[GR-61863] TRegex: exclude test projects from coverage reports.

PullRequest: graal/20561

Author: djoooooe

regex/mx.regex/suite.py

@@ -113,6 +113,8 @@
       "checkstyle" : "com.oracle.truffle.regex",
       "javaCompliance" : "17+",
       "workingSets" : "Truffle,Regex",
+      "testProject" : True,
+      "jacoco" : "exclude",
     },
 
     "com.oracle.truffle.regex.test.dummylang" : {
@@ -127,6 +129,8 @@
       "checkstyle" : "com.oracle.truffle.regex",
       "javaCompliance" : "17+",
       "workingSets" : "Truffle,Regex",
+      "testProject" : True,
+      "jacoco" : "exclude",
     },
   },
 
@@ -177,6 +181,7 @@
       "description" : "Truffle regular expressions testing dummy language.",
       "allowsJavadocWarnings": True,
       "maven" : False,
+      "testDistribution": True,
     },
 
     "TREGEX_UNIT_TESTS" : {
@@ -192,6 +197,7 @@
         "regex:TREGEX_TEST_DUMMY_LANG",
       ],
       "maven" : False,
+      "testDistribution": True,
     },
 
     "TREGEX_GRAALVM_SUPPORT" : {

regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/nodes/TRegexExecNode.java

@@ -46,6 +46,8 @@
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.frame.MaterializedFrame;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.strings.TruffleString;
@@ -142,13 +144,7 @@ public final RegexResult execute(VirtualFrame frame, TruffleString input, int fr
         assert !sticky || source.getOptions().isBooleanMatch() || result == RegexResult.getNoMatchInstance() || RegexResult.RegexResultGetStartNode.getUncached().execute(result, 0) == fromIndex;
         assert validResult(input, fromIndex, maxIndex, regionFrom, regionTo, result);
         if (regressionTestMode) {
-            if (!(backtrackerProducesSameResult(frame, input, fromIndex, maxIndex, regionFrom, regionTo, result) &&
-                            nfaProducesSameResult(frame, input, fromIndex, maxIndex, regionFrom, regionTo, result) &&
-                            noSimpleCGLazyDFAProducesSameResult(frame, input, fromIndex, maxIndex, regionFrom, regionTo, result) &&
-                            (source.getOptions().isBooleanMatch() || eagerAndLazyDFAProduceSameResult(frame, input, fromIndex, maxIndex, regionFrom, regionTo, result)))) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                throw new AssertionError("Inconsistent results between different matching modes");
-            }
+            runInternalRegressionTests(frame.materialize(), input, fromIndex, maxIndex, regionFrom, regionTo, result);
         }
 
         if (CompilerDirectives.inInterpreter() && !backtrackingMode) {
@@ -206,15 +202,25 @@ private boolean validResult(Object input, int fromIndex, int maxIndex, int regio
         return true;
     }
 
-    private RegexResult regressionTestRun(VirtualFrame frame, RunRegexSearchNode node, TruffleString input, int fromIndex, int maxIndex, int regionFrom, int regionTo) {
+    @TruffleBoundary
+    private void runInternalRegressionTests(MaterializedFrame frame, TruffleString input, int fromIndex, int maxIndex, int regionFrom, int regionTo, RegexResult result) {
+        if (!(backtrackerProducesSameResult(frame, input, fromIndex, maxIndex, regionFrom, regionTo, result) &&
+                        nfaProducesSameResult(frame, input, fromIndex, maxIndex, regionFrom, regionTo, result) &&
+                        noSimpleCGLazyDFAProducesSameResult(frame, input, fromIndex, maxIndex, regionFrom, regionTo, result) &&
+                        (source.getOptions().isBooleanMatch() || eagerAndLazyDFAProduceSameResult(frame, input, fromIndex, maxIndex, regionFrom, regionTo, result)))) {
+            throw new AssertionError("Inconsistent results between different matching modes");
+        }
+    }
+
+    private RegexResult regressionTestRun(MaterializedFrame frame, RunRegexSearchNode node, TruffleString input, int fromIndex, int maxIndex, int regionFrom, int regionTo) {
         RunRegexSearchNode old = runnerNode;
         runnerNode = insert(node);
         RegexResult result = runnerNode.run(frame, input, fromIndex, maxIndex, regionFrom, regionTo);
         runnerNode = insert(old);
         return result;
     }
 
-    private boolean backtrackerProducesSameResult(VirtualFrame frame, TruffleString input, int fromIndex, int maxIndex, int regionFrom, int regionTo, RegexResult result) {
+    private boolean backtrackerProducesSameResult(MaterializedFrame frame, TruffleString input, int fromIndex, int maxIndex, int regionFrom, int regionTo, RegexResult result) {
         RegexResult btResult = regressionTestRun(frame, regressTestBacktrackingNode, input, fromIndex, maxIndex, regionFrom, regionTo);
         if (resultsEqual(result, btResult, getNumberOfCaptureGroups())) {
             return true;
@@ -223,7 +229,7 @@ private boolean backtrackerProducesSameResult(VirtualFrame frame, TruffleString
         return false;
     }
 
-    private boolean nfaProducesSameResult(VirtualFrame frame, TruffleString input, int fromIndex, int maxIndex, int regionFrom, int regionTo, RegexResult result) {
+    private boolean nfaProducesSameResult(MaterializedFrame frame, TruffleString input, int fromIndex, int maxIndex, int regionFrom, int regionTo, RegexResult result) {
         if (lazyDFANode == LAZY_DFA_BAILED_OUT) {
             return true;
         }
@@ -236,7 +242,7 @@ private boolean nfaProducesSameResult(VirtualFrame frame, TruffleString input, i
         return false;
     }
 
-    private boolean noSimpleCGLazyDFAProducesSameResult(VirtualFrame frame, TruffleString input, int fromIndex, int maxIndex, int regionFrom, int regionTo, RegexResult result) {
+    private boolean noSimpleCGLazyDFAProducesSameResult(MaterializedFrame frame, TruffleString input, int fromIndex, int maxIndex, int regionFrom, int regionTo, RegexResult result) {
         if (lazyDFANode == LAZY_DFA_BAILED_OUT || !lazyDFANode.isSimpleCG() || regressTestNoSimpleCGLazyDFANode == LAZY_DFA_BAILED_OUT) {
             return true;
         }
@@ -249,7 +255,7 @@ private boolean noSimpleCGLazyDFAProducesSameResult(VirtualFrame frame, TruffleS
         return false;
     }
 
-    private boolean eagerAndLazyDFAProduceSameResult(VirtualFrame frame, TruffleString input, int fromIndex, int maxIndex, int regionFrom, int regionTo, RegexResult resultOfCurrentSearchNode) {
+    private boolean eagerAndLazyDFAProduceSameResult(MaterializedFrame frame, TruffleString input, int fromIndex, int maxIndex, int regionFrom, int regionTo, RegexResult resultOfCurrentSearchNode) {
         if (lazyDFANode.captureGroupEntryNode == null || eagerDFANode == EAGER_DFA_BAILED_OUT) {
             return true;
         }