Merge branch 'master' into jl/brillig_entry

Author: jialinli98

.github/actions/download-binary/action.yml

@@ -0,0 +1,21 @@
+name: Download Binary
+description: Downloads a binary from an artifact and adds it to the path
+inputs:
+  name:
+    description: Name of the binary to download, e.g. 'nargo'
+    required: true
+runs:
+  using: composite
+  steps:
+    - name: Download ${{ inputs.name }} binary
+      uses: actions/download-artifact@v4
+      with:
+        name: ${{ inputs.name }}
+        path: ./${{ inputs.name }}
+
+    - name: Set ${{ inputs.name }} on PATH
+      shell: bash
+      run: |
+        binary="${{ github.workspace }}/${{ inputs.name }}/${{ inputs.name }}"
+        chmod +x $binary
+        echo "$(dirname $binary)" >> $GITHUB_PATH

.github/actions/download-nargo/action.yml

@@ -1,4 +1,4 @@
-define: &AZ_COMMIT 5be53b6f75bac06d6d0132220044b28777021f0f
+define: &AZ_COMMIT 3bc986da25df117f91b133c4a370b214d3d88e96
 projects:
   private-kernel-inner:
     repo: AztecProtocol/aztec-packages
@@ -82,7 +82,7 @@ projects:
     cannot_execute_brillig: true
     num_runs: 1
     compilation-timeout: 500
-    execution-timeout: 0.75
+    execution-timeout: 35
     brillig-compilation-timeout: 500
     compilation-memory-limit: 12000
     execution-memory-limit: 2000
@@ -93,7 +93,7 @@ projects:
     cannot_execute_brillig: true
     num_runs: 1
     compilation-timeout: 525
-    execution-timeout: 1
+    execution-timeout: 35
     brillig-compilation-timeout: 525
     compilation-memory-limit: 12000
     execution-memory-limit: 2000

.github/actions/download-noir-execute/action.yml

@@ -169,7 +169,9 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Download nargo binary
-        uses: ./.github/actions/download-nargo
+        uses: ./.github/actions/download-binary
+        with:
+          name: nargo
 
       - name: Format stdlib
         working-directory: ./noir_stdlib

.github/actions/download-noir-inspector/action.yml

@@ -50,7 +50,9 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Download nargo binary
-        uses: ./.github/actions/download-nargo
+        uses: ./.github/actions/download-binary
+        with:
+          name: nargo
 
       - name: Run `integration-tests`
         working-directory: ./noir_stdlib

.github/actions/download-noir-ssa/action.yml

@@ -158,7 +158,9 @@ jobs:
           echo "$HOME/.bb/" >> $GITHUB_PATH
 
       - name: Download nargo binary
-        uses: ./.github/actions/download-nargo
+        uses: ./.github/actions/download-binary
+        with:
+          name: nargo
 
       - name: Build Noir circuits
         working-directory: ./test_programs
@@ -198,7 +200,9 @@ jobs:
       - uses: actions/checkout@v6
 
       - name: Download nargo binary
-        uses: ./.github/actions/download-nargo
+        uses: ./.github/actions/download-binary
+        with:
+          name: nargo
 
       - name: Generate Brillig bytecode size report
         working-directory: ./test_programs
@@ -250,7 +254,9 @@ jobs:
       - uses: actions/checkout@v6
 
       - name: Download nargo binary
-        uses: ./.github/actions/download-nargo
+        uses: ./.github/actions/download-binary
+        with:
+          name: nargo
 
       - name: Generate Brillig execution report
         working-directory: ./test_programs
@@ -302,7 +308,9 @@ jobs:
       - uses: actions/checkout@v6
 
       - name: Download nargo binary
-        uses: ./.github/actions/download-nargo
+        uses: ./.github/actions/download-binary
+        with:
+          name: nargo
 
       - name: Generate Memory report
         working-directory: ./test_programs
@@ -346,8 +354,7 @@ jobs:
       - uses: actions/checkout@v6
         with:
           sparse-checkout: |
