[WIP] [GR-32682] Operations DSL

truffle/mx.truffle/mx_truffle.py

@@ -659,7 +659,7 @@ def create_dsl_parser(args=None, out=None):
 
 def create_sl_parser(args=None, out=None):
     """create the SimpleLanguage parser using antlr"""
-    create_parser("com.oracle.truffle.sl", "com.oracle.truffle.sl.parser", "SimpleLanguage", COPYRIGHT_HEADER_UPL, args, out)
+    create_parser("com.oracle.truffle.sl", "com.oracle.truffle.sl.parser", "SimpleLanguageOperations", COPYRIGHT_HEADER_UPL, ['-visitor'] + args, out)
 
 def create_parser(grammar_project, grammar_package, grammar_name, copyright_template, args=None, out=None, postprocess=None):
     """create the DSL expression parser using antlr"""

truffle/mx.truffle/suite.py

@@ -236,6 +236,7 @@
         "sdk:GRAAL_SDK",
         "com.oracle.truffle.api.instrumentation",
         "com.oracle.truffle.api.exception",
+        "com.oracle.truffle.api.operation",
       ],
       "requires" : [
         "java.logging",
@@ -344,6 +345,42 @@
       "javaCompliance" : "11+",
       "workingSets" : "API,Truffle",
     },
