rollback suggestions

Author: fcarreiro

barretenberg/cpp/src/barretenberg/eccvm/eccvm_flavor.hpp

@@ -8,7 +8,6 @@
 #include "barretenberg/flavor/flavor_macros.hpp"
 #include "barretenberg/flavor/relation_definitions.hpp"
 #include "barretenberg/flavor/repeated_commitments_data.hpp"
-#include "barretenberg/numeric/bitop/division.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/relations/ecc_vm/ecc_bools_relation.hpp"
@@ -715,7 +714,8 @@ class ECCVMFlavor {
         PartiallyEvaluatedMultivariates(const ProverPolynomials& full_polynomials, size_t circuit_size)
         {
             for (auto [poly, full_poly] : zip_view(get_all(), full_polynomials.get_all())) {
-                poly = Polynomial(numeric::div_ceil<size_t>(full_poly.end_index(), 2), circuit_size / 2);
+                size_t desired_size = std::min(full_poly.end_index(), circuit_size / 2);
+                poly = Polynomial(desired_size, circuit_size / 2);
             }
         }
     };

barretenberg/cpp/src/barretenberg/numeric/bitop/division.hpp

@@ -5,7 +5,6 @@
 #include "barretenberg/flavor/flavor_macros.hpp"
 #include "barretenberg/flavor/relation_definitions.hpp"
 #include "barretenberg/flavor/repeated_commitments_data.hpp"
-#include "barretenberg/numeric/bitop/division.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/relations/auxiliary_relation.hpp"
 #include "barretenberg/relations/databus_lookup_relation.hpp"
@@ -635,7 +634,8 @@ class MegaFlavor {
         PartiallyEvaluatedMultivariates(const ProverPolynomials& full_polynomials, size_t circuit_size)
         {
             for (auto [poly, full_poly] : zip_view(get_all(), full_polynomials.get_all())) {
-                poly = Polynomial(numeric::div_ceil<size_t>(full_poly.end_index(), 2), circuit_size / 2);
+                size_t desired_size = std::min(full_poly.end_index(), circuit_size / 2);
+                poly = Polynomial(desired_size, circuit_size / 2);
             }
         }
     };

barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/mega_flavor.hpp

@@ -4,7 +4,6 @@
 #include "barretenberg/flavor/flavor.hpp"
 #include "barretenberg/flavor/flavor_macros.hpp"
 #include "barretenberg/flavor/repeated_commitments_data.hpp"
-#include "barretenberg/numeric/bitop/division.hpp"
 #include "barretenberg/plonk_honk_shared/library/grand_product_delta.hpp"
 #include "barretenberg/plonk_honk_shared/library/grand_product_library.hpp"
 #include "barretenberg/polynomials/barycentric.hpp"
@@ -509,7 +508,8 @@ class UltraFlavor {
         {
             PROFILE_THIS_NAME("PartiallyEvaluatedMultivariates constructor");
             for (auto [poly, full_poly] : zip_view(get_all(), full_polynomials.get_all())) {
-                poly = Polynomial(numeric::div_ceil<size_t>(full_poly.end_index(), 2), circuit_size / 2);
+                size_t desired_size = std::min(full_poly.end_index(), circuit_size / 2);
+                poly = Polynomial(desired_size, circuit_size / 2);
             }
         }
     };

barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/ultra_flavor.hpp

@@ -69,7 +69,7 @@ TYPED_TEST(PartialEvaluationTests, TwoRoundsSpecial)
     FF expected_hi = v01 * (FF(1) - round_challenge_0) + v11 * round_challenge_0;
 
     sumcheck.partially_evaluated_polynomials = typename Flavor::PartiallyEvaluatedMultivariates(multivariate_n);
-    sumcheck.partially_evaluate(full_polynomials, 0, round_challenge_0);
+    sumcheck.partially_evaluate(full_polynomials, multivariate_n, round_challenge_0);
 
     auto& first_polynomial = sumcheck.partially_evaluated_polynomials.get_all()[0];
     EXPECT_EQ(first_polynomial[0], round_challenge_0);
@@ -78,7 +78,7 @@ TYPED_TEST(PartialEvaluationTests, TwoRoundsSpecial)
     FF round_challenge_1 = 2;
     FF expected_val = expected_lo * (FF(1) - round_challenge_1) + expected_hi * round_challenge_1;
 
-    sumcheck.partially_evaluate(sumcheck.partially_evaluated_polynomials, 1, round_challenge_1);
+    sumcheck.partially_evaluate(sumcheck.partially_evaluated_polynomials, multivariate_n >> 1, round_challenge_1);
     EXPECT_EQ(first_polynomial[0], expected_val);
 }
 
