Skip to content

feat: add normalized_cache to UltraCircuitBuilder #1384

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: add normalized_cache to UltraCircuitBuilder #1384

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
4 changes: 4 additions & 0 deletions cpp/src/barretenberg/stdlib/primitives/field/field.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,9 @@ template <typename Builder> field_t<Builder> field_t<Builder>::add_two(const fie
*/
template <typename Builder> field_t<Builder> field_t<Builder>::normalize() const
{
if (context && context->has_normalized(witness_index, multiplicative_constant, additive_constant)) {
return context->get_normalized(witness_index, multiplicative_constant, additive_constant);
}
if (witness_index == IS_CONSTANT ||
((multiplicative_constant == bb::fr::one()) && (additive_constant == bb::fr::zero()))) {
return *this;
Expand Down Expand Up @@ -557,6 +560,7 @@ template <typename Builder> field_t<Builder> field_t<Builder>::normalize() const
.c_scaling = bb::fr::neg_one(),
.const_scaling = additive_constant });
result.tag = tag;
context->cache_normalized(witness_index, multiplicative_constant, additive_constant, result);
return result;
}

Expand Down
22 changes: 22 additions & 0 deletions cpp/src/barretenberg/stdlib_circuit_builders/ultra_circuit_builder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,6 +736,28 @@ uint32_t UltraCircuitBuilder_<ExecutionTrace>::put_constant_variable(const FF& v
}
}

template <typename ExecutionTrace>
field_t<UltraCircuitBuilder_<ExecutionTrace>> UltraCircuitBuilder_<ExecutionTrace>::get_normalized(
uint32_t witness_index, const bb::fr& mul, const bb::fr& add) const
{
return normalized_cache.at({witness_index, mul, add});
}

template <typename ExecutionTrace>
bool UltraCircuitBuilder_<ExecutionTrace>::has_normalized(
uint32_t witness_index, const bb::fr& mul, const bb::fr& add) const
{
return normalized_cache.contains({witness_index, mul, add});
}

template <typename ExecutionTrace>
void UltraCircuitBuilder_<ExecutionTrace>::cache_normalized(
uint32_t witness_index, const bb::fr& mul, const bb::fr& add,
const field_t<UltraCircuitBuilder_<ExecutionTrace>>& normalized)
{
normalized_cache[{witness_index, mul, add}] = normalized;
}

/**
* @brief Get the basic table with provided ID from the set of tables for the present circuit; create it if it doesnt
* yet exist
Expand Down
15 changes: 15 additions & 0 deletions cpp/src/barretenberg/stdlib_circuit_builders/ultra_circuit_builder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,8 @@ class UltraCircuitBuilder_ : public CircuitBuilderBase<typename ExecutionTrace_:
std::vector<uint32_t> used_witnesses;
std::vector<cached_partial_non_native_field_multiplication> cached_partial_non_native_field_multiplications;

std::unordered_map<std::tuple<uint32_t, bb::fr, bb::fr>, field_t<UltraCircuitBuilder>, boost::hash<std::tuple<uint32_t, bb::fr, bb::fr>>> normalized_cache;

bool circuit_finalized = false;

std::vector<fr> ipa_proof;
Expand Down Expand Up @@ -718,6 +720,19 @@ class UltraCircuitBuilder_ : public CircuitBuilderBase<typename ExecutionTrace_:

void update_used_witnesses(uint32_t var_idx) { used_witnesses.emplace_back(var_idx); }

field_t<UltraCircuitBuilder> get_normalized(uint32_t witness_index, const bb::fr& mul, const bb::fr& add) const {
return normalized_cache.at({witness_index, mul, add});
}

bool has_normalized(uint32_t witness_index, const bb::fr& mul, const bb::fr& add) const {
return normalized_cache.contains({witness_index, mul, add});
}

void cache_normalized(uint32_t witness_index, const bb::fr& mul, const bb::fr& add, const field_t<UltraCircuitBuilder>& normalized) {
normalized_cache[{witness_index, mul, add}] = normalized;
}


/**x
* @brief Print the number and composition of gates in the circuit
*
Expand Down