merge main

matter-labs · Oct 28, 2024 · 3c0ab96 · 3c0ab96
1 parent a5df3c2
commit 3c0ab96
Show file tree

Hide file tree

Showing 69 changed files with 1,663 additions and 912 deletions.
diff --git a/.github/workflows/ci-core-reusable.yml b/.github/workflows/ci-core-reusable.yml
@@ -403,12 +403,16 @@ jobs:
 
       - name: Run servers
         run: |
+          # Override config for part of chains to test the default config as well
+          ci_run zkstack dev config-writer --path etc/env/file_based/overrides/tests/integration.yaml --chain era
+          ci_run zkstack dev config-writer --path etc/env/file_based/overrides/tests/integration.yaml --chain validium
+          
           ci_run zkstack server --ignore-prerequisites --chain era &> ${{ env.SERVER_LOGS_DIR }}/rollup.log &
           ci_run zkstack server --ignore-prerequisites --chain validium &> ${{ env.SERVER_LOGS_DIR }}/validium.log &
           ci_run zkstack server --ignore-prerequisites --chain custom_token &> ${{ env.SERVER_LOGS_DIR }}/custom_token.log &
           ci_run zkstack server --ignore-prerequisites --chain consensus \
-          --components=api,tree,eth,state_keeper,housekeeper,commitment_generator,vm_runner_protective_reads,vm_runner_bwip,vm_playground,da_dispatcher,consensus \
-          &> ${{ env.SERVER_LOGS_DIR }}/consensus.log &
+            --components=api,tree,eth,state_keeper,housekeeper,commitment_generator,vm_runner_protective_reads,vm_runner_bwip,vm_playground,da_dispatcher,consensus \
+            &> ${{ env.SERVER_LOGS_DIR }}/consensus.log &
 
           ci_run sleep 5
 

diff --git a/.github/workflows/vm-perf-comparison.yml b/.github/workflows/vm-perf-comparison.yml
@@ -40,6 +40,8 @@ jobs:
 #          echo "SCCACHE_GCS_SERVICE_ACCOUNT=gha-ci-runners@matterlabs-infra.iam.gserviceaccount.com" >> .env
 #          echo "SCCACHE_GCS_RW_MODE=READ_WRITE" >> .env
 #          echo "RUSTC_WRAPPER=sccache" >> .env
+#          # Set the minimum reported instruction count difference to reduce noise
+#          echo "BENCHMARK_DIFF_THRESHOLD_PERCENT=2" >> .env
 #
 #      - name: init
 #        run: |
@@ -51,33 +53,48 @@ jobs:
 #        run: |
 #          ci_run zkstackup -g --local
 #          ci_run zkstack dev contracts --system-contracts
-#          ci_run cargo bench --package vm-benchmark --bench iai | tee base-iai
-#          ci_run cargo run --package vm-benchmark --release --bin instruction_counts | tee base-opcodes || touch base-opcodes
+#          ci_run cargo bench --package vm-benchmark --bench instructions -- --verbose || echo "Instructions benchmark is missing"
+#          ci_run cargo run --package vm-benchmark --release --bin instruction_counts | tee base-opcodes
 #
 #      - name: checkout PR
 #        run: |
 #          git checkout --force FETCH_HEAD --recurse-submodules
 #
 #      - name: run benchmarks on PR
 #        shell: bash
+#        id: comparison
 #        run: |
 #          ci_run zkstackup -g --local
 #          ci_run zkstack dev contracts --system-contracts
-#          ci_run cargo bench --package vm-benchmark --bench iai | tee pr-iai
-#          ci_run cargo run --package vm-benchmark --release --bin instruction_counts | tee pr-opcodes || touch pr-opcodes
+#          ci_run cargo bench --package vm-benchmark --bench instructions -- --verbose
 #
+#          ci_run cargo bench --package vm-benchmark --bench instructions -- --print > instructions.log 2>/dev/null
+#          # Output all lines from the benchmark result starting from the "## ..." comparison header.
+#          # Since the output spans multiple lines, we use a heredoc declaration.
 #          EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
 #          echo "speedup<<$EOF" >> $GITHUB_OUTPUT
-#          ci_run cargo run --package vm-benchmark --release --bin compare_iai_results base-iai pr-iai base-opcodes pr-opcodes >> $GITHUB_OUTPUT
+#          sed -n '/^## /,$p' instructions.log >> $GITHUB_OUTPUT
+#          echo "$EOF" >> $GITHUB_OUTPUT
+#
+#          ci_run cargo run --package vm-benchmark --release --bin instruction_counts -- --diff base-opcodes > opcodes.log
+#          echo "opcodes<<$EOF" >> $GITHUB_OUTPUT
+#          sed -n '/^## /,$p' opcodes.log >> $GITHUB_OUTPUT
 #          echo "$EOF" >> $GITHUB_OUTPUT
-#        id: comparison
 #
 #      - name: Comment on PR
 #        uses: thollander/actions-comment-pull-request@fabd468d3a1a0b97feee5f6b9e499eab0dd903f6 # v2.5.0
+#        if: steps.comparison.outputs.speedup != '' || steps.comparison.outputs.opcodes != ''
 #        with:
 #          message: |
-#            ${{ steps.comparison.outputs.speedup == '' && '## No performance difference detected (anymore)' || '## Detected VM performance changes' }}
 #            ${{ steps.comparison.outputs.speedup }}
+#            ${{ steps.comparison.outputs.opcodes }}
 #          comment_tag: vm-performance-changes
 #          mode: recreate
-#          create_if_not_exists: ${{ steps.comparison.outputs.speedup != '' }}
+#          create_if_not_exists: true
+#      - name: Remove PR comment
+#        uses: thollander/actions-comment-pull-request@fabd468d3a1a0b97feee5f6b9e499eab0dd903f6 # v2.5.0
+#        if: steps.comparison.outputs.speedup == '' && steps.comparison.outputs.opcodes == ''
+#        with:
+#          comment_tag: vm-performance-changes
+#          message: 'No performance difference detected (anymore)'
+#          mode: delete
diff --git a/.github/workflows/vm-perf-to-prometheus.yml b/.github/workflows/vm-perf-to-prometheus.yml
@@ -48,5 +48,5 @@ jobs:
           ci_run cargo bench --package vm-benchmark --bench oneshot
           # Run only benches with 1,000 transactions per batch to not spend too much time
           ci_run cargo bench --package vm-benchmark --bench batch '/1000$'
-          ci_run cargo bench --package vm-benchmark --bench iai | tee iai-result
-          ci_run cargo run --package vm-benchmark --bin iai_results_to_prometheus --release < iai-result
+          ci_run cargo bench --package vm-benchmark --bench instructions -- --verbose
+          ci_run cargo bench --package vm-benchmark --bench instructions -- --print