consolidate prcCallTests => weeklyTests

This consolidates all of the prcCallTests into the existing weeklyTests
group.  This makes sense as they all have roughly similar test profiles.
The weeklyTests now has a much more aggressive degree of parallelism.

In addition, this sets more suitable default sample sizes for the PRC
calltests.  Specifically, defaults are set to approx 10% of the overall
parameter space.

Author: DavePearce

.github/workflows/gradle-prc-call-tests.yml

@@ -1,4 +1,4 @@
-name: Weekly Replay Tests
+name: Weekly Tests
 
 on:
   schedule:
@@ -23,11 +23,11 @@ jobs:
         uses: ./.github/actions/setup-environment
 
       - name: Run Weekly tests
-        run: GOMEMLIMIT=55GiB ./gradlew weeklyTests
+        run: GOMAXPROCS=2 GOMEMLIMIT=5GiB ./gradlew weeklyTests
         env:
           JAVA_OPTS: -Dorg.gradle.daemon=false
-          WEEKLY_TESTS_PARALLELISM: 2
-          GOCORSET_FLAGS: -vw -b1024 --ansi-escapes=false --report --air
+          WEEKLY_TESTS_PARALLELISM: 26
+          GOCORSET_FLAGS: -vw -b1024 --ansi-escapes=false --report --hir
 
       - name: Upload test report
         if: always()

.github/workflows/gradle-weekly-tests.yml

@@ -29,11 +29,11 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.provider.Arguments;
 
