switch CI back to labsjdk for non-Linux platforms

argan · Jul 14, 2017 · cce2bdc · cce2bdc
1 parent 9ed9a01
commit cce2bdc
Show file tree

Hide file tree

Showing 15 changed files with 146 additions and 193 deletions.
diff --git a/common.hocon b/common.hocon
@@ -1,18 +1,30 @@
 # overlay version
-overlay = 2fa6fa642a6de2b8f07acc7940ce526193d9ab93
+overlay = 29b847f04b62506b6a9e07806ce476e99b6d850a
 
-jdk-downloads: {
-  java8 : {name : openjdk, version : "8u121-jvmci-0.30", platformspecific: true}
-  java9 : {name : labsjdk, version : "9-20170703-141343", platformspecific: true}
-  java9EA : {name : labsjdk, version : "9+176", platformspecific: true}
-  java8Debug : {name : openjdk, version : "8u121-jvmci-0.30-fastdebug", platformspecific: true}
+# labsjdk* are JDKs based on OracleJDK binaries
+# openjdk* are JDKs based on OpenJDK binaries
+jdks: {
+  openjdk8 : {name : openjdk, version : "8u121-jvmci-0.30", platformspecific: true}
   labsjdk8 : {name : labsjdk, version : "8u121-jvmci-0.30", platformspecific: true}
+  labsjdk9 : {name : labsjdk, version : "9-20170703-141343", platformspecific: true}
+  labsjdk9EA : {name : labsjdk, version : "9+176", platformspecific: true}
+  openjdk8Debug : {name : openjdk, version : "8u121-jvmci-0.30-fastdebug", platformspecific: true}
   labsjdk8Debug : {name : labsjdk, version : "8u121-jvmci-0.30-fastdebug", platformspecific: true}
 }
 
 # Overlay placeholder for pinning mx to a specific revision
 mx : {}
 
+labsjdk8 :      { downloads : { JAVA_HOME : ${jdks.labsjdk8} }}
+labsjdk8Debug : { downloads : { JAVA_HOME : ${jdks.labsjdk8Debug} }}
+
+openjdk8 :      { downloads : { JAVA_HOME : ${jdks.openjdk8} }}
+openjdk8Debug : { downloads : { JAVA_HOME : ${jdks.openjdk8Debug} }}
+
+labsjdk9 :      { downloads : { JAVA_HOME : ${jdks.labsjdk9},   EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.labsjdk8} ]} }}
+labsjdk9EA :    { downloads : { JAVA_HOME : ${jdks.labsjdk9EA}, EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.labsjdk8} ]} }}
+
+
 common : ${mx} {
   timelimit : "30:00"
   catch_files : [
@@ -66,45 +78,6 @@ linux-sparcv9 : ${linux} {
   capabilities : [linux, sparcv9]
 }
 
-labsjdk8 : {
-  downloads : {
-    JAVA_HOME : ${jdk-downloads.labsjdk8}
-  }
-}
-
-labsjdk8Debug : {
-  downloads : {
-    JAVA_HOME : ${jdk-downloads.labsjdk8Debug}
-  }
-}
-
-java8 : {
-  downloads : {
-    JAVA_HOME : ${jdk-downloads.java8}
-  }
-}
-
-java8Debug : {
-  downloads : {
-    JAVA_HOME : ${jdk-downloads.java8Debug}
-  }
-}
-
-java9 : {
-  downloads : {
-    EXTRA_JAVA_HOMES : { pathlist :[
-      ${jdk-downloads.java8}
-    ]}
-    JAVA_HOME : ${jdk-downloads.java9}
-  }
-}
-
-java9EA : ${java9} {
-  downloads : {
-    JAVA_HOME : ${jdk-downloads.java9EA}
-  }
-}
-
 eclipse : {
   downloads : {
     ECLIPSE : {name: eclipse, version: "4.5.2", platformspecific: true}
@@ -121,7 +94,7 @@ jdt : {
 }
 
 # for cases where a maven package is not easily accessible
-maven-download-unix : ${java8} {
+maven-download-unix : ${labsjdk8} {
   downloads : {
     MAVEN_HOME: {name: maven, version: "3.3.9", platformspecific: false}
   }
@@ -144,15 +117,15 @@ darwin-deploy : ${darwin} ${maven-download-unix} {
   }
 }
 
-deploy-binaries : ${java8} {
+deploy-binaries : ${labsjdk8} {
   targets : [post-merge, deploy]
   run : [
     ["mx", "--strict-compliance", "build"]
     ["mx", "deploy-binary", "--all-suites", "--skip-existing", ${binaries-repository}]
   ]
 }
 
-maven-deploy-dry-run : ${java8} {
+maven-deploy-dry-run : ${labsjdk8} {
   targets : [gate]
   run : [
     ["mx", "--strict-compliance", "build"]

diff --git a/compiler/ci_common/bench-hwloc.hocon b/compiler/ci_common/bench-hwloc.hocon
@@ -1,5 +1,5 @@
 # hwloc (Hardware Locality) provides means to bind a process to NUMA nodes
-hwloc.bench-common-8 : {
+hwloc.bench-common : {
   packages: {hwloc: ">=1.9"}
   environment: {
     BASE_BENCH_RESULTS_FILE_NAME: "bench-results.json"
@@ -15,8 +15,8 @@ hwloc.bench-common-8 : {
     "*output.log"
   ]
 }
-hwloc.scala.bench-common-8 : ${hwloc.bench-common-8} {
-  teardown : ${hwloc.bench-common-8.teardown} [
+hwloc.scala.bench-common : ${hwloc.bench-common} {
+  teardown : ${hwloc.bench-common.teardown} [
     ["bench-uploader.py", "--url", "${BENCH_SERVER_URL}", "serial-node0-${BASE_BENCH_RESULTS_FILE_NAME}"]
     ["bench-uploader.py", "--url", "${BENCH_SERVER_URL}", "serial-node1-${BASE_BENCH_RESULTS_FILE_NAME}"]
   ]
@@ -36,7 +36,7 @@ export.node1: [export, "MACHINE_NODE=1", "BENCH_RESULTS_FILE_PATH=node1-${BASE_B
 export.serial.node0: [export, "MACHINE_NODE=0", "BENCH_RESULTS_FILE_PATH=serial-node0-${BASE_BENCH_RESULTS_FILE_NAME}"]
 export.serial.node1: [export, "MACHINE_NODE=1", "BENCH_RESULTS_FILE_PATH=serial-node1-${BASE_BENCH_RESULTS_FILE_NAME}"]
 
-bench-dacapo-hwloc: ${bench-dacapo} ${hwloc.bench-common-8} {
+bench-dacapo-hwloc: ${bench-dacapo} ${hwloc.bench-common} {
   run: [
     [export, "LOGDIR=${PWD}"]
     ${export.node0}
@@ -47,7 +47,7 @@ bench-dacapo-hwloc: ${bench-dacapo} ${hwloc.bench-common-8} {
   ]
 }
 
-bench-dacapo-timing-hwloc: ${bench-dacapo-timing} ${hwloc.bench-common-8} {
+bench-dacapo-timing-hwloc: ${bench-dacapo-timing} ${hwloc.bench-common} {
   run: [
     [export, "LOGDIR=${PWD}"]
     ${export.node0}
@@ -58,7 +58,7 @@ bench-dacapo-timing-hwloc: ${bench-dacapo-timing} ${hwloc.bench-common-8} {
   ]
 }
 
-bench-dacapo-move-profiling-hwloc: ${bench-dacapo-move-profiling} ${hwloc.bench-common-8} {
+bench-dacapo-move-profiling-hwloc: ${bench-dacapo-move-profiling} ${hwloc.bench-common} {
   run: [
     [export, "LOGDIR=${PWD}"]
     ${export.node0}
@@ -82,7 +82,7 @@ bench-hwloc-only-scala-actors : {
 }
 
 
-bench-scala-dacapo-hwloc: ${bench-scala-dacapo} ${hwloc.scala.bench-common-8} {
+bench-scala-dacapo-hwloc: ${bench-scala-dacapo} ${hwloc.scala.bench-common} {
   run: [
     [export, "LOGDIR=${PWD}"]
     ${export.node0}
@@ -97,7 +97,7 @@ bench-scala-dacapo-hwloc: ${bench-scala-dacapo} ${hwloc.scala.bench-common-8} {
   ]
 }
 
-bench-scala-dacapo-timing-hwloc: ${bench-scala-dacapo-timing} ${hwloc.scala.bench-common-8} {
+bench-scala-dacapo-timing-hwloc: ${bench-scala-dacapo-timing} ${hwloc.scala.bench-common} {
   run: [
     [export, "LOGDIR=${PWD}"]
     ${export.node0}
@@ -112,7 +112,7 @@ bench-scala-dacapo-timing-hwloc: ${bench-scala-dacapo-timing} ${hwloc.scala.benc
   ]
 }
 
-bench-scala-dacapo-move-profiling-hwloc: ${bench-scala-dacapo-move-profiling} ${hwloc.scala.bench-common-8} {
+bench-scala-dacapo-move-profiling-hwloc: ${bench-scala-dacapo-move-profiling} ${hwloc.scala.bench-common} {
   run: [
     [export, "LOGDIR=${PWD}"]
     ${export.node0}
@@ -129,7 +129,7 @@ bench-scala-dacapo-move-profiling-hwloc: ${bench-scala-dacapo-move-profiling} ${
 
 # Renaissance-related targets
 
-bench-renaissance-hwloc: ${bench-renaissance} ${hwloc.bench-common-8} {
+bench-renaissance-hwloc: ${bench-renaissance} ${hwloc.bench-common} {
   run: [
     [export, "LOGDIR=${PWD}"]
     ${export.node0}

diff --git a/compiler/ci_common/bench.hocon b/compiler/ci_common/bench.hocon
@@ -19,7 +19,7 @@ bench-jvmci : {
   mx-teardown : ["bench-uploader.py", "--url", "${BENCH_SERVER_URL}", "${BENCH_RESULTS_FILE_PATH}"]
 }
 
-bench-common-8 : ${java8} ${compilerCommon} {
+bench-common : ${compilerCommon} {
   environment: {
     BENCH_RESULTS_FILE_PATH: "bench-results.json"
   }
@@ -31,21 +31,21 @@ bench-common-8 : ${java8} ${compilerCommon} {
   ]
 }
 
-bench-dacapo: ${bench-common-8} {
+bench-dacapo: ${bench-common} {
   targets : [bench, post-merge]
   run: [
     ${bench-jvmci.mx-dacapo} ${bench-arguments}
   ]
 }
 
-bench-dacapo-timing: ${bench-common-8} {
+bench-dacapo-timing: ${bench-common} {
   targets: [bench, daily]
   run: [
     ${bench-jvmci.mx-dacapo-timing} ${bench-arguments}
   ]
 }
 
-bench-dacapo-move-profiling: ${bench-common-8} {
+bench-dacapo-move-profiling: ${bench-common} {
   targets: [bench, daily]
   run: [
     ${bench-jvmci.mx-dacapo-move-profiling} ${bench-arguments}
@@ -54,21 +54,21 @@ bench-dacapo-move-profiling: ${bench-common-8} {
 
 # Scala DaCapo-related targets
 
-bench-scala-dacapo: ${bench-common-8} {
+bench-scala-dacapo: ${bench-common} {
   targets: [bench, post-merge]
   run: [
     ${bench-jvmci.mx-scala-dacapo} ${bench-arguments}
   ]
 }
 
-bench-scala-dacapo-timing: ${bench-common-8} {
+bench-scala-dacapo-timing: ${bench-common} {
   targets: [bench, daily]
   run: [
     ${bench-jvmci.mx-scala-dacapo-timing} ${bench-arguments}
   ]
 }
 
-bench-scala-dacapo-move-profiling: ${bench-common-8} {
+bench-scala-dacapo-move-profiling: ${bench-common} {
   targets: [bench, daily]
   run: [
     ${bench-jvmci.mx-scala-dacapo-move-profiling} ${bench-arguments}
@@ -77,7 +77,7 @@ bench-scala-dacapo-move-profiling: ${bench-common-8} {
 
 # SPECjbb2005-related targets
 
-bench-specjbb2005: ${bench-common-8} {
+bench-specjbb2005: ${bench-common} {
   targets: [bench, post-merge]
   downloads: {
     SPECJBB2005: { name: specjbb2005, version: "1.07" }
@@ -89,11 +89,11 @@ bench-specjbb2005: ${bench-common-8} {
 }
 
 # SPECJvm2008-related targets
-bench-specjvm2008: ${bench-common-8} {
+bench-specjvm2008: ${bench-common} {
   downloads: {
     SPECJVM2008: { name: specjvm2008, version: "1.01" }
   }
-  teardown: ${bench-common-8.teardown} [
+  teardown: ${bench-common.teardown} [
     [rm, "-r", "${SPECJVM2008}/results"]
   ]
   timelimit: "2:50:00"
@@ -119,7 +119,7 @@ bench-specjvm2008-OneVM: ${bench-specjvm2008} {
 
 # SPECjbb2015-related targets
 
-bench-specjbb2015: ${bench-common-8} {
+bench-specjbb2015: ${bench-common} {
   targets: [bench, post-merge]
   run: [
     ${bench-jvmci.mx-specjbb2015} ${bench-arguments}
@@ -132,7 +132,7 @@ bench-specjbb2015: ${bench-common-8} {
 
 # JMH micros graal
 
-bench-micros-graal: ${bench-common-8} {
+bench-micros-graal: ${bench-common} {
   targets: [weekly]
   run: [
     ${bench-jvmci.mx-micros-graal} ${bench-arguments}
@@ -142,7 +142,7 @@ bench-micros-graal: ${bench-common-8} {
 
 # Renaissance-related targets
 
-bench-renaissance: ${bench-common-8} {
+bench-renaissance: ${bench-common} {
   targets: [bench, post-merge]
   run: [
     ${bench-jvmci.mx-renaissance} ${bench-arguments}

diff --git a/compiler/ci_common/gate.hocon b/compiler/ci_common/gate.hocon
@@ -57,27 +57,7 @@ gateBootstrapFullVerify : {
   ]
 }
 
-gateTest8               : ${gateTest} ${java8}
-gateTestLabs8           : ${gateTest} ${labsjdk8}
-gateTestCTW8            : ${gateTestCTW} ${java8}
-gateTestCTWLabs8        : ${gateTestCTW} ${labsjdk8}
-gateTestCTW9            : ${gateTestCTW} ${java9}
-gateTest8Debug          : ${gateTest} ${java8Debug}
-gateTest9               : ${gateTest} ${java9}
-gateTest9EA             : ${gateTest} ${java9EA}
-gateTestBenchmark8      : ${gateTestBenchmark} ${labsjdk8}
-gateTestBenchmark8Debug : ${gateTestBenchmark} ${labsjdk8Debug}
-gateTestBenchmark9      : ${gateTestBenchmark} ${java9}
-gateBootstrap8          : ${gateBootstrap} ${java8}
-gateBootstrapLabs8      : ${gateBootstrap} ${labsjdk8}
-gateBootstrap9          : ${gateBootstrap} ${java9}
-gateBootstrap9EA        : ${gateBootstrap} ${java9EA}
-gateBootstrap8FullVerify: ${gateBootstrapFullVerify} ${java8}
-gateBootstrapLite8      : ${gateBootstrapLite} ${java8}
-gateBootstrapLiteLabs8  : ${gateBootstrapLite} ${labsjdk8}
-gateBootstrapLite9      : ${gateBootstrapLite} ${java9}
-
-gateStyle : ${java8} ${eclipse} ${jdt} {
+gateStyle : ${eclipse} ${jdt} {
   downloads : {
     JDT : {name: ecj, version: "4.5.1", platformspecific: false}
     ECLIPSE : {name: eclipse, version: "4.5.2", platformspecific: true}

diff --git a/compiler/ci_common/gate_tasks.hocon b/compiler/ci_common/gate_tasks.hocon
@@ -2,35 +2,35 @@
 
 builds += [
   # Darwin AMD64
-  ${gateTest8}                 ${gateDarwinAMD64}  {name: "gate-compiler-test-8-darwin-amd64", targets : [weekly]}
-  ${gateTest9}                 ${gateDarwinAMD64}  {name: "gate-compiler-test-9-darwin-amd64", targets : [weekly]}
-  ${gateTest9EA}               ${gateDarwinAMD64}  {name: "gate-compiler-test-9EA-darwin-amd64", targets : [weekly]}
-# ${gateTestBenchmark8}        ${gateDarwinAMD64}  {name: "gate-compiler-benchmarktest-8-darwin-amd64", targets : [weekly]}
+  ${gateTest}           ${labsjdk8}   ${gateDarwinAMD64}  {name: "gate-compiler-test-8-darwin-amd64", targets : [weekly]}
+  ${gateTest}           ${labsjdk9}   ${gateDarwinAMD64}  {name: "gate-compiler-test-9-darwin-amd64", targets : [weekly]}
+  ${gateTest}           ${labsjdk9EA} ${gateDarwinAMD64}  {name: "gate-compiler-test-9EA-darwin-amd64", targets : [weekly]}
+# ${gateTestBenchmark}  ${labsjdk8}   ${gateDarwinAMD64}  {name: "gate-compiler-benchmarktest-8-darwin-amd64", targets : [weekly]}
 
   # Linux AMD64
-  ${gateTest8}                 ${gateLinuxAMD64}   {name: "gate-compiler-test-8-linux-amd64"}
-  ${gateTest9}                 ${gateLinuxAMD64}   {name: "gate-compiler-test-9-linux-amd64"}
-  ${gateTest9EA}               ${gateLinuxAMD64}   {name: "gate-compiler-test-9EA-linux-amd64"}
-  ${gateTestCTW8}              ${gateLinuxAMD64}   {name: "gate-compiler-ctw-8-linux-amd64"}
-  ${gateTestCTW9}              ${gateLinuxAMD64}   {name: "gate-compiler-ctw-9-linux-amd64", targets : [weekly]}
-  ${gateTest8Debug}            ${gateLinuxAMD64}   {name: "gate-compiler-test-8-linux-amd64-fastdebug", targets : [weekly]}
-  ${gateTestBenchmark8}        ${gateLinuxAMD64}   {name: "gate-compiler-benchmarktest-8-linux-amd64"}
-  ${gateTestBenchmark8Debug}   ${gateLinuxAMD64}   {name: "gate-compiler-benchmarktest-8-linux-amd64-fastdebug", targets : [weekly]}
-  ${gateStyle}                 ${gateLinuxAMD64}   {name: "gate-compiler-style-linux-amd64"}
+  ${gateTest}          ${openjdk8}       ${gateLinuxAMD64}   {name: "gate-compiler-test-8-linux-amd64"}
+  ${gateTest}          ${labsjdk9}       ${gateLinuxAMD64}   {name: "gate-compiler-test-9-linux-amd64"}
+  ${gateTest}          ${labsjdk9EA}     ${gateLinuxAMD64}   {name: "gate-compiler-test-9EA-linux-amd64"}
+  ${gateTestCTW}       ${openjdk8}       ${gateLinuxAMD64}   {name: "gate-compiler-ctw-8-linux-amd64"}
+  ${gateTestCTW}       ${labsjdk9}       ${gateLinuxAMD64}   {name: "gate-compiler-ctw-9-linux-amd64", targets : [weekly]}
+  ${gateTest}          ${openjdk8Debug}  ${gateLinuxAMD64}   {name: "gate-compiler-test-8-linux-amd64-fastdebug", targets : [weekly]}
+  ${gateTestBenchmark} ${openjdk8}       ${gateLinuxAMD64}   {name: "gate-compiler-benchmarktest-8-linux-amd64"}
+  ${gateTestBenchmark} ${openjdk8Debug}  ${gateLinuxAMD64}   {name: "gate-compiler-benchmarktest-8-linux-amd64-fastdebug", targets : [weekly]}
+  ${gateStyle}         ${openjdk8}       ${gateLinuxAMD64}   {name: "gate-compiler-style-linux-amd64"}
 
   # Solaris SPARC
-  ${gateTest8}                 ${gateSolarisSPARC} {name: "gate-compiler-test-8-solaris-sparcv9",                    timelimit: "1:00:00"}
-  ${gateTest9}                 ${gateSolarisSPARC} {name: "gate-compiler-test-9-solaris-sparcv9",                    timelimit: "1:00:00"}
-  ${gateTestCTW8}              ${gateSolarisSPARC} {name: "gate-compiler-ctw-8-solaris-sparcv9",                     timelimit: "1:00:00"}
-  ${gateTestCTW9}              ${gateSolarisSPARC} {name: "gate-compiler-ctw-9-solaris-sparcv9",                     timelimit: "1:00:00", targets : [weekly]}
-  ${gateTest8Debug}            ${gateSolarisSPARC} {name: "gate-compiler-test-8-solaris-sparcv9-fastdebug",          timelimit: "1:00:00", targets : [weekly]}
-  ${gateTestBenchmark8}        ${gateSolarisSPARC} {name: "gate-compiler-benchmarktest-8-solaris-sparcv9",           timelimit: "1:00:00"}
-# ${gateTestBenchmark8Debug}   ${gateSolarisSPARC} {name: "gate-compiler-benchmarktest-8-solaris-sparcv9-fastdebug", timelimit: "1:00:00"}
+  ${gateTest}          ${labsjdk8}       ${gateSolarisSPARC} {name: "gate-compiler-test-8-solaris-sparcv9",                    timelimit: "1:00:00"}
+  ${gateTest}          ${labsjdk9}       ${gateSolarisSPARC} {name: "gate-compiler-test-9-solaris-sparcv9",                    timelimit: "1:00:00"}
+  ${gateTestCTW}       ${labsjdk8}       ${gateSolarisSPARC} {name: "gate-compiler-ctw-8-solaris-sparcv9",                     timelimit: "1:00:00"}
+  ${gateTestCTW}       ${labsjdk9}       ${gateSolarisSPARC} {name: "gate-compiler-ctw-9-solaris-sparcv9",                     timelimit: "1:00:00", targets : [weekly]}
+  ${gateTest}          ${labsjdk8Debug}  ${gateSolarisSPARC} {name: "gate-compiler-test-8-solaris-sparcv9-fastdebug",          timelimit: "1:00:00", targets : [weekly]}
+  ${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:00:00"}
 
   # Linux SPARC
-  ${gateTestLabs8}             ${gateLinuxSPARC} {name: "gate-compiler-test-8-linux-sparcv9",                    timelimit: "1:00:00"}
+  ${gateTest}          ${labsjdk8}       ${gateLinuxSPARC}   {name: "gate-compiler-test-8-linux-sparcv9",                      timelimit: "1:00:00"}
 
   # TraceRA
-  ${gateTest8}                 ${gateLinuxAMD64TraceRA} {name: "gate-compiler-test-8-linux-amd64-tracera", targets : [weekly]}
-  ${gateTest8}                 ${gateLinuxAMD64TraceRABU} {name: "gate-compiler-test-8-linux-amd64-tracera-bu", targets : [weekly]}
+  ${gateTest}          ${openjdk8}       ${gateLinuxAMD64TraceRA} {name: "gate-compiler-test-8-linux-amd64-tracera", targets : [weekly]}
+  ${gateTest}          ${openjdk8}       ${gateLinuxAMD64TraceRABU} {name: "gate-compiler-test-8-linux-amd64-tracera-bu", targets : [weekly]}
 ]