Skip to content

Commit 7f1b198

Browse files
jeanmonjeanmon
authored
chore(avm)!: Migration to GT gadget for Keccak permutation (#16725)
1 parent bfc5abd commit 7f1b198

File tree

15 files changed

+129
-148
lines changed

15 files changed

+129
-148
lines changed

‎barretenberg/cpp/pil/vm2/keccakf1600.pil‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1355,25 +1355,18 @@ src_out_of_range_error * (1 - src_out_of_range_error) = 0;
13551355
dst_out_of_range_error * (1 - dst_out_of_range_error) = 0;
13561356

13571357
pol HIGHEST_SLICE_ADDRESS = constants.AVM_HIGHEST_MEM_ADDRESS - constants.AVM_KECCAKF1600_STATE_SIZE + 1;
1358-
// start == 1 ==> [src_out_of_range_error == 1 && src_addr > HIGHEST_SLICE_ADDRESS]
1359-
pol commit src_abs_diff;
1358+
// TODO: remove this column when we support constants in lookup tuples.
1359+
pol commit highest_slice_address;
1360+
start * (highest_slice_address - HIGHEST_SLICE_ADDRESS) = 0;
1361+
1362+
// start == 1 ==> [src_out_of_range_error == 1 <==> src_addr > HIGHEST_SLICE_ADDRESS]
13601363
#[SRC_OUT_OF_RANGE_TOGGLE]
1361-
src_abs_diff = start * ((2 * src_out_of_range_error - 1) * (src_addr - HIGHEST_SLICE_ADDRESS) - src_out_of_range_error);
1364+
start { src_addr, highest_slice_address, src_out_of_range_error } in gt.sel { gt.input_a, gt.input_b, gt.res };
13621365

1363-
// start == 1 ==> [dst_out_of_range_error == 1 && dst_addr > HIGHEST_SLICE_ADDRESS]
1364-
pol commit dst_abs_diff;
1366+
// start == 1 ==> [dst_out_of_range_error == 1 <==> dst_addr > HIGHEST_SLICE_ADDRESS]
13651367
#[DST_OUT_OF_RANGE_TOGGLE]
1366-
dst_abs_diff = start * ((2 * dst_out_of_range_error - 1) * (dst_addr - HIGHEST_SLICE_ADDRESS) - dst_out_of_range_error);
1367-
1368-
// TODO: remove this column when we support constants in lookup tuples.
1369-
pol commit thirty_two;
1370-
sel * (thirty_two - 32) = 0;
1371-
1372-
#[SRC_ABS_DIFF_POSITIVE]
1373-
start { src_abs_diff, thirty_two } in range_check.sel { range_check.value, range_check.rng_chk_bits };
1368+
start { dst_addr, highest_slice_address, dst_out_of_range_error } in gt.sel { gt.input_a, gt.input_b, gt.res };
13741369

1375-
#[DST_ABS_DIFF_POSITIVE]
1376-
start { dst_abs_diff, thirty_two } in range_check.sel { range_check.value, range_check.rng_chk_bits };
13771370

13781371
// error = src_out_of_range_error || dst_out_of_range_error || tag_error
13791372
// boolean by definition

‎barretenberg/cpp/src/barretenberg/vm2/generated/columns.hpp‎

Lines changed: 4 additions & 4 deletions
Large diffs are not rendered by default.

‎barretenberg/cpp/src/barretenberg/vm2/generated/flavor_variables.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,10 @@ namespace bb::avm2 {
133133

134134
struct AvmFlavorVariables {
135135
static constexpr size_t NUM_PRECOMPUTED_ENTITIES = 133;
136-
static constexpr size_t NUM_WITNESS_ENTITIES = 2936;
136+
static constexpr size_t NUM_WITNESS_ENTITIES = 2934;
137137
static constexpr size_t NUM_SHIFTED_ENTITIES = 317;
138138
static constexpr size_t NUM_WIRES = NUM_WITNESS_ENTITIES + NUM_PRECOMPUTED_ENTITIES;
139-
static constexpr size_t NUM_ALL_ENTITIES = 3386;
139+
static constexpr size_t NUM_ALL_ENTITIES = 3384;
140140

141141
// Need to be templated for recursive verifier
142142
template <typename FF_>
@@ -311,9 +311,9 @@ struct AvmFlavorVariables {
311311
lookup_instr_fetching_wire_instruction_info_relation<FF_>,
312312
lookup_internal_call_push_call_stack_relation<FF_>,
313313
lookup_internal_call_unwind_call_stack_relation<FF_>,
314-
lookup_keccakf1600_dst_abs_diff_positive_relation<FF_>,
314+
lookup_keccakf1600_dst_out_of_range_toggle_relation<FF_>,
315315
lookup_keccakf1600_round_cst_relation<FF_>,
316-
lookup_keccakf1600_src_abs_diff_positive_relation<FF_>,
316+
lookup_keccakf1600_src_out_of_range_toggle_relation<FF_>,
317317
lookup_keccakf1600_state_chi_00_relation<FF_>,
318318
lookup_keccakf1600_state_chi_01_relation<FF_>,
319319
lookup_keccakf1600_state_chi_02_relation<FF_>,

‎barretenberg/cpp/src/barretenberg/vm2/generated/relations/keccakf1600.hpp‎

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ template <typename FF_> class keccakf1600Impl {
1414
public:
1515
using FF = FF_;
1616

17-
static constexpr std::array<size_t, 159> SUBRELATION_PARTIAL_LENGTHS = {
17+
static constexpr std::array<size_t, 157> SUBRELATION_PARTIAL_LENGTHS = {
1818
3, 3, 3, 3, 4, 4, 3, 3, 3, 3, 3, 2, 2, 3, 2, 2, 3, 2, 2, 3, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1919
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2020
2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
2121
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
22-
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 3, 4, 3, 3, 3, 3, 4, 3
22+
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 3, 3, 3, 3, 4, 3
2323
};
2424

2525
template <typename AllEntities> inline static bool skip(const AllEntities& in)
@@ -279,23 +279,19 @@ template <typename FF> class keccakf1600 : public Relation<keccakf1600Impl<FF>>
279279
return "SRC_OUT_OF_RANGE_ERROR_BOOLEAN";
280280
case 148:
281281
return "DST_OUT_OF_RANGE_ERROR_BOOLEAN";
282-
case 149:
283-
return "SRC_OUT_OF_RANGE_TOGGLE";
284282
case 150:
285-
return "DST_OUT_OF_RANGE_TOGGLE";
286-
case 152:
287283
return "ERROR";
288-
case 153:
284+
case 151:
289285
return "DST_ADDR_PROPAGATION";
290-
case 154:
286+
case 152:
291287
return "CLK_PROPAGATION";
292-
case 155:
288+
case 153:
293289
return "SPACE_ID_PROPAGATION";
294-
case 156:
290+
case 154:
295291
return "SEL_NO_ERROR_PROPAGATION";
296-
case 157:
292+
case 155:
297293
return "SEL_SLICE_READ";
298-
case 158:
294+
case 156:
299295
return "SEL_SLICE_WRITE";
300296
}
301297
return std::to_string(index);
@@ -420,15 +416,13 @@ template <typename FF> class keccakf1600 : public Relation<keccakf1600Impl<FF>>
420416
static constexpr size_t SR_NEXT_STATE_IN_44 = 146;
421417
static constexpr size_t SR_SRC_OUT_OF_RANGE_ERROR_BOOLEAN = 147;
422418
static constexpr size_t SR_DST_OUT_OF_RANGE_ERROR_BOOLEAN = 148;
423-
static constexpr size_t SR_SRC_OUT_OF_RANGE_TOGGLE = 149;
424-
static constexpr size_t SR_DST_OUT_OF_RANGE_TOGGLE = 150;
425-
static constexpr size_t SR_ERROR = 152;
426-
static constexpr size_t SR_DST_ADDR_PROPAGATION = 153;
427-
static constexpr size_t SR_CLK_PROPAGATION = 154;
428-
static constexpr size_t SR_SPACE_ID_PROPAGATION = 155;
429-
static constexpr size_t SR_SEL_NO_ERROR_PROPAGATION = 156;
430-
static constexpr size_t SR_SEL_SLICE_READ = 157;
431-
static constexpr size_t SR_SEL_SLICE_WRITE = 158;
419+
static constexpr size_t SR_ERROR = 150;
420+
static constexpr size_t SR_DST_ADDR_PROPAGATION = 151;
421+
static constexpr size_t SR_CLK_PROPAGATION = 152;
422+
static constexpr size_t SR_SPACE_ID_PROPAGATION = 153;
423+
static constexpr size_t SR_SEL_NO_ERROR_PROPAGATION = 154;
424+
static constexpr size_t SR_SEL_SLICE_READ = 155;
425+
static constexpr size_t SR_SEL_SLICE_WRITE = 156;
432426
};
433427

434428
} // namespace bb::avm2

‎barretenberg/cpp/src/barretenberg/vm2/generated/relations/keccakf1600_impl.hpp‎

Lines changed: 17 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1202,83 +1202,64 @@ void keccakf1600Impl<FF_>::accumulate(ContainerOverSubrelations& evals,
12021202
tmp *= scaling_factor;
12031203
std::get<148>(evals) += typename Accumulator::View(tmp);
12041204
}
1205-
{ // SRC_OUT_OF_RANGE_TOGGLE
1205+
{
12061206
using Accumulator = typename std::tuple_element_t<149, ContainerOverSubrelations>;
1207-
auto tmp =
1208-
(in.get(C::keccakf1600_src_abs_diff) -
1209-
in.get(C::keccakf1600_start) * ((FF(2) * in.get(C::keccakf1600_src_out_of_range_error) - FF(1)) *
1210-
(in.get(C::keccakf1600_src_addr) - keccakf1600_HIGHEST_SLICE_ADDRESS) -
1211-
in.get(C::keccakf1600_src_out_of_range_error)));
1207+
auto tmp = in.get(C::keccakf1600_start) *
1208+
(in.get(C::keccakf1600_highest_slice_address) - keccakf1600_HIGHEST_SLICE_ADDRESS);
12121209
tmp *= scaling_factor;
12131210
std::get<149>(evals) += typename Accumulator::View(tmp);
12141211
}
1215-
{ // DST_OUT_OF_RANGE_TOGGLE
1216-
using Accumulator = typename std::tuple_element_t<150, ContainerOverSubrelations>;
1217-
auto tmp =
1218-
(in.get(C::keccakf1600_dst_abs_diff) -
1219-
in.get(C::keccakf1600_start) * ((FF(2) * in.get(C::keccakf1600_dst_out_of_range_error) - FF(1)) *
1220-
(in.get(C::keccakf1600_dst_addr) - keccakf1600_HIGHEST_SLICE_ADDRESS) -
1221-
in.get(C::keccakf1600_dst_out_of_range_error)));
1222-
tmp *= scaling_factor;
1223-
std::get<150>(evals) += typename Accumulator::View(tmp);
1224-
}
1225-
{
1226-
using Accumulator = typename std::tuple_element_t<151, ContainerOverSubrelations>;
1227-
auto tmp = in.get(C::keccakf1600_sel) * (in.get(C::keccakf1600_thirty_two) - FF(32));
1228-
tmp *= scaling_factor;
1229-
std::get<151>(evals) += typename Accumulator::View(tmp);
1230-
}
12311212
{ // ERROR
1232-
using Accumulator = typename std::tuple_element_t<152, ContainerOverSubrelations>;
1213+
using Accumulator = typename std::tuple_element_t<150, ContainerOverSubrelations>;
12331214
auto tmp =
12341215
(in.get(C::keccakf1600_error) - (FF(1) - (FF(1) - in.get(C::keccakf1600_src_out_of_range_error)) *
12351216
(FF(1) - in.get(C::keccakf1600_dst_out_of_range_error)) *
12361217
(FF(1) - in.get(C::keccakf1600_tag_error))));
12371218
tmp *= scaling_factor;
1238-
std::get<152>(evals) += typename Accumulator::View(tmp);
1219+
std::get<150>(evals) += typename Accumulator::View(tmp);
12391220
}
12401221
{ // DST_ADDR_PROPAGATION
1241-
using Accumulator = typename std::tuple_element_t<153, ContainerOverSubrelations>;
1222+
using Accumulator = typename std::tuple_element_t<151, ContainerOverSubrelations>;
12421223
auto tmp = (FF(1) - in.get(C::keccakf1600_last)) *
12431224
(in.get(C::keccakf1600_dst_addr_shift) - in.get(C::keccakf1600_dst_addr));
12441225
tmp *= scaling_factor;
1245-
std::get<153>(evals) += typename Accumulator::View(tmp);
1226+
std::get<151>(evals) += typename Accumulator::View(tmp);
12461227
}
12471228
{ // CLK_PROPAGATION
1248-
using Accumulator = typename std::tuple_element_t<154, ContainerOverSubrelations>;
1229+
using Accumulator = typename std::tuple_element_t<152, ContainerOverSubrelations>;
12491230
auto tmp =
12501231
(FF(1) - in.get(C::keccakf1600_last)) * (in.get(C::keccakf1600_clk_shift) - in.get(C::keccakf1600_clk));
12511232
tmp *= scaling_factor;
1252-
std::get<154>(evals) += typename Accumulator::View(tmp);
1233+
std::get<152>(evals) += typename Accumulator::View(tmp);
12531234
}
12541235
{ // SPACE_ID_PROPAGATION
1255-
using Accumulator = typename std::tuple_element_t<155, ContainerOverSubrelations>;
1236+
using Accumulator = typename std::tuple_element_t<153, ContainerOverSubrelations>;
12561237
auto tmp = (FF(1) - in.get(C::keccakf1600_last)) *
12571238
(in.get(C::keccakf1600_space_id_shift) - in.get(C::keccakf1600_space_id));
12581239
tmp *= scaling_factor;
1259-
std::get<155>(evals) += typename Accumulator::View(tmp);
1240+
std::get<153>(evals) += typename Accumulator::View(tmp);
12601241
}
12611242
{ // SEL_NO_ERROR_PROPAGATION
1262-
using Accumulator = typename std::tuple_element_t<156, ContainerOverSubrelations>;
1243+
using Accumulator = typename std::tuple_element_t<154, ContainerOverSubrelations>;
12631244
auto tmp = (FF(1) - in.get(C::keccakf1600_last)) *
12641245
(in.get(C::keccakf1600_sel_no_error_shift) - in.get(C::keccakf1600_sel_no_error));
12651246
tmp *= scaling_factor;
1266-
std::get<156>(evals) += typename Accumulator::View(tmp);
1247+
std::get<154>(evals) += typename Accumulator::View(tmp);
12671248
}
12681249
{ // SEL_SLICE_READ
1269-
using Accumulator = typename std::tuple_element_t<157, ContainerOverSubrelations>;
1250+
using Accumulator = typename std::tuple_element_t<155, ContainerOverSubrelations>;
12701251
auto tmp = (in.get(C::keccakf1600_sel_slice_read) -
12711252
in.get(C::keccakf1600_start) * (FF(1) - in.get(C::keccakf1600_src_out_of_range_error)) *
12721253
(FF(1) - in.get(C::keccakf1600_dst_out_of_range_error)));
12731254
tmp *= scaling_factor;
1274-
std::get<157>(evals) += typename Accumulator::View(tmp);
1255+
std::get<155>(evals) += typename Accumulator::View(tmp);
12751256
}
12761257
{ // SEL_SLICE_WRITE
1277-
using Accumulator = typename std::tuple_element_t<158, ContainerOverSubrelations>;
1258+
using Accumulator = typename std::tuple_element_t<156, ContainerOverSubrelations>;
12781259
auto tmp = (in.get(C::keccakf1600_sel_slice_write) -
12791260
in.get(C::keccakf1600_sel_no_error) * in.get(C::keccakf1600_last));
12801261
tmp *= scaling_factor;
1281-
std::get<158>(evals) += typename Accumulator::View(tmp);
1262+
std::get<156>(evals) += typename Accumulator::View(tmp);
12821263
}
12831264
}
12841265

‎barretenberg/cpp/src/barretenberg/vm2/generated/relations/lookups_keccakf1600.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ INSTANTIATE_LOOKUP(lookup_keccakf1600_state_chi_43_relation);
151151
INSTANTIATE_LOOKUP(lookup_keccakf1600_state_chi_44_relation);
152152
INSTANTIATE_LOOKUP(lookup_keccakf1600_round_cst_relation);
153153
INSTANTIATE_LOOKUP(lookup_keccakf1600_state_iota_00_relation);
154-
INSTANTIATE_LOOKUP(lookup_keccakf1600_src_abs_diff_positive_relation);
155-
INSTANTIATE_LOOKUP(lookup_keccakf1600_dst_abs_diff_positive_relation);
154+
INSTANTIATE_LOOKUP(lookup_keccakf1600_src_out_of_range_toggle_relation);
155+
INSTANTIATE_LOOKUP(lookup_keccakf1600_dst_out_of_range_toggle_relation);
156156

157157
} // namespace bb::avm2

‎barretenberg/cpp/src/barretenberg/vm2/generated/relations/lookups_keccakf1600.hpp‎

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3502,52 +3502,56 @@ using lookup_keccakf1600_state_iota_00_settings = lookup_settings<lookup_keccakf
35023502
template <typename FF_>
35033503
using lookup_keccakf1600_state_iota_00_relation = lookup_relation_base<FF_, lookup_keccakf1600_state_iota_00_settings>;
35043504

3505-
/////////////////// lookup_keccakf1600_src_abs_diff_positive ///////////////////
3505+
/////////////////// lookup_keccakf1600_src_out_of_range_toggle ///////////////////
35063506

3507-
struct lookup_keccakf1600_src_abs_diff_positive_settings_ {
3508-
static constexpr std::string_view NAME = "LOOKUP_KECCAKF1600_SRC_ABS_DIFF_POSITIVE";
3507+
struct lookup_keccakf1600_src_out_of_range_toggle_settings_ {
3508+
static constexpr std::string_view NAME = "LOOKUP_KECCAKF1600_SRC_OUT_OF_RANGE_TOGGLE";
35093509
static constexpr std::string_view RELATION_NAME = "keccakf1600";
3510-
static constexpr size_t LOOKUP_TUPLE_SIZE = 2;
3510+
static constexpr size_t LOOKUP_TUPLE_SIZE = 3;
35113511
static constexpr Column SRC_SELECTOR = Column::keccakf1600_start;
3512-
static constexpr Column DST_SELECTOR = Column::range_check_sel;
3513-
static constexpr Column COUNTS = Column::lookup_keccakf1600_src_abs_diff_positive_counts;
3514-
static constexpr Column INVERSES = Column::lookup_keccakf1600_src_abs_diff_positive_inv;
3512+
static constexpr Column DST_SELECTOR = Column::gt_sel;
3513+
static constexpr Column COUNTS = Column::lookup_keccakf1600_src_out_of_range_toggle_counts;
3514+
static constexpr Column INVERSES = Column::lookup_keccakf1600_src_out_of_range_toggle_inv;
35153515
static constexpr std::array<ColumnAndShifts, LOOKUP_TUPLE_SIZE> SRC_COLUMNS = {
3516-
ColumnAndShifts::keccakf1600_src_abs_diff, ColumnAndShifts::keccakf1600_thirty_two
3517-
};
3518-
static constexpr std::array<ColumnAndShifts, LOOKUP_TUPLE_SIZE> DST_COLUMNS = {
3519-
ColumnAndShifts::range_check_value, ColumnAndShifts::range_check_rng_chk_bits
3516+
ColumnAndShifts::keccakf1600_src_addr,
3517+
ColumnAndShifts::keccakf1600_highest_slice_address,
3518+
ColumnAndShifts::keccakf1600_src_out_of_range_error
35203519
};
3520+
static constexpr std::array<ColumnAndShifts, LOOKUP_TUPLE_SIZE> DST_COLUMNS = { ColumnAndShifts::gt_input_a,
3521+
ColumnAndShifts::gt_input_b,
3522+
ColumnAndShifts::gt_res };
35213523
};
35223524

3523-
using lookup_keccakf1600_src_abs_diff_positive_settings =
3524-
lookup_settings<lookup_keccakf1600_src_abs_diff_positive_settings_>;
3525+
using lookup_keccakf1600_src_out_of_range_toggle_settings =
3526+
lookup_settings<lookup_keccakf1600_src_out_of_range_toggle_settings_>;
35253527
template <typename FF_>
3526-
using lookup_keccakf1600_src_abs_diff_positive_relation =
3527-
lookup_relation_base<FF_, lookup_keccakf1600_src_abs_diff_positive_settings>;
3528+
using lookup_keccakf1600_src_out_of_range_toggle_relation =
3529+
lookup_relation_base<FF_, lookup_keccakf1600_src_out_of_range_toggle_settings>;
35283530

3529-
/////////////////// lookup_keccakf1600_dst_abs_diff_positive ///////////////////
3531+
/////////////////// lookup_keccakf1600_dst_out_of_range_toggle ///////////////////
35303532

3531-
struct lookup_keccakf1600_dst_abs_diff_positive_settings_ {
3532-
static constexpr std::string_view NAME = "LOOKUP_KECCAKF1600_DST_ABS_DIFF_POSITIVE";
3533+
struct lookup_keccakf1600_dst_out_of_range_toggle_settings_ {
3534+
static constexpr std::string_view NAME = "LOOKUP_KECCAKF1600_DST_OUT_OF_RANGE_TOGGLE";
35333535
static constexpr std::string_view RELATION_NAME = "keccakf1600";
3534-
static constexpr size_t LOOKUP_TUPLE_SIZE = 2;
3536+
static constexpr size_t LOOKUP_TUPLE_SIZE = 3;
35353537
static constexpr Column SRC_SELECTOR = Column::keccakf1600_start;
3536-
static constexpr Column DST_SELECTOR = Column::range_check_sel;
3537-
static constexpr Column COUNTS = Column::lookup_keccakf1600_dst_abs_diff_positive_counts;
3538-
static constexpr Column INVERSES = Column::lookup_keccakf1600_dst_abs_diff_positive_inv;
3538+
static constexpr Column DST_SELECTOR = Column::gt_sel;
3539+
static constexpr Column COUNTS = Column::lookup_keccakf1600_dst_out_of_range_toggle_counts;
3540+
static constexpr Column INVERSES = Column::lookup_keccakf1600_dst_out_of_range_toggle_inv;
35393541
static constexpr std::array<ColumnAndShifts, LOOKUP_TUPLE_SIZE> SRC_COLUMNS = {
3540-
ColumnAndShifts::keccakf1600_dst_abs_diff, ColumnAndShifts::keccakf1600_thirty_two
3541-
};
3542-
static constexpr std::array<ColumnAndShifts, LOOKUP_TUPLE_SIZE> DST_COLUMNS = {
3543-
ColumnAndShifts::range_check_value, ColumnAndShifts::range_check_rng_chk_bits
3542+
ColumnAndShifts::keccakf1600_dst_addr,
3543+
ColumnAndShifts::keccakf1600_highest_slice_address,
3544+
ColumnAndShifts::keccakf1600_dst_out_of_range_error
35443545
};
3546+
static constexpr std::array<ColumnAndShifts, LOOKUP_TUPLE_SIZE> DST_COLUMNS = { ColumnAndShifts::gt_input_a,
3547+
ColumnAndShifts::gt_input_b,
3548+
ColumnAndShifts::gt_res };
35453549
};
35463550

3547-
using lookup_keccakf1600_dst_abs_diff_positive_settings =
3548-
lookup_settings<lookup_keccakf1600_dst_abs_diff_positive_settings_>;
3551+
using lookup_keccakf1600_dst_out_of_range_toggle_settings =
3552+
lookup_settings<lookup_keccakf1600_dst_out_of_range_toggle_settings_>;
35493553
template <typename FF_>
3550-
using lookup_keccakf1600_dst_abs_diff_positive_relation =
3551-
lookup_relation_base<FF_, lookup_keccakf1600_dst_abs_diff_positive_settings>;
3554+
using lookup_keccakf1600_dst_out_of_range_toggle_relation =
3555+
lookup_relation_base<FF_, lookup_keccakf1600_dst_out_of_range_toggle_settings>;
35523556

35533557
} // namespace bb::avm2

‎barretenberg/cpp/src/barretenberg/vm2/simulation/events/keccakf1600_event.hpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ struct KeccakF1600Event {
4141
std::array<KeccakF1600RoundData, AVM_KECCAKF1600_NUM_ROUNDS> rounds;
4242
bool dst_out_of_range = false;
4343
bool src_out_of_range = false;
44-
MemoryAddress dst_abs_diff;
45-
MemoryAddress src_abs_diff;
4644
bool tag_error = false;
4745
};
4846

0 commit comments

Comments
 (0)