From b003567128c15c1064bd6bd831ebe1a4158ae66f Mon Sep 17 00:00:00 2001 From: Facundo Date: Wed, 5 Feb 2025 17:44:58 +0000 Subject: [PATCH] chore(avm): use lookup by clk for sha params (#11762) Please read [contributing guidelines](CONTRIBUTING.md) and remove this line. --- .../tracegen/lib/lookup_into_sha256_params.hpp | 18 ------------------ .../src/barretenberg/vm2/tracegen_helper.cpp | 3 +-- 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 barretenberg/cpp/src/barretenberg/vm2/tracegen/lib/lookup_into_sha256_params.hpp diff --git a/barretenberg/cpp/src/barretenberg/vm2/tracegen/lib/lookup_into_sha256_params.hpp b/barretenberg/cpp/src/barretenberg/vm2/tracegen/lib/lookup_into_sha256_params.hpp deleted file mode 100644 index eeb1c38ce3c..00000000000 --- a/barretenberg/cpp/src/barretenberg/vm2/tracegen/lib/lookup_into_sha256_params.hpp +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include - -#include "barretenberg/vm2/tracegen/lib/lookup_builder.hpp" - -namespace bb::avm2::tracegen { - -template class LookupIntoSha256Params : public BaseLookupTraceBuilder { - private: - uint32_t find_in_dst(const std::array& tup) const override - { - // clk/row-index is the round constant for the SHA-256 compression algorithm. - const auto& [clk, _] = tup; - return static_cast(clk); - } -}; -} // namespace bb::avm2::tracegen diff --git a/barretenberg/cpp/src/barretenberg/vm2/tracegen_helper.cpp b/barretenberg/cpp/src/barretenberg/vm2/tracegen_helper.cpp index 51c4f8e4a26..48f21de77b5 100644 --- a/barretenberg/cpp/src/barretenberg/vm2/tracegen_helper.cpp +++ b/barretenberg/cpp/src/barretenberg/vm2/tracegen_helper.cpp @@ -26,7 +26,6 @@ #include "barretenberg/vm2/tracegen/lib/lookup_builder.hpp" #include "barretenberg/vm2/tracegen/lib/lookup_into_bitwise.hpp" #include "barretenberg/vm2/tracegen/lib/lookup_into_indexed_by_clk.hpp" -#include "barretenberg/vm2/tracegen/lib/lookup_into_sha256_params.hpp" #include "barretenberg/vm2/tracegen/lib/permutation_builder.hpp" #include "barretenberg/vm2/tracegen/precomputed_trace.hpp" #include "barretenberg/vm2/tracegen/sha256_trace.hpp" @@ -199,7 +198,7 @@ TraceContainer AvmTraceGenHelper::generate_trace(EventsContainer&& events) std::make_unique>(), std::make_unique>(), std::make_unique>(), - std::make_unique>()); + std::make_unique>()); AVM_TRACK_TIME("tracegen/interactions", parallel_for(jobs_interactions.size(), [&](size_t i) { jobs_interactions[i]->process(trace); })); }