Merge pull request #269 from zakkak/update-mandrel-20.3

Sync mandrel 20.3 with upstream graal 20.3
graalvm · Jul 19, 2021 · 5fed9b5 · 5fed9b5
2 parents f9f24ba + 29f664b
commit 5fed9b5
Show file tree

Hide file tree

Showing 146 changed files with 591 additions and 14,386 deletions.
diff --git a/common.json b/common.json
@@ -2,14 +2,14 @@
   "README": "This file contains definitions that are useful for the hocon and jsonnet CI files of multiple repositories.",
 
   "jdks": {
-    "openjdk8":           {"name": "openjdk",   "version": "8u292+07-jvmci-20.3-b13", "platformspecific": true },
-    "oraclejdk8":         {"name": "oraclejdk", "version": "8u291+08-jvmci-20.3-b13", "platformspecific": true },
-    "oraclejdk8Debug":    {"name": "oraclejdk", "version": "8u291+08-jvmci-20.3-b13-fastdebug", "platformspecific": true },
+    "openjdk8":           {"name": "openjdk",   "version": "8u302+07-jvmci-20.3-b18", "platformspecific": true },
+    "oraclejdk8":         {"name": "oraclejdk", "version": "8u301+09-jvmci-20.3-b18", "platformspecific": true },
+    "oraclejdk8Debug":    {"name": "oraclejdk", "version": "8u301+09-jvmci-20.3-b18-fastdebug", "platformspecific": true },
 
     "openjdk11":          {"name": "openjdk",   "version": "11.0.3+7", "platformspecific": true },
     "oraclejdk11":        {"name": "oraclejdk", "version": "11.0.6+8", "platformspecific": true },
-    "labsjdk-ce-11":      {"name": "labsjdk",   "version": "ce-11.0.11+7-jvmci-20.3-b13", "platformspecific": true },
-    "labsjdk-ee-11":      {"name": "labsjdk",   "version": "ee-11.0.11+8-jvmci-20.3-b13", "platformspecific": true },
+    "labsjdk-ce-11":      {"name": "labsjdk",   "version": "ce-11.0.12+6-jvmci-20.3-b18", "platformspecific": true },
+    "labsjdk-ee-11":      {"name": "labsjdk",   "version": "ee-11.0.12+8-jvmci-20.3-b18", "platformspecific": true },
 
     "oraclejdk15":        {"name": "oraclejdk", "version": "15.0.1+6", "platformspecific": true },
     "labsjdk-ce-15":      {"name": "labsjdk",   "version": "ce-15.0.1+9-jvmci-20.3-b09", "platformspecific": true },

diff --git a/compiler/mx.compiler/mx_compiler.py b/compiler/mx.compiler/mx_compiler.py
@@ -633,7 +633,6 @@ def compiler_gate_benchmark_runner(tasks, extraVMarguments=None, prefix=''):
 ]
 
 _registers = {
-    'sparcv9': 'o0,o1,o2,o3,f8,f9,d32,d34',
     'amd64': 'rbx,r11,r10,r14,xmm3,xmm11,xmm14',
     'aarch64': 'r0,r1,r2,r3,r4,v0,v1,v2,v3'
 }

diff --git a/compiler/mx.compiler/mx_graal_tools.py b/compiler/mx.compiler/mx_graal_tools.py
@@ -115,8 +115,6 @@ def hsdis(args, copyToDir=None):
         r'intel\hsdis-amd64-windows-%s.dll' : '6a388372cdd5fe905c1a26ced614334e405d1f30',
         r'intel/hsdis-amd64-linux-%s.so' : '0d031013db9a80d6c88330c42c983fbfa7053193',
         r'intel/hsdis-amd64-darwin-%s.dylib' : '67f6d23cbebd8998450a88b5bef362171f66f11a',
-        r'hsdis-sparcv9-solaris-%s.so': '970640a9af0bd63641f9063c11275b371a59ee60',
-        r'hsdis-sparcv9-linux-%s.so': '0c375986d727651dee1819308fbbc0de4927d5d9',
         r'hsdis-aarch64-linux-%s.so': 'fcc9b70ac91c00db8a50b0d4345490a68e3743e1',
     }
 

