Skip to content
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

feat: DataBus PoC (UltraHonk as extension of Ultra) #3181

Merged
merged 19 commits into from
Nov 17, 2023
Merged

feat: DataBus PoC (UltraHonk as extension of Ultra) #3181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
6c11165
builds w UCB inheritance w new arith
ledwards2225 Nov 1, 2023
89d0629
tests passing with databus additions to goblin
ledwards2225 Nov 1, 2023
701a696
cleanup and remove unneeded forward decs
ledwards2225 Nov 1, 2023
3ef4a84
define pad directly in arith to avoid virtual
ledwards2225 Nov 2, 2023
0f509e3
define accum directly in relation for now
ledwards2225 Nov 6, 2023
24cf9cf
databus log deriv relation passing correctness
ledwards2225 Nov 7, 2023
1a7d2b4
fix linker issues after master merge
ledwards2225 Nov 7, 2023
d05d274
use requires instead
ledwards2225 Nov 9, 2023
8c4dafd
Merge branch 'master' into lde/databus
ledwards2225 Nov 10, 2023
77d6d3a
WiP builds with lookup lib function in relation
ledwards2225 Nov 10, 2023
4773666
cleanup
ledwards2225 Nov 11, 2023
99a70c8
ultra honk verifies with databus relation
ledwards2225 Nov 11, 2023
e99e017
Merge branch 'master' into lde/databus
ledwards2225 Nov 11, 2023
5022b7c
updates after merge
ledwards2225 Nov 11, 2023
bc2b4a4
Merge branch 'master' into lde/databus
ledwards2225 Nov 14, 2023
235dfcd
update recursive verifier
ledwards2225 Nov 15, 2023
923cfa9
WiP
ledwards2225 Nov 16, 2023
117dfd5
Merge branch 'master' into lde/databus
ledwards2225 Nov 16, 2023
d5d3a31
cleanup
ledwards2225 Nov 16, 2023
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
87 changes: 54 additions & 33 deletions barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,16 @@
#include "barretenberg/polynomials/univariate.hpp"
#include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp"
#include "barretenberg/relations/auxiliary_relation.hpp"
#include "barretenberg/relations/databus_lookup_relation.hpp"
#include "barretenberg/relations/ecc_op_queue_relation.hpp"
#include "barretenberg/relations/elliptic_relation.hpp"
#include "barretenberg/relations/gen_perm_sort_relation.hpp"
#include "barretenberg/relations/lookup_relation.hpp"
#include "barretenberg/relations/permutation_relation.hpp"
#include "barretenberg/relations/relation_parameters.hpp"
#include "barretenberg/relations/ultra_arithmetic_relation.hpp"
#include "barretenberg/transcript/transcript.hpp"
#include "relation_definitions_fwd.hpp"

