jdk-sandbox: comparison src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalCompiler.java

equal deleted inserted replaced

-:13588c901957
+:9cf78a70fa4f
 /*
-* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
 import org.graalvm.compiler.hotspot.phases.OnStackReplacementPhase;
 import org.graalvm.compiler.java.GraphBuilderPhase;
 import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory;
 import org.graalvm.compiler.lir.phases.LIRSuites;
+import org.graalvm.compiler.nodes.Cancellable;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.phases.OptimisticOptimizations;
 import jdk.vm.ci.meta.SpeculationLog;
 import jdk.vm.ci.meta.TriState;
 import jdk.vm.ci.runtime.JVMCICompiler;
 import sun.misc.Unsafe;
-public class HotSpotGraalCompiler implements GraalJVMCICompiler {
+public class HotSpotGraalCompiler implements GraalJVMCICompiler, Cancellable {
 private static final Unsafe UNSAFE = GraalUnsafeAccess.getUnsafe();
 private final HotSpotJVMCIRuntime jvmciRuntime;
 private final HotSpotGraalRuntimeProvider graalRuntime;
 private final CompilationCounters compilationCounters;
 private List<DebugHandlersFactory> factories;
 HotSpotGraalCompiler(HotSpotJVMCIRuntime jvmciRuntime, HotSpotGraalRuntimeProvider graalRuntime, OptionValues options) {
 this.jvmciRuntime = jvmciRuntime;
 this.graalRuntime = graalRuntime;
-// It is sufficient to have one compilation counter object per Graal compiler object.
+// It is sufficient to have one compilation counter object per compiler object.
 this.compilationCounters = Options.CompilationCountLimit.getValue(options) > 0 ? new CompilationCounters(options) : null;
 this.bootstrapWatchDog = graalRuntime.isBootstrapping() && !DebugOptions.BootstrapInitializeOnly.getValue(options) ? BootstrapWatchDog.maybeCreate(graalRuntime) : null;
 }
 public List<DebugHandlersFactory> getDebugHandlersFactories() {
 return compileMethod(request, true, graalRuntime.getOptions());
 }
 @SuppressWarnings("try")
 CompilationRequestResult compileMethod(CompilationRequest request, boolean installAsDefault, OptionValues initialOptions) {
-if (graalRuntime.isShutdown()) {
+try (CompilationContext scope = HotSpotGraalServices.openLocalCompilationContext(request)) {
-return HotSpotCompilationRequestResult.failure(String.format("Shutdown entered"), false);
+if (graalRuntime.isShutdown()) {
-}
+return HotSpotCompilationRequestResult.failure(String.format("Shutdown entered"), true);
+}
-ResolvedJavaMethod method = request.getMethod();
+ResolvedJavaMethod method = request.getMethod();
-if (graalRuntime.isBootstrapping()) {
-if (DebugOptions.BootstrapInitializeOnly.getValue(initialOptions)) {
+if (graalRuntime.isBootstrapping()) {
-return HotSpotCompilationRequestResult.failure(String.format("Skip compilation because %s is enabled", DebugOptions.BootstrapInitializeOnly.getName()), true);
+if (DebugOptions.BootstrapInitializeOnly.getValue(initialOptions)) {
-}
+return HotSpotCompilationRequestResult.failure(String.format("Skip compilation because %s is enabled", DebugOptions.BootstrapInitializeOnly.getName()), true);
-if (bootstrapWatchDog != null) {
+}
-if (bootstrapWatchDog.hitCriticalCompilationRateOrTimeout()) {
+if (bootstrapWatchDog != null) {
-// Drain the compilation queue to expedite completion of the bootstrap
+if (bootstrapWatchDog.hitCriticalCompilationRateOrTimeout()) {
-return HotSpotCompilationRequestResult.failure("hit critical bootstrap compilation rate or timeout", true);
+// Drain the compilation queue to expedite completion of the bootstrap
-}
+return HotSpotCompilationRequestResult.failure("hit critical bootstrap compilation rate or timeout", true);
 }
 }
-HotSpotCompilationRequest hsRequest = (HotSpotCompilationRequest) request;
+}
-CompilationTask task = new CompilationTask(jvmciRuntime, this, hsRequest, true, shouldRetainLocalVariables(hsRequest.getJvmciEnv()), installAsDefault);
+HotSpotCompilationRequest hsRequest = (HotSpotCompilationRequest) request;
-OptionValues options = task.filterOptions(initialOptions);
+CompilationTask task = new CompilationTask(jvmciRuntime, this, hsRequest, true, shouldRetainLocalVariables(hsRequest.getJvmciEnv()), installAsDefault);
-try (CompilationWatchDog w1 = CompilationWatchDog.watch(method, hsRequest.getId(), options);
+OptionValues options = task.filterOptions(initialOptions);
-BootstrapWatchDog.Watch w2 = bootstrapWatchDog == null ? null : bootstrapWatchDog.watch(request);
+try (CompilationWatchDog w1 = CompilationWatchDog.watch(method, hsRequest.getId(), options);
-CompilationAlarm alarm = CompilationAlarm.trackCompilationPeriod(options);) {
+BootstrapWatchDog.Watch w2 = bootstrapWatchDog == null ? null : bootstrapWatchDog.watch(request);
-if (compilationCounters != null) {
+CompilationAlarm alarm = CompilationAlarm.trackCompilationPeriod(options);) {
-compilationCounters.countCompilation(method);
+if (compilationCounters != null) {
-}
+compilationCounters.countCompilation(method);
-CompilationRequestResult r = null;
+}
-try (DebugContext debug = graalRuntime.openDebugContext(options, task.getCompilationIdentifier(), method, getDebugHandlersFactories(), DebugContext.DEFAULT_LOG_STREAM);
+CompilationRequestResult r = null;
-Activation a = debug.activate()) {
+try (DebugContext debug = graalRuntime.openDebugContext(options, task.getCompilationIdentifier(), method, getDebugHandlersFactories(), DebugContext.DEFAULT_LOG_STREAM);
-r = task.runCompilation(debug);
+Activation a = debug.activate()) {
-}
+r = task.runCompilation(debug);
-assert r != null;
+}
-return r;
+assert r != null;
+return r;
+}
 }
 }
 private boolean shouldRetainLocalVariables(long envAddress) {
 GraalHotSpotVMConfig config = graalRuntime.getVMConfig();
 }
 }
 return false;
 }
+@Override
+public boolean isCancelled() {
+return graalRuntime.isShutdown();
+}
 public StructuredGraph createGraph(ResolvedJavaMethod method, int entryBCI, boolean useProfilingInfo, CompilationIdentifier compilationId, OptionValues options, DebugContext debug) {
 HotSpotBackend backend = graalRuntime.getHostBackend();
 HotSpotProviders providers = backend.getProviders();
 final boolean isOSR = entryBCI != JVMCICompiler.INVOCATION_ENTRY_BCI;
-StructuredGraph graph = method.isNative() || isOSR ? null : providers.getReplacements().getIntrinsicGraph(method, compilationId, debug);
+StructuredGraph graph = method.isNative() || isOSR ? null : providers.getReplacements().getIntrinsicGraph(method, compilationId, debug, this);
 if (graph == null) {
 SpeculationLog speculationLog = method.getSpeculationLog();
 if (speculationLog != null) {
 speculationLog.collectFailedSpeculations();
 }
-graph = new StructuredGraph.Builder(options, debug, AllowAssumptions.ifTrue(OptAssumptions.getValue(options))).method(method).entryBCI(entryBCI).speculationLog(
+// @formatter:off
-speculationLog).useProfilingInfo(useProfilingInfo).compilationId(compilationId).build();
+graph = new StructuredGraph.Builder(options, debug, AllowAssumptions.ifTrue(OptAssumptions.getValue(options))).
+method(method).
+cancellable(this).
+entryBCI(entryBCI).
+speculationLog(speculationLog).
+useProfilingInfo(useProfilingInfo).
+compilationId(compilationId).build();
+// @formatter:on
 }
 return graph;
 }
 public CompilationResult compileHelper(CompilationResultBuilderFactory crbf, CompilationResult result, StructuredGraph graph, ResolvedJavaMethod method, int entryBCI, boolean useProfilingInfo,
 }
 return result;
 }
-public CompilationResult compile(ResolvedJavaMethod method, int entryBCI, boolean useProfilingInfo, boolean shouldRetainLocalVariables, CompilationIdentifier compilationId,
+public CompilationResult compile(ResolvedJavaMethod method,
+int entryBCI,
+boolean useProfilingInfo,
+boolean shouldRetainLocalVariables,
+CompilationIdentifier compilationId,
 DebugContext debug) {
 StructuredGraph graph = createGraph(method, entryBCI, useProfilingInfo, compilationId, debug.getOptions(), debug);
 CompilationResult result = new CompilationResult(compilationId);
 return compileHelper(CompilationResultBuilderFactory.Default, result, graph, method, entryBCI, useProfilingInfo, shouldRetainLocalVariables, debug.getOptions());
 }

branch	datagramsocketimpl-branch
changeset 58678	9cf78a70fa4f
parent 54601	c40b2a190173
child 58679	9c3209ff7550