-@Tag("prc-calltests")
+@Tag("weekly")
 public class Tests extends PrecompileCallTests<CallParameters> {
   // Set sample size with potential for override.
   private static final int ECADD_SAMPLE_SIZE =
-      Integer.parseInt(System.getenv().getOrDefault("PRC_CALLTESTS_SAMPLE_SIZE", "500"));
+      Integer.parseInt(System.getenv().getOrDefault("PRC_CALLTESTS_SAMPLE_SIZE", "1000"));
 
   public static Stream<Arguments> parameterGeneration() {
     return randomSampleByDayOfMonth(ECADD_SAMPLE_SIZE, ParameterGeneration.parameterGeneration())

arithmetization/src/test/java/net/consensys/linea/zktracer/instructionprocessing/callTests/prc/ecadd/Tests.java

@@ -30,11 +30,11 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.provider.Arguments;
 
-@Tag("prc-calltests")
+@Tag("weekly")
 public class Tests extends PrecompileCallTests<CallParameters> {
   // Set sample size with potential for override.
   private static final int ECMUL_SAMPLE_SIZE =
-      Integer.parseInt(System.getenv().getOrDefault("PRC_CALLTESTS_SAMPLE_SIZE", "500"));
+      Integer.parseInt(System.getenv().getOrDefault("PRC_CALLTESTS_SAMPLE_SIZE", "700"));
 
   public static Stream<Arguments> parameterGeneration() {
     return randomSampleByDayOfMonth(ECMUL_SAMPLE_SIZE, ParameterGeneration.parameterGeneration())

arithmetization/src/test/java/net/consensys/linea/zktracer/instructionprocessing/callTests/prc/ecmul/Tests.java

@@ -22,11 +22,11 @@
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.params.provider.Arguments;
 
-@Tag("prc-calltests")
+@Tag("weekly")
 public class Tests extends PrecompileCallTests<CallParameters> {
   // Set sample size with potential for override.
   private static final int ECPAIRING_SAMPLE_SIZE =
-      Integer.parseInt(System.getenv().getOrDefault("PRC_CALLTESTS_SAMPLE_SIZE", "500"));
+      Integer.parseInt(System.getenv().getOrDefault("PRC_CALLTESTS_SAMPLE_SIZE", "7500"));
 
   public static Stream<Arguments> parameterGeneration() {
     return randomSampleByDayOfMonth(

arithmetization/src/test/java/net/consensys/linea/zktracer/instructionprocessing/callTests/prc/ecpairing/Tests.java

@@ -22,13 +22,14 @@
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.params.provider.Arguments;
 
-@Tag("prc-calltests")
+@Tag("weekly")
 public class Tests extends PrecompileCallTests<CallParameters> {
   // Set sample size with potential for override.
   private static int ECRECOVER_SAMPLE_SIZE =
-      Integer.parseInt(System.getenv().getOrDefault("PRC_CALLTESTS_SAMPLE_SIZE", "500"));
+      Integer.parseInt(System.getenv().getOrDefault("PRC_CALLTESTS_SAMPLE_SIZE", "250"));
 
   public static Stream<Arguments> parameterGeneration() {
+    System.out.println("ECRECOVER TESTS=" + ParameterGeneration.parameterGeneration().size());
     return randomSampleByDayOfMonth(
         ECRECOVER_SAMPLE_SIZE, ParameterGeneration.parameterGeneration())
         .stream();

arithmetization/src/test/java/net/consensys/linea/zktracer/instructionprocessing/callTests/prc/ecrecover/Tests.java

@@ -60,11 +60,11 @@
  *
  * <p>- play with (precompile) return data
  */
-@Tag("prc-calltests")
+@Tag("weekly")
 public class Tests extends PrecompileCallTests<CallParameters> {
   // Set sample size with potential for override.
   private static final int HASH_SAMPLE_SIZE =
-      Integer.parseInt(System.getenv().getOrDefault("PRC_CALLTESTS_SAMPLE_SIZE", "500"));
+      Integer.parseInt(System.getenv().getOrDefault("PRC_CALLTESTS_SAMPLE_SIZE", "2000"));
 
   public static Stream<Arguments> parameterGeneration() {
     return randomSampleByDayOfMonth(HASH_SAMPLE_SIZE, ParameterGeneration.parameterGeneration())

arithmetization/src/test/java/net/consensys/linea/zktracer/instructionprocessing/callTests/prc/hash/Tests.java

@@ -29,11 +29,11 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.provider.Arguments;
 
-@Tag("prc-calltests")
+@Tag("weekly")
 public class Tests extends PrecompileCallTests<CallParameters> {
   // Set sample size with potential for override.
   private static final int MODEXP_SAMPLE_SIZE =
-      Integer.parseInt(System.getenv().getOrDefault("PRC_CALLTESTS_SAMPLE_SIZE", "500"));
+      Integer.parseInt(System.getenv().getOrDefault("PRC_CALLTESTS_SAMPLE_SIZE", "700"));
 
   public static Stream<Arguments> parameterGeneration() {
     return randomSampleByDayOfMonth(MODEXP_SAMPLE_SIZE, ParameterGeneration.parameterGeneration())

arithmetization/src/test/java/net/consensys/linea/zktracer/instructionprocessing/callTests/prc/modexp/Tests.java

@@ -33,6 +33,10 @@ def TRACE_PKG = "net.consensys.linea.zktracer"
 
 tasks.register('buildZkevmBin', Exec) {
     workingDir "${project.rootDir}/linea-constraints/"
+    // Specify input files so gradle knows when to rebuild.
+    inputs.files(fileTree(workingDir).include('**/*.lisp'))
+    // Specify output file so gradle knows when out-of-date.
+    outputs.files(fileTree(workingDir).include(ZKEVM_BIN))
     // Sanity check executing this makes sense.
     doFirst {    
         // Record zkevm.bin for CorsetValidator

gradle/corset.gradle

@@ -135,7 +135,6 @@ tasks.test.configure {
     excludeTags("nightly")
     excludeTags("replay")
     excludeTags("weekly")
-    excludeTags("prc-calltests")
   }
   finalizedBy(jacocoTestReport)
 }
@@ -225,12 +224,11 @@ tasks.register("weeklyTests", Test) {
   systemProperty("junit.jupiter.execution.parallel.mode.classes.default", "concurrent")
   systemProperty("junit.jupiter.execution.parallel.config.strategy", "fixed")
   systemProperty("junit.jupiter.execution.parallel.config.fixed.parallelism",
-          System.getenv().getOrDefault("WEEKLY_TESTS_PARALLELISM", "1").toInteger())
+          System.getenv().getOrDefault("WEEKLY_TESTS_PARALLELISM", "8").toInteger())
 
   useJUnitPlatform {
     excludeTags("nightly")
     excludeTags("replay")
-    excludeTags("prc-calltests")
     includeTags("weekly")
   }
   finalizedBy(jacocoWeeklyTestsReport)
@@ -257,24 +255,6 @@ tasks.register("jacocoUnitFastReplayWeeklyNightlyReferenceBlockchainAndStateTest
   executionData fileTree(project.rootDir.absolutePath).include("**/build/jacoco/*.exec")
 }
 
-tasks.register("prcCallTests", Test) {
-    dependsOn(buildZkevmBin)
-  //
-  systemProperty("junit.jupiter.execution.parallel.enabled", true)
-  systemProperty("junit.jupiter.execution.parallel.mode.default", "concurrent")
-  systemProperty("junit.jupiter.execution.parallel.mode.classes.default", "concurrent")
-  systemProperty("junit.jupiter.execution.parallel.config.strategy", "fixed")
-  systemProperty("junit.jupiter.execution.parallel.config.fixed.parallelism",
-          System.getenv().getOrDefault("PRC_CALLTESTS_PARALLELISM", "8").toInteger())
-
-  useJUnitPlatform {
-    excludeTags("nightly")
-    excludeTags("replay")
-    excludeTags("weekly")
-    includeTags("prc-calltests")
-  }
-}
-
 // Configure default build task to require the tracer is built first.
 // This only makes sense for projects which need the tracer.
 compileJava.dependsOn 'buildTracer'

gradle/tests.gradle

@@ -21,7 +21,6 @@ jacoco {
   toolVersion = '0.8.12'
 }
 
-apply from: rootProject.file("gradle/corset.gradle")
 apply from: rootProject.file("gradle/java.gradle")
 apply from: rootProject.file("gradle/dependency-management.gradle")
 apply from: rootProject.file('gradle/common-dependencies.gradle')
@@ -58,7 +57,7 @@ tasks.register("generateGeneralStateReferenceTests", RefTestGenerationTask) {
 }
 
 tasks.register('referenceBlockchainTests', Test) {
-  dependsOn(buildZkevmBin)
+  dependsOn(":arithmetization:buildZkevmBin")
   finalizedBy(jacocoReferenceBlockchainTestsReport)
   description = 'Runs ETH reference blockchain tests.'
   dependsOn generateBlockchainReferenceTests
@@ -83,7 +82,7 @@ tasks.register("jacocoReferenceBlockchainTestsReport", JacocoReport) {
 }
 
 tasks.register('referenceGeneralStateTests', Test) {
-  dependsOn(buildZkevmBin)
+  dependsOn(":arithmetization:buildZkevmBin")
   finalizedBy(jacocoReferenceGeneralStateTestsReport)
   description = 'Runs ETH reference general state tests.'
   dependsOn generateGeneralStateReferenceTests