@@ -109,15 +109,15 @@ TYPED_TEST(PartialEvaluationTests, TwoRoundsGeneric)
     FF expected_hi = v01 * (FF(1) - round_challenge_0) + v11 * round_challenge_0;
 
     sumcheck.partially_evaluated_polynomials = typename Flavor::PartiallyEvaluatedMultivariates(multivariate_n);
-    sumcheck.partially_evaluate(full_polynomials, 0, round_challenge_0);
+    sumcheck.partially_evaluate(full_polynomials, multivariate_n, round_challenge_0);
     auto& first_polynomial = sumcheck.partially_evaluated_polynomials.get_all()[0];
 
     EXPECT_EQ(first_polynomial[0], expected_lo);
     EXPECT_EQ(first_polynomial[1], expected_hi);
 
     FF round_challenge_1 = FF::random_element();
     FF expected_val = expected_lo * (FF(1) - round_challenge_1) + expected_hi * round_challenge_1;
-    sumcheck.partially_evaluate(sumcheck.partially_evaluated_polynomials, 1, round_challenge_1);
+    sumcheck.partially_evaluate(sumcheck.partially_evaluated_polynomials, multivariate_n >> 1, round_challenge_1);
     EXPECT_EQ(first_polynomial[0], expected_val);
 }
 
@@ -176,7 +176,7 @@ TYPED_TEST(PartialEvaluationTests, ThreeRoundsSpecial)
     FF expected_q4 = v011 * (FF(1) - round_challenge_0) + v111 * round_challenge_0; // 8
 
     sumcheck.partially_evaluated_polynomials = typename Flavor::PartiallyEvaluatedMultivariates(multivariate_n);
-    sumcheck.partially_evaluate(full_polynomials, 0, round_challenge_0);
+    sumcheck.partially_evaluate(full_polynomials, multivariate_n, round_challenge_0);
 
     auto& first_polynomial = sumcheck.partially_evaluated_polynomials.get_all()[0];
     EXPECT_EQ(first_polynomial[0], expected_q1);
@@ -188,13 +188,13 @@ TYPED_TEST(PartialEvaluationTests, ThreeRoundsSpecial)
     FF expected_lo = expected_q1 * (FF(1) - round_challenge_1) + expected_q2 * round_challenge_1; // 6
     FF expected_hi = expected_q3 * (FF(1) - round_challenge_1) + expected_q4 * round_challenge_1; // 10
 
-    sumcheck.partially_evaluate(sumcheck.partially_evaluated_polynomials, 0, round_challenge_1);
+    sumcheck.partially_evaluate(sumcheck.partially_evaluated_polynomials, multivariate_n >> 1, round_challenge_1);
     EXPECT_EQ(first_polynomial[0], expected_lo);
     EXPECT_EQ(first_polynomial[1], expected_hi);
 
     FF round_challenge_2 = 3;
     FF expected_val = expected_lo * (FF(1) - round_challenge_2) + expected_hi * round_challenge_2; // 18
-    sumcheck.partially_evaluate(sumcheck.partially_evaluated_polynomials, 1, round_challenge_2);
+    sumcheck.partially_evaluate(sumcheck.partially_evaluated_polynomials, multivariate_n >> 2, round_challenge_2);
     EXPECT_EQ(first_polynomial[0], expected_val);
 }
 
@@ -232,7 +232,7 @@ TYPED_TEST(PartialEvaluationTests, ThreeRoundsGeneric)
 
     sumcheck.partially_evaluated_polynomials = typename Flavor::PartiallyEvaluatedMultivariates(multivariate_n);
     auto& first_polynomial = sumcheck.partially_evaluated_polynomials.get_all()[0];
-    sumcheck.partially_evaluate(full_polynomials, 0, round_challenge_0);
+    sumcheck.partially_evaluate(full_polynomials, multivariate_n, round_challenge_0);
 
     EXPECT_EQ(first_polynomial[0], expected_q1);
     EXPECT_EQ(first_polynomial[1], expected_q2);
@@ -243,13 +243,13 @@ TYPED_TEST(PartialEvaluationTests, ThreeRoundsGeneric)
     FF expected_lo = expected_q1 * (FF(1) - round_challenge_1) + expected_q2 * round_challenge_1;
     FF expected_hi = expected_q3 * (FF(1) - round_challenge_1) + expected_q4 * round_challenge_1;
 