namespace proof_system::honk::flavor {

Expand All @@ -32,13 +35,12 @@ class GoblinUltra {
// The number of multivariate polynomials on which a sumcheck prover sumcheck operates (including shifts). We often
// need containers of this size to hold related data, so we choose a name more agnostic than `NUM_POLYNOMIALS`.
// Note: this number does not include the individual sorted list polynomials.
// NUM = 43 (UH) + 4 op wires + 1 op wire "selector" + 3 (calldata + calldata_read_counts + q_busread)
static constexpr size_t NUM_ALL_ENTITIES = 51;
static constexpr size_t NUM_ALL_ENTITIES = 53;
// The number of polynomials precomputed to describe a circuit and to aid a prover in constructing a satisfying
// assignment of witnesses. We again choose a neutral name.
static constexpr size_t NUM_PRECOMPUTED_ENTITIES = 27; // 25 (UH) + 1 op wire "selector" + q_busread
static constexpr size_t NUM_PRECOMPUTED_ENTITIES = 28;
// The total number of witness entities not including shifts.
static constexpr size_t NUM_WITNESS_ENTITIES = 17; // 11 (UH) + 4 op wires + (calldata + calldata_read_counts)
static constexpr size_t NUM_WITNESS_ENTITIES = 18;

using GrandProductRelations =
std::tuple<proof_system::UltraPermutationRelation<FF>, proof_system::LookupRelation<FF>>;
Expand All @@ -50,7 +52,10 @@ class GoblinUltra {
proof_system::GenPermSortRelation<FF>,
proof_system::EllipticRelation<FF>,
proof_system::AuxiliaryRelation<FF>,
proof_system::EccOpQueueRelation<FF>>;
proof_system::EccOpQueueRelation<FF>,
proof_system::DatabusLookupRelation<FF>>;

using LogDerivLookupRelation = proof_system::DatabusLookupRelation<FF>;

static constexpr size_t MAX_PARTIAL_RELATION_LENGTH = compute_max_partial_relation_length<Relations>();
static constexpr size_t MAX_TOTAL_RELATION_LENGTH = compute_max_total_relation_length<Relations>();
Expand Down Expand Up @@ -106,6 +111,7 @@ class GoblinUltra {
DataType lagrange_first; // column 24
DataType lagrange_last; // column 25
DataType lagrange_ecc_op; // column 26 // indicator poly for ecc op gates
DataType databus_id; // column 27 // id polynomial, i.e. id_i = i

DEFINE_POINTER_VIEW(NUM_PRECOMPUTED_ENTITIES,
&q_m,
Expand Down Expand Up @@ -134,7 +140,8 @@ class GoblinUltra {
&table_4,
&lagrange_first,
&lagrange_last,
&lagrange_ecc_op)
&lagrange_ecc_op,
&databus_id)

static constexpr CircuitType CIRCUIT_TYPE = CircuitBuilder::CIRCUIT_TYPE;

Expand Down Expand Up @@ -172,6 +179,7 @@ class GoblinUltra {
DataType ecc_op_wire_4; // column 14
DataType calldata; // column 15
DataType calldata_read_counts; // column 16
DataType lookup_inverses; // column 17

DEFINE_POINTER_VIEW(NUM_WITNESS_ENTITIES,
&w_l,
Expand All @@ -190,7 +198,8 @@ class GoblinUltra {
&ecc_op_wire_3,
&ecc_op_wire_4,
&calldata,
&calldata_read_counts)
&calldata_read_counts,
&lookup_inverses)

std::vector<HandleType> get_wires() override { return { w_l, w_r, w_o, w_4 }; };
std::vector<HandleType> get_ecc_op_wires()
Expand Down Expand Up @@ -240,30 +249,32 @@ class GoblinUltra {
DataType lagrange_first; // column 24
DataType lagrange_last; // column 25
DataType lagrange_ecc_op; // column 26
DataType w_l; // column 27
DataType w_r; // column 28
DataType w_o; // column 29
DataType w_4; // column 30
DataType sorted_accum; // column 31
DataType z_perm; // column 32
DataType z_lookup; // column 33
DataType ecc_op_wire_1; // column 34
DataType ecc_op_wire_2; // column 35
DataType ecc_op_wire_3; // column 36
DataType ecc_op_wire_4; // column 37
DataType calldata; // column 38
DataType calldata_read_counts; // column 39
DataType table_1_shift; // column 40
DataType table_2_shift; // column 41
DataType table_3_shift; // column 42
DataType table_4_shift; // column 43
DataType w_l_shift; // column 44
DataType w_r_shift; // column 45
DataType w_o_shift; // column 46
DataType w_4_shift; // column 47
DataType sorted_accum_shift; // column 48
DataType z_perm_shift; // column 49
DataType z_lookup_shift; // column 50
DataType databus_id; // column 27
DataType w_l; // column 28
DataType w_r; // column 29
DataType w_o; // column 30
DataType w_4; // column 31
DataType sorted_accum; // column 32
DataType z_perm; // column 33
DataType z_lookup; // column 34
DataType ecc_op_wire_1; // column 35
DataType ecc_op_wire_2; // column 36
DataType ecc_op_wire_3; // column 37
DataType ecc_op_wire_4; // column 38
DataType calldata; // column 39
DataType calldata_read_counts; // column 40
DataType lookup_inverses; // column 41
DataType table_1_shift; // column 42
DataType table_2_shift; // column 43
DataType table_3_shift; // column 44
DataType table_4_shift; // column 45
DataType w_l_shift; // column 46
DataType w_r_shift; // column 47
DataType w_o_shift; // column 48
DataType w_4_shift; // column 49
DataType sorted_accum_shift; // column 50
DataType z_perm_shift; // column 51
DataType z_lookup_shift; // column 52

// defines a method pointer_view that returns the following, with const and non-const variants
DEFINE_POINTER_VIEW(NUM_ALL_ENTITIES,
Expand Down Expand Up @@ -294,6 +305,7 @@ class GoblinUltra {
&lagrange_first,
&lagrange_last,
&lagrange_ecc_op,
&databus_id,
&w_l,
&w_r,
&w_o,
Expand All @@ -307,6 +319,7 @@ class GoblinUltra {
&ecc_op_wire_4,
&calldata,
&calldata_read_counts,
&lookup_inverses,
&table_1_shift,
&table_2_shift,
&table_3_shift,
Expand Down Expand Up @@ -354,6 +367,7 @@ class GoblinUltra {
lagrange_first,
lagrange_last,
lagrange_ecc_op,
databus_id,
w_l,
w_r,
w_o,
Expand All @@ -366,7 +380,8 @@ class GoblinUltra {
ecc_op_wire_3,
ecc_op_wire_4,
calldata,
calldata_read_counts };
calldata_read_counts,
lookup_inverses };
};
std::vector<HandleType> get_to_be_shifted() override
{
Expand Down Expand Up @@ -489,6 +504,7 @@ class GoblinUltra {
ecc_op_wire_4 = "ECC_OP_WIRE_4";
calldata = "CALLDATA";
calldata_read_counts = "CALLDATA_READ_COUNTS";
lookup_inverses = "LOOKUP_INVERSES";

// The ones beginning with "__" are only used for debugging
q_c = "__Q_C";
Expand Down Expand Up @@ -554,6 +570,7 @@ class GoblinUltra {
lagrange_first = verification_key->lagrange_first;
lagrange_last = verification_key->lagrange_last;
lagrange_ecc_op = verification_key->lagrange_ecc_op;
databus_id = verification_key->databus_id;
}
};

Expand Down Expand Up @@ -582,6 +599,7 @@ class GoblinUltra {
Commitment ecc_op_wire_4_comm;
Commitment calldata_comm;
Commitment calldata_read_counts_comm;
Commitment lookup_inverses_comm;
Commitment sorted_accum_comm;
Commitment w_4_comm;
Commitment z_perm_comm;
Expand All @@ -597,6 +615,7 @@ class GoblinUltra {
Transcript(const std::vector<uint8_t>& proof)
: BaseTranscript<FF>(proof)
{}

void deserialize_full_transcript() override
{
// take current proof and put them into the struct
Expand All @@ -618,6 +637,7 @@ class GoblinUltra {
ecc_op_wire_4_comm = deserialize_from_buffer<Commitment>(proof_data, num_bytes_read);
calldata_comm = deserialize_from_buffer<Commitment>(proof_data, num_bytes_read);
calldata_read_counts_comm = deserialize_from_buffer<Commitment>(proof_data, num_bytes_read);
lookup_inverses_comm = deserialize_from_buffer<Commitment>(proof_data, num_bytes_read);
sorted_accum_comm = deserialize_from_buffer<Commitment>(proof_data, num_bytes_read);
w_4_comm = deserialize_from_buffer<Commitment>(proof_data, num_bytes_read);
z_perm_comm = deserialize_from_buffer<Commitment>(proof_data, num_bytes_read);
Expand Down Expand Up @@ -656,6 +676,7 @@ class GoblinUltra {
serialize_to_buffer(ecc_op_wire_4_comm, proof_data);
serialize_to_buffer(calldata_comm, proof_data);
serialize_to_buffer(calldata_read_counts_comm, proof_data);
serialize_to_buffer(lookup_inverses_comm, proof_data);
serialize_to_buffer(sorted_accum_comm, proof_data);
serialize_to_buffer(w_4_comm, proof_data);
serialize_to_buffer(z_perm_comm, proof_data);
Expand All @@ -675,4 +696,4 @@ class GoblinUltra {
};
};

} // namespace proof_system::honk::flavor
} // namespace proof_system::honk::flavor
Loading