-            .github/actions/download-nargo/action.yml
-            .github/actions/download-noir-inspector/action.yml
+            .github/actions/download-binary/action.yml
             scripts/gather_benchmark_data.sh
             scripts/process_benchmark_data.sh
           sparse-checkout-cone-mode: false
@@ -360,10 +367,14 @@ jobs:
           ref: ${{ matrix.ref }}
 
       - name: Download nargo binary
-        uses: ./.github/actions/download-nargo
+        uses: ./.github/actions/download-binary
+        with:
+          name: nargo
 
       - name: Download noir-inspector binary
-        uses: ./.github/actions/download-noir-inspector
+        uses: ./.github/actions/download-binary
+        with:
+          name: noir-inspector
 
       - name: Generate compilation report
         id: compilation_report
@@ -416,7 +427,7 @@ jobs:
       - name: Check execution time limit
         if: ${{ !matrix.cannot_execute }}
         run: |
-          TIME=$(jq '.execution_time.value' ${{ steps.execution_report.outputs.report_path }})
+          TIME=$(jq '.execution_time.value' ${{ steps.compilation_report.outputs.report_path }})
           TIME_LIMIT=${{ matrix.execution-timeout }}
           if awk 'BEGIN{exit !(ARGV[1]>ARGV[2])}' "$TIME" "$TIME_LIMIT"; then
             # Don't bump this timeout without understanding why this has happened and confirming that you're not the cause.
@@ -464,15 +475,18 @@ jobs:
     steps:
       - uses: actions/checkout@v6
         with:
+          # Note that we are checking them out under `scripts`, including the github action.
           path: scripts
           sparse-checkout: |
-            .github/actions/download-nargo/action.yml
+            .github/actions/download-binary/action.yml
             test_programs/memory_report.sh
             test_programs/parse_memory.sh
           sparse-checkout-cone-mode: false
 
       - name: Download nargo binary
-        uses: ./scripts/.github/actions/download-nargo
+        uses: ./scripts/.github/actions/download-binary
+        with:
+          name: nargo
 
       - name: Checkout
         uses: actions/checkout@v6
@@ -605,6 +619,52 @@ jobs:
           alert-comment-cc-users: "@TomAFrench"
           max-items-in-chart: 50
 
+  upload_elaboration_reports:
+    name: Upload elaboration reports
+    needs: [external_repo_reports]
+    timeout-minutes: 5
+    # We want this job to run even if one variation of the matrix in `external_repo_reports` fails
+    if: always()
+    runs-on: ubuntu-22.04
+    permissions:
+      pull-requests: write
+      # deployments permission to deploy GitHub pages website
+      deployments: write
+      # contents permission to update benchmark contents in gh-pages branch
+      contents: write
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Download matrix compilation reports
+        uses: actions/download-artifact@v7
+        with:
+          pattern: external_report_*
+          path: ./reports
+          merge-multiple: true
+
+      - name: Merge elaboration reports using jq
+        run: |
+          # Github actions seems to not expand "**" in globs by default.
+          shopt -s globstar
+          jq --slurp 'map(.elaboration_time | select(.))' ./reports/* | tee time_bench.json
+
+      - name: Store benchmark result
+        uses: benchmark-action/github-action-benchmark@4bdcce38c94cec68da58d012ac24b7b1155efe8b
+        with:
+          name: "Elaboration Time"
+          tool: "customSmallerIsBetter"
+          output-file-path: ./time_bench.json
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          # We want this to only run on master to avoid garbage data from PRs being added.
+          auto-push: ${{ github.ref == 'refs/heads/master' }}
+          alert-threshold: "120%"
+          comment-on-alert: true
+          comment-always: ${{ contains( github.event.pull_request.labels.*.name, 'bench-show') }}
+          fail-on-alert: false
+          alert-comment-cc-users: "@TomAFrench"
+          max-items-in-chart: 50
+
   upload_execution_reports:
     name: Upload execution reports
     needs: [external_repo_reports]
@@ -994,6 +1054,7 @@ jobs:
     needs:
       - rust_benchmarks
       - upload_compilation_reports
+      - upload_elaboration_reports
       - upload_execution_reports
       - upload_artifact_reports
       - upload_opcode_reports