diff --git a/compiler/mx.compiler/mx_renamegraalpackages.py b/compiler/mx.compiler/mx_renamegraalpackages.py
@@ -62,14 +62,10 @@ def rename_one(filepath, old, new):
 
     for proj_dir in [join(vc_dir, x) for x in os.listdir(vc_dir) if exists(join(vc_dir, x, 'mx.' + x, 'suite.py'))]:
         for dirpath, _, filenames in os.walk(proj_dir):
-            if args.version >= 15 and "sparc" in dirpath:
-                # Remove SPARC port for JDK 15
-                shutil.rmtree(dirpath)
-            else:
-                for filename in filenames:
-                    if filename.endswith('.java') or filename == 'suite.py' or filename == 'generate_unicode_properties.py' or filename == "mx_substratevm.py" or "META-INF" in dirpath:
-                        filepath = join(dirpath, filename)
-                        rename_packages(filepath)
+            for filename in filenames:
+                if filename.endswith('.java') or filename == 'suite.py' or filename == 'generate_unicode_properties.py' or filename == "mx_substratevm.py" or "META-INF" in dirpath:
+                    filepath = join(dirpath, filename)
+                    rename_packages(filepath)
 
         # move directories according to new package name
         for old_name, new_name in package_renamings.items():

diff --git a/compiler/mx.compiler/mx_updategraalinopenjdk.py b/compiler/mx.compiler/mx_updategraalinopenjdk.py
@@ -215,9 +215,6 @@ def run_output(args, cwd=None):
                 if str(mx_compiler.jdk.javaCompliance) not in p.javaCompliance:
                     mx.log('  skipping {} since its compliance ({}) is not compatible with {}'.format(p, repr(p.javaCompliance), mx_compiler.jdk.javaCompliance))
                     continue
-                if args.version >= 15 and "sparc" in p.name:
-                    # Filter SPARC port for JDK 15
-                    continue
                 if any(inc in p.name for inc in info.includes) and not any(ex in p.name for ex in info.excludes):
                     assert len(p.source_dirs()) == 1, p
                     version = 0
@@ -254,9 +251,6 @@ def run_output(args, cwd=None):
                 for rel_src_file in src_files:
                     if not len(rel_src_file):
                         continue
-                    if args.version >= 15 and "sparc" in rel_src_file:
-                        # Skip SPARC files for JDK 15
-                        continue
                     filename = os.path.basename(rel_src_file)
                     src_file = join(source_dir, rel_src_file)
                     dst_file = join(target_dir, os.path.relpath(src_file, source_dir))

diff --git a/compiler/mx.compiler/suite.py b/compiler/mx.compiler/suite.py
@@ -4,7 +4,7 @@
   "sourceinprojectwhitelist" : [],
 
   "groupId" : "org.graalvm.compiler",
-  "version" : "20.3.2.1",
+  "version" : "20.3.3.0",
   "release" : False,
   "url" : "http://www.graalvm.org/",
   "developer" : {
@@ -147,16 +147,6 @@
             "sha1": "fb71a14c57a6e6f494aaaa5a84773a3e35344b9b",
             "urls": ["{urlbase}/hsdis-aarch64-linux-fcc9b70ac91c00db8a50b0d4345490a68e3743e1.tar.gz"],
           },
