5557: rebase on master fixing conflicts

AztecProtocol · Apr 11, 2024 · 806cea4 · 806cea4
1 parent 7e401cd
commit 806cea4
Show file tree

Hide file tree

Showing 7 changed files with 167 additions and 307 deletions.
diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/avm/avm_alu.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/avm/avm_alu.hpp
@@ -271,18 +271,10 @@ template <typename FF_> class avm_aluImpl {
         {
             Avm_DECLARE_VIEWS(9);
 
-            auto tmp =
-                (((avm_alu_op_add + avm_alu_op_sub) *
-                  ((((((((((avm_alu_u8_r0 + (avm_alu_u8_r1 * FF(256))) + (avm_alu_u16_r0 * FF(65536))) +
-                          (avm_alu_u16_r1 * FF(4294967296UL))) +
-                         (avm_alu_u16_r2 * FF(281474976710656UL))) +
-                        (avm_alu_u16_r3 * FF(uint256_t{ 0, 1, 0, 0 }))) +
-                       (avm_alu_u16_r4 * FF(uint256_t{ 0, 65536, 0, 0 }))) +
-                      (avm_alu_u16_r5 * FF(uint256_t{ 0, 4294967296, 0, 0 }))) +
-                     (avm_alu_u16_r6 * FF(uint256_t{ 0, 281474976710656, 0, 0 }))) -
-                    avm_alu_ia) +
-                   (avm_alu_ff_tag * avm_alu_ic))) +
-                 ((avm_alu_op_add - avm_alu_op_sub) * ((avm_alu_cf * FF(uint256_t{ 0, 0, 1, 0 })) - avm_alu_ib)));
+            auto tmp = (avm_alu_in_tag - (((((avm_alu_u8_tag + (avm_alu_u16_tag * FF(2))) + (avm_alu_u32_tag * FF(3))) +
+                                            (avm_alu_u64_tag * FF(4))) +
+                                           (avm_alu_u128_tag * FF(5))) +
+                                          (avm_alu_ff_tag * FF(6))));
             tmp *= scaling_factor;
             std::get<9>(evals) += tmp;
         }
@@ -336,15 +328,7 @@ template <typename FF_> class avm_aluImpl {
         {
             Avm_DECLARE_VIEWS(12);
 
-            auto tmp = ((((-avm_alu_ff_tag + FF(1)) - avm_alu_u128_tag) * avm_alu_op_mul) *
-                        (((((((((avm_alu_u8_r0 + (avm_alu_u8_r1 * FF(256))) + (avm_alu_u16_r0 * FF(65536))) +
-                               (avm_alu_u16_r1 * FF(4294967296UL))) +
-                              (avm_alu_u16_r2 * FF(281474976710656UL))) +
-                             (avm_alu_u16_r3 * FF(uint256_t{ 0, 1, 0, 0 }))) +
-                            (avm_alu_u16_r4 * FF(uint256_t{ 0, 65536, 0, 0 }))) +
-                           (avm_alu_u16_r5 * FF(uint256_t{ 0, 4294967296, 0, 0 }))) +
-                          (avm_alu_u16_r6 * FF(uint256_t{ 0, 281474976710656, 0, 0 }))) -
-                         (avm_alu_ia * avm_alu_ib)));
+            auto tmp = ((avm_alu_ff_tag * avm_alu_op_mul) * ((avm_alu_ia * avm_alu_ib) - avm_alu_ic));
             tmp *= scaling_factor;
             std::get<12>(evals) += tmp;
         }
@@ -434,12 +418,7 @@ template <typename FF_> class avm_aluImpl {
         {
             Avm_DECLARE_VIEWS(18);
 
-            auto tmp = (avm_alu_op_not *
-                        ((avm_alu_ia + avm_alu_ic) - ((((((avm_alu_u8_tag * FF(256)) + (avm_alu_u16_tag * FF(65536))) +
-                                                         (avm_alu_u32_tag * FF(4294967296UL))) +
-                                                        (avm_alu_u64_tag * FF(uint256_t{ 0, 1, 0, 0 }))) +
-                                                       (avm_alu_u128_tag * FF(uint256_t{ 0, 0, 1, 0 }))) -
-                                                      FF(1))));
+            auto tmp = (avm_alu_op_not * avm_alu_ff_tag);
             tmp *= scaling_factor;
             std::get<18>(evals) += tmp;
         }