rename labsjdk to oraclejdk

sekmet · May 15, 2019 · 10c58e5 · 10c58e5
1 parent 5fa2323
commit 10c58e5
Show file tree

Hide file tree

Showing 27 changed files with 190 additions and 190 deletions.
diff --git a/ci_includes/publish-javadoc.hocon b/ci_includes/publish-javadoc.hocon
@@ -1,7 +1,7 @@
 # Publish Javadoc of graal components post-merge
 
 builds += [
-  ${linux-amd64} ${labsjdk8} {
+  ${linux-amd64} ${oraclejdk8} {
     timelimit : "30:00",
     run : [
         [cd, "./sdk"],

diff --git a/common.hocon b/common.hocon
@@ -1,16 +1,16 @@
 # overlay version
-overlay = 92cc4cf61ccb3ffc91bea53450b8a73222107f8e
+overlay = 3b3af32fa05783864db158cac06121303f465821
 
 # oraclejdk* are released OracleJDK binaries
-# labsjdk* are JDKs based on OracleJDK binaries
+# oraclejdk* are JDKs based on OracleJDK binaries
 # openjdk8 JDKs on Linux are built by Oracle Labs
 # openjdk8 JDKs on macOS are based on AdoptOpenJDK binaries
 jdks: {
-  labsjdk8:      {name : labsjdk,   version : "8u202-jvmci-0.59", platformspecific: true}
-  openjdk8:      {name : openjdk,   version : "8u202-jvmci-0.59", platformspecific: true}
-  labsjdk8Debug: {name : labsjdk,   version : "8u202-jvmci-0.59-fastdebug", platformspecific: true}
-  oraclejdk11:   {name : oraclejdk, version : "11+28", platformspecific: true}
-  openjdk11:     {name : openjdk,   version : "11+28", platformspecific: true}
+  oraclejdk8:      {name : labsjdk,   version : "8u202-jvmci-0.59", platformspecific: true}
+  openjdk8:        {name : openjdk,   version : "8u202-jvmci-0.59", platformspecific: true}
+  oraclejdk8Debug: {name : labsjdk,   version : "8u202-jvmci-0.59-fastdebug", platformspecific: true}
+  oraclejdk11:     {name : oraclejdk, version : "11+28", platformspecific: true}
+  openjdk11:       {name : openjdk,   version : "11+28", platformspecific: true}
 }
 
 # This must always point to HEAD in the master branch but can be used to point
@@ -27,8 +27,8 @@ download-hsdis : {
   ]
 }
 
-labsjdk8 :      { downloads : { JAVA_HOME : ${jdks.labsjdk8},      EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.oraclejdk11} ]} }}
-labsjdk8Debug : { downloads : { JAVA_HOME : ${jdks.labsjdk8Debug}, EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.oraclejdk11} ]} }}
+oraclejdk8 :      { downloads : { JAVA_HOME : ${jdks.oraclejdk8},      EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.oraclejdk11} ]} }}
+oraclejdk8Debug : { downloads : { JAVA_HOME : ${jdks.oraclejdk8Debug}, EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.oraclejdk11} ]} }}
 
 openjdk8 :        { downloads : { JAVA_HOME : ${jdks.openjdk8} }}
 

diff --git a/compiler/README.md b/compiler/README.md
@@ -32,7 +32,7 @@ If you don't have a JDK that satisfies the requirement of a versioned project, t
 
 If you only want to develop Graal for a single JDK version, you only need to define `JAVA_HOME`. For example:
 ```
-export JAVA_HOME=/usr/lib/jvm/labsjdk1.8.0_172-jvmci-0.46
+export JAVA_HOME=/usr/lib/jvm/oraclejdk1.8.0_172-jvmci-0.46
 ```
 or:
 ```
@@ -43,12 +43,12 @@ If you want to ensure your changes will pass both JDK 8 and JDK 11 gates, you ca
 For example, to develop Graal for JDK 8 while ensuring `mx build` still works with the JDK 11 specific sources:
 
 ```
