Skip to content

fix(avm)!: remove unused dc selector #21314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
IlyasRidhuan merged 1 commit into from
Mar 13, 2026
Merged

fix(avm)!: remove unused dc selector #21314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion barretenberg/cpp/pil/vm2/precomputed.pil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,6 @@ pol constant sel_op_dc_13;
pol constant sel_op_dc_14;
pol constant sel_op_dc_15;
pol constant sel_op_dc_16;
pol constant sel_op_dc_17;

pol constant exec_opcode;
pol constant instr_size; // Instruction size in bytes
Expand Down
2 changes: 1 addition & 1 deletion barretenberg/cpp/src/barretenberg/vm2/common/instruction_spec.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

namespace bb::avm2 {

constexpr size_t NUM_OP_DC_SELECTORS = 18;
constexpr size_t NUM_OP_DC_SELECTORS = 17;
constexpr uint32_t DECOMPOSE_WINDOW_SIZE = 37; // Max size of instruction in bytes.
// We do not use a static constant to compute this value from WIRE_INSTRUCTION_SPEC
// because we do not want it to be changed transparently. Namely, if this constant
Expand Down
3 changes: 1 addition & 2 deletions barretenberg/cpp/src/barretenberg/vm2/constraining/avm_fixed_vk.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class AvmHardCodedVKAndHash {
using FF = bb::curve::BN254::ScalarField;

// Precomputed VK hash (hash of all commitments below).
static FF vk_hash() { return FF(uint256_t("0x18952f5711d5f7a6e29c980f1077eecd2ec45e80ba0ae78d5a4ae08e50428cab")); }
static FF vk_hash() { return FF(uint256_t("0x183783fd7c3f269b595307224be99cf3773b781f8d1d59a305ce711101d43a60")); }

static constexpr std::array<Commitment, NUM_PRECOMPUTED_ENTITIES> get_all()
{
Expand Down Expand Up @@ -328,7 +328,6 @@ class AvmHardCodedVKAndHash {
uint256_t("0x1a81d9ac52aa2a7fde7ee8b78f3606a35a8758e8de801673cea21e9a03b7ff4a"),
uint256_t(
"0x1d22d13122365e7ce6b1015f81eb2ba0e7fc566a64737406aeeabe279ece22ba")), // precomputed_sel_op_dc_16
Commitment::infinity(), // precomputed_sel_op_dc_17
Commitment(
uint256_t("0x1081a61f4edf2b68d9184bf3b60e78bab17e61612bc8c29c5a3198c39271284f"),
uint256_t(
Expand Down
2 changes: 1 addition & 1 deletion barretenberg/cpp/src/barretenberg/vm2/constraining/relations/op_decomposition.test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ TEST(DecompositionSelectors, CodeGen)
info(" Precomputed Selectors Table:");
info("#################################\n");

info("constexpr size_t NUM_OP_DC_SELECTORS = 18;\n\n");
info("constexpr size_t NUM_OP_DC_SELECTORS = ", set_of_bitmasks.size(), ";\n\n");

info("const std::unordered_map<WireOpCode, std::array<uint8_t, NUM_OP_DC_SELECTORS>> WireOpCode_DC_SELECTORS = "
"{");
Expand Down
10 changes: 5 additions & 5 deletions barretenberg/cpp/src/barretenberg/vm2/generated/columns.hpp
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions barretenberg/cpp/src/barretenberg/vm2/generated/flavor_variables.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,11 @@
namespace bb::avm2 {

struct AvmFlavorVariables {
static constexpr size_t NUM_PRECOMPUTED_ENTITIES = 123;
static constexpr size_t NUM_PRECOMPUTED_ENTITIES = 122;
static constexpr size_t NUM_WITNESS_ENTITIES = 3012;
static constexpr size_t NUM_SHIFTED_ENTITIES = 363;
static constexpr size_t NUM_WIRES = 2559;
static constexpr size_t NUM_ALL_ENTITIES = 3498;
static constexpr size_t NUM_ALL_ENTITIES = 3497;

// Need to be templated for recursive verifier
template <typename FF_>
Expand Down
4 changes: 2 additions & 2 deletions barretenberg/cpp/src/barretenberg/vm2/tracegen/precomputed_trace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ void PrecomputedTraceBuilder::process_tag_parameters(TraceContainer& trace)
/**
* @brief Populate the wire-level instruction specification table.
* @details One row per WireOpCode (0..67). Each row holds the operand decomposition selectors
* (sel_op_dc_0..17), the corresponding ExecutionOpCode, instruction size in bytes, and tag
* (sel_op_dc_0..16), the corresponding ExecutionOpCode, instruction size in bytes, and tag
* operand metadata. Rows beyond the last valid opcode are flagged with opcode_out_of_range.
* Used by the instruction-fetch subtrace to decode bytecode.
*/
Expand All @@ -183,7 +183,7 @@ void PrecomputedTraceBuilder::process_wire_instruction_spec(TraceContainer& trac
C::precomputed_sel_op_dc_6, C::precomputed_sel_op_dc_7, C::precomputed_sel_op_dc_8,
C::precomputed_sel_op_dc_9, C::precomputed_sel_op_dc_10, C::precomputed_sel_op_dc_11,
C::precomputed_sel_op_dc_12, C::precomputed_sel_op_dc_13, C::precomputed_sel_op_dc_14,
C::precomputed_sel_op_dc_15, C::precomputed_sel_op_dc_16, C::precomputed_sel_op_dc_17,
C::precomputed_sel_op_dc_15, C::precomputed_sel_op_dc_16,
};

// First set the selector for this table lookup.
Expand Down
Loading