Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
@codygunton
codygunton committed Mar 31, 2024
1 parent 03335b3 commit 9dada06
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 20 deletions.
2 changes: 1 addition & 1 deletion barretenberg/cpp/src/barretenberg/benchmark/goblin_bench/eccvm.bench.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ using namespace benchmark;
using namespace bb;

using Flavor = ECCVMFlavor;
using Builder = ECCVMCircuitBuilder<Flavor>;
using Builder = ECCVMCircuitBuilder;
using Composer = ECCVMComposer;

namespace {
Expand Down
2 changes: 1 addition & 1 deletion barretenberg/cpp/src/barretenberg/eccvm/eccvm_circuit_builder.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

namespace bb {

template <typename Flavor> class ECCVMCircuitBuilder {
class ECCVMCircuitBuilder {
public:
using CycleGroup = typename Flavor::CycleGroup;
using FF = typename Flavor::FF;
Expand Down
26 changes: 13 additions & 13 deletions barretenberg/cpp/src/barretenberg/eccvm/eccvm_circuit_builder.test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ TYPED_TEST(ECCVMCircuitBuilderTests, BaseCase)
op_queue->mul_accumulate(b, x);
op_queue->mul_accumulate(c, x);

ECCVMCircuitBuilder<Flavor> circuit{ op_queue };
ECCVMCircuitBuilder circuit{ op_queue };
bool result = circuit.check_circuit();
EXPECT_EQ(result, true);
}
Expand All @@ -60,7 +60,7 @@ TYPED_TEST(ECCVMCircuitBuilderTests, Add)

op_queue->add_accumulate(a);

ECCVMCircuitBuilder<Flavor> circuit{ op_queue };
ECCVMCircuitBuilder circuit{ op_queue };
bool result = circuit.check_circuit();
EXPECT_EQ(result, true);
}
Expand All @@ -78,7 +78,7 @@ TYPED_TEST(ECCVMCircuitBuilderTests, Mul)

op_queue->mul_accumulate(a, x);

ECCVMCircuitBuilder<Flavor> circuit{ op_queue };
ECCVMCircuitBuilder circuit{ op_queue };
bool result = circuit.check_circuit();
EXPECT_EQ(result, true);
}
Expand All @@ -102,7 +102,7 @@ TYPED_TEST(ECCVMCircuitBuilderTests, ShortMul)
op_queue->mul_accumulate(a, x);
op_queue->eq();

ECCVMCircuitBuilder<Flavor> circuit{ op_queue };
ECCVMCircuitBuilder circuit{ op_queue };
bool result = circuit.check_circuit();
EXPECT_EQ(result, true);
}
Expand All @@ -129,7 +129,7 @@ TYPED_TEST(ECCVMCircuitBuilderTests, EqFails)
.z1 = 0,
.z2 = 0,
.mul_scalar_full = 0 });
ECCVMCircuitBuilder<Flavor> circuit{ op_queue };
ECCVMCircuitBuilder circuit{ op_queue };
bool result = circuit.check_circuit();
EXPECT_EQ(result, false);
}
Expand All @@ -141,7 +141,7 @@ TYPED_TEST(ECCVMCircuitBuilderTests, EmptyRow)

op_queue->empty_row();

ECCVMCircuitBuilder<Flavor> circuit{ op_queue };
ECCVMCircuitBuilder circuit{ op_queue };
bool result = circuit.check_circuit();
EXPECT_EQ(result, true);
}
Expand All @@ -161,7 +161,7 @@ TYPED_TEST(ECCVMCircuitBuilderTests, EmptyRowBetweenOps)
op_queue->empty_row();
op_queue->eq();

ECCVMCircuitBuilder<Flavor> circuit{ op_queue };
ECCVMCircuitBuilder circuit{ op_queue };
bool result = circuit.check_circuit();
EXPECT_EQ(result, true);
}
Expand All @@ -180,7 +180,7 @@ TYPED_TEST(ECCVMCircuitBuilderTests, EndWithEq)
op_queue->mul_accumulate(a, x);
op_queue->eq();

ECCVMCircuitBuilder<Flavor> circuit{ op_queue };
ECCVMCircuitBuilder circuit{ op_queue };
bool result = circuit.check_circuit();
EXPECT_EQ(result, true);
}
Expand All @@ -200,7 +200,7 @@ TYPED_TEST(ECCVMCircuitBuilderTests, EndWithAdd)
op_queue->eq();
op_queue->add_accumulate(a);

ECCVMCircuitBuilder<Flavor> circuit{ op_queue };
ECCVMCircuitBuilder circuit{ op_queue };
bool result = circuit.check_circuit();
EXPECT_EQ(result, true);
}
Expand All @@ -220,7 +220,7 @@ TYPED_TEST(ECCVMCircuitBuilderTests, EndWithMul)
op_queue->eq();
op_queue->mul_accumulate(a, x);

