chore: add more tests to submit

matter-labs · Jan 31, 2025 · c136f15 · c136f15
1 parent e417613
commit c136f15
Showing 1 changed file with 40 additions and 44 deletions.
diff --git a/.github/workflows/lnt.yml b/.github/workflows/lnt.yml
@@ -42,6 +42,8 @@ jobs:
     container:
       image: ghcr.io/matter-labs/zksync-llvm-runner:latest
       options: -m 110g
+    env:
+      RESULTS_DIR: results
     steps:
 
       - name: Checkout LNT
@@ -56,15 +58,7 @@ jobs:
           python-version: '3.9'
 
       - name: Install LNT
-        run: |
-          cd lnt && pip install .
-          which lnt
-          lnt --version
-
-      - name: Check LNT
-        run: |
-          which lnt
-          lnt --version
+        run: cd lnt && pip install .
 
       - name: Define branches
         shell: bash -ex {0}
@@ -138,43 +132,45 @@ jobs:
                 --path 'solidity' \
                 --mode "${MODE}" \
                 --toolchain "${TOOLCHAIN}" \
-                --benchmark results_llvm_eravm_${TOOLCHAIN}_${MODE} \
+                --benchmark "${RESULTS_DIR}" \
                 --benchmark-format json-lnt \
                 --benchmark-context context.json || true
             done
           done
 
-          # for MODE in Y+M3B3 Y+MzB3; do
-          #   for TOOLCHAIN in solc ir-llvm; do
-          #     for ENV in REVM EVMInterpreter; do
-          #       # Create a context file
-          #       echo "{
-          #         \"machine\": \"llvm_evm_${TOOLCHAIN}_${MODE}_${ENV}\",
-          #         \"target\": \"evm\",
-          #         \"environment\": \"${ENV}\",
-          #         \"toolchain\": \"${TOOLCHAIN}\",
-          #         \"zksolc_version\": \"${ZKSOLC_VERSION}\",
-          #         \"llvm_version\": \"${LLVM_VERSION}\"
-          #       }" > context.json
-          #       # Run benchmarks
-          #       ./target/release/compiler-tester \
-          #         --zksolc ./target-zksolc/release/zksolc \
-          #         --target evm \
-          #         --path 'solidity' \
-          #         --mode "${MODE}" \
-          #         --toolchain "${TOOLCHAIN}" \
-          #         --environment "${ENV}" \
-          #         --benchmark results_llvm_evm_${TOOLCHAIN}_${MODE}_${ENV} \
-          #         --benchmark-format json-lnt \
-          #         --benchmark-context context.json || true
-          #     done
-          #   done
-          # done
-
-          find results* -name '*.json'
-
-          head -n 20 ./results_llvm_eravm_ir-llvm_Y+M3B3/llvm_eravm_ir-llvm_Y+M3B3-Y+M3B3.json
-
-          lnt submit --ignore-regressions \
-            http://llvm-lnt.infra.matterlabs.corp/db_default/v4/zksync/submitRun \
-            ./results_llvm_eravm_ir-llvm_Y+M3B3/llvm_eravm_ir-llvm_Y+M3B3-Y+M3B3.json
+          for MODE in Y+M3B3 Y+MzB3; do
+            for TOOLCHAIN in solc ir-llvm; do
+              for ENV in REVM EVMInterpreter; do
+                # Create a context file
+                echo "{
+                  \"machine\": \"llvm_evm_${TOOLCHAIN}_${MODE}_${ENV}\",
+                  \"target\": \"evm\",
+                  \"environment\": \"${ENV}\",
+                  \"toolchain\": \"${TOOLCHAIN}\",
+                  \"zksolc_version\": \"${ZKSOLC_VERSION}\",
+                  \"llvm_version\": \"${LLVM_VERSION}\"
+                }" > context.json
+                # Run benchmarks
+                ./target/release/compiler-tester \
+                  --zksolc ./target-zksolc/release/zksolc \
+                  --target evm \
+                  --path 'solidity' \
+                  --mode "${MODE}" \
+                  --toolchain "${TOOLCHAIN}" \
+                  --environment "${ENV}" \
+                  --benchmark "${RESULTS_DIR}" \
+                  --benchmark-format json-lnt \
+                  --benchmark-context context.json || true
+              done
+            done
+          done
+          find "${RESULTS_DIR}" -name '*.json'
+
+      - name: Submit LNT results
+        shell: bash -ex {0}
+        run: |
+          for JSON in $(ls ${RESULTS_DIR}/*.json); do
+            lnt submit --ignore-regressions \
+              http://llvm-lnt.infra.matterlabs.corp/db_default/v4/zksync/submitRun \
+              "${JSON}"
+          done