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.

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: Sync from noir #10307

Merged
merged 43 commits into from
Dec 5, 2024
Merged
Show file tree
Hide file tree
Changes from 35 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
369ea54
[1 changes] feat: Sync from aztec-packages (https://github.com/noir-l…
AztecBot Nov 29, 2024
8de9057
chore: apply sync fixes
AztecBot Nov 29, 2024
d1cbba5
[1 changes] feat(ssa): Option to set the maximum acceptable Brillig b…
AztecBot Nov 30, 2024
3311744
chore: apply sync fixes
AztecBot Nov 30, 2024
f2cef7c
feat(ssa): Option to set the maximum acceptable Brillig bytecode incr…
AztecBot Nov 30, 2024
ed5ec28
[1 changes] feat(ssa): Option to set the maximum acceptable Brillig b…
AztecBot Dec 1, 2024
2ab9ea9
chore: apply sync fixes
AztecBot Dec 1, 2024
268bd31
feat(ssa): Option to set the maximum acceptable Brillig bytecode incr…
AztecBot Dec 1, 2024
d36e23a
[1 changes] feat(ssa): Option to set the maximum acceptable Brillig b…
AztecBot Dec 2, 2024
d77d424
chore: apply sync fixes
AztecBot Dec 2, 2024
c1781ec
feat(ssa): Option to set the maximum acceptable Brillig bytecode incr…
AztecBot Dec 2, 2024
f8acd2e
[1 changes] feat: Reduce memory consumption by storing array length a…
AztecBot Dec 2, 2024
ea74bcd
chore: apply sync fixes
AztecBot Dec 2, 2024
c0f1030
feat: Reduce memory consumption by storing array length as `u32` duri…
AztecBot Dec 2, 2024
30daa73
Merge branch 'master' into sync-noir
TomAFrench Dec 2, 2024
4b35f0a
[1 changes] feat(ssa): Simplify array get from set that writes to the…
AztecBot Dec 3, 2024
6bc6f32
chore: apply sync fixes
AztecBot Dec 3, 2024
a92b956
feat(ssa): Simplify array get from set that writes to the same dynami…
AztecBot Dec 3, 2024
bf993f3
[1 changes] chore: fix warning when compiling `noir_wasm` (https://gi…
AztecBot Dec 3, 2024
70201f7
chore: apply sync fixes
AztecBot Dec 3, 2024
01a88de
chore: fix warning when compiling `noir_wasm` (https://github.com/noi…
AztecBot Dec 3, 2024
c2cb837
[1 changes] fix: Don't remove necessary RC instructions in DIE pass (…
AztecBot Dec 3, 2024
61716dc
chore: apply sync fixes
AztecBot Dec 3, 2024
bcded2c
fix: Don't remove necessary RC instructions in DIE pass (https://gith…
AztecBot Dec 3, 2024
4772967
Merge branch 'master' into sync-noir
TomAFrench Dec 3, 2024
3ffcc94
[1 changes] chore: Revert "fix: Don't remove necessary RC instruction…
AztecBot Dec 4, 2024
94da40c
chore: apply sync fixes
AztecBot Dec 4, 2024
feef655
chore: Revert "fix: Don't remove necessary RC instructions in DIE pas…
AztecBot Dec 4, 2024
70cf870
[1 changes] feat: revert changes to `ValueMerger` and `Instruction::I…
AztecBot Dec 4, 2024
47e3e69
chore: apply sync fixes
AztecBot Dec 4, 2024
f4c94c7
feat: revert changes to `ValueMerger` and `Instruction::IfElse` (http…
AztecBot Dec 4, 2024
b6c7773
[1 changes] chore: update release-please action (https://github.com/n…
AztecBot Dec 5, 2024
7c377b2
chore: apply sync fixes
AztecBot Dec 5, 2024
df46b8f
chore: update release-please action (https://github.com/noir-lang/noi…
AztecBot Dec 5, 2024
e276378
Merge branch 'master' into sync-noir
TomAFrench Dec 5, 2024
905851e
Update noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/die.rs
TomAFrench Dec 5, 2024
b4135ed
[1 changes] chore: Remove inliner override for `reference_counts` tes…
AztecBot Dec 5, 2024
40c2a72
chore: apply sync fixes
AztecBot Dec 5, 2024
c61e6a3
chore: Remove inliner override for `reference_counts` test (https://g…
AztecBot Dec 5, 2024
e11cb11
Merge branch 'master' into sync-noir
vezenovm Dec 5, 2024
063afbc
Update noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/constant_f…
vezenovm Dec 5, 2024
bbf5a1d
remove duplicated tests
vezenovm Dec 5, 2024
bcfb2f6
correct reference_counts test
vezenovm Dec 5, 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 .noir-sync-commit
Original file line number Diff line number Diff line change
@@ -1 +1 @@
68c32b4ffd9b069fe4b119327dbf4018c17ab9d4
e9d3ccf5bae50241d8183ba5972dce62fbd700a4
37 changes: 26 additions & 11 deletions noir/noir-repo/.github/workflows/formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,37 +15,53 @@ concurrency:
jobs:
clippy:
name: cargo clippy
runs-on: ${{ matrix.runner }}
runs-on: ubuntu-latest
timeout-minutes: 30
env:
RUSTFLAGS: -Dwarnings

strategy:
fail-fast: false
matrix:
include:
- runner: ubuntu-latest
target: x86_64-unknown-linux-gnu

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup toolchain
uses: dtolnay/[email protected]
with:
targets: ${{ matrix.target }}
targets: x86_64-unknown-linux-gnu
components: clippy, rustfmt

- uses: Swatinem/rust-cache@v2
with:
key: ${{ matrix.target }}
key: x86_64-unknown-linux-gnu
cache-on-failure: true
save-if: ${{ github.event_name != 'merge_group' }}

- name: Run `cargo clippy`
run: cargo clippy --all-targets --workspace --locked --release

rustfmt:
name: cargo fmt
runs-on: ubuntu-latest
timeout-minutes: 30
env:
RUSTFLAGS: -Dwarnings

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup toolchain
uses: dtolnay/[email protected]
with:
targets: x86_64-unknown-linux-gnu
components: clippy, rustfmt

- uses: Swatinem/rust-cache@v2
with:
key: x86_64-unknown-linux-gnu
cache-on-failure: true
save-if: ${{ github.event_name != 'merge_group' }}

- name: Run `cargo fmt`
run: cargo fmt --all --check

Expand Down Expand Up @@ -88,7 +104,6 @@ jobs:
run: |
mkdir dist
cp ./target/release/nargo ./dist/nargo
7z a -ttar -so -an ./dist/* | 7z a -si ./nargo-x86_64-unknown-linux-gnu.tar.gz

- name: Upload artifact
uses: actions/upload-artifact@v4
Expand Down
92 changes: 0 additions & 92 deletions noir/noir-repo/.github/workflows/gates_report_brillig.yml

This file was deleted.

This file was deleted.

23 changes: 0 additions & 23 deletions noir/noir-repo/.github/workflows/lockfile.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Report gates diff
name: Report Peak Memory

on:
push:
Expand Down Expand Up @@ -33,7 +33,6 @@ jobs:
run: |
mkdir dist
cp ./target/release/nargo ./dist/nargo
7z a -ttar -so -an ./dist/* | 7z a -si ./nargo-x86_64-unknown-linux-gnu.tar.gz

- name: Upload artifact
uses: actions/upload-artifact@v4
Expand All @@ -42,8 +41,7 @@ jobs:
path: ./dist/*
retention-days: 3


compare_gates_reports:
generate_memory_report:
needs: [build-nargo]
runs-on: ubuntu-latest
permissions:
Expand All @@ -52,11 +50,6 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Install `bb`
run: |
./scripts/install_bb.sh
echo "$HOME/.bb/" >> $GITHUB_PATH

- name: Download nargo binary
uses: actions/download-artifact@v4
with:
Expand All @@ -71,24 +64,25 @@ jobs:
export PATH="$PATH:$(dirname $nargo_binary)"
nargo -V

- name: Generate gates report
- name: Generate Memory report
working-directory: ./test_programs
run: |
./rebuild.sh
./gates_report.sh
mv gates_report.json ../gates_report.json
- name: Compare gates reports
id: gates_diff
uses: noir-lang/noir-gates-diff@1931aaaa848a1a009363d6115293f7b7fc72bb87
chmod +x memory_report.sh
./memory_report.sh
mv memory_report.json ../memory_report.json

- name: Parse memory report
id: memory_report
uses: noir-lang/noir-bench-report@ccb0d806a91d3bd86dba0ba3d580a814eed5673c
with:
report: gates_report.json
summaryQuantile: 0.9 # only display the 10% most significant circuit size diffs in the summary (defaults to 20%)
report: memory_report.json
header: |
# Memory Report
memory_report: true

- name: Add gates diff to sticky comment
- name: Add memory report to sticky comment
if: github.event_name == 'pull_request' || github.event_name == 'pull_request_target'
uses: marocchino/sticky-pull-request-comment@v2
with:
# delete the comment in case changes no longer impact circuit sizes
delete: ${{ !steps.gates_diff.outputs.markdown }}
message: ${{ steps.gates_diff.outputs.markdown }}
header: memory
message: ${{ steps.memory_report.outputs.markdown }}
2 changes: 1 addition & 1 deletion noir/noir-repo/.github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
- name: Run release-please
id: release
uses: google-github-actions/release-please-action@v4
uses: googleapis/release-please-action@v4
with:
token: ${{ secrets.NOIR_RELEASES_TOKEN }}

Expand Down
Loading
Loading