Skip to content

Commit

Permalink
[GR-18988] Update to jdk11 jvmci-19.3-b04.
Browse files Browse the repository at this point in the history
PullRequest: graal/4790
  • Loading branch information
dougxc committed Nov 5, 2019
2 parents 28ec4f5 + fc34857 commit f212d6b
Show file tree
Hide file tree
Showing 17 changed files with 99 additions and 90 deletions.
11 changes: 6 additions & 5 deletions common.hocon
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jdks: {
oraclejdk8Debug: {name : oraclejdk, version : "8u231-jvmci-19.3-b04-fastdebug", platformspecific: true}
oraclejdk11: {name : oraclejdk, version : "11.0.3+12", platformspecific: true}
openjdk11: {name : openjdk, version : "11.0.3+7", platformspecific: true}
labsjdk-ce-11: {name : labsjdk, version : "ce-11.0.5+9-jvmci-19.3-b03", platformspecific: true}
labsjdk-ee-11: {name : labsjdk, version : "ee-11.0.5+1-jvmci-19.3-b03", platformspecific: true}
labsjdk-ce-11: {name : labsjdk, version : "ce-11.0.5+10-jvmci-19.3-b04", platformspecific: true}
labsjdk-ee-11: {name : labsjdk, version : "ee-11.0.5+10-jvmci-19.3-b04", platformspecific: true}
}

# This must always point to HEAD in the master branch but can be used to point
Expand All @@ -29,9 +29,10 @@ download-hsdis : {
]
}

oraclejdk8 : { downloads : { JAVA_HOME : ${jdks.oraclejdk8}, EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.labsjdk-ee-11} ]} }}
oraclejdk8Only : { downloads : { JAVA_HOME : ${jdks.oraclejdk8} }}
oraclejdk8Debug : { downloads : { JAVA_HOME : ${jdks.oraclejdk8Debug}, EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.labsjdk-ee-11} ]} }}
oraclejdk8 : { downloads : { JAVA_HOME : ${jdks.oraclejdk8}, EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.labsjdk-ee-11} ]} }}
oraclejdk8Only : { downloads : { JAVA_HOME : ${jdks.oraclejdk8} }}
oraclejdk8Debug : { downloads : { JAVA_HOME : ${jdks.oraclejdk8Debug}, EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.labsjdk-ee-11} ]} }}
oraclejdk8OnlyDebug : { downloads : { JAVA_HOME : ${jdks.oraclejdk8Debug} }}

openjdk8 : { downloads : { JAVA_HOME : ${jdks.openjdk8} }}

