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

Jump to bottom

feat(acir_gen): RecursiveAggregation opcode and updates to black box func call generation #2097

Merged
merged 5 commits into from
Aug 1, 2023
Merged

feat(acir_gen): RecursiveAggregation opcode and updates to black box func call generation #2097

merged 5 commits into from
Aug 1, 2023

Conversation

vezenovm
Copy link
Contributor

Description

Problem*

Resolves #1570

Summary*

This PR generates the BlackBoxFuncCall::RecursiveAggregation opcode. Due to the opcode being more complex some updates had to be done to how we generate black box func calls.

  1. We supported variable black box func inputs, but only for a singular value. This has been updated to handle multiple inputs that can all be variable
  2. We fetch the output count before generating a black box function. This is used for generating the output witnesses in case we have variable outputs and cannot check against a hardcoded output count.

Documentation

  • This PR requires documentation updates when merged.

    • I will submit a noir-lang/docs PR.
    • I will request for and support Dev Rel's help in documenting this PR.

Additional Context

PR Checklist*

  • I have tested the changes locally.
  • I have formatted the changes with Prettier and/or cargo fmt on default settings.

@vezenovm vezenovm mentioned this pull request Jul 31, 2023
Merged
6 tasks
@vezenovm vezenovm requested a review from jfecher July 31, 2023 19:35
ludamad
ludamad approved these changes Jul 31, 2023
View reviewed changes
Copy link
Collaborator

@ludamad ludamad left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LGTM as far as reading reasonably although I'll let noir team review

