From 53033ff049b22d0279a11695c6a937a1470587cd Mon Sep 17 00:00:00 2001 From: FlorianHuc Date: Fri, 13 Sep 2024 08:20:54 +0200 Subject: [PATCH 1/7] add to git ignore --- linea-constraints | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linea-constraints b/linea-constraints index bea9ff5263..a6960ee6c0 160000 --- a/linea-constraints +++ b/linea-constraints @@ -1 +1 @@ -Subproject commit bea9ff52638ac0bf495aea3d0acc0b5a72433791 +Subproject commit a6960ee6c0662bcc9c14775d61a200f3ef745d3b From d09783675981d0a73cc6d8ca2225721d7764bfc6 Mon Sep 17 00:00:00 2001 From: FlorianHuc Date: Fri, 13 Sep 2024 11:59:10 +0200 Subject: [PATCH 2/7] delete unwanted file --- .github/workflows/gradle-ethereum-tests.yml | 5 +++-- .github/workflows/reference-blockchain-tests.yml | 5 +++-- .../consensys/linea/corset/CorsetValidator.java | 14 ++++++++++---- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/gradle-ethereum-tests.yml b/.github/workflows/gradle-ethereum-tests.yml index 989e571fb9..59fc0a532e 100644 --- a/.github/workflows/gradle-ethereum-tests.yml +++ b/.github/workflows/gradle-ethereum-tests.yml @@ -52,15 +52,16 @@ jobs: - name: Generate block chain reference tests run: ./gradlew :reference-tests:generateBlockchainReferenceTests -Dorg.gradle.parallel=true -Dorg.gradle.caching=true env: - JAVA_OPTS: -Dorg.gradle.daemon=false -DZKEVM_BIN_ORIGINAL_PATH="linea-constraints/zkevm.bin" + JAVA_OPTS: -Dorg.gradle.daemon=false CORSET_FLAGS: fields,expand,expand,expand - name: generate zkevm.bin - run: cd ./linea-constraints; make zkevm.bin -B; cd .. + run: cd ./linea-constraints; make zkevm_for_reference_tests.bin -B; cd .. - name: Run general reference tests run: ./gradlew referenceGeneralStateTests env: JAVA_OPTS: -Dorg.gradle.daemon=false + ZKEVM_BIN: zkevm_for_reference_tests.bin CORSET_FLAGS: fields,expand,expand,expand diff --git a/.github/workflows/reference-blockchain-tests.yml b/.github/workflows/reference-blockchain-tests.yml index 1daf1f4cfb..b824e5aec3 100644 --- a/.github/workflows/reference-blockchain-tests.yml +++ b/.github/workflows/reference-blockchain-tests.yml @@ -78,16 +78,17 @@ jobs: - name: Generate block chain reference tests run: ./gradlew :reference-tests:generateBlockchainReferenceTests -Dorg.gradle.parallel=true -Dorg.gradle.caching=true env: - JAVA_OPTS: -Dorg.gradle.daemon=false -DZKEVM_BIN_ORIGINAL_PATH="linea-constraints/zkevm.bin" + JAVA_OPTS: -Dorg.gradle.daemon=false CORSET_FLAGS: fields,expand,expand,expand - name: generate zkevm.bin - run: cd ./linea-constraints; make zkevm.bin -B; cd .. + run: cd ./linea-constraints; make zkevm_for_reference_tests.bin -B; cd .. - name: Run reference blockchain tests run: ./gradlew referenceBlockchainTests env: JAVA_OPTS: -Dorg.gradle.daemon=false + ZKEVM_BIN: zkevm_for_reference_tests.bin CORSET_FLAGS: fields,expand,expand,expand FAILED_TESTS_FILE_NAME: ${{ inputs.failed_tests_file_name || '' }} FAILED_TEST_JSON_DIRECTORY: ${{ ../tmp/${{ inputs.branch-name }}/ || '' }} diff --git a/arithmetization/src/main/java/net/consensys/linea/corset/CorsetValidator.java b/arithmetization/src/main/java/net/consensys/linea/corset/CorsetValidator.java index 56aead688a..6152631391 100644 --- a/arithmetization/src/main/java/net/consensys/linea/corset/CorsetValidator.java +++ b/arithmetization/src/main/java/net/consensys/linea/corset/CorsetValidator.java @@ -44,7 +44,9 @@ public class CorsetValidator { public record Result(boolean isValid, File traceFile, String corsetOutput) {} /** */ - private static final String ZK_EVM_RELATIVE_PATH = "/linea-constraints/zkevm.bin"; + private static final String ZK_EVM_RELATIVE_PATH = "/linea-constraints/"; + + private static final String ZK_EVM_BIN = "zkevm.bin"; /** Specifies the default zkEVM.bin file to use (including its path). */ private String defaultZkEvm = null; @@ -120,18 +122,22 @@ private void initDefaultZkEvm() { throw new RuntimeException(e); } - final String zkEvmBinInCurrentDir = currentDir + ZK_EVM_RELATIVE_PATH; + final String zkEvmBinInCurrentDir = currentDir + ZK_EVM_RELATIVE_PATH + binName(); if (new File(zkEvmBinInCurrentDir).exists()) { defaultZkEvm = zkEvmBinInCurrentDir; return; } - final String zkEvmBinInDirAbove = currentDir + "/.." + ZK_EVM_RELATIVE_PATH; + final String zkEvmBinInDirAbove = currentDir + "/.." + ZK_EVM_RELATIVE_PATH + binName(); if (new File(zkEvmBinInDirAbove).exists()) { defaultZkEvm = zkEvmBinInDirAbove; return; } - log.warn("Could not find default path for zkevm.bin"); + log.warn("Could not find default path for {}", binName()); + } + + private String binName() { + return System.getenv("ZKEVM_BIN") != null ? System.getenv("ZKEVM_BIN") : ZK_EVM_BIN; } } From aca6b14fadb84e7a76d6a537bc6468f31a20cd69 Mon Sep 17 00:00:00 2001 From: FlorianHuc Date: Fri, 13 Sep 2024 12:10:23 +0200 Subject: [PATCH 3/7] trigger test --- .github/workflows/gradle-ethereum-tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gradle-ethereum-tests.yml b/.github/workflows/gradle-ethereum-tests.yml index 59fc0a532e..a7ce4db022 100644 --- a/.github/workflows/gradle-ethereum-tests.yml +++ b/.github/workflows/gradle-ethereum-tests.yml @@ -1,8 +1,8 @@ name: reference tests -on: - schedule: - - cron: "0 23 * * *" +on: [push, pull_request] +# schedule: +# - cron: "0 23 * * *" env: CARGO_NET_GIT_FETCH_WITH_CLI: true From 7ebb0b2f0b37c2e9438d77f97211c5bd71d62eb4 Mon Sep 17 00:00:00 2001 From: FlorianHuc Date: Fri, 13 Sep 2024 14:36:32 +0200 Subject: [PATCH 4/7] ignore spotless here --- .github/workflows/gradle-ethereum-tests.yml | 2 +- .github/workflows/reference-blockchain-tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle-ethereum-tests.yml b/.github/workflows/gradle-ethereum-tests.yml index a7ce4db022..ed543f11b9 100644 --- a/.github/workflows/gradle-ethereum-tests.yml +++ b/.github/workflows/gradle-ethereum-tests.yml @@ -59,7 +59,7 @@ jobs: run: cd ./linea-constraints; make zkevm_for_reference_tests.bin -B; cd .. - name: Run general reference tests - run: ./gradlew referenceGeneralStateTests + run: ./gradlew referenceGeneralStateTests -x spotlessCheck env: JAVA_OPTS: -Dorg.gradle.daemon=false ZKEVM_BIN: zkevm_for_reference_tests.bin diff --git a/.github/workflows/reference-blockchain-tests.yml b/.github/workflows/reference-blockchain-tests.yml index b824e5aec3..bd61c4ba1d 100644 --- a/.github/workflows/reference-blockchain-tests.yml +++ b/.github/workflows/reference-blockchain-tests.yml @@ -85,7 +85,7 @@ jobs: run: cd ./linea-constraints; make zkevm_for_reference_tests.bin -B; cd .. - name: Run reference blockchain tests - run: ./gradlew referenceBlockchainTests + run: ./gradlew referenceBlockchainTests -x spotlessCheck env: JAVA_OPTS: -Dorg.gradle.daemon=false ZKEVM_BIN: zkevm_for_reference_tests.bin From 7b6550b3040797839b254d7b42c79aa23336bd53 Mon Sep 17 00:00:00 2001 From: FlorianHuc Date: Fri, 13 Sep 2024 20:35:19 +0200 Subject: [PATCH 5/7] revert trigger change --- .github/workflows/gradle-ethereum-tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gradle-ethereum-tests.yml b/.github/workflows/gradle-ethereum-tests.yml index ed543f11b9..bd96bc8e10 100644 --- a/.github/workflows/gradle-ethereum-tests.yml +++ b/.github/workflows/gradle-ethereum-tests.yml @@ -1,8 +1,8 @@ name: reference tests -on: [push, pull_request] -# schedule: -# - cron: "0 23 * * *" +on: + schedule: + - cron: "0 23 * * *" env: CARGO_NET_GIT_FETCH_WITH_CLI: true From 84e3c36b25f99673dcbf3436fcceb1de0682f504 Mon Sep 17 00:00:00 2001 From: Bradley Bown Date: Fri, 13 Sep 2024 20:18:16 +0100 Subject: [PATCH 6/7] Add junit parallel properties to referenceGeneralStateTests --- reference-tests/build.gradle | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/reference-tests/build.gradle b/reference-tests/build.gradle index be24093418..c55eb3eb67 100644 --- a/reference-tests/build.gradle +++ b/reference-tests/build.gradle @@ -67,6 +67,12 @@ tasks.register('referenceGeneralStateTests', Test) { dependsOn generateGeneralStateReferenceTests + systemProperties["junit.jupiter.execution.timeout.default"] = "5 m" // 5 minutes + systemProperties["junit.jupiter.execution.parallel.enabled"] = true + systemProperties["junit.jupiter.execution.parallel.mode.default"] = "concurrent" + systemProperties["junit.jupiter.execution.parallel.mode.classes.default"] = "concurrent" + maxParallelForks = Runtime.getRuntime().availableProcessors() + boolean isCiServer = System.getenv().containsKey("CI") minHeapSize = "4g" maxHeapSize = isCiServer ? "32g" : "8g" From 49910d08e49d036612a29dca15d27938df058814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20B=C3=A9gassat?= Date: Sun, 15 Sep 2024 23:59:59 +0200 Subject: [PATCH 7/7] spotless --- linea-constraints | 2 +- reference-tests/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linea-constraints b/linea-constraints index a6960ee6c0..7fe32e2761 160000 --- a/linea-constraints +++ b/linea-constraints @@ -1 +1 @@ -Subproject commit a6960ee6c0662bcc9c14775d61a200f3ef745d3b +Subproject commit 7fe32e2761e3246628fc135dd5e3837e01ba1295 diff --git a/reference-tests/build.gradle b/reference-tests/build.gradle index c55eb3eb67..0ae85873ac 100644 --- a/reference-tests/build.gradle +++ b/reference-tests/build.gradle @@ -72,7 +72,7 @@ tasks.register('referenceGeneralStateTests', Test) { systemProperties["junit.jupiter.execution.parallel.mode.default"] = "concurrent" systemProperties["junit.jupiter.execution.parallel.mode.classes.default"] = "concurrent" maxParallelForks = Runtime.getRuntime().availableProcessors() - + boolean isCiServer = System.getenv().containsKey("CI") minHeapSize = "4g" maxHeapSize = isCiServer ? "32g" : "8g"