Skip to content

feat!: remove ec_double opcode #4210

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
kevaundray merged 1 commit into from
Jan 25, 2024
Merged

feat!: remove ec_double opcode #4210

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
5 changes: 0 additions & 5 deletions barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,6 @@ void build_constraints(Builder& builder, AcirFormat const& constraint_system, bo
create_ec_add_constraint(builder, constraint, has_valid_witness_assignments);
}

// Add ec double
for (const auto& constraint : constraint_system.ec_double_constraints) {
create_ec_double_constraint(builder, constraint, has_valid_witness_assignments);
}

// Add block constraints
for (const auto& constraint : constraint_system.block_constraints) {
create_block_constraints(builder, constraint, has_valid_witness_assignments);
Expand Down
2 changes: 1 addition & 1 deletion barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ struct AcirFormat {
std::vector<PedersenHashConstraint> pedersen_hash_constraints;
std::vector<FixedBaseScalarMul> fixed_base_scalar_mul_constraints;
std::vector<EcAdd> ec_add_constraints;
std::vector<EcDouble> ec_double_constraints;
std::vector<RecursionConstraint> recursion_constraints;
std::vector<BigIntFromLeBytes> bigint_from_le_bytes_constraints;
std::vector<BigIntOperation> bigint_operations;
Expand Down Expand Up @@ -70,6 +69,7 @@ struct AcirFormat {
pedersen_constraints,
pedersen_hash_constraints,
fixed_base_scalar_mul_constraints,
ec_add_constraints,
recursion_constraints,
constraints,
block_constraints,
Expand Down
6 changes: 0 additions & 6 deletions barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ TEST_F(AcirFormatTests, TestASingleConstraintNoPubInputs)
.pedersen_hash_constraints = {},
.fixed_base_scalar_mul_constraints = {},
.ec_add_constraints = {},
.ec_double_constraints = {},
.recursion_constraints = {},
.bigint_from_le_bytes_constraints = {},
.bigint_operations = {},
Expand Down Expand Up @@ -158,7 +157,6 @@ TEST_F(AcirFormatTests, TestLogicGateFromNoirCircuit)
.pedersen_hash_constraints = {},
.fixed_base_scalar_mul_constraints = {},
.ec_add_constraints = {},
.ec_double_constraints = {},
.recursion_constraints = {},
.bigint_from_le_bytes_constraints = {},
.bigint_operations = {},
Expand Down Expand Up @@ -223,7 +221,6 @@ TEST_F(AcirFormatTests, TestSchnorrVerifyPass)
.pedersen_hash_constraints = {},
.fixed_base_scalar_mul_constraints = {},
.ec_add_constraints = {},
.ec_double_constraints = {},
.recursion_constraints = {},
.bigint_from_le_bytes_constraints = {},
.bigint_operations = {},
Expand Down Expand Up @@ -316,7 +313,6 @@ TEST_F(AcirFormatTests, TestSchnorrVerifySmallRange)
.pedersen_hash_constraints = {},
.fixed_base_scalar_mul_constraints = {},
.ec_add_constraints = {},
.ec_double_constraints = {},
.recursion_constraints = {},
.bigint_from_le_bytes_constraints = {},
.bigint_operations = {},
Expand Down Expand Up @@ -428,7 +424,6 @@ TEST_F(AcirFormatTests, TestVarKeccak)
.pedersen_hash_constraints = {},
.fixed_base_scalar_mul_constraints = {},
.ec_add_constraints = {},
.ec_double_constraints = {},
.recursion_constraints = {},
.bigint_from_le_bytes_constraints = {},
.bigint_operations = {},
Expand Down Expand Up @@ -472,7 +467,6 @@ TEST_F(AcirFormatTests, TestKeccakPermutation)
.pedersen_hash_constraints = {},
.fixed_base_scalar_mul_constraints = {},
.ec_add_constraints = {},
.ec_double_constraints = {},
.recursion_constraints = {},
.bigint_from_le_bytes_constraints = {},
.bigint_operations = {},
Expand Down
7 changes: 0 additions & 7 deletions barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,13 +214,6 @@ void handle_blackbox_func_call(Circuit::Opcode::BlackBoxFuncCall const& arg, Aci
.result_x = arg.outputs[0].value,
.result_y = arg.outputs[1].value,
});
} else if constexpr (std::is_same_v<T, Circuit::BlackBoxFuncCall::EmbeddedCurveDouble>) {
af.ec_double_constraints.push_back(EcDouble{
.input_x = arg.input_x.witness.value,
.input_y = arg.input_y.witness.value,
.result_x = arg.outputs[0].value,
.result_y = arg.outputs[1].value,
});
} else if constexpr (std::is_same_v<T, Circuit::BlackBoxFuncCall::Keccak256>) {
af.keccak_constraints.push_back(KeccakConstraint{
.inputs = map(arg.inputs,
Expand Down
1 change: 0 additions & 1 deletion barretenberg/cpp/src/barretenberg/dsl/acir_format/bigint_constraint.test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ TEST_F(BigIntTests, TestBigIntConstraintDummy)
.pedersen_hash_constraints = {},
.fixed_base_scalar_mul_constraints = {},
.ec_add_constraints = {},
.ec_double_constraints = {},
.recursion_constraints = {},
.bigint_from_le_bytes_constraints = { from_le_bytes_constraint },
.bigint_operations = { add_constraint, neg_constraint, mul_constraint, div_constraint },
Expand Down
1 change: 0 additions & 1 deletion barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ TEST_F(UltraPlonkRAM, TestBlockConstraint)
.pedersen_hash_constraints = {},
.fixed_base_scalar_mul_constraints = {},
.ec_add_constraints = {},
.ec_double_constraints = {},
.recursion_constraints = {},
.bigint_from_le_bytes_constraints = {},
.bigint_operations = {},
Expand Down
33 changes: 0 additions & 33 deletions barretenberg/cpp/src/barretenberg/dsl/acir_format/ec_operations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,37 +46,4 @@ template void create_ec_add_constraint<GoblinUltraCircuitBuilder>(GoblinUltraCir
const EcAdd& input,
bool has_valid_witness_assignments);

template <typename Builder>
void create_ec_double_constraint(Builder& builder, const EcDouble& input, bool has_valid_witness_assignments)
{
using cycle_group_ct = bb::stdlib::cycle_group<Builder>;
using field_ct = bb::stdlib::field_t<Builder>;
// Input to cycle_group point
auto x = field_ct::from_witness_index(&builder, input.input_x);
auto y = field_ct::from_witness_index(&builder, input.input_y);

if (!has_valid_witness_assignments) {
auto g1 = grumpkin::g1::affine_one;
// We need to have correct values representing point on the curve
builder.variables[input.input_x] = g1.x;
builder.variables[input.input_y] = g1.y;
}
cycle_group_ct input_point(x, y, false);

// Doubling
cycle_group_ct result = input_point.dbl();

auto x_normalized = result.x.normalize();
auto y_normalized = result.y.normalize();
builder.assert_equal(x_normalized.witness_index, input.result_x);
builder.assert_equal(y_normalized.witness_index, input.result_y);
}

template void create_ec_double_constraint<UltraCircuitBuilder>(UltraCircuitBuilder& builder,
const EcDouble& input,
bool has_valid_witness_assignments);
template void create_ec_double_constraint<GoblinUltraCircuitBuilder>(GoblinUltraCircuitBuilder& builder,
const EcDouble& input,
bool has_valid_witness_assignments);

} // namespace acir_format
14 changes: 0 additions & 14 deletions barretenberg/cpp/src/barretenberg/dsl/acir_format/ec_operations.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,4 @@ struct EcAdd {

template <typename Builder>
void create_ec_add_constraint(Builder& builder, const EcAdd& input, bool has_valid_witness_assignments);

struct EcDouble {
uint32_t input_x;
uint32_t input_y;
uint32_t result_x;
uint32_t result_y;

// for serialization, update with any new fields
MSGPACK_FIELDS(input_x, input_y, result_x, result_y);
friend bool operator==(EcDouble const& lhs, EcDouble const& rhs) = default;
};

template <typename Builder>
void create_ec_double_constraint(Builder& builder, const EcDouble& input, bool has_valid_witness_assignments);
} // namespace acir_format
51 changes: 2 additions & 49 deletions barretenberg/cpp/src/barretenberg/dsl/acir_format/ec_operations.test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,58 +40,12 @@ size_t generate_ec_add_constraint(EcAdd& ec_add_constraint, WitnessVector& witne
return witness_values.size();
}

size_t generate_ec_double_constraint(EcDouble& ec_double_constraint, WitnessVector& witness_values)
{

using cycle_group_ct = bb::stdlib::cycle_group<Builder>;
auto g1 = grumpkin::g1::affine_one;
cycle_group_ct input_point(g1);
// Doubling
cycle_group_ct result = input_point.dbl();
// add: x,y,x2,y2
uint32_t result_x_witness_index = static_cast<uint32_t>(witness_values.size());

witness_values.push_back(result.x.get_value());
uint32_t result_y_witness_index = static_cast<uint32_t>(witness_values.size());
witness_values.push_back(result.y.get_value());
ec_double_constraint = EcDouble{
.input_x = 1,
.input_y = 2,
.result_x = result_x_witness_index,
.result_y = result_y_witness_index,
};
return witness_values.size();
}

TEST_F(EcOperations, TestECOperations)
{
EcAdd ec_add_constraint;
EcDouble ec_double_constraint;

WitnessVector witness_values;
generate_ec_add_constraint(ec_add_constraint, witness_values);
size_t num_variables = generate_ec_double_constraint(ec_double_constraint, witness_values);

poly_triple constrain_5_is_7{
.a = 5,
.b = 7,
.c = 0,
.q_m = 0,
.q_l = 1,
.q_r = -1,
.q_o = 0,
.q_c = 0,
};
poly_triple constrain_6_is_8{
.a = 6,
.b = 8,
.c = 0,
.q_m = 0,
.q_l = 1,
.q_r = -1,
.q_o = 0,
.q_c = 0,
};
size_t num_variables = generate_ec_add_constraint(ec_add_constraint, witness_values);

AcirFormat constraint_system{
.varnum = static_cast<uint32_t>(num_variables + 1),
Expand All @@ -111,11 +65,10 @@ TEST_F(EcOperations, TestECOperations)
.pedersen_hash_constraints = {},
.fixed_base_scalar_mul_constraints = {},
.ec_add_constraints = { ec_add_constraint },
.ec_double_constraints = { ec_double_constraint },
.recursion_constraints = {},
.bigint_from_le_bytes_constraints = {},
.bigint_operations = {},
.constraints = { constrain_5_is_7, constrain_6_is_8 },
.constraints = {},
.block_constraints = {},
};

Expand Down
3 changes: 0 additions & 3 deletions barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ TEST_F(ECDSASecp256k1, TestECDSAConstraintSucceed)
.pedersen_hash_constraints = {},
.fixed_base_scalar_mul_constraints = {},
.ec_add_constraints = {},
.ec_double_constraints = {},
.recursion_constraints = {},
.bigint_from_le_bytes_constraints = {},
.bigint_operations = {},
Expand Down Expand Up @@ -151,7 +150,6 @@ TEST_F(ECDSASecp256k1, TestECDSACompilesForVerifier)
.pedersen_hash_constraints = {},
.fixed_base_scalar_mul_constraints = {},
.ec_add_constraints = {},
.ec_double_constraints = {},
.recursion_constraints = {},
.bigint_from_le_bytes_constraints = {},
.bigint_operations = {},
Expand Down Expand Up @@ -192,7 +190,6 @@ TEST_F(ECDSASecp256k1, TestECDSAConstraintFail)
.pedersen_hash_constraints = {},
.fixed_base_scalar_mul_constraints = {},
.ec_add_constraints = {},
.ec_double_constraints = {},
.recursion_constraints = {},
.bigint_from_le_bytes_constraints = {},
.bigint_operations = {},
Expand Down
4 changes: 0 additions & 4 deletions barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ TEST(ECDSASecp256r1, test_hardcoded)
.pedersen_hash_constraints = {},
.fixed_base_scalar_mul_constraints = {},
.ec_add_constraints = {},
.ec_double_constraints = {},
.recursion_constraints = {},
.bigint_from_le_bytes_constraints = {},
.bigint_operations = {},
Expand Down Expand Up @@ -187,7 +186,6 @@ TEST(ECDSASecp256r1, TestECDSAConstraintSucceed)
.pedersen_hash_constraints = {},
.fixed_base_scalar_mul_constraints = {},
.ec_add_constraints = {},
.ec_double_constraints = {},
.recursion_constraints = {},
.bigint_from_le_bytes_constraints = {},
.bigint_operations = {},
Expand Down Expand Up @@ -232,7 +230,6 @@ TEST(ECDSASecp256r1, TestECDSACompilesForVerifier)
.pedersen_hash_constraints = {},
.fixed_base_scalar_mul_constraints = {},
.ec_add_constraints = {},
.ec_double_constraints = {},
.recursion_constraints = {},
.bigint_from_le_bytes_constraints = {},
.bigint_operations = {},
Expand Down Expand Up @@ -272,7 +269,6 @@ TEST(ECDSASecp256r1, TestECDSAConstraintFail)
.pedersen_hash_constraints = {},
.fixed_base_scalar_mul_constraints = {},
.ec_add_constraints = {},
.ec_double_constraints = {},
.recursion_constraints = {},
.bigint_from_le_bytes_constraints = {},
.bigint_operations = {},
Expand Down
2 changes: 0 additions & 2 deletions barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ Builder create_inner_circuit()
.pedersen_hash_constraints = {},
.fixed_base_scalar_mul_constraints = {},
.ec_add_constraints = {},
.ec_double_constraints = {},
.recursion_constraints = {},
.bigint_from_le_bytes_constraints = {},
.bigint_operations = {},
Expand Down Expand Up @@ -252,7 +251,6 @@ Builder create_outer_circuit(std::vector<Builder>& inner_circuits)
.pedersen_hash_constraints = {},
.fixed_base_scalar_mul_constraints = {},
.ec_add_constraints = {},
.ec_double_constraints = {},
.recursion_constraints = recursion_constraints,
.bigint_from_le_bytes_constraints = {},
.bigint_operations = {},
Expand Down
Loading