[GR-44222] [GR-47557] Separate SVM and Truffle (Unchained Part 6).

PullRequest: graal/15126

Author: chumer

common.json

@@ -4,7 +4,7 @@
     "Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
   ],
 
-  "mx_version": "6.34.0",
+  "mx_version": "6.35.1",
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {

compiler/mx.compiler/mx_compiler.py

@@ -704,11 +704,7 @@ def _unittest_config_participant(config):
         # for the junit harness which uses reflection to find @Test methods. In addition, the
         # tests widely use JVMCI classes so JVMCI needs to also export all its packages to
         # ALL-UNNAMED.
-
         mainClassArgs.extend(['-JUnitOpenPackages', 'jdk.internal.vm.ci/*=org.graalvm.truffle.runtime,jdk.internal.vm.compiler,ALL-UNNAMED'])
-        mainClassArgs.extend(['-JUnitOpenPackages', 'org.graalvm.truffle/*=ALL-UNNAMED'])
-        mainClassArgs.extend(['-JUnitOpenPackages', 'org.graalvm.truffle.compiler/*=ALL-UNNAMED'])
-        mainClassArgs.extend(['-JUnitOpenPackages', 'org.graalvm.truffle.runtime/*=ALL-UNNAMED'])
 
         limited_modules = None
         for arg in vmArgs:
@@ -1341,7 +1337,7 @@ def _jvmci_jars():
         dir_name='graal',
         license_files=[],
         third_party_license_files=[],
-        dependencies=['Truffle API'],
+        dependencies=['Truffle Compiler'],
         jar_distributions=[  # Dev jars (annotation processors)
             'compiler:GRAAL_PROCESSOR',
         ],

compiler/mx.compiler/suite.py

@@ -452,7 +452,9 @@
         "truffle:TRUFFLE_TEST",
         "truffle:TRUFFLE_COMPILER",
         "truffle:TRUFFLE_RUNTIME",
-        "regex:TREGEX"
+        "regex:TREGEX",
+        "ASM_TREE_9.5",
+        "ASM_UTIL_9.5",
       ],
       "exclude" : [
         "mx:JUNIT",
@@ -493,7 +495,7 @@
         ],
         "exports" : [
           """* to com.oracle.graal.graal_enterprise,org.graalvm.nativeimage.pointsto,org.graalvm.nativeimage.builder,org.graalvm.nativeimage.llvm,com.oracle.svm.svm_enterprise,com.oracle.svm_enterprise.ml_dataset,org.graalvm.nativeimage.base,
-          org.graalvm.extraimage.builder,com.oracle.svm.extraimage_enterprise""",
+          org.graalvm.extraimage.builder,com.oracle.svm.extraimage_enterprise,org.graalvm.truffle.runtime.svm,com.oracle.truffle.enterprise.svm""",
           "org.graalvm.compiler.java                   to org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.configure",
           "org.graalvm.compiler.core.common            to org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.objectfile",
           "org.graalvm.compiler.debug                  to org.graalvm.nativeimage.objectfile",

compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/test/SubprocessUtil.java

@@ -445,7 +445,7 @@ public static Subprocess process(List<String> command, Map<String, String> env,
     }
 
     private static boolean hasArg(String optionName) {
-        if (optionName.equals("-cp") || optionName.equals("-classpath")) {
+        if (optionName.equals("-cp") || optionName.equals("-classpath") || optionName.equals("-p")) {
             return true;
         }
         if (optionName.equals("--version") ||

compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/KnownTruffleTypes.java

@@ -154,6 +154,7 @@ public class KnownTruffleTypes extends AbstractKnownTruffleTypes {
     public final ResolvedJavaType CompilationState = lookupType("com.oracle.truffle.runtime.CompilationState");
 
     public final ResolvedJavaType OptimizedCallTarget = lookupTypeCached("com.oracle.truffle.runtime.OptimizedCallTarget");
+    public final ResolvedJavaMethod OptimizedCallTarget_call = findMethod(OptimizedCallTarget, "call", Object_Array);
     public final ResolvedJavaMethod OptimizedCallTarget_callDirect = findMethod(OptimizedCallTarget, "callDirect", Node, Object_Array);
     public final ResolvedJavaMethod OptimizedCallTarget_callInlined = findMethod(OptimizedCallTarget, "callInlined", Node, Object_Array);
     public final ResolvedJavaMethod OptimizedCallTarget_callIndirect = findMethod(OptimizedCallTarget, "callIndirect", Node, Object_Array);

compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/PartialEvaluator.java

@@ -171,7 +171,7 @@ public InstrumentPhase.Instrumentation getInstrumentation() {
                         throw new IllegalStateException("PartialEvaluator is not yet initialized");
                     }
                     long[] accessTable = new long[instrumentationCfg.instrumentationTableSize];
-                    instrumentation = new InstrumentPhase.Instrumentation(accessTable);
+                    instrumentation = new InstrumentPhase.Instrumentation(types, accessTable);
                 }
             }
         }

compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/InstrumentPhase.java

@@ -30,7 +30,6 @@
 import static org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions.InstrumentBranchesPerInlineSite;
 import static org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions.InstrumentationTableSize;
 
-import java.lang.reflect.Method;
 import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -55,47 +54,24 @@
 import org.graalvm.compiler.nodes.java.StoreIndexedNode;
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.phases.BasePhase;
+import org.graalvm.compiler.truffle.compiler.KnownTruffleTypes;
 import org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions;
 import org.graalvm.compiler.truffle.compiler.TruffleTierContext;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.MetaUtil;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
 
 public abstract class InstrumentPhase extends BasePhase<TruffleTierContext> {
-
-    private static boolean checkMethodExists(String declaringClassName, String methodName) {
-        try {
-            Class<?> declaringClass = Class.forName(declaringClassName);
-            for (Method m : declaringClass.getDeclaredMethods()) {
-                if (m.getName().equals(methodName)) {
-                    return true;
-                }
-            }
-        } catch (ClassNotFoundException e) {
-            throw new NoClassDefFoundError(declaringClassName);
-        }
-        throw new NoSuchMethodError(declaringClassName + "." + methodName);
-    }
-
-    private static String asStackPattern(String declaringClassName, String methodName) {
-        assert checkMethodExists(declaringClassName, methodName);
-        return declaringClassName + "." + methodName;
-    }
-
-    private static final String[] OMITTED_STACK_PATTERNS = new String[]{
-                    asStackPattern("com.oracle.truffle.runtime.OptimizedCallTarget", "executeRootNode"),
-                    asStackPattern("com.oracle.truffle.runtime.OptimizedCallTarget", "profiledPERoot"),
-                    asStackPattern("com.oracle.truffle.runtime.OptimizedCallTarget", "callDirect"),
-                    asStackPattern("com.oracle.truffle.runtime.OptimizedDirectCallNode", "call"),
-    };
     private final Instrumentation instrumentation;
     protected final SnippetReflectionProvider snippetReflection;
 
     public InstrumentPhase(SnippetReflectionProvider snippetReflection, Instrumentation instrumentation) {
         this.snippetReflection = snippetReflection;
         this.instrumentation = instrumentation;
+
     }
 
     public Instrumentation getInstrumentation() {
@@ -190,9 +166,20 @@ public int compare(Map.Entry<String, Point> x, Map.Entry<String, Point> y) {
         public Map<String, Point> pointMap = new LinkedHashMap<>();
         public int tableIdCount;
         public int tableStartIndex;
+        private final String[] omittedStackPatterns;
 
-        public Instrumentation(long[] accessTable) {
+        public Instrumentation(KnownTruffleTypes types, long[] accessTable) {
             this.accessTable = accessTable;
+            this.omittedStackPatterns = new String[]{
+                            asStackPattern(types.OptimizedCallTarget_executeRootNode),
+                            asStackPattern(types.OptimizedCallTarget_profiledPERoot),
+                            asStackPattern(types.OptimizedCallTarget_callDirect),
+                            asStackPattern(types.OptimizedCallTarget_call),
+            };
+        }
+
+        private static String asStackPattern(ResolvedJavaMethod method) {
+            return method.getDeclaringClass().toJavaName(true) + "." + method.getName();
         }
 
         /*
@@ -226,7 +213,7 @@ private static String filterAndEncode(MethodFilter methodFilter, Node node, Inst
             }
         }
 
-        private static String prettify(String key, Point p) {
+        private String prettify(String key, Point p) {
             if (p.isPrettified()) {
                 StringBuilder sb = new StringBuilder();
                 NodeSourcePosition pos = p.getPosition();
@@ -235,7 +222,7 @@ private static String prettify(String key, Point p) {
 
                 callerChainLoop: while (pos != null) {
                     // Skip stack frame if it is a known pattern.
-                    for (String pattern : OMITTED_STACK_PATTERNS) {
+                    for (String pattern : omittedStackPatterns) {
                         if (pos.getMethod().format("%H.%n(%p)").contains(pattern)) {
                             pos = pos.getCaller();
                             continue callerChainLoop;

compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/InstrumentationSuite.java

@@ -30,7 +30,8 @@
 
 public class InstrumentationSuite extends PhaseSuite<TruffleTierContext> {
     @SuppressWarnings("this-escape")
-    public InstrumentationSuite(InstrumentPhase.InstrumentationConfiguration instrumentationCfg, SnippetReflectionProvider snippetReflection, InstrumentPhase.Instrumentation instrumentation) {
+    public InstrumentationSuite(InstrumentPhase.InstrumentationConfiguration instrumentationCfg, SnippetReflectionProvider snippetReflection,
+                    InstrumentPhase.Instrumentation instrumentation) {
         if (instrumentationCfg.instrumentBranches) {
             appendPhase(new InstrumentBranchesPhase(snippetReflection, instrumentation, instrumentationCfg.instrumentBranchesPerInlineSite));
         }

espresso/mx.espresso/jvm-ce

@@ -1,6 +1,6 @@
 # mx --dynamicimports=/vm,/substratevm --components="Espresso Launcher,LibGraal,SubstrateVM,suite:tools" --native-images=lib:jvmcicompiler --disable-installables=true graalvm-show
 
 DYNAMIC_IMPORTS=/vm,/substratevm
-COMPONENTS=Espresso Launcher,LibGraal,SubstrateVM,suite:tools
+COMPONENTS=Espresso Launcher,LibGraal,SubstrateVM,suite:tools,tflm
 NATIVE_IMAGES=lib:jvmcicompiler
 DISABLE_INSTALLABLES=true

espresso/mx.espresso/jvm-ce-llvm

@@ -1,6 +1,6 @@
 # mx --dynamicimports=/vm,/substratevm --components="Espresso Launcher,LibGraal,SubstrateVM,Java on Truffle LLVM Java libraries,suite:tools" --native-images=lib:jvmcicompiler --disable-installables=true graalvm-show
 
 DYNAMIC_IMPORTS=/vm,/substratevm
-COMPONENTS=Espresso Launcher,LibGraal,SubstrateVM,Java on Truffle LLVM Java libraries,suite:tools
+COMPONENTS=Espresso Launcher,LibGraal,SubstrateVM,Java on Truffle LLVM Java libraries,suite:tools,tflm
 NATIVE_IMAGES=lib:jvmcicompiler
 DISABLE_INSTALLABLES=true