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

chore: move decider PK allocation to methods #10670

Merged
merged 4 commits into from
Dec 13, 2024
Merged

chore: move decider PK allocation to methods #10670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
afcc31e
move allocation to methods
ledwards2225 Dec 12, 2024
09daef4
concept update
ledwards2225 Dec 12, 2024
0b06162
databus id update from other pr
ledwards2225 Dec 13, 2024
0c01eb2
Merge branch 'master' into lde/decider_pk_cleanup
ledwards2225 Dec 13, 2024
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
2 changes: 1 addition & 1 deletion barretenberg/cpp/src/barretenberg/plonk_honk_shared/execution_trace/mega_execution_trace.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ template <typename T> struct MegaTraceBlockData {
};
}

auto get_gate_blocks()
auto get_gate_blocks() const
{
return RefArray{
busread, arithmetic, delta_range, elliptic, aux, poseidon2_external, poseidon2_internal, lookup
Expand Down
2 changes: 1 addition & 1 deletion ...etenberg/cpp/src/barretenberg/plonk_honk_shared/execution_trace/ultra_execution_trace.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ template <typename T> struct UltraTraceBlockData {
lookup, poseidon2_external, poseidon2_internal, overflow };
}

auto get_gate_blocks()
auto get_gate_blocks() const
{
return RefArray{ arithmetic, delta_range, elliptic, aux, lookup, poseidon2_external, poseidon2_internal };
}
Expand Down
144 changes: 140 additions & 4 deletions barretenberg/cpp/src/barretenberg/ultra_honk/decider_proving_key.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,142 @@ template <IsUltraFlavor Flavor> size_t DeciderProvingKey_<Flavor>::compute_dyadi
return circuit.get_circuit_subgroup_size(total_num_gates);
}

template <IsUltraFlavor Flavor> void DeciderProvingKey_<Flavor>::allocate_wires()
{
PROFILE_THIS_NAME("allocate_wires");

for (auto& wire : proving_key.polynomials.get_wires()) {
wire = Polynomial::shiftable(proving_key.circuit_size);
}
}

template <IsUltraFlavor Flavor> void DeciderProvingKey_<Flavor>::allocate_permutation_argument_polynomials()
{
PROFILE_THIS_NAME("allocate_permutation_argument_polynomials");

for (auto& sigma : proving_key.polynomials.get_sigmas()) {
sigma = Polynomial(proving_key.circuit_size);
}
for (auto& id : proving_key.polynomials.get_ids()) {
id = Polynomial(proving_key.circuit_size);
}
proving_key.polynomials.z_perm = Polynomial::shiftable(proving_key.circuit_size);
}

template <IsUltraFlavor Flavor> void DeciderProvingKey_<Flavor>::allocate_lagrange_polynomials()
{
PROFILE_THIS_NAME("allocate_lagrange_polynomials");

// First and last lagrange polynomials (in the full circuit size)
proving_key.polynomials.lagrange_first = Polynomial(
/* size=*/1, /*virtual size=*/dyadic_circuit_size, /*start_index=*/0);

// Even though lagrange_last has a single non-zero element, we cannot set its size to 0 as different
// keys being folded might have lagrange_last set at different indexes and folding does not work
// correctly unless the polynomial is allocated in the correct range to accomodate this
proving_key.polynomials.lagrange_last = Polynomial(
/* size=*/dyadic_circuit_size, /*virtual size=*/dyadic_circuit_size, /*start_index=*/0);
}

template <IsUltraFlavor Flavor> void DeciderProvingKey_<Flavor>::allocate_selectors(const Circuit& circuit)
{
PROFILE_THIS_NAME("allocate_selectors");

// Define gate selectors over the block they are isolated to
for (auto [selector, block] :
zip_view(proving_key.polynomials.get_gate_selectors(), circuit.blocks.get_gate_blocks())) {

// TODO(https://github.com/AztecProtocol/barretenberg/issues/914): q_arith is currently used
// in aux block.
if (&block == &circuit.blocks.arithmetic) {
size_t arith_size = circuit.blocks.aux.trace_offset - circuit.blocks.arithmetic.trace_offset +
circuit.blocks.aux.get_fixed_size(is_structured);
selector = Polynomial(arith_size, proving_key.circuit_size, circuit.blocks.arithmetic.trace_offset);
} else {
selector = Polynomial(block.get_fixed_size(is_structured), proving_key.circuit_size, block.trace_offset);
}
}

// Set the other non-gate selector polynomials (e.g. q_l, q_r, q_m etc.) to full size
for (auto& selector : proving_key.polynomials.get_non_gate_selectors()) {
selector = Polynomial(proving_key.circuit_size);
}
}

