[GR-38700] Minor Bytecode DSL improvements.

PullRequest: graalpython/4136

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode_dsl/PBytecodeDSLRootNode.java

@@ -970,17 +970,17 @@ protected byte[] extractCode() {
         return MarshalModuleBuiltins.serializeCodeUnit(null, PythonContext.get(this), co);
     }
 
-    private static Object checkUnboundCell(PCell cell, int index, PBytecodeDSLRootNode rootNode, Node inliningTarget, PRaiseNode raiseNode) {
+    private static Object checkUnboundCell(PCell cell, int index, BytecodeNode bytecodeNode) {
         Object result = cell.getRef();
         if (result == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            CodeUnit codeUnit = rootNode.getCodeUnit();
+            CodeUnit codeUnit = ((PBytecodeDSLRootNode) bytecodeNode.getRootNode()).getCodeUnit();
             if (index < codeUnit.cellvars.length) {
                 TruffleString localName = codeUnit.cellvars[index];
-                throw raiseNode.raise(inliningTarget, PythonBuiltinClassType.UnboundLocalError, ErrorMessages.LOCAL_VAR_REFERENCED_BEFORE_ASSIGMENT, localName);
+                throw PRaiseNode.raiseStatic(bytecodeNode, PythonBuiltinClassType.UnboundLocalError, ErrorMessages.LOCAL_VAR_REFERENCED_BEFORE_ASSIGMENT, localName);
             } else {
                 TruffleString localName = codeUnit.freevars[index - codeUnit.cellvars.length];
-                throw raiseNode.raise(inliningTarget, PythonBuiltinClassType.NameError, ErrorMessages.UNBOUNDFREEVAR, localName);
+                throw PRaiseNode.raiseStatic(bytecodeNode, PythonBuiltinClassType.NameError, ErrorMessages.UNBOUNDFREEVAR, localName);
             }
         }
         return result;
@@ -2512,10 +2512,8 @@ public static void doAssertFailed(VirtualFrame frame, Object assertionMessage,
     public static final class LoadCell {
         @Specialization
         public static Object doLoadCell(int index, PCell cell,
-                        @Bind PBytecodeDSLRootNode rootNode,
-                        @Bind Node inliningTarget,
-                        @Cached PRaiseNode raiseNode) {
-            return checkUnboundCell(cell, index, rootNode, inliningTarget, raiseNode);
+                        @Bind BytecodeNode bytecodeNode) {
+            return checkUnboundCell(cell, index, bytecodeNode);
         }
     }
 
@@ -2529,11 +2527,10 @@ public static Object doLoadCell(int index, PCell cell,
     public static final class LoadFromDictOrCell {
         @Specialization
         public static Object doLoadCell(VirtualFrame frame, int index, Object locals, PCell cell,
-                        @Bind PBytecodeDSLRootNode rootNode,
+                        @Bind BytecodeNode bytecodeNode,
                         @Bind Node inliningTarget,
-                        @Cached ReadFromLocalsNode readLocalsNode,
-                        @Cached PRaiseNode raiseNode) {
-            CodeUnit co = rootNode.getCodeUnit();
+                        @Cached ReadFromLocalsNode readLocalsNode) {
+            CodeUnit co = ((PBytecodeDSLRootNode) bytecodeNode.getRootNode()).getCodeUnit();
             TruffleString name;
             if (index < co.cellvars.length) {
                 name = co.cellvars[index];
@@ -2544,7 +2541,7 @@ public static Object doLoadCell(VirtualFrame frame, int index, Object locals, PC
             if (value != PNone.NO_VALUE) {
                 return value;
             } else {
-                return checkUnboundCell(cell, index, rootNode, inliningTarget, raiseNode);
+                return checkUnboundCell(cell, index, bytecodeNode);
             }
         }
     }
@@ -2609,10 +2606,8 @@ public static void doCreateCells(VirtualFrame frame, LocalRangeAccessor locals,
     public static final class ClearCell {
         @Specialization
         public static void doClearCell(int index, PCell cell,
-                        @Bind PBytecodeDSLRootNode rootNode,
-                        @Bind Node inliningTarget,
-                        @Cached PRaiseNode raiseNode) {
-            checkUnboundCell(cell, index, rootNode, inliningTarget, raiseNode);
+                        @Bind BytecodeNode bytecodeNode) {
+            checkUnboundCell(cell, index, bytecodeNode);
             cell.clearRef();
         }
     }
@@ -3591,16 +3586,6 @@ private static PException raiseUnbound(BytecodeNode bytecodeNode, int index) {
         throw PRaiseNode.raiseStatic(bytecodeNode, PythonBuiltinClassType.UnboundLocalError, ErrorMessages.LOCAL_VAR_REFERENCED_BEFORE_ASSIGMENT, localName);
     }
 
-    @Operation(storeBytecodeIndex = true)
-    public static final class RaiseNotImplementedError {
-        @Specialization
-        public static void doRaise(VirtualFrame frame, TruffleString name,
-                        @Bind BytecodeNode node) {
-            throw PRaiseNode.raiseStatic(node, PythonBuiltinClassType.NotImplementedError, name);
-
-        }
-    }
-
     /**
      * Creates a TypeVar, TypeVarTuple or ParamSpec object. The constant argument determines
      * (defined in {@link MakeTypeParamKind}) which and whether it will need to pop bound or
@@ -3642,8 +3627,8 @@ public static Object doObject(int kind, TruffleString name, Object boundOrConstr
     public static final class MakeTypeAliasType {
         @Specialization
         public static PTypeAliasType doObject(TruffleString name, Object typeParams, Object computeValue,
-                        @Bind PBytecodeDSLRootNode rootNode) {
-            PythonLanguage language = PythonLanguage.get(rootNode);
+                        @Bind BytecodeNode bytecodeNode) {
+            PythonLanguage language = PythonLanguage.get(bytecodeNode);
             // bytecode compiler should ensure that typeParams are either PTuple or null
             return PFactory.createTypeAliasType(language, name, (PTuple) typeParams, computeValue, null, null);
         }

mx.graalpython/mx_graalpython.py

@@ -1993,6 +1993,7 @@ def python_style_checks(args):
     "Check (and fix where possible) copyrights, eclipse formatting, and spotbugs"
     warn_about_old_hardcoded_version()
     python_run_mx_filetests(args)
+    check_unused_operations()
     python_checkcopyrights(["--fix"] if "--fix" in args else [])
     if not os.environ.get("ECLIPSE_EXE"):
         find_eclipse()
@@ -2054,6 +2055,31 @@ def python_run_mx_filetests(_):
             mx.run([sys.executable, test, "-v"])
 
 
+def check_unused_operations():
+    root_node = "graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode_dsl/PBytecodeDSLRootNode.java"
+    in_operation = False
+    operations = []
+    with open(os.path.join(SUITE.dir, root_node)) as f:
+        while line := f.readline():
+            if not in_operation and ('@Operation\n' in line or '@Operation(' in line):
+                in_operation = True
+            elif in_operation:
+                if names := re.findall(r'public static final class (\S+)', line):
+                    in_operation = False
+                    operations += names
+    compiler = "graalpython/com.oracle.graal.python/src/com/oracle/graal/python/compiler/bytecode_dsl/RootNodeCompiler.java"
+    with open(os.path.join(SUITE.dir, compiler)) as f:
+        contents = f.read().lower()
+    result = True
+    for n in operations:
+        if not n.lower() in contents:
+            mx.log_error(f"ERROR: unused @Operation {n}")
+            result = False
+    if not result:
+        mx.abort("Found unused @Operation, see above")
+
+
+
 def _python_checkpatchfiles():
     env = os.environ.copy()
     mx_dir = Path(__file__).parent