stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8160730: [JVMCI] compiler selection should work without -Djvmci.Compiler

Browse Source 
Reviewed-by: kvn, twisti, never
This commit is contained in:
Doug Simon 2016-07-11 19:15:21 +00:00
parent c4a811cc90
commit 48d49a9522
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java
View File

@ -32,6 +32,11 @@ import jdk.vm.ci.services.Services;
final class HotSpotJVMCICompilerConfig { final class HotSpotJVMCICompilerConfig {
/**
* This factory allows JVMCI initialization to succeed but raises an error if the VM asks JVMCI
* to perform a compilation. This allows the reflective parts of the JVMCI API to be used
* without requiring a compiler implementation to be available.
*/
private static class DummyCompilerFactory extends JVMCICompilerFactory implements JVMCICompiler { private static class DummyCompilerFactory extends JVMCICompilerFactory implements JVMCICompiler {
public HotSpotCompilationRequestResult compileMethod(CompilationRequest request) { public HotSpotCompilationRequestResult compileMethod(CompilationRequest request) {
@ -67,7 +72,6 @@ final class HotSpotJVMCICompilerConfig {
for (JVMCICompilerFactory f : Services.load(JVMCICompilerFactory.class)) { for (JVMCICompilerFactory f : Services.load(JVMCICompilerFactory.class)) {
if (f.getCompilerName().equals(compilerName)) { if (f.getCompilerName().equals(compilerName)) {
Services.exportJVMCITo(f.getClass()); Services.exportJVMCITo(f.getClass());
f.onSelection();
factory = f; factory = f;
} }
} }
@ -75,8 +79,21 @@ final class HotSpotJVMCICompilerConfig {
throw new JVMCIError("JVMCI compiler '%s' not found", compilerName); throw new JVMCIError("JVMCI compiler '%s' not found", compilerName);
} }
} else { } else {
// Auto select a single available compiler
for (JVMCICompilerFactory f : Services.load(JVMCICompilerFactory.class)) {
if (factory == null) {
factory = f;
} else {
// Multiple factories seen - cancel auto selection
factory = null;
break;
}
}
if (factory == null) {
factory = new DummyCompilerFactory(); factory = new DummyCompilerFactory();
} }
}
factory.onSelection();
compilerFactory = factory; compilerFactory = factory;
} }
return compilerFactory; return compilerFactory;

13
hotspot/test/compiler/jvmci/events/JvmciNotifyInstallEventTest.java
View File

@ -32,16 +32,16 @@
* java.base/jdk.internal.org.objectweb.asm.tree * java.base/jdk.internal.org.objectweb.asm.tree
* jdk.vm.ci/jdk.vm.ci.hotspot * jdk.vm.ci/jdk.vm.ci.hotspot
* jdk.vm.ci/jdk.vm.ci.code * jdk.vm.ci/jdk.vm.ci.code
* jdk.vm.ci/jdk.vm.ci.code.site
* jdk.vm.ci/jdk.vm.ci.meta * jdk.vm.ci/jdk.vm.ci.meta
* jdk.vm.ci/jdk.vm.ci.runtime * jdk.vm.ci/jdk.vm.ci.runtime
* *
* @ignore 8144964
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
* @build compiler.jvmci.common.JVMCIHelpers * @build compiler.jvmci.common.JVMCIHelpers
* compiler.jvmci.events.JvmciNotifyInstallEventTest * compiler.jvmci.events.JvmciNotifyInstallEventTest
* @run driver jdk.test.lib.FileInstaller ../common/services/ ./META-INF/services/ * @run driver jdk.test.lib.FileInstaller ../common/services/ ./META-INF/services/
* @run driver jdk.test.lib.FileInstaller ./JvmciNotifyInstallEventTest.config * @run driver jdk.test.lib.FileInstaller ./JvmciNotifyInstallEventTest.config
* ./META-INF/services/jdk.vm.ci.hotspot.HotSpotVMEventListener * ./META-INF/services/jdk.vm.ci.hotspot.services.HotSpotVMEventListener
* @run driver ClassFileInstaller * @run driver ClassFileInstaller
* compiler.jvmci.common.JVMCIHelpers$EmptyHotspotCompiler * compiler.jvmci.common.JVMCIHelpers$EmptyHotspotCompiler
* compiler.jvmci.common.JVMCIHelpers$EmptyCompilerFactory * compiler.jvmci.common.JVMCIHelpers$EmptyCompilerFactory
@ -53,6 +53,11 @@
* jdk.test.lib.Asserts * jdk.test.lib.Asserts
* jdk.test.lib.Utils * jdk.test.lib.Utils
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
* -Xbootclasspath/a:. -Xmixed
* -XX:+UseJVMCICompiler -XX:-BootstrapJVMCI
* -Dcompiler.jvmci.events.JvmciNotifyInstallEventTest.failoninit=false
* compiler.jvmci.events.JvmciNotifyInstallEventTest
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
* -Djvmci.compiler=EmptyCompiler -Xbootclasspath/a:. -Xmixed * -Djvmci.compiler=EmptyCompiler -Xbootclasspath/a:. -Xmixed
* -XX:+UseJVMCICompiler -XX:-BootstrapJVMCI * -XX:+UseJVMCICompiler -XX:-BootstrapJVMCI
* -Dcompiler.jvmci.events.JvmciNotifyInstallEventTest.failoninit=false * -Dcompiler.jvmci.events.JvmciNotifyInstallEventTest.failoninit=false
@ -75,7 +80,7 @@ import compiler.jvmci.common.testcases.SimpleClass;
import jdk.test.lib.Asserts; import jdk.test.lib.Asserts;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import jdk.test.lib.Utils; import jdk.test.lib.Utils;
import jdk.vm.ci.hotspot.HotSpotVMEventListener; import jdk.vm.ci.hotspot.services.HotSpotVMEventListener;
import jdk.vm.ci.code.CompiledCode; import jdk.vm.ci.code.CompiledCode;
import jdk.vm.ci.code.InstalledCode; import jdk.vm.ci.code.InstalledCode;
import jdk.vm.ci.code.site.DataPatch; import jdk.vm.ci.code.site.DataPatch;
@ -88,7 +93,7 @@ import jdk.vm.ci.hotspot.HotSpotCompiledCode.Comment;
import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod; import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod;
public class JvmciNotifyInstallEventTest implements HotSpotVMEventListener { public class JvmciNotifyInstallEventTest extends HotSpotVMEventListener {
private static final String METHOD_NAME = "testMethod"; private static final String METHOD_NAME = "testMethod";
private static final boolean FAIL_ON_INIT = !Boolean.getBoolean( private static final boolean FAIL_ON_INIT = !Boolean.getBoolean(
"compiler.jvmci.events.JvmciNotifyInstallEventTest.failoninit"); "compiler.jvmci.events.JvmciNotifyInstallEventTest.failoninit");