-          "sparcv9": {
-            "sha1": "1c611db3b3b89f78e1e3223fcf4d83c9a4a0dcd0",
-            "urls": ["{urlbase}/hsdis-sparcv9-linux-0c375986d727651dee1819308fbbc0de4927d5d9.tar.gz"],
-          },
-        },
-        "solaris": {
-          "sparcv9": {
-            "sha1": "73c911e408a0e23624020a536dd2fed680c8fd9e",
-            "urls": ["{urlbase}/hsdis-sparcv9-solaris-970640a9af0bd63641f9063c11275b371a59ee60.tar.gz"],
-          },
         },
         "darwin": {
           "amd64": {
@@ -732,20 +722,6 @@
       "workingSets" : "Graal,HotSpot,AMD64",
     },
 
-    "org.graalvm.compiler.hotspot.sparc" : {
-      "subDir" : "src",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "org.graalvm.compiler.hotspot",
-        "org.graalvm.compiler.core.sparc",
-        "org.graalvm.compiler.replacements.sparc",
-      ],
-      "checkstyle" : "org.graalvm.compiler.graph",
-      "annotationProcessors" : ["GRAAL_PROCESSOR"],
-      "javaCompliance" : "8..14",
-      "workingSets" : "Graal,HotSpot,SPARC",
-    },
-
     "org.graalvm.compiler.hotspot.test" : {
       "subDir" : "src",
       "sourceDirs" : ["src"],
@@ -925,29 +901,6 @@
       "workingSets" : "Graal,Assembler,AMD64",
     },
 
-    "org.graalvm.compiler.asm.sparc" : {
-      "subDir" : "src",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "org.graalvm.compiler.asm",
-      ],
-      "checkstyle" : "org.graalvm.compiler.graph",
-      "javaCompliance" : "8..14",
-      "workingSets" : "Graal,Assembler,SPARC",
-    },
-
-    "org.graalvm.compiler.asm.sparc.test" : {
-      "subDir" : "src",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "org.graalvm.compiler.asm.test",
-        "org.graalvm.compiler.asm.sparc",
-      ],
-      "checkstyle" : "org.graalvm.compiler.graph",
-      "javaCompliance" : "8..14",
-      "workingSets" : "Graal,Assembler,SPARC,Test",
-    },
-
     "org.graalvm.compiler.bytecode" : {
       "subDir" : "src",
       "sourceDirs" : ["src"],
@@ -1081,18 +1034,6 @@
       "workingSets" : "Graal,LIR,AMD64",
     },
 
-    "org.graalvm.compiler.lir.sparc" : {
-      "subDir" : "src",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "org.graalvm.compiler.asm.sparc",
-        "org.graalvm.compiler.lir",
-      ],
-      "checkstyle" : "org.graalvm.compiler.graph",
-      "javaCompliance" : "8..14",
-      "workingSets" : "Graal,LIR,SPARC",
-    },
-
     "org.graalvm.compiler.word" : {
       "subDir" : "src",
       "sourceDirs" : ["src"],
@@ -1150,17 +1091,6 @@
       "workingSets" : "Graal,Replacements,AMD64",
     },
 
-    "org.graalvm.compiler.replacements.sparc" : {
-      "subDir" : "src",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "org.graalvm.compiler.replacements",
-      ],
-      "checkstyle" : "org.graalvm.compiler.graph",
-      "javaCompliance" : "8..14",
-      "workingSets" : "Graal,Replacements,SPARC",
-    },
-
     "org.graalvm.compiler.replacements.test" : {
       "subDir" : "src",
       "sourceDirs" : ["src"],
@@ -1494,35 +1424,6 @@
       "workingSets" : "Graal,AMD64,Test",
     },
 
-    "org.graalvm.compiler.core.sparc" : {
-      "subDir" : "src",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "org.graalvm.compiler.core",
-        "org.graalvm.compiler.lir.sparc",
-        "org.graalvm.compiler.java"
-      ],
-      "checkstyle" : "org.graalvm.compiler.graph",
-      "annotationProcessors" : [
-        "GRAAL_PROCESSOR",
-      ],
-      "javaCompliance" : "8..14",
-      "workingSets" : "Graal,SPARC",
-    },
-
-    "org.graalvm.compiler.hotspot.sparc.test" : {
-      "subDir" : "src",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "org.graalvm.compiler.hotspot",
-        "org.graalvm.compiler.lir.jtt",
-        "JVMCI_HOTSPOT"
-      ],
-      "checkstyle" : "org.graalvm.compiler.graph",
-      "javaCompliance" : "8..14",
-      "workingSets" : "Graal,SPARC,Test",
-    },
-
     "org.graalvm.compiler.runtime" : {
       "subDir" : "src",
       "sourceDirs" : ["src"],
@@ -2113,19 +2014,6 @@
       "workingSets" : "Graal,Truffle",
     },
 