@vezenovm vezenovm requested review from TomAFrench and guipublic July 31, 2023 21:52
@vezenovm vezenovm enabled auto-merge August 1, 2023 18:10
@vezenovm vezenovm added this pull request to the merge queue Aug 1, 2023
Merged via the queue into master with commit 5cb8166 Aug 1, 2023
@vezenovm vezenovm deleted the mv/recursive-agg-opcode branch August 1, 2023 18:30
@kevaundray kevaundray mentioned this pull request Aug 1, 2023
Merged
vezenovm added a commit to AztecProtocol/aztec-packages that referenced this pull request Aug 1, 2023
@vezenovm
chore(ci): Update build artifacts for recursion bin-test and enable b…
48aa541 
…in-test (#1326)

# Description

Resolves #1236 

The ACIR artifacts included in this PR are generated based off of this
work in the Noir repo: noir-lang/noir#2097. This
re-enables the CI now that recursive aggregation will be supported in
the new SSA.

This PR should only be merged though once the Noir PR that is linked
reaches master.

# Checklist:

- [X] I have reviewed my diff in github, line by line.
- [X] Every change is related to the PR description.
- [X] I have
[linked](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue)
this pull request to the issue(s) that it resolves.
- [X] There are no unexpected formatting changes, superfluous debug
logs, or commented-out code.
- [X] The branch has been merged or rebased against the head of its
merge target.
- [X] I'm happy for the PR to be merged at the reviewer's next
convenience.
AztecBot pushed a commit to AztecProtocol/barretenberg that referenced this pull request Aug 1, 2023
@vezenovm @AztecBot
chore(ci): Update build artifacts for recursion bin-test and enable b…
697669a 
…in-test (#1326)

# Description

Resolves #1236 

The ACIR artifacts included in this PR are generated based off of this
work in the Noir repo: noir-lang/noir#2097. This
re-enables the CI now that recursive aggregation will be supported in
the new SSA.

This PR should only be merged though once the Noir PR that is linked
reaches master.

# Checklist:

- [X] I have reviewed my diff in github, line by line.
- [X] Every change is related to the PR description.
- [X] I have
[linked](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue)
this pull request to the issue(s) that it resolves.
- [X] There are no unexpected formatting changes, superfluous debug
logs, or commented-out code.
- [X] The branch has been merged or rebased against the head of its
merge target.
- [X] I'm happy for the PR to be merged at the reviewer's next
convenience.
TomAFrench added a commit that referenced this pull request Aug 2, 2023
@TomAFrench
Merge branch 'master' into boolean-and
41ca50d 
* master:
  feat!: Support workspaces and package selection on every nargo command (#1992)
  chore: Make a more clear error for slices passed to std::println (#2113)
  feat: Implement type aliases (#2112)
  feat: Add `Option<T>` to noir stdlib (#1781)
  feat: Format strings for prints  (#1952)
  feat(acir_gen): RecursiveAggregation opcode and updates to black box func call generation (#2097)
  fix: Mutating a variable no longer mutates its copy (#2057)
  fix: Implement `.len()` in Acir-Gen (#2077)
  chore: clippy fixes (#2101)
TomAFrench added a commit that referenced this pull request Aug 2, 2023
@TomAFrench
Merge branch 'master' into gd/brillig_quotient
d9333a2 
* master: (50 commits)
  fix(globals): Accurately filter literals for resolving globals (#2126)
  feat: Optimize away constant calls to black box functions (#1981)
  fix: Rename `Option::value` to `Option::_value` (#2127)
  feat: replace boolean `AND`s with multiplication (#1954)
  chore: create a `const` to hold the panic message (#2122)
  feat: Add support for bitshifts by distances known at runtime (#2072)
  feat: Add additional `BinaryOp` simplifications (#2124)
  fix: flattening pass no longer overwrites previously mapped condition values (#2117)
  chore(noirc_driver): Unify crate preparation (#2119)
  feat!: Support workspaces and package selection on every nargo command (#1992)
  chore: Make a more clear error for slices passed to std::println (#2113)
  feat: Implement type aliases (#2112)
  feat: Add `Option<T>` to noir stdlib (#1781)
  feat: Format strings for prints  (#1952)
  feat(acir_gen): RecursiveAggregation opcode and updates to black box func call generation (#2097)
  fix: Mutating a variable no longer mutates its copy (#2057)
  fix: Implement `.len()` in Acir-Gen (#2077)
  chore: clippy fixes (#2101)
  chore: Update `noir-source-resolver` to v1.1.3 (#1912)
  chore: Document `GeneratedAcir::more_than_eq_comparison` (#2085)
  ...
TomAFrench added a commit that referenced this pull request Aug 2, 2023
@TomAFrench
Merge branch 'master' into gd/issue_2015
eb48ebc 
* master:
  chore: rename `ssa_refactor` module to `ssa` (#2129)
  chore: Use `--show-output` flag on execution rather than compilation  (#2116)
  fix(globals): Accurately filter literals for resolving globals (#2126)
  feat: Optimize away constant calls to black box functions (#1981)
  fix: Rename `Option::value` to `Option::_value` (#2127)
  feat: replace boolean `AND`s with multiplication (#1954)
  chore: create a `const` to hold the panic message (#2122)
  feat: Add support for bitshifts by distances known at runtime (#2072)
  feat: Add additional `BinaryOp` simplifications (#2124)
  fix: flattening pass no longer overwrites previously mapped condition values (#2117)
  chore(noirc_driver): Unify crate preparation (#2119)
  feat!: Support workspaces and package selection on every nargo command (#1992)
  chore: Make a more clear error for slices passed to std::println (#2113)
  feat: Implement type aliases (#2112)
  feat: Add `Option<T>` to noir stdlib (#1781)
  feat: Format strings for prints  (#1952)
  feat(acir_gen): RecursiveAggregation opcode and updates to black box func call generation (#2097)
  fix: Mutating a variable no longer mutates its copy (#2057)
  fix: Implement `.len()` in Acir-Gen (#2077)
TomAFrench added a commit that referenced this pull request Aug 2, 2023
@TomAFrench
Merge branch 'master' into gd/issue_2016
cf49105 
* master:
  chore: rename `ssa_refactor` module to `ssa` (#2129)
  chore: Use `--show-output` flag on execution rather than compilation  (#2116)
  fix(globals): Accurately filter literals for resolving globals (#2126)
  feat: Optimize away constant calls to black box functions (#1981)
  fix: Rename `Option::value` to `Option::_value` (#2127)
  feat: replace boolean `AND`s with multiplication (#1954)
  chore: create a `const` to hold the panic message (#2122)
  feat: Add support for bitshifts by distances known at runtime (#2072)
  feat: Add additional `BinaryOp` simplifications (#2124)
  fix: flattening pass no longer overwrites previously mapped condition values (#2117)
  chore(noirc_driver): Unify crate preparation (#2119)
  feat!: Support workspaces and package selection on every nargo command (#1992)
  chore: Make a more clear error for slices passed to std::println (#2113)
  feat: Implement type aliases (#2112)
  feat: Add `Option<T>` to noir stdlib (#1781)
  feat: Format strings for prints  (#1952)
  feat(acir_gen): RecursiveAggregation opcode and updates to black box func call generation (#2097)
  fix: Mutating a variable no longer mutates its copy (#2057)
  fix: Implement `.len()` in Acir-Gen (#2077)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ludamad ludamad ludamad approved these changes

@jfecher jfecher jfecher approved these changes

@TomAFrench TomAFrench Awaiting requested review from TomAFrench

@guipublic guipublic Awaiting requested review from guipublic

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Generate RecursiveAggregation AcirOpcode in SSA refactor
3 participants
@vezenovm @ludamad @jfecher