template <IsUltraFlavor Flavor>
void DeciderProvingKey_<Flavor>::allocate_table_lookup_polynomials(const Circuit& circuit)
{
PROFILE_THIS_NAME("allocate_table_lookup_polynomials");

const size_t max_tables_size = std::min(static_cast<size_t>(MAX_LOOKUP_TABLES_SIZE), dyadic_circuit_size - 1);
size_t table_offset = dyadic_circuit_size - max_tables_size;
ASSERT(dyadic_circuit_size > max_tables_size);

// Allocate the polynomials containing the actual table data
if constexpr (IsUltraFlavor<Flavor>) {
for (auto& poly : proving_key.polynomials.get_tables()) {
poly = Polynomial(max_tables_size, dyadic_circuit_size, table_offset);
}
}

// Allocate the read counts and tags polynomials
proving_key.polynomials.lookup_read_counts = Polynomial(max_tables_size, dyadic_circuit_size, table_offset);
proving_key.polynomials.lookup_read_tags = Polynomial(max_tables_size, dyadic_circuit_size, table_offset);
ZoneScopedN("allocating lookup and databus inverses");

// Allocate the log derivative lookup argument inverse polynomial
const size_t lookup_offset = static_cast<size_t>(circuit.blocks.lookup.trace_offset);
const size_t lookup_inverses_start = std::min(lookup_offset, table_offset);
const size_t lookup_inverses_end =
std::min(dyadic_circuit_size,
std::max(lookup_offset + circuit.blocks.lookup.get_fixed_size(is_structured),
table_offset + MAX_LOOKUP_TABLES_SIZE));
proving_key.polynomials.lookup_inverses =
Polynomial(lookup_inverses_end - lookup_inverses_start, dyadic_circuit_size, lookup_inverses_start);
}

template <IsUltraFlavor Flavor>
void DeciderProvingKey_<Flavor>::allocate_ecc_op_polynomials(const Circuit& circuit)
requires IsMegaFlavor<Flavor>
{
PROFILE_THIS_NAME("allocate_ecc_op_polynomials");

// Allocate the ecc op wires and selector
const size_t ecc_op_block_size = circuit.blocks.ecc_op.get_fixed_size(is_structured);
const size_t op_wire_offset = circuit.blocks.ecc_op.trace_offset;
for (auto& wire : proving_key.polynomials.get_ecc_op_wires()) {
wire = Polynomial(ecc_op_block_size, proving_key.circuit_size, op_wire_offset);
}
proving_key.polynomials.lagrange_ecc_op = Polynomial(ecc_op_block_size, proving_key.circuit_size, op_wire_offset);
}

template <IsUltraFlavor Flavor>
void DeciderProvingKey_<Flavor>::allocate_databus_polynomials(const Circuit& circuit)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add a PROFILE_THIS_NAME tag on this function as well

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes! but will do in a follow on because I'm going to do lot of cleanup of the profiling/labels

requires HasDataBus<Flavor>
{
proving_key.polynomials.calldata = Polynomial(MAX_DATABUS_SIZE, proving_key.circuit_size);
proving_key.polynomials.calldata_read_counts = Polynomial(MAX_DATABUS_SIZE, proving_key.circuit_size);
proving_key.polynomials.calldata_read_tags = Polynomial(MAX_DATABUS_SIZE, proving_key.circuit_size);
proving_key.polynomials.secondary_calldata = Polynomial(MAX_DATABUS_SIZE, proving_key.circuit_size);
proving_key.polynomials.secondary_calldata_read_counts = Polynomial(MAX_DATABUS_SIZE, proving_key.circuit_size);
proving_key.polynomials.secondary_calldata_read_tags = Polynomial(MAX_DATABUS_SIZE, proving_key.circuit_size);
proving_key.polynomials.return_data = Polynomial(MAX_DATABUS_SIZE, proving_key.circuit_size);
proving_key.polynomials.return_data_read_counts = Polynomial(MAX_DATABUS_SIZE, proving_key.circuit_size);
proving_key.polynomials.return_data_read_tags = Polynomial(MAX_DATABUS_SIZE, proving_key.circuit_size);

proving_key.polynomials.databus_id = Polynomial(MAX_DATABUS_SIZE, proving_key.circuit_size);

// Allocate log derivative lookup argument inverse polynomials
const size_t q_busread_end =
circuit.blocks.busread.trace_offset + circuit.blocks.busread.get_fixed_size(is_structured);
proving_key.polynomials.calldata_inverses =
Polynomial(std::max(circuit.get_calldata().size(), q_busread_end), dyadic_circuit_size);
proving_key.polynomials.secondary_calldata_inverses =
Polynomial(std::max(circuit.get_secondary_calldata().size(), q_busread_end), dyadic_circuit_size);
proving_key.polynomials.return_data_inverses =
Polynomial(std::max(circuit.get_return_data().size(), q_busread_end), dyadic_circuit_size);
}

/**
* @brief
* @details
Expand All @@ -39,7 +175,7 @@ template <IsUltraFlavor Flavor> size_t DeciderProvingKey_<Flavor>::compute_dyadi
*/
template <IsUltraFlavor Flavor>
void DeciderProvingKey_<Flavor>::construct_databus_polynomials(Circuit& circuit)
requires IsMegaFlavor<Flavor>
requires HasDataBus<Flavor>
{
auto& calldata_poly = proving_key.polynomials.calldata;
auto& calldata_read_counts = proving_key.polynomials.calldata_read_counts;
Expand All @@ -51,9 +187,9 @@ void DeciderProvingKey_<Flavor>::construct_databus_polynomials(Circuit& circuit)
auto& return_data_read_counts = proving_key.polynomials.return_data_read_counts;
auto& return_data_read_tags = proving_key.polynomials.return_data_read_tags;

auto calldata = circuit.get_calldata();
auto secondary_calldata = circuit.get_secondary_calldata();
auto return_data = circuit.get_return_data();
const auto& calldata = circuit.get_calldata();
const auto& secondary_calldata = circuit.get_secondary_calldata();
const auto& return_data = circuit.get_return_data();

// Note: We do not utilize a zero row for databus columns
for (size_t idx = 0; idx < calldata.size(); ++idx) {
Expand Down
Loading
Loading