Merge branch 'arith-dev' into gauravahuja/skip_blockchain_tests_high_…

…memory

.github/workflows/reference-blockchain-tests.yml

@@ -70,6 +70,10 @@ jobs:
           commit: ${{ inputs.commit || '' }}
           if_no_artifact_found: ignore
 
+      - name: Rename filter input file
+        if: ${{ inputs.failed_module != '' }}
+        run: mv ${{ github.workspace }}/tmp/${{ steps.extract_branch.outputs.branch }}/failedBlockchainReferenceTests.json ${{ github.workspace }}/tmp/${{ steps.extract_branch.outputs.branch }}/failedBlockchainReferenceTests-input.json
+
       - name: Run reference blockchain tests
         run: ./gradlew referenceBlockchainTests -x spotlessCheck
         timeout-minutes: 180
@@ -82,6 +86,7 @@ jobs:
           FAILED_TEST_JSON_DIRECTORY: ${{ github.workspace }}/tmp/${{ steps.extract_branch.outputs.branch }}/
           FAILED_MODULE: ${{ inputs.failed_module || '' }}
           FAILED_CONSTRAINT: ${{ inputs.failed_constraint || '' }}
+          REFERENCE_TEST_FILTER_INPUT: failedBlockchainReferenceTests.json
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4

arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/defer/DeferRegistry.java

@@ -220,4 +220,8 @@ public void resolveUponContextReEntry(Hub hub, CallFrame callFrame) {
       contextReEntryDefers.remove(callFrame);
     }
   }
+
+  public void unscheduleForContextReEntry(ContextReEntryDefer defer, CallFrame callFrame) {
+    contextReEntryDefers.get(callFrame).remove(defer);
+  }
 }

arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/section/call/precompileSubsection/ModexpSubsection.java

@@ -73,6 +73,7 @@ public ModexpSubsection(final Hub hub, final CallSection callSection) {
                 .compareTo(BigInteger.valueOf(PROVER_MAX_INPUT_BYTE_SIZE))
             >= 0) {
       hub.modexpEffectiveCall().addPrecompileLimit(Integer.MAX_VALUE);
+      hub.defers().unscheduleForContextReEntry(this, hub.currentFrame());
       return;
     }
 

arithmetization/src/main/java/net/consensys/linea/zktracer/module/limits/precompiles/ModexpEffectiveCall.java

@@ -39,7 +39,8 @@ public String moduleKey() {
   @Override
   public void addPrecompileLimit(final int count) {
     Preconditions.checkArgument(
-        count == 1, "can't add more than one effective precompile call at a time");
+        count == 1 || count == Integer.MAX_VALUE,
+        "Either use 1 for one effective precompile call at a time or use Integer.MAX_VALUE");
     counts.add(count);
   }
 }

arithmetization/src/main/java/net/consensys/linea/zktracer/module/mmio/MmioData.java