-    "org.graalvm.compiler.truffle.compiler.hotspot.sparc" : {
-      "subDir" : "src",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "org.graalvm.compiler.truffle.compiler.hotspot",
-        "org.graalvm.compiler.hotspot.sparc",
-      ],
-      "checkstyle" : "org.graalvm.compiler.graph",
-      "javaCompliance" : "8..14",
-      "annotationProcessors" : ["GRAAL_PROCESSOR"],
-      "workingSets" : "Graal,Truffle,SPARC",
-    },
-
     "org.graalvm.compiler.truffle.compiler.hotspot.aarch64" : {
       "subDir" : "src",
       "sourceDirs" : ["src"],
@@ -2190,7 +2078,6 @@
       "subDir" : "src",
       "dependencies" : [
         "org.graalvm.compiler.api.directives.test",
-        "org.graalvm.compiler.asm.sparc.test",
         "org.graalvm.compiler.asm.aarch64.test",
         "org.graalvm.compiler.asm.amd64.test",
         "org.graalvm.compiler.test",
@@ -2200,7 +2087,6 @@
         "org.graalvm.compiler.hotspot.aarch64.test",
         "org.graalvm.compiler.hotspot.amd64.test",
         "org.graalvm.compiler.hotspot.lir.test",
-        "org.graalvm.compiler.hotspot.sparc.test",
         "org.graalvm.compiler.hotspot.jdk15.test",
         "org.graalvm.compiler.hotspot.jdk9.test",
         "org.graalvm.compiler.options.test",
@@ -2256,7 +2142,6 @@
       "subDir" : "src",
       "dependencies" : [
         "org.graalvm.compiler.truffle.compiler.hotspot.amd64",
-        "org.graalvm.compiler.truffle.compiler.hotspot.sparc",
         "org.graalvm.compiler.truffle.compiler.hotspot.aarch64",
         "org.graalvm.compiler.truffle.compiler.hotspot.libgraal",
       ],
@@ -2382,11 +2267,8 @@
         "org.graalvm.compiler.replacements.aarch64",
         "org.graalvm.compiler.core.amd64",
         "org.graalvm.compiler.replacements.amd64",
-        "org.graalvm.compiler.core.sparc",
-        "org.graalvm.compiler.replacements.sparc",
         "org.graalvm.compiler.hotspot.aarch64",
         "org.graalvm.compiler.hotspot.amd64",
-        "org.graalvm.compiler.hotspot.sparc",
         "org.graalvm.compiler.hotspot",
         "org.graalvm.compiler.lir.aarch64",
         "org.graalvm.compiler.truffle.compiler.amd64",
@@ -2395,7 +2277,6 @@
         "org.graalvm.compiler.truffle.runtime.hotspot.java",
         "org.graalvm.compiler.truffle.runtime.hotspot.libgraal",
         "org.graalvm.compiler.truffle.compiler.hotspot.amd64",
-        "org.graalvm.compiler.truffle.compiler.hotspot.sparc",
         "org.graalvm.compiler.truffle.compiler.hotspot.aarch64",
         "org.graalvm.compiler.truffle.jfr",
       ],

diff --git a/compiler/src/jdk.tools.jaotc/src/jdk/tools/jaotc/CodeSectionProcessor.java b/compiler/src/jdk.tools.jaotc/src/jdk/tools/jaotc/CodeSectionProcessor.java
@@ -81,7 +81,6 @@ void process(AOTCompiledClass compClass) {
                     if (callInfopoint.target instanceof HotSpotForeignCallLinkage &&
                                     target.arch instanceof AMD64) {
                         // TODO 4 is x86 size of relative displacement.
-                        // For SPARC need something different.
                         int destOffset = infopoint.pcOffset + callInfopoint.size - 4;
                         targetCode[destOffset + 0] = 0;
                         targetCode[destOffset + 1] = 0;