+
+    "com.oracle.truffle.api.operation" : {
+      "subDir" : "src",
+      "sourceDirs" : ["src"],
+      "dependencies" : [
+        "com.oracle.truffle.api",
+        "com.oracle.truffle.api.library",
+        "com.oracle.truffle.api.interop",
+        "com.oracle.truffle.api.exception",
+        "com.oracle.truffle.api.instrumentation", 
+        "TruffleJSON",
+      ],
+      "requires" : [
+        "jdk.unsupported", # sun.misc.Unsafe
+      ],
+      "checkstyle" : "com.oracle.truffle.api",
+      "annotationProcessors" : ["TRUFFLE_DSL_PROCESSOR"],
+      "javaCompliance" : "11+",
+      "workingSets" : "API,Truffle",
+    },
+
+    "com.oracle.truffle.api.operation.test" : {
+      "subDir" : "src",
+      "sourceDirs" : ["src"],
+      "dependencies" : [
+        "TRUFFLE_API",
+        "mx:JUNIT",
+        "mx:JMH_1_21",
+      ],
+      "checkstyle" : "com.oracle.truffle.dsl.processor",
+      "javaCompliance" : "11+",
+      "annotationProcessors" : ["mx:JMH_1_21", "TRUFFLE_DSL_PROCESSOR"],
+      "workingSets" : "API,Truffle,Codegen,Test",
+      "testProject" : True,
+      "jacoco" : "exclude",
+    },
 
     "com.oracle.truffle.api.dsl" : {
       "subDir" : "src",
@@ -412,7 +449,8 @@
       "subDir" : "src",
       "sourceDirs" : ["src"],
       "dependencies" : [
-        "truffle:ANTLR4"
+        "truffle:ANTLR4",
+        "TruffleJSON",
       ],
       "requires" : [
         "java.compiler",
@@ -1058,7 +1096,7 @@
           "jdk.unsupported", # sun.misc.Unsafe
           "java.logging",
           "java.management",
-          "java.sql" # java.sql.date java.sql.Time
+          "java.sql", # java.sql.date java.sql.Time
         ],
         "exports" : [
           # Qualified exports
@@ -1091,6 +1129,7 @@
           "com.oracle.truffle.api",
           "com.oracle.truffle.api.instrumentation",
           "com.oracle.truffle.api.dsl",
+          "com.oracle.truffle.api.operation",
           "com.oracle.truffle.api.profiles",
           "com.oracle.truffle.api.interop",
           "com.oracle.truffle.api.exception",
@@ -1110,6 +1149,7 @@
       "dependencies" : [
         "com.oracle.truffle.api",
         "com.oracle.truffle.api.exception",
+        "com.oracle.truffle.api.operation",
         "com.oracle.truffle.api.dsl",
         "com.oracle.truffle.api.profiles",
         "com.oracle.truffle.api.debug",
@@ -1393,6 +1433,7 @@
          "com.oracle.truffle.api.instrumentation.test",
          "com.oracle.truffle.api.debug.test",
          "com.oracle.truffle.api.strings.test",
+         "com.oracle.truffle.api.operation.test",
          "com.oracle.truffle.object.basic.test",
          "com.oracle.truffle.nfi.test",
          "com.oracle.truffle.api.staticobject.test",

truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ChildExecutionTest.java

@@ -43,6 +43,8 @@
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.dsl.TypeSystem;
+import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
@@ -81,6 +83,17 @@ public String executeString(VirtualFrame frame) {
         }
     }
 
+    public static class ChildExecutionChildNodeWithError extends Node {
+
+        public int executeInt(VirtualFrame frame) throws UnexpectedResultException {
+            throw new UnexpectedResultException(null);
+        }
+
+        public Object executeObject(VirtualFrame frame) {
+            return 0;
+        }
+    }
+
     @ExpectError("Child execution method: String ChildExecutionChildNode2::executeString(VirtualFrame) called from method: boolean TestNode2::executeBool(boolean) requires a frame parameter.")
     @NodeChildren({
                     @NodeChild(value = "first", type = ChildExecutionChildNode2.class),
@@ -131,4 +144,28 @@ protected boolean doIt(String a, String b) {
             return a.isEmpty() && b.isEmpty();
         }
     }
+
+    @TypeSystem({int.class})
+    public static class ChildTestTypeSystem {
+    }
+
+    @NodeChildren({
+                    @NodeChild(value = "first", type = ChildExecutionChildNodeWithError.class),
+                    @NodeChild(value = "second", type = ChildExecutionChildNode2.class)
+    })
+    @TypeSystemReference(ChildTestTypeSystem.class)
+    public abstract static class TestNode4 extends Node {
+
+        public abstract Object execute(VirtualFrame frame);
+
+        @Specialization
+        protected boolean doItPrim(int a, String b) {
+            return true;
+        }
+
+        @Specialization
+        protected boolean doIt(String a, String b) {
+            return true;
+        }
+    }
 }

truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TypeBoxingTest.java

@@ -44,6 +44,8 @@
 
 import org.junit.Test;
 
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.dsl.ImplicitCast;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -269,7 +271,11 @@ public int executeInt() throws UnexpectedResultException {
 
     @TypeSystem
     static class TypeBoxingTypeSystem {
-
+        @ImplicitCast
+        @TruffleBoundary
+        public static int castInt(byte b) {
+            return b;
+        }
     }
 
 }

truffle/src/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/BoundaryCallFailedException.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.truffle.api.dsl;
+
+import com.oracle.truffle.api.nodes.ControlFlowException;
+
+//TODO delete
+public final class BoundaryCallFailedException extends ControlFlowException {
+    private static final long serialVersionUID = 4967477438708874100L;
+
+    public static final BoundaryCallFailedException INSTANCE = new BoundaryCallFailedException();
+
+    private BoundaryCallFailedException() {
+    }
+}

truffle/src/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/ExecuteTracingSupport.java

@@ -63,7 +63,7 @@ public interface ExecuteTracingSupport {
     /**
      * Invoked by the generated code to determine whether tracing is enabled. If tracing is
      * disabled, no other methods in this interface will be invoked.
-     * 
+     *
      * @return {@code true} if tracing is enabled
      * @since 21.3
      */
@@ -73,7 +73,7 @@ public interface ExecuteTracingSupport {
      * Invoked by the generated {@code execute} methods before any {@link Specialization} is called,
      * but after all {@link NodeChildren} are evaluated. Called only if {@link #isTracingEnabled()}
      * returns {@code true}.
-     * 
+     *
      * @param arguments the arguments of the specialization except the frame, if any
      * @since 21.3
      */

truffle/src/com.oracle.truffle.api.operation.test/src/com/oracle/truffle/api/operation/test/ExpectError.java

@@ -0,0 +1,5 @@
+package com.oracle.truffle.api.operation.test;
+
+public @interface ExpectError {
+    public String[] value() default {};
+}