-    sumcheck.partially_evaluate(sumcheck.partially_evaluated_polynomials, 0, round_challenge_1);
+    sumcheck.partially_evaluate(sumcheck.partially_evaluated_polynomials, multivariate_n >> 1, round_challenge_1);
     EXPECT_EQ(first_polynomial[0], expected_lo);
     EXPECT_EQ(first_polynomial[1], expected_hi);
 
     FF round_challenge_2 = FF::random_element();
     FF expected_val = expected_lo * (FF(1) - round_challenge_2) + expected_hi * round_challenge_2;
-    sumcheck.partially_evaluate(sumcheck.partially_evaluated_polynomials, 1, round_challenge_2);
+    sumcheck.partially_evaluate(sumcheck.partially_evaluated_polynomials, multivariate_n >> 2, round_challenge_2);
     EXPECT_EQ(first_polynomial[0], expected_val);
 }
 
@@ -303,7 +303,7 @@ TYPED_TEST(PartialEvaluationTests, ThreeRoundsGenericMultiplePolys)
     }
 
     sumcheck.partially_evaluated_polynomials = typename Flavor::PartiallyEvaluatedMultivariates(multivariate_n);
-    sumcheck.partially_evaluate(full_polynomials, 0, round_challenge_0);
+    sumcheck.partially_evaluate(full_polynomials, multivariate_n, round_challenge_0);
     auto polynomial_get_all = sumcheck.partially_evaluated_polynomials.get_all();
     for (size_t i = 0; i < 3; i++) {
         EXPECT_EQ((polynomial_get_all[i])[0], expected_q1[i]);
@@ -319,7 +319,7 @@ TYPED_TEST(PartialEvaluationTests, ThreeRoundsGenericMultiplePolys)
         expected_lo[i] = expected_q1[i] * (FF(1) - round_challenge_1) + expected_q2[i] * round_challenge_1;
         expected_hi[i] = expected_q3[i] * (FF(1) - round_challenge_1) + expected_q4[i] * round_challenge_1;
     }