@@ -221,11 +221,23 @@ public void oneToOnePadded(
       final short targetByteOffset,
       final short size) {
 
-    checkArgument(0 <= sourceByteOffset && sourceByteOffset <= LLARGEMO);
-    checkArgument(0 < size && size <= LLARGE);
-    checkArgument(sourceByteOffset + size - 1 <= LLARGEMO);
-    checkArgument(0 <= targetByteOffset && targetByteOffset <= LLARGEMO);
-    checkArgument(targetByteOffset + size - 1 <= LLARGEMO);
+    checkArgument(
+        0 <= sourceByteOffset && sourceByteOffset <= LLARGEMO,
+        "sourceByteOffset has value {}.",
+        sourceByteOffset);
+    checkArgument(0 < size && size <= LLARGE, "size has value {}.", size);
+    checkArgument(
+        sourceByteOffset + size - 1 <= LLARGEMO,
+        "sourceByteOffset has value {}.",
+        sourceByteOffset);
+    checkArgument(
+        0 <= targetByteOffset && targetByteOffset <= LLARGEMO,
+        "targetByteOffset has value {}.",
+        targetByteOffset);
+    checkArgument(
+        targetByteOffset + size - 1 <= LLARGEMO,
+        "targetByteOffset has value {}.",
+        targetByteOffset);
 
     for (short ct = 0; ct < LLARGE; ct++) {
       bit1.add(ct, plateau(sourceByteOffset, ct));

arithmetization/src/main/java/net/consensys/linea/zktracer/module/oob/OobOperation.java

@@ -542,10 +542,10 @@ private BigInteger callToMOD(
   private boolean callToLT(
       int k, BigInteger arg1Hi, BigInteger arg1Lo, BigInteger arg2Hi, BigInteger arg2Lo) {
     // 128 = 8 * 16
-    checkArgument(arg1Hi.bitLength() <= 128);
-    checkArgument(arg1Lo.bitLength() <= 128);
-    checkArgument(arg2Hi.bitLength() <= 128);
-    checkArgument(arg2Lo.bitLength() <= 128);
+    checkArgument(arg1Hi.bitLength() <= 128, "arg1Hi.bitLength() has length " + arg1Hi.bitLength());
+    checkArgument(arg1Lo.bitLength() <= 128, "arg1Lo.bitLength() has length " + arg1Lo.bitLength());
+    checkArgument(arg2Hi.bitLength() <= 128, "arg2Hi.bitLength() has length " + arg2Hi.bitLength());
+    checkArgument(arg2Lo.bitLength() <= 128, "arg2Lo.bitLength() has length " + arg2Lo.bitLength());
     final EWord arg1 = EWord.of(arg1Hi, arg1Lo);
     final EWord arg2 = EWord.of(arg2Hi, arg2Lo);
     addFlag[k] = false;

buildSrc/src/main/groovy/RefTestGenerationTask.groovy

@@ -77,7 +77,7 @@ abstract class RefTestGenerationTask extends DefaultTask {
         def parentPathFile = parentFile.getPath().substring(parentFile.getPath().indexOf(refTestJsonParamsDirectory))
         if (!testJsonFile.getName().toString().startsWith(".") && !excludedPath.contains(parentPathFile)) {
           def pathFile = testJsonFile.getPath()
-          paths << pathFile.substring(pathFile.indexOf(refTestJsonParamsDirectory))
+          paths << pathFile.substring(pathFile.indexOf(refTestJsonParamsDirectory)).replace('\\','/')
         }
       }
 

reference-tests/build.gradle

@@ -121,4 +121,5 @@ dependencies {
   implementation project(":arithmetization")
   implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
   testImplementation project(path: ':testing')
+  implementation 'org.junit.platform:junit-platform-launcher:1.11.2'
 }

reference-tests/src/main/java/net/consensys/linea/BlockchainReferenceTestJson.java

@@ -14,7 +14,8 @@
  */
 package net.consensys.linea;
 
-import java.io.FileWriter;
+import static net.consensys.linea.ReferenceTestOutcomeRecorderTool.setFileDirectory;
+
 import java.io.IOException;
 import java.nio.file.FileAlreadyExistsException;
 import java.nio.file.Files;
@@ -27,14 +28,14 @@
 
 @Slf4j
 public class BlockchainReferenceTestJson {
-  static String fileDirectory = setFileDirectory();
 
   @Synchronized
   public static CompletableFuture<String> readBlockchainReferenceTestsOutput(String fileName) {
+    String fileDirectory = setFileDirectory();
     return CompletableFuture.supplyAsync(
         () -> {
           Path directoryPath = Paths.get(fileDirectory);
-          Path filePath = Paths.get(fileDirectory + fileName);
+          Path filePath = directoryPath.resolve(fileName);
           String jsonString = "";
 
           try {
@@ -62,24 +63,4 @@ public static CompletableFuture<String> readBlockchainReferenceTestsOutput(Strin
           return jsonString;
         });
   }
-
-  @Synchronized
-  public static CompletableFuture<Void> writeToJsonFile(String jsonString, String fileName) {
-    return CompletableFuture.runAsync(
-        () -> {
-          try (FileWriter file = new FileWriter(fileDirectory + fileName)) {
-            file.write(jsonString);
-          } catch (Exception e) {
-            log.error("Error - Failed to write failed test output: %s".formatted(e.getMessage()));
-          }
-        });
-  }
-
-  private static String setFileDirectory() {
-    String jsonDirectory = System.getenv("FAILED_TEST_JSON_DIRECTORY");
-    if (jsonDirectory == null || jsonDirectory.isEmpty()) {
-      return "../tmp/local/";
-    }
-    return jsonDirectory;
-  }
 }

reference-tests/src/main/java/net/consensys/linea/BlockchainReferenceTestOutcome.java

@@ -14,10 +14,27 @@
  */
 package net.consensys.linea;
 
-import java.util.List;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ConcurrentSkipListSet;
 
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
 
-@JsonPropertyOrder({"failedCounter", "successCounter", "modules"})
-public record BlockchainReferenceTestOutcome(
-    int failedCounter, int successCounter, List<ModuleToConstraints> modulesToConstraints) {}
+@Getter
+@AllArgsConstructor
+@JsonPropertyOrder({
+  "failedCounter",
+  "successCounter",
+  "disabledCounter",
+  "abortedCounter",
+  "modules"
+})
+public class BlockchainReferenceTestOutcome {
+  private final int failedCounter;
+  private final int successCounter;
+  private final int disabledCounter;
+  private final int abortedCounter;
+  private final ConcurrentMap<String, ConcurrentMap<String, ConcurrentSkipListSet<String>>>
+      modulesToConstraintsToTests;
+}