From 3338487b3c4b4e575df2be2a47e198054221edfa Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Mon, 9 Dec 2024 22:30:45 +0000 Subject: [PATCH 001/135] update compilation_report script and job to handle external libraries --- .github/workflows/reports.yml | 87 +++++++++++++++++++++++++++-- test_programs/compilation_report.sh | 21 ++++++- 2 files changed, 100 insertions(+), 8 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 8d18e378d34..ff5ddaa48b0 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -198,12 +198,6 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Download nargo binary - uses: actions/download-artifact@v4 - with: - name: nargo - path: ./nargo - - name: Set nargo on PATH run: | nargo_binary="${{ github.workspace }}/nargo/nargo" @@ -264,6 +258,86 @@ jobs: ./compilation_report.sh mv compilation_report.json ../compilation_report.json + - name: Upload compilation report + uses: actions/upload-artifact@v4 + with: + name: compilation_report + path: ../compilation_report.json + retention-days: 3 + + external_repo_compilation_report: + needs: [build-nargo, critical-library-list, generate_compilation_report] + runs-on: ubuntu-latest + timeout-minutes: 30 + strategy: + fail-fast: false + matrix: + project: ${{ fromJson( needs.critical-library-list.outputs.libraries )}} + include: + - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } + - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts } + - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/parity-lib } + # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/private-kernel-lib } + # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/reset-kernel-lib } + # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/rollup-lib } + # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/types } + + name: External repo compilation report - ${{ matrix.project.repo }} + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + repository: ${{ matrix.project.repo }} + path: test-repo + ref: ${{ matrix.project.ref }} + + - name: Download nargo binary + uses: actions/download-artifact@v4 + with: + name: nargo + path: ./nargo + + - name: Set nargo on PATH + run: | + nargo_binary="${{ github.workspace }}/nargo/nargo" + chmod +x $nargo_binary + echo "$(dirname $nargo_binary)" >> $GITHUB_PATH + export PATH="$PATH:$(dirname $nargo_binary)" + nargo -V + + - name: Download compilation report + uses: actions/download-artifact@v4 + with: + name: compilation_report + path: ./test-repo/${{ matrix.project.path }}/compilation_report.json + + - name: Generate Compilation report + working-directory: ./test-repo/${{ matrix.project.path }} + run: | + ./compilation_report.sh 1 + + - name: Upload compilation report + uses: actions/upload-artifact@v4 + with: + name: compilation_report + path: ./test-repo/compilation_report.json + retention-days: 3 + + upload_compilation_report: + name: Upload compilation report + needs: [generate_compilation_report, external_repo_compilation_report] + runs-on: ubuntu-latest + permissions: + pull-requests: write + + name: Upload compilation report + steps: + - name: Download compilation report + uses: actions/download-artifact@v4 + with: + name: compilation_report + path: ./compilation_report.json + - name: Parse compilation report id: compilation_report uses: noir-lang/noir-bench-report@0d7464a8c39170523932d7846b6e6b458a294aea @@ -279,3 +353,4 @@ jobs: with: header: compilation message: ${{ steps.compilation_report.outputs.markdown }} + diff --git a/test_programs/compilation_report.sh b/test_programs/compilation_report.sh index 08cee7ba4a6..83b48d09230 100755 --- a/test_programs/compilation_report.sh +++ b/test_programs/compilation_report.sh @@ -6,8 +6,25 @@ base_path="$current_dir/execution_success" test_dirs=$(ls $base_path) # Tests to be profiled for compilation report +# tests_to_profile=("sha256_regression" "regression_4709" "ram_blowup_regression") tests_to_profile=("sha256_regression" "regression_4709" "ram_blowup_regression") -echo "{\"compilation_reports\": [ " > $current_dir/compilation_report.json + +# If there is an argument that means we want to re-use an already existing compilation report +# rather than generating a new one. +# When reusing a report, the script can only profile one additional test at the moment. +if [ "$#" -eq 0 ]; then + echo "{\"compilation_reports\": [ " > $current_dir/compilation_report.json + +else + # Delete last two lines so that we can re-use the previous report + sed -i '$d' compilation_report.json | sed -i '$d' compilation_report.json + + echo "}, " >> $current_dir/compilation_report.json + + # The additional report is expected to be in the current directory + base_path="$current_dir" + tests_to_profile=(".") +fi ITER="1" NUM_ARTIFACTS=${#tests_to_profile[@]} @@ -24,7 +41,7 @@ for dir in ${tests_to_profile[@]}; do cd $base_path/$dir COMPILE_TIME=$((time nargo compile --force) 2>&1 | grep real | grep -oE '[0-9]+m[0-9]+.[0-9]+s') - echo -e " {\n \"artifact_name\":\"$dir\",\n \"time\":\"$COMPILE_TIME\"\n" >> $current_dir/compilation_report.json + echo -e " {\n \"artifact_name\":\"$dir\",\n \"time\":\"$COMPILE_TIME\"" >> $current_dir/compilation_report.json if (($ITER == $NUM_ARTIFACTS)); then echo "}" >> $current_dir/compilation_report.json From a1104a097d32285d46cf72e132a8358c3d1c2523 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Mon, 9 Dec 2024 22:37:41 +0000 Subject: [PATCH 002/135] bring back accidental deleteion --- .github/workflows/reports.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index ff5ddaa48b0..2531912ead4 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -198,6 +198,12 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Download nargo binary + uses: actions/download-artifact@v4 + with: + name: nargo + path: ./nargo + - name: Set nargo on PATH run: | nargo_binary="${{ github.workspace }}/nargo/nargo" From d1278727ce16f50f0304e44081cfd335e7c1e50c Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Mon, 9 Dec 2024 22:47:13 +0000 Subject: [PATCH 003/135] missing job --- .github/workflows/reports.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 2531912ead4..9730785feb0 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -271,6 +271,25 @@ jobs: path: ../compilation_report.json retention-days: 3 + critical-library-list: + name: Load critical library list + runs-on: ubuntu-latest + outputs: + libraries: ${{ steps.get_critical_libraries.outputs.libraries }} + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Build list of libraries + id: get_critical_libraries + run: | + LIBRARIES=$(grep -Po "^https://github.com/\K.+" ./CRITICAL_NOIR_LIBRARIES | jq -R -s -c 'split("\n") | map(select(. != "")) | map({ repo: ., path: "./"})') + echo "libraries=$LIBRARIES" + echo "libraries=$LIBRARIES" >> $GITHUB_OUTPUT + env: + GH_TOKEN: ${{ github.token }} + external_repo_compilation_report: needs: [build-nargo, critical-library-list, generate_compilation_report] runs-on: ubuntu-latest From aa82e83939726bbd33574fe365200ed1e4dd8c3c Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Mon, 9 Dec 2024 22:48:14 +0000 Subject: [PATCH 004/135] remove job --- .github/workflows/reports.yml | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 9730785feb0..4d12eb99c5c 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -271,33 +271,13 @@ jobs: path: ../compilation_report.json retention-days: 3 - critical-library-list: - name: Load critical library list - runs-on: ubuntu-latest - outputs: - libraries: ${{ steps.get_critical_libraries.outputs.libraries }} - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Build list of libraries - id: get_critical_libraries - run: | - LIBRARIES=$(grep -Po "^https://github.com/\K.+" ./CRITICAL_NOIR_LIBRARIES | jq -R -s -c 'split("\n") | map(select(. != "")) | map({ repo: ., path: "./"})') - echo "libraries=$LIBRARIES" - echo "libraries=$LIBRARIES" >> $GITHUB_OUTPUT - env: - GH_TOKEN: ${{ github.token }} - external_repo_compilation_report: - needs: [build-nargo, critical-library-list, generate_compilation_report] + needs: [build-nargo, generate_compilation_report] runs-on: ubuntu-latest timeout-minutes: 30 strategy: fail-fast: false matrix: - project: ${{ fromJson( needs.critical-library-list.outputs.libraries )}} include: - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts } From 4eba04b3a78d4f394692f1a6510a60b0c508cec5 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Mon, 9 Dec 2024 23:05:46 +0000 Subject: [PATCH 005/135] write perms --- .github/workflows/reports.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 4d12eb99c5c..957e26f12bc 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -274,6 +274,8 @@ jobs: external_repo_compilation_report: needs: [build-nargo, generate_compilation_report] runs-on: ubuntu-latest + permissions: + pull-requests: write timeout-minutes: 30 strategy: fail-fast: false From 4a4ea2000c499f31f15a1618255275cb6a0cc413 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Mon, 9 Dec 2024 23:08:07 +0000 Subject: [PATCH 006/135] tests report w/o matrix --- .github/workflows/reports.yml | 114 +++++++++++++++++----------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 957e26f12bc..cebb0f32daa 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -271,64 +271,64 @@ jobs: path: ../compilation_report.json retention-days: 3 - external_repo_compilation_report: - needs: [build-nargo, generate_compilation_report] - runs-on: ubuntu-latest - permissions: - pull-requests: write - timeout-minutes: 30 - strategy: - fail-fast: false - matrix: - include: - - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } - - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts } - - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/parity-lib } - # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/private-kernel-lib } - # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/reset-kernel-lib } - # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/rollup-lib } - # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/types } - - name: External repo compilation report - ${{ matrix.project.repo }} - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - repository: ${{ matrix.project.repo }} - path: test-repo - ref: ${{ matrix.project.ref }} - - - name: Download nargo binary - uses: actions/download-artifact@v4 - with: - name: nargo - path: ./nargo - - - name: Set nargo on PATH - run: | - nargo_binary="${{ github.workspace }}/nargo/nargo" - chmod +x $nargo_binary - echo "$(dirname $nargo_binary)" >> $GITHUB_PATH - export PATH="$PATH:$(dirname $nargo_binary)" - nargo -V - - - name: Download compilation report - uses: actions/download-artifact@v4 - with: - name: compilation_report - path: ./test-repo/${{ matrix.project.path }}/compilation_report.json - - - name: Generate Compilation report - working-directory: ./test-repo/${{ matrix.project.path }} - run: | - ./compilation_report.sh 1 + # external_repo_compilation_report: + # needs: [build-nargo, generate_compilation_report] + # runs-on: ubuntu-latest + # permissions: + # pull-requests: write + # timeout-minutes: 30 + # strategy: + # fail-fast: false + # matrix: + # include: + # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } + # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts } + # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/parity-lib } + # # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/private-kernel-lib } + # # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/reset-kernel-lib } + # # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/rollup-lib } + # # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/types } + + # name: External repo compilation report - ${{ matrix.project.repo }} + # steps: + # - name: Checkout + # uses: actions/checkout@v4 + # with: + # repository: ${{ matrix.project.repo }} + # path: test-repo + # ref: ${{ matrix.project.ref }} + + # - name: Download nargo binary + # uses: actions/download-artifact@v4 + # with: + # name: nargo + # path: ./nargo + + # - name: Set nargo on PATH + # run: | + # nargo_binary="${{ github.workspace }}/nargo/nargo" + # chmod +x $nargo_binary + # echo "$(dirname $nargo_binary)" >> $GITHUB_PATH + # export PATH="$PATH:$(dirname $nargo_binary)" + # nargo -V + + # - name: Download compilation report + # uses: actions/download-artifact@v4 + # with: + # name: compilation_report + # path: ./test-repo/${{ matrix.project.path }}/compilation_report.json + + # - name: Generate Compilation report + # working-directory: ./test-repo/${{ matrix.project.path }} + # run: | + # ./compilation_report.sh 1 - - name: Upload compilation report - uses: actions/upload-artifact@v4 - with: - name: compilation_report - path: ./test-repo/compilation_report.json - retention-days: 3 + # - name: Upload compilation report + # uses: actions/upload-artifact@v4 + # with: + # name: compilation_report + # path: ./test-repo/compilation_report.json + # retention-days: 3 upload_compilation_report: name: Upload compilation report From c8e844437d9a83f4a849241d8aa3d6f4e8f4cf2a Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Mon, 9 Dec 2024 23:10:01 +0000 Subject: [PATCH 007/135] remove dep on old job --- .github/workflows/reports.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index cebb0f32daa..304cf4f58ac 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -332,7 +332,8 @@ jobs: upload_compilation_report: name: Upload compilation report - needs: [generate_compilation_report, external_repo_compilation_report] + # needs: [generate_compilation_report, external_repo_compilation_report] + needs: [generate_compilation_report] runs-on: ubuntu-latest permissions: pull-requests: write From 27d4d61e322eea247aaf6badc0eaf3cade0a408f Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Mon, 9 Dec 2024 23:18:01 +0000 Subject: [PATCH 008/135] test if reports runs --- .github/workflows/reports.yml | 121 +++++++++++----------------------- 1 file changed, 38 insertions(+), 83 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 304cf4f58ac..abc4f9ec42a 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -264,88 +264,12 @@ jobs: ./compilation_report.sh mv compilation_report.json ../compilation_report.json - - name: Upload compilation report - uses: actions/upload-artifact@v4 - with: - name: compilation_report - path: ../compilation_report.json - retention-days: 3 - - # external_repo_compilation_report: - # needs: [build-nargo, generate_compilation_report] - # runs-on: ubuntu-latest - # permissions: - # pull-requests: write - # timeout-minutes: 30 - # strategy: - # fail-fast: false - # matrix: - # include: - # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } - # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts } - # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/parity-lib } - # # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/private-kernel-lib } - # # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/reset-kernel-lib } - # # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/rollup-lib } - # # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/types } - - # name: External repo compilation report - ${{ matrix.project.repo }} - # steps: - # - name: Checkout - # uses: actions/checkout@v4 - # with: - # repository: ${{ matrix.project.repo }} - # path: test-repo - # ref: ${{ matrix.project.ref }} - - # - name: Download nargo binary - # uses: actions/download-artifact@v4 - # with: - # name: nargo - # path: ./nargo - - # - name: Set nargo on PATH - # run: | - # nargo_binary="${{ github.workspace }}/nargo/nargo" - # chmod +x $nargo_binary - # echo "$(dirname $nargo_binary)" >> $GITHUB_PATH - # export PATH="$PATH:$(dirname $nargo_binary)" - # nargo -V - - # - name: Download compilation report - # uses: actions/download-artifact@v4 - # with: - # name: compilation_report - # path: ./test-repo/${{ matrix.project.path }}/compilation_report.json - - # - name: Generate Compilation report - # working-directory: ./test-repo/${{ matrix.project.path }} - # run: | - # ./compilation_report.sh 1 - - # - name: Upload compilation report - # uses: actions/upload-artifact@v4 - # with: - # name: compilation_report - # path: ./test-repo/compilation_report.json - # retention-days: 3 - - upload_compilation_report: - name: Upload compilation report - # needs: [generate_compilation_report, external_repo_compilation_report] - needs: [generate_compilation_report] - runs-on: ubuntu-latest - permissions: - pull-requests: write - - name: Upload compilation report - steps: - - name: Download compilation report - uses: actions/download-artifact@v4 - with: - name: compilation_report - path: ./compilation_report.json - + # - name: Upload compilation report + # uses: actions/upload-artifact@v4 + # with: + # name: compilation_report + # path: ../compilation_report.json + # retention-days: 3 - name: Parse compilation report id: compilation_report uses: noir-lang/noir-bench-report@0d7464a8c39170523932d7846b6e6b458a294aea @@ -361,4 +285,35 @@ jobs: with: header: compilation message: ${{ steps.compilation_report.outputs.markdown }} - + + # upload_compilation_report: + # name: Upload compilation report + # # needs: [generate_compilation_report, external_repo_compilation_report] + # needs: [generate_compilation_report] + # runs-on: ubuntu-latest + # permissions: + # pull-requests: write + + # name: Download compilation report + # steps: + # - name: Download compilation report + # uses: actions/download-artifact@v4 + # with: + # name: compilation_report + # path: ./compilation_report.json + + # - name: Parse compilation report + # id: compilation_report + # uses: noir-lang/noir-bench-report@0d7464a8c39170523932d7846b6e6b458a294aea + # with: + # report: compilation_report.json + # header: | + # # Compilation Report + # memory_report: false + + # - 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: + # header: compilation + # message: ${{ steps.compilation_report.outputs.markdown }} From ce3f6529b231668aa9739d2d07aac0c3e49dd64f Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Mon, 9 Dec 2024 23:19:24 +0000 Subject: [PATCH 009/135] test w override --- .github/workflows/reports.yml | 42 ++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index abc4f9ec42a..935f1f7750f 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -264,27 +264,29 @@ jobs: ./compilation_report.sh mv compilation_report.json ../compilation_report.json - # - name: Upload compilation report - # uses: actions/upload-artifact@v4 - # with: - # name: compilation_report - # path: ../compilation_report.json - # retention-days: 3 - - name: Parse compilation report - id: compilation_report - uses: noir-lang/noir-bench-report@0d7464a8c39170523932d7846b6e6b458a294aea - with: - report: compilation_report.json - header: | - # Compilation Report - memory_report: false - - - 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 + - name: Upload compilation report + uses: actions/upload-artifact@v4 with: - header: compilation - message: ${{ steps.compilation_report.outputs.markdown }} + name: compilation_report + path: ../compilation_report.json + retention-days: 3 + overwrite: true + + # - name: Parse compilation report + # id: compilation_report + # uses: noir-lang/noir-bench-report@0d7464a8c39170523932d7846b6e6b458a294aea + # with: + # report: compilation_report.json + # header: | + # # Compilation Report + # memory_report: false + + # - 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: + # header: compilation + # message: ${{ steps.compilation_report.outputs.markdown }} # upload_compilation_report: # name: Upload compilation report From 647f60e4758f7659263fccc65746fe97bad699fb Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Mon, 9 Dec 2024 23:19:38 +0000 Subject: [PATCH 010/135] bring back upload_compilation_report --- .github/workflows/reports.yml | 64 +++++++++++++++++------------------ 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 935f1f7750f..c731f679244 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -271,7 +271,7 @@ jobs: path: ../compilation_report.json retention-days: 3 overwrite: true - + # - name: Parse compilation report # id: compilation_report # uses: noir-lang/noir-bench-report@0d7464a8c39170523932d7846b6e6b458a294aea @@ -288,34 +288,34 @@ jobs: # header: compilation # message: ${{ steps.compilation_report.outputs.markdown }} - # upload_compilation_report: - # name: Upload compilation report - # # needs: [generate_compilation_report, external_repo_compilation_report] - # needs: [generate_compilation_report] - # runs-on: ubuntu-latest - # permissions: - # pull-requests: write - - # name: Download compilation report - # steps: - # - name: Download compilation report - # uses: actions/download-artifact@v4 - # with: - # name: compilation_report - # path: ./compilation_report.json - - # - name: Parse compilation report - # id: compilation_report - # uses: noir-lang/noir-bench-report@0d7464a8c39170523932d7846b6e6b458a294aea - # with: - # report: compilation_report.json - # header: | - # # Compilation Report - # memory_report: false - - # - 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: - # header: compilation - # message: ${{ steps.compilation_report.outputs.markdown }} + upload_compilation_report: + name: Upload compilation report + # needs: [generate_compilation_report, external_repo_compilation_report] + needs: [generate_compilation_report] + runs-on: ubuntu-latest + permissions: + pull-requests: write + + name: Download compilation report + steps: + - name: Download compilation report + uses: actions/download-artifact@v4 + with: + name: compilation_report + path: ./compilation_report.json + + - name: Parse compilation report + id: compilation_report + uses: noir-lang/noir-bench-report@0d7464a8c39170523932d7846b6e6b458a294aea + with: + report: compilation_report.json + header: | + # Compilation Report + memory_report: false + + - 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: + header: compilation + message: ${{ steps.compilation_report.outputs.markdown }} From 2fcfc9a4f035e9e8652f88ac304f9d808e0a53dd Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Mon, 9 Dec 2024 23:22:44 +0000 Subject: [PATCH 011/135] just upload report --- .github/workflows/reports.yml | 65 ++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index c731f679244..c602a19dba5 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -266,9 +266,10 @@ jobs: - name: Upload compilation report uses: actions/upload-artifact@v4 + working-directory: ./ with: name: compilation_report - path: ../compilation_report.json + path: ./compilation_report.json retention-days: 3 overwrite: true @@ -288,34 +289,34 @@ jobs: # header: compilation # message: ${{ steps.compilation_report.outputs.markdown }} - upload_compilation_report: - name: Upload compilation report - # needs: [generate_compilation_report, external_repo_compilation_report] - needs: [generate_compilation_report] - runs-on: ubuntu-latest - permissions: - pull-requests: write - - name: Download compilation report - steps: - - name: Download compilation report - uses: actions/download-artifact@v4 - with: - name: compilation_report - path: ./compilation_report.json - - - name: Parse compilation report - id: compilation_report - uses: noir-lang/noir-bench-report@0d7464a8c39170523932d7846b6e6b458a294aea - with: - report: compilation_report.json - header: | - # Compilation Report - memory_report: false - - - 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: - header: compilation - message: ${{ steps.compilation_report.outputs.markdown }} + # upload_compilation_report: + # name: Upload compilation report + # # needs: [generate_compilation_report, external_repo_compilation_report] + # needs: [generate_compilation_report] + # runs-on: ubuntu-latest + # permissions: + # pull-requests: write + + # name: Download compilation report + # steps: + # - name: Download compilation report + # uses: actions/download-artifact@v4 + # with: + # name: compilation_report + # path: ./compilation_report.json + + # - name: Parse compilation report + # id: compilation_report + # uses: noir-lang/noir-bench-report@0d7464a8c39170523932d7846b6e6b458a294aea + # with: + # report: compilation_report.json + # header: | + # # Compilation Report + # memory_report: false + + # - 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: + # header: compilation + # message: ${{ steps.compilation_report.outputs.markdown }} From ed0c12f1c7f959f4869cfb36df0e129b1839a60d Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Mon, 9 Dec 2024 23:23:42 +0000 Subject: [PATCH 012/135] comment out upload --- .github/workflows/reports.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index c602a19dba5..32573e88bbd 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -264,14 +264,14 @@ jobs: ./compilation_report.sh mv compilation_report.json ../compilation_report.json - - name: Upload compilation report - uses: actions/upload-artifact@v4 - working-directory: ./ - with: - name: compilation_report - path: ./compilation_report.json - retention-days: 3 - overwrite: true + # - name: Upload compilation report + # uses: actions/upload-artifact@v4 + # working-directory: ./ + # with: + # name: compilation_report + # path: ./compilation_report.json + # retention-days: 3 + # overwrite: true # - name: Parse compilation report # id: compilation_report From 288c8d1c51627ef74a2e0f047698073dfa04d96a Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Mon, 9 Dec 2024 23:29:04 +0000 Subject: [PATCH 013/135] bring back upload artifact --- .github/workflows/reports.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 32573e88bbd..b86ed0650e6 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -264,14 +264,14 @@ jobs: ./compilation_report.sh mv compilation_report.json ../compilation_report.json - # - name: Upload compilation report - # uses: actions/upload-artifact@v4 - # working-directory: ./ - # with: - # name: compilation_report - # path: ./compilation_report.json - # retention-days: 3 - # overwrite: true + - name: Upload compilation report + uses: actions/upload-artifact@v4 + working-directory: ./ + with: + name: in_progress_compilation_report + path: ./compilation_report.json + retention-days: 3 + overwrite: true # - name: Parse compilation report # id: compilation_report From e67822124d94aac623c12edb5f62d8d00d9c4141 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Mon, 9 Dec 2024 23:29:48 +0000 Subject: [PATCH 014/135] add debug --- .github/workflows/reports.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index b86ed0650e6..778feff7aa1 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -263,6 +263,7 @@ jobs: run: | ./compilation_report.sh mv compilation_report.json ../compilation_report.json + echo $PWD - name: Upload compilation report uses: actions/upload-artifact@v4 From 4ca798613056451c093b7e9fd4b47cdfa96fd0a8 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Mon, 9 Dec 2024 23:31:47 +0000 Subject: [PATCH 015/135] remove artifact upload --- .github/workflows/reports.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 778feff7aa1..e4708631d88 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -38,7 +38,6 @@ jobs: path: ./dist/* retention-days: 3 - compare_gates_reports: name: Circuit sizes needs: [build-nargo] @@ -265,14 +264,14 @@ jobs: mv compilation_report.json ../compilation_report.json echo $PWD - - name: Upload compilation report - uses: actions/upload-artifact@v4 - working-directory: ./ - with: - name: in_progress_compilation_report - path: ./compilation_report.json - retention-days: 3 - overwrite: true + # - name: Upload compilation report + # uses: actions/upload-artifact@v4 + # working-directory: ./ + # with: + # name: in_progress_compilation_report + # path: ./compilation_report.json + # retention-days: 3 + # overwrite: true # - name: Parse compilation report # id: compilation_report From 537e2c78129079832aa29a9ec32453ecd1a1f6d6 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Mon, 9 Dec 2024 23:38:45 +0000 Subject: [PATCH 016/135] try bringing back again --- .github/workflows/reports.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index e4708631d88..45ea50004a0 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -264,14 +264,14 @@ jobs: mv compilation_report.json ../compilation_report.json echo $PWD - # - name: Upload compilation report - # uses: actions/upload-artifact@v4 - # working-directory: ./ - # with: - # name: in_progress_compilation_report - # path: ./compilation_report.json - # retention-days: 3 - # overwrite: true + - name: Upload compilation report + uses: actions/upload-artifact@v4 + working-directory: ./ + with: + name: in_progress_compilation_report + path: compilation_report.json + retention-days: 3 + overwrite: true # - name: Parse compilation report # id: compilation_report From b6f2179fcce5e2c0d5d2ccad313b538d485fc7bb Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Mon, 9 Dec 2024 23:40:14 +0000 Subject: [PATCH 017/135] do not specify working directory --- .github/workflows/reports.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 45ea50004a0..4676a6c29ba 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -266,7 +266,6 @@ jobs: - name: Upload compilation report uses: actions/upload-artifact@v4 - working-directory: ./ with: name: in_progress_compilation_report path: compilation_report.json From 290d81c91e50c927bd2303dacca9c81105326fdd Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Mon, 9 Dec 2024 23:40:53 +0000 Subject: [PATCH 018/135] bring back upload report --- .github/workflows/reports.yml | 62 +++++++++++++++++------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 4676a6c29ba..7fb5918fc56 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -288,34 +288,34 @@ jobs: # header: compilation # message: ${{ steps.compilation_report.outputs.markdown }} - # upload_compilation_report: - # name: Upload compilation report - # # needs: [generate_compilation_report, external_repo_compilation_report] - # needs: [generate_compilation_report] - # runs-on: ubuntu-latest - # permissions: - # pull-requests: write - - # name: Download compilation report - # steps: - # - name: Download compilation report - # uses: actions/download-artifact@v4 - # with: - # name: compilation_report - # path: ./compilation_report.json - - # - name: Parse compilation report - # id: compilation_report - # uses: noir-lang/noir-bench-report@0d7464a8c39170523932d7846b6e6b458a294aea - # with: - # report: compilation_report.json - # header: | - # # Compilation Report - # memory_report: false - - # - 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: - # header: compilation - # message: ${{ steps.compilation_report.outputs.markdown }} + upload_compilation_report: + name: Upload compilation report + # needs: [generate_compilation_report, external_repo_compilation_report] + needs: [generate_compilation_report] + runs-on: ubuntu-latest + permissions: + pull-requests: write + + name: Download compilation report + steps: + - name: Download compilation report + uses: actions/download-artifact@v4 + with: + name: compilation_report + path: ./compilation_report.json + + - name: Parse compilation report + id: compilation_report + uses: noir-lang/noir-bench-report@0d7464a8c39170523932d7846b6e6b458a294aea + with: + report: compilation_report.json + header: | + # Compilation Report + memory_report: false + + - 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: + header: compilation + message: ${{ steps.compilation_report.outputs.markdown }} From 0f1cc54735c139dbb70cba4aa8cf96ede2a8c398 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Mon, 9 Dec 2024 23:47:01 +0000 Subject: [PATCH 019/135] change path --- .github/workflows/reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 7fb5918fc56..1d132bc8743 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -302,7 +302,7 @@ jobs: uses: actions/download-artifact@v4 with: name: compilation_report - path: ./compilation_report.json + path: compilation_report.json - name: Parse compilation report id: compilation_report From 6aefe80d10666576bc0eb744dd8a7fbfbe30c83d Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Mon, 9 Dec 2024 23:49:44 +0000 Subject: [PATCH 020/135] specify dir path not file name --- .github/workflows/reports.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 1d132bc8743..deac6e7d0c7 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -298,11 +298,12 @@ jobs: name: Download compilation report steps: + - name: Download compilation report uses: actions/download-artifact@v4 with: name: compilation_report - path: compilation_report.json + path: ./ - name: Parse compilation report id: compilation_report From dee5f1459393c61b2299d8c7b043504800c1fc44 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Mon, 9 Dec 2024 23:50:50 +0000 Subject: [PATCH 021/135] do not specify path --- .github/workflows/reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index deac6e7d0c7..358700aa749 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -303,7 +303,7 @@ jobs: uses: actions/download-artifact@v4 with: name: compilation_report - path: ./ + # path: ./ - name: Parse compilation report id: compilation_report From 308a2effaec90c078ad23dff017d5690622dd6f0 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Mon, 9 Dec 2024 23:51:05 +0000 Subject: [PATCH 022/135] nit with brackets --- .github/workflows/reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 358700aa749..0e99cf3c3f4 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -291,7 +291,7 @@ jobs: upload_compilation_report: name: Upload compilation report # needs: [generate_compilation_report, external_repo_compilation_report] - needs: [generate_compilation_report] + needs: generate_compilation_report runs-on: ubuntu-latest permissions: pull-requests: write From 81910d26ec0b0c26e73fcb56c4754c22ce0f4ce8 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Mon, 9 Dec 2024 23:56:22 +0000 Subject: [PATCH 023/135] try to trigger report --- .github/workflows/reports.yml | 58 +++++++++++++++++------------------ 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 0e99cf3c3f4..0bb19e47dc8 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -288,35 +288,35 @@ jobs: # header: compilation # message: ${{ steps.compilation_report.outputs.markdown }} - upload_compilation_report: - name: Upload compilation report - # needs: [generate_compilation_report, external_repo_compilation_report] - needs: generate_compilation_report - runs-on: ubuntu-latest - permissions: - pull-requests: write - - name: Download compilation report - steps: - - - name: Download compilation report - uses: actions/download-artifact@v4 - with: - name: compilation_report + # upload_compilation_report: + # name: Upload compilation report + # # needs: [generate_compilation_report, external_repo_compilation_report] + # needs: generate_compilation_report + # runs-on: ubuntu-latest + # permissions: + # pull-requests: write + + # name: Download compilation report + # steps: + + # - name: Download compilation report + # uses: actions/download-artifact@v4 + # with: + # name: compilation_report # path: ./ - - name: Parse compilation report - id: compilation_report - uses: noir-lang/noir-bench-report@0d7464a8c39170523932d7846b6e6b458a294aea - with: - report: compilation_report.json - header: | - # Compilation Report - memory_report: false + # - name: Parse compilation report + # id: compilation_report + # uses: noir-lang/noir-bench-report@0d7464a8c39170523932d7846b6e6b458a294aea + # with: + # report: compilation_report.json + # header: | + # # Compilation Report + # memory_report: false - - 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: - header: compilation - message: ${{ steps.compilation_report.outputs.markdown }} + # - 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: + # header: compilation + # message: ${{ steps.compilation_report.outputs.markdown }} From 804f2310f11665ef2a7b6aa45176b464c361ed88 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 00:07:25 +0000 Subject: [PATCH 024/135] test next job --- .github/workflows/reports.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 0bb19e47dc8..ae7246b75ff 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -288,16 +288,18 @@ jobs: # header: compilation # message: ${{ steps.compilation_report.outputs.markdown }} - # upload_compilation_report: - # name: Upload compilation report - # # needs: [generate_compilation_report, external_repo_compilation_report] - # needs: generate_compilation_report - # runs-on: ubuntu-latest - # permissions: - # pull-requests: write - - # name: Download compilation report - # steps: + upload_compilation_report: + name: Upload compilation report + # needs: [generate_compilation_report, external_repo_compilation_report] + needs: generate_compilation_report + runs-on: ubuntu-latest + permissions: + pull-requests: write + + name: Download compilation report + steps: + - name: Test run + run: echo $PWD # - name: Download compilation report # uses: actions/download-artifact@v4 From 69cb0c94b4a38e40fb977e921491131830afeb65 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 00:07:45 +0000 Subject: [PATCH 025/135] update name --- .github/workflows/reports.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index ae7246b75ff..4f084e4c0f7 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -301,11 +301,11 @@ jobs: - name: Test run run: echo $PWD - # - name: Download compilation report - # uses: actions/download-artifact@v4 - # with: - # name: compilation_report - # path: ./ + - name: Download compilation report + uses: actions/download-artifact@v4 + with: + name: in_progress_compilation_report + path: ./ # - name: Parse compilation report # id: compilation_report From 4e01594ea7488a46552327862a4ad6688cc605cc Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 00:08:39 +0000 Subject: [PATCH 026/135] remove the download --- .github/workflows/reports.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 4f084e4c0f7..50d0a652ffc 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -301,11 +301,11 @@ jobs: - name: Test run run: echo $PWD - - name: Download compilation report - uses: actions/download-artifact@v4 - with: - name: in_progress_compilation_report - path: ./ + # - name: Download compilation report + # uses: actions/download-artifact@v4 + # with: + # name: in_progress_compilation_report + # path: ./ # - name: Parse compilation report # id: compilation_report From e778e86c0d64b1ecff6cefc0527a40f3a33f16af Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 00:11:02 +0000 Subject: [PATCH 027/135] use checout and download without path --- .github/workflows/reports.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 50d0a652ffc..8156ad6f01f 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -291,21 +291,23 @@ jobs: upload_compilation_report: name: Upload compilation report # needs: [generate_compilation_report, external_repo_compilation_report] - needs: generate_compilation_report + needs: [generate_compilation_report] runs-on: ubuntu-latest permissions: pull-requests: write name: Download compilation report steps: + - uses: actions/checkout@v4 + - name: Test run run: echo $PWD - # - name: Download compilation report - # uses: actions/download-artifact@v4 - # with: - # name: in_progress_compilation_report - # path: ./ + - name: Download compilation report + uses: actions/download-artifact@v4 + with: + name: in_progress_compilation_report + # path: ./ # - name: Parse compilation report # id: compilation_report From 25d39f8ce437a3ac9ecd0063b6652da68d949925 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 00:12:35 +0000 Subject: [PATCH 028/135] remove the download --- .github/workflows/reports.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 8156ad6f01f..b053b775952 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -303,10 +303,10 @@ jobs: - name: Test run run: echo $PWD - - name: Download compilation report - uses: actions/download-artifact@v4 - with: - name: in_progress_compilation_report + # - name: Download compilation report + # uses: actions/download-artifact@v4 + # with: + # name: in_progress_compilation_report # path: ./ # - name: Parse compilation report From 350f2d83fab61bee93c72fb299cc0b09ac01333f Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 00:13:50 +0000 Subject: [PATCH 029/135] delete name --- .github/workflows/reports.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index b053b775952..5bc17a76af7 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -296,7 +296,6 @@ jobs: permissions: pull-requests: write - name: Download compilation report steps: - uses: actions/checkout@v4 From c156bb9e0cbaf88d9ef90d414ac10c823c1a2be5 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 00:14:12 +0000 Subject: [PATCH 030/135] bring back download --- .github/workflows/reports.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 5bc17a76af7..7e65cd09acd 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -302,11 +302,11 @@ jobs: - name: Test run run: echo $PWD - # - name: Download compilation report - # uses: actions/download-artifact@v4 - # with: - # name: in_progress_compilation_report - # path: ./ + - name: Download compilation report + uses: actions/download-artifact@v4 + with: + name: in_progress_compilation_report + path: ./ # - name: Parse compilation report # id: compilation_report From 3e43fbea6b7b5eaa34366ecb3ea5226a079889f0 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 00:15:37 +0000 Subject: [PATCH 031/135] correct indents --- .github/workflows/reports.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 7e65cd09acd..598fec08372 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -297,16 +297,15 @@ jobs: pull-requests: write steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4 - - name: Test run + - name: Test run run: echo $PWD - name: Download compilation report uses: actions/download-artifact@v4 with: name: in_progress_compilation_report - path: ./ # - name: Parse compilation report # id: compilation_report From b36429a367e2a9b4ab281c55b511020e2e5a363a Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 00:19:50 +0000 Subject: [PATCH 032/135] no download --- .github/workflows/reports.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 598fec08372..313d3dfec2f 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -302,10 +302,10 @@ jobs: - name: Test run run: echo $PWD - - name: Download compilation report - uses: actions/download-artifact@v4 - with: - name: in_progress_compilation_report + # - name: Download compilation report + # uses: actions/download-artifact@v4 + # with: + # name: in_progress_compilation_report # - name: Parse compilation report # id: compilation_report From 3e8dffc819e24ac8bc55881fa8513f01d1c0ffcc Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 00:21:49 +0000 Subject: [PATCH 033/135] bring back parsing the report --- .github/workflows/reports.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 313d3dfec2f..48530a0cdfb 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -299,26 +299,26 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Test run - run: echo $PWD + # - name: Test run + # run: echo $PWD # - name: Download compilation report # uses: actions/download-artifact@v4 # with: # name: in_progress_compilation_report - # - name: Parse compilation report - # id: compilation_report - # uses: noir-lang/noir-bench-report@0d7464a8c39170523932d7846b6e6b458a294aea - # with: - # report: compilation_report.json - # header: | - # # Compilation Report - # memory_report: false + - name: Parse compilation report + id: compilation_report + uses: noir-lang/noir-bench-report@0d7464a8c39170523932d7846b6e6b458a294aea + with: + report: compilation_report.json + header: | + # Compilation Report + memory_report: false - # - 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: - # header: compilation - # message: ${{ steps.compilation_report.outputs.markdown }} + - 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: + header: compilation + message: ${{ steps.compilation_report.outputs.markdown }} From 6cde9c405adb383fbe6f750437a24da22a56178f Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 00:32:52 +0000 Subject: [PATCH 034/135] download report --- .github/workflows/reports.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 48530a0cdfb..801497f3491 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -302,10 +302,10 @@ jobs: # - name: Test run # run: echo $PWD - # - name: Download compilation report - # uses: actions/download-artifact@v4 - # with: - # name: in_progress_compilation_report + - name: Download compilation report + uses: actions/download-artifact@v4 + with: + name: in_progress_compilation_report - name: Parse compilation report id: compilation_report From 15a5fa35a52a0677c78940a31820275c18e969d0 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 00:45:54 +0000 Subject: [PATCH 035/135] bring back external repos --- .github/workflows/reports.yml | 84 ++++++++++++++++++++++++++--------- 1 file changed, 63 insertions(+), 21 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 801497f3491..b4878a2812c 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -262,7 +262,6 @@ jobs: run: | ./compilation_report.sh mv compilation_report.json ../compilation_report.json - echo $PWD - name: Upload compilation report uses: actions/upload-artifact@v4 @@ -272,26 +271,72 @@ jobs: retention-days: 3 overwrite: true - # - name: Parse compilation report - # id: compilation_report - # uses: noir-lang/noir-bench-report@0d7464a8c39170523932d7846b6e6b458a294aea - # with: - # report: compilation_report.json - # header: | - # # Compilation Report - # memory_report: false - - # - 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: - # header: compilation - # message: ${{ steps.compilation_report.outputs.markdown }} + external_repo_compilation_report: + needs: [build-nargo, generate_compilation_report] + runs-on: ubuntu-latest + permissions: + pull-requests: write + timeout-minutes: 30 + strategy: + fail-fast: false + matrix: + include: + - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } + - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts } + - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/parity-lib } + # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/private-kernel-lib } + # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/reset-kernel-lib } + # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/rollup-lib } + # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/types } + + name: External repo compilation report - ${{ matrix.project.repo }} + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + repository: ${{ matrix.project.repo }} + path: test-repo + ref: ${{ matrix.project.ref }} + + - name: Download nargo binary + uses: actions/download-artifact@v4 + with: + name: nargo + path: ./nargo + + - name: Set nargo on PATH + run: | + nargo_binary="${{ github.workspace }}/nargo/nargo" + chmod +x $nargo_binary + echo "$(dirname $nargo_binary)" >> $GITHUB_PATH + export PATH="$PATH:$(dirname $nargo_binary)" + nargo -V + + - name: Download compilation report + uses: actions/download-artifact@v4 + with: + name: in_progress_compilation_report + path: ./test-repo/${{ matrix.project.path }} + + - name: Generate compilation report + working-directory: ./test-repo/${{ matrix.project.path }} + run: | + ./compilation_report.sh 1 + cd ~ + mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report.json + + - name: Upload compilation report + uses: actions/upload-artifact@v4 + with: + name: in_progress_compilation_report + path: compilation_report.json + retention-days: 3 + overwrite: true upload_compilation_report: name: Upload compilation report - # needs: [generate_compilation_report, external_repo_compilation_report] - needs: [generate_compilation_report] + needs: [generate_compilation_report, external_repo_compilation_report] + # needs: [generate_compilation_report] runs-on: ubuntu-latest permissions: pull-requests: write @@ -299,9 +344,6 @@ jobs: steps: - uses: actions/checkout@v4 - # - name: Test run - # run: echo $PWD - - name: Download compilation report uses: actions/download-artifact@v4 with: From 10c88b0ffe64faa3e5a7dd66f08776eddd92aa20 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 00:47:22 +0000 Subject: [PATCH 036/135] simplify external_repo_compilation_report for debugging --- .github/workflows/reports.yml | 40 +++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index b4878a2812c..78ccfe5de99 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -312,26 +312,26 @@ jobs: export PATH="$PATH:$(dirname $nargo_binary)" nargo -V - - name: Download compilation report - uses: actions/download-artifact@v4 - with: - name: in_progress_compilation_report - path: ./test-repo/${{ matrix.project.path }} - - - name: Generate compilation report - working-directory: ./test-repo/${{ matrix.project.path }} - run: | - ./compilation_report.sh 1 - cd ~ - mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report.json - - - name: Upload compilation report - uses: actions/upload-artifact@v4 - with: - name: in_progress_compilation_report - path: compilation_report.json - retention-days: 3 - overwrite: true + # - name: Download compilation report + # uses: actions/download-artifact@v4 + # with: + # name: in_progress_compilation_report + # path: ./test-repo/${{ matrix.project.path }} + + # - name: Generate compilation report + # working-directory: ./test-repo/${{ matrix.project.path }} + # run: | + # ./compilation_report.sh 1 + # cd ~ + # mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report.json + + # - name: Upload compilation report + # uses: actions/upload-artifact@v4 + # with: + # name: in_progress_compilation_report + # path: compilation_report.json + # retention-days: 3 + # overwrite: true upload_compilation_report: name: Upload compilation report From 7ecc8fee0f17556c12dd3461aadd6ee1cc052dcf Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 00:48:25 +0000 Subject: [PATCH 037/135] only checkout matrix --- .github/workflows/reports.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 78ccfe5de99..839d6bd70aa 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -298,19 +298,19 @@ jobs: path: test-repo ref: ${{ matrix.project.ref }} - - name: Download nargo binary - uses: actions/download-artifact@v4 - with: - name: nargo - path: ./nargo + # - name: Download nargo binary + # uses: actions/download-artifact@v4 + # with: + # name: nargo + # path: ./nargo - - name: Set nargo on PATH - run: | - nargo_binary="${{ github.workspace }}/nargo/nargo" - chmod +x $nargo_binary - echo "$(dirname $nargo_binary)" >> $GITHUB_PATH - export PATH="$PATH:$(dirname $nargo_binary)" - nargo -V + # - name: Set nargo on PATH + # run: | + # nargo_binary="${{ github.workspace }}/nargo/nargo" + # chmod +x $nargo_binary + # echo "$(dirname $nargo_binary)" >> $GITHUB_PATH + # export PATH="$PATH:$(dirname $nargo_binary)" + # nargo -V # - name: Download compilation report # uses: actions/download-artifact@v4 From ac1a2b6b9c14cee88c0c196e283693ade63d1e1d Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 01:02:04 +0000 Subject: [PATCH 038/135] debugging --- .github/workflows/reports.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 839d6bd70aa..1e83138a65c 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -274,8 +274,8 @@ jobs: external_repo_compilation_report: needs: [build-nargo, generate_compilation_report] runs-on: ubuntu-latest - permissions: - pull-requests: write + # permissions: + # pull-requests: write timeout-minutes: 30 strategy: fail-fast: false @@ -291,18 +291,18 @@ jobs: name: External repo compilation report - ${{ matrix.project.repo }} steps: - - name: Checkout - uses: actions/checkout@v4 - with: - repository: ${{ matrix.project.repo }} - path: test-repo - ref: ${{ matrix.project.ref }} - - # - name: Download nargo binary - # uses: actions/download-artifact@v4 + # - name: Checkout + # uses: actions/checkout@v4 # with: - # name: nargo - # path: ./nargo + # repository: ${{ matrix.project.repo }} + # path: test-repo + # ref: ${{ matrix.project.ref }} + + - name: Download nargo binary + uses: actions/download-artifact@v4 + with: + name: nargo + path: ./nargo # - name: Set nargo on PATH # run: | From a1690cd2758e3cc081fe066ab5935109cbccec45 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 01:10:50 +0000 Subject: [PATCH 039/135] do not use include --- .github/workflows/reports.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 1e83138a65c..54d94856ffc 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -280,10 +280,12 @@ jobs: strategy: fail-fast: false matrix: - include: - - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } - - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts } - - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/parity-lib } + project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } + project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts } + # include: + # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } + # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts } + # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/parity-lib } # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/private-kernel-lib } # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/reset-kernel-lib } # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/rollup-lib } From 581450a300f7384c3345a6752ec7855e3de42725 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 01:12:03 +0000 Subject: [PATCH 040/135] one project --- .github/workflows/reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 54d94856ffc..67f3ade6b44 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -280,7 +280,7 @@ jobs: strategy: fail-fast: false matrix: - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } + # project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts } # include: # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } From 1b59d222b616fc5919a67451027b1651ba3996f7 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 01:12:38 +0000 Subject: [PATCH 041/135] put project in an array --- .github/workflows/reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 67f3ade6b44..e5328f8dc78 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -281,7 +281,7 @@ jobs: fail-fast: false matrix: # project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts } + project: [{ repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts }] # include: # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts } From 739b8e9bbbbf7eae9c0077abc249830970264037 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 01:15:56 +0000 Subject: [PATCH 042/135] go back to include --- .github/workflows/reports.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index e5328f8dc78..afe9caa84c8 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -281,10 +281,10 @@ jobs: fail-fast: false matrix: # project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } - project: [{ repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts }] - # include: - # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } - # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts } + # project: [{ repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts }] + include: + - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } + - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts } # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/parity-lib } # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/private-kernel-lib } # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/reset-kernel-lib } From bafb26b32172ead4b8d33afed2211937fbca4632 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 01:17:15 +0000 Subject: [PATCH 043/135] remove matrix --- .github/workflows/reports.yml | 68 +++++++++++++++++------------------ 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index afe9caa84c8..a8e57404b34 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -271,40 +271,40 @@ jobs: retention-days: 3 overwrite: true - external_repo_compilation_report: - needs: [build-nargo, generate_compilation_report] - runs-on: ubuntu-latest - # permissions: - # pull-requests: write - timeout-minutes: 30 - strategy: - fail-fast: false - matrix: - # project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } - # project: [{ repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts }] - include: - - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } - - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts } - # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/parity-lib } - # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/private-kernel-lib } - # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/reset-kernel-lib } - # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/rollup-lib } - # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/types } - - name: External repo compilation report - ${{ matrix.project.repo }} - steps: - # - name: Checkout - # uses: actions/checkout@v4 - # with: - # repository: ${{ matrix.project.repo }} - # path: test-repo - # ref: ${{ matrix.project.ref }} - - - name: Download nargo binary - uses: actions/download-artifact@v4 - with: - name: nargo - path: ./nargo +# external_repo_compilation_report: +# needs: [build-nargo, generate_compilation_report] +# runs-on: ubuntu-latest +# # permissions: +# # pull-requests: write +# timeout-minutes: 30 +# strategy: +# fail-fast: false +# matrix: +# # project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } +# # project: [{ repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts }] +# include: +# - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } +# - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts } +# # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/parity-lib } +# # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/private-kernel-lib } +# # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/reset-kernel-lib } +# # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/rollup-lib } +# # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/types } + +# name: External repo compilation report - ${{ matrix.project.repo }} +# steps: +# # - name: Checkout +# # uses: actions/checkout@v4 +# # with: +# # repository: ${{ matrix.project.repo }} +# # path: test-repo +# # ref: ${{ matrix.project.ref }} + +# - name: Download nargo binary +# uses: actions/download-artifact@v4 +# with: +# name: nargo +# path: ./nargo # - name: Set nargo on PATH # run: | From 46db5a64a5c34742f2a8bebeb00586b731c64bdd Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 01:44:26 +0000 Subject: [PATCH 044/135] fix dep in upload_compilation_report --- .github/workflows/reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index a8e57404b34..e3f9775e51d 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -337,8 +337,8 @@ jobs: upload_compilation_report: name: Upload compilation report - needs: [generate_compilation_report, external_repo_compilation_report] - # needs: [generate_compilation_report] + # needs: [generate_compilation_report, external_repo_compilation_report] + needs: [generate_compilation_report] runs-on: ubuntu-latest permissions: pull-requests: write From 4c24ff28613f782a0454000fceebb6afe9609724 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 01:45:52 +0000 Subject: [PATCH 045/135] test matrix --- .github/workflows/reports.yml | 48 +++++++++++++++++------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index e3f9775e51d..e0f602d279e 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -271,28 +271,28 @@ jobs: retention-days: 3 overwrite: true -# external_repo_compilation_report: -# needs: [build-nargo, generate_compilation_report] -# runs-on: ubuntu-latest -# # permissions: -# # pull-requests: write -# timeout-minutes: 30 -# strategy: -# fail-fast: false -# matrix: -# # project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } -# # project: [{ repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts }] -# include: -# - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } -# - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts } -# # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/parity-lib } -# # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/private-kernel-lib } -# # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/reset-kernel-lib } -# # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/rollup-lib } -# # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/types } - -# name: External repo compilation report - ${{ matrix.project.repo }} -# steps: + external_repo_compilation_report: + needs: [build-nargo, generate_compilation_report] + runs-on: ubuntu-latest + timeout-minutes: 30 + strategy: + fail-fast: false + matrix: + # project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } + # project: [{ repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts }] + include: + - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } + - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts } + # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/parity-lib } + # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/private-kernel-lib } + # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/reset-kernel-lib } + # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/rollup-lib } + # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/types } + + name: External repo compilation report - ${{ matrix.project.repo }} + steps: + - name: Test run + run: echo $PWD # # - name: Checkout # # uses: actions/checkout@v4 # # with: @@ -337,8 +337,8 @@ jobs: upload_compilation_report: name: Upload compilation report - # needs: [generate_compilation_report, external_repo_compilation_report] - needs: [generate_compilation_report] + needs: [generate_compilation_report, external_repo_compilation_report] + # needs: [generate_compilation_report] runs-on: ubuntu-latest permissions: pull-requests: write From a8faea6b8a115f610dd9549b68b243dd24449780 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 01:46:46 +0000 Subject: [PATCH 046/135] only have have matrix --- .github/workflows/reports.yml | 62 +++++++++++++++++------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index e0f602d279e..67d8cbb0157 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -335,34 +335,34 @@ jobs: # retention-days: 3 # overwrite: true - upload_compilation_report: - name: Upload compilation report - needs: [generate_compilation_report, external_repo_compilation_report] - # needs: [generate_compilation_report] - runs-on: ubuntu-latest - permissions: - pull-requests: write - - steps: - - uses: actions/checkout@v4 - - - name: Download compilation report - uses: actions/download-artifact@v4 - with: - name: in_progress_compilation_report - - - name: Parse compilation report - id: compilation_report - uses: noir-lang/noir-bench-report@0d7464a8c39170523932d7846b6e6b458a294aea - with: - report: compilation_report.json - header: | - # Compilation Report - memory_report: false - - - 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: - header: compilation - message: ${{ steps.compilation_report.outputs.markdown }} + # upload_compilation_report: + # name: Upload compilation report + # needs: [generate_compilation_report, external_repo_compilation_report] + # # needs: [generate_compilation_report] + # runs-on: ubuntu-latest + # permissions: + # pull-requests: write + + # steps: + # - uses: actions/checkout@v4 + + # - name: Download compilation report + # uses: actions/download-artifact@v4 + # with: + # name: in_progress_compilation_report + + # - name: Parse compilation report + # id: compilation_report + # uses: noir-lang/noir-bench-report@0d7464a8c39170523932d7846b6e6b458a294aea + # with: + # report: compilation_report.json + # header: | + # # Compilation Report + # memory_report: false + + # - 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: + # header: compilation + # message: ${{ steps.compilation_report.outputs.markdown }} From e2e7e5e52f5f6447b346080fc321d5999f59e27f Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 01:48:27 +0000 Subject: [PATCH 047/135] only depend on generate_compilation_report --- .github/workflows/reports.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 67d8cbb0157..8c4e07b4199 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -272,7 +272,7 @@ jobs: overwrite: true external_repo_compilation_report: - needs: [build-nargo, generate_compilation_report] + needs: [generate_compilation_report] runs-on: ubuntu-latest timeout-minutes: 30 strategy: @@ -292,7 +292,8 @@ jobs: name: External repo compilation report - ${{ matrix.project.repo }} steps: - name: Test run - run: echo $PWD + run: | + echo $PWD # # - name: Checkout # # uses: actions/checkout@v4 # # with: From d82a52e26f2917f2d18d174edfd8aaa5740f7dbe Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 01:51:58 +0000 Subject: [PATCH 048/135] fix indents --- .github/workflows/reports.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 8c4e07b4199..6566abde557 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -291,9 +291,9 @@ jobs: name: External repo compilation report - ${{ matrix.project.repo }} steps: - - name: Test run - run: | - echo $PWD + - name: Test run + run: | + echo $PWD # # - name: Checkout # # uses: actions/checkout@v4 # # with: From efb0bc6b1fe7af9a7fe7eac431325add9ec02da1 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 01:52:57 +0000 Subject: [PATCH 049/135] one more indent --- .github/workflows/reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 6566abde557..120549ff06a 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -271,7 +271,7 @@ jobs: retention-days: 3 overwrite: true - external_repo_compilation_report: + external_repo_compilation_report: needs: [generate_compilation_report] runs-on: ubuntu-latest timeout-minutes: 30 From 0a05826313ca7515cf3379e485a7ee7abee83f96 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 02:00:39 +0000 Subject: [PATCH 050/135] bring back report logic --- .github/workflows/reports.yml | 41 ++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 120549ff06a..6e7ed33475f 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -294,26 +294,27 @@ jobs: - name: Test run run: | echo $PWD -# # - name: Checkout -# # uses: actions/checkout@v4 -# # with: -# # repository: ${{ matrix.project.repo }} -# # path: test-repo -# # ref: ${{ matrix.project.ref }} - -# - name: Download nargo binary -# uses: actions/download-artifact@v4 -# with: -# name: nargo -# path: ./nargo - - # - name: Set nargo on PATH - # run: | - # nargo_binary="${{ github.workspace }}/nargo/nargo" - # chmod +x $nargo_binary - # echo "$(dirname $nargo_binary)" >> $GITHUB_PATH - # export PATH="$PATH:$(dirname $nargo_binary)" - # nargo -V + + - name: Checkout + uses: actions/checkout@v4 + with: + repository: ${{ matrix.project.repo }} + path: test-repo + ref: ${{ matrix.project.ref }} + + - name: Download nargo binary + uses: actions/download-artifact@v4 + with: + name: nargo + path: ./nargo + + - name: Set nargo on PATH + run: | + nargo_binary="${{ github.workspace }}/nargo/nargo" + chmod +x $nargo_binary + echo "$(dirname $nargo_binary)" >> $GITHUB_PATH + export PATH="$PATH:$(dirname $nargo_binary)" + nargo -V # - name: Download compilation report # uses: actions/download-artifact@v4 From b812d85a82f0a89adaba9010c39687721f8e2c1e Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 02:01:01 +0000 Subject: [PATCH 051/135] bring back action external repo reports --- .github/workflows/reports.yml | 44 ++++++++++++++++------------------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 6e7ed33475f..60e1538f396 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -291,10 +291,6 @@ jobs: name: External repo compilation report - ${{ matrix.project.repo }} steps: - - name: Test run - run: | - echo $PWD - - name: Checkout uses: actions/checkout@v4 with: @@ -316,26 +312,26 @@ jobs: export PATH="$PATH:$(dirname $nargo_binary)" nargo -V - # - name: Download compilation report - # uses: actions/download-artifact@v4 - # with: - # name: in_progress_compilation_report - # path: ./test-repo/${{ matrix.project.path }} - - # - name: Generate compilation report - # working-directory: ./test-repo/${{ matrix.project.path }} - # run: | - # ./compilation_report.sh 1 - # cd ~ - # mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report.json - - # - name: Upload compilation report - # uses: actions/upload-artifact@v4 - # with: - # name: in_progress_compilation_report - # path: compilation_report.json - # retention-days: 3 - # overwrite: true + - name: Download compilation report + uses: actions/download-artifact@v4 + with: + name: in_progress_compilation_report + path: ./test-repo/${{ matrix.project.path }} + + - name: Generate compilation report + working-directory: ./test-repo/${{ matrix.project.path }} + run: | + ./compilation_report.sh 1 + cd ~ + mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report.json + + - name: Upload compilation report + uses: actions/upload-artifact@v4 + with: + name: in_progress_compilation_report + path: compilation_report.json + retention-days: 3 + overwrite: true # upload_compilation_report: # name: Upload compilation report From 14a4733634ae284b813138270a73aa910f86e7fc Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 02:01:32 +0000 Subject: [PATCH 052/135] upload report --- .github/workflows/reports.yml | 62 +++++++++++++++++------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 60e1538f396..d8e7fc21126 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -333,34 +333,34 @@ jobs: retention-days: 3 overwrite: true - # upload_compilation_report: - # name: Upload compilation report - # needs: [generate_compilation_report, external_repo_compilation_report] - # # needs: [generate_compilation_report] - # runs-on: ubuntu-latest - # permissions: - # pull-requests: write - - # steps: - # - uses: actions/checkout@v4 - - # - name: Download compilation report - # uses: actions/download-artifact@v4 - # with: - # name: in_progress_compilation_report - - # - name: Parse compilation report - # id: compilation_report - # uses: noir-lang/noir-bench-report@0d7464a8c39170523932d7846b6e6b458a294aea - # with: - # report: compilation_report.json - # header: | - # # Compilation Report - # memory_report: false - - # - 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: - # header: compilation - # message: ${{ steps.compilation_report.outputs.markdown }} + upload_compilation_report: + name: Upload compilation report + needs: [generate_compilation_report, external_repo_compilation_report] + # needs: [generate_compilation_report] + runs-on: ubuntu-latest + permissions: + pull-requests: write + + steps: + - uses: actions/checkout@v4 + + - name: Download compilation report + uses: actions/download-artifact@v4 + with: + name: in_progress_compilation_report + + - name: Parse compilation report + id: compilation_report + uses: noir-lang/noir-bench-report@0d7464a8c39170523932d7846b6e6b458a294aea + with: + report: compilation_report.json + header: | + # Compilation Report + memory_report: false + + - 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: + header: compilation + message: ${{ steps.compilation_report.outputs.markdown }} From 778dc219bceac15af5881a76234ade79ebac24be Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 02:13:06 +0000 Subject: [PATCH 053/135] upload script --- .github/workflows/reports.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index d8e7fc21126..15be6c9fa29 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -263,6 +263,14 @@ jobs: ./compilation_report.sh mv compilation_report.json ../compilation_report.json + - name: Upload compilation report script + uses: actions/upload-artifact@v4 + with: + name: compilation_report_script + path: compilation_report.sh + retention-days: 3 + overwrite: true + - name: Upload compilation report uses: actions/upload-artifact@v4 with: @@ -312,6 +320,12 @@ jobs: export PATH="$PATH:$(dirname $nargo_binary)" nargo -V + - name: Download compilation report script + uses: actions/download-artifact@v4 + with: + name: compilation_report_script + path: ./test-repo/${{ matrix.project.path }} + - name: Download compilation report uses: actions/download-artifact@v4 with: @@ -322,7 +336,9 @@ jobs: working-directory: ./test-repo/${{ matrix.project.path }} run: | ./compilation_report.sh 1 + echo $PWD cd ~ + echo $PWD mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report.json - name: Upload compilation report From 056b6c93e03dafac39db4e8200279f83afb47a22 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 02:18:19 +0000 Subject: [PATCH 054/135] compilation_report.sh correct path --- .github/workflows/reports.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 15be6c9fa29..ba483dd6596 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -267,7 +267,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: compilation_report_script - path: compilation_report.sh + path: ./test_programs/compilation_report.sh retention-days: 3 overwrite: true @@ -351,8 +351,7 @@ jobs: upload_compilation_report: name: Upload compilation report - needs: [generate_compilation_report, external_repo_compilation_report] - # needs: [generate_compilation_report] + needs: [external_repo_compilation_report] runs-on: ubuntu-latest permissions: pull-requests: write From d19c101f1a1fe81ec0ea2113e37947db8a720536 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 02:22:49 +0000 Subject: [PATCH 055/135] change perms on compilation_report.sh --- .github/workflows/reports.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index ba483dd6596..e923cbb40ed 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -335,6 +335,7 @@ jobs: - name: Generate compilation report working-directory: ./test-repo/${{ matrix.project.path }} run: | + chmod +x compilation_report.sh ./compilation_report.sh 1 echo $PWD cd ~ From 585ce2d35332270516a17319fcc3e3ec1e12eaa7 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 02:30:52 +0000 Subject: [PATCH 056/135] delete test_dirs --- test_programs/compilation_report.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/test_programs/compilation_report.sh b/test_programs/compilation_report.sh index 83b48d09230..7320389b722 100755 --- a/test_programs/compilation_report.sh +++ b/test_programs/compilation_report.sh @@ -3,7 +3,6 @@ set -e current_dir=$(pwd) base_path="$current_dir/execution_success" -test_dirs=$(ls $base_path) # Tests to be profiled for compilation report # tests_to_profile=("sha256_regression" "regression_4709" "ram_blowup_regression") From e7fcdb38876617a9a2de219fdeee42bd531eeb72 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 02:36:40 +0000 Subject: [PATCH 057/135] switch how we upoad report --- .github/workflows/reports.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index e923cbb40ed..b7decdbebd7 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -338,15 +338,12 @@ jobs: chmod +x compilation_report.sh ./compilation_report.sh 1 echo $PWD - cd ~ - echo $PWD - mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report.json - + - name: Upload compilation report uses: actions/upload-artifact@v4 with: name: in_progress_compilation_report - path: compilation_report.json + path: ./test-repo/${{ matrix.project.path }}/compilation_report.json retention-days: 3 overwrite: true From 68a097ee99027a538ca49c9bfe56f1d9a8d52652 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 02:42:36 +0000 Subject: [PATCH 058/135] switch order of paths --- .github/workflows/reports.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index b7decdbebd7..25477a2c357 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -333,17 +333,18 @@ jobs: path: ./test-repo/${{ matrix.project.path }} - name: Generate compilation report - working-directory: ./test-repo/${{ matrix.project.path }} + # working-directory: ./test-repo/${{ matrix.project.path }} run: | - chmod +x compilation_report.sh - ./compilation_report.sh 1 + chmod +x ./test-repo/${{ matrix.project.path }}/compilation_report.sh/compilation_report.sh + ./test-repo/${{ matrix.project.path }}/compilation_report.sh 1 echo $PWD - + mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report.json + - name: Upload compilation report uses: actions/upload-artifact@v4 with: name: in_progress_compilation_report - path: ./test-repo/${{ matrix.project.path }}/compilation_report.json + path: compilation_report.json retention-days: 3 overwrite: true From ccbdaff8e5bd47dc829f994946caf8030d2b113f Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 02:47:05 +0000 Subject: [PATCH 059/135] fix bad path --- .github/workflows/reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 25477a2c357..fd7a79edf4c 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -335,7 +335,7 @@ jobs: - name: Generate compilation report # working-directory: ./test-repo/${{ matrix.project.path }} run: | - chmod +x ./test-repo/${{ matrix.project.path }}/compilation_report.sh/compilation_report.sh + chmod +x ./test-repo/${{ matrix.project.path }}/compilation_report.sh ./test-repo/${{ matrix.project.path }}/compilation_report.sh 1 echo $PWD mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report.json From c93c7ae2b7f2b339b69878c38e1c817ea5ad1a03 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 03:33:48 +0000 Subject: [PATCH 060/135] split out move --- .github/workflows/reports.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index fd7a79edf4c..c596299b160 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -333,12 +333,14 @@ jobs: path: ./test-repo/${{ matrix.project.path }} - name: Generate compilation report - # working-directory: ./test-repo/${{ matrix.project.path }} + working-directory: ./test-repo/${{ matrix.project.path }} run: | - chmod +x ./test-repo/${{ matrix.project.path }}/compilation_report.sh - ./test-repo/${{ matrix.project.path }}/compilation_report.sh 1 + chmod +x ./compilation_report.sh + ./compilation_report.sh 1 echo $PWD - mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report.json + + - name: Move compilation report + run: mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report.json - name: Upload compilation report uses: actions/upload-artifact@v4 From d9ea61eb788e39f146e064a8116d9094a2061804 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 03:51:35 +0000 Subject: [PATCH 061/135] fetch the name from nargo toml rather than the specified dir --- test_programs/compilation_report.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test_programs/compilation_report.sh b/test_programs/compilation_report.sh index 7320389b722..64c6a3eaca6 100755 --- a/test_programs/compilation_report.sh +++ b/test_programs/compilation_report.sh @@ -39,8 +39,10 @@ for dir in ${tests_to_profile[@]}; do cd $base_path/$dir + PACKAGE_NAME=grep -oP 'name\s*=\s*"\K[^"]+' Nargo.toml + COMPILE_TIME=$((time nargo compile --force) 2>&1 | grep real | grep -oE '[0-9]+m[0-9]+.[0-9]+s') - echo -e " {\n \"artifact_name\":\"$dir\",\n \"time\":\"$COMPILE_TIME\"" >> $current_dir/compilation_report.json + echo -e " {\n \"artifact_name\":\"$PACKAGE_NAME\",\n \"time\":\"$COMPILE_TIME\"" >> $current_dir/compilation_report.json if (($ITER == $NUM_ARTIFACTS)); then echo "}" >> $current_dir/compilation_report.json From 982635a4e0dc0e51abef94c8b164bfbd2eb4e692 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 03:52:28 +0000 Subject: [PATCH 062/135] wrap in parens cmd --- test_programs/compilation_report.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_programs/compilation_report.sh b/test_programs/compilation_report.sh index 64c6a3eaca6..dfc15219d85 100755 --- a/test_programs/compilation_report.sh +++ b/test_programs/compilation_report.sh @@ -39,7 +39,7 @@ for dir in ${tests_to_profile[@]}; do cd $base_path/$dir - PACKAGE_NAME=grep -oP 'name\s*=\s*"\K[^"]+' Nargo.toml + PACKAGE_NAME=$(grep -oP 'name\s*=\s*"\K[^"]+' Nargo.toml) COMPILE_TIME=$((time nargo compile --force) 2>&1 | grep real | grep -oE '[0-9]+m[0-9]+.[0-9]+s') echo -e " {\n \"artifact_name\":\"$PACKAGE_NAME\",\n \"time\":\"$COMPILE_TIME\"" >> $current_dir/compilation_report.json From 5794b1756953ded7a49ce4bd03f097929c3bbb4f Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 04:00:47 +0000 Subject: [PATCH 063/135] debug --- test_programs/compilation_report.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test_programs/compilation_report.sh b/test_programs/compilation_report.sh index dfc15219d85..39ffde31ce5 100755 --- a/test_programs/compilation_report.sh +++ b/test_programs/compilation_report.sh @@ -5,7 +5,6 @@ current_dir=$(pwd) base_path="$current_dir/execution_success" # Tests to be profiled for compilation report -# tests_to_profile=("sha256_regression" "regression_4709" "ram_blowup_regression") tests_to_profile=("sha256_regression" "regression_4709" "ram_blowup_regression") # If there is an argument that means we want to re-use an already existing compilation report @@ -16,7 +15,7 @@ if [ "$#" -eq 0 ]; then else # Delete last two lines so that we can re-use the previous report - sed -i '$d' compilation_report.json | sed -i '$d' compilation_report.json + sed -i '$d' $current_dir/compilation_report.json | sed -i '$d' c$current_dir/compilation_report.json echo "}, " >> $current_dir/compilation_report.json @@ -41,6 +40,8 @@ for dir in ${tests_to_profile[@]}; do PACKAGE_NAME=$(grep -oP 'name\s*=\s*"\K[^"]+' Nargo.toml) + echo $PACKAGE_NAME + COMPILE_TIME=$((time nargo compile --force) 2>&1 | grep real | grep -oE '[0-9]+m[0-9]+.[0-9]+s') echo -e " {\n \"artifact_name\":\"$PACKAGE_NAME\",\n \"time\":\"$COMPILE_TIME\"" >> $current_dir/compilation_report.json From f1756ef1b2fe78da24d250bba3534870a00685d4 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 04:01:34 +0000 Subject: [PATCH 064/135] one more --- test_programs/compilation_report.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test_programs/compilation_report.sh b/test_programs/compilation_report.sh index 39ffde31ce5..9626d364c53 100755 --- a/test_programs/compilation_report.sh +++ b/test_programs/compilation_report.sh @@ -38,6 +38,8 @@ for dir in ${tests_to_profile[@]}; do cd $base_path/$dir + echo "$base_path/$dir" + PACKAGE_NAME=$(grep -oP 'name\s*=\s*"\K[^"]+' Nargo.toml) echo $PACKAGE_NAME From 82f0a75f34db2d20778427852d0accf26f836238 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 04:06:32 +0000 Subject: [PATCH 065/135] type in path --- test_programs/compilation_report.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_programs/compilation_report.sh b/test_programs/compilation_report.sh index 9626d364c53..279c30cd044 100755 --- a/test_programs/compilation_report.sh +++ b/test_programs/compilation_report.sh @@ -15,7 +15,7 @@ if [ "$#" -eq 0 ]; then else # Delete last two lines so that we can re-use the previous report - sed -i '$d' $current_dir/compilation_report.json | sed -i '$d' c$current_dir/compilation_report.json + sed -i '$d' $current_dir/compilation_report.json | sed -i '$d' $current_dir/compilation_report.json echo "}, " >> $current_dir/compilation_report.json From a3b4987b6d93180621c5ba0714ccc2d1b7fc2279 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 04:11:55 +0000 Subject: [PATCH 066/135] remove echo --- .github/workflows/reports.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index c596299b160..9dec2d32938 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -337,7 +337,6 @@ jobs: run: | chmod +x ./compilation_report.sh ./compilation_report.sh 1 - echo $PWD - name: Move compilation report run: mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report.json From 0c2f8bd2c8a3fd5f60219ea26ead1ab4dbfae8aa Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 04:18:01 +0000 Subject: [PATCH 067/135] use extended reg ex --- test_programs/compilation_report.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test_programs/compilation_report.sh b/test_programs/compilation_report.sh index 279c30cd044..a13cdcd280b 100755 --- a/test_programs/compilation_report.sh +++ b/test_programs/compilation_report.sh @@ -40,8 +40,11 @@ for dir in ${tests_to_profile[@]}; do echo "$base_path/$dir" - PACKAGE_NAME=$(grep -oP 'name\s*=\s*"\K[^"]+' Nargo.toml) + FILES=$(ls ./) + echo $FILES + # PACKAGE_NAME=$(grep -oP 'name\s*=\s*"\K[^"]+' Nargo.toml) + PACKAGE_NAME=$(grep -oE 'name\s*=\s*"([^"]+)"' your_file.toml | sed 's/name\s*=\s*"//;s/"//') echo $PACKAGE_NAME COMPILE_TIME=$((time nargo compile --force) 2>&1 | grep real | grep -oE '[0-9]+m[0-9]+.[0-9]+s') From 4ef49dac6f7055b856caaf99604b0541dd80fa52 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 04:18:11 +0000 Subject: [PATCH 068/135] correct name --- test_programs/compilation_report.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_programs/compilation_report.sh b/test_programs/compilation_report.sh index a13cdcd280b..7fa938a43f9 100755 --- a/test_programs/compilation_report.sh +++ b/test_programs/compilation_report.sh @@ -44,7 +44,7 @@ for dir in ${tests_to_profile[@]}; do echo $FILES # PACKAGE_NAME=$(grep -oP 'name\s*=\s*"\K[^"]+' Nargo.toml) - PACKAGE_NAME=$(grep -oE 'name\s*=\s*"([^"]+)"' your_file.toml | sed 's/name\s*=\s*"//;s/"//') + PACKAGE_NAME=$(grep -oE 'name\s*=\s*"([^"]+)"' Nargo.toml | sed 's/name\s*=\s*"//;s/"//') echo $PACKAGE_NAME COMPILE_TIME=$((time nargo compile --force) 2>&1 | grep real | grep -oE '[0-9]+m[0-9]+.[0-9]+s') From ad8fe1309c2716cec7d3d94f7869eeeb9c9b11df Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 04:36:57 +0000 Subject: [PATCH 069/135] print compilation reports as we are failing on json deserialization --- .github/workflows/reports.yml | 4 ++-- test_programs/compilation_report.sh | 7 +------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 9dec2d32938..3c163735343 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -261,6 +261,7 @@ jobs: working-directory: ./test_programs run: | ./compilation_report.sh + cat compilation_report.json mv compilation_report.json ../compilation_report.json - name: Upload compilation report script @@ -286,8 +287,6 @@ jobs: strategy: fail-fast: false matrix: - # project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } - # project: [{ repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts }] include: - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts } @@ -337,6 +336,7 @@ jobs: run: | chmod +x ./compilation_report.sh ./compilation_report.sh 1 + cat compilation_report.json - name: Move compilation report run: mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report.json diff --git a/test_programs/compilation_report.sh b/test_programs/compilation_report.sh index 7fa938a43f9..4bc9fc980be 100755 --- a/test_programs/compilation_report.sh +++ b/test_programs/compilation_report.sh @@ -38,13 +38,8 @@ for dir in ${tests_to_profile[@]}; do cd $base_path/$dir - echo "$base_path/$dir" - - FILES=$(ls ./) - echo $FILES - - # PACKAGE_NAME=$(grep -oP 'name\s*=\s*"\K[^"]+' Nargo.toml) PACKAGE_NAME=$(grep -oE 'name\s*=\s*"([^"]+)"' Nargo.toml | sed 's/name\s*=\s*"//;s/"//') + echo $PACKAGE_NAME COMPILE_TIME=$((time nargo compile --force) 2>&1 | grep real | grep -oE '[0-9]+m[0-9]+.[0-9]+s') From e68a32ccf7e61b29876789adb1fe40a817ac210b Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 04:53:42 +0000 Subject: [PATCH 070/135] try to extract name, it is successful locally but not in CI --- test_programs/compilation_report.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test_programs/compilation_report.sh b/test_programs/compilation_report.sh index 4bc9fc980be..eba2889a8fb 100755 --- a/test_programs/compilation_report.sh +++ b/test_programs/compilation_report.sh @@ -38,7 +38,9 @@ for dir in ${tests_to_profile[@]}; do cd $base_path/$dir - PACKAGE_NAME=$(grep -oE 'name\s*=\s*"([^"]+)"' Nargo.toml | sed 's/name\s*=\s*"//;s/"//') + echo $base_path/$dir + + PACKAGE_NAME=$(grep -oE 'name\s*=\s*"([^"]+)"' ./Nargo.toml | sed 's/name\s*=\s*"//;s/"//') echo $PACKAGE_NAME From d28637f57d965c3f5fe690e31e19e7fea8c23be2 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 05:03:51 +0000 Subject: [PATCH 071/135] more debugging stuff --- test_programs/compilation_report.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test_programs/compilation_report.sh b/test_programs/compilation_report.sh index eba2889a8fb..2ab5647a09a 100755 --- a/test_programs/compilation_report.sh +++ b/test_programs/compilation_report.sh @@ -39,11 +39,18 @@ for dir in ${tests_to_profile[@]}; do cd $base_path/$dir echo $base_path/$dir + echo $(ls ./) - PACKAGE_NAME=$(grep -oE 'name\s*=\s*"([^"]+)"' ./Nargo.toml | sed 's/name\s*=\s*"//;s/"//') + cat Nargo.toml + + NAME_LINE=$(grep -oE 'name\s*=\s*"([^"]+)"' Nargo.toml) + echo $NAME_LINE + + PACKAGE_NAME=$(grep -oE 'name\s*=\s*"([^"]+)"' $base_path/$dir/Nargo.toml | sed 's/name\s*=\s*"//;s/"//') echo $PACKAGE_NAME + COMPILE_TIME=$((time nargo compile --force) 2>&1 | grep real | grep -oE '[0-9]+m[0-9]+.[0-9]+s') echo -e " {\n \"artifact_name\":\"$PACKAGE_NAME\",\n \"time\":\"$COMPILE_TIME\"" >> $current_dir/compilation_report.json From 7592273a38e0dde45010dac0e9f5ee40b909af45 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 05:04:26 +0000 Subject: [PATCH 072/135] try again --- test_programs/compilation_report.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test_programs/compilation_report.sh b/test_programs/compilation_report.sh index 2ab5647a09a..4eca196381d 100755 --- a/test_programs/compilation_report.sh +++ b/test_programs/compilation_report.sh @@ -15,7 +15,7 @@ if [ "$#" -eq 0 ]; then else # Delete last two lines so that we can re-use the previous report - sed -i '$d' $current_dir/compilation_report.json | sed -i '$d' $current_dir/compilation_report.json + sed -i '$d' compilation_report.json | sed -i '$d' compilation_report.json echo "}, " >> $current_dir/compilation_report.json @@ -45,12 +45,11 @@ for dir in ${tests_to_profile[@]}; do NAME_LINE=$(grep -oE 'name\s*=\s*"([^"]+)"' Nargo.toml) echo $NAME_LINE - + PACKAGE_NAME=$(grep -oE 'name\s*=\s*"([^"]+)"' $base_path/$dir/Nargo.toml | sed 's/name\s*=\s*"//;s/"//') echo $PACKAGE_NAME - COMPILE_TIME=$((time nargo compile --force) 2>&1 | grep real | grep -oE '[0-9]+m[0-9]+.[0-9]+s') echo -e " {\n \"artifact_name\":\"$PACKAGE_NAME\",\n \"time\":\"$COMPILE_TIME\"" >> $current_dir/compilation_report.json From 167f2e766a067dbc90722d1bf370e0541e5174be Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 05:18:25 +0000 Subject: [PATCH 073/135] discern on workspaces --- .../reference_counts/compilation_report.sh | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 test_programs/execution_success/reference_counts/compilation_report.sh diff --git a/test_programs/execution_success/reference_counts/compilation_report.sh b/test_programs/execution_success/reference_counts/compilation_report.sh new file mode 100644 index 00000000000..01ee5f85cd3 --- /dev/null +++ b/test_programs/execution_success/reference_counts/compilation_report.sh @@ -0,0 +1,75 @@ +#!/usr/bin/env bash +set -e + +current_dir=$(pwd) +base_path="$current_dir/execution_success" + +# Tests to be profiled for compilation report +tests_to_profile=("sha256_regression" "regression_4709" "ram_blowup_regression") + +# If there is an argument that means we want to re-use an already existing compilation report +# rather than generating a new one. +# When reusing a report, the script can only profile one additional test at the moment. +if [ "$#" -eq 0 ]; then + echo "{\"compilation_reports\": [ " > $current_dir/compilation_report.json + +else + # Delete last two lines so that we can re-use the previous report + sed -i '$d' $current_dir/compilation_report.json | sed -i '$d' $current_dir/compilation_report.json + + echo "}, " >> $current_dir/compilation_report.json + + # The additional report is expected to be in the current directory + base_path="$current_dir" + tests_to_profile=(".") +fi + +ITER="1" +NUM_ARTIFACTS=${#tests_to_profile[@]} + +for dir in ${tests_to_profile[@]}; do + if [[ " ${excluded_dirs[@]} " =~ " ${dir} " ]]; then + continue + fi + + if [[ ${CI-false} = "true" ]] && [[ " ${ci_excluded_dirs[@]} " =~ " ${dir} " ]]; then + continue + fi + + cd $base_path/$dir + + echo $base_path/$dir + echo $(ls ./) + + cat Nargo.toml + + NAME_LINE=$(grep -oE 'name\s*=\s*"([^"]+)"' Nargo.toml) + echo $NAME_LINE + + PACKAGE_NAME=$(grep -oE 'name\s*=\s*"([^"]+)"' $base_path/$dir/Nargo.toml | sed 's/name\s*=\s*"//;s/"//') + + echo $PACKAGE_NAME + + head -n 1 Nargo.toml | grep -q "[workspace]" + if [ $? -eq 0 ] && [ "$#" -eq 0 ]; then + PACKAGE_NAME=$(basename $current_dir) + else + PACKAGE_NAME=$dir + fi + + echo $PACKAGE_NAME + + COMPILE_TIME=$((time nargo compile --force) 2>&1 | grep real | grep -oE '[0-9]+m[0-9]+.[0-9]+s') + echo -e " {\n \"artifact_name\":\"$PACKAGE_NAME\",\n \"time\":\"$COMPILE_TIME\"" >> $current_dir/compilation_report.json + + if (($ITER == $NUM_ARTIFACTS)); then + echo "}" >> $current_dir/compilation_report.json + else + echo "}, " >> $current_dir/compilation_report.json + fi + + ITER=$(( $ITER + 1 )) +done + +echo "]}" >> $current_dir/compilation_report.json + From 98b5666b2814bb863281f8d443aa327ad87684d1 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 05:31:30 +0000 Subject: [PATCH 074/135] update the actual report --- test_programs/compilation_report.sh | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/test_programs/compilation_report.sh b/test_programs/compilation_report.sh index 4eca196381d..ce8be3fc144 100755 --- a/test_programs/compilation_report.sh +++ b/test_programs/compilation_report.sh @@ -15,7 +15,7 @@ if [ "$#" -eq 0 ]; then else # Delete last two lines so that we can re-use the previous report - sed -i '$d' compilation_report.json | sed -i '$d' compilation_report.json + sed -i '$d' $current_dir/compilation_report.json | sed -i '$d' $current_dir/compilation_report.json echo "}, " >> $current_dir/compilation_report.json @@ -43,16 +43,25 @@ for dir in ${tests_to_profile[@]}; do cat Nargo.toml - NAME_LINE=$(grep -oE 'name\s*=\s*"([^"]+)"' Nargo.toml) + NAME_LINE=$(grep -oE 'name\s*=\s*"([^"]+)"' Nargo.toml || true) echo $NAME_LINE - PACKAGE_NAME=$(grep -oE 'name\s*=\s*"([^"]+)"' $base_path/$dir/Nargo.toml | sed 's/name\s*=\s*"//;s/"//') - + PACKAGE_NAME=$(grep -oE 'name\s*=\s*"([^"]+)"' $base_path/$dir/Nargo.toml | sed 's/name\s*=\s*"//;s/"//' || true) + echo $PACKAGE_NAME + + head -n 1 Nargo.toml | grep -q "[workspace]" + if [ $? -eq 0 ] && [ "$#" -ne 0 ]; then + echo "here" + PACKAGE_NAME=$(basename $current_dir) + else + echo "no here" + PACKAGE_NAME=$dir + fi + echo $PACKAGE_NAME COMPILE_TIME=$((time nargo compile --force) 2>&1 | grep real | grep -oE '[0-9]+m[0-9]+.[0-9]+s') echo -e " {\n \"artifact_name\":\"$PACKAGE_NAME\",\n \"time\":\"$COMPILE_TIME\"" >> $current_dir/compilation_report.json - if (($ITER == $NUM_ARTIFACTS)); then echo "}" >> $current_dir/compilation_report.json else @@ -63,4 +72,3 @@ for dir in ${tests_to_profile[@]}; do done echo "]}" >> $current_dir/compilation_report.json - From 8074a85055218830f023f11d51f2321eb4fc85db Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 05:41:33 +0000 Subject: [PATCH 075/135] just avoid using grep on the nargo toml --- test_programs/compilation_report.sh | 34 ++++++++++++++++------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/test_programs/compilation_report.sh b/test_programs/compilation_report.sh index ce8be3fc144..2d492af1174 100755 --- a/test_programs/compilation_report.sh +++ b/test_programs/compilation_report.sh @@ -15,9 +15,9 @@ if [ "$#" -eq 0 ]; then else # Delete last two lines so that we can re-use the previous report - sed -i '$d' $current_dir/compilation_report.json | sed -i '$d' $current_dir/compilation_report.json + sed -i '$d' compilation_report.json | sed -i '$d' compilation_report.json - echo "}, " >> $current_dir/compilation_report.json + echo "}, " >> compilation_report.json # The additional report is expected to be in the current directory base_path="$current_dir" @@ -39,25 +39,29 @@ for dir in ${tests_to_profile[@]}; do cd $base_path/$dir echo $base_path/$dir - echo $(ls ./) cat Nargo.toml - NAME_LINE=$(grep -oE 'name\s*=\s*"([^"]+)"' Nargo.toml || true) - echo $NAME_LINE + # NAME_LINE=$({ grep -oE 'name\s*=\s*"([^"]+)"' Nargo.toml || true }) + # echo $NAME_LINE - PACKAGE_NAME=$(grep -oE 'name\s*=\s*"([^"]+)"' $base_path/$dir/Nargo.toml | sed 's/name\s*=\s*"//;s/"//' || true) - echo $PACKAGE_NAME + # PACKAGE_NAME=$(grep -oE 'name\s*=\s*"([^"]+)"' $base_path/$dir/Nargo.toml | sed 's/name\s*=\s*"//;s/"//' || true) + # echo $PACKAGE_NAME - head -n 1 Nargo.toml | grep -q "[workspace]" - if [ $? -eq 0 ] && [ "$#" -ne 0 ]; then - echo "here" - PACKAGE_NAME=$(basename $current_dir) - else - echo "no here" - PACKAGE_NAME=$dir - fi + # head -n 1 Nargo.toml | grep -q "[workspace]" + # if [ $? -eq 0 ] && [ "$#" -ne 0 ]; then + # echo "here" + # PACKAGE_NAME=$(basename $current_dir) + # else + # echo "no here" + # PACKAGE_NAME=$dir + # fi + PACKAGE_NAME=$dir + if [ "$#" -ne 0 ]; then + PACKAGE_NAME=$(basename $current_dir) + fi + echo $PACKAGE_NAME COMPILE_TIME=$((time nargo compile --force) 2>&1 | grep real | grep -oE '[0-9]+m[0-9]+.[0-9]+s') From 7eb4dc0f653073c6152a975224a7f16218a4d788 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 05:46:22 +0000 Subject: [PATCH 076/135] account for new lines --- test_programs/compilation_report.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test_programs/compilation_report.sh b/test_programs/compilation_report.sh index 2d492af1174..c4e06ed948a 100755 --- a/test_programs/compilation_report.sh +++ b/test_programs/compilation_report.sh @@ -15,7 +15,7 @@ if [ "$#" -eq 0 ]; then else # Delete last two lines so that we can re-use the previous report - sed -i '$d' compilation_report.json | sed -i '$d' compilation_report.json + sed -i '${/^$/d;}' compilation_report.json | sed -i '$d' compilation_report.json | sed -i '$d' compilation_report.json echo "}, " >> compilation_report.json @@ -61,7 +61,7 @@ for dir in ${tests_to_profile[@]}; do if [ "$#" -ne 0 ]; then PACKAGE_NAME=$(basename $current_dir) fi - + echo $PACKAGE_NAME COMPILE_TIME=$((time nargo compile --force) 2>&1 | grep real | grep -oE '[0-9]+m[0-9]+.[0-9]+s') From c267d919647c17c79d11c74e73c7041a52f9db16 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 06:30:40 +0000 Subject: [PATCH 077/135] generate fresh reports and combine them using jq --- .github/workflows/reports.yml | 54 +++++++++---- test_programs/compilation_report.sh | 29 ++----- .../reference_counts/compilation_report.sh | 75 ------------------- 3 files changed, 45 insertions(+), 113 deletions(-) delete mode 100644 test_programs/execution_success/reference_counts/compilation_report.sh diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 3c163735343..b014d175744 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -290,7 +290,7 @@ jobs: include: - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts } - # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/parity-lib } + - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/parity-lib } # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/private-kernel-lib } # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/reset-kernel-lib } # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/rollup-lib } @@ -325,11 +325,11 @@ jobs: name: compilation_report_script path: ./test-repo/${{ matrix.project.path }} - - name: Download compilation report - uses: actions/download-artifact@v4 - with: - name: in_progress_compilation_report - path: ./test-repo/${{ matrix.project.path }} + # - name: Download compilation report + # uses: actions/download-artifact@v4 + # with: + # name: in_progress_compilation_report + # path: ./test-repo/${{ matrix.project.path }} - name: Generate compilation report working-directory: ./test-repo/${{ matrix.project.path }} @@ -339,15 +339,20 @@ jobs: cat compilation_report.json - name: Move compilation report - run: mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report.json - - - name: Upload compilation report - uses: actions/upload-artifact@v4 - with: - name: in_progress_compilation_report - path: compilation_report.json - retention-days: 3 - overwrite: true + run: | + mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report.json + echo "compilation_report_${{ matrix.project.repo }}=./compilation_report.json" >> $GITHUB_OUTPUT + + # - name: Upload compilation report + # uses: actions/upload-artifact@v4 + # with: + # name: in_progress_compilation_report + # path: compilation_report.json + # retention-days: 3 + # overwrite: true + + outputs: + compilation_reports: ${{ steps.set_report_output.outputs.compilation_reports }} upload_compilation_report: name: Upload compilation report @@ -364,6 +369,25 @@ jobs: with: name: in_progress_compilation_report + - name: Aggregate compilation reports using jq + run: | + echo "Merging reports" + + combined_reports="[]" + + # Iterate over each report and merge the 'compilation_reports' array + for report in ${{ needs.external_repo_compilation_report.outputs.compilation_reports }}; do + # Extract the 'compilation_reports' array from each report and merge it + combined_reports=$(jq '[.compilation_reports[]] + '"$combined_reports" <<< "$(cat "$report")") + done + + combined_reports=$(jq '[.compilation_reports[]] + '"$combined_reports" <<< "$(cat ./compilation_report.json)") + + # Wrap the merged compilation reports into a new object as to keep the 'compilation_reports' key + final_report="{\"compilation_reports\": $combined_reports}" + + echo "$final_report" > compilation_report.json + - name: Parse compilation report id: compilation_report uses: noir-lang/noir-bench-report@0d7464a8c39170523932d7846b6e6b458a294aea diff --git a/test_programs/compilation_report.sh b/test_programs/compilation_report.sh index c4e06ed948a..3dad9044732 100755 --- a/test_programs/compilation_report.sh +++ b/test_programs/compilation_report.sh @@ -7,17 +7,18 @@ base_path="$current_dir/execution_success" # Tests to be profiled for compilation report tests_to_profile=("sha256_regression" "regression_4709" "ram_blowup_regression") +echo "{\"compilation_reports\": [ " > $current_dir/compilation_report.json + # If there is an argument that means we want to re-use an already existing compilation report # rather than generating a new one. # When reusing a report, the script can only profile one additional test at the moment. if [ "$#" -eq 0 ]; then - echo "{\"compilation_reports\": [ " > $current_dir/compilation_report.json - + # echo "{\"compilation_reports\": [ " > $current_dir/compilation_report.json else # Delete last two lines so that we can re-use the previous report - sed -i '${/^$/d;}' compilation_report.json | sed -i '$d' compilation_report.json | sed -i '$d' compilation_report.json + # sed -i '${/^$/d;}' compilation_report.json | sed -i '$d' compilation_report.json | sed -i '$d' compilation_report.json - echo "}, " >> compilation_report.json + # echo "}, " >> compilation_report.json # The additional report is expected to be in the current directory base_path="$current_dir" @@ -36,27 +37,8 @@ for dir in ${tests_to_profile[@]}; do continue fi - cd $base_path/$dir - echo $base_path/$dir - cat Nargo.toml - - # NAME_LINE=$({ grep -oE 'name\s*=\s*"([^"]+)"' Nargo.toml || true }) - # echo $NAME_LINE - - # PACKAGE_NAME=$(grep -oE 'name\s*=\s*"([^"]+)"' $base_path/$dir/Nargo.toml | sed 's/name\s*=\s*"//;s/"//' || true) - # echo $PACKAGE_NAME - - # head -n 1 Nargo.toml | grep -q "[workspace]" - # if [ $? -eq 0 ] && [ "$#" -ne 0 ]; then - # echo "here" - # PACKAGE_NAME=$(basename $current_dir) - # else - # echo "no here" - # PACKAGE_NAME=$dir - # fi - PACKAGE_NAME=$dir if [ "$#" -ne 0 ]; then PACKAGE_NAME=$(basename $current_dir) @@ -66,6 +48,7 @@ for dir in ${tests_to_profile[@]}; do COMPILE_TIME=$((time nargo compile --force) 2>&1 | grep real | grep -oE '[0-9]+m[0-9]+.[0-9]+s') echo -e " {\n \"artifact_name\":\"$PACKAGE_NAME\",\n \"time\":\"$COMPILE_TIME\"" >> $current_dir/compilation_report.json + if (($ITER == $NUM_ARTIFACTS)); then echo "}" >> $current_dir/compilation_report.json else diff --git a/test_programs/execution_success/reference_counts/compilation_report.sh b/test_programs/execution_success/reference_counts/compilation_report.sh deleted file mode 100644 index 01ee5f85cd3..00000000000 --- a/test_programs/execution_success/reference_counts/compilation_report.sh +++ /dev/null @@ -1,75 +0,0 @@ -#!/usr/bin/env bash -set -e - -current_dir=$(pwd) -base_path="$current_dir/execution_success" - -# Tests to be profiled for compilation report -tests_to_profile=("sha256_regression" "regression_4709" "ram_blowup_regression") - -# If there is an argument that means we want to re-use an already existing compilation report -# rather than generating a new one. -# When reusing a report, the script can only profile one additional test at the moment. -if [ "$#" -eq 0 ]; then - echo "{\"compilation_reports\": [ " > $current_dir/compilation_report.json - -else - # Delete last two lines so that we can re-use the previous report - sed -i '$d' $current_dir/compilation_report.json | sed -i '$d' $current_dir/compilation_report.json - - echo "}, " >> $current_dir/compilation_report.json - - # The additional report is expected to be in the current directory - base_path="$current_dir" - tests_to_profile=(".") -fi - -ITER="1" -NUM_ARTIFACTS=${#tests_to_profile[@]} - -for dir in ${tests_to_profile[@]}; do - if [[ " ${excluded_dirs[@]} " =~ " ${dir} " ]]; then - continue - fi - - if [[ ${CI-false} = "true" ]] && [[ " ${ci_excluded_dirs[@]} " =~ " ${dir} " ]]; then - continue - fi - - cd $base_path/$dir - - echo $base_path/$dir - echo $(ls ./) - - cat Nargo.toml - - NAME_LINE=$(grep -oE 'name\s*=\s*"([^"]+)"' Nargo.toml) - echo $NAME_LINE - - PACKAGE_NAME=$(grep -oE 'name\s*=\s*"([^"]+)"' $base_path/$dir/Nargo.toml | sed 's/name\s*=\s*"//;s/"//') - - echo $PACKAGE_NAME - - head -n 1 Nargo.toml | grep -q "[workspace]" - if [ $? -eq 0 ] && [ "$#" -eq 0 ]; then - PACKAGE_NAME=$(basename $current_dir) - else - PACKAGE_NAME=$dir - fi - - echo $PACKAGE_NAME - - COMPILE_TIME=$((time nargo compile --force) 2>&1 | grep real | grep -oE '[0-9]+m[0-9]+.[0-9]+s') - echo -e " {\n \"artifact_name\":\"$PACKAGE_NAME\",\n \"time\":\"$COMPILE_TIME\"" >> $current_dir/compilation_report.json - - if (($ITER == $NUM_ARTIFACTS)); then - echo "}" >> $current_dir/compilation_report.json - else - echo "}, " >> $current_dir/compilation_report.json - fi - - ITER=$(( $ITER + 1 )) -done - -echo "]}" >> $current_dir/compilation_report.json - From b8cf7327d626b0a7ae35592546c6b3c8d08a40c7 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 06:34:36 +0000 Subject: [PATCH 078/135] fixup if statement --- test_programs/compilation_report.sh | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/test_programs/compilation_report.sh b/test_programs/compilation_report.sh index 3dad9044732..80ed9014ff2 100755 --- a/test_programs/compilation_report.sh +++ b/test_programs/compilation_report.sh @@ -12,15 +12,20 @@ echo "{\"compilation_reports\": [ " > $current_dir/compilation_report.json # If there is an argument that means we want to re-use an already existing compilation report # rather than generating a new one. # When reusing a report, the script can only profile one additional test at the moment. -if [ "$#" -eq 0 ]; then - # echo "{\"compilation_reports\": [ " > $current_dir/compilation_report.json -else - # Delete last two lines so that we can re-use the previous report - # sed -i '${/^$/d;}' compilation_report.json | sed -i '$d' compilation_report.json | sed -i '$d' compilation_report.json +# if [ "$#" -eq 0 ]; then +# echo "{\"compilation_reports\": [ " > $current_dir/compilation_report.json +# else +# # Delete last two lines so that we can re-use the previous report +# sed -i '${/^$/d;}' compilation_report.json | sed -i '$d' compilation_report.json | sed -i '$d' compilation_report.json - # echo "}, " >> compilation_report.json +# echo "}, " >> compilation_report.json - # The additional report is expected to be in the current directory +# # The additional report is expected to be in the current directory +# base_path="$current_dir" +# tests_to_profile=(".") +# fi + +if [ "$#" -ne 0 ]; then base_path="$current_dir" tests_to_profile=(".") fi From 37db26bf275771e1ef1d4e7e9b390819ff1e7c98 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 06:42:24 +0000 Subject: [PATCH 079/135] debug res of compilationgit status --- .github/workflows/reports.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index b014d175744..ababb2224da 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -372,7 +372,7 @@ jobs: - name: Aggregate compilation reports using jq run: | echo "Merging reports" - + combined_reports="[]" # Iterate over each report and merge the 'compilation_reports' array @@ -386,7 +386,11 @@ jobs: # Wrap the merged compilation reports into a new object as to keep the 'compilation_reports' key final_report="{\"compilation_reports\": $combined_reports}" + echo "$final_report" + echo "$final_report" > compilation_report.json + + cat compilation_report - name: Parse compilation report id: compilation_report From 9ae0b3c65bb3335d08d925ae8eb6d7ba4b6bd62b Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 06:42:36 +0000 Subject: [PATCH 080/135] rename step --- .github/workflows/reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index ababb2224da..5f54c89c15e 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -369,7 +369,7 @@ jobs: with: name: in_progress_compilation_report - - name: Aggregate compilation reports using jq + - name: Merge compilation reports using jq run: | echo "Merging reports" @@ -389,7 +389,7 @@ jobs: echo "$final_report" echo "$final_report" > compilation_report.json - + cat compilation_report - name: Parse compilation report From 585d65f0f78669b7ec1089cd6846d1d27cc9533b Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 06:50:30 +0000 Subject: [PATCH 081/135] report id --- .github/workflows/reports.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 5f54c89c15e..742f260530e 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -339,6 +339,7 @@ jobs: cat compilation_report.json - name: Move compilation report + id: report run: | mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report.json echo "compilation_report_${{ matrix.project.repo }}=./compilation_report.json" >> $GITHUB_OUTPUT @@ -352,7 +353,7 @@ jobs: # overwrite: true outputs: - compilation_reports: ${{ steps.set_report_output.outputs.compilation_reports }} + compilation_reports: ${{ steps.report.outputs.compilation_reports }} upload_compilation_report: name: Upload compilation report @@ -381,6 +382,8 @@ jobs: combined_reports=$(jq '[.compilation_reports[]] + '"$combined_reports" <<< "$(cat "$report")") done + echo $combined_reports + combined_reports=$(jq '[.compilation_reports[]] + '"$combined_reports" <<< "$(cat ./compilation_report.json)") # Wrap the merged compilation reports into a new object as to keep the 'compilation_reports' key From ef31693ba4e6aa53c38c9f14ad87864344091e48 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 07:02:22 +0000 Subject: [PATCH 082/135] specify outputs correctly --- .github/workflows/reports.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 742f260530e..98e08f02b0a 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -341,8 +341,8 @@ jobs: - name: Move compilation report id: report run: | - mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report.json - echo "compilation_report_${{ matrix.project.repo }}=./compilation_report.json" >> $GITHUB_OUTPUT + mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report_${{ matrix.project.path }}.json + echo "compilation_reports=./compilation_report_${{ matrix.project.path }}.json" >> $GITHUB_OUTPUT # - name: Upload compilation report # uses: actions/upload-artifact@v4 @@ -393,7 +393,7 @@ jobs: echo "$final_report" > compilation_report.json - cat compilation_report + cat compilation_report.json - name: Parse compilation report id: compilation_report From 544455d10d3766faa4447c456e46806cd3a4901e Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 07:10:25 +0000 Subject: [PATCH 083/135] extract basename --- .github/workflows/reports.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 98e08f02b0a..5ba209bb87a 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -341,8 +341,9 @@ jobs: - name: Move compilation report id: report run: | - mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report_${{ matrix.project.path }}.json - echo "compilation_reports=./compilation_report_${{ matrix.project.path }}.json" >> $GITHUB_OUTPUT + PACKAGE_NAME=basename ${{ matrix.project.path }} + mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report_$PACKAGE_NAME.json + echo "compilation_reports=./compilation_report_$PACKAGE_NAME.json" >> $GITHUB_OUTPUT # - name: Upload compilation report # uses: actions/upload-artifact@v4 From 7389da5a33b903ae410a19733b7623410b805a9c Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 07:14:25 +0000 Subject: [PATCH 084/135] wrap in parens --- .github/workflows/reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 5ba209bb87a..92eb46713bb 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -341,7 +341,7 @@ jobs: - name: Move compilation report id: report run: | - PACKAGE_NAME=basename ${{ matrix.project.path }} + PACKAGE_NAME=$(basename ${{ matrix.project.path }}) mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report_$PACKAGE_NAME.json echo "compilation_reports=./compilation_report_$PACKAGE_NAME.json" >> $GITHUB_OUTPUT From acda6ca48ec9f7295f0857f941c02279daad0f71 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 07:30:14 +0000 Subject: [PATCH 085/135] try and cat the contents' --- .github/workflows/reports.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 92eb46713bb..1848821f350 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -343,7 +343,8 @@ jobs: run: | PACKAGE_NAME=$(basename ${{ matrix.project.path }}) mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report_$PACKAGE_NAME.json - echo "compilation_reports=./compilation_report_$PACKAGE_NAME.json" >> $GITHUB_OUTPUT + REPORT_CONTENTS=$(cat ./compilation_report_$PACKAGE_NAME.json) + echo "compilation_report=$REPORT_CONTENTS" >> $GITHUB_OUTPUT # - name: Upload compilation report # uses: actions/upload-artifact@v4 @@ -354,7 +355,7 @@ jobs: # overwrite: true outputs: - compilation_reports: ${{ steps.report.outputs.compilation_reports }} + compilation_reports: ${{ steps.report.outputs.compilation_report }} upload_compilation_report: name: Upload compilation report @@ -375,6 +376,9 @@ jobs: run: | echo "Merging reports" + REPORTS=${{ needs.external_repo_compilation_report.outputs.compilation_reports }} + echo $REPORTS + combined_reports="[]" # Iterate over each report and merge the 'compilation_reports' array From c9710b0c93400bca27944e5a4074bdb8a40909e4 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 07:34:50 +0000 Subject: [PATCH 086/135] switch to same id --- .github/workflows/reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 1848821f350..28ba9c4e0e7 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -344,7 +344,7 @@ jobs: PACKAGE_NAME=$(basename ${{ matrix.project.path }}) mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report_$PACKAGE_NAME.json REPORT_CONTENTS=$(cat ./compilation_report_$PACKAGE_NAME.json) - echo "compilation_report=$REPORT_CONTENTS" >> $GITHUB_OUTPUT + echo "compilation_reports=$REPORT_CONTENTS" >> $GITHUB_OUTPUT # - name: Upload compilation report # uses: actions/upload-artifact@v4 @@ -355,7 +355,7 @@ jobs: # overwrite: true outputs: - compilation_reports: ${{ steps.report.outputs.compilation_report }} + compilation_reports: ${{ steps.report.outputs.compilation_reports }} upload_compilation_report: name: Upload compilation report From ba5940972275addaa014f1dcc02999c6336b0f0d Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 14:58:04 +0000 Subject: [PATCH 087/135] split path into var --- .github/workflows/reports.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 28ba9c4e0e7..56363093c51 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -341,7 +341,8 @@ jobs: - name: Move compilation report id: report run: | - PACKAGE_NAME=$(basename ${{ matrix.project.path }}) + PATH=${{ matrix.project.path }} + PACKAGE_NAME=$(basename $PATH) mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report_$PACKAGE_NAME.json REPORT_CONTENTS=$(cat ./compilation_report_$PACKAGE_NAME.json) echo "compilation_reports=$REPORT_CONTENTS" >> $GITHUB_OUTPUT From 8a8bd28f5d86058f74eee88048bd1f5dfd8ac6c3 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 15:01:47 +0000 Subject: [PATCH 088/135] attach old reports --- .github/workflows/reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 56363093c51..4accfcb91e5 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -345,7 +345,7 @@ jobs: PACKAGE_NAME=$(basename $PATH) mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report_$PACKAGE_NAME.json REPORT_CONTENTS=$(cat ./compilation_report_$PACKAGE_NAME.json) - echo "compilation_reports=$REPORT_CONTENTS" >> $GITHUB_OUTPUT + echo "compilation_reports=${{ steps.report.outputs.compilation_reports }},$REPORT_CONTENTS" >> $GITHUB_OUTPUT # - name: Upload compilation report # uses: actions/upload-artifact@v4 From 39c648e45b147b6cc0f3cfcf323758fa94fd71c3 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 15:12:03 +0000 Subject: [PATCH 089/135] do not overrwite PATH --- .github/workflows/reports.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 4accfcb91e5..39b000d0e7c 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -340,9 +340,10 @@ jobs: - name: Move compilation report id: report + shell: bash run: | - PATH=${{ matrix.project.path }} - PACKAGE_NAME=$(basename $PATH) + PROJECT_PATH=${{ matrix.project.path }} + PACKAGE_NAME=$(basename $PROJECT_PATH) mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report_$PACKAGE_NAME.json REPORT_CONTENTS=$(cat ./compilation_report_$PACKAGE_NAME.json) echo "compilation_reports=${{ steps.report.outputs.compilation_reports }},$REPORT_CONTENTS" >> $GITHUB_OUTPUT From d7a7475958d8714ade7ebc98f8a2d306a41e8bb3 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 15:31:43 +0000 Subject: [PATCH 090/135] try to download multiple artifacts of similar name --- .github/workflows/reports.yml | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 39b000d0e7c..d82bf1aa127 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -345,16 +345,16 @@ jobs: PROJECT_PATH=${{ matrix.project.path }} PACKAGE_NAME=$(basename $PROJECT_PATH) mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report_$PACKAGE_NAME.json - REPORT_CONTENTS=$(cat ./compilation_report_$PACKAGE_NAME.json) - echo "compilation_reports=${{ steps.report.outputs.compilation_reports }},$REPORT_CONTENTS" >> $GITHUB_OUTPUT + # REPORT_CONTENTS=$(cat ./compilation_report_$PACKAGE_NAME.json) + # echo "compilation_reports=${{ steps.report.outputs.compilation_reports }},$REPORT_CONTENTS" >> $GITHUB_OUTPUT - # - name: Upload compilation report - # uses: actions/upload-artifact@v4 - # with: - # name: in_progress_compilation_report - # path: compilation_report.json - # retention-days: 3 - # overwrite: true + - name: Upload compilation report + uses: actions/upload-artifact@v4 + with: + name: compilation_report_${{ matrix.project.path }} + path: compilation_report_${{ matrix.project.path }}.json + retention-days: 3 + overwrite: true outputs: compilation_reports: ${{ steps.report.outputs.compilation_reports }} @@ -372,11 +372,17 @@ jobs: - name: Download compilation report uses: actions/download-artifact@v4 with: - name: in_progress_compilation_report + name: compilation_report_* + path: ./reports - name: Merge compilation reports using jq run: | - echo "Merging reports" + echo "Merging reports" + + echo $(ls ./reports) + + ARTIFACTS=${{ needs.external_repo_compilation_report.outputs.artifact_names }}; + echo $ARTIFACTS REPORTS=${{ needs.external_repo_compilation_report.outputs.compilation_reports }} echo $REPORTS From 5e95f8bce97de8e127837169cc1be8576d573ef2 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 15:31:55 +0000 Subject: [PATCH 091/135] pattern not name --- .github/workflows/reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index d82bf1aa127..9734190af24 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -372,7 +372,7 @@ jobs: - name: Download compilation report uses: actions/download-artifact@v4 with: - name: compilation_report_* + pattern: compilation_report_* path: ./reports - name: Merge compilation reports using jq From 7499fafc5028850b37b5037616f9c8ce2a508c0e Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 15:40:57 +0000 Subject: [PATCH 092/135] fix upload --- .github/workflows/reports.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 9734190af24..9fd80e423e9 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -342,8 +342,9 @@ jobs: id: report shell: bash run: | - PROJECT_PATH=${{ matrix.project.path }} - PACKAGE_NAME=$(basename $PROJECT_PATH) + PROJECT_REF=${{ matrix.project.ref }} + PACKAGE_NAME=$(basename $PROJECT_REF) + echo $PACKAGE_NAME mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report_$PACKAGE_NAME.json # REPORT_CONTENTS=$(cat ./compilation_report_$PACKAGE_NAME.json) # echo "compilation_reports=${{ steps.report.outputs.compilation_reports }},$REPORT_CONTENTS" >> $GITHUB_OUTPUT @@ -351,8 +352,8 @@ jobs: - name: Upload compilation report uses: actions/upload-artifact@v4 with: - name: compilation_report_${{ matrix.project.path }} - path: compilation_report_${{ matrix.project.path }}.json + name: compilation_report_${{ matrix.project.ref }} + path: compilation_report_${{ matrix.project.ref }}.json retention-days: 3 overwrite: true From 063a390de8def35796dbe4a50e6c7bec24854f74 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 15:47:00 +0000 Subject: [PATCH 093/135] no need for basename anymore --- .github/workflows/reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 9fd80e423e9..14d5c7f0919 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -342,8 +342,8 @@ jobs: id: report shell: bash run: | - PROJECT_REF=${{ matrix.project.ref }} - PACKAGE_NAME=$(basename $PROJECT_REF) + PACKAGE_NAME=${{ matrix.project.ref }} + # PACKAGE_NAME=$(basename $PROJECT_REF) echo $PACKAGE_NAME mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report_$PACKAGE_NAME.json # REPORT_CONTENTS=$(cat ./compilation_report_$PACKAGE_NAME.json) From 4d2db0fecec49cf64c7c413899282a4270723e92 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 15:53:17 +0000 Subject: [PATCH 094/135] use outputs for the name --- .github/workflows/reports.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 14d5c7f0919..ac2c0492263 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -342,18 +342,18 @@ jobs: id: report shell: bash run: | - PACKAGE_NAME=${{ matrix.project.ref }} - # PACKAGE_NAME=$(basename $PROJECT_REF) + PACKAGE_NAME=${{ matrix.project.path }} + PACKAGE_NAME=$(basename $PROJECT_REF) echo $PACKAGE_NAME mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report_$PACKAGE_NAME.json # REPORT_CONTENTS=$(cat ./compilation_report_$PACKAGE_NAME.json) - # echo "compilation_reports=${{ steps.report.outputs.compilation_reports }},$REPORT_CONTENTS" >> $GITHUB_OUTPUT + echo "compilation_report_name=$PACKAGE_NAME" >> $GITHUB_OUTPUT - name: Upload compilation report uses: actions/upload-artifact@v4 with: - name: compilation_report_${{ matrix.project.ref }} - path: compilation_report_${{ matrix.project.ref }}.json + name: compilation_report_${{ steps.report.outputs.compilation_report_name }} + path: compilation_report_${{ steps.report.outputs.compilation_report_name }}.json retention-days: 3 overwrite: true From eb38d188806e505ecd72642ad41e6ee5e4a3c4d0 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 15:56:53 +0000 Subject: [PATCH 095/135] rename bad var --- .github/workflows/reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index ac2c0492263..744b5394fc0 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -343,7 +343,7 @@ jobs: shell: bash run: | PACKAGE_NAME=${{ matrix.project.path }} - PACKAGE_NAME=$(basename $PROJECT_REF) + PACKAGE_NAME=$(basename $PACKAGE_NAME) echo $PACKAGE_NAME mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report_$PACKAGE_NAME.json # REPORT_CONTENTS=$(cat ./compilation_report_$PACKAGE_NAME.json) From 3c27057c7f62509cc7e23ecccffb2c11931f5d31 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 16:10:22 +0000 Subject: [PATCH 096/135] loop over reports from artifacts --- .github/workflows/reports.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 744b5394fc0..78ae8b263ff 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -267,7 +267,7 @@ jobs: - name: Upload compilation report script uses: actions/upload-artifact@v4 with: - name: compilation_report_script + name: script_for_compilation_report path: ./test_programs/compilation_report.sh retention-days: 3 overwrite: true @@ -288,9 +288,9 @@ jobs: fail-fast: false matrix: include: - - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } + # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts } - - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/parity-lib } + # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/parity-lib } # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/private-kernel-lib } # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/reset-kernel-lib } # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/rollup-lib } @@ -322,7 +322,7 @@ jobs: - name: Download compilation report script uses: actions/download-artifact@v4 with: - name: compilation_report_script + name: script_for_compilation_report path: ./test-repo/${{ matrix.project.path }} # - name: Download compilation report @@ -370,7 +370,12 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Download compilation report + - name: Download initial compilation report + uses: actions/download-artifact@v4 + with: + name: in_progress_compilation_report + + - name: Download matrix compilation reports uses: actions/download-artifact@v4 with: pattern: compilation_report_* @@ -382,18 +387,13 @@ jobs: echo $(ls ./reports) - ARTIFACTS=${{ needs.external_repo_compilation_report.outputs.artifact_names }}; - echo $ARTIFACTS - - REPORTS=${{ needs.external_repo_compilation_report.outputs.compilation_reports }} - echo $REPORTS - combined_reports="[]" # Iterate over each report and merge the 'compilation_reports' array - for report in ${{ needs.external_repo_compilation_report.outputs.compilation_reports }}; do + for report in ./reports/*; do + echo $report # Extract the 'compilation_reports' array from each report and merge it - combined_reports=$(jq '[.compilation_reports[]] + '"$combined_reports" <<< "$(cat "$report")") + combined_reports=$(jq '[.compilation_reports[]] + '"$combined_reports" <<< "$(cat "./reports/$report")") done echo $combined_reports From 6d419f30be141b35eb5d35947e3680d6dc7d33a6 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 16:17:21 +0000 Subject: [PATCH 097/135] remove the extra path segment --- .github/workflows/reports.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 78ae8b263ff..28df77a6644 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -288,13 +288,10 @@ jobs: fail-fast: false matrix: include: - # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/aztec-nr } - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts } - # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/parity-lib } - # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/private-kernel-lib } - # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/reset-kernel-lib } - # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/rollup-lib } - # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/types } + - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/private-kernel-inner } + # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/rollup-base-private } + # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/rollup-base-public } name: External repo compilation report - ${{ matrix.project.repo }} steps: @@ -393,7 +390,7 @@ jobs: for report in ./reports/*; do echo $report # Extract the 'compilation_reports' array from each report and merge it - combined_reports=$(jq '[.compilation_reports[]] + '"$combined_reports" <<< "$(cat "./reports/$report")") + combined_reports=$(jq '[.compilation_reports[]] + '"$combined_reports" <<< "$(cat "$report")") done echo $combined_reports From b0bce5819adb3e5842cd2175090e720014a37424 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 16:19:39 +0000 Subject: [PATCH 098/135] fix bad compilation times for native noir repo tests --- test_programs/compilation_report.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_programs/compilation_report.sh b/test_programs/compilation_report.sh index 80ed9014ff2..8779cb7763d 100755 --- a/test_programs/compilation_report.sh +++ b/test_programs/compilation_report.sh @@ -42,7 +42,7 @@ for dir in ${tests_to_profile[@]}; do continue fi - echo $base_path/$dir + cd $base_path/$dir PACKAGE_NAME=$dir if [ "$#" -ne 0 ]; then From fd3aff274f4e9200b1dd929db29c384cec725ef8 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 16:34:36 +0000 Subject: [PATCH 099/135] test inner dir --- .github/workflows/reports.yml | 1 + test_programs/compilation_report.sh | 17 +---------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 28df77a6644..ffb4404aa00 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -389,6 +389,7 @@ jobs: # Iterate over each report and merge the 'compilation_reports' array for report in ./reports/*; do echo $report + echo $(ls $report) # Extract the 'compilation_reports' array from each report and merge it combined_reports=$(jq '[.compilation_reports[]] + '"$combined_reports" <<< "$(cat "$report")") done diff --git a/test_programs/compilation_report.sh b/test_programs/compilation_report.sh index 8779cb7763d..be46a384c90 100755 --- a/test_programs/compilation_report.sh +++ b/test_programs/compilation_report.sh @@ -9,22 +9,7 @@ tests_to_profile=("sha256_regression" "regression_4709" "ram_blowup_regression") echo "{\"compilation_reports\": [ " > $current_dir/compilation_report.json -# If there is an argument that means we want to re-use an already existing compilation report -# rather than generating a new one. -# When reusing a report, the script can only profile one additional test at the moment. -# if [ "$#" -eq 0 ]; then -# echo "{\"compilation_reports\": [ " > $current_dir/compilation_report.json -# else -# # Delete last two lines so that we can re-use the previous report -# sed -i '${/^$/d;}' compilation_report.json | sed -i '$d' compilation_report.json | sed -i '$d' compilation_report.json - -# echo "}, " >> compilation_report.json - -# # The additional report is expected to be in the current directory -# base_path="$current_dir" -# tests_to_profile=(".") -# fi - +# If there is an argument that means we want to generate a report for only the current directory if [ "$#" -ne 0 ]; then base_path="$current_dir" tests_to_profile=(".") From 981e7cf54f20eb6115e91bf27c0285ae7b4017a8 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 16:44:07 +0000 Subject: [PATCH 100/135] add extension --- .github/workflows/reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index ffb4404aa00..ce0aafb570b 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -391,7 +391,7 @@ jobs: echo $report echo $(ls $report) # Extract the 'compilation_reports' array from each report and merge it - combined_reports=$(jq '[.compilation_reports[]] + '"$combined_reports" <<< "$(cat "$report")") + combined_reports=$(jq '[.compilation_reports[]] + '"$combined_reports" <<< "$(cat "$report/*.json")") done echo $combined_reports From 428a76c79afd6b6a6508c72a2e1182d1a63ba910 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 16:56:49 +0000 Subject: [PATCH 101/135] use correct report name --- .github/workflows/reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index ce0aafb570b..b14408f6ed3 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -389,9 +389,9 @@ jobs: # Iterate over each report and merge the 'compilation_reports' array for report in ./reports/*; do echo $report - echo $(ls $report) + REPORT_NAME=echo $(ls $report) # Extract the 'compilation_reports' array from each report and merge it - combined_reports=$(jq '[.compilation_reports[]] + '"$combined_reports" <<< "$(cat "$report/*.json")") + combined_reports=$(jq '[.compilation_reports[]] + '"$combined_reports" <<< "$(cat "$report/$REPORT_NAME")") done echo $combined_reports From a63140194e24cfca0f442e3c6901fa2e6e00f48a Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 17:15:03 +0000 Subject: [PATCH 102/135] parens around REPORT_NAME --- .github/workflows/reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index b14408f6ed3..432c615dda2 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -389,7 +389,7 @@ jobs: # Iterate over each report and merge the 'compilation_reports' array for report in ./reports/*; do echo $report - REPORT_NAME=echo $(ls $report) + REPORT_NAME=$(echo $(ls $report)) # Extract the 'compilation_reports' array from each report and merge it combined_reports=$(jq '[.compilation_reports[]] + '"$combined_reports" <<< "$(cat "$report/$REPORT_NAME")") done From 4ab173827169423b957ed802566dab12188cb3dd Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 17:30:17 +0000 Subject: [PATCH 103/135] checkout do not upload compilation script --- .github/workflows/reports.yml | 39 +++++++---------------------- test_programs/compilation_report.sh | 2 -- 2 files changed, 9 insertions(+), 32 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 432c615dda2..054172cf0b0 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -264,14 +264,6 @@ jobs: cat compilation_report.json mv compilation_report.json ../compilation_report.json - - name: Upload compilation report script - uses: actions/upload-artifact@v4 - with: - name: script_for_compilation_report - path: ./test_programs/compilation_report.sh - retention-days: 3 - overwrite: true - - name: Upload compilation report uses: actions/upload-artifact@v4 with: @@ -289,9 +281,11 @@ jobs: matrix: include: - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts } + - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/parity-root } - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/private-kernel-inner } - # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/rollup-base-private } - # - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/rollup-base-public } + - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/private-kernel-reset } + - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/rollup-base-private } + - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/rollup-base-public } name: External repo compilation report - ${{ matrix.project.repo }} steps: @@ -316,17 +310,10 @@ jobs: export PATH="$PATH:$(dirname $nargo_binary)" nargo -V - - name: Download compilation report script - uses: actions/download-artifact@v4 + - uses: actions/checkout@v4 with: - name: script_for_compilation_report - path: ./test-repo/${{ matrix.project.path }} - - # - name: Download compilation report - # uses: actions/download-artifact@v4 - # with: - # name: in_progress_compilation_report - # path: ./test-repo/${{ matrix.project.path }} + sparse-checkout: | + ./test_programs/compilation_report.sh - name: Generate compilation report working-directory: ./test-repo/${{ matrix.project.path }} @@ -341,9 +328,7 @@ jobs: run: | PACKAGE_NAME=${{ matrix.project.path }} PACKAGE_NAME=$(basename $PACKAGE_NAME) - echo $PACKAGE_NAME mv ./test-repo/${{ matrix.project.path }}/compilation_report.json ./compilation_report_$PACKAGE_NAME.json - # REPORT_CONTENTS=$(cat ./compilation_report_$PACKAGE_NAME.json) echo "compilation_report_name=$PACKAGE_NAME" >> $GITHUB_OUTPUT - name: Upload compilation report @@ -382,27 +367,21 @@ jobs: run: | echo "Merging reports" - echo $(ls ./reports) - combined_reports="[]" - # Iterate over each report and merge the 'compilation_reports' array + # Iterate over each report and merge them for report in ./reports/*; do - echo $report + # The report is saved under ./compilation_report_{ matrix_report }/compilation_report_{ matrix_report }.json REPORT_NAME=$(echo $(ls $report)) # Extract the 'compilation_reports' array from each report and merge it combined_reports=$(jq '[.compilation_reports[]] + '"$combined_reports" <<< "$(cat "$report/$REPORT_NAME")") done - echo $combined_reports - combined_reports=$(jq '[.compilation_reports[]] + '"$combined_reports" <<< "$(cat ./compilation_report.json)") # Wrap the merged compilation reports into a new object as to keep the 'compilation_reports' key final_report="{\"compilation_reports\": $combined_reports}" - echo "$final_report" - echo "$final_report" > compilation_report.json cat compilation_report.json diff --git a/test_programs/compilation_report.sh b/test_programs/compilation_report.sh index be46a384c90..314e3804d36 100755 --- a/test_programs/compilation_report.sh +++ b/test_programs/compilation_report.sh @@ -34,8 +34,6 @@ for dir in ${tests_to_profile[@]}; do PACKAGE_NAME=$(basename $current_dir) fi - echo $PACKAGE_NAME - COMPILE_TIME=$((time nargo compile --force) 2>&1 | grep real | grep -oE '[0-9]+m[0-9]+.[0-9]+s') echo -e " {\n \"artifact_name\":\"$PACKAGE_NAME\",\n \"time\":\"$COMPILE_TIME\"" >> $current_dir/compilation_report.json From 97a6a44838c3e6ff02adf14b78ad3e375d466cb3 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 17:31:14 +0000 Subject: [PATCH 104/135] cleanup reports yml --- .github/workflows/reports.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 054172cf0b0..7b480b2a640 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -320,7 +320,6 @@ jobs: run: | chmod +x ./compilation_report.sh ./compilation_report.sh 1 - cat compilation_report.json - name: Move compilation report id: report @@ -338,9 +337,6 @@ jobs: path: compilation_report_${{ steps.report.outputs.compilation_report_name }}.json retention-days: 3 overwrite: true - - outputs: - compilation_reports: ${{ steps.report.outputs.compilation_reports }} upload_compilation_report: name: Upload compilation report From bc9e317aa066a32edd9c8ebf44278775b5edb101 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 17:38:18 +0000 Subject: [PATCH 105/135] specify path in checkout --- .github/workflows/reports.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 7b480b2a640..54ec2075ad4 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -312,6 +312,7 @@ jobs: - uses: actions/checkout@v4 with: + path: ./test-repo/${{ matrix.project.path }} sparse-checkout: | ./test_programs/compilation_report.sh From 6c583b9948d2388fa9d8528c1e983cd35a0f4e92 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 17:48:32 +0000 Subject: [PATCH 106/135] specify cone mode false --- .github/workflows/reports.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 54ec2075ad4..7d41ff2975d 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -312,9 +312,10 @@ jobs: - uses: actions/checkout@v4 with: - path: ./test-repo/${{ matrix.project.path }} + path: test-repo/${{ matrix.project.path }} sparse-checkout: | ./test_programs/compilation_report.sh + sparse-checkout-cone-mode: false - name: Generate compilation report working-directory: ./test-repo/${{ matrix.project.path }} From 9b08f0bd90eef892da5bc7b85d64550458f97d7b Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 17:54:04 +0000 Subject: [PATCH 107/135] move in separate job --- .github/workflows/reports.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 7d41ff2975d..ad3ec8a4b79 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -312,11 +312,16 @@ jobs: - uses: actions/checkout@v4 with: - path: test-repo/${{ matrix.project.path }} sparse-checkout: | ./test_programs/compilation_report.sh sparse-checkout-cone-mode: false + - name: Move compilation report + run: | + echo $(ls ./) + echo $(lhs ./test_programs) + mv ./compilation_report.sh ./test-repo/${{ matrix.project.path }}/compilation_report.sh + - name: Generate compilation report working-directory: ./test-repo/${{ matrix.project.path }} run: | From 4873320bd274570ab59f401a30139854a222ce2c Mon Sep 17 00:00:00 2001 From: Tom French <15848336+TomAFrench@users.noreply.github.com> Date: Tue, 10 Dec 2024 17:59:24 +0000 Subject: [PATCH 108/135] Update .github/workflows/reports.yml --- .github/workflows/reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index ad3ec8a4b79..078c13fdccd 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -319,7 +319,7 @@ jobs: - name: Move compilation report run: | echo $(ls ./) - echo $(lhs ./test_programs) + echo $(ls ./test_programs) mv ./compilation_report.sh ./test-repo/${{ matrix.project.path }}/compilation_report.sh - name: Generate compilation report From 416654aa2f03093a065f4ae8977ffb14046eb534 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 17:59:53 +0000 Subject: [PATCH 109/135] try ./test_programs/ prefix --- .github/workflows/reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index ad3ec8a4b79..9a53fff0ff6 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -319,8 +319,8 @@ jobs: - name: Move compilation report run: | echo $(ls ./) - echo $(lhs ./test_programs) - mv ./compilation_report.sh ./test-repo/${{ matrix.project.path }}/compilation_report.sh + echo $(ls ./test_programs) + mv ./test_programs/compilation_report.sh ./test-repo/${{ matrix.project.path }}/compilation_report.sh - name: Generate compilation report working-directory: ./test-repo/${{ matrix.project.path }} From 210bf28393f69683fe10ff0f084b886e667209af Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 18:05:09 +0000 Subject: [PATCH 110/135] remove test_programs prefix --- .github/workflows/reports.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 9a53fff0ff6..e0c5f811c8f 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -319,8 +319,7 @@ jobs: - name: Move compilation report run: | echo $(ls ./) - echo $(ls ./test_programs) - mv ./test_programs/compilation_report.sh ./test-repo/${{ matrix.project.path }}/compilation_report.sh + mv ./compilation_report.sh ./test-repo/${{ matrix.project.path }}/compilation_report.sh - name: Generate compilation report working-directory: ./test-repo/${{ matrix.project.path }} From 3fc95d8f9c6140b8149bd5304b34314a88938403 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 18:10:58 +0000 Subject: [PATCH 111/135] try checkout again --- .github/workflows/reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index e0c5f811c8f..0b5cecbffce 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -313,12 +313,12 @@ jobs: - uses: actions/checkout@v4 with: sparse-checkout: | - ./test_programs/compilation_report.sh + test_programs/compilation_report.sh sparse-checkout-cone-mode: false - name: Move compilation report run: | - echo $(ls ./) + ls ./ mv ./compilation_report.sh ./test-repo/${{ matrix.project.path }}/compilation_report.sh - name: Generate compilation report From c77a117b29a7a1b810bf0dcb3f4e3104b4aa0d1f Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 18:15:00 +0000 Subject: [PATCH 112/135] cd into test_programs --- .github/workflows/reports.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 0b5cecbffce..e3aebab6000 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -318,6 +318,8 @@ jobs: - name: Move compilation report run: | + ls ./ + cd test_programs ls ./ mv ./compilation_report.sh ./test-repo/${{ matrix.project.path }}/compilation_report.sh From 0224ffd6263544fbef7a37f4d5b331e91e677509 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 18:19:34 +0000 Subject: [PATCH 113/135] this should work now --- .github/workflows/reports.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index e3aebab6000..b07c0693915 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -319,9 +319,8 @@ jobs: - name: Move compilation report run: | ls ./ - cd test_programs - ls ./ - mv ./compilation_report.sh ./test-repo/${{ matrix.project.path }}/compilation_report.sh + ls ./test_programs + mv ./test_programs/compilation_report.sh ./test-repo/${{ matrix.project.path }}/compilation_report.sh - name: Generate compilation report working-directory: ./test-repo/${{ matrix.project.path }} From e46d7a8a9fb5feb4805fbad415ff50f4bd3b9db1 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 13:26:43 -0500 Subject: [PATCH 114/135] Update .github/workflows/reports.yml Co-authored-by: Tom French <15848336+TomAFrench@users.noreply.github.com> --- .github/workflows/reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index b07c0693915..f6931cbf2ba 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -320,7 +320,7 @@ jobs: run: | ls ./ ls ./test_programs - mv ./test_programs/compilation_report.sh ./test-repo/${{ matrix.project.path }}/compilation_report.sh + mv ./test_programs/compilation_report.sh ./test-repo/${{ matrix.project.path }}/ - name: Generate compilation report working-directory: ./test-repo/${{ matrix.project.path }} From f8c5e3ea0f6c5c5abfc241b303cb151df984e226 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 13:44:35 -0500 Subject: [PATCH 115/135] Update .github/workflows/reports.yml Co-authored-by: Tom French <15848336+TomAFrench@users.noreply.github.com> --- .github/workflows/reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index f6931cbf2ba..4fc599d485a 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -320,11 +320,11 @@ jobs: run: | ls ./ ls ./test_programs - mv ./test_programs/compilation_report.sh ./test-repo/${{ matrix.project.path }}/ - name: Generate compilation report working-directory: ./test-repo/${{ matrix.project.path }} run: | + mv /home/runner/test_programs/compilation_report.sh ./compilation_report.sh chmod +x ./compilation_report.sh ./compilation_report.sh 1 From ab8b9045d719ab2b65cc5fd4838499f5b6d8bef9 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 18:47:33 +0000 Subject: [PATCH 116/135] fix indent --- .github/workflows/reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 4fc599d485a..9c5bf9c2c8f 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -324,7 +324,7 @@ jobs: - name: Generate compilation report working-directory: ./test-repo/${{ matrix.project.path }} run: | - mv /home/runner/test_programs/compilation_report.sh ./compilation_report.sh + mv /home/runner/test_programs/compilation_report.sh ./compilation_report.sh chmod +x ./compilation_report.sh ./compilation_report.sh 1 From cd857e286561e74f92fc7c339a98d2ef392f5d08 Mon Sep 17 00:00:00 2001 From: Tom French <15848336+TomAFrench@users.noreply.github.com> Date: Tue, 10 Dec 2024 18:48:21 +0000 Subject: [PATCH 117/135] Update reports.yml --- .github/workflows/reports.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 9c5bf9c2c8f..3940211075b 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -316,11 +316,6 @@ jobs: test_programs/compilation_report.sh sparse-checkout-cone-mode: false - - name: Move compilation report - run: | - ls ./ - ls ./test_programs - - name: Generate compilation report working-directory: ./test-repo/${{ matrix.project.path }} run: | From 3d9113ec0996b18c60644b1f6eb50dc004b9e1f8 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 19:01:57 +0000 Subject: [PATCH 118/135] try and specify path --- .github/workflows/reports.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 3940211075b..f55a56c3767 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -312,6 +312,7 @@ jobs: - uses: actions/checkout@v4 with: + path: test-repo sparse-checkout: | test_programs/compilation_report.sh sparse-checkout-cone-mode: false @@ -319,7 +320,9 @@ jobs: - name: Generate compilation report working-directory: ./test-repo/${{ matrix.project.path }} run: | - mv /home/runner/test_programs/compilation_report.sh ./compilation_report.sh + ls . + # mv /home/runner/test_programs/compilation_report.sh ./compilation_report.sh + mv ../test_programs/compilation_report.sh ./compilation_report.sh chmod +x ./compilation_report.sh ./compilation_report.sh 1 From 147e979773e6fa0bbb77983a281737937319b116 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 19:06:40 +0000 Subject: [PATCH 119/135] specify more exact --- .github/workflows/reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index f55a56c3767..3c1173932ae 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -312,7 +312,7 @@ jobs: - uses: actions/checkout@v4 with: - path: test-repo + path: test-repo/${{ matrix.project.path }} sparse-checkout: | test_programs/compilation_report.sh sparse-checkout-cone-mode: false @@ -322,7 +322,7 @@ jobs: run: | ls . # mv /home/runner/test_programs/compilation_report.sh ./compilation_report.sh - mv ../test_programs/compilation_report.sh ./compilation_report.sh + mv ./test_programs/compilation_report.sh ./compilation_report.sh chmod +x ./compilation_report.sh ./compilation_report.sh 1 From 61fa3b5fb06f9659960bdbc0b4c3f06faa0aea15 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 19:11:41 +0000 Subject: [PATCH 120/135] checkout test-repo after script checkout --- .github/workflows/reports.yml | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 3c1173932ae..206a162bf82 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -289,12 +289,12 @@ jobs: name: External repo compilation report - ${{ matrix.project.repo }} steps: - - name: Checkout - uses: actions/checkout@v4 - with: - repository: ${{ matrix.project.repo }} - path: test-repo - ref: ${{ matrix.project.ref }} + # - name: Checkout + # uses: actions/checkout@v4 + # with: + # repository: ${{ matrix.project.repo }} + # path: test-repo + # ref: ${{ matrix.project.ref }} - name: Download nargo binary uses: actions/download-artifact@v4 @@ -312,17 +312,24 @@ jobs: - uses: actions/checkout@v4 with: - path: test-repo/${{ matrix.project.path }} + # path: test-repo/${{ matrix.project.path }} sparse-checkout: | test_programs/compilation_report.sh sparse-checkout-cone-mode: false + - name: Checkout + uses: actions/checkout@v4 + with: + repository: ${{ matrix.project.repo }} + path: test-repo + ref: ${{ matrix.project.ref }} + - name: Generate compilation report working-directory: ./test-repo/${{ matrix.project.path }} run: | ls . - # mv /home/runner/test_programs/compilation_report.sh ./compilation_report.sh - mv ./test_programs/compilation_report.sh ./compilation_report.sh + mv /home/runner/test_programs/compilation_report.sh ./compilation_report.sh + # mv ./test_programs/compilation_report.sh ./compilation_report.sh chmod +x ./compilation_report.sh ./compilation_report.sh 1 From aee423a76d206e883ae01acc2cc1788f34a32eeb Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 14:28:41 -0500 Subject: [PATCH 121/135] Update .github/workflows/reports.yml --- .github/workflows/reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 206a162bf82..b69cb3b25ff 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -312,7 +312,7 @@ jobs: - uses: actions/checkout@v4 with: - # path: test-repo/${{ matrix.project.path }} + path: test-repo sparse-checkout: | test_programs/compilation_report.sh sparse-checkout-cone-mode: false From 2768257e36bc5324feb3ae70ace7d7aa1de7b3d3 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 14:29:12 -0500 Subject: [PATCH 122/135] Update .github/workflows/reports.yml --- .github/workflows/reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index b69cb3b25ff..90b8b4fbd35 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -328,7 +328,7 @@ jobs: working-directory: ./test-repo/${{ matrix.project.path }} run: | ls . - mv /home/runner/test_programs/compilation_report.sh ./compilation_report.sh + mv ../test_programs/compilation_report.sh ./compilation_report.sh # mv ./test_programs/compilation_report.sh ./compilation_report.sh chmod +x ./compilation_report.sh ./compilation_report.sh 1 From c1cbfefd7e3a45ae2cefc20132534c1111d1fc8c Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 19:35:24 +0000 Subject: [PATCH 123/135] try different path for script --- .github/workflows/reports.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 90b8b4fbd35..6e86a4f434e 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -312,7 +312,7 @@ jobs: - uses: actions/checkout@v4 with: - path: test-repo + path: scripts sparse-checkout: | test_programs/compilation_report.sh sparse-checkout-cone-mode: false @@ -328,7 +328,8 @@ jobs: working-directory: ./test-repo/${{ matrix.project.path }} run: | ls . - mv ../test_programs/compilation_report.sh ./compilation_report.sh + ls /home/runner/ + mv /home/runner/scripts/test_programs/compilation_report.sh ./compilation_report.sh # mv ./test_programs/compilation_report.sh ./compilation_report.sh chmod +x ./compilation_report.sh ./compilation_report.sh 1 From 8700ef01591c01d293e9333788767672bcb43871 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 19:43:02 +0000 Subject: [PATCH 124/135] update runner path --- .github/workflows/reports.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 6e86a4f434e..fb248865c55 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -328,8 +328,9 @@ jobs: working-directory: ./test-repo/${{ matrix.project.path }} run: | ls . - ls /home/runner/ - mv /home/runner/scripts/test_programs/compilation_report.sh ./compilation_report.sh + ls /home/runner/work/ + ls ~ + mv /home/runner/work/scripts/test_programs/compilation_report.sh ./compilation_report.sh # mv ./test_programs/compilation_report.sh ./compilation_report.sh chmod +x ./compilation_report.sh ./compilation_report.sh 1 From 049499d5d9a681ee6ec712a4a1ed08a53440c2b6 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 14:55:23 -0500 Subject: [PATCH 125/135] Update .github/workflows/reports.yml --- .github/workflows/reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index fb248865c55..ee247449aaa 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -328,8 +328,8 @@ jobs: working-directory: ./test-repo/${{ matrix.project.path }} run: | ls . - ls /home/runner/work/ - ls ~ + echo " " + ls /home/runner/work/noir mv /home/runner/work/scripts/test_programs/compilation_report.sh ./compilation_report.sh # mv ./test_programs/compilation_report.sh ./compilation_report.sh chmod +x ./compilation_report.sh From f56ff402b3b3a138137f9019574660e41e8a0bb2 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 20:00:06 +0000 Subject: [PATCH 126/135] different name --- .github/workflows/reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index ee247449aaa..38c4b794b4d 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -330,7 +330,7 @@ jobs: ls . echo " " ls /home/runner/work/noir - mv /home/runner/work/scripts/test_programs/compilation_report.sh ./compilation_report.sh + mv /home/runner/work/noir/test_programs/compilation_report.sh ./compilation_report.sh # mv ./test_programs/compilation_report.sh ./compilation_report.sh chmod +x ./compilation_report.sh ./compilation_report.sh 1 From 1e59ead1050bfc06af22a2e3a7f53c758414655b Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 20:04:50 +0000 Subject: [PATCH 127/135] add to path --- .github/workflows/reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 38c4b794b4d..3873b6035ea 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -329,7 +329,7 @@ jobs: run: | ls . echo " " - ls /home/runner/work/noir + ls /home/runner/work/noir/noir mv /home/runner/work/noir/test_programs/compilation_report.sh ./compilation_report.sh # mv ./test_programs/compilation_report.sh ./compilation_report.sh chmod +x ./compilation_report.sh From b5810f4f968a36eefc435ea37d5910e9675a3326 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 20:04:56 +0000 Subject: [PATCH 128/135] one more --- .github/workflows/reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 3873b6035ea..d0d1f3d8ae7 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -330,7 +330,7 @@ jobs: ls . echo " " ls /home/runner/work/noir/noir - mv /home/runner/work/noir/test_programs/compilation_report.sh ./compilation_report.sh + mv /home/runner/work/noir/noir/test_programs/compilation_report.sh ./compilation_report.sh # mv ./test_programs/compilation_report.sh ./compilation_report.sh chmod +x ./compilation_report.sh ./compilation_report.sh 1 From 4546bc54e584e2a92aaab45f9babc5d831c0d5b8 Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 20:11:36 +0000 Subject: [PATCH 129/135] use scripts in path --- .github/workflows/reports.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index d0d1f3d8ae7..0ddf1d2aea2 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -330,7 +330,9 @@ jobs: ls . echo " " ls /home/runner/work/noir/noir - mv /home/runner/work/noir/noir/test_programs/compilation_report.sh ./compilation_report.sh + ls /home/runner/work/noir/noir/scripts/ + ls /home/runner/work/noir/noir/scripts/test_programs + mv /home/runner/work/noir/noir/scripts/test_programs/compilation_report.sh ./compilation_report.sh # mv ./test_programs/compilation_report.sh ./compilation_report.sh chmod +x ./compilation_report.sh ./compilation_report.sh 1 From da6e4101360deaa83fc7e744ad4ba63035474e3c Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 20:50:22 +0000 Subject: [PATCH 130/135] add path to name --- .github/workflows/reports.yml | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 0ddf1d2aea2..50c90e33f40 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -280,22 +280,15 @@ jobs: fail-fast: false matrix: include: - - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts } - - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/parity-root } - - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/private-kernel-inner } - - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/private-kernel-reset } - - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/rollup-base-private } - - project: { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits/crates/rollup-base-public } - - name: External repo compilation report - ${{ matrix.project.repo }} + - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-contracts } + - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/parity-root } + - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/private-kernel-inner } + - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/private-kernel-reset } + - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/rollup-base-private } + - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/rollup-base-public } + + name: External repo compilation report - ${{ matrix.project.repo }}/${{ matrix.project.path }} steps: - # - name: Checkout - # uses: actions/checkout@v4 - # with: - # repository: ${{ matrix.project.repo }} - # path: test-repo - # ref: ${{ matrix.project.ref }} - - name: Download nargo binary uses: actions/download-artifact@v4 with: @@ -327,13 +320,7 @@ jobs: - name: Generate compilation report working-directory: ./test-repo/${{ matrix.project.path }} run: | - ls . - echo " " - ls /home/runner/work/noir/noir - ls /home/runner/work/noir/noir/scripts/ - ls /home/runner/work/noir/noir/scripts/test_programs mv /home/runner/work/noir/noir/scripts/test_programs/compilation_report.sh ./compilation_report.sh - # mv ./test_programs/compilation_report.sh ./compilation_report.sh chmod +x ./compilation_report.sh ./compilation_report.sh 1 From 3068fd4737fdee51eabc9270eee0c06002c49f7d Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 20:50:47 +0000 Subject: [PATCH 131/135] relax external_repo_compilation_report dep --- .github/workflows/reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 50c90e33f40..5367872ce83 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -273,7 +273,7 @@ jobs: overwrite: true external_repo_compilation_report: - needs: [generate_compilation_report] + needs: [build-nargo] runs-on: ubuntu-latest timeout-minutes: 30 strategy: @@ -343,7 +343,7 @@ jobs: upload_compilation_report: name: Upload compilation report - needs: [external_repo_compilation_report] + needs: [generate_compilation_report, external_repo_compilation_report] runs-on: ubuntu-latest permissions: pull-requests: write From 6822222012fa581b50a78d146d1d03f5c2ebf1cf Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 21:08:25 +0000 Subject: [PATCH 132/135] silence warnings --- .github/workflows/reports.yml | 2 ++ test_programs/compilation_report.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 5367872ce83..67da32d3b70 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -344,6 +344,8 @@ jobs: upload_compilation_report: name: Upload compilation report needs: [generate_compilation_report, external_repo_compilation_report] + # We want this job to run even if one variation of the matrix in `external_repo_compilation_report` fails + if: always() runs-on: ubuntu-latest permissions: pull-requests: write diff --git a/test_programs/compilation_report.sh b/test_programs/compilation_report.sh index 314e3804d36..13e74f0d7d2 100755 --- a/test_programs/compilation_report.sh +++ b/test_programs/compilation_report.sh @@ -34,7 +34,7 @@ for dir in ${tests_to_profile[@]}; do PACKAGE_NAME=$(basename $current_dir) fi - COMPILE_TIME=$((time nargo compile --force) 2>&1 | grep real | grep -oE '[0-9]+m[0-9]+.[0-9]+s') + COMPILE_TIME=$((time nargo compile --force --silence-warnings) 2>&1 | grep real | grep -oE '[0-9]+m[0-9]+.[0-9]+s') echo -e " {\n \"artifact_name\":\"$PACKAGE_NAME\",\n \"time\":\"$COMPILE_TIME\"" >> $current_dir/compilation_report.json if (($ITER == $NUM_ARTIFACTS)); then From 6632fa0a01099922243af340a2885affda0b076a Mon Sep 17 00:00:00 2001 From: Maxim Vezenov Date: Tue, 10 Dec 2024 21:26:47 +0000 Subject: [PATCH 133/135] comment out rollup circuits for now --- .github/workflows/reports.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 67da32d3b70..95ef67a86e2 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -275,7 +275,7 @@ jobs: external_repo_compilation_report: needs: [build-nargo] runs-on: ubuntu-latest - timeout-minutes: 30 + timeout-minutes: 15 strategy: fail-fast: false matrix: @@ -284,8 +284,9 @@ jobs: - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/parity-root } - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/private-kernel-inner } - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/private-kernel-reset } - - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/rollup-base-private } - - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/rollup-base-public } + # TODO: Bring these back once they no longer time out + # - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/rollup-base-private } + # - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/rollup-base-public } name: External repo compilation report - ${{ matrix.project.repo }}/${{ matrix.project.path }} steps: From 5fe58e0d4e7e9d2b27fc7c1c296265d45203d260 Mon Sep 17 00:00:00 2001 From: Tom French <15848336+TomAFrench@users.noreply.github.com> Date: Wed, 11 Dec 2024 11:38:33 +0000 Subject: [PATCH 134/135] Update .github/workflows/reports.yml --- .github/workflows/reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 95ef67a86e2..be3272f6302 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -285,8 +285,8 @@ jobs: - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/private-kernel-inner } - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/private-kernel-reset } # TODO: Bring these back once they no longer time out - # - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/rollup-base-private } - # - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/rollup-base-public } + - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/rollup-base-private } + - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/rollup-base-public } name: External repo compilation report - ${{ matrix.project.repo }}/${{ matrix.project.path }} steps: From 5ccf5e557f5f60359c5e26f39ea96d75de9835c7 Mon Sep 17 00:00:00 2001 From: Tom French <15848336+TomAFrench@users.noreply.github.com> Date: Wed, 11 Dec 2024 14:22:40 +0000 Subject: [PATCH 135/135] Update .github/workflows/reports.yml --- .github/workflows/reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index be3272f6302..2077e8e6a1e 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -285,8 +285,8 @@ jobs: - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/private-kernel-inner } - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/private-kernel-reset } # TODO: Bring these back once they no longer time out - - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/rollup-base-private } - - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/rollup-base-public } + #- project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/rollup-base-private } + #- project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/rollup-base-public } name: External repo compilation report - ${{ matrix.project.repo }}/${{ matrix.project.path }} steps: