perf: integrate icicle mmcs

.github/workflows/ci.yml

@@ -134,7 +134,7 @@ jobs:
 
  - name: Run cpplint
  if: github.event_name == 'pull_request'
- run: git diff --name-status HEAD origin/${{ github.base_ref }} | cut -f 2,3 | xargs cpplint --filter=-legal/copyright,-whitespace/line_length,-build/namespaces,-runtime/references
+ run: git diff --name-status HEAD origin/${{ github.base_ref }} | cut -f 2,3 | xargs cpplint --filter=-legal/copyright,-whitespace/line_length,-whitespace/indent_namespace,-build/namespaces,-runtime/references
 
  - name: Run clang-format lint
  uses: jidicula/[email protected]

benchmark/fri/BUILD.bazel

@@ -26,7 +26,6 @@ tachyon_cc_library(
  "//tachyon/base/containers:container_util",
  "//tachyon/base/time",
  "//tachyon/c/math/matrix",
- "//tachyon/crypto/hashes/sponge/poseidon2:poseidon2_horizen_external_matrix",
  "//tachyon/math/matrix:matrix_types",
  ],
 )
@@ -51,7 +50,6 @@ tachyon_cc_binary(
  "//tachyon/crypto/hashes/sponge:padding_free_sponge",
  "//tachyon/crypto/hashes/sponge:truncated_permutation",
  "//tachyon/crypto/hashes/sponge/poseidon2",
- "//tachyon/crypto/hashes/sponge/poseidon2:poseidon2_horizen_external_matrix",
  "//tachyon/crypto/hashes/sponge/poseidon2:poseidon2_params",
  "//tachyon/crypto/hashes/sponge/poseidon2/param_traits:poseidon2_baby_bear",
  "//tachyon/math/finite_fields:packed_field_traits_forward",

benchmark/fri/fri_benchmark.cc

@@ -1,4 +1,7 @@
 #include <iostream>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "absl/strings/substitute.h"
 
@@ -18,7 +21,6 @@
 #include "tachyon/crypto/hashes/sponge/padding_free_sponge.h"
 #include "tachyon/crypto/hashes/sponge/poseidon2/param_traits/poseidon2_baby_bear.h"
 #include "tachyon/crypto/hashes/sponge/poseidon2/poseidon2.h"
-#include "tachyon/crypto/hashes/sponge/poseidon2/poseidon2_horizen_external_matrix.h"
 #include "tachyon/crypto/hashes/sponge/poseidon2/poseidon2_params.h"
 #include "tachyon/crypto/hashes/sponge/truncated_permutation.h"
 #include "tachyon/math/finite_fields/baby_bear/baby_bear4.h"
@@ -50,16 +52,15 @@ void Run(const FRIConfig& config) {
  using ExtF = math::BabyBear4;
  using PackedF = math::PackedBabyBear;
  using ExtPackedF = math::PackedBabyBear4;
- using Params = crypto::Poseidon2Params<F, 15, 7>;
- using PackedParams = crypto::Poseidon2Params<PackedF, 15, 7>;
- using Poseidon2 =
- crypto::Poseidon2Sponge<crypto::Poseidon2ExternalMatrix<
- crypto::Poseidon2HorizenExternalMatrix<F>>,
- Params>;
- using PackedPoseidon2 = crypto::Poseidon2Sponge<
- crypto::Poseidon2ExternalMatrix<
- crypto::Poseidon2HorizenExternalMatrix<PackedF>>,
- PackedParams>;
+ using Params =
+ crypto::Poseidon2Params<crypto::Poseidon2Vendor::kHorizen,
+ crypto::Poseidon2Vendor::kPlonky3, F, 15, 7>;
+ using PackedParams =
+ crypto::Poseidon2Params<crypto::Poseidon2Vendor::kHorizen,
+ crypto::Poseidon2Vendor::kPlonky3, PackedF, 15,
+ 7>;
+ using Poseidon2 = crypto::Poseidon2Sponge<Params>;
+ using PackedPoseidon2 = crypto::Poseidon2Sponge<PackedParams>;
  using MyHasher = crypto::PaddingFreeSponge<Poseidon2, kRate, kChunk>;
  using MyPackedHasher =
  crypto::PaddingFreeSponge<PackedPoseidon2, kRate, kChunk>;
@@ -79,27 +80,12 @@ void Run(const FRIConfig& config) {
  ExtF::Init();
  ExtPackedF::Init();
 
- auto poseidon2_config = crypto::Poseidon2Config<Params>::Create(
- crypto::GetPoseidon2InternalShiftArray<Params>());
- Poseidon2 sponge(std::move(poseidon2_config));
- MyHasher hasher(sponge);
- MyCompressor compressor(sponge);
-
- auto packed_config = crypto::Poseidon2Config<PackedParams>::Create(
- crypto::GetPoseidon2InternalShiftArray<PackedParams>());
- PackedPoseidon2 packed_sponge(std::move(packed_config));
- MyPackedHasher packed_hasher(packed_sponge);
- MyPackedCompressor packed_compressor(std::move(packed_sponge));
- MMCS mmcs(hasher, packed_hasher, compressor, packed_compressor);
-
- ChallengeMMCS challenge_mmcs(
- ExtMMCS(std::move(hasher), std::move(packed_hasher),
- std::move(compressor), std::move(packed_compressor)));
-
+ MMCS mmcs;
+ ChallengeMMCS challenge_mmcs;
  crypto::FRIConfig<ChallengeMMCS> fri_config{config.log_blowup(), 10, 8,
  challenge_mmcs};
  MyPCS pcs = MyPCS(std::move(mmcs), std::move(fri_config));
- Challenger challenger = Challenger(std::move(sponge));
+ Challenger challenger;
 
  SimpleReporter reporter;
  std::string name;

benchmark/poseidon2/BUILD.bazel

@@ -29,7 +29,6 @@ tachyon_cc_library(
  "//tachyon/base/time",
  "//tachyon/c/base:type_traits_forward",
  "//tachyon/crypto/hashes/sponge/poseidon2",
- "//tachyon/crypto/hashes/sponge/poseidon2:poseidon2_horizen_external_matrix",
  ],
 )
 

benchmark/poseidon2/poseidon2_benchmark.cc

@@ -40,21 +40,21 @@ void Run(SimpleReporter& reporter, const Poseidon2Config& config, Fn horizen_fn,
  Field result;
  if constexpr (std::is_same_v<Field, math::BabyBear>) {
  if (base::Contains(config.vendors(), Vendor::Plonky3())) {
- using Params = Poseidon2Params<math::BabyBear, 15, 7>;
- auto poseidon2_config = crypto::Poseidon2Config<Params>::Create(
- crypto::GetPoseidon2InternalShiftArray<Params>());
- result = runner.Run(poseidon2_config);
+ using Params =
+  Poseidon2Params<Poseidon2Vendor::kHorizen, Poseidon2Vendor::kPlonky3,
+  math::BabyBear, 15, 7>;
+ result = runner.template Run<Params>();
  } else {
- using Params = Poseidon2Params<math::BabyBear, 15, 7>;
- auto poseidon2_config = crypto::Poseidon2Config<Params>::Create(
- crypto::GetPoseidon2InternalDiagonalArray<Params>());
- result = runner.Run(poseidon2_config);
+ using Params =
+  Poseidon2Params<Poseidon2Vendor::kHorizen, Poseidon2Vendor::kHorizen,
+  math::BabyBear, 15, 7>;
+ result = runner.template Run<Params>();
  }
  } else {
- using Params = Poseidon2Params<math::bn254::Fr, 2, 5>;
- auto poseidon2_config = crypto::Poseidon2Config<Params>::Create(
- crypto::GetPoseidon2InternalDiagonalArray<Params>());
- result = runner.Run(poseidon2_config);
+ using Params =
+  Poseidon2Params<Poseidon2Vendor::kHorizen, Poseidon2Vendor::kHorizen,
+  math::bn254::Fr, 2, 5>;
+ result = runner.template Run<Params>();
  }
  for (const Vendor vendor : config.vendors()) {
  Field result_vendor;

benchmark/poseidon2/poseidon2_benchmark_runner.h

@@ -16,7 +16,6 @@
 #include "tachyon/base/time/time.h"
 #include "tachyon/c/base/type_traits_forward.h"
 #include "tachyon/crypto/hashes/sponge/poseidon2/poseidon2.h"
-#include "tachyon/crypto/hashes/sponge/poseidon2/poseidon2_horizen_external_matrix.h"
 
 namespace tachyon::benchmark {
 
@@ -32,15 +31,11 @@ class Poseidon2BenchmarkRunner {
  : reporter_(reporter), config_(config) {}
 
  template <typename Params>
- Field Run(const crypto::Poseidon2Config<Params>& config) {
+ Field Run() {
  reporter_.AddVendor(Vendor::Tachyon());
  Field ret = Field::Zero();
  for (size_t i = 0; i < config_.repeating_num(); ++i) {
- crypto::Poseidon2Sponge<
- crypto::Poseidon2ExternalMatrix<
- crypto::Poseidon2HorizenExternalMatrix<Field>>,
- Params>
- sponge(config);
+ crypto::Poseidon2Sponge<Params> sponge;
  crypto::SpongeState<Params> state;
  base::TimeTicks start = base::TimeTicks::Now();
  for (size_t j = 0; j < 10000; ++j) {

tachyon/c/zk/air/sp1/BUILD.bazel

@@ -72,7 +72,6 @@ tachyon_cc_library(
  "//tachyon/crypto/challenger:duplex_challenger",
  "//tachyon/crypto/hashes/sponge/poseidon2",
  "//tachyon/crypto/hashes/sponge/poseidon2:poseidon2_params",
- "//tachyon/crypto/hashes/sponge/poseidon2:poseidon2_plonky3_external_matrix",
  "//tachyon/crypto/hashes/sponge/poseidon2/param_traits:poseidon2_baby_bear",
  ],
 )
@@ -223,7 +222,6 @@ tachyon_cc_library(
  "//tachyon/crypto/hashes/sponge:truncated_permutation",
  "//tachyon/crypto/hashes/sponge/poseidon2",
  "//tachyon/crypto/hashes/sponge/poseidon2:poseidon2_params",
- "//tachyon/crypto/hashes/sponge/poseidon2:poseidon2_plonky3_external_matrix",
  "//tachyon/crypto/hashes/sponge/poseidon2/param_traits:poseidon2_baby_bear",
  ],
 )

tachyon/c/zk/air/sp1/baby_bear_poseidon2_duplex_challenger.cc

@@ -15,11 +15,11 @@ using namespace tachyon;
 
 using F = math::BabyBear;
 using Params =
- crypto::Poseidon2Params<F, TACHYON_PLONKY3_BABY_BEAR_POSEIDON2_WIDTH - 1,
+ crypto::Poseidon2Params<crypto::Poseidon2Vendor::kPlonky3,
+ crypto::Poseidon2Vendor::kPlonky3, F,
+ TACHYON_PLONKY3_BABY_BEAR_POSEIDON2_WIDTH - 1,
  TACHYON_PLONKY3_BABY_BEAR_POSEIDON2_ALPHA>;
-using Poseidon2 = crypto::Poseidon2Sponge<
- crypto::Poseidon2ExternalMatrix<crypto::Poseidon2Plonky3ExternalMatrix<F>>,
- Params>;
+using Poseidon2 = crypto::Poseidon2Sponge<Params>;
 
 tachyon_sp1_baby_bear_poseidon2_duplex_challenger*
 tachyon_sp1_baby_bear_poseidon2_duplex_challenger_create() {
@@ -32,8 +32,7 @@ tachyon_sp1_baby_bear_poseidon2_duplex_challenger_create() {
  }
  }
 
- auto config = crypto::Poseidon2Config<Params>::Create(
- crypto::GetPoseidon2InternalShiftArray<Params>(), std::move(ark));
+ auto config = crypto::Poseidon2Config<Params>::CreateDefault(std::move(ark));
  Poseidon2 sponge(std::move(config));
  return c::base::c_cast(
  new crypto::DuplexChallenger<Poseidon2,

tachyon/c/zk/air/sp1/baby_bear_poseidon2_duplex_challenger_type_traits.h

@@ -7,38 +7,31 @@
 #include "tachyon/crypto/challenger/duplex_challenger.h"
 #include "tachyon/crypto/hashes/sponge/poseidon2/poseidon2.h"
 #include "tachyon/crypto/hashes/sponge/poseidon2/poseidon2_params.h"
-#include "tachyon/crypto/hashes/sponge/poseidon2/poseidon2_plonky3_external_matrix.h"
 #include "tachyon/math/finite_fields/baby_bear/baby_bear.h"
 
 namespace tachyon::c::base {
 
 namespace {
 
 using Params = tachyon::crypto::Poseidon2Params<
- tachyon::math::BabyBear, TACHYON_PLONKY3_BABY_BEAR_POSEIDON2_WIDTH - 1,
+ tachyon::crypto::Poseidon2Vendor::kPlonky3,
+ tachyon::crypto::Poseidon2Vendor::kPlonky3, tachyon::math::BabyBear,
+ TACHYON_PLONKY3_BABY_BEAR_POSEIDON2_WIDTH - 1,
  TACHYON_PLONKY3_BABY_BEAR_POSEIDON2_ALPHA>;
 
 } // namespace
 
 template <>
 struct TypeTraits<tachyon::crypto::DuplexChallenger<
- tachyon::crypto::Poseidon2Sponge<
- tachyon::crypto::Poseidon2ExternalMatrix<
- tachyon::crypto::Poseidon2Plonky3ExternalMatrix<
- tachyon::math::BabyBear>>,
- Params>,
+ tachyon::crypto::Poseidon2Sponge<Params>,
  TACHYON_PLONKY3_BABY_BEAR_POSEIDON2_RATE>> {
  using CType = tachyon_sp1_baby_bear_poseidon2_duplex_challenger;
 };
 
 template <>
 struct TypeTraits<tachyon_sp1_baby_bear_poseidon2_duplex_challenger> {
  using NativeType = tachyon::crypto::DuplexChallenger<
- tachyon::crypto::Poseidon2Sponge<
- tachyon::crypto::Poseidon2ExternalMatrix<
- tachyon::crypto::Poseidon2Plonky3ExternalMatrix<
- tachyon::math::BabyBear>>,
- Params>,
+ tachyon::crypto::Poseidon2Sponge<Params>,
  TACHYON_PLONKY3_BABY_BEAR_POSEIDON2_RATE>;
 };
 

tachyon/c/zk/air/sp1/baby_bear_poseidon2_duplex_challenger_unittest.cc

@@ -11,11 +11,11 @@
 namespace tachyon::crypto {
 
 using F = math::BabyBear;
-using Params = Poseidon2Params<F, TACHYON_PLONKY3_BABY_BEAR_POSEIDON2_WIDTH - 1,
-  TACHYON_PLONKY3_BABY_BEAR_POSEIDON2_ALPHA>;
-using Poseidon2 =
- Poseidon2Sponge<Poseidon2ExternalMatrix<Poseidon2Plonky3ExternalMatrix<F>>,
- Params>;
+using Params =
+ Poseidon2Params<Poseidon2Vendor::kPlonky3, Poseidon2Vendor::kPlonky3, F,
+ TACHYON_PLONKY3_BABY_BEAR_POSEIDON2_WIDTH - 1,
+  TACHYON_PLONKY3_BABY_BEAR_POSEIDON2_ALPHA>;
+using Poseidon2 = Poseidon2Sponge<Params>;
 
 class DuplexChallengerTest : public math::FiniteFieldTest<F> {
  public:

tachyon/c/zk/air/sp1/baby_bear_poseidon2_hintable_unittest.cc

@@ -1,6 +1,7 @@
 #include "tachyon/c/zk/air/sp1/baby_bear_poseidon2_hintable.h"
 
 #include <utility>
+#include <vector>
 
 #include "tachyon/c/zk/air/sp1/baby_bear_poseidon2_two_adic_fri_type_traits.h"
 #include "tachyon/math/finite_fields/test/finite_field_test.h"
@@ -17,10 +18,7 @@ constexpr size_t kRate = 4;
 class HintableTest : public math::FiniteFieldTest<F> {};
 
 TEST_F(HintableTest, DuplexChallenger) {
- auto config = crypto::Poseidon2Config<Params>::Create(
- crypto::GetPoseidon2InternalShiftArray<Params>());
- Poseidon2 sponge(std::move(config));
- crypto::DuplexChallenger<Poseidon2, kRate> challenger(std::move(sponge));
+ crypto::DuplexChallenger<Poseidon2, kRate> challenger;
  for (size_t i = 0; i < Params::kWidth; ++i) {
  challenger.state_[i] = F(i);
  }

tachyon/c/zk/air/sp1/baby_bear_poseidon2_two_adic_fri.cc

@@ -34,10 +34,13 @@ using ExtMMCS = c::zk::air::sp1::baby_bear::ExtMMCS;
 using ChallengeMMCS = c::zk::air::sp1::baby_bear::ChallengeMMCS;
 using PCS = c::zk::air::sp1::baby_bear::PCS;
 using Params =
- crypto::Poseidon2Params<F, TACHYON_PLONKY3_BABY_BEAR_POSEIDON2_WIDTH - 1,
+ crypto::Poseidon2Params<crypto::Poseidon2Vendor::kPlonky3,
+ crypto::Poseidon2Vendor::kPlonky3, F,
+ TACHYON_PLONKY3_BABY_BEAR_POSEIDON2_WIDTH - 1,
  TACHYON_PLONKY3_BABY_BEAR_POSEIDON2_ALPHA>;
 using PackedParams =
- crypto::Poseidon2Params<PackedF,
+ crypto::Poseidon2Params<crypto::Poseidon2Vendor::kPlonky3,
+ crypto::Poseidon2Vendor::kPlonky3, PackedF,
  TACHYON_PLONKY3_BABY_BEAR_POSEIDON2_WIDTH - 1,
  TACHYON_PLONKY3_BABY_BEAR_POSEIDON2_ALPHA>;
 
@@ -67,14 +70,12 @@ tachyon_sp1_baby_bear_poseidon2_two_adic_fri_create(uint32_t log_blowup,
  }
  }
 
- auto config = crypto::Poseidon2Config<Params>::Create(
- crypto::GetPoseidon2InternalShiftArray<Params>(), std::move(ark));
+ auto config = crypto::Poseidon2Config<Params>::CreateDefault(std::move(ark));
  Poseidon2 sponge(std::move(config));
  Hasher hasher(sponge);
  Compressor compressor(std::move(sponge));
 
- auto packed_config = crypto::Poseidon2Config<PackedParams>::Create(
- crypto::GetPoseidon2InternalShiftArray<PackedParams>(),
+ auto packed_config = crypto::Poseidon2Config<PackedParams>::CreateDefault(
  std::move(packed_ark));
  PackedPoseidon2 packed_sponge(std::move(packed_config));
  PackedHasher packed_hasher(packed_sponge);

tachyon/c/zk/air/sp1/baby_bear_poseidon2_two_adic_fri_type_traits.h

@@ -14,27 +14,26 @@
 #include "tachyon/crypto/hashes/sponge/poseidon2/param_traits/poseidon2_baby_bear.h"
 #include "tachyon/crypto/hashes/sponge/poseidon2/poseidon2.h"
 #include "tachyon/crypto/hashes/sponge/poseidon2/poseidon2_params.h"
-#include "tachyon/crypto/hashes/sponge/poseidon2/poseidon2_plonky3_external_matrix.h"
 #include "tachyon/crypto/hashes/sponge/truncated_permutation.h"
 
 namespace tachyon::c {
 namespace zk::air::sp1::baby_bear {
 
 using Params = tachyon::crypto::Poseidon2Params<
- F, TACHYON_PLONKY3_BABY_BEAR_POSEIDON2_WIDTH - 1,
+ tachyon::crypto::Poseidon2Vendor::kPlonky3,
+ tachyon::crypto::Poseidon2Vendor::kPlonky3, F,
+ TACHYON_PLONKY3_BABY_BEAR_POSEIDON2_WIDTH - 1,
  TACHYON_PLONKY3_BABY_BEAR_POSEIDON2_ALPHA>;
+
 using PackedParams = tachyon::crypto::Poseidon2Params<
- PackedF, TACHYON_PLONKY3_BABY_BEAR_POSEIDON2_WIDTH - 1,
+ tachyon::crypto::Poseidon2Vendor::kPlonky3,
+ tachyon::crypto::Poseidon2Vendor::kPlonky3, PackedF,
+ TACHYON_PLONKY3_BABY_BEAR_POSEIDON2_WIDTH - 1,
  TACHYON_PLONKY3_BABY_BEAR_POSEIDON2_ALPHA>;
-using Poseidon2 = tachyon::crypto::Poseidon2Sponge<
- tachyon::crypto::Poseidon2ExternalMatrix<
- tachyon::crypto::Poseidon2Plonky3ExternalMatrix<F>>,
- Params>;
-
-using PackedPoseidon2 = tachyon::crypto::Poseidon2Sponge<
- tachyon::crypto::Poseidon2ExternalMatrix<
- tachyon::crypto::Poseidon2Plonky3ExternalMatrix<PackedF>>,
- PackedParams>;
+
+using Poseidon2 = tachyon::crypto::Poseidon2Sponge<Params>;
+
+using PackedPoseidon2 = tachyon::crypto::Poseidon2Sponge<PackedParams>;
 
 using Hasher = tachyon::crypto::PaddingFreeSponge<
  Poseidon2, TACHYON_PLONKY3_BABY_BEAR_POSEIDON2_RATE,

tachyon/crypto/challenger/BUILD.bazel

@@ -75,7 +75,6 @@ tachyon_cc_unittest(
  "//tachyon/crypto/hashes/sponge:padding_free_sponge",
  "//tachyon/crypto/hashes/sponge/poseidon2",
  "//tachyon/crypto/hashes/sponge/poseidon2:poseidon2_params",
- "//tachyon/crypto/hashes/sponge/poseidon2:poseidon2_plonky3_external_matrix",
  "//tachyon/crypto/hashes/sponge/poseidon2/param_traits:poseidon2_baby_bear",
  "//tachyon/crypto/hashes/sponge/poseidon2/param_traits:poseidon2_bn254",
  "//tachyon/math/finite_fields/test:finite_field_test",