chore: update openvm to v0.1.1 (#26)

* chore: patch openvm to latest main

* chore: update revm

* chore: use openvm-prof

* update tags

* turn off patches

.cargo/config.toml

@@ -1,53 +1,105 @@
-[net]
-git-fetch-with-cli = true
+# [net]
+# git-fetch-with-cli = true
 
-# [patch."ssh://[email protected]/openvm-org/openvm.git"]
+# [patch."https://github.com/openvm-org/stark-backend.git"]
+# openvm-stark-backend = { git = "ssh://[email protected]/openvm-org/stark-backend.git" }
+# openvm-stark-sdk = { git = "ssh://[email protected]/openvm-org/stark-backend.git" }
+
+# [patch."https://github.com/openvm-org/openvm.git"]
+# openvm-benchmarks = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# # OpenVM
+# openvm-sdk = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# cargo-openvm = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-mod-circuit-builder = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-poseidon2-air = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-circuit-primitives = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-circuit-primitives-derive = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-build = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-instructions = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-instructions-derive = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-macros-common = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-platform = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-transpiler = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-circuit = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-circuit-derive = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+
+# # Extensions
+# openvm-algebra-circuit = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-algebra-transpiler = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-algebra-guest = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-algebra-moduli-setup = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-algebra-complex-macros = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-bigint-circuit = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-bigint-transpiler = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-bigint-guest = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-ecc-circuit = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-ecc-transpiler = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-ecc-guest = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-ecc-sw-setup = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-keccak256-circuit = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-keccak256-transpiler = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-keccak256-guest = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-native-circuit = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-native-compiler = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-native-compiler-derive = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-native-recursion = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-pairing-circuit = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-pairing-transpiler = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-pairing-guest = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-rv32-adapters = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-rv32im-circuit = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-rv32im-transpiler = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-rv32im-guest = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+
+
+# [patch."https://github.com/openvm-org/openvm.git"]
 # # OpenVM
-# openvm-sdk = { path = "../openvm/crates/sdk", default-features = false }
-# cargo-openvm = { path = "../openvm/crates/cli", default-features = false }
-# openvm-mod-circuit-builder = { path = "../openvm/crates/circuits/mod-builder", default-features = false }
-# openvm-poseidon2-air = { path = "../openvm/crates/circuits/poseidon2-air", default-features = false }
-# openvm-circuit-primitives = { path = "../openvm/crates/circuits/primitives", default-features = false }
-# openvm-circuit-primitives-derive = { path = "../openvm/crates/circuits/primitives/derive", default-features = false }
-# openvm = { path = "../openvm/crates/toolchain/openvm", default-features = false }
-# openvm-build = { path = "../openvm/crates/toolchain/build", default-features = false }
-# openvm-instructions = { path = "../openvm/crates/toolchain/instructions", default-features = false }
-# openvm-instructions-derive = { path = "../openvm/crates/toolchain/instructions/derive", default-features = false }
-# openvm-macros-common = { path = "../openvm/crates/toolchain/macros", default-features = false }
-# openvm-platform = { path = "../openvm/crates/toolchain/platform", default-features = false }
-# openvm-transpiler = { path = "../openvm/crates/toolchain/transpiler", default-features = false }
-# openvm-circuit = { path = "../openvm/crates/vm", default-features = false }
-# openvm-circuit-derive = { path = "../openvm/crates/vm/derive", default-features = false }
+# openvm-sdk = { git = "ssh://[email protected]/openvm-org/openvm.git"sdk", default-features = false }
+# cargo-openvm = { git = "ssh://[email protected]/openvm-org/openvm.git"cli", default-features = false }
+# openvm-mod-circuit-builder = { git = "ssh://[email protected]/openvm-org/openvm.git"circuits/mod-builder", default-features = false }
+# openvm-poseidon2-air = { git = "ssh://[email protected]/openvm-org/openvm.git"circuits/poseidon2-air", default-features = false }
+# openvm-circuit-primitives = { git = "ssh://[email protected]/openvm-org/openvm.git"circuits/primitives", default-features = false }
+# openvm-circuit-primitives-derive = { git = "ssh://[email protected]/openvm-org/openvm.git"circuits/primitives/derive", default-features = false }
+# openvm = { git = "ssh://[email protected]/openvm-org/openvm.git"toolchain/openvm", default-features = false }
+# openvm-build = { git = "ssh://[email protected]/openvm-org/openvm.git"toolchain/build", default-features = false }
+# openvm-instructions = { git = "ssh://[email protected]/openvm-org/openvm.git"toolchain/instructions", default-features = false }
+# openvm-instructions-derive = { git = "ssh://[email protected]/openvm-org/openvm.git"toolchain/instructions/derive", default-features = false }
+# openvm-macros-common = { git = "ssh://[email protected]/openvm-org/openvm.git"toolchain/macros", default-features = false }
+# openvm-platform = { git = "ssh://[email protected]/openvm-org/openvm.git"toolchain/platform", default-features = false }
+# openvm-transpiler = { git = "ssh://[email protected]/openvm-org/openvm.git"toolchain/transpiler", default-features = false }
+# openvm-circuit = { git = "ssh://[email protected]/openvm-org/openvm.git"vm", default-features = false }
+# openvm-circuit-derive = { git = "ssh://[email protected]/openvm-org/openvm.git"vm/derive", default-features = false }
 # openvm-stark-backend = { path = "../stark-backend/crates/stark-backend", default-features = false }
 # openvm-stark-sdk = { path = "../stark-backend/crates/stark-sdk", default-features = false }
 
 # # Extensions
-# openvm-algebra-circuit = { path = "../openvm/extensions/algebra/circuit", default-features = false }
-# openvm-algebra-transpiler = { path = "../openvm/extensions/algebra/transpiler", default-features = false }
-# openvm-algebra-guest = { path = "../openvm/extensions/algebra/guest", default-features = false }
-# openvm-algebra-moduli-setup = { path = "../openvm/extensions/algebra/moduli-setup", default-features = false }
-# openvm-algebra-complex-macros = { path = "../openvm/extensions/algebra/guest/src/field/complex-macros", default-features = false }
-# openvm-bigint-circuit = { path = "../openvm/extensions/bigint/circuit", default-features = false }
-# openvm-bigint-transpiler = { path = "../openvm/extensions/bigint/transpiler", default-features = false }
-# openvm-bigint-guest = { path = "../openvm/extensions/bigint/guest", default-features = false }
-# openvm-ecc-circuit = { path = "../openvm/extensions/ecc/circuit", default-features = false }
-# openvm-ecc-transpiler = { path = "../openvm/extensions/ecc/transpiler", default-features = false }
-# openvm-ecc-guest = { path = "../openvm/extensions/ecc/guest", default-features = false }
-# openvm-ecc-sw-setup = { path = "../openvm/extensions/ecc/sw-setup", default-features = false }
-# openvm-keccak256-circuit = { path = "../openvm/extensions/keccak256/circuit", default-features = false }
-# openvm-keccak256-transpiler = { path = "../openvm/extensions/keccak256/transpiler", default-features = false }
-# openvm-keccak256-guest = { path = "../openvm/extensions/keccak256/guest", default-features = false }
-# openvm-native-circuit = { path = "../openvm/extensions/native/circuit", default-features = false }
-# openvm-native-compiler = { path = "../openvm/extensions/native/compiler", default-features = false }
-# openvm-native-compiler-derive = { path = "../openvm/extensions/native/compiler/derive", default-features = false }
-# openvm-native-recursion = { path = "../openvm/extensions/native/recursion", default-features = false }
-# openvm-pairing-circuit = { path = "../openvm/extensions/pairing/circuit", default-features = false }
-# openvm-pairing-transpiler = { path = "../openvm/extensions/pairing/transpiler", default-features = false }
-# openvm-pairing-guest = { path = "../openvm/extensions/pairing/guest", default-features = false }
-# openvm-rv32-adapters = { path = "../openvm/extensions/rv32-adapters", default-features = false }
-# openvm-rv32im-circuit = { path = "../openvm/extensions/rv32im/circuit", default-features = false }
-# openvm-rv32im-transpiler = { path = "../openvm/extensions/rv32im/transpiler", default-features = false }
-# openvm-rv32im-guest = { path = "../openvm/extensions/rv32im/guest", default-features = false }
+# openvm-algebra-circuit = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-algebra-transpiler = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-algebra-guest = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-algebra-moduli-setup = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-algebra-complex-macros = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-bigint-circuit = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-bigint-transpiler = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-bigint-guest = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-ecc-circuit = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-ecc-transpiler = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-ecc-guest = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-ecc-sw-setup = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-keccak256-circuit = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-keccak256-transpiler = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-keccak256-guest = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-native-circuit = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-native-compiler = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-native-compiler-derive = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-native-recursion = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-pairing-circuit = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-pairing-transpiler = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-pairing-guest = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-rv32-adapters = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-rv32im-circuit = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-rv32im-transpiler = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
+# openvm-rv32im-guest = { git = "ssh://[email protected]/openvm-org/openvm.git", default-features = false }
 
 # [patch.crates-io]
 # revm = { path = "../revm/crates/revm" }

.github/workflows/reth-benchmark.yml

@@ -88,9 +88,18 @@ jobs:
           cache-on-failure: true
       - name: Display workflow inputs
         run: echo "${{ toJSON(github.event.inputs) }}"
+      # - name: Load SSH key
+      #   uses: webfactory/[email protected]
+      #   with:
+      #     ssh-private-key: |
+      #       ${{ secrets.GH_ACTIONS_DEPLOY_PRIVATE_KEY }}
+
       - name: Install cargo-openvm
         run: |
-          cargo install --git https://github.com/openvm-org/openvm.git --tag v0.1.0-alpha cargo-openvm
+          cargo install --git https://github.com/openvm-org/openvm.git cargo-openvm
+      - name: Install openvm-prof
+        run: |
+          cargo install --git https://github.com/openvm-org/openvm.git --profile=dev openvm-prof
       - name: Checkout openvm (for scripts)
         run: |
           git clone https://github.com/openvm-org/openvm.git
@@ -100,9 +109,6 @@ jobs:
           rustup install nightly-2024-10-30
           source openvm/ci/scripts/utils.sh
           install_s5cmd
-      - name: Setup python
-        run: |
-          pip install -r ci/requirements.txt
 
       - name: Setup halo2
         if: ${{ github.event.inputs.mode == 'prove-e2e' }}
@@ -175,8 +181,9 @@ jobs:
 
       - name: Generate markdown # result path is hardcoded results.md
         run: |
-          source openvm/ci/scripts/utils.sh
-          generate_markdown $METRIC_PATH $METRIC_NAME ${{ env.S3_METRICS_PATH }} "./openvm"
+          openvm-prof --json-paths $METRIC_PATH
+          MD_PATH=${METRIC_PATH%.json}.md
+          echo "MD_PATH=${MD_PATH}" >> $GITHUB_ENV
 
       # - name: Install inferno-flamegraph
       #   run: cargo install inferno
@@ -191,21 +198,20 @@ jobs:
 
       - name: Add benchmark metadata to markdown, and upload
         run: |
+          COMMIT_URL=https://github.com/${{ github.repository }}/commit/${current_sha}
+          BENCHMARK_WORKFLOW_URL=https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
+
           source openvm/ci/scripts/utils.sh
-          add_metadata results.md ${{ inputs.max_segment_length }} ${{ inputs.instance_family }} ${{ inputs.memory_allocator }} ${{ github.repository }} ${{ github.run_id }}
+          add_metadata $MD_PATH \
+            ${{ inputs.max_segment_length }} \
+            ${{ inputs.instance_family }} \
+            ${{ inputs.memory_allocator }} \
+            $COMMIT_URL \
+            $BENCHMARK_WORKFLOW_URL
 
-      - name: Summarize metrics md
-        run: |
-          if [[ -f $METRIC_PATH ]] && [[ ${{ inputs.mode }} == "prove-e2e" ]]; then
-            # prepend to results.md
-            python3 ci/summarize.py $METRIC_PATH --print > temp.md
-            cat results.md >> temp.md
-            rm results.md
-            mv temp.md results.md
-          fi
-      - name: upload markdown
+      - name: Upload markdown
         run: |
-          s5cmd cp results.md "${{ env.S3_PATH }}/${current_sha}-${METRIC_NAME}.md"
+          s5cmd cp $MD_PATH "${{ env.S3_PATH }}/${current_sha}-${METRIC_NAME}.md"
 
       ### Update gh-pages
       - uses: actions/checkout@v4