-    sumcheck.partially_evaluate(sumcheck.partially_evaluated_polynomials, 0, round_challenge_1);
+    sumcheck.partially_evaluate(sumcheck.partially_evaluated_polynomials, multivariate_n >> 1, round_challenge_1);
     for (size_t i = 0; i < 3; i++) {
         EXPECT_EQ((polynomial_get_all[i])[0], expected_lo[i]);
         EXPECT_EQ((polynomial_get_all[i])[1], expected_hi[i]);
@@ -329,7 +329,7 @@ TYPED_TEST(PartialEvaluationTests, ThreeRoundsGenericMultiplePolys)
     for (size_t i = 0; i < 3; i++) {
         expected_val[i] = expected_lo[i] * (FF(1) - round_challenge_2) + expected_hi[i] * round_challenge_2;
     }
-    sumcheck.partially_evaluate(sumcheck.partially_evaluated_polynomials, 1, round_challenge_2);
+    sumcheck.partially_evaluate(sumcheck.partially_evaluated_polynomials, multivariate_n >> 2, round_challenge_2);
     for (size_t i = 0; i < 3; i++) {
         EXPECT_EQ((polynomial_get_all[i])[0], expected_val[i]);
     }

barretenberg/cpp/src/barretenberg/sumcheck/partial_evaluation.test.cpp

@@ -1,5 +1,4 @@
 #pragma once
-#include "barretenberg/numeric/bitop/division.hpp"
 #include "barretenberg/plonk_honk_shared/library/grand_product_delta.hpp"
 #include "barretenberg/polynomials/polynomial_arithmetic.hpp"
 #include "barretenberg/sumcheck/sumcheck_output.hpp"
@@ -209,7 +208,7 @@ template <typename Flavor> class SumcheckProver {
             FF round_challenge = transcript->template get_challenge<FF>("Sumcheck:u_0");
             multivariate_challenge.emplace_back(round_challenge);
             // Prepare sumcheck book-keeping table for the next round
-            partially_evaluate(full_polynomials, 0, round_challenge);
+            partially_evaluate(full_polynomials, multivariate_n, round_challenge);
             gate_separators.partially_evaluate(round_challenge);
             round.round_size = round.round_size >> 1; // TODO(#224)(Cody): Maybe partially_evaluate should do this and
             // release memory?        // All but final round
@@ -226,8 +225,7 @@ template <typename Flavor> class SumcheckProver {
             FF round_challenge = transcript->template get_challenge<FF>("Sumcheck:u_" + std::to_string(round_idx));
             multivariate_challenge.emplace_back(round_challenge);
             // Prepare sumcheck book-keeping table for the next round.
-            // We use "round_idx - 1" because the partially_evaluated_polynomials are already halved once.
-            partially_evaluate(partially_evaluated_polynomials, round_idx - 1, round_challenge);
+            partially_evaluate(partially_evaluated_polynomials, multivariate_n >> round_idx, round_challenge);
             gate_separators.partially_evaluate(round_challenge);
             round.round_size = round.round_size >> 1;
         }
@@ -321,7 +319,7 @@ template <typename Flavor> class SumcheckProver {
 
             multivariate_challenge.emplace_back(round_challenge);
             // Prepare sumcheck book-keeping table for the next round
-            partially_evaluate(full_polynomials, 0, round_challenge);
+            partially_evaluate(full_polynomials, multivariate_n, round_challenge);
             // Prepare ZK Sumcheck data for the next round
             zk_sumcheck_data.update_zk_sumcheck_data(round_challenge, round_idx);
             row_disabling_polynomial.update_evaluations(round_challenge, round_idx);
@@ -356,8 +354,7 @@ template <typename Flavor> class SumcheckProver {
                 transcript->template get_challenge<FF>("Sumcheck:u_" + std::to_string(round_idx));
             multivariate_challenge.emplace_back(round_challenge);
             // Prepare sumcheck book-keeping table for the next round.
-            // We use "round_idx - 1" because the partially_evaluated_polynomials are already halved once.
-            partially_evaluate(partially_evaluated_polynomials, round_idx - 1, round_challenge);
+            partially_evaluate(partially_evaluated_polynomials, multivariate_n >> round_idx, round_challenge);
             // Prepare evaluation masking and libra structures for the next round (for ZK Flavors)
             zk_sumcheck_data.update_zk_sumcheck_data(round_challenge, round_idx);
             row_disabling_polynomial.update_evaluations(round_challenge, round_idx);
@@ -447,19 +444,20 @@ template <typename Flavor> class SumcheckProver {
      * After the final update, i.e. when \f$ i = d-1 \f$, the upper row of the table contains the evaluations of Honk
      * polynomials at the challenge point \f$ (u_0,\ldots, u_{d-1}) \f$.
      * @param polynomials Honk polynomials at initialization; partially evaluated polynomials in subsequent rounds
-     * @param halvings \f$i\f$
+     * @param round_size \f$2^{d-i}\f$
      * @param round_challenge \f$u_i\f$
      */
-    void partially_evaluate(auto& polynomials, size_t halvings, FF round_challenge)
+    void partially_evaluate(auto& polynomials, size_t round_size, FF round_challenge)
     {
         auto pep_view = partially_evaluated_polynomials.get_all();
         auto poly_view = polynomials.get_all();
         // after the first round, operate in place on partially_evaluated_polynomials
         parallel_for(poly_view.size(), [&](size_t j) {
             const auto& poly = poly_view[j];
-            size_t actual_end_index = numeric::div_ceil<size_t>(poly.end_index(), 1 << halvings);
-            for (size_t i = 0; i < actual_end_index; i += 2) {
-                pep_view[j].set_if_valid_index(i >> 1, poly[i] + round_challenge * (poly[i + 1] - poly[i]));
+            // If the polynomial is shorter than the round size, we do a little optimization.
+            size_t limit = std::min(poly.end_index(), round_size);
+            for (size_t i = 0; i < limit; i += 2) {
+                pep_view[j].at(i >> 1) = poly[i] + round_challenge * (poly[i + 1] - poly[i]);
             }
         });
     };
@@ -468,15 +466,16 @@ template <typename Flavor> class SumcheckProver {
      * Specialization for array, see \ref bb::SumcheckProver<Flavor>::partially_evaluate "generic version".
      */
     template <typename PolynomialT, std::size_t N>
-    void partially_evaluate(std::array<PolynomialT, N>& polynomials, size_t halvings, FF round_challenge)
+    void partially_evaluate(std::array<PolynomialT, N>& polynomials, size_t round_size, FF round_challenge)
     {
         auto pep_view = partially_evaluated_polynomials.get_all();
         // after the first round, operate in place on partially_evaluated_polynomials
         parallel_for(polynomials.size(), [&](size_t j) {
             const auto& poly = polynomials[j];
-            size_t actual_end_index = numeric::div_ceil<size_t>(poly.end_index(), 1 << halvings);
-            for (size_t i = 0; i < actual_end_index; i += 2) {
-                pep_view[j].set_if_valid_index(i >> 1, poly[i] + round_challenge * (poly[i + 1] - poly[i]));
+            // If the polynomial is shorter than the round size, we do a little optimization.
+            size_t limit = std::min(poly.end_index(), round_size);
+            for (size_t i = 0; i < limit; i += 2) {
+                pep_view[j].at(i >> 1) = poly[i] + round_challenge * (poly[i + 1] - poly[i]);
             }
         });
     };

barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.hpp

@@ -1,4 +1,5 @@
 #pragma once
+
 #include "barretenberg/commitment_schemes/commitment_key.hpp"
 #include "barretenberg/commitment_schemes/kzg/kzg.hpp"
 #include "barretenberg/common/ref_vector.hpp"
@@ -7,7 +8,6 @@
 #include "barretenberg/flavor/flavor_macros.hpp"
 #include "barretenberg/flavor/relation_definitions.hpp"
 #include "barretenberg/flavor/repeated_commitments_data.hpp"
-#include "barretenberg/numeric/bitop/division.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/relations/relation_parameters.hpp"
@@ -744,7 +744,8 @@ class TranslatorFlavor {
         PartiallyEvaluatedMultivariates(const ProverPolynomials& full_polynomials, size_t circuit_size)
         {
             for (auto [poly, full_poly] : zip_view(get_all(), full_polynomials.get_all())) {
-                poly = Polynomial(numeric::div_ceil<size_t>(full_poly.end_index(), 2), circuit_size / 2);
+                size_t desired_size = std::min(full_poly.end_index(), circuit_size / 2);
+                poly = Polynomial(desired_size, circuit_size / 2);
             }
         }
     };

barretenberg/cpp/src/barretenberg/translator_vm/translator_flavor.hpp

@@ -4,7 +4,6 @@
 #include "barretenberg/commitment_schemes/kzg/kzg.hpp"
 #include "barretenberg/ecc/curves/bn254/g1.hpp"
 #include "barretenberg/flavor/relation_definitions.hpp"
-#include "barretenberg/numeric/bitop/division.hpp"
 #include "barretenberg/polynomials/barycentric.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
 
@@ -406,7 +405,8 @@ class AvmFlavor {
         PartiallyEvaluatedMultivariates(const ProverPolynomials& full_polynomials, size_t circuit_size)
         {
             for (auto [poly, full_poly] : zip_view(get_all(), full_polynomials.get_all())) {
-                poly = Polynomial(numeric::div_ceil<size_t>(full_poly.end_index(), 2), circuit_size / 2);
+                size_t desired_size = std::min(full_poly.end_index(), circuit_size / 2);
+                poly = Polynomial(desired_size, circuit_size / 2);
             }
         }
     };

barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.hpp

@@ -1,6 +1,5 @@
 // AUTOGENERATED FILE
 #include "flavor.hpp"
-#include "barretenberg/numeric/bitop/division.hpp"
 
 namespace bb::avm2 {
 
@@ -90,7 +89,8 @@ AvmFlavor::PartiallyEvaluatedMultivariates::PartiallyEvaluatedMultivariates(cons
                                                                             size_t circuit_size)
 {
     for (auto [poly, full_poly] : zip_view(get_all(), full_polynomials.get_all())) {
-        poly = Polynomial(numeric::div_ceil<size_t>(full_poly.end_index(), 2), circuit_size / 2);
+        size_t desired_size = std::min(full_poly.end_index(), circuit_size / 2);
+        poly = Polynomial(desired_size, circuit_size / 2);
     }
 }
 

barretenberg/cpp/src/barretenberg/vm2/generated/flavor.cpp

@@ -1,6 +1,5 @@
 // AUTOGENERATED FILE
 #include "flavor.hpp"
-#include "barretenberg/numeric/bitop/division.hpp"
 
 namespace bb::{{snakeCase name}} {
 
@@ -89,7 +88,8 @@ AvmFlavor::PartiallyEvaluatedMultivariates::PartiallyEvaluatedMultivariates(cons
                                                                             size_t circuit_size)
 {
     for (auto [poly, full_poly] : zip_view(get_all(), full_polynomials.get_all())) {
-        poly = Polynomial(numeric::div_ceil<size_t>(full_poly.end_index(), 2), circuit_size / 2);
+        size_t desired_size = std::min(full_poly.end_index(), circuit_size / 2);
+        poly = Polynomial(desired_size, circuit_size / 2);
     }
 }