Expand Down
13 changes: 5 additions & 8 deletions compiler/ci_common/gate_tasks.hocon
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,11 @@ builds += [
${gateMathStubsListener} {name: "daily-hotspot-mathstubs-listener"}

# Solaris SPARC
${gateTest} ${oraclejdk8} ${gateSolarisSPARC} {name: "gate-compiler-test-8-solaris-sparcv9", timelimit: "1:00:00"}
# GR-19023
# ${gateTest} ${labsjdk-ee-11} ${gateSolarisSPARC} {name: "gate-compiler-test-labsjdk-ee-11-solaris-sparcv9", timelimit: "1:00:00"}
${gateTestCTW} ${oraclejdk8} ${gateSolarisSPARC} {name: "gate-compiler-ctw-8-solaris-sparcv9", timelimit: "1:00:00"}
${gateTestCTWWeekly} ${labsjdk-ee-11} ${gateSolarisSPARC} {name: "weekly-test-compiler-ctw-labsjdk-ee-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"}
${gateTest} ${oraclejdk8Only} ${gateSolarisSPARC} {name: "gate-compiler-test-8-solaris-sparcv9", timelimit: "1:00:00"}
${gateTestCTW} ${oraclejdk8Only} ${gateSolarisSPARC} {name: "gate-compiler-ctw-8-solaris-sparcv9", timelimit: "1:00:00"}
${gateTest} ${oraclejdk8OnlyDebug} ${gateSolarisSPARC} {name: "weekly-test-compiler-test-8-solaris-sparcv9-fastdebug", timelimit: "1:50:00"} ${graalWeekly}
${gateTestBenchmark} ${oraclejdk8Only} ${gateSolarisSPARC} {name: "gate-compiler-benchmarktest-8-solaris-sparcv9", timelimit: "1:00:00"}
# ${gateTestBenchmark} ${oraclejdk8OnlyDebug} ${gateSolarisSPARC} {name: "gate-compiler-benchmarktest-8-solaris-sparcv9-fastdebug", timelimit: "1:50:00"}

# Linux SPARC
#${gateTest} ${oraclejdk8} ${gateLinuxSPARC} {name: "weekly-test-compiler-test-8-linux-sparcv9", timelimit: "1:00:00"} ${graalWeekly}
Expand Down
3 changes: 1 addition & 2 deletions compiler/ci_common/gate_tasks_bootstrap.hocon
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@ builds += [
${gateBootstrap} ${labsjdk-ee-11} ${gateLinuxAMD64Bootstrap} {name: "gate-compiler-bootstrap-labsjdk-ee-11-linux-amd64"}

# Solaris SPARC
${gateBootstrap} ${oraclejdk8} ${gateSolarisSPARCBootstrap} {name: "gate-compiler-bootstrap-8-solaris-sparcv9", timelimit: "1:00:00"}
${gateBootstrap} ${labsjdk-ee-11} ${gateSolarisSPARCBootstrap} {name: "weekly-test-compiler-bootstrap-labsjdk-ee-11-solaris-sparcv9", timelimit: "1:00:00"} ${graalWeekly}
${gateBootstrap} ${oraclejdk8Only} ${gateSolarisSPARCBootstrap} {name: "gate-compiler-bootstrap-8-solaris-sparcv9", timelimit: "1:00:00"}
]
26 changes: 13 additions & 13 deletions compiler/ci_common/m7_eighth.hocon
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@ m7_eighth.default-g1gc : ${m7_eighth.default} {
}

builds += [
${m7_eighth.default} ${bench-dacapo} ${oraclejdk8} { name: "bench-compiler-dacapo-solaris-m7_eighth", timelimit: "1:00:00" }
${m7_eighth.default} ${bench-dacapo-timing} ${oraclejdk8} { name: "bench-compiler-dacapo-timing-solaris-m7_eighth", timelimit: "1:00:00" }
${m7_eighth.default} ${bench-scala-dacapo} ${oraclejdk8} { name: "bench-compiler-scala-dacapo-solaris-m7_eighth", timelimit: "1:00:00" }
${m7_eighth.default} ${bench-scala-dacapo-timing} ${oraclejdk8} { name: "bench-compiler-scala-dacapo-timing-solaris-m7_eighth", timelimit: "1:00:00" }
${m7_eighth.default} ${bench-specjvm2008-Single} ${oraclejdk8} { name: "bench-compiler-specjvm2008-Single-solaris-m7_eighth", timelimit: "3:10:00" }
${m7_eighth.default} ${bench-specjvm2008-OneVM} ${oraclejdk8} { name: "bench-compiler-specjvm2008-OneVM-solaris-m7_eighth", timelimit: "3:10:00" }
${m7_eighth.default} ${bench-dacapo} ${oraclejdk8Only} { name: "bench-compiler-dacapo-solaris-m7_eighth", timelimit: "1:00:00" }
${m7_eighth.default} ${bench-dacapo-timing} ${oraclejdk8Only} { name: "bench-compiler-dacapo-timing-solaris-m7_eighth", timelimit: "1:00:00" }
${m7_eighth.default} ${bench-scala-dacapo} ${oraclejdk8Only} { name: "bench-compiler-scala-dacapo-solaris-m7_eighth", timelimit: "1:00:00" }
${m7_eighth.default} ${bench-scala-dacapo-timing} ${oraclejdk8Only} { name: "bench-compiler-scala-dacapo-timing-solaris-m7_eighth", timelimit: "1:00:00" }
${m7_eighth.default} ${bench-specjvm2008-Single} ${oraclejdk8Only} { name: "bench-compiler-specjvm2008-Single-solaris-m7_eighth", timelimit: "3:10:00" }
${m7_eighth.default} ${bench-specjvm2008-OneVM} ${oraclejdk8Only} { name: "bench-compiler-specjvm2008-OneVM-solaris-m7_eighth", timelimit: "3:10:00" }
# GR-11609
# ${m7_eighth.default} ${bench-specjbb2015} ${oraclejdk8} { name: "bench-compiler-specjbb2015-solaris-m7_eighth" }
${m7_eighth.default} ${bench-micros-graal-whitebox} ${oraclejdk8} { name: "bench-compiler-jmh-micros-graal-whitebox-solaris-m7_eighth" }
${m7_eighth.default} ${bench-micros-graal-dist} ${oraclejdk8} { name: "bench-compiler-jmh-micros-graal-dist-solaris-m7_eighth" }
# ${m7_eighth.default} ${bench-specjbb2015} ${oraclejdk8Only} { name: "bench-compiler-specjbb2015-solaris-m7_eighth" }
${m7_eighth.default} ${bench-micros-graal-whitebox} ${oraclejdk8Only} { name: "bench-compiler-jmh-micros-graal-whitebox-solaris-m7_eighth" }
${m7_eighth.default} ${bench-micros-graal-dist} ${oraclejdk8Only} { name: "bench-compiler-jmh-micros-graal-dist-solaris-m7_eighth" }

${m7_eighth.default-g1gc} ${bench-dacapo} ${oraclejdk8} { targets : [weekly, bench], name: "bench-compiler-dacapo-g1gc-solaris-m7_eighth", timelimit: "1:00:00" }
${m7_eighth.default-g1gc} ${bench-scala-dacapo} ${oraclejdk8} { targets : [weekly, bench], name: "bench-compiler-scala-dacapo-g1gc-solaris-m7_eighth", timelimit: "1:00:00" }
${m7_eighth.default-g1gc} ${bench-specjvm2008-Single} ${oraclejdk8} { targets : [weekly, bench], name: "bench-compiler-specjvm2008-g1gc-Single-solaris-m7_eighth" }
${m7_eighth.default-g1gc} ${bench-dacapo} ${oraclejdk8Only} { targets : [weekly, bench], name: "bench-compiler-dacapo-g1gc-solaris-m7_eighth", timelimit: "1:00:00" }
${m7_eighth.default-g1gc} ${bench-scala-dacapo} ${oraclejdk8Only} { targets : [weekly, bench], name: "bench-compiler-scala-dacapo-g1gc-solaris-m7_eighth", timelimit: "1:00:00" }
${m7_eighth.default-g1gc} ${bench-specjvm2008-Single} ${oraclejdk8Only} { targets : [weekly, bench], name: "bench-compiler-specjvm2008-g1gc-Single-solaris-m7_eighth" }
# GR-11609
# ${m7_eighth.default-g1gc} ${bench-specjbb2015} ${oraclejdk8} { targets : [weekly, bench], name: "bench-compiler-specjbb2015-g1gc-solaris-m7_eighth" }
# ${m7_eighth.default-g1gc} ${bench-specjbb2015} ${oraclejdk8Only} { targets : [weekly, bench], name: "bench-compiler-specjbb2015-g1gc-solaris-m7_eighth" }
]
18 changes: 12 additions & 6 deletions compiler/mx.compiler/mx_compiler.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
from mx_javamodules import as_java_module
from mx_updategraalinopenjdk import updategraalinopenjdk
from mx_renamegraalpackages import renamegraalpackages
from mx_sdk_vm import jdk_enables_jvmci_by_default, jlink_new_jdk
from mx_sdk_vm import jlink_new_jdk

import mx_jaotc

Expand Down Expand Up @@ -1149,8 +1149,9 @@ def makegraaljdk_cli(args):
if args.bootstrap:
map_file = join(dst_jdk_dir, 'proguard.map')
with StdoutUnstripping(args=[], out=None, err=None, mapFiles=[map_file]) as u:
select_graal = [] if jdk_enables_jvmci_by_default(dst_jdk) else ['-XX:+UnlockExperimentalVMOptions', '-XX:+UseJVMCICompiler']
mx.run([dst_jdk.java] + select_graal + ['-XX:+BootstrapJVMCI', '-version'], out=u.out, err=u.err)
# Just use a set of flags that will work on all JVMCI enabled VMs without trying
# to remove flags that are unnecessary for a specific VM.
mx.run([dst_jdk.java, '-XX:+UnlockExperimentalVMOptions', '-XX:+UseJVMCICompiler', '-XX:+BootstrapJVMCI', '-version'], out=u.out, err=u.err)
if args.archive:
mx.log('Archiving {}'.format(args.archive))
create_archive(dst_jdk_dir, args.archive, basename(args.dest) + '/')
Expand Down Expand Up @@ -1226,6 +1227,12 @@ def _copy_file(src, dst):
mx.log('Copying {} to {}'.format(src, dst))
shutil.copyfile(src, dst)

vm_name = 'Graal'
for d in _graal_config().jvmci_dists:
s = ':' + d.suite.name + '_' + d.suite.version()
if s not in vm_name:
vm_name = vm_name + s

if isJDK8:
jre_dir = join(tmp_dst_jdk_dir, 'jre')
shutil.copytree(src_jdk.home, tmp_dst_jdk_dir)
Expand Down Expand Up @@ -1253,7 +1260,8 @@ def _copy_file(src, dst):
else:
module_dists = _graal_config().dists
_check_using_latest_jars(module_dists)
jlink_new_jdk(jdk, tmp_dst_jdk_dir, module_dists, root_module_names=root_module_names)
vendor_info = {'vendor-version' : vm_name}
jlink_new_jdk(jdk, tmp_dst_jdk_dir, module_dists, root_module_names=root_module_names, vendor_info=vendor_info)
jre_dir = tmp_dst_jdk_dir
jvmci_dir = mx.ensure_dir_exists(join(jre_dir, 'lib', 'jvmci'))
if export_truffle:
Expand Down Expand Up @@ -1284,12 +1292,10 @@ def _copy_file(src, dst):
mx.ensure_dir_exists(libjvm_dir)
jvmlib = join(libjvm_dir, mx.add_lib_prefix(mx.add_lib_suffix('jvm')))

vm_name = 'Graal'
with open(join(tmp_dst_jdk_dir, 'release.jvmci'), 'w') as fp:
for d in _graal_config().jvmci_dists:
s = d.suite
print('{}={}'.format(d.name, s.vc.parent(s.dir)), file=fp)
vm_name = vm_name + ':' + s.name + '_' + s.version()
for d in _graal_config().boot_dists + _graal_config().truffle_dists:
s = d.suite
print('{}={}'.format(d.name, s.vc.parent(s.dir)), file=fp)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
*/
public final class JVMCIVersionCheck {

private static final Version JVMCI8_MIN_VERSION = new Version3(19, 3, 2);
private static final Version JVMCI_MIN_VERSION = new Version3(19, 3, 4);

public interface Version {
boolean isLessThan(Version other);
Expand Down Expand Up @@ -145,18 +145,22 @@ public String toString() {
}
}

private static void failVersionCheck(Map<String, String> props, boolean exit, String reason, Object... args) {
private void failVersionCheck(boolean exit, String reason, Object... args) {
Formatter errorMessage = new Formatter().format(reason, args);
String javaHome = props.get("java.home");
String vmName = props.get("java.vm.name");
errorMessage.format("Set the JVMCI_VERSION_CHECK environment variable to \"ignore\" to suppress ");
errorMessage.format("this error or to \"warn\" to emit a warning and continue execution.%n");
errorMessage.format("Currently used Java home directory is %s.%n", javaHome);
errorMessage.format("Currently used VM configuration is: %s%n", vmName);
if (props.get("java.specification.version").compareTo("1.9") < 0) {
if (javaSpecVersion.compareTo("1.9") < 0) {
errorMessage.format("Download the latest JVMCI JDK 8 from https://github.com/graalvm/openjdk8-jvmci-builder/releases");
} else {
errorMessage.format("Download JDK 11 or later.");
if (javaSpecVersion.compareTo("11") == 0 && vmVersion.contains("-jvmci-")) {
errorMessage.format("Download the latest Labs OpenJDK 11 from https://github.com/graalvm/labs-openjdk-11/releases");
} else {
errorMessage.format("Download JDK 11 or later.");
}
}
String value = System.getenv("JVMCI_VERSION_CHECK");
if ("warn".equals(value)) {
Expand All @@ -183,7 +187,7 @@ private JVMCIVersionCheck(Map<String, String> props, String javaSpecVersion, Str

static void check(Map<String, String> props, boolean exitOnFailure) {
JVMCIVersionCheck checker = new JVMCIVersionCheck(props, props.get("java.specification.version"), props.get("java.vm.version"));
checker.run(exitOnFailure, JVMCI8_MIN_VERSION);
checker.run(exitOnFailure, JVMCI_MIN_VERSION);
}

/**
Expand All @@ -202,14 +206,14 @@ private void run(boolean exitOnFailure, Version minVersion) {
Version v = Version.parse(vmVersion);
if (v != null) {
if (v.isLessThan(minVersion)) {
failVersionCheck(props, exitOnFailure, "The VM does not support the minimum JVMCI API version required by Graal: %s < %s.%n", v, minVersion);
failVersionCheck(exitOnFailure, "The VM does not support the minimum JVMCI API version required by Graal: %s < %s.%n", v, minVersion);
}
return;
}
failVersionCheck(props, exitOnFailure, "The VM does not support the minimum JVMCI API version required by Graal.%n" +
failVersionCheck(exitOnFailure, "The VM does not support the minimum JVMCI API version required by Graal.%n" +
"Cannot read JVMCI version from java.vm.version property: %s.%n", vmVersion);
} else if (javaSpecVersion.compareTo("11") < 0) {
failVersionCheck(props, exitOnFailure, "Graal is not compatible with the JVMCI API in JDK 9 and 10.%n");
failVersionCheck(exitOnFailure, "Graal is not compatible with the JVMCI API in JDK 9 and 10.%n");
} else {
if (vmVersion.contains("SNAPSHOT")) {
return;
Expand All @@ -218,28 +222,16 @@ private void run(boolean exitOnFailure, Version minVersion) {
// Allow local builds
return;
}
if (vmVersion.startsWith("11-ea+")) {
String buildString = vmVersion.substring("11-ea+".length());
try {
int build = Integer.parseInt(buildString);
if (build < 20) {
failVersionCheck(props, exitOnFailure, "Graal requires build 20 or later of JDK 11 early access binary, got build %d.%n", build);
return;
}
} catch (NumberFormatException e) {
failVersionCheck(props, exitOnFailure, "Could not parse the JDK 11 early access build number from java.vm.version property: %s.%n", vmVersion);
return;
}
} else if (vmVersion.contains("-jvmci-")) {
if (vmVersion.contains("-jvmci-")) {
// A "labsjdk"
Version v = Version.parse(vmVersion);
if (v != null) {
if (v.isLessThan(minVersion)) {
failVersionCheck(props, exitOnFailure, "The VM does not support the minimum JVMCI API version required by Graal: %s < %s.%n", v, minVersion);
failVersionCheck(exitOnFailure, "The VM does not support the minimum JVMCI API version required by Graal: %s < %s.%n", v, minVersion);
}
return;
}
failVersionCheck(props, exitOnFailure, "The VM does not support the minimum JVMCI API version required by Graal.%n" +
failVersionCheck(exitOnFailure, "The VM does not support the minimum JVMCI API version required by Graal.%n" +
"Cannot read JVMCI version from java.vm.version property: %s.%n", vmVersion);
} else {
// Graal is compatible with all JDK versions as of 11 GA.
Expand Down
8 changes: 4 additions & 4 deletions examples/ci.hocon
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ examplesGate : ${examplesCommon} {
}

builds += [
${linux-amd64} ${oraclejdk8} ${examplesGate} ${eclipse} ${jdt} { name: "gate-examples-linux-8" },
${linux-amd64} ${oraclejdk11} ${examplesGate} ${eclipse} { name: "gate-examples-linux-oraclejdk-11" },
${solaris-sparcv9} ${oraclejdk8} ${examplesGate} { name: "gate-examples-solaris-8" },
${darwin-amd64} ${oraclejdk8} ${examplesGate} { name: "gate-examples-darwin-8" },
${linux-amd64} ${oraclejdk8} ${examplesGate} ${eclipse} ${jdt} { name: "gate-examples-linux-8" },
${linux-amd64} ${oraclejdk11} ${examplesGate} ${eclipse} { name: "gate-examples-linux-oraclejdk-11" },
${solaris-sparcv9} ${oraclejdk8Only} ${examplesGate} { name: "gate-examples-solaris-8" },
${darwin-amd64} ${oraclejdk8} ${examplesGate} { name: "gate-examples-darwin-8" },
]
6 changes: 1 addition & 5 deletions regex/ci.hocon
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,9 @@ regexWeekly: ${regex-weekly-notifications} {
builds += [
${linux-amd64} ${oraclejdk8} ${regexCommon} ${eclipse} ${jdt} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-regex-8"},
${linux-amd64} ${oraclejdk11} ${regexCommon} ${eclipse} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-regex-oraclejdk-11"},
${solaris-sparcv9} ${oraclejdk8} ${gateLite} ${regexWeekly} {
${solaris-sparcv9} ${oraclejdk8Only} ${gateLite} ${regexWeekly} {
name: "gate-regex-solaris-lite-8"
}
# GR-19023
# ${solaris-sparcv9} ${oraclejdk11} ${gateLite} ${regexWeekly} {
# name: "gate-regex-solaris-lite-oraclejdk-11"
# }
${darwin-amd64} ${oraclejdk8} ${gateLite} ${regexWeekly} {
name: "gate-regex-mac-lite-8"
}
Expand Down
8 changes: 4 additions & 4 deletions sdk/ci.hocon
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ sdkGate : ${sdkCommon} {
}

builds += [
${linux-amd64} ${oraclejdk8} ${sdkGate} ${eclipse} ${jdt} { name: "gate-sdk-linux-8" },
${linux-amd64} ${oraclejdk11} ${sdkGate} ${eclipse} { name: "gate-sdk-linux-oraclejdk-11" },
${solaris-sparcv9} ${oraclejdk8} ${sdkGate} { name: "gate-sdk-solaris-8" },
${darwin-amd64} ${oraclejdk8} ${sdkGate} { name: "gate-sdk-darwin-8" },
${linux-amd64} ${oraclejdk8} ${sdkGate} ${eclipse} ${jdt} { name: "gate-sdk-linux-8" },
${linux-amd64} ${oraclejdk11} ${sdkGate} ${eclipse} { name: "gate-sdk-linux-oraclejdk-11" },
${solaris-sparcv9} ${oraclejdk8Only} ${sdkGate} { name: "gate-sdk-solaris-8" },
${darwin-amd64} ${oraclejdk8} ${sdkGate} { name: "gate-sdk-darwin-8" },
]
Loading

0 comments on commit f212d6b

Please sign in to comment.