-export JAVA_HOME=/usr/lib/jvm/labsjdk1.8.0_172-jvmci-0.46
+export JAVA_HOME=/usr/lib/jvm/oraclejdk1.8.0_172-jvmci-0.46
 export EXTRA_JAVA_HOMES=/usr/lib/jvm/jdk-11
 ```
 And on macOS:
 ```
-export JAVA_HOME=/Library/Java/JavaVirtualMachines/labsjdk1.8.0_172-jvmci-0.46/Contents/Home
+export JAVA_HOME=/Library/Java/JavaVirtualMachines/oraclejdk1.8.0_172-jvmci-0.46/Contents/Home
 export EXTRA_JAVA_HOMES=/Library/Java/JavaVirtualMachines/jdk-11.jdk/Contents/Home
 ```
 If you omit `EXTRA_JAVA_HOMES` in the above examples, versioned projects depending on the specified JDK(s) will be ignored.

diff --git a/compiler/ci_common/bench-weekly.hocon b/compiler/ci_common/bench-weekly.hocon
@@ -119,32 +119,32 @@ bench-specjbb2015-forks : ${bench-specjbb2015} ${weeklys-bench-notifications} {
 }
 
 builds += [
-  ${x52.tmpfs10g} ${bench-dacapo-hwloc-forks}                        ${labsjdk8} { name: "bench-forks-compiler-dacapo-linux-x52" }
-  ${x52.tmpfs10g} ${bench-scala-dacapo-hwloc-forks}                  ${labsjdk8} { name: "bench-forks-compiler-scala-dacapo-linux-x52" }
-  ${x52.default} ${bench-specjvm2008-Single-forks-batch0}            ${labsjdk8} { name: "bench-forks-compiler-specjvm2008-Single-linux-x52-batch0" }
-  ${x52.default} ${bench-specjvm2008-Single-forks-batch1}            ${labsjdk8} { name: "bench-forks-compiler-specjvm2008-Single-linux-x52-batch1" }
-  ${x52.default} ${bench-specjvm2008-Single-forks-batch2}            ${labsjdk8} { name: "bench-forks-compiler-specjvm2008-Single-linux-x52-batch2" }
-  ${x52.default} ${bench-specjvm2008-Single-forks-batch3}            ${labsjdk8} { name: "bench-forks-compiler-specjvm2008-Single-linux-x52-batch3" }
-  ${x52.default} ${bench-specjvm2008-Single-forks-batch4}            ${labsjdk8} { name: "bench-forks-compiler-specjvm2008-Single-linux-x52-batch4" }
-  ${x52.tmpfs10g} ${bench-renaissance-legacy-hwloc-forks-batch0}     ${labsjdk8} { name: "bench-forks-compiler-renaissance-legacy-linux-x52-batch0" }
-  ${x52.tmpfs10g} ${bench-renaissance-legacy-hwloc-forks-batch1}     ${labsjdk8} { name: "bench-forks-compiler-renaissance-legacy-linux-x52-batch1" }
-  ${x52.tmpfs10g} ${bench-renaissance-legacy-hwloc-forks-batch2}     ${labsjdk8} { name: "bench-forks-compiler-renaissance-legacy-linux-x52-batch2" }
-  ${x52.tmpfs10g} ${bench-renaissance-legacy-hwloc-forks-batch3}     ${labsjdk8} { name: "bench-forks-compiler-renaissance-legacy-linux-x52-batch3" }
-  ${x52.default} ${bench-specjbb2005-forks}                          ${labsjdk8} { name: "bench-forks-compiler-specjbb2005-linux-x52" }
-  ${x52.default} ${bench-specjbb2015-forks}                          ${labsjdk8} { name: "bench-forks-compiler-specjbb2015-linux-x52" }
+  ${x52.tmpfs10g} ${bench-dacapo-hwloc-forks}                        ${oraclejdk8} { name: "bench-forks-compiler-dacapo-linux-x52" }
+  ${x52.tmpfs10g} ${bench-scala-dacapo-hwloc-forks}                  ${oraclejdk8} { name: "bench-forks-compiler-scala-dacapo-linux-x52" }
+  ${x52.default} ${bench-specjvm2008-Single-forks-batch0}            ${oraclejdk8} { name: "bench-forks-compiler-specjvm2008-Single-linux-x52-batch0" }
+  ${x52.default} ${bench-specjvm2008-Single-forks-batch1}            ${oraclejdk8} { name: "bench-forks-compiler-specjvm2008-Single-linux-x52-batch1" }
+  ${x52.default} ${bench-specjvm2008-Single-forks-batch2}            ${oraclejdk8} { name: "bench-forks-compiler-specjvm2008-Single-linux-x52-batch2" }
+  ${x52.default} ${bench-specjvm2008-Single-forks-batch3}            ${oraclejdk8} { name: "bench-forks-compiler-specjvm2008-Single-linux-x52-batch3" }
+  ${x52.default} ${bench-specjvm2008-Single-forks-batch4}            ${oraclejdk8} { name: "bench-forks-compiler-specjvm2008-Single-linux-x52-batch4" }
+  ${x52.tmpfs10g} ${bench-renaissance-legacy-hwloc-forks-batch0}     ${oraclejdk8} { name: "bench-forks-compiler-renaissance-legacy-linux-x52-batch0" }
+  ${x52.tmpfs10g} ${bench-renaissance-legacy-hwloc-forks-batch1}     ${oraclejdk8} { name: "bench-forks-compiler-renaissance-legacy-linux-x52-batch1" }
+  ${x52.tmpfs10g} ${bench-renaissance-legacy-hwloc-forks-batch2}     ${oraclejdk8} { name: "bench-forks-compiler-renaissance-legacy-linux-x52-batch2" }
+  ${x52.tmpfs10g} ${bench-renaissance-legacy-hwloc-forks-batch3}     ${oraclejdk8} { name: "bench-forks-compiler-renaissance-legacy-linux-x52-batch3" }
+  ${x52.default} ${bench-specjbb2005-forks}                          ${oraclejdk8} { name: "bench-forks-compiler-specjbb2005-linux-x52" }
+  ${x52.default} ${bench-specjbb2015-forks}                          ${oraclejdk8} { name: "bench-forks-compiler-specjbb2015-linux-x52" }
 
   # libgraal
-  ${x52.tmpfs10g-libgraal} ${bench-dacapo-hwloc-forks}                      ${labsjdk8} { name: "bench-forks-compiler-dacapo-libgraal-linux-x52" }
-  ${x52.tmpfs10g-libgraal} ${bench-scala-dacapo-hwloc-forks}                ${labsjdk8} { name: "bench-forks-compiler-scala-dacapo-libgraal-linux-x52" }
-  ${x52.default-libgraal} ${bench-specjvm2008-Single-forks-batch0}          ${labsjdk8} { name: "bench-forks-compiler-specjvm2008-Single-libgraal-linux-x52-batch0" }
-  ${x52.default-libgraal} ${bench-specjvm2008-Single-forks-batch1}          ${labsjdk8} { name: "bench-forks-compiler-specjvm2008-Single-libgraal-linux-x52-batch1" }
-  ${x52.default-libgraal} ${bench-specjvm2008-Single-forks-batch2}          ${labsjdk8} { name: "bench-forks-compiler-specjvm2008-Single-libgraal-linux-x52-batch2" }
-  ${x52.default-libgraal} ${bench-specjvm2008-Single-forks-batch3}          ${labsjdk8} { name: "bench-forks-compiler-specjvm2008-Single-libgraal-linux-x52-batch3" }
-  ${x52.default-libgraal} ${bench-specjvm2008-Single-forks-batch4}          ${labsjdk8} { name: "bench-forks-compiler-specjvm2008-Single-libgraal-linux-x52-batch4" }
-  ${x52.tmpfs10g-libgraal} ${bench-renaissance-legacy-hwloc-forks-batch0}   ${labsjdk8} { name: "bench-forks-compiler-renaissance-legacy-libgraal-linux-x52-batch0" }
-  ${x52.tmpfs10g-libgraal} ${bench-renaissance-legacy-hwloc-forks-batch1}   ${labsjdk8} { name: "bench-forks-compiler-renaissance-legacy-libgraal-linux-x52-batch1" }
-  ${x52.tmpfs10g-libgraal} ${bench-renaissance-legacy-hwloc-forks-batch2}   ${labsjdk8} { name: "bench-forks-compiler-renaissance-legacy-libgraal-linux-x52-batch2" }
-  ${x52.tmpfs10g-libgraal} ${bench-renaissance-legacy-hwloc-forks-batch3}   ${labsjdk8} { name: "bench-forks-compiler-renaissance-legacy-libgraal-linux-x52-batch3" }
-  ${x52.default-libgraal} ${bench-specjbb2005-forks}                        ${labsjdk8} { name: "bench-forks-compiler-specjbb2005-libgraal-linux-x52" }
-  ${x52.default-libgraal} ${bench-specjbb2015-forks}                        ${labsjdk8} { name: "bench-forks-compiler-specjbb2015-libgraal-linux-x52" }
+  ${x52.tmpfs10g-libgraal} ${bench-dacapo-hwloc-forks}                      ${oraclejdk8} { name: "bench-forks-compiler-dacapo-libgraal-linux-x52" }
+  ${x52.tmpfs10g-libgraal} ${bench-scala-dacapo-hwloc-forks}                ${oraclejdk8} { name: "bench-forks-compiler-scala-dacapo-libgraal-linux-x52" }
+  ${x52.default-libgraal} ${bench-specjvm2008-Single-forks-batch0}          ${oraclejdk8} { name: "bench-forks-compiler-specjvm2008-Single-libgraal-linux-x52-batch0" }
+  ${x52.default-libgraal} ${bench-specjvm2008-Single-forks-batch1}          ${oraclejdk8} { name: "bench-forks-compiler-specjvm2008-Single-libgraal-linux-x52-batch1" }
+  ${x52.default-libgraal} ${bench-specjvm2008-Single-forks-batch2}          ${oraclejdk8} { name: "bench-forks-compiler-specjvm2008-Single-libgraal-linux-x52-batch2" }
+  ${x52.default-libgraal} ${bench-specjvm2008-Single-forks-batch3}          ${oraclejdk8} { name: "bench-forks-compiler-specjvm2008-Single-libgraal-linux-x52-batch3" }
+  ${x52.default-libgraal} ${bench-specjvm2008-Single-forks-batch4}          ${oraclejdk8} { name: "bench-forks-compiler-specjvm2008-Single-libgraal-linux-x52-batch4" }
+  ${x52.tmpfs10g-libgraal} ${bench-renaissance-legacy-hwloc-forks-batch0}   ${oraclejdk8} { name: "bench-forks-compiler-renaissance-legacy-libgraal-linux-x52-batch0" }
+  ${x52.tmpfs10g-libgraal} ${bench-renaissance-legacy-hwloc-forks-batch1}   ${oraclejdk8} { name: "bench-forks-compiler-renaissance-legacy-libgraal-linux-x52-batch1" }
+  ${x52.tmpfs10g-libgraal} ${bench-renaissance-legacy-hwloc-forks-batch2}   ${oraclejdk8} { name: "bench-forks-compiler-renaissance-legacy-libgraal-linux-x52-batch2" }
+  ${x52.tmpfs10g-libgraal} ${bench-renaissance-legacy-hwloc-forks-batch3}   ${oraclejdk8} { name: "bench-forks-compiler-renaissance-legacy-libgraal-linux-x52-batch3" }
+  ${x52.default-libgraal} ${bench-specjbb2005-forks}                        ${oraclejdk8} { name: "bench-forks-compiler-specjbb2005-libgraal-linux-x52" }
+  ${x52.default-libgraal} ${bench-specjbb2015-forks}                        ${oraclejdk8} { name: "bench-forks-compiler-specjbb2015-libgraal-linux-x52" }
 ]
diff --git a/compiler/ci_common/gate_tasks.hocon b/compiler/ci_common/gate_tasks.hocon
@@ -2,45 +2,45 @@
 
 builds += [
   # Darwin AMD64
-  ${gateTest}           ${labsjdk8}    ${gateDarwinAMD64}  {name: "gate-test-compiler-test-8-darwin-amd64"}
+  ${gateTest}           ${oraclejdk8}  ${gateDarwinAMD64}  {name: "gate-test-compiler-test-8-darwin-amd64"}
   ${gateTest}           ${openjdk8}    ${gateDarwinAMD64}  {name: "weekly-test-compiler-test-openjdk8-darwin-amd64"} ${graalWeekly}
   ${gateTest}           ${oraclejdk11} ${gateDarwinAMD64}  {name: "weekly-test-compiler-test-11-darwin-amd64"} ${graalWeekly}
-# ${gateTestBenchmark}  ${labsjdk8}    ${gateDarwinAMD64}  {name: "weekly-test-compiler-benchmarktest-8-darwin-amd64"} ${graalWeekly}
+# ${gateTestBenchmark}  ${oraclejdk8}  ${gateDarwinAMD64}  {name: "weekly-test-compiler-benchmarktest-8-darwin-amd64"} ${graalWeekly}
 
   # Windows AMD64
-  ${gateTest}          ${labsjdk8}     ${gateWindowsAMD64}   {name: "gate-compiler-test-8-windows-amd64", timelimit: "50:00", packages: {msvc: "==10.0" }}
+  ${gateTest}          ${oraclejdk8}   ${gateWindowsAMD64}   {name: "gate-compiler-test-8-windows-amd64", timelimit: "50:00", packages: {msvc: "==10.0" }}
 
   # Linux AMD64
-  ${gateTest}          ${labsjdk8}       ${gateLinuxAMD64}   {name: "gate-compiler-test-8-linux-amd64"}
-  ${gateTest}          ${openjdk8}       ${gateLinuxAMD64}   {name: "weekly-test-compiler-test-openjdk8-linux-amd64"} ${graalWeekly}
-  ${gateTestMaxVS}     ${labsjdk8}       ${gateLinuxAMD64}   {name: "weekly-test-compiler-test-8-linux-amd64-maxvectorsize"} ${graalWeekly}
-  ${gateTestAVX0}      ${labsjdk8}       ${gateLinuxAMD64}   {name: "weekly-test-compiler-test-8-linux-amd64-avx0"} ${graalWeekly}
-  ${gateTestAVX1}      ${labsjdk8}       ${gateLinuxAMD64}   {name: "weekly-test-compiler-test-8-linux-amd64-avx1"} ${graalWeekly}
-  ${gateTest}          ${oraclejdk11}    ${gateLinuxAMD64}   {name: "gate-compiler-test-11-linux-amd64"}
-  ${gateJavaBaseTest}  ${oraclejdk11}    ${gateLinuxAMD64}   {name: "weekly-test-compiler-javabasetest-11-linux-amd64"} ${graalWeekly}
-  ${gateTestCTW}       ${labsjdk8}       ${gateLinuxAMD64}   {name: "gate-compiler-ctw-8-linux-amd64"}
-  ${gateTestCTW}       ${openjdk8}       ${gateLinuxAMD64}   {name: "weekly-test-compiler-ctw-openjdk8-linux-amd64"} ${graalWeekly}
-  ${gateTestCTW}       ${oraclejdk11}    ${gateLinuxAMD64}   {name: "weekly-test-compiler-ctw-11-linux-amd64"} ${graalWeekly}
-  ${gateTest}          ${labsjdk8Debug}  ${gateLinuxAMD64}   {name: "weekly-test-compiler-test-8-linux-amd64-fastdebug", timelimit: "1:50:00"} ${graalWeekly}
-  ${gateTestBenchmark} ${labsjdk8}       ${gateLinuxAMD64}   {name: "gate-compiler-benchmarktest-8-linux-amd64"}
-  ${gateTestBenchmark} ${labsjdk8Debug}  ${gateLinuxAMD64}   {name: "weekly-test-compiler-benchmarktest-8-linux-amd64-fastdebug"} ${graalWeekly}
-  ${gateStyle}         ${labsjdk8}       ${gateLinuxAMD64}   {name: "gate-compiler-style-linux-amd64"}
-  ${gateCoverage}      ${labsjdk8}       ${gateLinuxAMD64}   {name: "weekly-compiler-coverage-8-linux-amd64", timelimit: "1:50:00"} ${graalWeekly}
+  ${gateTest}          ${oraclejdk8}      ${gateLinuxAMD64}   {name: "gate-compiler-test-8-linux-amd64"}
+  ${gateTest}          ${openjdk8}        ${gateLinuxAMD64}   {name: "weekly-test-compiler-test-openjdk8-linux-amd64"} ${graalWeekly}
+  ${gateTestMaxVS}     ${oraclejdk8}      ${gateLinuxAMD64}   {name: "weekly-test-compiler-test-8-linux-amd64-maxvectorsize"} ${graalWeekly}
+  ${gateTestAVX0}      ${oraclejdk8}      ${gateLinuxAMD64}   {name: "weekly-test-compiler-test-8-linux-amd64-avx0"} ${graalWeekly}
+  ${gateTestAVX1}      ${oraclejdk8}      ${gateLinuxAMD64}   {name: "weekly-test-compiler-test-8-linux-amd64-avx1"} ${graalWeekly}
+  ${gateTest}          ${oraclejdk11}     ${gateLinuxAMD64}   {name: "gate-compiler-test-11-linux-amd64"}
+  ${gateJavaBaseTest}  ${oraclejdk11}     ${gateLinuxAMD64}   {name: "weekly-test-compiler-javabasetest-11-linux-amd64"} ${graalWeekly}
+  ${gateTestCTW}       ${oraclejdk8}      ${gateLinuxAMD64}   {name: "gate-compiler-ctw-8-linux-amd64"}
+  ${gateTestCTW}       ${openjdk8}        ${gateLinuxAMD64}   {name: "weekly-test-compiler-ctw-openjdk8-linux-amd64"} ${graalWeekly}
+  ${gateTestCTW}       ${oraclejdk11}     ${gateLinuxAMD64}   {name: "weekly-test-compiler-ctw-11-linux-amd64"} ${graalWeekly}
+  ${gateTest}          ${oraclejdk8Debug} ${gateLinuxAMD64}   {name: "weekly-test-compiler-test-8-linux-amd64-fastdebug", timelimit: "1:50:00"} ${graalWeekly}
+  ${gateTestBenchmark} ${oraclejdk8}      ${gateLinuxAMD64}   {name: "gate-compiler-benchmarktest-8-linux-amd64"}
+  ${gateTestBenchmark} ${oraclejdk8Debug} ${gateLinuxAMD64}   {name: "weekly-test-compiler-benchmarktest-8-linux-amd64-fastdebug"} ${graalWeekly}
+  ${gateStyle}         ${oraclejdk8}      ${gateLinuxAMD64}   {name: "gate-compiler-style-linux-amd64"}
+  ${gateCoverage}      ${oraclejdk8}      ${gateLinuxAMD64}   {name: "weekly-compiler-coverage-8-linux-amd64", timelimit: "1:50:00"} ${graalWeekly}
 
-  ${gateTestCompileImmediately}     ${labsjdk8}       ${gateLinuxAMD64}   {name: "gate-compiler-test-compile-immediately-8-linux-amd64"}
+  ${gateTestCompileImmediately}     ${oraclejdk8}     ${gateLinuxAMD64}   {name: "gate-compiler-test-compile-immediately-8-linux-amd64"}
   ${gateMathStubsListener}                                                {name: "daily-hotspot-mathstubs-listener"}
 
   # Solaris SPARC
-  ${gateTest}          ${labsjdk8}       ${gateSolarisSPARC} {name: "gate-compiler-test-8-solaris-sparcv9",                    timelimit: "1:00:00"}
-  ${gateTest}          ${oraclejdk11}    ${gateSolarisSPARC} {name: "gate-compiler-test-11-solaris-sparcv9",                   timelimit: "1:00:00"}
-  ${gateTestCTW}       ${labsjdk8}       ${gateSolarisSPARC} {name: "gate-compiler-ctw-8-solaris-sparcv9",                     timelimit: "1:00:00"}
-  ${gateTestCTW}       ${oraclejdk11}    ${gateSolarisSPARC} {name: "weekly-test-compiler-ctw-11-solaris-sparcv9",             timelimit: "1:50:00"} ${graalWeekly}
-  ${gateTest}          ${labsjdk8Debug}  ${gateSolarisSPARC} {name: "weekly-test-compiler-test-8-solaris-sparcv9-fastdebug",   timelimit: "1:50:00"} ${graalWeekly}
-  ${gateTestBenchmark} ${labsjdk8}       ${gateSolarisSPARC} {name: "gate-compiler-benchmarktest-8-solaris-sparcv9",           timelimit: "1:00:00"}
-# ${gateTestBenchmark} ${labsjdk8Debug}  ${gateSolarisSPARC} {name: "gate-compiler-benchmarktest-8-solaris-sparcv9-fastdebug", timelimit: "1:50:00"}
+  ${gateTest}          ${oraclejdk8}      ${gateSolarisSPARC} {name: "gate-compiler-test-8-solaris-sparcv9",                    timelimit: "1:00:00"}
+  ${gateTest}          ${oraclejdk11}     ${gateSolarisSPARC} {name: "gate-compiler-test-11-solaris-sparcv9",                   timelimit: "1:00:00"}
+  ${gateTestCTW}       ${oraclejdk8}      ${gateSolarisSPARC} {name: "gate-compiler-ctw-8-solaris-sparcv9",                     timelimit: "1:00:00"}
+  ${gateTestCTW}       ${oraclejdk11}     ${gateSolarisSPARC} {name: "weekly-test-compiler-ctw-11-solaris-sparcv9",             timelimit: "1:50:00"} ${graalWeekly}
+  ${gateTest}          ${oraclejdk8Debug} ${gateSolarisSPARC} {name: "weekly-test-compiler-test-8-solaris-sparcv9-fastdebug",   timelimit: "1:50:00"} ${graalWeekly}
+  ${gateTestBenchmark} ${oraclejdk8}      ${gateSolarisSPARC} {name: "gate-compiler-benchmarktest-8-solaris-sparcv9",           timelimit: "1:00:00"}
+# ${gateTestBenchmark} ${oraclejdk8Debug} ${gateSolarisSPARC} {name: "gate-compiler-benchmarktest-8-solaris-sparcv9-fastdebug", timelimit: "1:50:00"}
 
   # Linux SPARC
-  #${gateTest}          ${labsjdk8}       ${gateLinuxSPARC}   {name: "weekly-test-compiler-test-8-linux-sparcv9",               timelimit: "1:00:00"} ${graalWeekly}
+  #${gateTest}          ${oraclejdk8}     ${gateLinuxSPARC}   {name: "weekly-test-compiler-test-8-linux-sparcv9",               timelimit: "1:00:00"} ${graalWeekly}
 
   # Linux AArch64
   ${gateTest}                            ${gateLinuxAArch64} {name: "weekly-compiler-test-11-linux-aarch64",                   timelimit: "1:50:00"} ${graalWeekly}