--- a/test/jtreg-ext/requires/VMProps.java Wed Aug 08 15:34:32 2018 -0700
+++ b/test/jtreg-ext/requires/VMProps.java Wed Aug 08 18:38:34 2018 -0700
@@ -92,6 +92,8 @@
map.put("vm.cds.archived.java.heap", vmCDSForArchivedJavaHeap());
// vm.graal.enabled is true if Graal is used as JIT
map.put("vm.graal.enabled", isGraalEnabled());
+ map.put("vm.compiler1.enabled", isCompiler1Enabled());
+ map.put("vm.compiler2.enabled", isCompiler2Enabled());
map.put("docker.support", dockerSupport());
map.put("release.implementor", implementor());
vmGC(map); // vm.gc.X = true/false
@@ -390,6 +392,23 @@
return Compiler.isGraalEnabled() ? "true" : "false";
}
+ /**
+ * Check if Compiler1 is present.
+ *
+ * @return true if Compiler1 is used as JIT compiler, either alone or as part of the tiered system.
+ */
+ protected String isCompiler1Enabled() {
+ return Compiler.isC1Enabled() ? "true" : "false";
+ }
+
+ /**
+ * Check if Compiler2 is present.
+ *
+ * @return true if Compiler2 is used as JIT compiler, either alone or as part of the tiered system.
+ */
+ protected String isCompiler2Enabled() {
+ return Compiler.isC2Enabled() ? "true" : "false";
+ }
/**
* A simple check for docker support