ECCVMCircuitBuilder<Flavor> circuit{ op_queue };
ECCVMCircuitBuilder circuit{ op_queue };
bool result = circuit.check_circuit();
EXPECT_EQ(result, true);
}
Expand All @@ -241,7 +241,7 @@ TYPED_TEST(ECCVMCircuitBuilderTests, EndWithNoop)
op_queue->mul_accumulate(a, x);

op_queue->empty_row();
ECCVMCircuitBuilder<Flavor> circuit{ op_queue };
ECCVMCircuitBuilder circuit{ op_queue };
bool result = circuit.check_circuit();
EXPECT_EQ(result, true);
}
Expand Down Expand Up @@ -274,7 +274,7 @@ TYPED_TEST(ECCVMCircuitBuilderTests, MSM)
std::shared_ptr<ECCOpQueue> op_queue = std::make_shared<ECCOpQueue>();

compute_msms(j, op_queue);
ECCVMCircuitBuilder<Flavor> circuit{ op_queue };
ECCVMCircuitBuilder circuit{ op_queue };
bool result = circuit.check_circuit();
EXPECT_EQ(result, true);
}
Expand All @@ -284,7 +284,7 @@ TYPED_TEST(ECCVMCircuitBuilderTests, MSM)
for (size_t j = 1; j < 9; ++j) {
compute_msms(j, op_queue);
}
ECCVMCircuitBuilder<Flavor> circuit{ op_queue };
ECCVMCircuitBuilder circuit{ op_queue };
bool result = circuit.check_circuit();
EXPECT_EQ(result, true);
}
2 changes: 1 addition & 1 deletion barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace bb {
template <IsECCVMFlavor Flavor> class ECCVMComposer_ {
public:
using FF = typename Flavor::FF;
using CircuitConstructor = ECCVMCircuitBuilder<Flavor>;
using CircuitConstructor = ECCVMCircuitBuilder;
using ProvingKey = typename Flavor::ProvingKey;
using VerificationKey = typename Flavor::VerificationKey;
using PCS = typename Flavor::PCS;
Expand Down
4 changes: 2 additions & 2 deletions barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ TYPED_TEST_SUITE(ECCVMComposerTests, FlavorTypes);
namespace {
auto& engine = numeric::get_debug_randomness();
}
template <typename Flavor> ECCVMCircuitBuilder<Flavor> generate_circuit(numeric::RNG* engine = nullptr)
template <typename Flavor> ECCVMCircuitBuilder generate_circuit(numeric::RNG* engine = nullptr)
{
std::shared_ptr<ECCOpQueue> op_queue = std::make_shared<ECCOpQueue>();
using G1 = typename Flavor::CycleGroup;
Expand Down Expand Up @@ -61,7 +61,7 @@ template <typename Flavor> ECCVMCircuitBuilder<Flavor> generate_circuit(numeric:
op_queue->mul_accumulate(a, x);
op_queue->mul_accumulate(b, x);
op_queue->mul_accumulate(c, x);
ECCVMCircuitBuilder<Flavor> builder{ op_queue };
ECCVMCircuitBuilder builder{ op_queue };
return builder;
}

Expand Down
1 change: 1 addition & 0 deletions barretenberg/cpp/src/barretenberg/eccvm/eccvm_flavor.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ namespace bb {

class ECCVMFlavor {
public:
// using CircuitBuilder = ECCVMCircuitBuilder;
using CycleGroup = bb::g1;
using Curve = curve::Grumpkin;
using G1 = typename Curve::Group;
Expand Down
4 changes: 2 additions & 2 deletions barretenberg/cpp/src/barretenberg/eccvm/eccvm_transcript.test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ template <typename Flavor> class ECCVMTranscriptTests : public ::testing::Test {

return manifest_expected;
}
ECCVMCircuitBuilder<Flavor> generate_trace(numeric::RNG* engine = nullptr)
ECCVMCircuitBuilder generate_trace(numeric::RNG* engine = nullptr)
{
std::shared_ptr<ECCOpQueue> op_queue = std::make_shared<ECCOpQueue>();
using G1 = typename Flavor::CycleGroup;
Expand Down Expand Up @@ -231,7 +231,7 @@ template <typename Flavor> class ECCVMTranscriptTests : public ::testing::Test {
op_queue->mul_accumulate(a, x);
op_queue->mul_accumulate(b, x);
op_queue->mul_accumulate(c, x);
ECCVMCircuitBuilder<Flavor> builder{ op_queue };
ECCVMCircuitBuilder builder{ op_queue };
return builder;
}
};
Expand Down

0 comments on commit 9dada06

Please sign in to comment.