Revert "Merge branch 'main' into feat/native_multi_observe"

This reverts commit ea82760, reversing
changes made to 3230ce8.

Author: darth-cy

.github/workflows/benchmark-call.yml

@@ -106,7 +106,6 @@ on:
 
 env:
   S3_METRICS_PATH: s3://openvm-public-data-sandbox-us-east-1/benchmark/github/metrics
-  S3_FLAMEGRAPHS_PATH: s3://openvm-public-data-sandbox-us-east-1/benchmark/github/flamegraphs
   FEATURE_FLAGS: "bench-metrics,parallel,nightly-features"
   INPUT_ARGS: ""
   CARGO_NET_GIT_FETCH_WITH_CLI: "true"
@@ -182,9 +181,9 @@ jobs:
       - name: Set working directory
         id: set-working-dir
         run: |
-          WORKING_DIR=$(jq -r --arg id "${{ inputs.benchmark_id }}" '
+          WORKING_DIR=$(jq -r --arg name "${{ inputs.benchmark_name }}" '
             .benchmarks[] |
-            select(.id == $id) |
+            select(.name == $name) |
             .working_directory
           ' ./ci/benchmark-config.json)
           RELATIVE_PATH=$(python3 -c "import os.path; print(os.path.relpath('.', '$WORKING_DIR'))")
@@ -229,25 +228,16 @@ jobs:
 
           s5cmd cp $METRIC_PATH ${{ env.S3_METRICS_PATH }}/${METRIC_NAME}-${current_sha}.json
 
-      - name: Install inferno-flamegraph
-        if: ${{ contains(env.FEATURE_FLAGS, 'profiling') }}
-        run: cargo install inferno
+      # - name: Install inferno-flamegraph
+      #   run: cargo install inferno
 
-      - name: Generate flamegraphs
-        if: ${{ contains(env.FEATURE_FLAGS, 'profiling') }}
-        run: |
-          if [[ -f $METRIC_PATH ]]; then
-            GUEST_SYMBOLS_PATH="${METRIC_PATH%.json}.syms"
-            if [[ -f $GUEST_SYMBOLS_PATH ]]; then
-              echo "Generating flamegraphs with guest symbols"
-              python3 ci/scripts/metric_unify/flamegraph.py $METRIC_PATH --guest-symbols $GUEST_SYMBOLS_PATH
-            else
-              echo "No guest symbols found, generating flamegraphs without symbols"
-              python3 ci/scripts/metric_unify/flamegraph.py $METRIC_PATH
-            fi
-            s5cmd cp '.bench_metrics/flamegraphs/*.svg' "${{ env.S3_FLAMEGRAPHS_PATH }}/${METRIC_NAME}-${current_sha}/"
-            echo "UPLOAD_FLAMEGRAPHS=1" >> $GITHUB_ENV
-          fi
+      # - name: Generate flamegraphs
+      #   run: |
+      #     if [[ -f $METRIC_PATH ]]; then
+      #       python3 ci/scripts/metric_unify/flamegraph.py $METRIC_PATH
+      #       s5cmd cp '.bench_metrics/flamegraphs/*.svg' "${{ env.PUBLIC_S3_PATH }}/${current_sha}/"
+      #       echo "UPLOAD_FLAMEGRAPHS=1" >> $GITHUB_ENV
+      #     fi
 
       ##########################################################################
       # Update s3 for latest main metrics upon a push event                    #

.github/workflows/benchmarks-execute.yml

@@ -7,7 +7,7 @@ on:
     types: [opened, synchronize, reopened, labeled]
     branches: ["**"]
     paths:
-      - "benchmarks/prove/**"
+      - "benchmarks/**"
       - "crates/circuits/**"
       - "crates/toolchain/**"
       - "crates/prof/**"
@@ -199,9 +199,6 @@ jobs:
       - name: Download all metric json files from S3
         run: |
           matrix=$(echo '${{ needs.create-matrix.outputs.matrix }}')
-          names=$(echo $matrix | jq -r '.[] | "\(.id)"')
-          names_list=$(echo -n "$names" | paste -sd "," -)
-
           json_files=$(echo $matrix | jq -r '
             .[] |
             "\(.id)-${{ env.CURRENT_SHA }}.json"')
@@ -227,7 +224,6 @@ jobs:
 
           openvm-prof --json-paths "${json_file_list}" \
             --prev-json-paths "${prev_json_file_list}" \
-            --names "${names_list}" \
             summary \
             --benchmark-results-link "https://github.com/${{ github.repository }}/blob/benchmark-results/${BENCHMARK_RESULTS_PATH}" \
             --summary-md-path summary.md

.github/workflows/benchmarks.yml

@@ -12,7 +12,6 @@ on:
       - "crates/cli/**"
       - "examples/**"
       - "Cargo.toml"
-      - ".github/workflows/cli.yml"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
@@ -26,11 +25,11 @@ jobs:
   app-level-cli:
     runs-on:
       - runs-on=${{ github.run_id }}
-      - disk=large
       - runner=32cpu-linux-arm64
       - extras=s3-cache
 
     steps:
+      - uses: runs-on/action@v1
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
@@ -40,41 +39,38 @@ jobs:
       - name: Install solc # svm should support arm64 linux
         run: (hash svm 2>/dev/null || cargo install --version 0.2.23 svm-rs) && svm install 0.8.19 && solc --version
 
+      - name: Install tools
+        run: |
+          rustup component add rust-src --toolchain nightly-2025-02-14
+
       - name: Install cargo-openvm
         working-directory: crates/cli
         run: |
           cargo install --force --locked --path .
 
+      - name: check build consistency
+        working-directory: examples/ecc
+        run: |
+          cargo openvm build
+          mv openvm/app.vmexe app1.vmexe
+          cargo openvm build
+          cmp app1.vmexe openvm/app.vmexe || (echo "Build is not deterministic!" && exit 1)
+
       - name: Build and run book examples
         working-directory: examples
         run: |
-          set -e
           for dir in */; do
             if [ -f "${dir}Cargo.toml" ]; then
               echo "Building ${dir%/}"
               cd "$dir"
-              cargo openvm build
-              cargo openvm run
+              cargo openvm build && cargo openvm run
               cd ..
             fi
           done
 
-      - name: check build consistency
-        working-directory: examples/ecc
-        run: |
-          cargo openvm build
-          mv target/openvm/release/ecc-example.vmexe app1.vmexe
-          cargo openvm build
-          cmp app1.vmexe target/openvm/release/ecc-example.vmexe || (echo "Build is not deterministic!" && exit 1)
-
       - name: Run app-level CLI commands
         working-directory: crates/cli
         run: |
           export RUST_BACKTRACE=1
           cargo build
-          cargo run --bin cargo-openvm -- openvm keygen --config ./example/app_config.toml --output-dir .
-
-      - name: Run CLI tests
-        working-directory: crates/cli
-        run: |
-          cargo nextest run --cargo-profile=fast
+          cargo run --bin cargo-openvm -- openvm keygen --config ./example/app_config.toml --output app.pk --vk-output app.vk

.github/workflows/cli.yml

@@ -76,6 +76,8 @@ jobs:
           FEATURE_ARGS=""
           if [[ "${{ matrix.extension.name }}" == "pairing" ]]; then
             FEATURE_ARGS="--features=bn254,bls12_381,halo2curves"
+          elif [[ "${{ matrix.extension.name }}" == "ecc" ]]; then
+            FEATURE_ARGS="--features=k256,p256"
           fi
           cargo nextest run --cargo-profile=fast $FEATURE_ARGS --no-tests=pass