diff --git a/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/BinaryContainer.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/BinaryContainer.java index bea29235506..96f18961a95 100644 --- a/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/BinaryContainer.java +++ b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/BinaryContainer.java @@ -52,8 +52,8 @@ import jdk.tools.jaotc.binformat.pecoff.JPECoffRelocObject; * *

* This class holds information necessary to create platform-specific binary containers such as - * ELFContainer for Linux or MachOContainer for Mac OS or PEContainer - * for MS Windows operating systems. + * ELFContainer for Linux or MachOContainer for Mac OS or PEContainer for MS Windows operating + * systems. * *

* Method APIs provided by this class are used to construct and populate platform-independent @@ -300,7 +300,7 @@ public final class BinaryContainer implements SymbolTable { this.codeEntryAlignment = graalHotSpotVMConfig.codeEntryAlignment; - this.threadLocalHandshakes = graalHotSpotVMConfig.threadLocalHandshakes; + this.threadLocalHandshakes = graalHotSpotVMConfig.useThreadLocalPolling; // Section unique name is limited to 8 characters due to limitation on Windows. // Name could be longer but only first 8 characters are stored on Windows. @@ -354,7 +354,7 @@ public final class BinaryContainer implements SymbolTable { graphBuilderConfig.omitAssertions())); if (JavaVersionUtil.JAVA_SPEC < 14) { // See JDK-8220049. Thread local handshakes are on by default since JDK14, the command line option has been removed. - booleanFlagsList.add(graalHotSpotVMConfig.threadLocalHandshakes); + booleanFlagsList.add(graalHotSpotVMConfig.useThreadLocalPolling); } ArrayList intFlagsList = new ArrayList<>(); @@ -432,6 +432,10 @@ public final class BinaryContainer implements SymbolTable { return "_aot_stub_routines_crc_table_adr"; } + public static String getPollingPageSymbolName() { + return "_aot_polling_page"; + } + public static String getResolveStaticEntrySymbolName() { return "_resolve_static_entry"; } @@ -508,6 +512,7 @@ public final class BinaryContainer implements SymbolTable { createGotSymbol(getHeapEndAddressSymbolName()); createGotSymbol(getNarrowKlassBaseAddressSymbolName()); createGotSymbol(getNarrowOopBaseAddressSymbolName()); + createGotSymbol(getPollingPageSymbolName()); createGotSymbol(getLogOfHeapRegionGrainBytesSymbolName()); createGotSymbol(getInlineContiguousAllocationSupportedSymbolName()); diff --git a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTCompilationTask.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTCompilationTask.java index 192e3ef863e..6c8a47e8f1f 100644 --- a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTCompilationTask.java +++ b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTCompilationTask.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -33,6 +33,7 @@ import org.graalvm.compiler.code.CompilationResult; import org.graalvm.compiler.core.GraalCompilerOptions; import org.graalvm.compiler.debug.DebugContext; import org.graalvm.compiler.debug.DebugContext.Activation; +import org.graalvm.compiler.debug.DebugContext.Builder; import org.graalvm.compiler.debug.TTY; import org.graalvm.compiler.options.OptionValues; import org.graalvm.compiler.printer.GraalDebugHandlersFactory; @@ -118,7 +119,7 @@ final class AOTCompilationTask implements Runnable, Comparable { CompilationResult compResult = null; final long startTime = System.currentTimeMillis(); SnippetReflectionProvider snippetReflection = aotBackend.getProviders().getSnippetReflection(); - try (DebugContext debug = DebugContext.create(graalOptions, new GraalDebugHandlersFactory(snippetReflection)); Activation a = debug.activate()) { + try (DebugContext debug = new Builder(graalOptions, new GraalDebugHandlersFactory(snippetReflection)).build(); Activation a = debug.activate()) { compResult = aotBackend.compileMethod(method, debug); } final long endTime = System.currentTimeMillis(); diff --git a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CallInfo.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CallInfo.java index ecff0cffe15..de8699c5e2d 100644 --- a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CallInfo.java +++ b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CallInfo.java @@ -26,6 +26,7 @@ package jdk.tools.jaotc; import org.graalvm.compiler.bytecode.Bytecodes; +import org.graalvm.compiler.hotspot.HotSpotMarkId; import jdk.vm.ci.code.BytecodePosition; import jdk.vm.ci.code.site.Call; @@ -67,11 +68,11 @@ final class CallInfo { } static boolean isVirtualCall(CompiledMethodInfo methodInfo, Call call) { - return isInvokeVirtual(call) && !methodInfo.hasMark(call, MarkId.INVOKESPECIAL) && !isStaticTarget(call); + return isInvokeVirtual(call) && !methodInfo.hasMark(call, HotSpotMarkId.INVOKESPECIAL) && !isStaticTarget(call); } static boolean isOptVirtualCall(CompiledMethodInfo methodInfo, Call call) { - return isInvokeVirtual(call) && methodInfo.hasMark(call, MarkId.INVOKESPECIAL); + return isInvokeVirtual(call) && methodInfo.hasMark(call, HotSpotMarkId.INVOKESPECIAL); } private static boolean isJavaCall(Call call) { diff --git a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CodeOffsets.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CodeOffsets.java index 243c8b4da40..d59df0123a4 100644 --- a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CodeOffsets.java +++ b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CodeOffsets.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -27,7 +27,8 @@ package jdk.tools.jaotc; import java.util.List; -import jdk.vm.ci.code.site.Mark; +import org.graalvm.compiler.code.CompilationResult; +import org.graalvm.compiler.hotspot.HotSpotMarkId; final class CodeOffsets { private final int entry; @@ -42,34 +43,32 @@ final class CodeOffsets { this.deoptHandler = deoptHandler; } - static CodeOffsets buildFrom(List marks) { + static CodeOffsets buildFrom(List marks) { int entry = 0; int verifiedEntry = 0; int exceptionHandler = -1; int deoptHandler = -1; - for (Mark mark : marks) { - if (mark.id instanceof Integer) { - MarkId markId = MarkId.getEnum((int) mark.id); - switch (markId) { - case UNVERIFIED_ENTRY: - entry = mark.pcOffset; - break; - case VERIFIED_ENTRY: - verifiedEntry = mark.pcOffset; - break; - case OSR_ENTRY: - // Unhandled - break; - case EXCEPTION_HANDLER_ENTRY: - exceptionHandler = mark.pcOffset; - break; - case DEOPT_HANDLER_ENTRY: - deoptHandler = mark.pcOffset; - break; - default: - break; // Ignore others - } + for (CompilationResult.CodeMark mark : marks) { + HotSpotMarkId markId = (HotSpotMarkId) mark.id; + switch (markId) { + case UNVERIFIED_ENTRY: + entry = mark.pcOffset; + break; + case VERIFIED_ENTRY: + verifiedEntry = mark.pcOffset; + break; + case OSR_ENTRY: + // Unhandled + break; + case EXCEPTION_HANDLER_ENTRY: + exceptionHandler = mark.pcOffset; + break; + case DEOPT_HANDLER_ENTRY: + deoptHandler = mark.pcOffset; + break; + default: + break; // Ignore others } } return new CodeOffsets(entry, verifiedEntry, exceptionHandler, deoptHandler); diff --git a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CompiledMethodInfo.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CompiledMethodInfo.java index 9486edac158..e044c3519da 100644 --- a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CompiledMethodInfo.java +++ b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/CompiledMethodInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -25,17 +25,17 @@ package jdk.tools.jaotc; -import java.util.concurrent.atomic.AtomicInteger; import java.util.HashMap; import java.util.HashSet; +import java.util.concurrent.atomic.AtomicInteger; +import org.graalvm.compiler.code.CompilationResult; +import org.graalvm.compiler.hotspot.HotSpotMarkId; + +import jdk.tools.jaotc.AOTCompiledClass.AOTKlassData; import jdk.tools.jaotc.binformat.BinaryContainer; import jdk.tools.jaotc.binformat.ReadOnlyDataContainer; -import jdk.tools.jaotc.AOTCompiledClass.AOTKlassData; -import org.graalvm.compiler.code.CompilationResult; - -import jdk.vm.ci.code.site.Mark; -import jdk.vm.ci.code.site.Site; +import jdk.vm.ci.code.site.Call; import jdk.vm.ci.hotspot.HotSpotCompiledCode; import jdk.vm.ci.hotspot.HotSpotResolvedObjectType; @@ -306,23 +306,11 @@ final class CompiledMethodInfo { return null; } - boolean hasMark(Site call, MarkId id) { - for (Mark m : compilationResult.getMarks()) { - int adjOffset = m.pcOffset; - if (archStr.equals("aarch64")) { - // The mark is at the end of a group of three instructions: - // adrp; add; ldr - adjOffset += 12; - } else { - // X64-specific code. - // Call instructions are aligned to 8 - // bytes - 1 on x86 to patch address atomically, - adjOffset = (adjOffset & (-8)) + 7; - } - // Mark points before aligning nops. - if ((call.pcOffset == adjOffset) && MarkId.getEnum((int) m.id) == id) { - return true; - } + boolean hasMark(Call call, HotSpotMarkId id) { + assert id == HotSpotMarkId.INVOKESTATIC || id == HotSpotMarkId.INVOKESPECIAL; + CompilationResult.CodeMark mark = compilationResult.getAssociatedMark(call); + if (mark != null) { + return mark.id == id; } return false; } diff --git a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/JavaCallSiteRelocationSymbol.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/JavaCallSiteRelocationSymbol.java index 705851dbe50..8f7ad70cba1 100644 --- a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/JavaCallSiteRelocationSymbol.java +++ b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/JavaCallSiteRelocationSymbol.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -25,6 +25,8 @@ package jdk.tools.jaotc; +import org.graalvm.compiler.hotspot.HotSpotMarkId; + import jdk.tools.jaotc.binformat.BinaryContainer; import jdk.tools.jaotc.binformat.Symbol; import jdk.vm.ci.code.site.Call; @@ -136,7 +138,7 @@ final class JavaCallSiteRelocationSymbol extends CallSiteRelocationSymbol { private static String getResolveSymbolName(CompiledMethodInfo mi, Call call) { String resolveSymbolName; if (CallInfo.isStaticCall(call)) { - assert mi.hasMark(call, MarkId.INVOKESTATIC); + assert mi.hasMark(call, HotSpotMarkId.INVOKESTATIC); resolveSymbolName = BinaryContainer.getResolveStaticEntrySymbolName(); } else if (CallInfo.isSpecialCall(call)) { resolveSymbolName = BinaryContainer.getResolveOptVirtualEntrySymbolName(); diff --git a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Main.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Main.java index 6970f430292..64082155959 100644 --- a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Main.java +++ b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Main.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -31,6 +31,8 @@ import static org.graalvm.compiler.hotspot.meta.HotSpotAOTProfilingPlugin.Option import java.io.IOException; import java.io.PrintWriter; +import java.nio.file.Files; +import java.nio.file.Paths; import java.text.MessageFormat; import java.util.ArrayList; import java.util.Collections; @@ -39,13 +41,12 @@ import java.util.ListIterator; import java.util.Set; import java.util.StringTokenizer; import java.util.stream.Stream; -import java.nio.file.Files; -import java.nio.file.Paths; import org.graalvm.compiler.api.replacements.SnippetReflectionProvider; import org.graalvm.compiler.api.runtime.GraalJVMCICompiler; import org.graalvm.compiler.debug.DebugContext; import org.graalvm.compiler.debug.DebugContext.Activation; +import org.graalvm.compiler.debug.DebugContext.Builder; import org.graalvm.compiler.hotspot.CompilerConfigurationFactory; import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; import org.graalvm.compiler.hotspot.HotSpotGraalCompilerFactory; @@ -232,12 +233,12 @@ public final class Main { // The GC names are spelled the same in both enums, so no clever remapping is needed // here. String name = "CollectedHeap::" + graalGC.name(); - int gc = graalHotSpotVMConfig.getConstant(name, Integer.class, def); + int gc = graalHotSpotVMConfig.getConstant(name, Integer.class, def, true); BinaryContainer binaryContainer = new BinaryContainer(graalOptions, graalHotSpotVMConfig, graphBuilderConfig, gc, JVM_VERSION); DataBuilder dataBuilder = new DataBuilder(this, backend, classes, binaryContainer); - try (DebugContext debug = DebugContext.create(graalOptions, new GraalDebugHandlersFactory(snippetReflection)); Activation a = debug.activate()) { + try (DebugContext debug = new Builder(graalOptions, new GraalDebugHandlersFactory(snippetReflection)).build(); Activation a = debug.activate()) { dataBuilder.prepareData(debug); } diff --git a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MarkId.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MarkId.java deleted file mode 100644 index 80174be5768..00000000000 --- a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MarkId.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (c) 2016, 2020, 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. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - - -package jdk.tools.jaotc; - -import java.util.HashMap; -import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; - -/** - * Constants used to mark special positions in code being installed into the code cache by Graal C++ - * code. - */ -enum MarkId { - VERIFIED_ENTRY("CodeInstaller::VERIFIED_ENTRY"), - UNVERIFIED_ENTRY("CodeInstaller::UNVERIFIED_ENTRY"), - OSR_ENTRY("CodeInstaller::OSR_ENTRY"), - EXCEPTION_HANDLER_ENTRY("CodeInstaller::EXCEPTION_HANDLER_ENTRY"), - DEOPT_HANDLER_ENTRY("CodeInstaller::DEOPT_HANDLER_ENTRY"), - INVOKEINTERFACE("CodeInstaller::INVOKEINTERFACE"), - INVOKEVIRTUAL("CodeInstaller::INVOKEVIRTUAL"), - INVOKESTATIC("CodeInstaller::INVOKESTATIC"), - INVOKESPECIAL("CodeInstaller::INVOKESPECIAL"), - INLINE_INVOKE("CodeInstaller::INLINE_INVOKE"), - POLL_NEAR("CodeInstaller::POLL_NEAR"), - POLL_RETURN_NEAR("CodeInstaller::POLL_RETURN_NEAR"), - POLL_FAR("CodeInstaller::POLL_FAR"), - POLL_RETURN_FAR("CodeInstaller::POLL_RETURN_FAR"), - CARD_TABLE_ADDRESS("CodeInstaller::CARD_TABLE_ADDRESS"), - HEAP_TOP_ADDRESS("CodeInstaller::HEAP_TOP_ADDRESS"), - HEAP_END_ADDRESS("CodeInstaller::HEAP_END_ADDRESS"), - NARROW_KLASS_BASE_ADDRESS("CodeInstaller::NARROW_KLASS_BASE_ADDRESS"), - NARROW_OOP_BASE_ADDRESS("CodeInstaller::NARROW_OOP_BASE_ADDRESS"), - CRC_TABLE_ADDRESS("CodeInstaller::CRC_TABLE_ADDRESS"), - LOG_OF_HEAP_REGION_GRAIN_BYTES("CodeInstaller::LOG_OF_HEAP_REGION_GRAIN_BYTES"), - INLINE_CONTIGUOUS_ALLOCATION_SUPPORTED("CodeInstaller::INLINE_CONTIGUOUS_ALLOCATION_SUPPORTED"); - - private final int value; - private static HashMap lookup = new HashMap<>(); - - static { - for (MarkId e : values()) { - lookup.put(e.value, e); - } - } - - MarkId(String name) { - this.value = (int) (long) HotSpotJVMCIRuntime.runtime().getConfigStore().getConstants().get(name); - } - - static MarkId getEnum(int value) { - MarkId e = lookup.get(value); - if (e == null) { - throw new InternalError("Unknown enum value: " + value); - } - return e; - } -} diff --git a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MarkProcessor.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MarkProcessor.java index 606cc709ddd..32b80b653f5 100644 --- a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MarkProcessor.java +++ b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MarkProcessor.java @@ -25,11 +25,13 @@ package jdk.tools.jaotc; +import org.graalvm.compiler.code.CompilationResult; +import org.graalvm.compiler.hotspot.HotSpotMarkId; + import jdk.tools.jaotc.binformat.BinaryContainer; import jdk.tools.jaotc.binformat.Relocation; import jdk.tools.jaotc.binformat.Relocation.RelocType; import jdk.tools.jaotc.binformat.Symbol; - import jdk.vm.ci.code.site.Mark; final class MarkProcessor { @@ -48,8 +50,8 @@ final class MarkProcessor { * @param mark mark being processed */ @SuppressWarnings("fallthrough") - void process(CompiledMethodInfo methodInfo, Mark mark) { - MarkId markId = MarkId.getEnum((int) mark.id); + void process(CompiledMethodInfo methodInfo, CompilationResult.CodeMark mark) { + HotSpotMarkId markId = (HotSpotMarkId) mark.id; switch (markId) { case EXCEPTION_HANDLER_ENTRY: case DEOPT_HANDLER_ENTRY: @@ -62,24 +64,19 @@ final class MarkProcessor { } // fallthrough case CARD_TABLE_ADDRESS: - case HEAP_TOP_ADDRESS: - case HEAP_END_ADDRESS: case NARROW_KLASS_BASE_ADDRESS: case NARROW_OOP_BASE_ADDRESS: case CRC_TABLE_ADDRESS: case LOG_OF_HEAP_REGION_GRAIN_BYTES: - case INLINE_CONTIGUOUS_ALLOCATION_SUPPORTED: String vmSymbolName; switch (markId) { + case POLL_FAR: + case POLL_RETURN_FAR: + vmSymbolName = BinaryContainer.getPollingPageSymbolName(); + break; case CARD_TABLE_ADDRESS: vmSymbolName = BinaryContainer.getCardTableAddressSymbolName(); break; - case HEAP_TOP_ADDRESS: - vmSymbolName = BinaryContainer.getHeapTopAddressSymbolName(); - break; - case HEAP_END_ADDRESS: - vmSymbolName = BinaryContainer.getHeapEndAddressSymbolName(); - break; case NARROW_KLASS_BASE_ADDRESS: vmSymbolName = BinaryContainer.getNarrowKlassBaseAddressSymbolName(); break; @@ -92,9 +89,6 @@ final class MarkProcessor { case LOG_OF_HEAP_REGION_GRAIN_BYTES: vmSymbolName = BinaryContainer.getLogOfHeapRegionGrainBytesSymbolName(); break; - case INLINE_CONTIGUOUS_ALLOCATION_SUPPORTED: - vmSymbolName = BinaryContainer.getInlineContiguousAllocationSupportedSymbolName(); - break; default: throw new InternalError("Unhandled mark: " + mark); } @@ -109,6 +103,7 @@ final class MarkProcessor { case VERIFIED_ENTRY: case UNVERIFIED_ENTRY: case OSR_ENTRY: + case FRAME_COMPLETE: case INVOKEINTERFACE: case INVOKEVIRTUAL: case INVOKESTATIC: diff --git a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MetadataBuilder.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MetadataBuilder.java index 562651b3f56..b68064e0947 100644 --- a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MetadataBuilder.java +++ b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MetadataBuilder.java @@ -236,7 +236,7 @@ final class MetadataBuilder { infopointProcessor.process(methodInfo, infoPoint); } - for (Mark mark : compilationResult.getMarks()) { + for (CompilationResult.CodeMark mark : compilationResult.getMarks()) { markProcessor.process(methodInfo, mark); } diff --git a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/EconomicMap.java b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/EconomicMap.java index 02af6d941c2..5fe2eb7bdcc 100644 --- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/EconomicMap.java +++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/EconomicMap.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, 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 @@ -45,7 +45,26 @@ import java.util.Map; import java.util.function.BiFunction; /** - * Memory efficient map data structure. + * Memory efficient map data structure that dynamically changes its representation depending on the + * number of entries and is specially optimized for small number of entries. It keeps elements in a + * linear list without any hashing when the number of entries is small. Should an actual hash data + * structure be necessary, it tries to fit the hash value into as few bytes as possible. In contrast + * to {@link java.util.HashMap}, it avoids allocating an extra node object per entry and rather + * keeps values always in a plain array. See {@link EconomicMapImpl} for implementation details and + * exact thresholds when its representation changes. + * + * It supports a {@code null} value, but it does not support adding or looking up a {@code null} + * key. Operations {@code get} and {@code put} provide constant-time performance on average if + * repeatedly performed. They can however trigger an operation growing or compressing the data + * structure, which is linear in the number of elements. Iteration is also linear in the number of + * elements. + * + * The implementation is not synchronized. If multiple threads want to access the data structure, it + * requires manual synchronization, for example using {@link java.util.Collections#synchronizedMap}. + * There is also no extra precaution to detect concurrent modification while iterating. + * + * Different strategies for the equality comparison can be configured by providing a + * {@link Equivalence} configuration object. * * @since 19.0 */ @@ -53,7 +72,8 @@ public interface EconomicMap extends UnmodifiableEconomicMap { /** * Associates {@code value} with {@code key} in this map. If the map previously contained a - * mapping for {@code key}, the old value is replaced by {@code value}. + * mapping for {@code key}, the old value is replaced by {@code value}. While the {@code value} + * may be {@code null}, the {@code key} must not be {code null}. * * @return the previous value associated with {@code key}, or {@code null} if there was no * mapping for {@code key}. @@ -94,7 +114,7 @@ public interface EconomicMap extends UnmodifiableEconomicMap { /** * Removes the mapping for {@code key} from this map if it is present. The map will not contain - * a mapping for {@code key} once the call returns. + * a mapping for {@code key} once the call returns. The {@code key} must not be {@code null}. * * @return the previous value associated with {@code key}, or {@code null} if there was no * mapping for {@code key}. diff --git a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/EconomicMapImpl.java b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/EconomicMapImpl.java index 59560a250a0..3250ab52597 100644 --- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/EconomicMapImpl.java +++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/EconomicMapImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, 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 @@ -41,7 +41,6 @@ package jdk.internal.vm.compiler.collections; import java.util.Iterator; -import java.util.Objects; import java.util.function.BiFunction; /** @@ -240,7 +239,7 @@ final class EconomicMapImpl implements EconomicMap, EconomicSet { @SuppressWarnings("unchecked") @Override public V get(K key) { - Objects.requireNonNull(key); + checkKeyNonNull(key); int index = find(key); if (index != -1) { @@ -420,9 +419,7 @@ final class EconomicMapImpl implements EconomicMap, EconomicSet { @SuppressWarnings("unchecked") @Override public V put(K key, V value) { - if (key == null) { - throw new UnsupportedOperationException("null not supported as key!"); - } + checkKeyNonNull(key); int index = find(key); if (index != -1) { Object oldValue = getValue(index); @@ -622,9 +619,7 @@ final class EconomicMapImpl implements EconomicMap, EconomicSet { @SuppressWarnings("unchecked") @Override public V removeKey(K key) { - if (key == null) { - throw new UnsupportedOperationException("null not supported as key!"); - } + checkKeyNonNull(key); int index; if (hasHashArray()) { index = this.findAndRemoveHash(key); @@ -640,6 +635,12 @@ final class EconomicMapImpl implements EconomicMap, EconomicSet { return null; } + private void checkKeyNonNull(K key) { + if (key == null) { + throw new UnsupportedOperationException("null not supported as key!"); + } + } + /** * Removes the element at the specific index and returns the index of the next element. This can * be a different value if graph compression was triggered. diff --git a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/UnmodifiableEconomicMap.java b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/UnmodifiableEconomicMap.java index 8a1851a337b..4d22ab60261 100644 --- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/UnmodifiableEconomicMap.java +++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/UnmodifiableEconomicMap.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, 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 @@ -41,7 +41,8 @@ package jdk.internal.vm.compiler.collections; /** - * Unmodifiable memory efficient map data structure. + * Unmodifiable memory efficient map. See {@link EconomicMap} for the underlying data structure and + * its properties. * * @since 19.0 */ @@ -49,7 +50,7 @@ public interface UnmodifiableEconomicMap { /** * Returns the value to which {@code key} is mapped, or {@code null} if this map contains no - * mapping for {@code key}. + * mapping for {@code key}. The {@code key} must not be {@code null}. * * @since 19.0 */ @@ -57,7 +58,7 @@ public interface UnmodifiableEconomicMap { /** * Returns the value to which {@code key} is mapped, or {@code defaultValue} if this map - * contains no mapping for {@code key}. + * contains no mapping for {@code key}. The {@code key} must not be {@code null}. * * @since 19.0 */ @@ -70,7 +71,8 @@ public interface UnmodifiableEconomicMap { } /** - * Returns {@code true} if this map contains a mapping for {@code key}. + * Returns {@code true} if this map contains a mapping for {@code key}. Returns always + * {@code false} if the {@code key} is {@code null}. * * @since 19.0 */ diff --git a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.libgraal/src/jdk/internal/vm/compiler/libgraal/LibGraal.java b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.libgraal/src/jdk/internal/vm/compiler/libgraal/LibGraal.java index 03cc1f93a04..33c8c67ee3c 100644 --- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.libgraal/src/jdk/internal/vm/compiler/libgraal/LibGraal.java +++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.libgraal/src/jdk/internal/vm/compiler/libgraal/LibGraal.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, 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 @@ -24,7 +24,8 @@ package jdk.internal.vm.compiler.libgraal; -import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; +import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime; + import jdk.vm.ci.hotspot.HotSpotSpeculationLog; import jdk.vm.ci.services.Services; @@ -33,8 +34,13 @@ import jdk.vm.ci.services.Services; */ public class LibGraal { + static { + // Initialize JVMCI to ensure JVMCI opens its packages to Graal. + Services.initializeJVMCI(); + } + public static boolean isAvailable() { - return inLibGraal() || isolate != 0L; + return inLibGraal() || theIsolate != 0L; } public static boolean isSupported() { @@ -45,67 +51,63 @@ public class LibGraal { return Services.IS_IN_NATIVE_IMAGE; } - public static void registerNativeMethods(HotSpotJVMCIRuntime runtime, Class clazz) { + public static void registerNativeMethods(Class clazz) { if (clazz.isPrimitive()) { throw new IllegalArgumentException(); } if (inLibGraal() || !isAvailable()) { throw new IllegalStateException(); } - runtime.registerNativeMethods(clazz); + runtime().registerNativeMethods(clazz); } - public static long translate(HotSpotJVMCIRuntime runtime, Object obj) { + public static long translate(Object obj) { if (!isAvailable()) { throw new IllegalStateException(); } if (!inLibGraal() && LibGraalScope.currentScope.get() == null) { throw new IllegalStateException("Not within a " + LibGraalScope.class.getName()); } - return runtime.translate(obj); + return runtime().translate(obj); } - public static T unhand(HotSpotJVMCIRuntime runtime, Class type, long handle) { + public static T unhand(Class type, long handle) { if (!isAvailable()) { throw new IllegalStateException(); } if (!inLibGraal() && LibGraalScope.currentScope.get() == null) { throw new IllegalStateException("Not within a " + LibGraalScope.class.getName()); } - return runtime.unhand(type, handle); + return runtime().unhand(type, handle); } private static long initializeLibgraal() { try { - // Initialize JVMCI to ensure JVMCI opens its packages to - // Graal otherwise the call to HotSpotJVMCIRuntime.runtime() - // below will fail on JDK13+. - Services.initializeJVMCI(); - - HotSpotJVMCIRuntime runtime = HotSpotJVMCIRuntime.runtime(); - long[] nativeInterface = runtime.registerNativeMethods(LibGraal.class); - return nativeInterface[1]; + long[] javaVMInfo = runtime().registerNativeMethods(LibGraalScope.class); + return javaVMInfo[1]; } catch (UnsupportedOperationException e) { return 0L; } } - static final long isolate = Services.IS_BUILDING_NATIVE_IMAGE ? 0L : initializeLibgraal(); + static final long theIsolate = Services.IS_BUILDING_NATIVE_IMAGE ? 0L : initializeLibgraal(); - static boolean isCurrentThreadAttached(HotSpotJVMCIRuntime runtime) { - return runtime.isCurrentThreadAttached(); + static boolean isCurrentThreadAttached() { + return runtime().isCurrentThreadAttached(); } - public static boolean attachCurrentThread(HotSpotJVMCIRuntime runtime, boolean isDaemon) { - return runtime.attachCurrentThread(isDaemon); + public static boolean attachCurrentThread(boolean isDaemon, long[] isolate) { + if (isolate != null) { + isolate[0] = LibGraal.theIsolate; + } + return runtime().attachCurrentThread(isDaemon); } - public static void detachCurrentThread(HotSpotJVMCIRuntime runtime) { - runtime.detachCurrentThread(); + public static boolean detachCurrentThread(boolean release) { + runtime().detachCurrentThread(); + return false; } - static native long getCurrentIsolateThread(long iso); - public static long getFailedSpeculationsAddress(HotSpotSpeculationLog log) { return log.getFailedSpeculationsAddress(); } diff --git a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.libgraal/src/jdk/internal/vm/compiler/libgraal/LibGraalIsolate.java b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.libgraal/src/jdk/internal/vm/compiler/libgraal/LibGraalIsolate.java new file mode 100644 index 00000000000..b313ba53f77 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.libgraal/src/jdk/internal/vm/compiler/libgraal/LibGraalIsolate.java @@ -0,0 +1,149 @@ +/* + * Copyright (c) 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package jdk.internal.vm.compiler.libgraal; + +import java.lang.ref.ReferenceQueue; +import java.lang.ref.WeakReference; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Supplier; + +/** + * Represents a single libgraal isolate. All {@link LibGraalObject}s have a {@link LibGraalIsolate} + * context. + */ +public final class LibGraalIsolate { + + final long address; + + private static final Map isolates = new HashMap<>(); + + static synchronized LibGraalIsolate forAddress(long isolateAddress) { + return isolates.computeIfAbsent(isolateAddress, a -> new LibGraalIsolate(a)); + } + + private LibGraalIsolate(long address) { + this.address = address; + } + + /** + * Gets the isolate associated with the current thread. The current thread must be in an + * {@linkplain LibGraalScope opened} scope. + * + * @throws IllegalStateException if the current thread is not attached to libgraal + */ + public static LibGraalIsolate current() { + return LibGraalScope.current().getIsolate(); + } + + /** + * Gets the value corresponding to {@code key} from a key-value store of singleton objects. If + * no value corresponding to {@code key} currently exists, then it is computed with + * {@code supplier} and inserted in the store. + * + * This is used to obtain objects whose lifetime is bound to the isolate represented by this + * object. + */ + @SuppressWarnings("unchecked") + public synchronized T getSingleton(Class key, Supplier supplier) { + // Cannot use HahsMap.computeIfAbsent as it will throw a ConcurrentModificationException + // if supplier recurses here to compute another singleton. + if (!singletons.containsKey(key)) { + singletons.put(key, supplier.get()); + } + return (T) singletons.get(key); + } + + private final Map, Object> singletons = new HashMap<>(); + + /** + * Strong references to the {@link WeakReference} objects. + */ + private final Set cleaners = Collections.newSetFromMap(new ConcurrentHashMap<>()); + + void register(LibGraalObject obj, long handle) { + cleanHandles(); + Cleaner cref = new Cleaner(cleanersQueue, obj, handle); + cleaners.add(cref); + } + + /** + * Processes {@link #cleanersQueue} to release any handles whose {@link LibGraalObject} objects + * are now unreachable. + */ + private void cleanHandles() { + Cleaner cleaner; + while ((cleaner = (Cleaner) cleanersQueue.poll()) != null) { + cleaners.remove(cleaner); + if (!cleaner.clean()) { + new Exception(String.format("Error releasing handle %d in isolate 0x%x", cleaner.handle, address)).printStackTrace(System.out); + } + } + } + + /** + * Queue into which a {@link Cleaner} is enqueued when its {@link LibGraalObject} referent + * becomes unreachable. + */ + private final ReferenceQueue cleanersQueue = new ReferenceQueue<>(); + + private static final class Cleaner extends WeakReference { + private final long handle; + + Cleaner(ReferenceQueue cleanersQueue, LibGraalObject referent, long handle) { + super(referent, cleanersQueue); + this.handle = handle; + } + + boolean clean() { + return LibGraalObject.releaseHandle(LibGraalScope.getIsolateThread(), handle); + } + } + + /** + * Notifies that the {@code JavaVM} associated with {@code isolate} has been destroyed. All + * subsequent accesses to objects in the isolate will throw an {@link IllegalArgumentException}. + */ + static synchronized void remove(LibGraalIsolate isolate) { + isolate.destroyed = true; + LibGraalIsolate removed = isolates.remove(isolate.address); + assert removed == isolate : "isolate already removed or overwritten: " + isolate; + } + + @Override + public String toString() { + return String.format("%s[0x%x]", getClass().getSimpleName(), address); + } + + private boolean destroyed; + + public boolean isValid() { + return !destroyed; + } + +} diff --git a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.libgraal/src/jdk/internal/vm/compiler/libgraal/LibGraalObject.java b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.libgraal/src/jdk/internal/vm/compiler/libgraal/LibGraalObject.java new file mode 100644 index 00000000000..2bdf5bf0a29 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.libgraal/src/jdk/internal/vm/compiler/libgraal/LibGraalObject.java @@ -0,0 +1,93 @@ +/* + * Copyright (c) 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package jdk.internal.vm.compiler.libgraal; + +/** + * Encapsulates a handle to an object in a libgraal isolate where the object's lifetime is bound to + * the lifetime of the {@link LibGraalObject} instance. At some point after a {@link LibGraalObject} + * is garbage collected, a call is made to release the handle, allowing the libgraal object to be + * collected. + */ +public class LibGraalObject { + + static { + if (LibGraal.isAvailable()) { + LibGraal.registerNativeMethods(LibGraalObject.class); + } + } + + /** + * Handle to an object in {@link #isolate}. + */ + private final long handle; + + /** + * The libgraal isolate containing {@link #handle}. + */ + private final LibGraalIsolate isolate; + + /** + * Creates a new {@link LibGraalObject}. + * + * @param handle handle to an object in a libgraal isolate + */ + protected LibGraalObject(long handle) { + this.handle = handle; + isolate = LibGraalScope.current().getIsolate(); + isolate.register(this, handle); + } + + /** + * Gets the raw JNI handle wrapped by this object. + * + * @throw {@link IllegalArgumentException} if the isolate context for the handle has destroyed. + */ + public long getHandle() { + if (!isolate.isValid()) { + throw new IllegalArgumentException(toString()); + } + return handle; + } + + /** + * Releases {@code handle} in the isolate denoted by {@code isolateThreadId}. + * + * @return {@code false} if {@code} is not a valid handle in the isolate + */ + // Implementation: + // com.oracle.svm.graal.hotspot.libgraal.LibGraalEntryPoints.releaseHandle + static native boolean releaseHandle(long isolateThreadId, long handle); + + @Override + public String toString() { + String name = getClass().getSimpleName(); + Class outer = getClass().getDeclaringClass(); + while (outer != null) { + name = outer.getSimpleName() + '.' + name; + outer = outer.getDeclaringClass(); + } + return String.format("%s[%d]", name, handle); + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.libgraal/src/jdk/internal/vm/compiler/libgraal/LibGraalScope.java b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.libgraal/src/jdk/internal/vm/compiler/libgraal/LibGraalScope.java index 00395429b68..4450815e3da 100644 --- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.libgraal/src/jdk/internal/vm/compiler/libgraal/LibGraalScope.java +++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.libgraal/src/jdk/internal/vm/compiler/libgraal/LibGraalScope.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, 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 @@ -24,37 +24,92 @@ package jdk.internal.vm.compiler.libgraal; -import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; +import java.lang.reflect.Method; +import java.util.Arrays; /** - * Scope for calling CEntryPoints in libgraal. {@linkplain #LibGraalScope(HotSpotJVMCIRuntime) - * Opening} a scope attaches the current thread to libgraal and {@linkplain #close() closing} it + * Scope for calling CEntryPoints in libgraal. {@linkplain #LibGraalScope() Opening} a scope ensures + * the current thread is attached to libgraal and {@linkplain #close() closing} the outer most scope * detaches the current thread. */ public final class LibGraalScope implements AutoCloseable { static final ThreadLocal currentScope = new ThreadLocal<>(); + /** + * Shared state between a thread's nested scopes. + */ + static class Shared { + final DetachAction detachAction; + final LibGraalIsolate isolate; + final long isolateThread; + + Shared(DetachAction detachAction, LibGraalIsolate isolate, long isolateThread) { + this.detachAction = detachAction; + this.isolate = isolate; + this.isolateThread = isolateThread; + } + } + private final LibGraalScope parent; - private final boolean topLevel; - private final HotSpotJVMCIRuntime runtime; - private final long isolateThread; + private final Shared shared; + + /** + * Gets the current scope. + * + * @throws IllegalStateException if the current thread is not in an {@linkplain #LibGraalScope() + * opened} scope + */ + public static LibGraalScope current() { + LibGraalScope scope = currentScope.get(); + if (scope == null) { + throw new IllegalStateException("Not in an " + LibGraalScope.class.getSimpleName()); + } + return scope; + } /** * Gets the isolate thread associated with the current thread. The current thread must be in an - * {@linkplain #LibGraalScope(HotSpotJVMCIRuntime) opened} scope. + * {@linkplain #LibGraalScope() opened} scope. * * @returns a value that can be used for the IsolateThreadContext argument of a {@code native} * method {@link LibGraal#registerNativeMethods linked} to a CEntryPoint function in * libgraal - * @throws IllegalStateException if not the current thread is not attached to libgraal + * @throws IllegalStateException if the current thread is not attached to libgraal */ public static long getIsolateThread() { - LibGraalScope scope = currentScope.get(); - if (scope == null) { - throw new IllegalStateException("Cannot get isolate thread outside of a " + LibGraalScope.class.getSimpleName()); - } - return scope.isolateThread; + return current().shared.isolateThread; + } + + /** + * Denotes the detach action to perform when closing a {@link LibGraalScope}. + */ + public enum DetachAction { + /** + * Detach the thread from its libgraal isolate. + */ + DETACH, + + /** + * Detach the thread from its libgraal isolate and the associated {@code JVMCIRuntime}. + */ + DETACH_RUNTIME, + + /** + * Detach the thread from its libgraal isolate and the associated {@code JVMCIRuntime}. If + * the VM supports releasing the {@code JavaVM} associated with {@code JVMCIRuntime}s and + * this is the last thread attached to its {@code JVMCIRuntime}, then the + * {@code JVMCIRuntime} destroys its {@code JavaVM} instance. + */ + DETACH_RUNTIME_AND_RELEASE + } + + /** + * Shortcut for calling {@link #LibGraalScope(DetachAction)} with an argument of + * {@link DetachAction#DETACH_RUNTIME}. + */ + public LibGraalScope() { + this(DetachAction.DETACH_RUNTIME); } /** @@ -69,28 +124,183 @@ public final class LibGraalScope implements AutoCloseable { * @throws IllegalStateException if libgraal is {@linkplain LibGraal#isAvailable() unavailable} * or {@link LibGraal#inLibGraal()} returns true */ - public LibGraalScope(HotSpotJVMCIRuntime runtime) { + public LibGraalScope(DetachAction detachAction) { if (LibGraal.inLibGraal() || !LibGraal.isAvailable()) { throw new IllegalStateException(); } - this.runtime = runtime; parent = currentScope.get(); - boolean top = false; if (parent == null) { - top = LibGraal.attachCurrentThread(runtime, false); - isolateThread = LibGraal.getCurrentIsolateThread(LibGraal.isolate); + long[] isolateBox = {0}; + boolean firstAttach = LibGraal.attachCurrentThread(false, isolateBox); + long isolateAddress = isolateBox[0]; + LibGraalIsolate isolate = LibGraalIsolate.forAddress(isolateAddress); + long isolateThread = getIsolateThreadIn(isolateAddress); + shared = new Shared(firstAttach ? detachAction : null, isolate, isolateThread); } else { - isolateThread = parent.isolateThread; + shared = parent.shared; } - topLevel = top; currentScope.set(this); } + /** + * Enters a scope for making calls into an existing libgraal isolate. If there is no existing + * libgraal scope for the current thread, the current thread is attached to libgraal. When the + * outer most scope is closed, the current thread is detached from libgraal. + * + * This must be used in a try-with-resources statement. + * + * This cannot be called from {@linkplain LibGraal#inLibGraal() within} libgraal. + * + * @throws IllegalStateException if libgraal is {@linkplain LibGraal#isAvailable() unavailable} + * or {@link LibGraal#inLibGraal()} returns true + */ + public LibGraalScope(long isolateAddress) { + if (LibGraal.inLibGraal() || !LibGraal.isAvailable()) { + throw new IllegalStateException(); + } + parent = currentScope.get(); + if (parent == null) { + long isolateThread = getIsolateThreadIn(isolateAddress); + boolean alreadyAttached; + if (isolateThread == 0L) { + alreadyAttached = false; + isolateThread = attachThreadTo(isolateAddress); + } else { + alreadyAttached = true; + } + LibGraalIsolate isolate = LibGraalIsolate.forAddress(isolateAddress); + shared = new Shared(alreadyAttached ? null : DetachAction.DETACH, isolate, isolateThread); + } else { + shared = parent.shared; + } + currentScope.set(this); + } + + /** + * Attaches the current thread to the isolate at {@code isolateAddress}. + * + * @return the address of the attached IsolateThread + */ + // Implementation: + // com.oracle.svm.graal.hotspot.libgraal.LibGraalEntryPoints.attachThreadTo + static native long attachThreadTo(long isolateAddress); + + /** + * Detaches the current thread from the isolate at {@code isolateAddress}. + */ + // Implementation: + // com.oracle.svm.graal.hotspot.libgraal.LibGraalEntryPoints.detachThreadFrom + static native void detachThreadFrom(long isolateThreadAddress); + + /** + * Gets the isolate thread for the current thread in the isolate at {@code isolateAddress}. + * + * @return 0L if the current thread is not attached to the isolate at {@code isolateAddress} + */ + // Implementation: + // com.oracle.svm.graal.hotspot.libgraal.LibGraalEntryPoints.getIsolateThreadIn + @SuppressWarnings("unused") + static native long getIsolateThreadIn(long isolateAddress); + + /** + * Gets the isolate associated with this scope. + */ + public LibGraalIsolate getIsolate() { + return shared.isolate; + } + + /** + * Gets the address of the isolate thread associated with this scope. + */ + public long getIsolateThreadAddress() { + return shared.isolateThread; + } + @Override public void close() { - if (topLevel) { - LibGraal.detachCurrentThread(runtime); + if (parent == null && shared.detachAction != null) { + if (shared.detachAction == DetachAction.DETACH) { + detachThreadFrom(shared.isolateThread); + } else { + boolean isolateDestroyed = LibGraal.detachCurrentThread(shared.detachAction == DetachAction.DETACH_RUNTIME_AND_RELEASE); + if (isolateDestroyed) { + LibGraalIsolate.remove(shared.isolate); + } + } } currentScope.set(parent); } + + // Shared support for the LibGraal overlays + + /** + * Convenience function for wrapping varargs into an array for use in calls to + * {@link #method(Class, String, Class[][])}. + */ + static Class[] sig(Class... types) { + return types; + } + + /** + * Gets the method in {@code declaringClass} with the unique name {@code name}. + * + * @param sigs the signatures the method may have + */ + static Method method(Class declaringClass, String name, Class[]... sigs) { + if (sigs.length == 1 || sigs.length == 0) { + try { + Class[] sig = sigs.length == 1 ? sigs[0] : new Class[0]; + return declaringClass.getDeclaredMethod(name, sig); + } catch (NoSuchMethodException | SecurityException e) { + throw (NoSuchMethodError) new NoSuchMethodError(name).initCause(e); + } + } + Method match = null; + for (Method m : declaringClass.getDeclaredMethods()) { + if (m.getName().equals(name)) { + if (match != null) { + throw new InternalError(String.format("Expected single method named %s, found %s and %s", + name, match, m)); + } + match = m; + } + } + if (match == null) { + throw new NoSuchMethodError("Cannot find method " + name + " in " + declaringClass.getName()); + } + Class[] parameterTypes = match.getParameterTypes(); + for (Class[] sig : sigs) { + if (Arrays.equals(parameterTypes, sig)) { + return match; + } + } + throw new NoSuchMethodError(String.format("Unexpected signature for %s: %s", name, Arrays.toString(parameterTypes))); + } + + /** + * Gets the method in {@code declaringClass} with the unique name {@code name} or {@code null} + * if not found. + * + * @param sigs the signatures the method may have + */ + static Method methodOrNull(Class declaringClass, String name, Class[]... sigs) { + try { + return method(declaringClass, name, sigs); + } catch (NoSuchMethodError e) { + return null; + } + } + + /** + * Gets the method in {@code declaringClass} with the unique name {@code name} or {@code null} + * if {@code guard == null}. + * + * @param sigs the signatures the method may have + */ + static Method methodIf(Object guard, Class declaringClass, String name, Class[]... sigs) { + if (guard == null) { + return null; + } + return method(declaringClass, name, sigs); + } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64.test/src/org/graalvm/compiler/asm/aarch64/test/TestProtectedAssembler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64.test/src/org/graalvm/compiler/asm/aarch64/test/TestProtectedAssembler.java index 9b5ea0dfdf1..bbab79683ab 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64.test/src/org/graalvm/compiler/asm/aarch64/test/TestProtectedAssembler.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64.test/src/org/graalvm/compiler/asm/aarch64/test/TestProtectedAssembler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -132,16 +132,6 @@ class TestProtectedAssembler extends AArch64Assembler { super.stxr(size, rs, rt, rn); } - @Override - protected void ldar(int size, Register rt, Register rn) { - super.ldar(size, rt, rn); - } - - @Override - protected void stlr(int size, Register rt, Register rn) { - super.stlr(size, rt, rn); - } - @Override public void ldaxr(int size, Register rt, Register rn) { super.ldaxr(size, rt, rn); @@ -258,7 +248,7 @@ class TestProtectedAssembler extends AArch64Assembler { } @Override - protected void sub(int size, Register dst, Register src1, Register src2, ExtendType extendType, int shiftAmt) { + public void sub(int size, Register dst, Register src1, Register src2, ExtendType extendType, int shiftAmt) { super.sub(size, dst, src1, src2, extendType, shiftAmt); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java index fc85ea90a48..db9a289e5ee 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java @@ -56,6 +56,7 @@ import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.CSIN import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.CSNEG; import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.DC; import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.DMB; +import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.DSB; import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.EON; import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.EOR; import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.EXTR; @@ -673,6 +674,7 @@ public abstract class AArch64Assembler extends Assembler { CLREX(0xd5033f5f), HINT(0xD503201F), DMB(0x000000A0), + DSB(0x00000080), MRS(0xD5300000), MSR(0xD5100000), @@ -1402,7 +1404,7 @@ public abstract class AArch64Assembler extends Assembler { * @param rt general purpose register. May not be null or stackpointer. * @param rn general purpose register. */ - protected void ldar(int size, Register rt, Register rn) { + public void ldar(int size, Register rt, Register rn) { assert size == 8 || size == 16 || size == 32 || size == 64; int transferSize = NumUtil.log2Ceil(size / 8); exclusiveLoadInstruction(LDAR, rt, rn, transferSize); @@ -1415,7 +1417,7 @@ public abstract class AArch64Assembler extends Assembler { * @param rt general purpose register. May not be null or stackpointer. * @param rn general purpose register. */ - protected void stlr(int size, Register rt, Register rn) { + public void stlr(int size, Register rt, Register rn) { assert size == 8 || size == 16 || size == 32 || size == 64; int transferSize = NumUtil.log2Ceil(size / 8); // Hack: Passing the zero-register means it is ignored when building the encoding. @@ -1471,7 +1473,7 @@ public abstract class AArch64Assembler extends Assembler { */ private void exclusiveStoreInstruction(Instruction instr, Register rs, Register rt, Register rn, int log2TransferSize) { assert log2TransferSize >= 0 && log2TransferSize < 4; - assert rt.getRegisterCategory().equals(CPU) && rs.getRegisterCategory().equals(CPU) && !rs.equals(rt); + assert rt.getRegisterCategory().equals(CPU) && rs.getRegisterCategory().equals(CPU) && (instr == STLR || !rs.equals(rt)); int transferSizeEncoding = log2TransferSize << LoadStoreTransferSizeOffset; emitInt(transferSizeEncoding | instr.encoding | rs2(rs) | rn(rn) | rt(rt)); } @@ -1992,7 +1994,7 @@ public abstract class AArch64Assembler extends Assembler { * @param extendType defines how src2 is extended to the same size as src1. * @param shiftAmt must be in range 0 to 4. */ - protected void sub(int size, Register dst, Register src1, Register src2, ExtendType extendType, int shiftAmt) { + public void sub(int size, Register dst, Register src1, Register src2, ExtendType extendType, int shiftAmt) { assert !dst.equals(zr); assert !src1.equals(zr); assert !src2.equals(sp); @@ -3012,6 +3014,15 @@ public abstract class AArch64Assembler extends Assembler { emitInt(DMB.encoding | BarrierOp | barrierKind.encoding << BarrierKindOffset); } + /** + * Data Synchronization Barrier. + * + * @param barrierKind barrier that is issued. May not be null. + */ + public void dsb(BarrierKind barrierKind) { + emitInt(DSB.encoding | BarrierOp | barrierKind.encoding << BarrierKindOffset); + } + /** * Instruction Synchronization Barrier. */ diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java index 743fc0647c6..564d9a17718 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java @@ -2138,6 +2138,14 @@ public class AArch64MacroAssembler extends AArch64Assembler { super.hint(SystemHint.CSDB); } + /** + * Ensures current execution state is committed before continuing. + */ + public void fullSystemBarrier() { + super.dsb(BarrierKind.SYSTEM); + super.isb(); + } + /** * Same as {@link #nop()}. */ diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java index 1813e003a46..ec13c045a67 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java @@ -107,7 +107,8 @@ public class AMD64Assembler extends AMD64BaseAssembler { public static class Options { // @formatter:off @Option(help = "Force branch instructions to align with 32-bytes boundary, to mitigate the jcc erratum. " + - "See https://www.intel.com/content/dam/support/us/en/documents/processors/mitigations-jump-conditional-code-erratum.pdf for more details.", type = OptionType.User) + "See https://www.intel.com/content/dam/support/us/en/documents/processors/mitigations-jump-conditional-code-erratum.pdf for more details. " + + "If not set explicitly, the default value will be determined according to the CPU model.", type = OptionType.User) public static final OptionKey UseBranchesWithin32ByteBoundary = new OptionKey<>(false); // @formatter:on } @@ -120,19 +121,28 @@ public class AMD64Assembler extends AMD64BaseAssembler { protected CodePatchShifter codePatchShifter = null; + /** + * Constructs an assembler for the AMD64 architecture. + */ public AMD64Assembler(TargetDescription target) { super(target); useBranchesWithin32ByteBoundary = false; } - /** - * Constructs an assembler for the AMD64 architecture. - */ public AMD64Assembler(TargetDescription target, OptionValues optionValues) { super(target); useBranchesWithin32ByteBoundary = Options.UseBranchesWithin32ByteBoundary.getValue(optionValues); } + public AMD64Assembler(TargetDescription target, OptionValues optionValues, boolean hasIntelJccErratum) { + super(target); + if (Options.UseBranchesWithin32ByteBoundary.hasBeenSet(optionValues)) { + useBranchesWithin32ByteBoundary = Options.UseBranchesWithin32ByteBoundary.getValue(optionValues); + } else { + useBranchesWithin32ByteBoundary = hasIntelJccErratum; + } + } + public void setCodePatchShifter(CodePatchShifter codePatchShifter) { assert this.codePatchShifter == null : "overwriting existing value"; this.codePatchShifter = codePatchShifter; @@ -2269,6 +2279,12 @@ public class AMD64Assembler extends AMD64BaseAssembler { emitModRM(dst, src); } + public final void movb(Register dst, AMD64Address src) { + prefixb(src, dst); + emitByte(0x8A); + emitOperandHelper(dst, src, 0); + } + public final void movb(AMD64Address dst, int imm8) { prefix(dst); emitByte(0xC6); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64MacroAssembler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64MacroAssembler.java index ba00152725e..92e5438254d 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64MacroAssembler.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64MacroAssembler.java @@ -63,6 +63,14 @@ public class AMD64MacroAssembler extends AMD64Assembler { super(target, optionValues); } + public AMD64MacroAssembler(TargetDescription target, OptionValues optionValues, boolean hasIntelJccErratum) { + super(target, optionValues, hasIntelJccErratum); + } + + public final void decrementq(Register reg) { + decrementq(reg, 1); + } + public final void decrementq(Register reg, int value) { if (value == Integer.MIN_VALUE) { subq(reg, value); @@ -101,6 +109,10 @@ public class AMD64MacroAssembler extends AMD64Assembler { } } + public final void incrementq(Register reg) { + incrementq(reg, 1); + } + public void incrementq(Register reg, int value) { if (value == Integer.MIN_VALUE) { addq(reg, value); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm/src/org/graalvm/compiler/asm/AsmOptions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm/src/org/graalvm/compiler/asm/AsmOptions.java index 93be335c38a..a9522058ecf 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm/src/org/graalvm/compiler/asm/AsmOptions.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm/src/org/graalvm/compiler/asm/AsmOptions.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -26,5 +26,5 @@ package org.graalvm.compiler.asm; public class AsmOptions { - public static int InitialCodeBufferSize = 232; + public static final int InitialCodeBufferSize = 232; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/CompilationResult.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/CompilationResult.java index b909702eccf..49659ddb298 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/CompilationResult.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/CompilationResult.java @@ -36,7 +36,9 @@ import java.util.List; import java.util.Objects; import java.util.function.Function; +import jdk.internal.vm.compiler.collections.EconomicMap; import jdk.internal.vm.compiler.collections.EconomicSet; +import jdk.internal.vm.compiler.collections.Equivalence; import org.graalvm.compiler.core.common.CompilationIdentifier; import org.graalvm.compiler.graph.NodeSourcePosition; @@ -194,7 +196,7 @@ public class CompilationResult { private final List sourceMapping = new ArrayList<>(); private final List dataPatches = new ArrayList<>(); private final List exceptionHandlers = new ArrayList<>(); - private final List marks = new ArrayList<>(); + private final List marks = new ArrayList<>(); private int totalFrameSize = -1; private int maxInterpreterFrameSize = -1; @@ -523,11 +525,13 @@ public class CompilationResult { * @param target the being called * @param debugInfo the debug info for the call * @param direct specifies if this is a {@linkplain Call#direct direct} call + * @return created call object */ - public void recordCall(int codePos, int size, InvokeTarget target, DebugInfo debugInfo, boolean direct) { + public Call recordCall(int codePos, int size, InvokeTarget target, DebugInfo debugInfo, boolean direct) { checkOpen(); final Call call = new Call(target, codePos, size, direct, debugInfo); addInfopoint(call); + return call; } /** @@ -603,9 +607,9 @@ public class CompilationResult { * @param codePos the position in the code that is covered by the handler * @param markId the identifier for this mark */ - public Mark recordMark(int codePos, Object markId) { + public CodeMark recordMark(int codePos, MarkId markId) { checkOpen(); - Mark mark = new Mark(codePos, markId); + CodeMark mark = new CodeMark(codePos, markId); marks.add(mark); return mark; } @@ -692,9 +696,78 @@ public class CompilationResult { } /** - * @return the list of marks + * An identified mark in the generated code. */ - public List getMarks() { + public interface MarkId { + + /** + * A human readable name for this mark. + */ + String getName(); + + /** + * Return the object which should be used in the {@link Mark}. On some platforms that may be + * different than this object. + */ + default Object getId() { + return this; + } + + /** + * Indicates whether the mark is intended to identify the end of the last instruction or the + * beginning of the next instruction. This information is necessary if the backend needs to + * insert instructions after the normal assembly step. + */ + boolean isMarkAfter(); + } + + /** + * An alternative to the existing {@link Mark} which isn't very flexible since it's final. This + * enforces some API for the mark object and can be converted into the standard mark for code + * installation if necessary. + */ + public static class CodeMark extends Site { + + /** + * An object denoting extra semantic information about the machine code position of this + * mark. + */ + public final MarkId id; + + /** + * Creates a mark that associates {@code id} with the machine code position + * {@code pcOffset}. + */ + public CodeMark(int pcOffset, MarkId id) { + super(pcOffset); + this.id = id; + assert id != null : this; + } + + @Override + public String toString() { + return id + "@" + pcOffset; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj instanceof CodeMark) { + CodeMark that = (CodeMark) obj; + if (this.pcOffset == that.pcOffset && Objects.equals(this.id, that.id)) { + return true; + } + } + return false; + } + } + + /** + * @return the list of {@link CodeMark code marks}. + */ + public List getMarks() { if (marks.isEmpty()) { return emptyList(); } @@ -750,6 +823,7 @@ public class CompilationResult { if (annotations != null) { annotations.clear(); } + callToMark.clear(); } public void clearInfopoints() { @@ -788,7 +862,7 @@ public class CompilationResult { }); iterateAndReplace(dataPatches, pos, site -> new DataPatch(site.pcOffset + bytesToShift, site.reference, site.note)); iterateAndReplace(exceptionHandlers, pos, site -> new ExceptionHandler(site.pcOffset + bytesToShift, site.handlerPos)); - iterateAndReplace(marks, pos, site -> new Mark(site.pcOffset + bytesToShift, site.id)); + iterateAndReplace(marks, pos, site -> new CodeMark(site.pcOffset + bytesToShift, site.id)); if (annotations != null) { for (CodeAnnotation annotation : annotations) { int annotationPos = annotation.position; @@ -802,9 +876,29 @@ public class CompilationResult { private static void iterateAndReplace(List sites, int pos, Function replacement) { for (int i = 0; i < sites.size(); i++) { T site = sites.get(i); + if (pos == site.pcOffset && site instanceof CodeMark) { + CodeMark mark = (CodeMark) site; + if (mark.id.isMarkAfter()) { + // The insert point is exactly on the mark but the mark is annotating the end of + // the last instruction, so leave it alone. + continue; + } + } if (pos <= site.pcOffset) { sites.set(i, replacement.apply(site)); } } } + + private final EconomicMap callToMark = EconomicMap.create(Equivalence.IDENTITY_WITH_SYSTEM_HASHCODE); + + public void recordCallContext(CodeMark mark, Call call) { + if (call != null) { + callToMark.put(call, mark); + } + } + + public CodeMark getAssociatedMark(Call call) { + return callToMark.get(call); + } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/HexCodeFileDisassemblerProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/HexCodeFileDisassemblerProvider.java index 4a5d7ea7a51..c02762dd75d 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/HexCodeFileDisassemblerProvider.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/HexCodeFileDisassemblerProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -28,6 +28,8 @@ import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.util.Arrays; +import org.graalvm.compiler.serviceprovider.ServiceProvider; + import jdk.vm.ci.code.CodeCacheProvider; import jdk.vm.ci.code.CodeUtil; import jdk.vm.ci.code.CodeUtil.DefaultRefMapFormatter; @@ -40,9 +42,6 @@ import jdk.vm.ci.code.site.Call; import jdk.vm.ci.code.site.DataPatch; import jdk.vm.ci.code.site.ExceptionHandler; import jdk.vm.ci.code.site.Infopoint; -import jdk.vm.ci.code.site.Mark; - -import org.graalvm.compiler.serviceprovider.ServiceProvider; /** * {@link HexCodeFile} based implementation of {@link DisassemblerProvider}. @@ -99,8 +98,8 @@ public class HexCodeFileDisassemblerProvider implements DisassemblerProvider { for (DataPatch site : compResult.getDataPatches()) { hcf.addOperandComment(site.pcOffset, "{" + site.reference.toString() + "}"); } - for (Mark mark : compResult.getMarks()) { - hcf.addComment(mark.pcOffset, codeCache.getMarkName(mark)); + for (CompilationResult.CodeMark mark : compResult.getMarks()) { + hcf.addComment(mark.pcOffset, mark.id.getName()); } } String hcfEmbeddedString = hcf.toEmbeddedString(); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64ArrayAddressTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64ArrayAddressTest.java index 918524b8049..71be63d9a6e 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64ArrayAddressTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64ArrayAddressTest.java @@ -1,6 +1,6 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2019, Arm Limited. All rights reserved. + * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, Arm Limited. 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 @@ -27,7 +27,7 @@ package org.graalvm.compiler.core.aarch64.test; import org.graalvm.compiler.api.directives.GraalDirectives; import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.aarch64.AArch64ArithmeticOp.ExtendedAddShiftOp; +import org.graalvm.compiler.lir.aarch64.AArch64ArithmeticOp.ExtendedAddSubShiftOp; import org.junit.Test; import java.util.ArrayDeque; @@ -36,7 +36,7 @@ import java.util.Set; import java.util.function.Predicate; public class AArch64ArrayAddressTest extends AArch64MatchRuleTest { - private static final Predicate predicate = op -> (op instanceof ExtendedAddShiftOp); + private static final Predicate predicate = op -> (op instanceof ExtendedAddSubShiftOp); public static byte loadByte(byte[] arr, int n) { return arr[n]; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MergeExtendWithAddSubTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MergeExtendWithAddSubTest.java new file mode 100644 index 00000000000..88ad4d2653e --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MergeExtendWithAddSubTest.java @@ -0,0 +1,238 @@ +/* + * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, Arm Limited. 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.core.aarch64.test; + +import org.graalvm.compiler.lir.LIRInstruction; +import org.graalvm.compiler.lir.aarch64.AArch64ArithmeticOp; +import org.junit.Test; + +import java.util.function.Predicate; + +public class AArch64MergeExtendWithAddSubTest extends AArch64MatchRuleTest { + + private static final Predicate PRED_EXTEND_ADD_SHIFT = op -> (op instanceof AArch64ArithmeticOp.ExtendedAddSubShiftOp && op.name().equals("ADD")); + private static final Predicate PRED_EXTEND_SUB_SHIFT = op -> (op instanceof AArch64ArithmeticOp.ExtendedAddSubShiftOp && op.name().equals("SUB")); + + private static final Long[] LONG_VALUES = {-1L, 0L, 0x1234567812345678L, 0xFFFFFFFFL, 0x12L, 0x1234L, Long.MIN_VALUE, Long.MAX_VALUE}; + private static final Integer[] INT_VALUES = {-1, 0, 0x1234, 0x12345678, Integer.MIN_VALUE, Integer.MAX_VALUE}; + + private void predicateExist(String[] testCases, T[] values, Predicate predicate) { + for (String t : testCases) { + for (T value : values) { + test(t, value, value); + checkLIR(t, predicate, 1); + } + } + } + + public long addI2LShift(long x, long y) { + int z = (int) y; + return x + (((long) z) << 3); + } + + public long addB2LShift(long x, long y) { + byte z = (byte) y; + return x + (((long) z) << 2); + } + + public long addC2LShift(long x, long y) { + char z = (char) y; + return x + (((long) z) << 1); + } + + public long addS2LShift(long x, long y) { + short z = (short) y; + return x + (((long) z) << 4); + } + + public long subI2LShift(long x, long y) { + int z = (int) y; + return x - (((long) z) << 1); + } + + public long subB2LShift(long x, long y) { + byte z = (byte) y; + return x - (((long) z) << 2); + } + + public long subC2LShift(long x, long y) { + char z = (char) y; + return x - (((long) z) << 3); + } + + public long subS2LShift(long x, long y) { + short z = (short) y; + return x - (((long) z) << 4); + } + + public long addI2L(long x, long y) { + int z = (int) y; + return x + z; + } + + public long addB2L(long x, long y) { + byte z = (byte) y; + return x + z; + } + + public long addC2L(long x, long y) { + char z = (char) y; + return x + z; + } + + public long addS2L(long x, long y) { + short z = (short) y; + return x + z; + } + + public int addB2S(int x, int y) { + short a = (short) x; + byte b = (byte) y; + return a + b; + } + + public int addB2SShift(int x, int y) { + short a = (short) x; + byte b = (byte) y; + return a + (b << 2); + } + + public int addB2I(int x, int y) { + byte z = (byte) y; + return x + z; + } + + public int addB2IShift(int x, int y) { + byte z = (byte) y; + return x + (z << 3); + } + + public int addS2I(int x, int y) { + short z = (short) y; + return x + z; + } + + public int addS2IShift(int x, int y) { + short z = (short) y; + return x + (z << 2); + } + + public int addC2I(int x, int y) { + char z = (char) y; + return x + z; + } + + public int addC2IShift(int x, int y) { + char z = (char) y; + return x + (z << 1); + } + + @Test + public void mergeSignExtendIntoAdd() { + predicateExist(new String[]{"addB2S", "addB2I", "addS2I", "addC2I"}, INT_VALUES, PRED_EXTEND_ADD_SHIFT); + predicateExist(new String[]{"addB2L", "addC2L", "addI2L", "addS2L"}, LONG_VALUES, PRED_EXTEND_ADD_SHIFT); + } + + @Test + public void mergeSignExtendShiftIntoAdd() { + predicateExist(new String[]{"addB2SShift", "addB2IShift", "addS2IShift", "addC2IShift"}, INT_VALUES, PRED_EXTEND_ADD_SHIFT); + predicateExist(new String[]{"addB2LShift", "addC2LShift", "addI2LShift", "addS2LShift"}, LONG_VALUES, PRED_EXTEND_ADD_SHIFT); + } + + public long subI2L(long x, long y) { + int z = (int) y; + return x - z; + } + + public long subB2L(long x, long y) { + byte z = (byte) y; + return x - z; + } + + public long subC2L(long x, long y) { + char z = (char) y; + return x - z; + } + + public long subS2L(long x, long y) { + short z = (short) y; + return x - z; + } + + public int subB2S(int x, int y) { + short a = (short) x; + byte b = (byte) y; + return a - b; + } + + public int subB2SShift(int x, int y) { + short a = (short) x; + byte b = (byte) y; + return a - (b << 2); + } + + public int subB2I(int x, int y) { + byte z = (byte) y; + return x - z; + } + + public int subB2IShift(int x, int y) { + byte z = (byte) y; + return x - (z << 3); + } + + public int subS2I(int x, int y) { + short z = (short) y; + return x - z; + } + + public int subS2IShift(int x, int y) { + short z = (short) y; + return x - (z << 2); + } + + public int subC2I(int x, int y) { + char z = (char) y; + return x - z; + } + + public int subC2IShift(int x, int y) { + char z = (char) y; + return x - (z << 1); + } + + @Test + public void mergeSignExtendShiftIntoSub() { + predicateExist(new String[]{"subB2SShift", "subB2IShift", "subS2IShift", "subC2IShift"}, INT_VALUES, PRED_EXTEND_SUB_SHIFT); + predicateExist(new String[]{"subB2LShift", "subC2LShift", "subI2LShift", "subS2LShift"}, LONG_VALUES, PRED_EXTEND_SUB_SHIFT); + } + + @Test + public void mergeSignExtendIntoSub() { + predicateExist(new String[]{"subB2S", "subB2I", "subS2I", "subC2I"}, INT_VALUES, PRED_EXTEND_SUB_SHIFT); + predicateExist(new String[]{"subB2L", "subC2L", "subI2L", "subS2L"}, LONG_VALUES, PRED_EXTEND_SUB_SHIFT); + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MergeNarrowWithAddSubTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MergeNarrowWithAddSubTest.java new file mode 100644 index 00000000000..5431d56e48a --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MergeNarrowWithAddSubTest.java @@ -0,0 +1,314 @@ +/* + * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, Arm Limited. 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.core.aarch64.test; + +import org.graalvm.compiler.lir.LIRInstruction; +import org.graalvm.compiler.lir.aarch64.AArch64ArithmeticOp; +import org.junit.Test; + +import java.util.function.Predicate; + +public class AArch64MergeNarrowWithAddSubTest extends AArch64MatchRuleTest { + + private static final Predicate PRED_EXTEND_ADD_SHIFT = op -> (op instanceof AArch64ArithmeticOp.ExtendedAddSubShiftOp && op.name().equals("ADD")); + private static final Predicate PRED_EXTEND_SUB_SHIFT = op -> (op instanceof AArch64ArithmeticOp.ExtendedAddSubShiftOp && op.name().equals("SUB")); + + private static final Long[] LONG_VALUES = {-1L, 0L, 0x1234567812345678L, 0xFFFFFFFFL, 0x12L, 0x1234L, Long.MIN_VALUE, Long.MAX_VALUE}; + private static final Integer[] INT_VALUES = {-1, 0, 0x1234, 0x12345678, Integer.MIN_VALUE, Integer.MAX_VALUE}; + + private void predicateExist(String[] testCases, T[] values, Predicate predicate) { + for (String t : testCases) { + for (T value : values) { + test(t, value, value); + checkLIR(t, predicate, 1); + } + } + } + + public int addIB(int x, int y) { + return x + (y & 0xff); + } + + public int addIH(int x, int y) { + return x + (y & 0xffff); + } + + public long addLB(long x, long y) { + return x + (y & 0xff); + } + + public long addLH(long x, long y) { + return x + (y & 0xffff); + } + + public long addLW(long x, long y) { + return x + (y & 0xffffffffL); + } + + @Test + public void mergeDowncastIntoAdd() { + predicateExist(new String[]{"addIB", "addIH"}, INT_VALUES, PRED_EXTEND_ADD_SHIFT); + predicateExist(new String[]{"addLB", "addLH", "addLW"}, LONG_VALUES, PRED_EXTEND_ADD_SHIFT); + } + + public int subIB(int x, int y) { + return x - (y & 0xff); + } + + public int subIH(int x, int y) { + return x - (y & 0xffff); + } + + public long subLB(long x, long y) { + return x - (y & 0xff); + } + + public long subLH(long x, long y) { + return x - (y & 0xffff); + } + + public long subLW(long x, long y) { + return x - (y & 0xffffffffL); + } + + @Test + public void mergeDowncastIntoSub() { + predicateExist(new String[]{"subIB", "subIH"}, INT_VALUES, PRED_EXTEND_SUB_SHIFT); + predicateExist(new String[]{"subLB", "subLH", "subLW"}, LONG_VALUES, PRED_EXTEND_SUB_SHIFT); + } + + public int addIBShift(int x, int y) { + return x + ((y & 0xff) << 3); + } + + public int addIHShift(int x, int y) { + return x + ((y & 0xffff) << 3); + } + + public long addLBShift(long x, long y) { + return x + ((y & 0xffL) << 3); + } + + public long addLHShift(long x, long y) { + return x + ((y & 0xffffL) << 3); + } + + public long addLWShift(long x, long y) { + return x + ((y & 0xffffffffL) << 3); + } + + @Test + public void mergeShiftDowncastIntoAdd() { + predicateExist(new String[]{"addIBShift", "addIHShift"}, INT_VALUES, PRED_EXTEND_ADD_SHIFT); + predicateExist(new String[]{"addLBShift", "addLHShift", "addLWShift"}, LONG_VALUES, PRED_EXTEND_ADD_SHIFT); + } + + public int subIBShift(int x, int y) { + return x - ((y & 0xff) << 3); + } + + public int subIHShift(int x, int y) { + return x - ((y & 0xffff) << 3); + } + + public long subLBShift(long x, long y) { + return x - ((y & 0xffL) << 3); + } + + public long subLHShift(long x, long y) { + return x - ((y & 0xffffL) << 3); + } + + public long subLWShift(long x, long y) { + return x - ((y & 0xffffffffL) << 3); + } + + @Test + public void mergeShiftDowncastIntoSub() { + predicateExist(new String[]{"subIBShift", "subIHShift"}, INT_VALUES, PRED_EXTEND_SUB_SHIFT); + predicateExist(new String[]{"subLBShift", "subLHShift", "subLWShift"}, LONG_VALUES, PRED_EXTEND_SUB_SHIFT); + } + + public int addIntExtractShort(int x, int y) { + return x + ((y << 16) >> 16); + } + + public int addIntExtractByte(int x, int y) { + return x + ((y << 24) >> 24); + } + + public long addLongExtractInt(long x, long y) { + return x + ((y << 32) >> 32); + } + + public long addLongExtractShort(long x, long y) { + return x + ((y << 48) >> 48); + } + + public long addLongExtractByte(long x, long y) { + return x + ((y << 56) >> 56); + } + + @Test + public void addSignExtractTest() { + predicateExist(new String[]{"addIntExtractShort", "addIntExtractByte"}, INT_VALUES, PRED_EXTEND_ADD_SHIFT); + predicateExist(new String[]{"addLongExtractInt", "addLongExtractShort", "addLongExtractByte"}, LONG_VALUES, PRED_EXTEND_ADD_SHIFT); + } + + public int addIntExtractShortByShift(int x, int y) { + return x + (((y << 16) >> 16) << 3); + } + + public int addIntExtractByteByShift(int x, int y) { + return x + (((y << 24) >> 24) << 3); + } + + public long addLongExtractIntByShift(long x, long y) { + return x + (((y << 32) >> 32) << 3); + } + + public long addLongExtractShortByShift(long x, long y) { + return x + (((y << 48) >> 48) << 3); + } + + public long addLongExtractByteByShift(long x, long y) { + return x + (((y << 56) >> 56) << 3); + } + + @Test + public void addExtractByShiftTest() { + predicateExist(new String[]{"addIntExtractShortByShift", "addIntExtractByteByShift"}, INT_VALUES, PRED_EXTEND_ADD_SHIFT); + predicateExist(new String[]{"addLongExtractIntByShift", "addLongExtractShortByShift", "addLongExtractByteByShift"}, LONG_VALUES, PRED_EXTEND_ADD_SHIFT); + } + + public int addIntUnsignedExtractByte(int x, int y) { + return x + ((y << 24) >>> 24); + } + + public long addLongUnsignedExtractByte(long x, long y) { + return x + ((y << 56) >>> 56); + } + + @Test + public void addUnsignedExtractTest() { + predicateExist(new String[]{"addIntUnsignedExtractByte"}, INT_VALUES, PRED_EXTEND_ADD_SHIFT); + predicateExist(new String[]{"addLongUnsignedExtractByte"}, LONG_VALUES, PRED_EXTEND_ADD_SHIFT); + } + + public int addIntUnsignedExtractByteByShift(int x, int y) { + return x + (((y << 24) >>> 24) << 2); + } + + public long addLongUnsignedExtractByteByShift(long x, long y) { + return x + (((y << 56) >>> 56) << 1); + } + + @Test + public void addUnsignedExtractByShiftTest() { + predicateExist(new String[]{"addIntUnsignedExtractByteByShift"}, INT_VALUES, PRED_EXTEND_ADD_SHIFT); + predicateExist(new String[]{"addLongUnsignedExtractByteByShift"}, LONG_VALUES, PRED_EXTEND_ADD_SHIFT); + } + + public int subIntExtractShort(int x, int y) { + return x - ((y << 16) >> 16); + } + + public int subIntExtractByte(int x, int y) { + return x - ((y << 24) >> 24); + } + + public long subLongExtractInt(long x, long y) { + return x - ((y << 32) >> 32); + } + + public long subLongExtractShort(long x, long y) { + return x - ((y << 48) >> 48); + } + + public long subLongExtractByte(long x, long y) { + return x - ((y << 56) >> 56); + } + + @Test + public void subExtractTest() { + predicateExist(new String[]{"subIntExtractShort", "subIntExtractByte"}, INT_VALUES, PRED_EXTEND_SUB_SHIFT); + predicateExist(new String[]{"subLongExtractInt", "subLongExtractShort", "subLongExtractByte"}, LONG_VALUES, PRED_EXTEND_SUB_SHIFT); + } + + public int subIntExtractShortByShift(int x, int y) { + return x - (((y << 16) >> 16) << 3); + } + + public int subIntExtractByteByShift(int x, int y) { + return x - (((y << 24) >> 24) << 3); + } + + public long subLongExtractIntByShift(long x, long y) { + return x - (((y << 32) >> 32) << 3); + } + + public long subLongExtractShortByShift(long x, long y) { + return x - (((y << 48) >> 48) << 3); + } + + public long subLongExtractByteByShift(long x, long y) { + return x - (((y << 56) >> 56) << 3); + } + + @Test + public void subExtractByShiftTest() { + predicateExist(new String[]{"subIntExtractShortByShift", "subIntExtractByteByShift"}, INT_VALUES, PRED_EXTEND_SUB_SHIFT); + predicateExist(new String[]{"subLongExtractIntByShift", "subLongExtractShortByShift", "subLongExtractByteByShift"}, LONG_VALUES, PRED_EXTEND_SUB_SHIFT); + } + + public int subIntUnsignedExtractByte(int x, int y) { + return x - ((y << 24) >>> 24); + } + + public long subLongUnsignedExtractByte(long x, long y) { + return x - ((y << 56) >>> 56); + } + + @Test + public void subUnsignedExtractTest() { + predicateExist(new String[]{"subIntUnsignedExtractByte"}, INT_VALUES, PRED_EXTEND_SUB_SHIFT); + predicateExist(new String[]{"subLongUnsignedExtractByte"}, LONG_VALUES, PRED_EXTEND_SUB_SHIFT); + } + + public int subIntUnsignedExtractByteByShift(int x, int y) { + return x - (((y << 24) >>> 24) << 1); + } + + public long subLongUnsignedExtractByteByShift(long x, long y) { + return x - (((y << 56) >>> 56) << 2); + } + + @Test + public void subUnsignedExtractByShiftTest() { + predicateExist(new String[]{"subIntUnsignedExtractByteByShift"}, INT_VALUES, PRED_EXTEND_SUB_SHIFT); + predicateExist(new String[]{"subLongUnsignedExtractByteByShift"}, LONG_VALUES, PRED_EXTEND_SUB_SHIFT); + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64TestBitAndBranchTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64TestBitAndBranchTest.java index ae07d293a1f..1526a3949d7 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64TestBitAndBranchTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64TestBitAndBranchTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -62,7 +62,7 @@ public class AArch64TestBitAndBranchTest extends LIRTest { public static long testBit42Snippet(long a, long b, long c) { if ((a & (1L << 42)) == 0) { - return b; + return b + c; } else { return c; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64VolatileAccessesTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64VolatileAccessesTest.java new file mode 100644 index 00000000000..461ae186166 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64VolatileAccessesTest.java @@ -0,0 +1,194 @@ +/* + * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, Red Hat Inc. 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + + +package org.graalvm.compiler.core.aarch64.test; + +import jdk.vm.ci.aarch64.AArch64; +import jdk.vm.ci.aarch64.AArch64Kind; +import org.graalvm.compiler.core.test.MatchRuleTest; +import org.graalvm.compiler.lir.LIRInstruction; +import org.graalvm.compiler.lir.aarch64.AArch64Move; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import java.util.function.Predicate; + +import static org.junit.Assume.assumeTrue; + +public class AArch64VolatileAccessesTest extends MatchRuleTest { + private static volatile byte volatileByteField; + private static volatile short volatileShortField; + private static volatile int volatileIntField; + private static volatile long volatileLongField; + private static volatile float volatileFloatField; + private static volatile double volatileDoubleField; + + private static Predicate storePredicate(AArch64Kind kind) { + return op -> (op instanceof AArch64Move.VolatileStoreOp && ((AArch64Move.VolatileStoreOp) op).getKind() == kind); + } + + private static Predicate loadPredicate(AArch64Kind kind) { + return op -> (op instanceof AArch64Move.VolatileLoadOp && ((AArch64Move.VolatileLoadOp) op).getKind() == kind); + } + + @Before + public void checkAArch64() { + assumeTrue("skipping AArch64 specific test", getTarget().arch instanceof AArch64); + } + + public static byte volatileByteFieldLoad() { + return volatileByteField; + } + + @Test + public void test01() { + checkLIR("volatileByteFieldLoad", loadPredicate(AArch64Kind.BYTE), 1); + volatileByteField = 42; + test("volatileByteFieldLoad"); + } + + public static short volatileShortFieldLoad() { + return volatileShortField; + } + + @Test + public void test02() { + checkLIR("volatileShortFieldLoad", loadPredicate(AArch64Kind.WORD), 1); + volatileShortField = 42; + test("volatileShortFieldLoad"); + } + + public static int volatileIntFieldLoad() { + return volatileIntField; + } + + @Test + public void test03() { + checkLIR("volatileIntFieldLoad", loadPredicate(AArch64Kind.DWORD), 1); + volatileIntField = 42; + test("volatileIntFieldLoad"); + } + + public static long volatileLongFieldLoad() { + return volatileLongField; + } + + @Test + public void test04() { + checkLIR("volatileLongFieldLoad", loadPredicate(AArch64Kind.QWORD), 1); + volatileLongField = 42; + test("volatileLongFieldLoad"); + } + + public static float volatileFloatFieldLoad() { + return volatileFloatField; + } + + @Test + public void test05() { + checkLIR("volatileFloatFieldLoad", loadPredicate(AArch64Kind.SINGLE), 1); + volatileFloatField = 42; + test("volatileFloatFieldLoad"); + } + + public static double volatileDoubleFieldLoad() { + return volatileDoubleField; + } + + @Test + public void test06() { + checkLIR("volatileDoubleFieldLoad", loadPredicate(AArch64Kind.DOUBLE), 1); + volatileDoubleField = 42; + test("volatileDoubleFieldLoad"); + } + + public static void volatileByteFieldStore(byte v) { + volatileByteField = v; + } + + @Test + public void test07() { + checkLIR("volatileByteFieldStore", storePredicate(AArch64Kind.BYTE), 1); + executeActual(getResolvedJavaMethod("volatileByteFieldStore"), (byte) 0x42); + Assert.assertEquals(volatileByteField, 0x42); + } + + public static void volatileShortFieldStore(short v) { + volatileShortField = v; + } + + @Test + public void test08() { + checkLIR("volatileShortFieldStore", storePredicate(AArch64Kind.WORD), 1); + executeActual(getResolvedJavaMethod("volatileShortFieldStore"), (short) 0x42); + Assert.assertEquals(volatileShortField, 0x42); + } + + public static void volatileIntFieldStore(int v) { + volatileIntField = v; + } + + @Test + public void test09() { + checkLIR("volatileIntFieldStore", storePredicate(AArch64Kind.DWORD), 1); + executeActual(getResolvedJavaMethod("volatileIntFieldStore"), 0x42); + Assert.assertEquals(volatileIntField, 0x42); + } + + public static void volatileLongFieldStore(int v) { + volatileLongField = v; + } + + @Test + public void test10() { + checkLIR("volatileLongFieldStore", storePredicate(AArch64Kind.QWORD), 1); + executeActual(getResolvedJavaMethod("volatileLongFieldStore"), 0x42); + Assert.assertEquals(volatileLongField, 0x42); + } + + public static void volatileFloatFieldStore(float v) { + volatileFloatField = v; + } + + @Test + public void test11() { + checkLIR("volatileFloatFieldStore", storePredicate(AArch64Kind.SINGLE), 1); + executeActual(getResolvedJavaMethod("volatileFloatFieldStore"), (float) 0x42); + Assert.assertEquals(volatileFloatField, 0x42, 0); + } + + public static void volatileDoubleFieldStore(double v) { + volatileDoubleField = v; + } + + @Test + public void test12() { + checkLIR("volatileDoubleFieldStore", storePredicate(AArch64Kind.DOUBLE), 1); + executeActual(getResolvedJavaMethod("volatileDoubleFieldStore"), (double) 0x42); + Assert.assertEquals(volatileDoubleField, 0x42, 0); + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java index 0f71a0e397f..3af4f1d9c20 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -46,6 +46,7 @@ import org.graalvm.compiler.lir.aarch64.AArch64AddressValue; import org.graalvm.compiler.lir.aarch64.AArch64ArithmeticLIRGeneratorTool; import org.graalvm.compiler.lir.aarch64.AArch64ArithmeticOp; import org.graalvm.compiler.lir.aarch64.AArch64BitManipulationOp; +import org.graalvm.compiler.lir.aarch64.AArch64Move; import org.graalvm.compiler.lir.aarch64.AArch64Move.LoadOp; import org.graalvm.compiler.lir.aarch64.AArch64Move.StoreConstantOp; import org.graalvm.compiler.lir.aarch64.AArch64Move.StoreOp; @@ -237,7 +238,7 @@ public class AArch64ArithmeticLIRGenerator extends ArithmeticLIRGenerator implem result = getLIRGen().newVariable(LIRKind.combine(c)); } else { assert a.getPlatformKind() == c.getPlatformKind(); - if (op == AArch64ArithmeticOp.FADD) { + if (op == AArch64ArithmeticOp.FMADD) { // For floating-point Math.fma intrinsic. assert a.getPlatformKind() == AArch64Kind.SINGLE || a.getPlatformKind() == AArch64Kind.DOUBLE; } else { @@ -506,6 +507,14 @@ public class AArch64ArithmeticLIRGenerator extends ArithmeticLIRGenerator implem return result; } + @Override + public Variable emitVolatileLoad(LIRKind kind, Value address, LIRFrameState state) { + AllocatableValue loadAddress = asAllocatable(address); + Variable result = getLIRGen().newVariable(getLIRGen().toRegisterKind(kind)); + getLIRGen().append(new AArch64Move.VolatileLoadOp((AArch64Kind) kind.getPlatformKind(), result, loadAddress, state)); + return result; + } + @Override public void emitStore(ValueKind lirKind, Value address, Value inputVal, LIRFrameState state) { AArch64AddressValue storeAddress = getLIRGen().asAddressValue(address); @@ -523,6 +532,14 @@ public class AArch64ArithmeticLIRGenerator extends ArithmeticLIRGenerator implem getLIRGen().append(new StoreOp(kind, storeAddress, input, state)); } + @Override + public void emitVolatileStore(ValueKind lirKind, Value addressVal, Value inputVal, LIRFrameState state) { + AArch64Kind kind = (AArch64Kind) lirKind.getPlatformKind(); + AllocatableValue input = asAllocatable(inputVal); + AllocatableValue address = asAllocatable(addressVal); + getLIRGen().append(new AArch64Move.VolatileStoreOp(kind, address, input, state)); + } + @Override public Value emitRound(Value value, RoundingMode mode) { AArch64ArithmeticOp op; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeMatchRules.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeMatchRules.java index 8af1e40d45c..cfc21263a89 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeMatchRules.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeMatchRules.java @@ -141,6 +141,22 @@ public class AArch64NodeMatchRules extends NodeMatchRules { } } + private static ExtendType getSignExtendType(int fromBits) { + switch (fromBits) { + case Byte.SIZE: + return ExtendType.SXTB; + case Short.SIZE: + return ExtendType.SXTH; + case Integer.SIZE: + return ExtendType.SXTW; + case Long.SIZE: + return ExtendType.SXTX; + default: + GraalError.shouldNotReachHere("extended from " + fromBits + "bits is not supported!"); + return null; + } + } + private AllocatableValue moveSp(AllocatableValue value) { return getLIRGeneratorTool().moveSp(value); } @@ -190,7 +206,83 @@ public class AArch64NodeMatchRules extends NodeMatchRules { } private static boolean isNarrowingLongToInt(NarrowNode narrow) { - return narrow.getInputBits() == 64 && narrow.getResultBits() == 32; + return narrow.getInputBits() == Long.SIZE && narrow.getResultBits() == Integer.SIZE; + } + + private ComplexMatchResult emitExtendedAddSubShift(BinaryNode op, ValueNode x, ValueNode y, ExtendType extType, int shiftAmt) { + assert op instanceof AddNode || op instanceof SubNode; + return builder -> { + AllocatableValue src1 = moveSp(gen.asAllocatable(operand(x))); + AllocatableValue src2 = moveSp(gen.asAllocatable(operand(y))); + Variable result = gen.newVariable(LIRKind.combine(operand(x), operand(y))); + AArch64ArithmeticOp arithmeticOp = op instanceof AddNode ? AArch64ArithmeticOp.ADD : AArch64ArithmeticOp.SUB; + gen.append(new AArch64ArithmeticOp.ExtendedAddSubShiftOp(arithmeticOp, result, src1, src2, extType, shiftAmt)); + return result; + }; + } + + @MatchRule("(Add=op x (LeftShift (SignExtend=ext y) Constant=lshift))") + @MatchRule("(Sub=op x (LeftShift (SignExtend=ext y) Constant=lshift))") + @MatchRule("(Add=op x (LeftShift (ZeroExtend=ext y) Constant=lshift))") + @MatchRule("(Sub=op x (LeftShift (ZeroExtend=ext y) Constant=lshift))") + public ComplexMatchResult mergeSignExtendByShiftIntoAddSub(BinaryNode op, UnaryNode ext, ValueNode x, ValueNode y, ConstantNode lshift) { + assert lshift.getStackKind().isNumericInteger(); + int shiftAmt = lshift.asJavaConstant().asInt(); + if (shiftAmt > 4 || shiftAmt < 0) { + return null; + } + ExtendType extType; + if (ext instanceof SignExtendNode) { + extType = getSignExtendType(((SignExtendNode) ext).getInputBits()); + } else { + extType = getZeroExtendType(((ZeroExtendNode) ext).getInputBits()); + } + return emitExtendedAddSubShift(op, x, y, extType, shiftAmt); + } + + @MatchRule("(Add=op x (LeftShift (And y Constant=constant) Constant=lshift))") + @MatchRule("(Sub=op x (LeftShift (And y Constant=constant) Constant=lshift))") + public ComplexMatchResult mergeShiftDowncastIntoAddSub(BinaryNode op, ValueNode x, ValueNode y, ConstantNode constant, ConstantNode lshift) { + assert lshift.getStackKind().isNumericInteger(); + assert constant.getStackKind().isNumericInteger(); + int shiftAmt = lshift.asJavaConstant().asInt(); + long mask = constant.asJavaConstant().asLong(); + if (shiftAmt > 4 || shiftAmt < 0) { + return null; + } + if (mask != 0xff && mask != 0xffff && mask != 0xffffffffL) { + return null; + } + ExtendType extType = getZeroExtendType(Long.toBinaryString(mask).length()); + return emitExtendedAddSubShift(op, x, y, extType, shiftAmt); + } + + @MatchRule("(Add=op x (RightShift (LeftShift y Constant=shiftConst) Constant=shiftConst))") + @MatchRule("(Sub=op x (RightShift (LeftShift y Constant=shiftConst) Constant=shiftConst))") + public ComplexMatchResult mergePairShiftIntoAddSub(BinaryNode op, ValueNode x, ValueNode y, ConstantNode shiftConst) { + assert shiftConst.getStackKind().isNumericInteger(); + int shift = shiftConst.asJavaConstant().asInt(); + if (shift != 16 && shift != 24 && shift != 32 && shift != 48 && shift != 56) { + return null; + } + int extractBits = shift >= 32 ? Long.SIZE - shift : Integer.SIZE - shift; + return emitExtendedAddSubShift(op, x, y, getSignExtendType(extractBits), 0); + } + + @MatchRule("(Add=op x (LeftShift (RightShift (LeftShift y Constant=shiftConst) Constant=shiftConst) Constant=lshift))") + @MatchRule("(Sub=op x (LeftShift (RightShift (LeftShift y Constant=shiftConst) Constant=shiftConst) Constant=lshift))") + public ComplexMatchResult mergeShiftedPairShiftIntoAddSub(BinaryNode op, ValueNode x, ValueNode y, ConstantNode shiftConst, ConstantNode lshift) { + assert shiftConst.getStackKind().isNumericInteger(); + int shift = shiftConst.asJavaConstant().asInt(); + int shiftAmt = lshift.asJavaConstant().asInt(); + if (shiftAmt > 4 || shiftAmt < 0) { + return null; + } + if (shift != 16 && shift != 24 && shift != 32 && shift != 48 && shift != 56) { + return null; + } + int extractBits = shift >= 32 ? Long.SIZE - shift : Integer.SIZE - shift; + return emitExtendedAddSubShift(op, x, y, getSignExtendType(extractBits), shiftAmt); } @MatchRule("(AArch64PointerAdd=addP base ZeroExtend)") @@ -225,7 +317,7 @@ public class AArch64NodeMatchRules extends NodeMatchRules { LIRKind kind = LIRKind.combineDerived(gen.getLIRKind(addP.stamp(NodeView.DEFAULT)), baseReference, null); Variable result = gen.newVariable(kind); - gen.append(new AArch64ArithmeticOp.ExtendedAddShiftOp(result, x, moveSp(y), + gen.append(new AArch64ArithmeticOp.ExtendedAddSubShiftOp(AArch64ArithmeticOp.ADD, result, x, moveSp(y), extendType, shiftNum)); return result; }; @@ -469,6 +561,32 @@ public class AArch64NodeMatchRules extends NodeMatchRules { resultKind, op, commutative, operand(src2), operand(src1)); } + @MatchRule("(Add=op x (And y Constant=constant))") + @MatchRule("(Sub=op x (And y Constant=constant))") + public ComplexMatchResult mergeDowncastIntoAddSub(BinaryNode op, ValueNode x, ValueNode y, ConstantNode constant) { + assert constant.getStackKind().isNumericInteger(); + long mask = constant.asJavaConstant().asLong(); + if (mask != 0xff && mask != 0xffff && mask != 0xffffffffL) { + return null; + } + ExtendType extType = getZeroExtendType(Long.toBinaryString(mask).length()); + return emitExtendedAddSubShift(op, x, y, extType, 0); + } + + @MatchRule("(Add=op x (SignExtend=ext y))") + @MatchRule("(Sub=op x (SignExtend=ext y))") + @MatchRule("(Add=op x (ZeroExtend=ext y))") + @MatchRule("(Sub=op x (ZeroExtend=ext y))") + public ComplexMatchResult mergeSignExtendIntoAddSub(BinaryNode op, UnaryNode ext, ValueNode x, ValueNode y) { + ExtendType extType; + if (ext instanceof SignExtendNode) { + extType = getSignExtendType(((SignExtendNode) ext).getInputBits()); + } else { + extType = getZeroExtendType(((ZeroExtendNode) ext).getInputBits()); + } + return emitExtendedAddSubShift(op, x, y, extType, 0); + } + @MatchRule("(Negate=unary (Narrow=narrow value))") @MatchRule("(Not=unary (Narrow=narrow value))") public ComplexMatchResult elideL2IForUnary(UnaryNode unary, NarrowNode narrow) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64ReadReplacementPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64ReadReplacementPhase.java index 99612b639e2..ffb91d584c9 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64ReadReplacementPhase.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64ReadReplacementPhase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2017, Red Hat Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -31,6 +31,7 @@ import org.graalvm.compiler.nodes.StructuredGraph; import org.graalvm.compiler.nodes.calc.SignExtendNode; import org.graalvm.compiler.nodes.calc.ZeroExtendNode; import org.graalvm.compiler.nodes.memory.ReadNode; +import org.graalvm.compiler.nodes.memory.VolatileReadNode; import org.graalvm.compiler.phases.Phase; /** @@ -46,7 +47,7 @@ public class AArch64ReadReplacementPhase extends Phase { if (node instanceof AArch64ReadNode) { continue; } - if (node instanceof ReadNode) { + if (node instanceof ReadNode && !(node instanceof VolatileReadNode)) { ReadNode readNode = (ReadNode) node; if (readNode.hasExactlyOneUsage()) { Node usage = readNode.usages().first(); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64ArithmeticLIRGenerator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64ArithmeticLIRGenerator.java index ce05b25e9e3..9d70e2d2771 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64ArithmeticLIRGenerator.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64ArithmeticLIRGenerator.java @@ -1177,6 +1177,16 @@ public class AMD64ArithmeticLIRGenerator extends ArithmeticLIRGenerator implemen return result; } + @Override + public Variable emitVolatileLoad(LIRKind kind, Value address, LIRFrameState state) { + throw GraalError.shouldNotReachHere(); + } + + @Override + public void emitVolatileStore(ValueKind kind, Value address, Value input, LIRFrameState state) { + throw GraalError.shouldNotReachHere(); + } + protected void emitStoreConst(AMD64Kind kind, AMD64AddressValue address, ConstantValue value, LIRFrameState state) { Constant c = value.getConstant(); if (JavaConstant.isNull(c)) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64LIRGenerator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64LIRGenerator.java index 77175981957..b2e3dcab42b 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64LIRGenerator.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64LIRGenerator.java @@ -107,7 +107,7 @@ import org.graalvm.compiler.lir.amd64.AMD64ZeroMemoryOp; import org.graalvm.compiler.lir.amd64.vector.AMD64VectorCompareOp; import org.graalvm.compiler.lir.gen.LIRGenerationResult; import org.graalvm.compiler.lir.gen.LIRGenerator; -import org.graalvm.compiler.lir.hashing.Hasher; +import org.graalvm.compiler.lir.hashing.IntHasher; import org.graalvm.compiler.phases.util.Providers; import jdk.vm.ci.amd64.AMD64; @@ -317,8 +317,9 @@ public abstract class AMD64LIRGenerator extends LIRGenerator { @Override public void emitCompareBranch(PlatformKind cmpKind, Value left, Value right, Condition cond, boolean unorderedIsTrue, LabelRef trueLabel, LabelRef falseLabel, double trueLabelProbability) { if (cmpKind == AMD64Kind.SINGLE || cmpKind == AMD64Kind.DOUBLE) { + boolean isSelfEqualsCheck = cond == Condition.EQ && !unorderedIsTrue && left.equals(right); Condition finalCondition = emitCompare(cmpKind, left, right, cond); - append(new FloatBranchOp(finalCondition, unorderedIsTrue, trueLabel, falseLabel, trueLabelProbability)); + append(new FloatBranchOp(finalCondition, unorderedIsTrue, trueLabel, falseLabel, trueLabelProbability, isSelfEqualsCheck)); return; } @@ -459,10 +460,15 @@ public abstract class AMD64LIRGenerator extends LIRGenerator { finalCondition = emitCompare(cmpKind, left, right, cond); } - return emitCondMoveOp(finalCondition, finalTrueValue, finalFalseValue, isFloatComparison, unorderedIsTrue); + boolean isSelfEqualsCheck = isFloatComparison && finalCondition == Condition.EQ && left.equals(right); + return emitCondMoveOp(finalCondition, finalTrueValue, finalFalseValue, isFloatComparison, unorderedIsTrue, isSelfEqualsCheck); } private Variable emitCondMoveOp(Condition condition, Value trueValue, Value falseValue, boolean isFloatComparison, boolean unorderedIsTrue) { + return emitCondMoveOp(condition, trueValue, falseValue, isFloatComparison, unorderedIsTrue, false); + } + + private Variable emitCondMoveOp(Condition condition, Value trueValue, Value falseValue, boolean isFloatComparison, boolean unorderedIsTrue, boolean isSelfEqualsCheck) { boolean isParityCheckNecessary = isFloatComparison && unorderedIsTrue != AMD64ControlFlow.trueOnUnordered(condition); Variable result = newVariable(trueValue.getValueKind()); if (!isParityCheckNecessary && isIntConstant(trueValue, 1) && isIntConstant(falseValue, 0)) { @@ -485,7 +491,7 @@ public abstract class AMD64LIRGenerator extends LIRGenerator { append(new CondSetOp(result, condition.negate())); } } else if (isFloatComparison) { - append(new FloatCondMoveOp(result, condition, unorderedIsTrue, load(trueValue), load(falseValue))); + append(new FloatCondMoveOp(result, condition, unorderedIsTrue, load(trueValue), load(falseValue), isSelfEqualsCheck)); } else { append(new CondMoveOp(result, condition, load(trueValue), loadNonConst(falseValue))); } @@ -686,16 +692,31 @@ public abstract class AMD64LIRGenerator extends LIRGenerator { } @Override - protected Optional hasherFor(JavaConstant[] keyConstants, double minDensity) { - return Hasher.forKeys(keyConstants, minDensity); + protected Optional hasherFor(JavaConstant[] keyConstants, double minDensity) { + int[] keys = new int[keyConstants.length]; + for (int i = 0; i < keyConstants.length; i++) { + keys[i] = keyConstants[i].asInt(); + } + return IntHasher.forKeys(keys); } @Override - protected void emitHashTableSwitch(Hasher hasher, JavaConstant[] keys, LabelRef defaultTarget, LabelRef[] targets, Value value) { - Value index = hasher.hash(value, arithmeticLIRGen); + protected void emitHashTableSwitch(IntHasher hasher, JavaConstant[] keys, LabelRef defaultTarget, LabelRef[] targets, Value value) { + Value hash = value; + if (hasher.factor > 1) { + Value factor = emitJavaConstant(JavaConstant.forShort(hasher.factor)); + hash = arithmeticLIRGen.emitMul(hash, factor, false); + } + if (hasher.shift > 0) { + Value shift = emitJavaConstant(JavaConstant.forByte(hasher.shift)); + hash = arithmeticLIRGen.emitShr(hash, shift); + } + Value cardinalityAnd = emitJavaConstant(JavaConstant.forInt(hasher.cardinality - 1)); + hash = arithmeticLIRGen.emitAnd(hash, cardinalityAnd); + Variable scratch = newVariable(LIRKind.value(target().arch.getWordKind())); Variable entryScratch = newVariable(LIRKind.value(target().arch.getWordKind())); - append(new HashTableSwitchOp(keys, defaultTarget, targets, value, index, scratch, entryScratch)); + append(new HashTableSwitchOp(keys, defaultTarget, targets, value, hash, scratch, entryScratch)); } @Override diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/CompilationListenerProfiler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/CompilationListenerProfiler.java new file mode 100644 index 00000000000..9b76964c447 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/CompilationListenerProfiler.java @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.core.common; + +import org.graalvm.compiler.debug.CompilationListener; +import org.graalvm.compiler.debug.DebugContext.CompilerPhaseScope; + +import jdk.vm.ci.meta.ResolvedJavaMethod; + +/** + * Connects a {@link CompilationListener} to a {@link CompilerProfiler}. + */ +public class CompilationListenerProfiler implements CompilationListener { + private final int compileId; + private final CompilerProfiler profiler; + + /** + * Creates a compilation listener that passes events for a specific compilation identified by + * {@code compileId} onto {@code profiler}. + */ + public CompilationListenerProfiler(CompilerProfiler profiler, int compileId) { + this.profiler = profiler; + this.compileId = compileId; + } + + @Override + public void notifyInlining(ResolvedJavaMethod caller, ResolvedJavaMethod callee, boolean succeeded, CharSequence message, int bci) { + profiler.notifyCompilerInlingEvent(compileId, caller, callee, succeeded, message.toString(), bci); + } + + @Override + public CompilerPhaseScope enterPhase(CharSequence name, int nesting) { + long start = profiler.getTicks(); + return new CompilerPhaseScope() { + + @Override + public void close() { + profiler.notifyCompilerPhaseEvent(compileId, start, name.toString(), nesting); + } + }; + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/CompilerProfiler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/CompilerProfiler.java new file mode 100644 index 00000000000..01d492784fc --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/CompilerProfiler.java @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.core.common; + +import jdk.vm.ci.meta.ResolvedJavaMethod; + +/** + * A profiling service that consumes compilation related events. The Java Flight Recorder (JFR) is + * an example of such a service that can be exposed via this interface. + */ +public interface CompilerProfiler { + + /** + * Get current value of the profiler's time counter. + * + * @return the number of profile-defined time units that have elapsed + */ + long getTicks(); + + /** + * Notifies JFR when a compiler phase ends. + * + * @param compileId current computation unit id + * @param startTime when the phase started + * @param name name of the phase + * @param nestingLevel how many ancestor phases there are of the phase + */ + void notifyCompilerPhaseEvent(int compileId, long startTime, String name, int nestingLevel); + + /** + * Notifies JFR when the compiler considers inlining {@code callee} into {@code caller}. + * + * @param compileId current computation unit id + * @param caller caller method + * @param callee callee method considered for inlining into {@code caller} + * @param succeeded true if {@code callee} was inlined into {@code caller} + * @param message extra information about inlining decision + * @param bci byte code index of call site + */ + void notifyCompilerInlingEvent(int compileId, ResolvedJavaMethod caller, ResolvedJavaMethod callee, boolean succeeded, String message, int bci); +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/GraalOptions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/GraalOptions.java index 20511c4067d..a3751cc0c87 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/GraalOptions.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/GraalOptions.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020, 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 @@ -271,6 +271,6 @@ public final class GraalOptions { @Option(help = "Alignment in bytes for loop header blocks.", type = OptionType.Expert) public static final OptionKey LoopHeaderAlignment = new OptionKey<>(16); - @Option(help = "Do not include membars for volatile accesses until the end of optimizations.", type = OptionType.Expert) - public static final OptionKey LateMembars = new OptionKey<>(true); + @Option(help = "String.indexOf invocations will be evaluated at compile time if the receiver is a constant and its length is lower than this value.", type = OptionType.Expert) + public static final OptionKey StringIndexOfLimit = new OptionKey<>(4096); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/NumUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/NumUtil.java index e7d1f8aed15..523465d2704 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/NumUtil.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/NumUtil.java @@ -136,6 +136,14 @@ public class NumUtil { return number / mod * mod; } + public static int divideAndRoundUp(int number, int divisor) { + return (number + divisor - 1) / divisor; + } + + public static long divideAndRoundUp(long number, long divisor) { + return (number + divisor - 1L) / divisor; + } + public static int log2Ceil(int val) { int x = 1; int log2 = 0; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/calc/Condition.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/calc/Condition.java index c2864312a7c..2b841798ed9 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/calc/Condition.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/calc/Condition.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020, 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 @@ -533,6 +533,130 @@ public enum Condition { } } + private static boolean in(Condition needle, Condition... haystack) { + for (Condition c : haystack) { + if (c == needle) { + return true; + } + } + return false; + } + + /** + * Returns true if this condition and {@code other} will never both return true for the same + * arguments. This means that tests using these conditions can be safely reordered. + */ + public boolean trueIsDisjoint(Condition other) { + if (other == this) { + return false; + } + switch (this) { + case EQ: { + // 0 EQ 0 is not disjoint from 0 LE 0 + // 0 EQ 0 is not disjoint from 0 GE 0 + // 0 EQ 0 is not disjoint from 0 AE 0 + // 0 EQ 0 is not disjoint from 0 BE 0 + return in(other, NE, LT, GT, AT, BT); + } + case NE: { + // 0 NE 1 is not disjoint from 0 LT 1 + // 0 NE 1 is not disjoint from 0 LE 1 + // 0 NE -1 is not disjoint from 0 GT -1 + // 0 NE -1 is not disjoint from 0 GE -1 + // 1 NE 0 is not disjoint from 1 AE 0 + // 0 NE 1 is not disjoint from 0 BE 1 + // 1 NE 0 is not disjoint from 1 AT 0 + // 0 NE 1 is not disjoint from 0 BT 1 + return other == EQ; + } + case LT: { + // 0 LT 1 is not disjoint from 0 NE 1 + // 0 LT 1 is not disjoint from 0 LE 1 + // -1 LT 0 is not disjoint from -1 AE 0 + // 0 LT 1 is not disjoint from 0 BE 1 + // -1 LT 0 is not disjoint from -1 AT 0 + // 0 LT 1 is not disjoint from 0 BT 1 + return in(other, EQ, GT, GE); + } + case LE: { + // 0 LE 0 is not disjoint from 0 EQ 0 + // 0 LE 1 is not disjoint from 0 NE 1 + // 0 LE 1 is not disjoint from 0 LT 1 + // 0 LE 0 is not disjoint from 0 GE 0 + // 0 LE 0 is not disjoint from 0 AE 0 + // 0 LE 0 is not disjoint from 0 BE 0 + // -1 LE 0 is not disjoint from -1 AT 0 + // 0 LE 1 is not disjoint from 0 BT 1 + return other == GT; + } + case GT: { + // 0 GT -1 is not disjoint from 0 NE -1 + // 0 GT -1 is not disjoint from 0 GE -1 + // 1 GT 0 is not disjoint from 1 AE 0 + // 0 GT -1 is not disjoint from 0 BE -1 + // 1 GT 0 is not disjoint from 1 AT 0 + // 0 GT -1 is not disjoint from 0 BT -1 + return in(other, EQ, LT, LE); + } + case GE: { + // 0 GE 0 is not disjoint from 0 EQ 0 + // 0 GE -1 is not disjoint from 0 NE -1 + // 0 GE 0 is not disjoint from 0 LE 0 + // 0 GE -1 is not disjoint from 0 GT -1 + // 0 GE 0 is not disjoint from 0 AE 0 + // 0 GE 0 is not disjoint from 0 BE 0 + // 1 GE 0 is not disjoint from 1 AT 0 + // 0 GE -1 is not disjoint from 0 BT -1 + return other == LT; + } + case AE: { + // 0 AE 0 is not disjoint from 0 EQ 0 + // 1 AE 0 is not disjoint from 1 NE 0 + // -1 AE 0 is not disjoint from -1 LT 0 + // 0 AE 0 is not disjoint from 0 LE 0 + // 1 AE 0 is not disjoint from 1 GT 0 + // 0 AE 0 is not disjoint from 0 GE 0 + // 0 AE 0 is not disjoint from 0 BE 0 + // 1 AE 0 is not disjoint from 1 AT 0 + return other == BT; + } + case BE: { + // 0 BE 0 is not disjoint from 0 EQ 0 + // 0 BE 1 is not disjoint from 0 NE 1 + // 0 BE 1 is not disjoint from 0 LT 1 + // 0 BE 0 is not disjoint from 0 LE 0 + // 0 BE -1 is not disjoint from 0 GT -1 + // 0 BE 0 is not disjoint from 0 GE 0 + // 0 BE 0 is not disjoint from 0 AE 0 + // 0 BE 1 is not disjoint from 0 BT 1 + return other == AT; + } + case AT: { + // 1 AT 0 is not disjoint from 1 NE 0 + // -1 AT 0 is not disjoint from -1 LT 0 + // -1 AT 0 is not disjoint from -1 LE 0 + // 1 AT 0 is not disjoint from 1 GT 0 + // 1 AT 0 is not disjoint from 1 GE 0 + // 1 AT 0 is not disjoint from 1 AE 0 + return in(other, EQ, BE, BT); + } + case BT: { + // 0 BT 1 is not disjoint from 0 NE 1 + // 0 BT 1 is not disjoint from 0 LT 1 + // 0 BT 1 is not disjoint from 0 LE 1 + // 0 BT -1 is not disjoint from 0 GT -1 + // 0 BT -1 is not disjoint from 0 GE -1 + // 0 BT 1 is not disjoint from 0 BE 1 + return in(other, EQ, AE, AT); + } + } + throw new IllegalArgumentException(this.toString()); + } + + /** + * Return the join of this condition and {@code other}. Only non-null return values are + * meaningful. + */ public Condition join(Condition other) { if (other == this) { return this; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/CodeGenProviders.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/CodeGenProviders.java index f927b86bab3..12071cf0bb1 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/CodeGenProviders.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/CodeGenProviders.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -41,4 +41,6 @@ public interface CodeGenProviders { ForeignCallsProvider getForeignCalls(); ConstantReflectionProvider getConstantReflection(); + + MetaAccessExtensionProvider getMetaAccessExtensionProvider(); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/ForeignCallDescriptor.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/ForeignCallDescriptor.java index d9c42660cca..e87aef91d2e 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/ForeignCallDescriptor.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/ForeignCallDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020, 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 @@ -26,9 +26,11 @@ package org.graalvm.compiler.core.common.spi; import java.util.Arrays; +import jdk.internal.vm.compiler.word.LocationIdentity; + /** - * The name and signature of a foreign call. A foreign call differs from a normal compiled Java call - * in at least one of these aspects: + * The information required for high level code generation of a foreign call. A foreign call differs + * from a normal compiled Java call in at least one of these aspects: *
    *
  • The call is to C/C++/assembler code.
    • *
  • The call uses different conventions for passing parameters or returning values.
    • @@ -42,59 +44,86 @@ import java.util.Arrays; */ public class ForeignCallDescriptor { - private final String name; - private final Class resultType; - private final Class[] argumentTypes; + protected final ForeignCallSignature signature; + protected final boolean isReexecutable; + protected final boolean canDeoptimize; + protected final boolean isGuaranteedSafepoint; + protected final LocationIdentity[] killedLocations; + + public ForeignCallDescriptor(String name, Class resultType, Class[] argumentTypes, boolean isReexecutable, LocationIdentity[] killedLocations, boolean canDeoptimize, + boolean isGuaranteedSafepoint) { + this.isReexecutable = isReexecutable; + this.killedLocations = killedLocations; + this.canDeoptimize = canDeoptimize; + this.isGuaranteedSafepoint = isGuaranteedSafepoint; + this.signature = new ForeignCallSignature(name, resultType, argumentTypes); - public ForeignCallDescriptor(String name, Class resultType, Class... argumentTypes) { - this.name = name; - this.resultType = resultType; - this.argumentTypes = argumentTypes; } - /** - * Gets the name of this foreign call. - */ + public ForeignCallSignature getSignature() { + return signature; + } + public String getName() { - return name; + return signature.getName(); } - /** - * Gets the return type of this foreign call. - */ public Class getResultType() { - return resultType; + return signature.getResultType(); } - /** - * Gets the argument types of this foreign call. - */ public Class[] getArgumentTypes() { - return argumentTypes.clone(); + return signature.getArgumentTypes(); + } + + @Override + public boolean equals(Object o) { + return this == o; } @Override public int hashCode() { - return name.hashCode(); + return signature.hashCode(); } - @Override - public boolean equals(Object obj) { - if (obj instanceof ForeignCallDescriptor) { - ForeignCallDescriptor other = (ForeignCallDescriptor) obj; - return other.name.equals(name) && other.resultType.equals(resultType) && Arrays.equals(other.argumentTypes, argumentTypes); - } - return false; + /** + * Determines if a given foreign call is side-effect free. Deoptimization cannot return + * execution to a point before a foreign call that has a side effect. + */ + public boolean isReexecutable() { + return isReexecutable; + } + + /** + * Gets the set of memory locations killed by a given foreign call. Returning the special value + * {@link LocationIdentity#any()} denotes that the call kills all memory locations. Returning + * any empty array denotes that the call does not kill any memory locations. + */ + public LocationIdentity[] getKilledLocations() { + return killedLocations; + } + + /** + * Determines if deoptimization can occur during a given foreign call. + */ + public boolean canDeoptimize() { + return canDeoptimize; + } + + /** + * Identifies foreign calls which are guaranteed to include a safepoint check. + */ + public boolean isGuaranteedSafepoint() { + return isGuaranteedSafepoint; } @Override public String toString() { - StringBuilder sb = new StringBuilder(name).append('('); - String sep = ""; - for (Class arg : argumentTypes) { - sb.append(sep).append(arg.getSimpleName()); - sep = ","; - } - return sb.append(')').append(resultType.getSimpleName()).toString(); + return getClass().getSimpleName() + "{" + signature + + ", isReexecutable=" + isReexecutable + + ", canDeoptimize=" + canDeoptimize + + ", isGuaranteedSafepoint=" + isGuaranteedSafepoint + + ", killedLocations=" + Arrays.toString(killedLocations) + + '}'; } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/ForeignCallSignature.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/ForeignCallSignature.java new file mode 100644 index 00000000000..a8a814d5bdb --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/ForeignCallSignature.java @@ -0,0 +1,89 @@ +/* + * Copyright (c) 2009, 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.core.common.spi; + +import java.util.Arrays; + +/** + * The name and signature of a {@link ForeignCallDescriptor foreign call}. + */ +public final class ForeignCallSignature { + + private final String name; + private final Class resultType; + private final Class[] argumentTypes; + + public ForeignCallSignature(String name, Class resultType, Class... argumentTypes) { + this.name = name; + this.resultType = resultType; + this.argumentTypes = argumentTypes; + } + + /** + * Gets the name of this foreign call. + */ + public String getName() { + return name; + } + + /** + * Gets the return type of this foreign call. + */ + public Class getResultType() { + return resultType; + } + + /** + * Gets the argument types of this foreign call. + */ + public Class[] getArgumentTypes() { + return argumentTypes.clone(); + } + + @Override + public int hashCode() { + return name.hashCode(); + } + + @Override + public boolean equals(Object obj) { + if (obj instanceof ForeignCallSignature) { + ForeignCallSignature other = (ForeignCallSignature) obj; + return other.name.equals(name) && other.resultType.equals(resultType) && Arrays.equals(other.argumentTypes, argumentTypes); + } + return false; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(name).append('('); + String sep = ""; + for (Class arg : argumentTypes) { + sb.append(sep).append(arg.getSimpleName()); + sep = ","; + } + return sb.append(')').append(resultType.getSimpleName()).toString(); + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/ForeignCallsProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/ForeignCallsProvider.java index 50912139949..e9405cad09c 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/ForeignCallsProvider.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/ForeignCallsProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -25,7 +25,6 @@ package org.graalvm.compiler.core.common.spi; import org.graalvm.compiler.core.common.LIRKind; -import jdk.internal.vm.compiler.word.LocationIdentity; import jdk.vm.ci.code.ValueKindFactory; @@ -34,36 +33,20 @@ import jdk.vm.ci.code.ValueKindFactory; */ public interface ForeignCallsProvider extends ValueKindFactory { - /** - * Determines if a given foreign call is side-effect free. Deoptimization cannot return - * execution to a point before a foreign call that has a side effect. - */ - boolean isReexecutable(ForeignCallDescriptor descriptor); - - /** - * Gets the set of memory locations killed by a given foreign call. Returning the special value - * {@link LocationIdentity#any()} denotes that the call kills all memory locations. Returning - * any empty array denotes that the call does not kill any memory locations. - */ - LocationIdentity[] getKilledLocations(ForeignCallDescriptor descriptor); - - /** - * Determines if deoptimization can occur during a given foreign call. - */ - boolean canDeoptimize(ForeignCallDescriptor descriptor); - - /** - * Identifies foreign calls which are guaranteed to include a safepoint check. - */ - boolean isGuaranteedSafepoint(ForeignCallDescriptor descriptor); - /** * Gets the linkage for a foreign call. */ ForeignCallLinkage lookupForeignCall(ForeignCallDescriptor descriptor); /** - * Return true if the foreign call has a binding. + * Gets the linkage for a foreign call. */ - boolean isAvailable(ForeignCallDescriptor descriptor); + default ForeignCallLinkage lookupForeignCall(ForeignCallSignature signature) { + return lookupForeignCall(getDescriptor(signature)); + } + + /** + * Gets the descriptor for a foreign call. + */ + ForeignCallDescriptor getDescriptor(ForeignCallSignature signature); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/MetaAccessExtensionProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/MetaAccessExtensionProvider.java new file mode 100644 index 00000000000..a798de84bc7 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/MetaAccessExtensionProvider.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.core.common.spi; + +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ResolvedJavaType; + +/** + * Provides additional meta data about JVMCI objects that is not provided by the VM itself, and + * therefore does not need to be in JVMCI itself. + */ +public interface MetaAccessExtensionProvider { + + /** + * The {@link JavaKind} used to store the provided type in a field or array element. This can be + * different than the {@link JavaType#getJavaKind} for types that are intercepted and + * transformed by the compiler. + */ + JavaKind getStorageKind(JavaType type); + + /** + * Checks if a dynamic allocation of the provided type can be canonicalized to a regular + * allocation node. If the method returns false, then the dynamic allocation would throw an + * exception at run time and therefore canonicalization would miss that exception. + */ + boolean canConstantFoldDynamicAllocation(ResolvedJavaType type); +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/FloatStamp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/FloatStamp.java index d1a83db912a..a854834677e 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/FloatStamp.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/FloatStamp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -339,14 +339,14 @@ public class FloatStamp extends PrimitiveStamp { if (Float.isNaN(value.asFloat())) { result = new FloatStamp(32, Double.NaN, Double.NaN, false); } else { - result = new FloatStamp(32, value.asFloat(), value.asFloat(), !Float.isNaN(value.asFloat())); + result = new FloatStamp(32, value.asFloat(), value.asFloat(), true); } break; case Double: if (Double.isNaN(value.asDouble())) { result = new FloatStamp(64, Double.NaN, Double.NaN, false); } else { - result = new FloatStamp(64, value.asDouble(), value.asDouble(), !Double.isNaN(value.asDouble())); + result = new FloatStamp(64, value.asDouble(), value.asDouble(), true); } break; default: diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/BitMap2D.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/BitMap2D.java index af0ff871b4e..da6ef1c9951 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/BitMap2D.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/BitMap2D.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020, 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 @@ -44,6 +44,11 @@ public final class BitMap2D { } public BitMap2D(int sizeInSlots, int bitsPerSlot) { + long nBits = (long) sizeInSlots * bitsPerSlot; + if (nBits > Integer.MAX_VALUE) { + // Avoids issues where (sizeInSlots * bitsPerSlot) wraps around to a positive integer + throw new OutOfMemoryError("Cannot allocate a BitSet for " + nBits + " bits"); + } map = new BitSet(sizeInSlots * bitsPerSlot); this.bitsPerSlot = bitsPerSlot; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.match.processor/src/org/graalvm/compiler/core/match/processor/MatchProcessor.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.match.processor/src/org/graalvm/compiler/core/match/processor/MatchProcessor.java index 208724deb78..b77cb641919 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.match.processor/src/org/graalvm/compiler/core/match/processor/MatchProcessor.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.match.processor/src/org/graalvm/compiler/core/match/processor/MatchProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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 @@ -548,7 +548,7 @@ public class MatchProcessor extends AbstractProcessor { } out.printf(" private static final String[] %s = new String[] {%s};\n", invoker.argumentsListName(), args); out.printf(" private static final class %s implements MatchGenerator {\n", invoker.wrapperClass()); - out.printf(" static MatchGenerator instance = new %s();\n", invoker.wrapperClass()); + out.printf(" static final MatchGenerator instance = new %s();\n", invoker.wrapperClass()); out.printf(" @Override\n"); out.printf(" public ComplexMatchResult match(NodeMatchRules nodeMatchRules, Object...args) {\n"); out.printf(" return ((%s) nodeMatchRules).%s(%s);\n", invoker.nodeLIRBuilderClass, invoker.methodName, types); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ArrayCopyVirtualizationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ArrayCopyVirtualizationTest.java new file mode 100644 index 00000000000..edc3cb96547 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ArrayCopyVirtualizationTest.java @@ -0,0 +1,160 @@ +/* + * Copyright (c) 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + + +package org.graalvm.compiler.core.test; + +import org.junit.Test; + +import org.graalvm.compiler.nodes.StructuredGraph; +import org.graalvm.compiler.nodes.java.NewArrayNode; + +public class ArrayCopyVirtualizationTest extends GraalCompilerTest { + + @Override + protected void checkMidTierGraph(StructuredGraph graph) { + assertTrue(graph.getNodes().filter(node -> node instanceof NewArrayNode).count() == 0, "shouldn't require allocation in %s", graph); + super.checkMidTierGraph(graph); + } + + public byte byteCopyVirtualization() { + byte[] array = new byte[]{1, 2, 3, 4}; + System.arraycopy(array, 1, array, 0, 3); + return array[0]; + } + + public short shortCopyVirtualization() { + short[] array = new short[]{1, 2, 3, 4}; + System.arraycopy(array, 1, array, 0, 2); + return array[0]; + } + + public char charCopyVirtualization() { + char[] array = new char[]{1, 2, 3, 4}; + System.arraycopy(array, 1, array, 0, 3); + return array[0]; + } + + public int intCopyVirtualization() { + int[] array = new int[]{1, 2, 3, 4}; + System.arraycopy(array, 1, array, 0, 3); + return array[0]; + } + + public long longCopyVirtualization() { + long[] array = new long[]{1, 2, 3, 4}; + System.arraycopy(array, 1, array, 0, 3); + return array[0]; + } + + public float floatCopyVirtualization() { + float[] array = new float[]{1, 2, 3, 4}; + System.arraycopy(array, 1, array, 0, 3); + return array[0]; + } + + public double doubleCopyVirtualization() { + double[] array = new double[]{1, 2, 3, 4}; + System.arraycopy(array, 1, array, 0, 3); + return array[0]; + } + + public Object objectCopyVirtualization() { + Object[] array = new Object[]{1, 2, 3, 4}; + System.arraycopy(array, 1, array, 0, 3); + return array[0]; + } + + @Test + public void testCopyVirtualization() { + test("byteCopyVirtualization"); + test("shortCopyVirtualization"); + test("charCopyVirtualization"); + test("intCopyVirtualization"); + test("longCopyVirtualization"); + test("floatCopyVirtualization"); + test("doubleCopyVirtualization"); + test("objectCopyVirtualization"); + } + + public byte byteCopyBackwardsVirtualization() { + byte[] array = new byte[]{1, 2, 3, 4}; + System.arraycopy(array, 0, array, 1, 3); + return array[3]; + } + + public short shortCopyBackwardsVirtualization() { + short[] array = new short[]{1, 2, 3, 4}; + System.arraycopy(array, 0, array, 1, 3); + return array[3]; + } + + public char charCopyBackwardsVirtualization() { + char[] array = new char[]{1, 2, 3, 4}; + System.arraycopy(array, 0, array, 1, 3); + return array[3]; + } + + public int intCopyBackwardsVirtualization() { + int[] array = new int[]{1, 2, 3, 4}; + System.arraycopy(array, 0, array, 1, 3); + return array[3]; + } + + public long longCopyBackwardsVirtualization() { + long[] array = new long[]{1, 2, 3, 4}; + System.arraycopy(array, 0, array, 1, 3); + return array[3]; + } + + public float floatCopyBackwardsVirtualization() { + float[] array = new float[]{1, 2, 3, 4}; + System.arraycopy(array, 0, array, 1, 3); + return array[3]; + } + + public double doubleCopyBackwardsVirtualization() { + double[] array = new double[]{1, 2, 3, 4}; + System.arraycopy(array, 0, array, 1, 3); + return array[3]; + } + + public Object objectCopyBackwardsVirtualization() { + Object[] array = new Object[]{1, 2, 3, 4}; + System.arraycopy(array, 0, array, 1, 3); + return array[3]; + } + + @Test + public void testCopyBackwardsVirtualization() { + test("byteCopyBackwardsVirtualization"); + test("shortCopyBackwardsVirtualization"); + test("charCopyBackwardsVirtualization"); + test("intCopyBackwardsVirtualization"); + test("longCopyBackwardsVirtualization"); + test("floatCopyBackwardsVirtualization"); + test("doubleCopyBackwardsVirtualization"); + test("objectCopyBackwardsVirtualization"); + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/BoxingEliminationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/BoxingEliminationTest.java index c130e94a5d6..d11505efa18 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/BoxingEliminationTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/BoxingEliminationTest.java @@ -252,6 +252,21 @@ public class BoxingEliminationTest extends GraalCompilerTest { test("materializeTest1Snippet", 1); } + public static Float materializeTest2Snippet(float a) { + Float v = a; + + if (v == a) { + return v; + } else { + return null; + } + } + + @Test + public void materializeTest2() { + test("materializeTest2Snippet", 1f); + } + public static int intTest1Snippet() { return Integer.valueOf(1); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java index 390c378bef6..92f037939ae 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java @@ -40,6 +40,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.ServiceLoader; import java.util.Set; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; @@ -60,7 +61,7 @@ import org.graalvm.compiler.core.common.LIRKind; import org.graalvm.compiler.core.common.type.ArithmeticOpTable; import org.graalvm.compiler.debug.DebugCloseable; import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugHandlersFactory; +import org.graalvm.compiler.debug.DebugContext.Builder; import org.graalvm.compiler.debug.GraalError; import org.graalvm.compiler.graph.Node; import org.graalvm.compiler.graph.NodeClass; @@ -150,13 +151,23 @@ public class CheckGraalInvariants extends GraalCompilerTest { } protected String getClassPath() { - String bootclasspath; + String classpath; if (JavaVersionUtil.JAVA_SPEC <= 8) { - bootclasspath = System.getProperty("sun.boot.class.path"); + classpath = System.getProperty("sun.boot.class.path"); } else { - bootclasspath = JRT_CLASS_PATH_ENTRY; + classpath = JRT_CLASS_PATH_ENTRY; } - return bootclasspath; + + // Also process classes that go into the libgraal native image. + String javaClassPath = System.getProperty("java.class.path"); + if (javaClassPath != null) { + for (String path : javaClassPath.split(File.pathSeparator)) { + if (path.contains("libgraal") && !path.contains("processor")) { + classpath += File.pathSeparator + path; + } + } + } + return classpath; } protected boolean shouldLoadClass(String className) { @@ -345,6 +356,8 @@ public class CheckGraalInvariants extends GraalCompilerTest { verifiers.add(new VerifyGetOptionsUsage()); verifiers.add(new VerifyUnsafeAccess()); + loadVerifiers(verifiers); + VerifyFoldableMethods foldableMethodsVerifier = new VerifyFoldableMethods(); if (tool.shouldVerifyFoldableMethods()) { verifiers.add(foldableMethodsVerifier); @@ -354,7 +367,7 @@ public class CheckGraalInvariants extends GraalCompilerTest { for (Method m : BadUsageWithEquals.class.getDeclaredMethods()) { ResolvedJavaMethod method = metaAccess.lookupJavaMethod(m); - try (DebugContext debug = DebugContext.create(options, DebugHandlersFactory.LOADER)) { + try (DebugContext debug = new Builder(options).build()) { StructuredGraph graph = new StructuredGraph.Builder(options, debug, AllowAssumptions.YES).method(method).build(); try (DebugCloseable s = debug.disableIntercept(); DebugContext.Scope ds = debug.scope("CheckingGraph", graph, method)) { graphBuilderSuite.apply(graph, context); @@ -408,7 +421,7 @@ public class CheckGraalInvariants extends GraalCompilerTest { String methodName = className + "." + method.getName(); if (matches(filters, methodName)) { executor.execute(() -> { - try (DebugContext debug = DebugContext.create(options, DebugHandlersFactory.LOADER)) { + try (DebugContext debug = new Builder(options).build()) { boolean isSubstitution = method.getAnnotation(Snippet.class) != null || method.getAnnotation(MethodSubstitution.class) != null; StructuredGraph graph = new StructuredGraph.Builder(options, debug).method(method).setIsSubstitution(isSubstitution).build(); try (DebugCloseable s = debug.disableIntercept(); DebugContext.Scope ds = debug.scope("CheckingGraph", graph, method)) { @@ -471,6 +484,13 @@ public class CheckGraalInvariants extends GraalCompilerTest { } } + @SuppressWarnings("unchecked") + private static void loadVerifiers(List> verifiers) { + for (VerifyPhase verifier : ServiceLoader.load(VerifyPhase.class)) { + verifiers.add(verifier); + } + } + /** * Initializes a map from a field annotated by {@link Option} to a set that will be used to * collect methods that accesses the option field. diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionTest.java index 450a61f239b..575125ddd27 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -108,4 +108,27 @@ public class ConditionTest { } } + static int[] intBoundaryValues = new int[]{-1, 0, 1, Integer.MIN_VALUE, Integer.MIN_VALUE + 1, Integer.MAX_VALUE - 1, Integer.MAX_VALUE}; + + @Test + public void testTrueIsDisjoint() { + for (Condition c1 : Condition.values()) { + for (Condition c2 : Condition.values()) { + if (c1.trueIsDisjoint(c2)) { + for (int v1 : intBoundaryValues) { + for (int v2 : intBoundaryValues) { + JavaConstant a = JavaConstant.forInt(v1); + JavaConstant b = JavaConstant.forInt(v2); + boolean result1 = c1.foldCondition(a, b, null, false); + boolean result2 = c2.foldCondition(a, b, null, false); + // If these conditions are disjoint then both conditions can't evaluate + // to true for the same inputs. + assertFalse(String.format("%s %s %s (%s) is not disjoint from %s %s %s (%s)", a, c1, b, result1, a, c2, b, result2), result1 && result2); + } + } + } + } + } + } + } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GuardPrioritiesTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GuardPrioritiesTest.java index 61a23420b6d..de2f08855ca 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GuardPrioritiesTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GuardPrioritiesTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, 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 @@ -93,7 +93,7 @@ public class GuardPrioritiesTest extends GraphScheduleTest { return graph; } - public int unknownCondition(Integer c, Object o, int[] a, Integer i) { + public int unknownCondition(int c, Object o, int[] a, int i) { if (o != null) { GraalDirectives.deoptimizeAndInvalidate(); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IfCanonicalizerSwapTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IfCanonicalizerSwapTest.java new file mode 100644 index 00000000000..f1712737472 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IfCanonicalizerSwapTest.java @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.core.test; + +import static org.graalvm.compiler.api.directives.GraalDirectives.injectBranchProbability; + +import org.junit.Test; + +/** + * Test extracted from reproducer in https://github.com/oracle/graal/issues/2493. + */ +public class IfCanonicalizerSwapTest extends GraalCompilerTest { + public static String testSnippet1(long value) { + if (injectBranchProbability(0.50, value >= 0L) && injectBranchProbability(0.00, value <= 35L)) { + return "JustRight"; + } else { + if (injectBranchProbability(0.50, value > 35L)) { + return "TooHot"; + } else { + return "TooCold"; + } + } + } + + @Test + public void test1() { + test("testSnippet1", -1L); + test("testSnippet1", 100L); + test("testSnippet1", 10L); + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LateMembarInsertionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LateMembarInsertionTest.java index b8a0c3eff2e..591de0a36cf 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LateMembarInsertionTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LateMembarInsertionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2019, Red Hat Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -26,17 +26,20 @@ package org.graalvm.compiler.core.test; +import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.meta.ConstantReflectionProvider; import jdk.vm.ci.meta.MetaAccessProvider; import jdk.vm.ci.meta.ResolvedJavaType; import jdk.internal.vm.compiler.collections.EconomicMap; import org.graalvm.compiler.core.common.type.Stamp; +import org.graalvm.compiler.graph.Node; import org.graalvm.compiler.nodes.ConstantNode; import org.graalvm.compiler.nodes.NodeView; import org.graalvm.compiler.nodes.StructuredGraph; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.cfg.Block; import org.graalvm.compiler.nodes.cfg.ControlFlowGraph; +import org.graalvm.compiler.nodes.extended.MembarNode; import org.graalvm.compiler.nodes.memory.FixedAccessNode; import org.graalvm.compiler.nodes.memory.MemoryAccess; import org.graalvm.compiler.nodes.memory.ReadNode; @@ -78,7 +81,7 @@ public class LateMembarInsertionTest extends GraalCompilerTest { @Test public void test01() { - List accesses = compile("volatileFieldLoadFieldLoad", stressTestEarlyReads()); + List accesses = getAccesses("volatileFieldLoadFieldLoad", stressTestEarlyReads()); Assert.assertEquals(accesses.size(), 2); Assert.assertEquals(accesses.get(0).getType(), volatileAccessType); @@ -95,7 +98,7 @@ public class LateMembarInsertionTest extends GraalCompilerTest { @Test public void test02() { - List accesses = compile("volatileFieldLoadVolatileFieldLoad", stressTestEarlyReads()); + List accesses = getAccesses("volatileFieldLoadVolatileFieldLoad", stressTestEarlyReads()); Assert.assertEquals(accesses.size(), 2); Assert.assertEquals(accesses.get(0).getType(), volatileAccessType); @@ -112,7 +115,7 @@ public class LateMembarInsertionTest extends GraalCompilerTest { @Test public void test03() { - List accesses = compile("volatileFieldLoadVolatileFieldStore"); + List accesses = getAccesses("volatileFieldLoadVolatileFieldStore"); Assert.assertEquals(accesses.size(), 2); Assert.assertEquals(accesses.get(0).getType(), volatileAccessType); @@ -128,7 +131,7 @@ public class LateMembarInsertionTest extends GraalCompilerTest { @Test public void test04() { - List accesses = compile("volatileFieldStoreVolatileFieldLoad", stressTestEarlyReads()); + List accesses = getAccesses("volatileFieldStoreVolatileFieldLoad", stressTestEarlyReads()); Assert.assertEquals(accesses.size(), 2); Assert.assertEquals(accesses.get(0).getType(), volatileAccessType); @@ -145,7 +148,7 @@ public class LateMembarInsertionTest extends GraalCompilerTest { @Test public void test05() { - List accesses = compile("fieldLoadVolatileFieldStore"); + List accesses = getAccesses("fieldLoadVolatileFieldStore"); Assert.assertEquals(accesses.size(), 2); Assert.assertEquals(accesses.get(0).getType(), regularAccessField); @@ -161,7 +164,7 @@ public class LateMembarInsertionTest extends GraalCompilerTest { @Test public void test06() { - List accesses = compile("volatileFieldStoreVolatileFieldStore"); + List accesses = getAccesses("volatileFieldStoreVolatileFieldStore"); Assert.assertEquals(accesses.size(), 2); Assert.assertEquals(accesses.get(0).getType(), volatileAccessType); @@ -170,6 +173,119 @@ public class LateMembarInsertionTest extends GraalCompilerTest { Assert.assertTrue(accesses.get(1).isWrite()); } + public static int volatileFieldLoad() { + return VolatileAccess.field; + } + + @Test + public void test07() { + verifyMembars("volatileFieldLoad", membarsExpected()); + } + + private boolean membarsExpected() { + return !(getTarget().arch instanceof AArch64); + } + + public static void volatileFieldStore(int v) { + VolatileAccess.field = v; + } + + @Test + public void test08() { + verifyMembars("volatileFieldStore", membarsExpected()); + } + + // Unused field load should be optimized out and leave no barrier behind + @SuppressWarnings("unused") + public static void volatileFieldStoreUnusedVolatileFieldLoadVolatileFieldStore(int v2) { + VolatileAccess2.field = v2; + int v1 = VolatileAccess.field; + VolatileAccess2.field = v2; + } + + @Test + public void test09() { + StructuredGraph graph = getFinalGraph(getResolvedJavaMethod("volatileFieldStoreUnusedVolatileFieldLoadVolatileFieldStore")); + List accesses = getAccesses(graph); + + Assert.assertEquals(accesses.size(), 2); + Assert.assertEquals(accesses.get(0).getType(), volatileAccess2Type); + Assert.assertEquals(accesses.get(1).getType(), volatileAccess2Type); + Assert.assertTrue(accesses.get(0).isWrite()); + Assert.assertTrue(accesses.get(1).isWrite()); + Assert.assertEquals(membarsExpected() ? 4 : 0, getMembars(graph).size()); + } + + // Unused field load should be optimized out and leave no barrier behind + @SuppressWarnings("unused") + public static void unusedVolatileFieldLoadVolatileFieldStore(int v2) { + int v1 = VolatileAccess.field; + VolatileAccess2.field = v2; + } + + @Test + public void test10() { + StructuredGraph graph = getFinalGraph(getResolvedJavaMethod("unusedVolatileFieldLoadVolatileFieldStore")); + List accesses = getAccesses(graph); + + Assert.assertEquals(accesses.size(), 1); + Assert.assertEquals(accesses.get(0).getType(), volatileAccess2Type); + Assert.assertTrue(accesses.get(0).isWrite()); + Assert.assertEquals(membarsExpected() ? 2 : 0, getMembars(graph).size()); + } + + public static int unsafeVolatileFieldLoad(Object o, long offset) { + return UNSAFE.getIntVolatile(o, offset); + } + + @Test + public void test11() { + verifyMembars("unsafeVolatileFieldLoad", membarsExpected()); + } + + public static void unsafeVolatileFieldStore(Object o, long offset, int v) { + UNSAFE.putIntVolatile(o, offset, v); + } + + @Test + public void test12() { + verifyMembars("unsafeVolatileFieldStore", membarsExpected()); + } + + private void verifyMembars(String method, boolean expectsMembar) { + StructuredGraph graph = getFinalGraph(getResolvedJavaMethod(method)); + StructuredGraph.ScheduleResult schedule = graph.getLastSchedule(); + ControlFlowGraph cfg = schedule.getCFG(); + Block[] blocks = cfg.getBlocks(); + Assert.assertEquals(blocks.length, 1); + Block block = blocks[0]; + List nodes = schedule.nodesFor(block); + Node preBarrier = null; + Node postBarrier = null; + Node mem = null; + for (int i = 0; i < nodes.size(); i++) { + Node node = nodes.get(i); + if (node instanceof MembarNode) { + if (preBarrier == null) { + Assert.assertNull(mem); + preBarrier = node; + } else { + Assert.assertNull(postBarrier); + Assert.assertNotNull(mem); + postBarrier = node; + } + } else if (node instanceof MemoryAccess) { + Assert.assertEquals(preBarrier != null, expectsMembar); + Assert.assertNull(postBarrier); + Assert.assertNull(mem); + mem = node; + } + } + Assert.assertEquals(preBarrier != null, expectsMembar); + Assert.assertEquals(postBarrier != null, expectsMembar); + Assert.assertNotNull(mem); + } + private static OptionValues stressTestEarlyReads() { EconomicMap, Object> overrides = OptionValues.newOptionMap(); overrides.put(StressTestEarlyReads, true); @@ -198,7 +314,7 @@ public class LateMembarInsertionTest extends GraalCompilerTest { } } - private List compile(String test, OptionValues options) { + private List getAccesses(String test, OptionValues options) { StructuredGraph graph = getFinalGraph(getResolvedJavaMethod(test), options); return getAccesses(graph); } @@ -212,7 +328,7 @@ public class LateMembarInsertionTest extends GraalCompilerTest { n -> new TypePair(n instanceof ReadNode, classForAccess((FixedAccessNode) n))).collect(Collectors.toList()); } - private List compile(String test) { + private List getAccesses(String test) { StructuredGraph graph = getFinalGraph(getResolvedJavaMethod(test)); return getAccesses(graph); } @@ -230,4 +346,11 @@ public class LateMembarInsertionTest extends GraalCompilerTest { return javaType; } + private static List getMembars(StructuredGraph graph) { + StructuredGraph.ScheduleResult schedule = graph.getLastSchedule(); + ControlFlowGraph cfg = schedule.getCFG(); + Block[] blocks = cfg.getBlocks(); + + return Arrays.stream(blocks).flatMap(b -> schedule.nodesFor(b).stream()).filter(n -> n instanceof MembarNode).collect(Collectors.toList()); + } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LockEliminationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LockEliminationTest.java index cfcf2094c01..a42cfecdba2 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LockEliminationTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LockEliminationTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -28,8 +28,8 @@ import org.graalvm.compiler.loop.DefaultLoopPolicies; import org.graalvm.compiler.loop.phases.LoopFullUnrollPhase; import org.graalvm.compiler.nodes.StructuredGraph; import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; +import org.graalvm.compiler.nodes.java.MonitorEnterNode; import org.graalvm.compiler.nodes.java.MonitorExitNode; -import org.graalvm.compiler.nodes.java.RawMonitorEnterNode; import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.phases.common.CanonicalizerPhase; import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase; @@ -71,7 +71,7 @@ public class LockEliminationTest extends GraalCompilerTest { StructuredGraph graph = getGraph("testSynchronizedSnippet", false); createCanonicalizerPhase().apply(graph, getProviders()); new LockEliminationPhase().apply(graph); - assertDeepEquals(1, graph.getNodes().filter(RawMonitorEnterNode.class).count()); + assertDeepEquals(1, graph.getNodes().filter(MonitorEnterNode.class).count()); assertDeepEquals(1, graph.getNodes().filter(MonitorExitNode.class).count()); } @@ -89,7 +89,7 @@ public class LockEliminationTest extends GraalCompilerTest { StructuredGraph graph = getGraph("testSynchronizedMethodSnippet", false); createCanonicalizerPhase().apply(graph, getProviders()); new LockEliminationPhase().apply(graph); - assertDeepEquals(1, graph.getNodes().filter(RawMonitorEnterNode.class).count()); + assertDeepEquals(1, graph.getNodes().filter(MonitorEnterNode.class).count()); assertDeepEquals(1, graph.getNodes().filter(MonitorExitNode.class).count()); } @@ -109,7 +109,7 @@ public class LockEliminationTest extends GraalCompilerTest { HighTierContext context = getDefaultHighTierContext(); new LoopFullUnrollPhase(canonicalizer, new DefaultLoopPolicies()).apply(graph, context); new LockEliminationPhase().apply(graph); - assertDeepEquals(1, graph.getNodes().filter(RawMonitorEnterNode.class).count()); + assertDeepEquals(1, graph.getNodes().filter(MonitorEnterNode.class).count()); assertDeepEquals(1, graph.getNodes().filter(MonitorExitNode.class).count()); } @@ -157,12 +157,12 @@ public class LockEliminationTest extends GraalCompilerTest { public void testEscapeAnalysis() { StructuredGraph graph = getGraph("testEscapeAnalysisSnippet", true); - assertDeepEquals(3, graph.getNodes().filter(RawMonitorEnterNode.class).count()); + assertDeepEquals(3, graph.getNodes().filter(MonitorEnterNode.class).count()); assertDeepEquals(3, graph.getNodes().filter(MonitorExitNode.class).count()); new LockEliminationPhase().apply(graph); - assertDeepEquals(2, graph.getNodes().filter(RawMonitorEnterNode.class).count()); + assertDeepEquals(2, graph.getNodes().filter(MonitorEnterNode.class).count()); assertDeepEquals(2, graph.getNodes().filter(MonitorExitNode.class).count()); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LongNodeChainTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LongNodeChainTest.java index aa54d3fad3b..8b4f34d9421 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LongNodeChainTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LongNodeChainTest.java @@ -24,12 +24,7 @@ package org.graalvm.compiler.core.test; -import jdk.vm.ci.meta.JavaConstant; - -import org.junit.Assert; -import org.junit.Test; -import org.graalvm.compiler.debug.DebugHandlersFactory; -import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.DebugContext.Builder; import org.graalvm.compiler.nodes.ConstantNode; import org.graalvm.compiler.nodes.ReturnNode; import org.graalvm.compiler.nodes.StructuredGraph; @@ -40,6 +35,10 @@ import org.graalvm.compiler.options.OptionValues; import org.graalvm.compiler.phases.schedule.SchedulePhase; import org.graalvm.compiler.phases.schedule.SchedulePhase.SchedulingStrategy; import org.graalvm.compiler.phases.tiers.HighTierContext; +import org.junit.Assert; +import org.junit.Test; + +import jdk.vm.ci.meta.JavaConstant; public class LongNodeChainTest extends GraalCompilerTest { @@ -56,7 +55,7 @@ public class LongNodeChainTest extends GraalCompilerTest { private void longAddChain(boolean reverse) { HighTierContext context = getDefaultHighTierContext(); OptionValues options = getInitialOptions(); - StructuredGraph graph = new StructuredGraph.Builder(options, DebugContext.create(options, DebugHandlersFactory.LOADER)).build(); + StructuredGraph graph = new StructuredGraph.Builder(options, new Builder(options).build()).build(); ValueNode constant = graph.unique(ConstantNode.forPrimitive(JavaConstant.INT_1)); ValueNode value = null; if (reverse) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryGraphCanonicalizeTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryGraphCanonicalizeTest.java index 6236a750073..b26f86d82d3 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryGraphCanonicalizeTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryGraphCanonicalizeTest.java @@ -25,13 +25,11 @@ package org.graalvm.compiler.core.test; +import org.graalvm.compiler.api.test.Graal; import org.graalvm.compiler.nodes.StructuredGraph; import org.graalvm.compiler.nodes.memory.WriteNode; -import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.phases.common.FloatingReadPhase; -import org.graalvm.compiler.phases.common.IncrementalCanonicalizerPhase; -import org.graalvm.compiler.phases.common.LoweringPhase; -import org.graalvm.compiler.phases.tiers.HighTierContext; +import org.graalvm.compiler.phases.tiers.Suites; +import org.graalvm.compiler.runtime.RuntimeProvider; import org.junit.Test; public class MemoryGraphCanonicalizeTest extends GraalCompilerTest { @@ -69,15 +67,15 @@ public class MemoryGraphCanonicalizeTest extends GraalCompilerTest { @Test public void testComplexElimination() { - testGraph("complexElimination", 6); + testGraph("complexElimination", 5); } public void testGraph(String name, int expectedWrites) { StructuredGraph graph = parseEager(name, StructuredGraph.AllowAssumptions.YES); - HighTierContext context = getDefaultHighTierContext(); - new LoweringPhase(createCanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context); - new IncrementalCanonicalizerPhase<>(createCanonicalizerPhase(), new FloatingReadPhase()).apply(graph, context); - createCanonicalizerPhase().apply(graph, context); + Suites s = Graal.getRequiredCapability(RuntimeProvider.class).getHostBackend().getSuites().getDefaultSuites(getInitialOptions()); + s.getHighTier().apply(graph, getDefaultHighTierContext()); + s.getMidTier().apply(graph, getDefaultMidTierContext()); + int writes = graph.getNodes().filter(WriteNode.class).count(); assertTrue(writes == expectedWrites, "Expected %d writes, found %d", expectedWrites, writes); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryScheduleTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryScheduleTest.java index df1e4fcfdd1..5e27ff4d984 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryScheduleTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryScheduleTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -40,6 +40,7 @@ import org.graalvm.compiler.graph.iterators.NodeIterable; import org.graalvm.compiler.nodes.ReturnNode; import org.graalvm.compiler.nodes.StructuredGraph; import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; +import org.graalvm.compiler.nodes.StructuredGraph.GuardsStage; import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult; import org.graalvm.compiler.nodes.cfg.Block; import org.graalvm.compiler.nodes.memory.FloatingReadNode; @@ -699,16 +700,20 @@ public class MemoryScheduleTest extends GraphScheduleTest { createInliningPhase(canonicalizer).apply(graph, context); } new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context); - if (mode == TestMode.WITHOUT_FRAMESTATES || mode == TestMode.INLINED_WITHOUT_FRAMESTATES) { - graph.clearAllStateAfter(); - } - debug.dump(DebugContext.BASIC_LEVEL, graph, "after removal of framestates"); new FloatingReadPhase().apply(graph); new RemoveValueProxyPhase().apply(graph); MidTierContext midContext = new MidTierContext(getProviders(), getTargetProvider(), OptimisticOptimizations.ALL, graph.getProfilingInfo()); new GuardLoweringPhase().apply(graph, midContext); + + if (mode == TestMode.WITHOUT_FRAMESTATES || mode == TestMode.INLINED_WITHOUT_FRAMESTATES) { + graph.clearAllStateAfter(); + // disable stat split verification + graph.setGuardsStage(GuardsStage.AFTER_FSA); + } + debug.dump(DebugContext.BASIC_LEVEL, graph, "after removal of framestates"); + new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.MID_TIER).apply(graph, midContext); new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.LOW_TIER).apply(graph, midContext); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NegateCanonicalizationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NegateCanonicalizationTest.java new file mode 100644 index 00000000000..5b8f08bff2b --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NegateCanonicalizationTest.java @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, Arm Limited and 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.core.test; + +import org.graalvm.compiler.nodes.StructuredGraph; +import org.graalvm.compiler.nodes.calc.NegateNode; +import org.graalvm.compiler.nodes.calc.RightShiftNode; +import org.graalvm.compiler.nodes.calc.UnsignedRightShiftNode; +import org.junit.Test; + +public class NegateCanonicalizationTest extends GraalCompilerTest { + + public static int negateInt(int x) { + return -(x >> 31); + } + + public static long negateLong(long x) { + return -(x >> 63); + } + + public static int signExtractInt(int x) { + return (x >> 31) >>> 31; + } + + public static long signExtractLong(long x) { + return (x >> 63) >>> 63; + } + + private void checkNodes(String methodName) { + StructuredGraph graph = parseForCompile(getResolvedJavaMethod(methodName)); + createCanonicalizerPhase().apply(graph, getProviders()); + assertTrue(graph.getNodes().filter(NegateNode.class).count() == 0); + assertTrue(graph.getNodes().filter(RightShiftNode.class).count() == 0); + assertTrue(graph.getNodes().filter(UnsignedRightShiftNode.class).count() == 1); + } + + @Test + public void testNegate() { + checkNodes("negateInt"); + checkNodes("negateLong"); + checkNodes("signExtractInt"); + checkNodes("signExtractLong"); + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NodePosIteratorTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NodePosIteratorTest.java index 11920b25f39..35df3db7971 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NodePosIteratorTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NodePosIteratorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -29,9 +29,8 @@ import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED; import java.util.Iterator; -import org.junit.Assert; -import org.junit.Test; - +import org.graalvm.compiler.core.common.PermanentBailoutException; +import org.graalvm.compiler.debug.DebugContext; import org.graalvm.compiler.graph.Node; import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.graph.NodeInputList; @@ -39,10 +38,15 @@ import org.graalvm.compiler.graph.NodeSuccessorList; import org.graalvm.compiler.graph.Position; import org.graalvm.compiler.graph.iterators.NodeIterable; import org.graalvm.compiler.nodeinfo.NodeInfo; +import org.graalvm.compiler.nodes.AbstractMergeNode; import org.graalvm.compiler.nodes.ConstantNode; import org.graalvm.compiler.nodes.EndNode; +import org.graalvm.compiler.nodes.MergeNode; +import org.graalvm.compiler.nodes.StructuredGraph; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.calc.FloatingNode; +import org.junit.Assert; +import org.junit.Test; public class NodePosIteratorTest extends GraalCompilerTest { @@ -63,6 +67,27 @@ public class NodePosIteratorTest extends GraalCompilerTest { } + @Test + public void testNodeInputIteratorLimit() { + DebugContext debug = getDebugContext(); + StructuredGraph graph = new StructuredGraph.Builder(debug.getOptions(), debug, + StructuredGraph.AllowAssumptions.YES).build(); + + AbstractMergeNode merge = graph.add(new MergeNode()); + for (int i = 0; i < 65536; i++) { + EndNode end = graph.add(new EndNode()); + merge.addForwardEnd(end); + } + merge.inputs().count(); + EndNode end = graph.add(new EndNode()); + try { + merge.addForwardEnd(end); + } catch (PermanentBailoutException e) { + return; + } + Assert.fail("Expected a permanent bailout exception due to too high number of inputs"); + } + @Test public void testInputs() { TestNode n = new TestNode(); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SchedulingTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SchedulingTest.java index 8195e18651b..b626bed73ef 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SchedulingTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SchedulingTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -62,6 +62,7 @@ public class SchedulingTest extends GraphScheduleTest { fs.replaceAtUsages(null); GraphUtil.killWithUnusedFloatingInputs(fs); } + graph.clearAllStateAfter(); SchedulePhase schedulePhase = new SchedulePhase(SchedulingStrategy.LATEST); schedulePhase.apply(graph); ScheduleResult schedule = graph.getLastSchedule(); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SimpleCFGTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SimpleCFGTest.java index 89e789188a2..1e724860e40 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SimpleCFGTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SimpleCFGTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -25,6 +25,7 @@ package org.graalvm.compiler.core.test; import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.DebugContext.Builder; import org.graalvm.compiler.nodes.AbstractBeginNode; import org.graalvm.compiler.nodes.AbstractMergeNode; import org.graalvm.compiler.nodes.BeginNode; @@ -51,7 +52,7 @@ public class SimpleCFGTest extends GraalCompilerTest { @Test public void testImplies() { OptionValues options = getInitialOptions(); - DebugContext debug = DebugContext.create(options, new GraalDebugHandlersFactory(getSnippetReflection())); + DebugContext debug = new Builder(options, new GraalDebugHandlersFactory(getSnippetReflection())).build(); StructuredGraph graph = new StructuredGraph.Builder(options, debug, AllowAssumptions.YES).build(); EndNode trueEnd = graph.add(new EndNode()); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StaticInterfaceFieldTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StaticInterfaceFieldTest.java index 1ba8f5fc16f..7ee69e1b740 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StaticInterfaceFieldTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StaticInterfaceFieldTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -30,8 +30,8 @@ import java.lang.reflect.Method; import org.graalvm.compiler.api.test.Graal; import org.graalvm.compiler.debug.DebugCloseable; -import org.graalvm.compiler.debug.DebugHandlersFactory; import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.DebugContext.Builder; import org.graalvm.compiler.java.GraphBuilderPhase; import org.graalvm.compiler.nodes.StructuredGraph; import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; @@ -93,7 +93,7 @@ public class StaticInterfaceFieldTest extends GraalTest { final Method m = getMethod(clazz, methodName); ResolvedJavaMethod method = metaAccess.lookupJavaMethod(m); OptionValues options = getInitialOptions(); - DebugContext debug = DebugContext.create(options, DebugHandlersFactory.LOADER); + DebugContext debug = new Builder(options).build(); StructuredGraph graph = new StructuredGraph.Builder(options, debug).method(method).build(); try (DebugCloseable s = debug.disableIntercept(); DebugContext.Scope ds = debug.scope("GraphBuilding", graph, method)) { graphBuilderSuite.apply(graph, context); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnsafeVirtualizationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnsafeVirtualizationTest.java index a70ebe82544..9373458d859 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnsafeVirtualizationTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnsafeVirtualizationTest.java @@ -282,6 +282,7 @@ public class UnsafeVirtualizationTest extends GraalCompilerTest { } else { UNSAFE.putLong(t, getUnsafeByteArrayOffset(0), l2); } + sideEffect(); if (c) { GraalDirectives.deoptimize(); } @@ -495,7 +496,7 @@ public class UnsafeVirtualizationTest extends GraalCompilerTest { VirtualObjectNode virtual = graph.getNodes().filter(VirtualObjectNode.class).first(); if (virtual instanceof VirtualArrayNode) { VirtualArrayNode array = (VirtualArrayNode) virtual; - if (array.isVirtualByteArray()) { + if (array.isVirtualByteArray(context.getMetaAccessExtensionProvider())) { canVirtualize = context.getPlatformConfigurationProvider().canVirtualizeLargeByteArrayAccess(); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnschedulableGraphTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnschedulableGraphTest.java new file mode 100644 index 00000000000..7d858de3aab --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnschedulableGraphTest.java @@ -0,0 +1,117 @@ +/* + * Copyright (c) 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.core.test; + +import static org.graalvm.compiler.debug.DebugOptions.DumpOnError; + +import java.util.List; + +import org.graalvm.compiler.api.directives.GraalDirectives; +import org.graalvm.compiler.core.common.cfg.BlockMap; +import org.graalvm.compiler.debug.DebugCloseable; +import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.TTY; +import org.graalvm.compiler.graph.Node; +import org.graalvm.compiler.graph.NodeMap; +import org.graalvm.compiler.nodes.StructuredGraph; +import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult; +import org.graalvm.compiler.nodes.calc.NegateNode; +import org.graalvm.compiler.nodes.cfg.Block; +import org.graalvm.compiler.nodes.extended.OpaqueNode; +import org.graalvm.compiler.options.OptionValues; +import org.junit.Assert; +import org.junit.Test; + +import jdk.vm.ci.meta.ResolvedJavaMethod; + +/** + * This test verifies that the backend detects graphs for which the scheduling is broken, i.e. input + * values are scheduled in non-dominating blocks causing illegal flow of values in the control flow + * graph. + */ +public class UnschedulableGraphTest extends GraalCompilerTest { + + public static int snippet01(int a, int b, int c) { + if (GraalDirectives.sideEffect(a) == b) { + GraalDirectives.sideEffect(b); + GraalDirectives.controlFlowAnchor(); + } else { + GraalDirectives.sideEffect(c); + GraalDirectives.controlFlowAnchor(); + } + GraalDirectives.sideEffect(); + GraalDirectives.controlFlowAnchor(); + return GraalDirectives.opaque(-a) + GraalDirectives.opaque(-b); + } + + @Override + protected void checkLowTierGraph(StructuredGraph graph) { + super.checkLowTierGraph(graph); + ScheduleResult res = graph.getLastSchedule(); + BlockMap> blockToNode = res.getBlockToNodesMap(); + NodeMap nodeToBlock = res.getNodeToBlockMap(); + Assert.assertEquals(4, res.getCFG().getBlocks().length); + Block split = res.getCFG().getStartBlock(); + Assert.assertEquals(2, split.getSuccessorCount()); + Block trueSucc = split.getSuccessors()[0]; + Block falseSucc = split.getSuccessors()[1]; + Block merge = trueSucc.getFirstSuccessor(); + Assert.assertEquals(merge, falseSucc.getFirstSuccessor()); + for (OpaqueNode op : graph.getNodes().filter(OpaqueNode.class)) { + Assert.assertEquals(merge, res.getNodeToBlockMap().get(op)); + } + int k = 0; + // destroy dominance relation for NegateNode nodes, they no longer dominate the addition + for (NegateNode op : graph.getNodes().filter(NegateNode.class)) { + final Block nonDominatingBlock = k++ % 2 == 0 ? trueSucc : falseSucc; + blockToNode.get(merge).remove(op); + blockToNode.get(nonDominatingBlock).add(0, op); + nodeToBlock.set(op, nonDominatingBlock); + } + graph.getDebug().dump(DebugContext.VERBOSE_LEVEL, graph, "After changing constant schedule"); + } + + private DebugContext getDebugContext(ResolvedJavaMethod method) { + OptionValues options = new OptionValues(getInitialOptions(), DumpOnError, false); + return getDebugContext(options, null, method); + } + + @Test + @SuppressWarnings("try") + public void test01() { + ResolvedJavaMethod method = getResolvedJavaMethod("snippet01"); + try (AutoCloseable c = new TTY.Filter(); + DebugContext debug = getDebugContext(method); + DebugCloseable s = debug.disableIntercept()) { + test("snippet01", 0, 1, 2); + Assert.fail("Compilation should not reach this point, must throw an exception before"); + } catch (Throwable t) { + if (t.getMessage().contains("liveIn set of first block must be empty")) { + return; + } + throw new AssertionError(t); + } + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyBailoutUsageTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyBailoutUsageTest.java index 427bf523490..267f1ffb042 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyBailoutUsageTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyBailoutUsageTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -33,8 +33,8 @@ import org.graalvm.compiler.api.test.Graal; import org.graalvm.compiler.core.common.PermanentBailoutException; import org.graalvm.compiler.core.common.RetryableBailoutException; import org.graalvm.compiler.debug.DebugCloseable; -import org.graalvm.compiler.debug.DebugHandlersFactory; import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.DebugContext.Builder; import org.graalvm.compiler.debug.GraalError; import org.graalvm.compiler.java.GraphBuilderPhase; import org.graalvm.compiler.nodes.StructuredGraph; @@ -128,7 +128,7 @@ public class VerifyBailoutUsageTest { graphBuilderSuite.appendPhase(new GraphBuilderPhase(config)); HighTierContext context = new HighTierContext(providers, graphBuilderSuite, OptimisticOptimizations.NONE); OptionValues options = getInitialOptions(); - DebugContext debug = DebugContext.create(options, DebugHandlersFactory.LOADER); + DebugContext debug = new Builder(options).build(); for (Method m : c.getDeclaredMethods()) { if (!Modifier.isNative(m.getModifiers()) && !Modifier.isAbstract(m.getModifiers())) { ResolvedJavaMethod method = metaAccess.lookupJavaMethod(m); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyDebugUsage.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyDebugUsage.java index e840d107068..ede9a59e1ec 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyDebugUsage.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyDebugUsage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -144,8 +144,8 @@ public class VerifyDebugUsage extends VerifyPhase { "org.graalvm.compiler.phases.BasePhase.dumpAfter", "org.graalvm.compiler.phases.BasePhase.dumpBefore", "org.graalvm.compiler.core.GraalCompiler.emitFrontEnd", - "org.graalvm.compiler.truffle.compiler.PartialEvaluator.fastPartialEvaluation", - "org.graalvm.compiler.truffle.compiler.PartialEvaluator$PerformanceInformationHandler.reportPerformanceWarnings", + "org.graalvm.compiler.truffle.compiler.PartialEvaluator.inliningGraphPE", + "org.graalvm.compiler.truffle.compiler.PerformanceInformationHandler.reportPerformanceWarnings", "org.graalvm.compiler.truffle.compiler.TruffleCompilerImpl.compilePEGraph", "org.graalvm.compiler.core.test.VerifyDebugUsageTest$ValidDumpUsagePhase.run", "org.graalvm.compiler.core.test.VerifyDebugUsageTest$InvalidConcatDumpUsagePhase.run", diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyDebugUsageTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyDebugUsageTest.java index cfed3ec4086..4ab782499df 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyDebugUsageTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyDebugUsageTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -31,8 +31,8 @@ import java.lang.reflect.Modifier; import org.graalvm.compiler.api.test.Graal; import org.graalvm.compiler.debug.DebugCloseable; -import org.graalvm.compiler.debug.DebugHandlersFactory; import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.DebugContext.Builder; import org.graalvm.compiler.debug.GraalError; import org.graalvm.compiler.debug.Indent; import org.graalvm.compiler.graph.Node; @@ -349,7 +349,7 @@ public class VerifyDebugUsageTest { graphBuilderSuite.appendPhase(new GraphBuilderPhase(config)); HighTierContext context = new HighTierContext(providers, graphBuilderSuite, OptimisticOptimizations.NONE); OptionValues options = getInitialOptions(); - DebugContext debug = DebugContext.create(options, DebugHandlersFactory.LOADER); + DebugContext debug = new Builder(options).build(); for (Method m : c.getDeclaredMethods()) { if (!Modifier.isNative(m.getModifiers()) && !Modifier.isAbstract(m.getModifiers())) { ResolvedJavaMethod method = metaAccess.lookupJavaMethod(m); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyVirtualizableTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyVirtualizableTest.java index b04f67acbaf..aa269da38a2 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyVirtualizableTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyVirtualizableTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -34,8 +34,8 @@ import java.lang.reflect.Modifier; import org.graalvm.compiler.api.test.Graal; import org.graalvm.compiler.core.common.type.StampFactory; import org.graalvm.compiler.debug.DebugCloseable; -import org.graalvm.compiler.debug.DebugHandlersFactory; import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.DebugContext.Builder; import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.java.GraphBuilderPhase; import org.graalvm.compiler.nodeinfo.NodeInfo; @@ -273,7 +273,7 @@ public class VerifyVirtualizableTest { graphBuilderSuite.appendPhase(new GraphBuilderPhase(config)); HighTierContext context = new HighTierContext(providers, graphBuilderSuite, OptimisticOptimizations.NONE); OptionValues options = getInitialOptions(); - DebugContext debug = DebugContext.create(options, DebugHandlersFactory.LOADER); + DebugContext debug = new Builder(options).build(); for (Method m : c.getDeclaredMethods()) { if (!Modifier.isNative(m.getModifiers()) && !Modifier.isAbstract(m.getModifiers())) { ResolvedJavaMethod method = metaAccess.lookupJavaMethod(m); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EATestBase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EATestBase.java index 87cc336f526..cde9141018f 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EATestBase.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EATestBase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisTest.java index 4b57eb7a1dd..5093c980519 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisTest.java @@ -26,14 +26,9 @@ package org.graalvm.compiler.core.test.ea; import java.lang.ref.SoftReference; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; - import org.graalvm.compiler.api.directives.GraalDirectives; import org.graalvm.compiler.core.test.TypeSystemTest; import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.AbstractMergeNode; import org.graalvm.compiler.nodes.ReturnNode; import org.graalvm.compiler.nodes.cfg.ControlFlowGraph; import org.graalvm.compiler.nodes.extended.BoxNode; @@ -45,6 +40,9 @@ import org.graalvm.compiler.nodes.java.NewInstanceNode; import org.graalvm.compiler.nodes.java.StoreFieldNode; import org.graalvm.compiler.nodes.virtual.CommitAllocationNode; import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; /** * The PartialEscapeAnalysisPhase is expected to remove all allocations and return the correct @@ -282,9 +280,7 @@ public class PartialEscapeAnalysisTest extends EATestBase { @SafeVarargs protected final void testPartialEscapeAnalysis(String snippet, double expectedProbability, int expectedCount, Class... invalidNodeClasses) { prepareGraph(snippet, false); - for (AbstractMergeNode merge : graph.getNodes(AbstractMergeNode.TYPE)) { - merge.setStateAfter(null); - } + graph.clearAllStateAfter(); new DeadCodeEliminationPhase().apply(graph); createCanonicalizerPhase().apply(graph, context); try { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/InvokeGraal.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/InvokeGraal.java index 362b5f3bd10..81075f1d8d3 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/InvokeGraal.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/InvokeGraal.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -34,8 +34,8 @@ import org.graalvm.compiler.code.CompilationResult; import org.graalvm.compiler.core.GraalCompiler; import org.graalvm.compiler.core.common.CompilationIdentifier; import org.graalvm.compiler.core.target.Backend; -import org.graalvm.compiler.debug.DebugHandlersFactory; import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.DebugContext.Builder; import org.graalvm.compiler.debug.DebugDumpScope; import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory; import org.graalvm.compiler.lir.phases.LIRSuites; @@ -88,7 +88,7 @@ public class InvokeGraal { /* Create a unique compilation identifier, visible in IGV. */ CompilationIdentifier compilationId = backend.getCompilationIdentifier(method); OptionValues options = getInitialOptions(); - DebugContext debug = DebugContext.create(options, DebugHandlersFactory.LOADER); + DebugContext debug = new Builder(options).build(); try (DebugContext.Scope s = debug.scope("compileAndInstallMethod", new DebugDumpScope(String.valueOf(compilationId), true))) { /* diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/StaticAnalysis.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/StaticAnalysis.java index fcedb865eec..d1a00198466 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/StaticAnalysis.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/StaticAnalysis.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -35,7 +35,7 @@ import java.util.Map; import java.util.Set; import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugHandlersFactory; +import org.graalvm.compiler.debug.DebugContext.Builder; import org.graalvm.compiler.debug.GraalError; import org.graalvm.compiler.graph.Node; import org.graalvm.compiler.graph.NodeMap; @@ -246,7 +246,7 @@ public class StaticAnalysis { */ OptionValues options = getInitialOptions(); - DebugContext debug = DebugContext.create(options, DebugHandlersFactory.LOADER); + DebugContext debug = new Builder(options).build(); StructuredGraph graph = new StructuredGraph.Builder(options, debug).method(method).build(); /* * Support for graph dumping, IGV uses this information to show the method name of a diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/CompilationWrapper.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/CompilationWrapper.java index 7c27cb18869..0d34bc0e002 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/CompilationWrapper.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/CompilationWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, 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 @@ -30,7 +30,6 @@ import static org.graalvm.compiler.core.GraalCompilerOptions.CompilationFailureA import static org.graalvm.compiler.core.GraalCompilerOptions.ExitVMOnException; import static org.graalvm.compiler.core.GraalCompilerOptions.MaxCompilationProblemsPerAction; import static org.graalvm.compiler.core.common.GraalOptions.TrackNodeSourcePosition; -import static org.graalvm.compiler.debug.DebugContext.VERBOSE_LEVEL; import static org.graalvm.compiler.debug.DebugOptions.Dump; import static org.graalvm.compiler.debug.DebugOptions.DumpPath; import static org.graalvm.compiler.debug.DebugOptions.MethodFilter; @@ -43,6 +42,7 @@ import java.io.PrintStream; import java.util.Map; import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.DebugOptions; import org.graalvm.compiler.debug.DiagnosticsOutputDirectory; import org.graalvm.compiler.debug.PathUtilities; import org.graalvm.compiler.debug.TTY; @@ -276,7 +276,7 @@ public abstract class CompilationWrapper { } OptionValues retryOptions = new OptionValues(initialOptions, - Dump, ":" + VERBOSE_LEVEL, + Dump, ":" + DebugOptions.DiagnoseDumpLevel.getValue(initialOptions), MethodFilter, null, DumpPath, dumpPath.getPath(), TrackNodeSourcePosition, true); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/GraalCompiler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/GraalCompiler.java index 31c5df284e1..ba49fff899a 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/GraalCompiler.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/GraalCompiler.java @@ -31,6 +31,7 @@ import org.graalvm.compiler.core.common.util.CompilationAlarm; import org.graalvm.compiler.core.target.Backend; import org.graalvm.compiler.debug.DebugCloseable; import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.DebugContext.CompilerPhaseScope; import org.graalvm.compiler.debug.MethodFilter; import org.graalvm.compiler.debug.TimerKey; import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory; @@ -208,9 +209,11 @@ public class GraalCompiler { try (DebugContext.Scope s = debug.scope("FrontEnd"); DebugCloseable a = FrontEnd.start(debug)) { HighTierContext highTierContext = new HighTierContext(providers, graphBuilderSuite, optimisticOpts); if (graph.start().next() == null) { - graphBuilderSuite.apply(graph, highTierContext); - new DeadCodeEliminationPhase(DeadCodeEliminationPhase.Optionality.Optional).apply(graph); - debug.dump(DebugContext.BASIC_LEVEL, graph, "After parsing"); + try (CompilerPhaseScope cps = debug.enterCompilerPhase("Parsing")) { + graphBuilderSuite.apply(graph, highTierContext); + new DeadCodeEliminationPhase(DeadCodeEliminationPhase.Optionality.Optional).apply(graph); + debug.dump(DebugContext.BASIC_LEVEL, graph, "After parsing"); + } } else { debug.dump(DebugContext.INFO_LEVEL, graph, "initial state"); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/GraalServiceThread.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/GraalServiceThread.java index 23dca78c5dd..b96801a398e 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/GraalServiceThread.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/GraalServiceThread.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, 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 @@ -49,16 +49,16 @@ public class GraalServiceThread extends Thread { /** * Substituted by {@code com.oracle.svm.graal.hotspot.libgraal. - * Target_org_graalvm_compiler_truffle_common_TruffleCompilerRuntimeInstance} to attach to the - * peer runtime if required. + * Target_org_graalvm_compiler_core_GraalServiceThread} to attach to the peer runtime if + * required. */ private void afterRun() { } /** * Substituted by {@code com.oracle.svm.graal.hotspot.libgraal. - * Target_org_graalvm_compiler_truffle_common_TruffleCompilerRuntimeInstance} to attach to the - * peer runtime if required. + * Target_org_graalvm_compiler_core_GraalServiceThread} to attach to the peer runtime if + * required. */ private void beforeRun() { } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/doc-files/CompilationFailureActionHelp.txt b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/doc-files/CompilationFailureActionHelp.txt index b8a739e411f..76572b4092d 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/doc-files/CompilationFailureActionHelp.txt +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/doc-files/CompilationFailureActionHelp.txt @@ -1,6 +1,11 @@ Specifies the action to take when compilation fails. + The accepted values are: - Silent - Print nothing to the console. - Print - Print a stack trace to the console. - Diagnose - Retry the compilation with extra diagnostics. - ExitVM - Same as Diagnose except that the VM process exits after retrying. \ No newline at end of file + Silent - Print nothing to the console. + Print - Print a stack trace to the console. + Diagnose* - Retry the compilation with extra diagnostics. + ExitVM - Same as Diagnose except that the VM process exits after retrying. + +* If "Diagnose" is set compilation will be retried with extra diagnostics enabled including dumping (see file:doc-files/DumpHelp.txt). + In such a scenario DiagnoseDumpLevel can be used to specify the dump level (DebugContext dump levels) accordingly. + \ No newline at end of file diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/DebugInfoBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/DebugInfoBuilder.java index 49c26cbe60f..43e126b4dc0 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/DebugInfoBuilder.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/DebugInfoBuilder.java @@ -30,6 +30,7 @@ import java.util.Queue; import jdk.internal.vm.compiler.collections.EconomicMap; import jdk.internal.vm.compiler.collections.Equivalence; +import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider; import org.graalvm.compiler.debug.CounterKey; import org.graalvm.compiler.debug.DebugContext; import org.graalvm.compiler.debug.GraalError; @@ -66,10 +67,12 @@ import jdk.vm.ci.meta.Value; public class DebugInfoBuilder { protected final NodeValueMap nodeValueMap; + protected final MetaAccessExtensionProvider metaAccessExtensionProvider; protected final DebugContext debug; - public DebugInfoBuilder(NodeValueMap nodeValueMap, DebugContext debug) { + public DebugInfoBuilder(NodeValueMap nodeValueMap, MetaAccessExtensionProvider metaAccessExtensionProvider, DebugContext debug) { this.nodeValueMap = nodeValueMap; + this.metaAccessExtensionProvider = metaAccessExtensionProvider; this.debug = debug; } @@ -129,7 +132,7 @@ public class DebugInfoBuilder { for (int i = 0; i < entryCount; i++) { ValueNode value = currentField.values().get(i); if (value == null) { - JavaKind entryKind = vobjNode.entryKind(i); + JavaKind entryKind = vobjNode.entryKind(metaAccessExtensionProvider, i); values[pos] = JavaConstant.defaultForKind(entryKind.getStackKind()); slotKinds[pos] = entryKind.getStackKind(); pos++; @@ -140,9 +143,9 @@ public class DebugInfoBuilder { } else { assert value.getStackKind() == JavaKind.Illegal; ValueNode previousValue = currentField.values().get(i - 1); - assert (previousValue != null && (previousValue.getStackKind().needsTwoSlots()) || vobjNode.isVirtualByteArray()) : vobjNode + " " + i + + assert (previousValue != null && (previousValue.getStackKind().needsTwoSlots()) || vobjNode.isVirtualByteArray(metaAccessExtensionProvider)) : vobjNode + " " + i + " " + previousValue + " " + currentField.values().snapshot(); - if (vobjNode.isVirtualByteArray()) { + if (vobjNode.isVirtualByteArray(metaAccessExtensionProvider)) { /* * Let Illegals pass through to help knowing the number of bytes to * write. For example, writing a short to index 2 of a byte array of @@ -158,7 +161,7 @@ public class DebugInfoBuilder { pos++; } else if (previousValue == null || !previousValue.getStackKind().needsTwoSlots()) { // Don't allow the IllegalConstant to leak into the debug info - JavaKind entryKind = vobjNode.entryKind(i); + JavaKind entryKind = vobjNode.entryKind(metaAccessExtensionProvider, i); values[pos] = JavaConstant.defaultForKind(entryKind.getStackKind()); slotKinds[pos] = entryKind.getStackKind(); pos++; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/LIRCompilerBackend.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/LIRCompilerBackend.java index 8f2f2886318..4db96954afa 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/LIRCompilerBackend.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/LIRCompilerBackend.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, 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 @@ -39,6 +39,7 @@ import org.graalvm.compiler.core.target.Backend; import org.graalvm.compiler.debug.CounterKey; import org.graalvm.compiler.debug.DebugCloseable; import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.DebugContext.CompilerPhaseScope; import org.graalvm.compiler.debug.GraalError; import org.graalvm.compiler.debug.TimerKey; import org.graalvm.compiler.lir.LIR; @@ -200,7 +201,7 @@ public class LIRCompilerBackend { ResolvedJavaMethod installedCodeOwner, CompilationResultBuilderFactory factory) { DebugContext debug = lirGenRes.getLIR().getDebug(); - try (DebugCloseable a = EmitCode.start(debug)) { + try (DebugCloseable a = EmitCode.start(debug); CompilerPhaseScope cps = debug.enterCompilerPhase("Emit code");) { LIRGenerationProvider lirBackend = (LIRGenerationProvider) backend; FrameMap frameMap = lirGenRes.getFrameMap(); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/NodeLIRBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/NodeLIRBuilder.java index e3dfa5d7a63..07725a45a56 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/NodeLIRBuilder.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/NodeLIRBuilder.java @@ -43,6 +43,7 @@ import org.graalvm.compiler.core.common.LIRKind; import org.graalvm.compiler.core.common.calc.Condition; import org.graalvm.compiler.core.common.cfg.AbstractBlockBase; import org.graalvm.compiler.core.common.cfg.BlockMap; +import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; import org.graalvm.compiler.core.common.type.Stamp; import org.graalvm.compiler.core.match.ComplexMatchValue; import org.graalvm.compiler.core.match.MatchPattern; @@ -99,6 +100,8 @@ import org.graalvm.compiler.nodes.calc.IntegerTestNode; import org.graalvm.compiler.nodes.calc.IsNullNode; import org.graalvm.compiler.nodes.cfg.Block; import org.graalvm.compiler.nodes.cfg.ControlFlowGraph; +import org.graalvm.compiler.nodes.extended.ForeignCall; +import org.graalvm.compiler.nodes.extended.ForeignCallWithExceptionNode; import org.graalvm.compiler.nodes.extended.IntegerSwitchNode; import org.graalvm.compiler.nodes.extended.SwitchNode; import org.graalvm.compiler.nodes.spi.LIRLowerable; @@ -155,7 +158,7 @@ public abstract class NodeLIRBuilder implements NodeLIRBuilderTool, LIRGeneratio } protected DebugInfoBuilder createDebugInfoBuilder(StructuredGraph graph, NodeValueMap nodeValueMap) { - return new DebugInfoBuilder(nodeValueMap, graph.getDebug()); + return new DebugInfoBuilder(nodeValueMap, gen.getProviders().getMetaAccessExtensionProvider(), graph.getDebug()); } /** @@ -620,6 +623,28 @@ public abstract class NodeLIRBuilder implements NodeLIRBuilderTool, LIRGeneratio } } + @Override + public void emitForeignCall(ForeignCall x) { + ForeignCallLinkage linkage = gen.getForeignCalls().lookupForeignCall(x.getDescriptor()); + + LabelRef exceptionEdge = null; + if (x instanceof ForeignCallWithExceptionNode) { + exceptionEdge = getLIRBlock(((ForeignCallWithExceptionNode) x).exceptionEdge()); + } + LIRFrameState callState = stateWithExceptionEdge(x, exceptionEdge); + + Value[] args = x.operands(this); + + Value result = gen.emitForeignCall(linkage, callState, args); + if (result != null) { + setResult(x.asNode(), result); + } + + if (x instanceof ForeignCallWithExceptionNode) { + gen.emitJump(getLIRBlock(((ForeignCallWithExceptionNode) x).next())); + } + } + protected abstract void emitDirectCall(DirectCallTargetNode callTarget, Value result, Value[] parameters, Value[] temps, LIRFrameState callState); protected abstract void emitIndirectCall(IndirectCallTargetNode callTarget, Value result, Value[] parameters, Value[] temps, LIRFrameState callState); @@ -735,7 +760,7 @@ public abstract class NodeLIRBuilder implements NodeLIRBuilderTool, LIRGeneratio if (gen.needOnlyOopMaps()) { return new LIRFrameState(null, null, null); } - assert state != null : deopt; + assert state != null : "Deopt node=" + deopt + " needs a state "; return getDebugInfoBuilder().build(deopt, state, exceptionEdge); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/LowTier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/LowTier.java index 98b85df66e1..fe70e10dca0 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/LowTier.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/LowTier.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -24,7 +24,6 @@ package org.graalvm.compiler.core.phases; -import static org.graalvm.compiler.core.common.GraalOptions.LateMembars; import static org.graalvm.compiler.phases.common.DeadCodeEliminationPhase.Optionality.Required; import org.graalvm.compiler.core.common.GraalOptions; @@ -37,7 +36,6 @@ import org.graalvm.compiler.phases.common.CanonicalizerPhase; import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase; import org.graalvm.compiler.phases.common.ExpandLogicPhase; import org.graalvm.compiler.phases.common.FixReadsPhase; -import org.graalvm.compiler.phases.common.InsertMembarsPhase; import org.graalvm.compiler.phases.common.LoweringPhase; import org.graalvm.compiler.phases.common.ProfileCompiledMethodsPhase; import org.graalvm.compiler.phases.common.PropagateDeoptimizeProbabilityPhase; @@ -80,9 +78,6 @@ public class LowTier extends BaseTier { appendPhase(new PropagateDeoptimizeProbabilityPhase()); - if (LateMembars.getValue(options)) { - appendPhase(new InsertMembarsPhase()); - } appendPhase(new SchedulePhase(SchedulePhase.SchedulingStrategy.LATEST_OUT_OF_LOOPS)); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/target/Backend.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/target/Backend.java index 500e3ded4c7..94da07336ab 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/target/Backend.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/target/Backend.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020, 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 @@ -30,7 +30,7 @@ import org.graalvm.compiler.code.CompilationResult; import org.graalvm.compiler.core.common.CompilationIdentifier; import org.graalvm.compiler.core.common.LIRKind; import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; +import org.graalvm.compiler.core.common.spi.ForeignCallSignature; import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; import org.graalvm.compiler.core.gen.LIRCompilerBackend; import org.graalvm.compiler.debug.DebugContext; @@ -63,8 +63,8 @@ public abstract class Backend implements TargetProvider, ValueKindFactory codeInstallationTaskFactories; - public static final ForeignCallDescriptor ARITHMETIC_FREM = new ForeignCallDescriptor("arithmeticFrem", float.class, float.class, float.class); - public static final ForeignCallDescriptor ARITHMETIC_DREM = new ForeignCallDescriptor("arithmeticDrem", double.class, double.class, double.class); + public static final ForeignCallSignature ARITHMETIC_FREM = new ForeignCallSignature("arithmeticFrem", float.class, float.class, float.class); + public static final ForeignCallSignature ARITHMETIC_DREM = new ForeignCallSignature("arithmeticDrem", double.class, double.class, double.class); protected Backend(Providers providers) { this.providers = providers; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug.test/src/org/graalvm/compiler/debug/test/DebugContextTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug.test/src/org/graalvm/compiler/debug/test/DebugContextTest.java index 989ca81b467..4bf5ad29fb0 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug.test/src/org/graalvm/compiler/debug/test/DebugContextTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug.test/src/org/graalvm/compiler/debug/test/DebugContextTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -33,7 +33,6 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.PrintStream; import java.util.Arrays; -import java.util.Collections; import java.util.Formatter; import java.util.List; import java.util.stream.Collectors; @@ -43,6 +42,7 @@ import org.graalvm.compiler.debug.Assertions; import org.graalvm.compiler.debug.CounterKey; import org.graalvm.compiler.debug.DebugCloseable; import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.DebugContext.Builder; import org.graalvm.compiler.debug.DebugContext.Scope; import org.graalvm.compiler.debug.DebugDumpHandler; import org.graalvm.compiler.debug.DebugHandler; @@ -80,7 +80,7 @@ public class DebugContextTest { }; DebugContext openDebugContext(OptionValues options) { - return DebugContext.create(options, NO_DESCRIPTION, NO_GLOBAL_METRIC_VALUES, new PrintStream(logOutput), Collections.singletonList(handlers)); + return new Builder(options, handlers).logStream(new PrintStream(logOutput)).build(); } } @@ -203,7 +203,7 @@ public class DebugContextTest { map.put(DebugOptions.DumpOnError, true); OptionValues options = new OptionValues(map); ByteArrayOutputStream baos = new ByteArrayOutputStream(); - DebugContext debug = DebugContext.create(options, NO_DESCRIPTION, NO_GLOBAL_METRIC_VALUES, new PrintStream(baos), DebugHandlersFactory.LOADER); + DebugContext debug = new Builder(options).globalMetrics(NO_GLOBAL_METRIC_VALUES).description(NO_DESCRIPTION).logStream(new PrintStream(baos)).build(); Exception e = new Exception("testEnabledSandbox"); String scopeName = ""; try { @@ -233,7 +233,7 @@ public class DebugContextTest { map.put(DebugOptions.DumpOnError, true); OptionValues options = new OptionValues(map); ByteArrayOutputStream baos = new ByteArrayOutputStream(); - DebugContext debug = DebugContext.create(options, NO_DESCRIPTION, NO_GLOBAL_METRIC_VALUES, new PrintStream(baos), DebugHandlersFactory.LOADER); + DebugContext debug = new Builder(options).globalMetrics(NO_GLOBAL_METRIC_VALUES).description(NO_DESCRIPTION).logStream(new PrintStream(baos)).build(); Exception e = new Exception("testDisabledSandbox"); try { // Test a disabled sandbox scope @@ -263,7 +263,7 @@ public class DebugContextTest { // Configure with an option that enables counters map.put(DebugOptions.Counters, ""); OptionValues options = new OptionValues(map); - DebugContext debug = DebugContext.create(options, DebugHandlersFactory.LOADER); + DebugContext debug = new Builder(options).build(); CounterKey counter = DebugContext.counter("DebugContextTestCounter"); AssertionError[] result = {null}; Thread thread = new Thread() { @@ -291,7 +291,7 @@ public class DebugContextTest { map.put(DebugOptions.DumpOnError, true); OptionValues options = new OptionValues(map); ByteArrayOutputStream baos = new ByteArrayOutputStream(); - DebugContext debug = DebugContext.create(options, NO_DESCRIPTION, NO_GLOBAL_METRIC_VALUES, new PrintStream(baos), DebugHandlersFactory.LOADER); + DebugContext debug = new Builder(options).globalMetrics(NO_GLOBAL_METRIC_VALUES).description(NO_DESCRIPTION).logStream(new PrintStream(baos)).build(); Exception e = new Exception(); try { try (DebugCloseable disabled = debug.disableIntercept(); Scope s1 = debug.scope("ScopeWithDisabledIntercept")) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug.test/src/org/graalvm/compiler/debug/test/TimerKeyTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug.test/src/org/graalvm/compiler/debug/test/TimerKeyTest.java index 5398dad15db..02d1300dc3e 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug.test/src/org/graalvm/compiler/debug/test/TimerKeyTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug.test/src/org/graalvm/compiler/debug/test/TimerKeyTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -24,15 +24,13 @@ package org.graalvm.compiler.debug.test; -import static org.graalvm.compiler.debug.DebugContext.DEFAULT_LOG_STREAM; import static org.graalvm.compiler.debug.DebugContext.NO_CONFIG_CUSTOMIZERS; -import static org.graalvm.compiler.debug.DebugContext.NO_DESCRIPTION; -import static org.graalvm.compiler.debug.DebugContext.NO_GLOBAL_METRIC_VALUES; import static org.junit.Assert.assertEquals; import jdk.internal.vm.compiler.collections.EconomicMap; import org.graalvm.compiler.debug.DebugCloseable; import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.DebugContext.Builder; import org.graalvm.compiler.debug.DebugOptions; import org.graalvm.compiler.debug.TimerKey; import org.graalvm.compiler.options.OptionKey; @@ -88,7 +86,7 @@ public class TimerKeyTest { EconomicMap, Object> map = EconomicMap.create(); map.put(DebugOptions.Time, ""); OptionValues options = new OptionValues(map); - DebugContext debug = DebugContext.create(options, NO_DESCRIPTION, NO_GLOBAL_METRIC_VALUES, DEFAULT_LOG_STREAM, NO_CONFIG_CUSTOMIZERS); + DebugContext debug = new Builder(options, NO_CONFIG_CUSTOMIZERS).build(); TimerKey timerC = DebugContext.timer("TimerC"); try (DebugCloseable c1 = timerC.start(debug)) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/CompilationListener.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/CompilationListener.java new file mode 100644 index 00000000000..1a0f61a9bd8 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/CompilationListener.java @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.debug; + +import org.graalvm.compiler.debug.DebugContext.CompilerPhaseScope; + +import jdk.vm.ci.meta.ResolvedJavaMethod; + +/** + * Implemented by clients interested in when the compiler starts/ends a {@linkplain #enterPhase + * phase} or {@linkplain #notifyInlining considers inlining} a method. + */ +public interface CompilationListener { + + /** + * Notifies this listener that the compiler is starting a compiler phase. + * + * @param name the name of the phase + * @return an object whose {@link CompilerPhaseScope#close()} method will be called when the + * phase completes + */ + CompilerPhaseScope enterPhase(CharSequence name, int nesting); + + /** + * Notifies this listener when the compiler considers inlining {@code callee} into + * {@code caller}. + * + * @param caller caller method + * @param callee callee method considered for inlining into {@code caller} + * @param succeeded true if {@code callee} was inlined into {@code caller} + * @param message extra information about inlining decision + * @param bci byte code index of call site + */ + void notifyInlining(ResolvedJavaMethod caller, ResolvedJavaMethod callee, boolean succeeded, CharSequence message, int bci); +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugContext.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugContext.java index d4bddbc3d49..df5b7dfe223 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugContext.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugContext.java @@ -59,6 +59,7 @@ import java.util.List; import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; +import java.util.function.Supplier; import jdk.internal.vm.compiler.collections.EconomicMap; import jdk.internal.vm.compiler.collections.EconomicSet; @@ -68,7 +69,9 @@ import org.graalvm.compiler.options.OptionValues; import org.graalvm.compiler.serviceprovider.GraalServices; import org.graalvm.graphio.GraphOutput; +import jdk.vm.ci.common.NativeImageReinitialize; import jdk.vm.ci.meta.JavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; /** * A facility for logging and dumping as well as a container for values associated with @@ -86,8 +89,6 @@ public final class DebugContext implements AutoCloseable { public static final GlobalMetrics NO_GLOBAL_METRIC_VALUES = null; public static final Iterable NO_CONFIG_CUSTOMIZERS = Collections.emptyList(); - public static final PrintStream DEFAULT_LOG_STREAM = TTY.out; - /** * Contains the immutable parts of a debug context. This separation allows the immutable parts * to be shared and reduces the overhead of initialization since most immutable fields are @@ -114,6 +115,10 @@ public final class DebugContext implements AutoCloseable { */ private long[] metricValues; + public static PrintStream getDefaultLogStream() { + return TTY.out; + } + /** * Determines if dynamic scopes are enabled. */ @@ -128,6 +133,7 @@ public final class DebugContext implements AutoCloseable { if (sharedChannel == null) { sharedChannel = new IgvDumpChannel(() -> getDumpPath(".bgv", false), immutable.options); } + builder.attr(GraphOutput.ATTR_VM_ID, GraalServices.getExecutionID()); final GraphOutput output = builder.build(sharedChannel); parentOutput = output; return output; @@ -315,7 +321,7 @@ public final class DebugContext implements AutoCloseable { /** * Singleton used to represent a disabled debug context. */ - private static final DebugContext DISABLED = new DebugContext(NO_DESCRIPTION, NO_GLOBAL_METRIC_VALUES, DEFAULT_LOG_STREAM, new Immutable(), NO_CONFIG_CUSTOMIZERS); + private static final DebugContext DISABLED = new DebugContext(NO_DESCRIPTION, null, NO_GLOBAL_METRIC_VALUES, getDefaultLogStream(), new Immutable(), NO_CONFIG_CUSTOMIZERS); /** * Create a DebugContext with debugging disabled. @@ -324,7 +330,7 @@ public final class DebugContext implements AutoCloseable { if (options == null || options.getMap().isEmpty()) { return DISABLED; } - return new DebugContext(NO_DESCRIPTION, NO_GLOBAL_METRIC_VALUES, DEFAULT_LOG_STREAM, Immutable.create(options), NO_CONFIG_CUSTOMIZERS); + return new DebugContext(NO_DESCRIPTION, null, NO_GLOBAL_METRIC_VALUES, getDefaultLogStream(), Immutable.create(options), NO_CONFIG_CUSTOMIZERS); } /** @@ -377,6 +383,8 @@ public final class DebugContext implements AutoCloseable { private final Description description; + private final CompilationListener compilationListener; + /** * Gets a description of the computation associated with this debug context. * @@ -386,6 +394,89 @@ public final class DebugContext implements AutoCloseable { return description; } + /** + * Determines if {@link #enterCompilerPhase} and {@link #notifyInlining} do anything. + * + * @return {@code true} if there is a listener for compiler phase and inlining events attached + * to this object, {@code false} otherwise + */ + public boolean hasCompilationListener() { + return compilationListener != null; + } + + private int compilerPhaseNesting = 0; + + /** + * Scope for a compiler phase event. + */ + public interface CompilerPhaseScope extends AutoCloseable { + /** + * Notifies the listener that the phase has ended. + */ + @Override + void close(); + } + + /** + * Notifies this object that the compiler is entering a phase. + * + * It is recommended to use this method in a try-with-resource statement. + * + * @param phaseName name of the phase being entered + * @return {@code null} if {@link #hasCompilationListener()} returns {@code false} otherwise an + * object whose {@link CompilerPhaseScope#close()} method must be called when the phase + * ends + */ + public CompilerPhaseScope enterCompilerPhase(CharSequence phaseName) { + if (compilationListener != null) { + return enterCompilerPhase(() -> phaseName); + } + return null; + } + + /** + * Notifies this object that the compiler is entering a phase. + * + * It is recommended to use this method in a try-with-resource statement. + * + * @param phaseName name of the phase being entered + * @return {@code null} if {@link #hasCompilationListener()} returns {@code false} otherwise an + * object whose {@link CompilerPhaseScope#close()} method must be called when the phase + * ends + */ + public CompilerPhaseScope enterCompilerPhase(Supplier phaseName) { + CompilationListener l = compilationListener; + if (l != null) { + CompilerPhaseScope scope = l.enterPhase(phaseName.get(), compilerPhaseNesting++); + return new CompilerPhaseScope() { + + @Override + public void close() { + --compilerPhaseNesting; + scope.close(); + } + }; + } + return null; + } + + /** + * Notifies this object when the compiler considers inlining {@code callee} into {@code caller}. + * A call to this method should be guarded with {@link #hasCompilationListener()} if + * {@code message} is not a string literal or pre-computed value + * + * @param caller caller method + * @param callee callee method considered for inlining into {@code caller} + * @param succeeded true if {@code callee} was inlined into {@code caller} + * @param message extra information about inlining decision + * @param bci byte code index of call site + */ + public void notifyInlining(ResolvedJavaMethod caller, ResolvedJavaMethod callee, boolean succeeded, CharSequence message, int bci) { + if (compilationListener != null) { + compilationListener.notifyInlining(caller, callee, succeeded, message, bci); + } + } + /** * Gets the global metrics associated with this debug context. * @@ -396,43 +487,91 @@ public final class DebugContext implements AutoCloseable { } /** - * Creates a {@link DebugContext} based on a given set of option values and {@code factory}. + * Object used to create a {@link DebugContext}. */ - public static DebugContext create(OptionValues options, DebugHandlersFactory factory) { - return new DebugContext(NO_DESCRIPTION, NO_GLOBAL_METRIC_VALUES, DEFAULT_LOG_STREAM, Immutable.create(options), Collections.singletonList(factory)); + public static class Builder { + private final OptionValues options; + private Description description = NO_DESCRIPTION; + private CompilationListener compilationListener; + private GlobalMetrics globalMetrics = NO_GLOBAL_METRIC_VALUES; + private PrintStream logStream = getDefaultLogStream(); + private final Iterable factories; + + /** + * Builder for a {@link DebugContext} based on {@code options} and + * {@link DebugHandlersFactory#LOADER}. + */ + public Builder(OptionValues options) { + this.options = options; + this.factories = DebugHandlersFactory.LOADER; + } + + /** + * Builder for a {@link DebugContext} based on {@code options} and {@code factories}. The + * {@link DebugHandlersFactory#LOADER} value can be used for the latter. + */ + public Builder(OptionValues options, Iterable factories) { + this.options = options; + this.factories = factories; + } + + /** + * Builder for a {@link DebugContext} based {@code options} and {@code factory}. The latter + * can be null in which case {@link DebugContext#NO_CONFIG_CUSTOMIZERS} is used. + */ + public Builder(OptionValues options, DebugHandlersFactory factory) { + this.options = options; + this.factories = factory == null ? NO_CONFIG_CUSTOMIZERS : Collections.singletonList(factory); + } + + /** + * Sets the description for the debug context. The default is for a context to have no + * description. + */ + public Builder description(Description desc) { + this.description = desc; + return this; + } + + /** + * Sets the compilation listener for the debug context. The default is for a context to have + * no compilation listener. + */ + public Builder compilationListener(CompilationListener listener) { + this.compilationListener = listener; + return this; + } + + public Builder globalMetrics(GlobalMetrics metrics) { + this.globalMetrics = metrics; + return this; + } + + public Builder logStream(PrintStream stream) { + this.logStream = stream; + return this; + } + + public DebugContext build() { + return new DebugContext(description, + compilationListener, + globalMetrics, + logStream, + Immutable.create(options), + factories); + } } - /** - * Creates a {@link DebugContext} based on a given set of option values and {@code factories}. - * The {@link DebugHandlersFactory#LOADER} can be used for the latter. - */ - public static DebugContext create(OptionValues options, Iterable factories) { - return new DebugContext(NO_DESCRIPTION, NO_GLOBAL_METRIC_VALUES, DEFAULT_LOG_STREAM, Immutable.create(options), factories); - } - - public static DebugContext create(OptionValues options, PrintStream logStream, DebugHandlersFactory factory) { - return new DebugContext(NO_DESCRIPTION, NO_GLOBAL_METRIC_VALUES, logStream, Immutable.create(options), Collections.singletonList(factory)); - } - - /** - * Creates a {@link DebugContext} based on a given set of option values and {@code factories}. - * The {@link DebugHandlersFactory#LOADER} can be used for the latter. - */ - public static DebugContext create(OptionValues options, Description description, Iterable factories) { - return new DebugContext(description, NO_GLOBAL_METRIC_VALUES, DEFAULT_LOG_STREAM, Immutable.create(options), factories); - } - - /** - * Creates a {@link DebugContext}. - */ - public static DebugContext create(OptionValues options, Description description, GlobalMetrics globalMetrics, PrintStream logStream, Iterable factories) { - return new DebugContext(description, globalMetrics, logStream, Immutable.create(options), factories); - } - - private DebugContext(Description description, GlobalMetrics globalMetrics, PrintStream logStream, Immutable immutable, Iterable factories) { + private DebugContext(Description description, + CompilationListener compilationListener, + GlobalMetrics globalMetrics, + PrintStream logStream, + Immutable immutable, + Iterable factories) { this.immutable = immutable; this.description = description; this.globalMetrics = globalMetrics; + this.compilationListener = compilationListener; if (immutable.scopesEnabled) { OptionValues options = immutable.options; List dumpHandlers = new ArrayList<>(); @@ -653,7 +792,11 @@ public final class DebugContext implements AutoCloseable { } } - private final Invariants invariants = Assertions.assertionsEnabled() ? new Invariants() : null; + /** + * Arbitrary threads cannot be in the image so null out {@code DebugContext.invariants} which + * holds onto a thread and is only used for assertions. + */ + @NativeImageReinitialize private final Invariants invariants = Assertions.assertionsEnabled() ? new Invariants() : null; static StackTraceElement[] getStackTrace(Thread thread) { return thread.getStackTrace(); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugOptions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugOptions.java index 827476ae3b6..5c50b60d171 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugOptions.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugOptions.java @@ -115,13 +115,16 @@ public class DebugOptions { @Option(help = "file:doc-files/MetricsFileHelp.txt", type = OptionType.Debug) public static final OptionKey MetricsFile = new OptionKey<>(null); @Option(help = "File to which aggregated metrics are dumped at shutdown. A CSV format is used if the file ends with .csv " + - "otherwise a more human readable format is used. If not specified, metrics are dumped to the console.", type = OptionType.Debug) + "otherwise a more human readable format is used. If not specified, metrics are dumped to the console.", type = OptionType.Debug) public static final OptionKey AggregatedMetricsFile = new OptionKey<>(null); @Option(help = "Enable debug output for stub code generation and snippet preparation.", type = OptionType.Debug) public static final OptionKey DebugStubsAndSnippets = new OptionKey<>(false); @Option(help = "Send compiler IR to dump handlers on error.", type = OptionType.Debug) public static final OptionKey DumpOnError = new OptionKey<>(false); + @Option(help = "Specify the DumpLevel if CompilationFailureAction#Diagnose is used." + + "See CompilationFailureAction for details. file:doc-files/CompilationFailureActionHelp.txt", type = OptionType.Debug) + public static final OptionKey DiagnoseDumpLevel = new OptionKey<>(DebugContext.VERBOSE_LEVEL); @Option(help = "Disable intercepting exceptions in debug scopes.", type = OptionType.Debug) public static final OptionKey DisableIntercept = new OptionKey<>(false); @Option(help = "Intercept also bailout exceptions", type = OptionType.Debug) @@ -137,7 +140,9 @@ public class DebugOptions { @Option(help = "Enable dumping to the C1Visualizer. Enabling this option implies PrintBackendCFG.", type = OptionType.Debug) public static final OptionKey PrintCFG = new OptionKey<>(false); @Option(help = "Enable dumping LIR, register allocation and code generation info to the C1Visualizer.", type = OptionType.Debug) - public static final OptionKey PrintBackendCFG = new OptionKey<>(true); + public static final OptionKey PrintBackendCFG = new OptionKey<>(false); + @Option(help = "Enable dumping CFG built during initial BciBlockMapping", type = OptionType.Debug) + public static final OptionKey PrintBlockMapping = new OptionKey<>(false); @Option(help = "file:doc-files/PrintGraphHelp.txt", type = OptionType.Debug) public static final EnumOptionKey PrintGraph = new EnumOptionKey<>(PrintGraphTarget.File); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DiagnosticsOutputDirectory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DiagnosticsOutputDirectory.java index beac60e6ff3..607ec6a83f7 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DiagnosticsOutputDirectory.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DiagnosticsOutputDirectory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, 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 @@ -42,6 +42,7 @@ import java.util.zip.ZipOutputStream; import org.graalvm.compiler.options.OptionValues; import org.graalvm.compiler.serviceprovider.GraalServices; +import org.graalvm.compiler.serviceprovider.IsolateUtil; /** * Manages a directory into which diagnostics such crash reports and dumps should be written. The @@ -107,7 +108,7 @@ public class DiagnosticsOutputDirectory { // directory specified by the DumpPath option. baseDir = Paths.get("."); } - return baseDir.resolve("graal_diagnostics_" + GraalServices.getExecutionID()).toAbsolutePath().toString(); + return baseDir.resolve("graal_diagnostics_" + GraalServices.getExecutionID() + '@' + IsolateUtil.getIsolateID()).toAbsolutePath().toString(); } /** diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/GlobalMetrics.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/GlobalMetrics.java index 38294ecd9f6..2b498bee476 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/GlobalMetrics.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/GlobalMetrics.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, 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 @@ -27,6 +27,7 @@ package org.graalvm.compiler.debug; import java.io.IOException; import java.io.PrintStream; import java.nio.file.Files; +import java.nio.file.Path; import java.nio.file.Paths; import java.util.Collections; import java.util.List; @@ -35,6 +36,7 @@ import jdk.internal.vm.compiler.collections.EconomicMap; import jdk.internal.vm.compiler.collections.MapCursor; import jdk.internal.vm.compiler.collections.Pair; import org.graalvm.compiler.options.OptionValues; +import org.graalvm.compiler.serviceprovider.IsolateUtil; /** * Metric values that can be {@linkplain #add(DebugContext) updated} by multiple threads. @@ -75,10 +77,30 @@ public class GlobalMetrics { return res; } + private static PrintStream openPrintStream(String metricsFile) throws IOException { + if (metricsFile == null) { + return DebugContext.getDefaultLogStream(); + } else { + long isolateID = IsolateUtil.getIsolateID(); + Path path; + if (isolateID != 0L) { + int lastDot = metricsFile.lastIndexOf('.'); + if (lastDot != -1) { + path = Paths.get(metricsFile.substring(0, lastDot) + '@' + isolateID + metricsFile.substring(lastDot)); + } else { + path = Paths.get(metricsFile + isolateID); + } + } else { + path = Paths.get(metricsFile); + } + return new PrintStream(Files.newOutputStream(path)); + } + } + /** * Prints the values in the object to the file specified by * {@link DebugOptions#AggregatedMetricsFile} if present otherwise to - * {@link DebugContext#DEFAULT_LOG_STREAM}. + * {@link DebugContext#getDefaultLogStream()}. */ public void print(OptionValues options) { long[] vals = values; @@ -88,10 +110,11 @@ public class GlobalMetrics { boolean csv = metricsFile != null && (metricsFile.endsWith(".csv") || metricsFile.endsWith(".CSV")); PrintStream p = null; try { - p = metricsFile == null ? DebugContext.DEFAULT_LOG_STREAM : new PrintStream(Files.newOutputStream(Paths.get(metricsFile))); + p = openPrintStream(metricsFile); + String isolateID = IsolateUtil.getIsolateID(false); if (!csv) { if (!map.isEmpty()) { - p.println("++ Aggregated Metrics ++"); + p.printf("++ Aggregated Metrics %s ++%n", isolateID); } } String csvFormat = CSVUtil.buildFormatString("%s", "%s", "%s"); @@ -107,7 +130,7 @@ public class GlobalMetrics { } if (!csv) { if (!map.isEmpty()) { - p.println("-- Aggregated Metrics --"); + p.printf("-- Aggregated Metrics %s --%n", isolateID); } } } catch (IOException e) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/GraphTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/GraphTest.java index 1812c2448b5..24a91e27e60 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/GraphTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/GraphTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, 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 @@ -25,8 +25,8 @@ package org.graalvm.compiler.graph.test; import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.debug.DebugHandlersFactory; import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.DebugContext.Builder; import org.graalvm.compiler.options.OptionValues; import org.junit.After; @@ -46,7 +46,7 @@ public abstract class GraphTest { } throw new AssertionError("At most one " + DebugContext.class.getName() + " object should be created per test"); } - DebugContext debug = DebugContext.create(options, DebugHandlersFactory.LOADER); + DebugContext debug = new Builder(options).build(); cachedDebug.set(debug); return debug; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/graphio/GraphOutputTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/graphio/GraphOutputTest.java index 532b9ab1b30..d79219119eb 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/graphio/GraphOutputTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/graphio/GraphOutputTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, 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 @@ -44,6 +44,7 @@ import org.graalvm.graphio.GraphTypes; import static org.junit.Assert.assertSame; import org.junit.Test; import java.lang.reflect.Field; +import static org.junit.Assert.assertEquals; public final class GraphOutputTest { @@ -131,6 +132,96 @@ public final class GraphOutputTest { assertSame(CustomEnum.class, clazz); } + @Test + @SuppressWarnings({"static-method", "unchecked"}) + public void testBuilderPromotesVersion() throws Exception { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + try (WritableByteChannel channel = Channels.newChannel(out)) { + GraphOutput.Builder builder = GraphOutput.newBuilder(new MockGraphStructure()).attr("test", "failed"); + try (GraphOutput graphOutput = builder.build(channel)) { + graphOutput.print(new MockGraph(), Collections.emptyMap(), 0, "Mock Graph"); + } catch (IllegalStateException ise) { + // expected exception + } + } + byte[] bytes = out.toByteArray(); + // there's B-I-G-V, major, minor + assertEquals("Major version 7 must be auto-selected", 7, bytes[4]); + } + + @Test + @SuppressWarnings({"static-method", "unchecked"}) + public void testTooOldVersionFails() throws Exception { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + try (WritableByteChannel channel = Channels.newChannel(out)) { + GraphOutput.Builder builder = GraphOutput.newBuilder(new MockGraphStructure()).protocolVersion(6, 1); + try { + builder.attr("test", "failed"); + fail("Should have failed, attr() requires version 7.0"); + } catch (IllegalStateException ex) { + // expected + } + try (GraphOutput graphOutput = builder.build(channel)) { + graphOutput.print(new MockGraph(), Collections.emptyMap(), 0, "Mock Graph"); + } catch (IllegalStateException ise) { + // expected exception + } + } + } + + @Test + @SuppressWarnings({"static-method", "unchecked"}) + public void testVersionDowngradeFails() throws Exception { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + try (WritableByteChannel channel = Channels.newChannel(out)) { + GraphOutput.Builder builder = GraphOutput.newBuilder(new MockGraphStructure()); + builder.attr("test", "failed"); + try { + builder.protocolVersion(6, 0); + fail("Should fail, cannot downgrade from required version."); + } catch (IllegalArgumentException e) { + // expected + } + try (GraphOutput graphOutput = builder.build(channel)) { + graphOutput.print(new MockGraph(), Collections.emptyMap(), 0, "Mock Graph"); + } catch (IllegalStateException ise) { + // expected exception + } + } + } + + @Test + @SuppressWarnings({"static-method", "unchecked"}) + public void testManualAncientVersion() throws Exception { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + try (WritableByteChannel channel = Channels.newChannel(out)) { + GraphOutput.Builder builder = GraphOutput.newBuilder(new MockGraphStructure()).protocolVersion(3, 0); + try (GraphOutput graphOutput = builder.build(channel)) { + graphOutput.print(new MockGraph(), Collections.emptyMap(), 0, "Mock Graph"); + } + } + byte[] bytes = out.toByteArray(); + // there's B-I-G-V, major, minor + assertEquals("Protocol version 3 was requested", 3, bytes[4]); + } + + @Test + @SuppressWarnings({"static-method", "unchecked"}) + public void testManualVersionUpgradeOK() throws Exception { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + try (WritableByteChannel channel = Channels.newChannel(out)) { + GraphOutput.Builder builder = GraphOutput.newBuilder(new MockGraphStructure()); + builder.attr("some", "thing"); + builder.protocolVersion(7, 0); + try (GraphOutput graphOutput = builder.build(channel)) { + graphOutput.print(new MockGraph(), Collections.emptyMap(), 0, "Mock Graph"); + } + } + byte[] bytes = out.toByteArray(); + // there's B-I-G-V, major, minor + assertEquals("Protocol version 7 was requested", 7, bytes[4]); + } + private static ByteBuffer generateData(int size) { ByteBuffer buffer = ByteBuffer.allocate(size); for (int i = 0; i < size; i++) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/graphio/NodeEncodingTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/graphio/NodeEncodingTest.java index d73f4b4b7a5..8c865d4f82b 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/graphio/NodeEncodingTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/graphio/NodeEncodingTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, 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 @@ -56,8 +56,8 @@ public final class NodeEncodingTest { } @Test - public void defaultVersionTheNodeIsntDumpedWithItsID() throws Exception { - runTheNodeIsntDumpedWithItsID(false); + public void defaultVersionTheNodeIsDumpedWithItsID() throws Exception { + runTheNodeIsTreatedPoolEntry(false); } private void runTheNodeIsntDumpedWithItsID(boolean explicitVersion) throws Exception { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java index 5e64672d9f6..af6ec435d58 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java @@ -427,12 +427,30 @@ public abstract class Node implements Cloneable, Formattable, NodeInterface { } /** - * Checks whether this node has exactly one usgae. + * Checks whether this node has exactly one usage. */ public final boolean hasExactlyOneUsage() { return hasUsages() && !hasMoreThanOneUsage(); } + /** + * Checks whether this node has only usages of that type. + * + * @param type the type of usages to look for + */ + public final boolean hasOnlyUsagesOfType(InputType type) { + for (Node usage : usages()) { + for (Position pos : usage.inputPositions()) { + if (pos.get(usage) == this) { + if (pos.getInputType() != type) { + return false; + } + } + } + } + return true; + } + /** * Adds a given node to this node's {@linkplain #usages() usages}. * @@ -858,7 +876,7 @@ public abstract class Node implements Cloneable, Formattable, NodeInterface { } } - public void replaceAtUsages(InputType type, Node other) { + public void replaceAtUsages(Node other, InputType type) { checkReplaceWith(other); int i = 0; int usageCount = this.getUsageCount(); @@ -882,6 +900,32 @@ public abstract class Node implements Cloneable, Formattable, NodeInterface { } } + public void replaceAtUsages(Node other, InputType... inputTypes) { + checkReplaceWith(other); + int i = 0; + int usageCount = this.getUsageCount(); + if (usageCount == 0) { + return; + } + usages: while (i < usageCount) { + Node usage = this.getUsageAt(i); + for (Position pos : usage.inputPositions()) { + for (InputType type : inputTypes) { + if (pos.getInputType() == type && pos.get(usage) == this) { + replaceAtUsagePos(other, usage, pos); + this.movUsageFromEndTo(i); + usageCount--; + continue usages; + } + } + } + i++; + } + if (hasNoUsages()) { + maybeNotifyZeroUsages(this); + } + } + private void maybeNotifyInputChanged(Node node) { if (graph != null) { assert !graph.isFrozen(); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeClass.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeClass.java index ac963df837b..5dd0f4581ef 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeClass.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeClass.java @@ -164,8 +164,8 @@ public final class NodeClass extends FieldIntrospection { private static final Class INPUT_LIST_CLASS = NodeInputList.class; private static final Class SUCCESSOR_LIST_CLASS = NodeSuccessorList.class; - private static AtomicInteger nextIterableId = new AtomicInteger(); - private static AtomicInteger nextLeafId = new AtomicInteger(); + private static final AtomicInteger nextIterableId = new AtomicInteger(); + private static final AtomicInteger nextLeafId = new AtomicInteger(); private final InputEdges inputs; private final SuccessorEdges successors; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeList.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeList.java index e9a93d23454..34333c14564 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeList.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeList.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -31,10 +31,20 @@ import java.util.Iterator; import java.util.List; import java.util.RandomAccess; +import org.graalvm.compiler.core.common.PermanentBailoutException; import org.graalvm.compiler.graph.iterators.NodeIterable; public abstract class NodeList extends AbstractList implements NodeIterable, RandomAccess { + /** + * This constant limits the maximum number of entries in a node list. The reason for the + * limitations is the constraints of the code iterating over a node's inputs and successors. It + * uses a bit data structure where only 16 bits are available for the current index into the + * list. See the methods {@link NodeClass#getSuccessorIterable(Node)} and + * {@link NodeClass#getInputIterable(Node)}. + */ + private static final int MAX_ENTRIES = 65536; + protected static final Node[] EMPTY_NODE_ARRAY = new Node[0]; protected final Node self; @@ -50,6 +60,7 @@ public abstract class NodeList extends AbstractList implement protected NodeList(Node self, int initialSize) { this.self = self; + checkMaxSize(initialSize); this.size = initialSize; this.initialSize = initialSize; this.nodes = new Node[initialSize]; @@ -62,8 +73,9 @@ public abstract class NodeList extends AbstractList implement this.nodes = EMPTY_NODE_ARRAY; this.initialSize = 0; } else { + checkMaxSize(elements.length); this.size = elements.length; - this.initialSize = elements.length; + this.initialSize = this.size; this.nodes = new Node[elements.length]; for (int i = 0; i < elements.length; i++) { this.nodes[i] = elements[i]; @@ -79,8 +91,10 @@ public abstract class NodeList extends AbstractList implement this.nodes = EMPTY_NODE_ARRAY; this.initialSize = 0; } else { - this.size = elements.size(); - this.initialSize = elements.size(); + int newSize = elements.size(); + checkMaxSize(newSize); + this.size = newSize; + this.initialSize = newSize; this.nodes = new Node[elements.size()]; for (int i = 0; i < elements.size(); i++) { this.nodes[i] = elements.get(i); @@ -89,6 +103,12 @@ public abstract class NodeList extends AbstractList implement } } + private static void checkMaxSize(int value) { + if (value > MAX_ENTRIES) { + throw new PermanentBailoutException("Number of elements in a node list too high: %d", value); + } + } + protected NodeList(Node self, Collection elements) { this.self = self; if (elements == null || elements.isEmpty()) { @@ -96,8 +116,10 @@ public abstract class NodeList extends AbstractList implement this.nodes = EMPTY_NODE_ARRAY; this.initialSize = 0; } else { - this.size = elements.size(); - this.initialSize = elements.size(); + int newSize = elements.size(); + checkMaxSize(newSize); + this.size = newSize; + this.initialSize = newSize; this.nodes = new Node[elements.size()]; int i = 0; for (NodeInterface n : elements) { @@ -109,7 +131,7 @@ public abstract class NodeList extends AbstractList implement } /** - * Removes null values from the list. + * Removes {@code null} values from the list. */ public void trim() { int newSize = 0; @@ -150,10 +172,15 @@ public abstract class NodeList extends AbstractList implement modCount++; } + /** + * Adds a new node to the list. The total number of nodes in the list must not exceed + * {@link #MAX_ENTRIES}, otherwise a {@link PermanentBailoutException} is thrown. + */ @SuppressWarnings("unchecked") @Override public boolean add(Node node) { assert node == null || !node.isDeleted() : node; + checkMaxSize(size + 1); self.incModCount(); incModCount(); int length = nodes.length; @@ -169,6 +196,9 @@ public abstract class NodeList extends AbstractList implement return true; } + /** + * Get a node from the list given an {@code index}. + */ @Override @SuppressWarnings("unchecked") public T get(int index) { @@ -185,6 +215,9 @@ public abstract class NodeList extends AbstractList implement return get(size() - 1); } + /** + * Set the node of the list at the given {@code index} to a new value. + */ @Override @SuppressWarnings("unchecked") public T set(int index, Node node) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/spi/CanonicalizerTool.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/spi/CanonicalizerTool.java index db390f142af..4e38500678f 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/spi/CanonicalizerTool.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/spi/CanonicalizerTool.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -24,14 +24,15 @@ package org.graalvm.compiler.graph.spi; +import org.graalvm.compiler.core.common.spi.ConstantFieldProvider; +import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider; +import org.graalvm.compiler.graph.Node; +import org.graalvm.compiler.options.OptionValues; + import jdk.vm.ci.meta.Assumptions; import jdk.vm.ci.meta.ConstantReflectionProvider; import jdk.vm.ci.meta.MetaAccessProvider; -import org.graalvm.compiler.core.common.spi.ConstantFieldProvider; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.options.OptionValues; - public interface CanonicalizerTool { Assumptions getAssumptions(); @@ -42,6 +43,8 @@ public interface CanonicalizerTool { ConstantFieldProvider getConstantFieldProvider(); + MetaAccessExtensionProvider getMetaAccessExtensionProvider(); + boolean canonicalizeReads(); /** diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackend.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackend.java index 9da0e5a9cd5..fe1d3a69880 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackend.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackend.java @@ -54,6 +54,7 @@ import org.graalvm.compiler.hotspot.HotSpotDataBuilder; import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; import org.graalvm.compiler.hotspot.HotSpotHostBackend; import org.graalvm.compiler.hotspot.HotSpotLIRGenerationResult; +import org.graalvm.compiler.hotspot.HotSpotMarkId; import org.graalvm.compiler.hotspot.meta.HotSpotConstantLoadAction; import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProvider; import org.graalvm.compiler.hotspot.meta.HotSpotProviders; @@ -81,7 +82,6 @@ import jdk.vm.ci.code.InstalledCode; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.RegisterConfig; import jdk.vm.ci.code.StackSlot; -import jdk.vm.ci.code.site.Mark; import jdk.vm.ci.hotspot.HotSpotCallingConventionType; import jdk.vm.ci.hotspot.HotSpotSentinelConstant; import jdk.vm.ci.hotspot.aarch64.AArch64HotSpotRegisterConfig; @@ -152,9 +152,8 @@ public class AArch64HotSpotBackend extends HotSpotHostBackend implements LIRGene private boolean hasInvalidatePlaceholder(CompilationResult compilationResult) { byte[] targetCode = compilationResult.getTargetCode(); int verifiedEntryOffset = 0; - for (Mark mark : compilationResult.getMarks()) { - Object markId = mark.id; - if (markId instanceof Integer && (int) markId == config.MARKID_VERIFIED_ENTRY) { + for (CompilationResult.CodeMark mark : compilationResult.getMarks()) { + if (mark.id == HotSpotMarkId.VERIFIED_ENTRY || mark.id == HotSpotMarkId.OSR_ENTRY) { // The nmethod verified entry is located at some pc offset. verifiedEntryOffset = mark.pcOffset; break; @@ -203,6 +202,9 @@ public class AArch64HotSpotBackend extends HotSpotHostBackend implements LIRGene } } } + if (HotSpotMarkId.FRAME_COMPLETE.isAvailable()) { + crb.recordMark(HotSpotMarkId.FRAME_COMPLETE); + } if (ZapStackOnMethodEntry.getValue(crb.getOptions())) { try (ScratchRegister sc = masm.getScratchRegister()) { Register scratch = sc.getRegister(); @@ -312,7 +314,7 @@ public class AArch64HotSpotBackend extends HotSpotHostBackend implements LIRGene private void emitCodePrefix(CompilationResultBuilder crb, ResolvedJavaMethod installedCodeOwner, AArch64MacroAssembler masm, RegisterConfig regConfig, Label verifiedStub) { HotSpotProviders providers = getProviders(); if (installedCodeOwner != null && !isStatic(installedCodeOwner.getModifiers())) { - crb.recordMark(config.MARKID_UNVERIFIED_ENTRY); + crb.recordMark(HotSpotMarkId.UNVERIFIED_ENTRY); CallingConvention cc = regConfig.getCallingConvention(HotSpotCallingConventionType.JavaCallee, null, new JavaType[]{providers.getMetaAccess().lookupJavaType(Object.class)}, this); // See definition of IC_Klass in c1_LIRAssembler_aarch64.cpp // equal to scratch(1) careful! @@ -325,7 +327,7 @@ public class AArch64HotSpotBackend extends HotSpotHostBackend implements LIRGene Register klass = r10; if (config.useCompressedClassPointers) { masm.ldr(32, klass, klassAddress); - AArch64HotSpotMove.decodeKlassPointer(crb, masm, klass, klass, config.getKlassEncoding(), config); + AArch64HotSpotMove.decodeKlassPointer(crb, masm, klass, klass, config.getKlassEncoding()); } else { masm.ldr(64, klass, klassAddress); } @@ -338,9 +340,8 @@ public class AArch64HotSpotBackend extends HotSpotHostBackend implements LIRGene AArch64Call.directJmp(crb, masm, getForeignCalls().lookupForeignCall(IC_MISS_HANDLER)); } masm.align(config.codeEntryAlignment); - crb.recordMark(config.MARKID_OSR_ENTRY); masm.bind(verifiedStub); - crb.recordMark(config.MARKID_VERIFIED_ENTRY); + crb.recordMark(crb.compilationResult.getEntryBCI() != -1 ? HotSpotMarkId.OSR_ENTRY : HotSpotMarkId.VERIFIED_ENTRY); if (GeneratePIC.getValue(crb.getOptions())) { // Check for method state @@ -385,12 +386,12 @@ public class AArch64HotSpotBackend extends HotSpotHostBackend implements LIRGene HotSpotForeignCallsProvider foreignCalls = providers.getForeignCalls(); try (ScratchRegister sc = masm.getScratchRegister()) { Register scratch = sc.getRegister(); - crb.recordMark(config.MARKID_EXCEPTION_HANDLER_ENTRY); + crb.recordMark(HotSpotMarkId.EXCEPTION_HANDLER_ENTRY); ForeignCallLinkage linkage = foreignCalls.lookupForeignCall(EXCEPTION_HANDLER); Register helper = AArch64Call.isNearCall(linkage) ? null : scratch; AArch64Call.directCall(crb, masm, linkage, helper, null); } - crb.recordMark(config.MARKID_DEOPT_HANDLER_ENTRY); + crb.recordMark(HotSpotMarkId.DEOPT_HANDLER_ENTRY); ForeignCallLinkage linkage = foreignCalls.lookupForeignCall(DEOPT_BLOB_UNPACK); masm.adr(lr, 0); // Warning: the argument is an offset from the instruction! AArch64Call.directJmp(crb, masm, linkage); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackendFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackendFactory.java index 25acce51957..4b4fb072421 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackendFactory.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackendFactory.java @@ -36,6 +36,7 @@ import org.graalvm.compiler.bytecode.BytecodeProvider; import org.graalvm.compiler.core.aarch64.AArch64AddressLoweringByUse; import org.graalvm.compiler.core.aarch64.AArch64LIRKindTool; import org.graalvm.compiler.core.aarch64.AArch64SuitesCreator; +import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider; import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; import org.graalvm.compiler.hotspot.HotSpotBackend; import org.graalvm.compiler.hotspot.HotSpotBackendFactory; @@ -44,11 +45,12 @@ import org.graalvm.compiler.hotspot.HotSpotReplacementsImpl; import org.graalvm.compiler.hotspot.meta.AddressLoweringHotSpotSuitesProvider; import org.graalvm.compiler.hotspot.meta.HotSpotConstantFieldProvider; import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotPlatformConfigurationProvider; import org.graalvm.compiler.hotspot.meta.HotSpotGraalConstantFieldProvider; import org.graalvm.compiler.hotspot.meta.HotSpotGraphBuilderPlugins; import org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; import org.graalvm.compiler.hotspot.meta.HotSpotLoweringProvider; +import org.graalvm.compiler.hotspot.meta.HotSpotMetaAccessExtensionProvider; +import org.graalvm.compiler.hotspot.meta.HotSpotPlatformConfigurationProvider; import org.graalvm.compiler.hotspot.meta.HotSpotProviders; import org.graalvm.compiler.hotspot.meta.HotSpotRegisters; import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider; @@ -116,6 +118,7 @@ public class AArch64HotSpotBackendFactory extends HotSpotBackendFactory { HotSpotLoweringProvider lowerer; HotSpotStampProvider stampProvider; HotSpotPlatformConfigurationProvider platformConfigurationProvider; + HotSpotMetaAccessExtensionProvider metaAccessExtensionProvider; HotSpotSnippetReflectionProvider snippetReflection; HotSpotReplacementsImpl replacements; HotSpotSuitesProvider suites; @@ -141,11 +144,15 @@ public class AArch64HotSpotBackendFactory extends HotSpotBackendFactory { try (InitTimer rt = timer("create platform configuration provider")) { platformConfigurationProvider = createConfigInfoProvider(config, metaAccess); } + try (InitTimer rt = timer("create MetaAccessExtensionProvider")) { + metaAccessExtensionProvider = createMetaAccessExtensionProvider(); + } try (InitTimer rt = timer("create Lowerer provider")) { - lowerer = createLowerer(graalRuntime, metaAccess, foreignCalls, registers, constantReflection, platformConfigurationProvider, target); + lowerer = createLowerer(graalRuntime, metaAccess, foreignCalls, registers, constantReflection, platformConfigurationProvider, metaAccessExtensionProvider, target); } - Providers p = new Providers(metaAccess, codeCache, constantReflection, constantFieldProvider, foreignCalls, lowerer, null, stampProvider, platformConfigurationProvider); + Providers p = new Providers(metaAccess, codeCache, constantReflection, constantFieldProvider, foreignCalls, lowerer, null, stampProvider, platformConfigurationProvider, + metaAccessExtensionProvider); try (InitTimer rt = timer("create SnippetReflection provider")) { snippetReflection = createSnippetReflection(graalRuntime, constantReflection, wordTypes); @@ -165,7 +172,7 @@ public class AArch64HotSpotBackendFactory extends HotSpotBackendFactory { suites = createSuites(config, graalRuntime, compilerConfiguration, plugins, replacements); } providers = new HotSpotProviders(metaAccess, codeCache, constantReflection, constantFieldProvider, foreignCalls, lowerer, replacements, suites, registers, - snippetReflection, wordTypes, plugins, platformConfigurationProvider); + snippetReflection, wordTypes, plugins, platformConfigurationProvider, metaAccessExtensionProvider); replacements.setProviders(providers); replacements.maybeInitializeEncoder(options); } @@ -197,7 +204,7 @@ public class AArch64HotSpotBackendFactory extends HotSpotBackendFactory { options, target); AArch64GraphBuilderPlugins.register(plugins, replacements, false, // - /* registerMathPlugins */true, /* emitJDK9StringSubstitutions */true, config.useFMAIntrinsics); + /* registerForeignCallMath */true, /* emitJDK9StringSubstitutions */true, config.useFMAIntrinsics); return plugins; } @@ -222,8 +229,10 @@ public class AArch64HotSpotBackendFactory extends HotSpotBackendFactory { } protected HotSpotLoweringProvider createLowerer(HotSpotGraalRuntimeProvider runtime, HotSpotMetaAccessProvider metaAccess, HotSpotForeignCallsProvider foreignCalls, - HotSpotRegistersProvider registers, HotSpotConstantReflectionProvider constantReflection, PlatformConfigurationProvider platformConfig, TargetDescription target) { - return new AArch64HotSpotLoweringProvider(runtime, metaAccess, foreignCalls, registers, constantReflection, platformConfig, target); + HotSpotRegistersProvider registers, HotSpotConstantReflectionProvider constantReflection, PlatformConfigurationProvider platformConfig, + MetaAccessExtensionProvider metaAccessExtensionProvider, + TargetDescription target) { + return new AArch64HotSpotLoweringProvider(runtime, metaAccess, foreignCalls, registers, constantReflection, platformConfig, metaAccessExtensionProvider, target); } protected static Value[] createNativeABICallerSaveRegisters(@SuppressWarnings("unused") GraalHotSpotVMConfig config, RegisterConfig regConfig) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDirectStaticCallOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDirectStaticCallOp.java index 5daf4a32dbc..845d0ee7898 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDirectStaticCallOp.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDirectStaticCallOp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -28,6 +28,7 @@ import static jdk.vm.ci.hotspot.aarch64.AArch64HotSpotRegisterConfig.inlineCache import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; +import org.graalvm.compiler.hotspot.HotSpotMarkId; import org.graalvm.compiler.lir.LIRFrameState; import org.graalvm.compiler.lir.LIRInstructionClass; import org.graalvm.compiler.lir.Opcode; @@ -58,14 +59,17 @@ final class AArch64HotSpotDirectStaticCallOp extends DirectCallOp { } @Override + @SuppressWarnings("try") public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) { - // The mark for an invocation that uses an inline cache must be placed at the - // instruction that loads the Klass from the inline cache. - // For the first invocation this is set to a bitpattern that is guaranteed to never be a - // valid object which causes the called function to call a handler that installs the - // correct inline cache value here. - crb.recordMark(invokeKind == InvokeKind.Static ? config.MARKID_INVOKESTATIC : config.MARKID_INVOKESPECIAL); - masm.movNativeAddress(inlineCacheRegister, config.nonOopBits); - super.emitCode(crb, masm); + try (CompilationResultBuilder.CallContext callContext = crb.openCallContext(invokeKind.isDirect())) { + // The mark for an invocation that uses an inline cache must be placed at the + // instruction that loads the Klass from the inline cache. + // For the first invocation this is set to a bitpattern that is guaranteed to never be a + // valid object which causes the called function to call a handler that installs the + // correct inline cache value here. + crb.recordMark(invokeKind == InvokeKind.Static ? HotSpotMarkId.INVOKESTATIC : HotSpotMarkId.INVOKESPECIAL); + masm.movNativeAddress(inlineCacheRegister, config.nonOopBits); + super.emitCode(crb, masm); + } } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDirectVirtualCallOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDirectVirtualCallOp.java index 2f3c6d95f90..9a5decc1567 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDirectVirtualCallOp.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDirectVirtualCallOp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -28,6 +28,7 @@ import static jdk.vm.ci.hotspot.aarch64.AArch64HotSpotRegisterConfig.inlineCache import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; +import org.graalvm.compiler.hotspot.HotSpotMarkId; import org.graalvm.compiler.lir.LIRFrameState; import org.graalvm.compiler.lir.LIRInstructionClass; import org.graalvm.compiler.lir.Opcode; @@ -58,14 +59,17 @@ final class AArch64HotSpotDirectVirtualCallOp extends DirectCallOp { } @Override + @SuppressWarnings("try") public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) { - // The mark for an invocation that uses an inline cache must be placed at the - // instruction that loads the Klass from the inline cache. - // For the first invocation this is set to a bitpattern that is guaranteed to never be a - // valid object which causes the called function to call a handler that installs the - // correct inline cache value here. - crb.recordMark(invokeKind == InvokeKind.Virtual ? config.MARKID_INVOKEVIRTUAL : config.MARKID_INVOKEINTERFACE); - masm.movNativeAddress(inlineCacheRegister, config.nonOopBits); - super.emitCode(crb, masm); + try (CompilationResultBuilder.CallContext callContext = crb.openCallContext(invokeKind.isDirect())) { + // The mark for an invocation that uses an inline cache must be placed at the + // instruction that loads the Klass from the inline cache. + // For the first invocation this is set to a bitpattern that is guaranteed to never be a + // valid object which causes the called function to call a handler that installs the + // correct inline cache value here. + crb.recordMark(invokeKind == InvokeKind.Virtual ? HotSpotMarkId.INVOKEVIRTUAL : HotSpotMarkId.INVOKEINTERFACE); + masm.movNativeAddress(inlineCacheRegister, config.nonOopBits); + super.emitCode(crb, masm); + } } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotForeignCallsProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotForeignCallsProvider.java index 7138cb45aa0..8154ef09973 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotForeignCallsProvider.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotForeignCallsProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -29,12 +29,9 @@ import static jdk.vm.ci.aarch64.AArch64.r3; import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.NativeCall; import static jdk.vm.ci.meta.Value.ILLEGAL; import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.JUMP_ADDRESS; -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Reexecutability.NOT_REEXECUTABLE; import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.DESTROYS_ALL_CALLER_SAVE_REGISTERS; -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Transition.LEAF; import static org.graalvm.compiler.hotspot.replacements.CRC32CSubstitutions.UPDATE_BYTES_CRC32C; import static org.graalvm.compiler.hotspot.replacements.CRC32Substitutions.UPDATE_BYTES_CRC32; -import static jdk.internal.vm.compiler.word.LocationIdentity.any; import org.graalvm.compiler.core.common.LIRKind; import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; @@ -76,17 +73,16 @@ public class AArch64HotSpotForeignCallsProvider extends HotSpotHostForeignCallsP RegisterValue exception = r0.asValue(LIRKind.reference(word)); RegisterValue exceptionPc = r3.asValue(LIRKind.value(word)); CallingConvention exceptionCc = new CallingConvention(0, ILLEGAL, exception, exceptionPc); - register(new HotSpotForeignCallLinkageImpl(HotSpotBackend.EXCEPTION_HANDLER, 0L, DESTROYS_ALL_CALLER_SAVE_REGISTERS, LEAF, NOT_REEXECUTABLE, exceptionCc, null, any())); - register(new HotSpotForeignCallLinkageImpl(HotSpotBackend.EXCEPTION_HANDLER_IN_CALLER, JUMP_ADDRESS, DESTROYS_ALL_CALLER_SAVE_REGISTERS, LEAF, NOT_REEXECUTABLE, exceptionCc, - null, - any())); + register(new HotSpotForeignCallLinkageImpl(HotSpotBackend.EXCEPTION_HANDLER, 0L, DESTROYS_ALL_CALLER_SAVE_REGISTERS, exceptionCc, null)); + register(new HotSpotForeignCallLinkageImpl(HotSpotBackend.EXCEPTION_HANDLER_IN_CALLER, JUMP_ADDRESS, DESTROYS_ALL_CALLER_SAVE_REGISTERS, exceptionCc, + null)); // These stubs do callee saving if (config.useCRC32Intrinsics) { - registerForeignCall(UPDATE_BYTES_CRC32, config.updateBytesCRC32Stub, NativeCall, LEAF, NOT_REEXECUTABLE, any()); + registerForeignCall(UPDATE_BYTES_CRC32, config.updateBytesCRC32Stub, NativeCall); } if (config.useCRC32CIntrinsics) { - registerForeignCall(UPDATE_BYTES_CRC32C, config.updateBytesCRC32C, NativeCall, LEAF, NOT_REEXECUTABLE, any()); + registerForeignCall(UPDATE_BYTES_CRC32C, config.updateBytesCRC32C, NativeCall); } super.initialize(providers, options); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLIRGenerator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLIRGenerator.java index 7876f5f1266..6f197f47d5e 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLIRGenerator.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLIRGenerator.java @@ -63,6 +63,7 @@ import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; import org.graalvm.compiler.hotspot.HotSpotLIRGenerationResult; import org.graalvm.compiler.hotspot.HotSpotLIRGenerator; import org.graalvm.compiler.hotspot.HotSpotLockStack; +import org.graalvm.compiler.hotspot.HotSpotMarkId; import org.graalvm.compiler.hotspot.meta.HotSpotConstantLoadAction; import org.graalvm.compiler.hotspot.meta.HotSpotProviders; import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider; @@ -270,7 +271,7 @@ public class AArch64HotSpotLIRGenerator extends AArch64LIRGenerator implements H if (encoding.hasBase() || GeneratePIC.getValue(options)) { if (GeneratePIC.getValue(options)) { Variable baseAddress = newVariable(lirKindTool.getWordKind()); - AArch64HotSpotMove.BaseMove move = new AArch64HotSpotMove.BaseMove(baseAddress, config); + AArch64HotSpotMove.BaseMove move = new AArch64HotSpotMove.BaseMove(baseAddress); append(move); base = baseAddress; } else { @@ -299,7 +300,7 @@ public class AArch64HotSpotLIRGenerator extends AArch64LIRGenerator implements H if (encoding.hasBase() || GeneratePIC.getValue(options)) { if (GeneratePIC.getValue(options)) { Variable baseAddress = newVariable(LIRKind.value(AArch64Kind.QWORD)); - AArch64HotSpotMove.BaseMove move = new AArch64HotSpotMove.BaseMove(baseAddress, config); + AArch64HotSpotMove.BaseMove move = new AArch64HotSpotMove.BaseMove(baseAddress); append(move); base = baseAddress; } else { @@ -472,7 +473,7 @@ public class AArch64HotSpotLIRGenerator extends AArch64LIRGenerator implements H } @Override - public Value emitLoadConfigValue(int markId, LIRKind kind) { + public Value emitLoadConfigValue(HotSpotMarkId markId, LIRKind kind) { Variable result = newVariable(kind); append(new AArch64HotSpotLoadConfigValueOp(markId, result)); return result; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoadConfigValueOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoadConfigValueOp.java index b2ff3c5f927..7864f5cc7fe 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoadConfigValueOp.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoadConfigValueOp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2018, Red Hat Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -25,28 +25,29 @@ package org.graalvm.compiler.hotspot.aarch64; -import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC; import static jdk.vm.ci.code.ValueUtil.asRegister; - -import jdk.vm.ci.aarch64.AArch64Kind; -import jdk.vm.ci.code.Register; -import jdk.vm.ci.meta.AllocatableValue; +import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC; import org.graalvm.compiler.asm.aarch64.AArch64Address; import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; import org.graalvm.compiler.debug.GraalError; +import org.graalvm.compiler.hotspot.HotSpotMarkId; import org.graalvm.compiler.lir.LIRInstructionClass; import org.graalvm.compiler.lir.aarch64.AArch64LIRInstruction; import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +import jdk.vm.ci.aarch64.AArch64Kind; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.meta.AllocatableValue; + public final class AArch64HotSpotLoadConfigValueOp extends AArch64LIRInstruction { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AArch64HotSpotLoadConfigValueOp.class); @Def({OperandFlag.REG}) protected AllocatableValue result; - private final int markId; + private final HotSpotMarkId markId; - public AArch64HotSpotLoadConfigValueOp(int markId, AllocatableValue result) { + public AArch64HotSpotLoadConfigValueOp(HotSpotMarkId markId, AllocatableValue result) { super(TYPE); this.result = result; this.markId = markId; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoweringProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoweringProvider.java index 0a7f3ce43d3..9b7819cb8e5 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoweringProvider.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoweringProvider.java @@ -27,6 +27,7 @@ package org.graalvm.compiler.hotspot.aarch64; import org.graalvm.compiler.core.aarch64.AArch64LoweringProviderMixin; import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; +import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider; import org.graalvm.compiler.debug.DebugHandlersFactory; import org.graalvm.compiler.graph.Node; import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; @@ -37,6 +38,8 @@ import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider; import org.graalvm.compiler.nodes.calc.FloatConvertNode; import org.graalvm.compiler.nodes.calc.IntegerDivRemNode; import org.graalvm.compiler.nodes.calc.RemNode; +import org.graalvm.compiler.nodes.memory.VolatileReadNode; +import org.graalvm.compiler.nodes.memory.VolatileWriteNode; import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.nodes.spi.PlatformConfigurationProvider; import org.graalvm.compiler.options.OptionValues; @@ -53,8 +56,9 @@ public class AArch64HotSpotLoweringProvider extends DefaultHotSpotLoweringProvid private AArch64FloatArithmeticSnippets floatArithmeticSnippets; public AArch64HotSpotLoweringProvider(HotSpotGraalRuntimeProvider runtime, MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls, HotSpotRegistersProvider registers, - HotSpotConstantReflectionProvider constantReflection, PlatformConfigurationProvider platformConfig, TargetDescription target) { - super(runtime, metaAccess, foreignCalls, registers, constantReflection, platformConfig, target); + HotSpotConstantReflectionProvider constantReflection, PlatformConfigurationProvider platformConfig, MetaAccessExtensionProvider metaAccessExtensionProvider, + TargetDescription target) { + super(runtime, metaAccess, foreignCalls, registers, constantReflection, platformConfig, metaAccessExtensionProvider, target); } @Override @@ -73,6 +77,9 @@ public class AArch64HotSpotLoweringProvider extends DefaultHotSpotLoweringProvid } else if (n instanceof FloatConvertNode) { // AMD64 has custom lowerings for ConvertNodes, HotSpotLoweringProvider does not expect // to see a ConvertNode and throws an error, just do nothing here. + } else if (n instanceof VolatileReadNode || n instanceof VolatileWriteNode) { + // AArch64 emits its own code sequence for volatile accesses. We don't want it lowered + // to memory barriers + a regular access. } else { super.lower(n, tool); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotMove.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotMove.java index 22320ad4964..d0fb2da6c12 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotMove.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotMove.java @@ -38,7 +38,7 @@ import org.graalvm.compiler.asm.aarch64.AArch64Address; import org.graalvm.compiler.asm.aarch64.AArch64Assembler; import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; import org.graalvm.compiler.core.common.CompressEncoding; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; +import org.graalvm.compiler.hotspot.HotSpotMarkId; import org.graalvm.compiler.lir.LIRInstruction; import org.graalvm.compiler.lir.LIRInstructionClass; import org.graalvm.compiler.lir.StandardOp.LoadConstantOp; @@ -90,12 +90,10 @@ public class AArch64HotSpotMove { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(BaseMove.class); @LIRInstruction.Def({REG, HINT}) protected AllocatableValue result; - private final GraalHotSpotVMConfig config; - public BaseMove(AllocatableValue result, GraalHotSpotVMConfig config) { + public BaseMove(AllocatableValue result) { super(TYPE); this.result = result; - this.config = config; } @Override @@ -106,7 +104,7 @@ public class AArch64HotSpotMove { masm.add(64, scratch, scratch, 1); masm.ldr(64, asRegister(result), AArch64Address.createBaseRegisterOnlyAddress(scratch)); masm.nop(); - crb.recordMark(config.MARKID_NARROW_KLASS_BASE_ADDRESS); + crb.recordMark(HotSpotMarkId.NARROW_KLASS_BASE_ADDRESS); } } @@ -236,7 +234,7 @@ public class AArch64HotSpotMove { // masm.cmov(64, result, result, ARMv8.zr, ARMv8Assembler.ConditionFlag.NE); // } - public static void decodeKlassPointer(CompilationResultBuilder crb, AArch64MacroAssembler masm, Register result, Register ptr, CompressEncoding encoding, GraalHotSpotVMConfig config) { + public static void decodeKlassPointer(CompilationResultBuilder crb, AArch64MacroAssembler masm, Register result, Register ptr, CompressEncoding encoding) { try (AArch64MacroAssembler.ScratchRegister sc = masm.getScratchRegister()) { Register scratch = sc.getRegister(); boolean pic = GeneratePIC.getValue(crb.getOptions()); @@ -245,7 +243,7 @@ public class AArch64HotSpotMove { masm.addressOf(scratch); masm.ldr(64, scratch, AArch64Address.createBaseRegisterOnlyAddress(scratch)); masm.add(64, result, scratch, ptr, AArch64Assembler.ExtendType.UXTX, encoding.getShift()); - crb.recordMark(config.MARKID_NARROW_KLASS_BASE_ADDRESS); + crb.recordMark(HotSpotMarkId.NARROW_KLASS_BASE_ADDRESS); } else { masm.mov(scratch, encoding.getBase()); masm.add(64, result, scratch, ptr, AArch64Assembler.ExtendType.UXTX, encoding.getShift()); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotNodeLIRBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotNodeLIRBuilder.java index 9aab14666af..5d1d0b2ddef 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotNodeLIRBuilder.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotNodeLIRBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -147,7 +147,7 @@ public class AArch64HotSpotNodeLIRBuilder extends AArch64NodeLIRBuilder implemen AllocatableValue targetAddressDst = inlineCacheRegister.asValue(targetAddressSrc.getValueKind()); gen.emitMove(metaspaceMethodDst, metaspaceMethodSrc); gen.emitMove(targetAddressDst, targetAddressSrc); - append(new AArch64IndirectCallOp(callTarget.targetMethod(), result, parameters, temps, metaspaceMethodDst, targetAddressDst, callState, getGen().config)); + append(new AArch64IndirectCallOp(callTarget.targetMethod(), result, parameters, temps, metaspaceMethodDst, targetAddressDst, callState)); } @Override diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotSafepointOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotSafepointOp.java index fadf20eead8..2ea9f37e5ed 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotSafepointOp.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotSafepointOp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -27,10 +27,11 @@ package org.graalvm.compiler.hotspot.aarch64; import static jdk.vm.ci.aarch64.AArch64.zr; import static jdk.vm.ci.code.ValueUtil.asRegister; -import org.graalvm.compiler.core.common.NumUtil; import org.graalvm.compiler.asm.aarch64.AArch64Address; import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; +import org.graalvm.compiler.core.common.NumUtil; import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; +import org.graalvm.compiler.hotspot.HotSpotMarkId; import org.graalvm.compiler.lir.LIRFrameState; import org.graalvm.compiler.lir.LIRInstructionClass; import org.graalvm.compiler.lir.Opcode; @@ -81,7 +82,7 @@ public class AArch64HotSpotSafepointOp extends AArch64LIRInstruction { } public static void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm, GraalHotSpotVMConfig config, boolean onReturn, Register thread, Register scratch, LIRFrameState state) { - if (config.threadLocalHandshakes) { + if (config.useThreadLocalPolling) { emitThreadLocalPoll(crb, masm, config, onReturn, thread, scratch, state); } else { emitGlobalPoll(crb, masm, config, onReturn, scratch, state); @@ -90,15 +91,15 @@ public class AArch64HotSpotSafepointOp extends AArch64LIRInstruction { private static void emitGlobalPoll(CompilationResultBuilder crb, AArch64MacroAssembler masm, GraalHotSpotVMConfig config, boolean onReturn, Register scratch, LIRFrameState state) { if (isPollingPageFar(config)) { - crb.recordMark(onReturn ? config.MARKID_POLL_RETURN_FAR : config.MARKID_POLL_FAR); + crb.recordMark(onReturn ? HotSpotMarkId.POLL_RETURN_FAR : HotSpotMarkId.POLL_FAR); masm.movNativeAddress(scratch, config.safepointPollingAddress); - crb.recordMark(onReturn ? config.MARKID_POLL_RETURN_FAR : config.MARKID_POLL_FAR); + crb.recordMark(onReturn ? HotSpotMarkId.POLL_RETURN_FAR : HotSpotMarkId.POLL_FAR); if (state != null) { crb.recordInfopoint(masm.position(), state, InfopointReason.SAFEPOINT); } masm.ldr(32, zr, AArch64Address.createBaseRegisterOnlyAddress(scratch)); } else { - crb.recordMark(onReturn ? config.MARKID_POLL_RETURN_NEAR : config.MARKID_POLL_NEAR); + crb.recordMark(onReturn ? HotSpotMarkId.POLL_RETURN_NEAR : HotSpotMarkId.POLL_NEAR); if (state != null) { crb.recordInfopoint(masm.position(), state, InfopointReason.SAFEPOINT); } @@ -110,7 +111,7 @@ public class AArch64HotSpotSafepointOp extends AArch64LIRInstruction { LIRFrameState state) { assert config.threadPollingPageOffset >= 0; masm.ldr(64, scratch, masm.makeAddress(thread, config.threadPollingPageOffset, 8)); - crb.recordMark(onReturn ? config.MARKID_POLL_RETURN_FAR : config.MARKID_POLL_FAR); + crb.recordMark(onReturn ? HotSpotMarkId.POLL_RETURN_FAR : HotSpotMarkId.POLL_FAR); if (state != null) { crb.recordInfopoint(masm.position(), state, InfopointReason.SAFEPOINT); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64IndirectCallOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64IndirectCallOp.java index 5763b37d01f..018960c74d9 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64IndirectCallOp.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64IndirectCallOp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -29,7 +29,7 @@ import static jdk.vm.ci.code.ValueUtil.asRegister; import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; +import org.graalvm.compiler.hotspot.HotSpotMarkId; import org.graalvm.compiler.lir.LIRFrameState; import org.graalvm.compiler.lir.LIRInstructionClass; import org.graalvm.compiler.lir.Opcode; @@ -59,21 +59,20 @@ final class AArch64IndirectCallOp extends IndirectCallOp { @Use({REG}) private Value metaspaceMethod; - private final GraalHotSpotVMConfig config; - - AArch64IndirectCallOp(ResolvedJavaMethod callTarget, Value result, Value[] parameters, Value[] temps, Value metaspaceMethod, Value targetAddress, LIRFrameState state, - GraalHotSpotVMConfig config) { + AArch64IndirectCallOp(ResolvedJavaMethod callTarget, Value result, Value[] parameters, Value[] temps, Value metaspaceMethod, Value targetAddress, LIRFrameState state) { super(TYPE, callTarget, result, parameters, temps, targetAddress, state); this.metaspaceMethod = metaspaceMethod; - this.config = config; } @Override + @SuppressWarnings("try") public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) { - crb.recordMark(config.MARKID_INLINE_INVOKE); - Register callReg = asRegister(targetAddress); - assert !callReg.equals(METHOD); - AArch64Call.indirectCall(crb, masm, callReg, callTarget, state); + try (CompilationResultBuilder.CallContext callContext = crb.openCallContext(false)) { + crb.recordMark(HotSpotMarkId.INLINE_INVOKE); + Register callReg = asRegister(targetAddress); + assert !callReg.equals(METHOD); + AArch64Call.indirectCall(crb, masm, callReg, callTarget, state); + } } @Override diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64.test/src/org/graalvm/compiler/hotspot/amd64/test/StubAVXTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64.test/src/org/graalvm/compiler/hotspot/amd64/test/StubAVXTest.java index ef8a1ca3f35..16aa81c9601 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64.test/src/org/graalvm/compiler/hotspot/amd64/test/StubAVXTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64.test/src/org/graalvm/compiler/hotspot/amd64/test/StubAVXTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -34,11 +34,12 @@ import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; import org.graalvm.compiler.bytecode.BytecodeProvider; import org.graalvm.compiler.core.common.CompilationIdentifier; import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; +import org.graalvm.compiler.core.common.spi.ForeignCallSignature; import org.graalvm.compiler.core.common.type.DataPointerConstant; import org.graalvm.compiler.debug.DebugContext; import org.graalvm.compiler.hotspot.HotSpotBackend; import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; +import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl; import org.graalvm.compiler.hotspot.meta.HotSpotProviders; import org.graalvm.compiler.hotspot.stubs.SnippetStub; @@ -200,7 +201,7 @@ public class StubAVXTest extends LIRTest { } } - public static final ForeignCallDescriptor TEST_STUB = new ForeignCallDescriptor("test_stub", void.class); + public static final ForeignCallSignature TEST_STUB = new ForeignCallSignature("test_stub", void.class); @LIRIntrinsic public static int compareAVXRegister(@SuppressWarnings("unused") LIRTestSpecification spec, Object left, Object right) { @@ -235,7 +236,8 @@ public class StubAVXTest extends LIRTest { public void test() { HotSpotProviders providers = (HotSpotProviders) getProviders(); HotSpotForeignCallsProviderImpl foreignCalls = (HotSpotForeignCallsProviderImpl) providers.getForeignCalls(); - HotSpotForeignCallLinkage linkage = foreignCalls.registerStubCall(TEST_STUB, HotSpotForeignCallLinkage.Transition.LEAF_NO_VZERO, HotSpotForeignCallLinkage.Reexecutability.REEXECUTABLE, + HotSpotForeignCallLinkage linkage = foreignCalls.registerStubCall(TEST_STUB, HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, COMPUTES_REGISTERS_KILLED); linkage.setCompiledStub(new TestStub(getInitialOptions(), providers, linkage)); runTest("testStub"); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64ArrayCompareToStub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64ArrayCompareToStub.java index a491d66987c..66fb0075a1c 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64ArrayCompareToStub.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64ArrayCompareToStub.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, 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 @@ -24,9 +24,14 @@ package org.graalvm.compiler.hotspot.amd64; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.LEAF; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.NO_LOCATIONS; + import org.graalvm.compiler.api.replacements.Snippet; import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; +import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; import org.graalvm.compiler.hotspot.meta.HotSpotProviders; import org.graalvm.compiler.hotspot.stubs.SnippetStub; import org.graalvm.compiler.options.OptionValues; @@ -37,13 +42,13 @@ import jdk.vm.ci.meta.JavaKind; public final class AMD64ArrayCompareToStub extends SnippetStub { - public static final ForeignCallDescriptor STUB_BYTE_ARRAY_COMPARE_TO_BYTE_ARRAY = new ForeignCallDescriptor( + public static final HotSpotForeignCallDescriptor STUB_BYTE_ARRAY_COMPARE_TO_BYTE_ARRAY = new HotSpotForeignCallDescriptor(LEAF, REEXECUTABLE, NO_LOCATIONS, "byteArrayCompareToByteArray", int.class, Pointer.class, Pointer.class, int.class, int.class); - public static final ForeignCallDescriptor STUB_BYTE_ARRAY_COMPARE_TO_CHAR_ARRAY = new ForeignCallDescriptor( + public static final HotSpotForeignCallDescriptor STUB_BYTE_ARRAY_COMPARE_TO_CHAR_ARRAY = new HotSpotForeignCallDescriptor(LEAF, REEXECUTABLE, NO_LOCATIONS, "byteArrayCompareToCharArray", int.class, Pointer.class, Pointer.class, int.class, int.class); - public static final ForeignCallDescriptor STUB_CHAR_ARRAY_COMPARE_TO_BYTE_ARRAY = new ForeignCallDescriptor( + public static final HotSpotForeignCallDescriptor STUB_CHAR_ARRAY_COMPARE_TO_BYTE_ARRAY = new HotSpotForeignCallDescriptor(LEAF, REEXECUTABLE, NO_LOCATIONS, "charArrayCompareToByteArray", int.class, Pointer.class, Pointer.class, int.class, int.class); - public static final ForeignCallDescriptor STUB_CHAR_ARRAY_COMPARE_TO_CHAR_ARRAY = new ForeignCallDescriptor( + public static final HotSpotForeignCallDescriptor STUB_CHAR_ARRAY_COMPARE_TO_CHAR_ARRAY = new HotSpotForeignCallDescriptor(LEAF, REEXECUTABLE, NO_LOCATIONS, "charArrayCompareToCharArray", int.class, Pointer.class, Pointer.class, int.class, int.class); public AMD64ArrayCompareToStub(ForeignCallDescriptor foreignCallDescriptor, OptionValues options, HotSpotProviders providers, HotSpotForeignCallLinkage linkage) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64ArrayEqualsStub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64ArrayEqualsStub.java index 8488c0247c9..d35ca5f9bb4 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64ArrayEqualsStub.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64ArrayEqualsStub.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, 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 @@ -24,9 +24,14 @@ package org.graalvm.compiler.hotspot.amd64; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.LEAF; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.NO_LOCATIONS; + import org.graalvm.compiler.api.replacements.Snippet; import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; +import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; import org.graalvm.compiler.hotspot.meta.HotSpotProviders; import org.graalvm.compiler.hotspot.stubs.SnippetStub; import org.graalvm.compiler.options.OptionValues; @@ -38,28 +43,28 @@ import jdk.vm.ci.meta.JavaKind; public final class AMD64ArrayEqualsStub extends SnippetStub { - public static final ForeignCallDescriptor STUB_BOOLEAN_ARRAY_EQUALS = new ForeignCallDescriptor( + public static final HotSpotForeignCallDescriptor STUB_BOOLEAN_ARRAY_EQUALS = new HotSpotForeignCallDescriptor(LEAF, REEXECUTABLE, NO_LOCATIONS, "booleanArraysEquals", boolean.class, Pointer.class, Pointer.class, int.class); - public static final ForeignCallDescriptor STUB_BYTE_ARRAY_EQUALS = new ForeignCallDescriptor( + public static final HotSpotForeignCallDescriptor STUB_BYTE_ARRAY_EQUALS = new HotSpotForeignCallDescriptor(LEAF, REEXECUTABLE, NO_LOCATIONS, "byteArraysEquals", boolean.class, Pointer.class, Pointer.class, int.class); - public static final ForeignCallDescriptor STUB_CHAR_ARRAY_EQUALS = new ForeignCallDescriptor( + public static final HotSpotForeignCallDescriptor STUB_CHAR_ARRAY_EQUALS = new HotSpotForeignCallDescriptor(LEAF, REEXECUTABLE, NO_LOCATIONS, "charArraysEquals", boolean.class, Pointer.class, Pointer.class, int.class); - public static final ForeignCallDescriptor STUB_SHORT_ARRAY_EQUALS = new ForeignCallDescriptor( + public static final HotSpotForeignCallDescriptor STUB_SHORT_ARRAY_EQUALS = new HotSpotForeignCallDescriptor(LEAF, REEXECUTABLE, NO_LOCATIONS, "shortArraysEquals", boolean.class, Pointer.class, Pointer.class, int.class); - public static final ForeignCallDescriptor STUB_INT_ARRAY_EQUALS = new ForeignCallDescriptor( + public static final HotSpotForeignCallDescriptor STUB_INT_ARRAY_EQUALS = new HotSpotForeignCallDescriptor(LEAF, REEXECUTABLE, NO_LOCATIONS, "intArraysEquals", boolean.class, Pointer.class, Pointer.class, int.class); - public static final ForeignCallDescriptor STUB_LONG_ARRAY_EQUALS = new ForeignCallDescriptor( + public static final HotSpotForeignCallDescriptor STUB_LONG_ARRAY_EQUALS = new HotSpotForeignCallDescriptor(LEAF, REEXECUTABLE, NO_LOCATIONS, "longArraysEquals", boolean.class, Pointer.class, Pointer.class, int.class); - public static final ForeignCallDescriptor STUB_FLOAT_ARRAY_EQUALS = new ForeignCallDescriptor( + public static final HotSpotForeignCallDescriptor STUB_FLOAT_ARRAY_EQUALS = new HotSpotForeignCallDescriptor(LEAF, REEXECUTABLE, NO_LOCATIONS, "floatArraysEquals", boolean.class, Pointer.class, Pointer.class, int.class); - public static final ForeignCallDescriptor STUB_DOUBLE_ARRAY_EQUALS = new ForeignCallDescriptor( + public static final HotSpotForeignCallDescriptor STUB_DOUBLE_ARRAY_EQUALS = new HotSpotForeignCallDescriptor(LEAF, REEXECUTABLE, NO_LOCATIONS, "doubleArraysEquals", boolean.class, Pointer.class, Pointer.class, int.class); - public static final ForeignCallDescriptor STUB_BYTE_ARRAY_EQUALS_DIRECT = new ForeignCallDescriptor( + public static final HotSpotForeignCallDescriptor STUB_BYTE_ARRAY_EQUALS_DIRECT = new HotSpotForeignCallDescriptor(LEAF, REEXECUTABLE, NO_LOCATIONS, "byteArraysEqualsDirect", boolean.class, Pointer.class, Pointer.class, int.class); - public static final ForeignCallDescriptor STUB_CHAR_ARRAY_EQUALS_DIRECT = new ForeignCallDescriptor( + public static final HotSpotForeignCallDescriptor STUB_CHAR_ARRAY_EQUALS_DIRECT = new HotSpotForeignCallDescriptor(LEAF, REEXECUTABLE, NO_LOCATIONS, "charArraysEqualsDirect", boolean.class, Pointer.class, Pointer.class, int.class); - public static final ForeignCallDescriptor STUB_CHAR_ARRAY_EQUALS_BYTE_ARRAY = new ForeignCallDescriptor( + public static final HotSpotForeignCallDescriptor STUB_CHAR_ARRAY_EQUALS_BYTE_ARRAY = new HotSpotForeignCallDescriptor(LEAF, REEXECUTABLE, NO_LOCATIONS, "charArrayEqualsByteArray", boolean.class, Pointer.class, Pointer.class, int.class); public AMD64ArrayEqualsStub(ForeignCallDescriptor foreignCallDescriptor, OptionValues options, HotSpotProviders providers, HotSpotForeignCallLinkage linkage) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64ArrayIndexOfStub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64ArrayIndexOfStub.java index 0b758fb7eaf..bb689f9ae81 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64ArrayIndexOfStub.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64ArrayIndexOfStub.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -25,7 +25,6 @@ package org.graalvm.compiler.hotspot.amd64; import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; import org.graalvm.compiler.hotspot.meta.HotSpotProviders; import org.graalvm.compiler.hotspot.stubs.SnippetStub; @@ -34,8 +33,8 @@ import org.graalvm.compiler.replacements.amd64.AMD64ArrayIndexOfNode; public class AMD64ArrayIndexOfStub extends SnippetStub { - public AMD64ArrayIndexOfStub(ForeignCallDescriptor foreignCallDescriptor, OptionValues options, HotSpotProviders providers, HotSpotForeignCallLinkage linkage) { - super(foreignCallDescriptor.getName(), options, providers, linkage); + public AMD64ArrayIndexOfStub(OptionValues options, HotSpotProviders providers, HotSpotForeignCallLinkage linkage) { + super(linkage.getDescriptor().getName(), options, providers, linkage); } @Snippet diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotAddressLowering.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotAddressLowering.java index d3a4194dade..a19c1793e17 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotAddressLowering.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotAddressLowering.java @@ -36,6 +36,7 @@ import org.graalvm.compiler.core.common.type.IntegerStamp; import org.graalvm.compiler.core.common.type.ObjectStamp; import org.graalvm.compiler.graph.Node; import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; +import org.graalvm.compiler.hotspot.HotSpotMarkId; import org.graalvm.compiler.hotspot.nodes.GraalHotSpotVMConfigNode; import org.graalvm.compiler.hotspot.nodes.type.KlassPointerStamp; import org.graalvm.compiler.loop.BasicInductionVariable; @@ -100,7 +101,7 @@ public class AMD64HotSpotAddressLowering extends AMD64CompressAddressLowering { } else if (encoding.getBase() != 0 || (generatePIC && compression.stamp(NodeView.DEFAULT) instanceof KlassPointerStamp)) { if (generatePIC) { if (other == null) { - ValueNode base = compression.graph().unique(new GraalHotSpotVMConfigNode(config, config.MARKID_NARROW_KLASS_BASE_ADDRESS, JavaKind.Long)); + ValueNode base = compression.graph().unique(new GraalHotSpotVMConfigNode(config, HotSpotMarkId.NARROW_KLASS_BASE_ADDRESS, JavaKind.Long)); addr.setBase(base); } else { return false; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackend.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackend.java index 56724ae4830..8e8cd772354 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackend.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackend.java @@ -34,7 +34,6 @@ import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC; import static org.graalvm.compiler.core.common.GraalOptions.ZapStackOnMethodEntry; import jdk.internal.vm.compiler.collections.EconomicSet; -import org.graalvm.compiler.asm.Label; import org.graalvm.compiler.asm.amd64.AMD64Address; import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag; import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; @@ -49,6 +48,7 @@ import org.graalvm.compiler.hotspot.HotSpotDataBuilder; import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; import org.graalvm.compiler.hotspot.HotSpotHostBackend; import org.graalvm.compiler.hotspot.HotSpotLIRGenerationResult; +import org.graalvm.compiler.hotspot.HotSpotMarkId; import org.graalvm.compiler.hotspot.meta.HotSpotConstantLoadAction; import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProvider; import org.graalvm.compiler.hotspot.meta.HotSpotProviders; @@ -170,6 +170,9 @@ public class AMD64HotSpotBackend extends HotSpotHostBackend implements LIRGenera } else { asm.decrementq(rsp, frameSize); } + if (HotSpotMarkId.FRAME_COMPLETE.isAvailable()) { + crb.recordMark(HotSpotMarkId.FRAME_COMPLETE); + } if (ZapStackOnMethodEntry.getValue(crb.getOptions())) { final int intSize = 4; for (int i = 0; i < frameSize / intSize; ++i) { @@ -210,10 +213,11 @@ public class AMD64HotSpotBackend extends HotSpotHostBackend implements LIRGenera assert gen.getDeoptimizationRescueSlot() == null || frameMap.frameNeedsAllocating() : "method that can deoptimize must have a frame"; OptionValues options = lir.getOptions(); DebugContext debug = lir.getDebug(); - boolean omitFrame = CanOmitFrame.getValue(options) && !frameMap.frameNeedsAllocating() && !lir.hasArgInCallerFrame() && !gen.hasForeignCall(); + boolean omitFrame = CanOmitFrame.getValue(options) && !frameMap.frameNeedsAllocating() && !lir.hasArgInCallerFrame() && !gen.hasForeignCall() && + !((AMD64FrameMap) frameMap).useStandardFrameProlog(); Stub stub = gen.getStub(); - AMD64MacroAssembler masm = new AMD64MacroAssembler(getTarget(), options); + AMD64MacroAssembler masm = new AMD64MacroAssembler(getTarget(), options, config.CPU_HAS_INTEL_JCC_ERRATUM); masm.setCodePatchShifter(compilationResult::shiftCodePatch); HotSpotFrameContext frameContext = new HotSpotFrameContext(stub != null, omitFrame, config.preserveFramePointer); DataBuilder dataBuilder = new HotSpotDataBuilder(getCodeCache().getTarget()); @@ -237,10 +241,9 @@ public class AMD64HotSpotBackend extends HotSpotHostBackend implements LIRGenera AMD64MacroAssembler asm = (AMD64MacroAssembler) crb.asm; FrameMap frameMap = crb.frameMap; RegisterConfig regConfig = frameMap.getRegisterConfig(); - Label verifiedEntry = new Label(); // Emit the prefix - emitCodePrefix(installedCodeOwner, crb, asm, regConfig, verifiedEntry); + emitCodePrefix(installedCodeOwner, crb, asm, regConfig); // Emit code for the LIR emitCodeBody(installedCodeOwner, crb, lir); @@ -257,10 +260,10 @@ public class AMD64HotSpotBackend extends HotSpotHostBackend implements LIRGenera * * @param installedCodeOwner see {@link LIRGenerationProvider#emitCode} */ - public void emitCodePrefix(ResolvedJavaMethod installedCodeOwner, CompilationResultBuilder crb, AMD64MacroAssembler asm, RegisterConfig regConfig, Label verifiedEntry) { + public void emitCodePrefix(ResolvedJavaMethod installedCodeOwner, CompilationResultBuilder crb, AMD64MacroAssembler asm, RegisterConfig regConfig) { HotSpotProviders providers = getProviders(); if (installedCodeOwner != null && !installedCodeOwner.isStatic()) { - crb.recordMark(config.MARKID_UNVERIFIED_ENTRY); + crb.recordMark(HotSpotMarkId.UNVERIFIED_ENTRY); CallingConvention cc = regConfig.getCallingConvention(HotSpotCallingConventionType.JavaCallee, null, new JavaType[]{providers.getMetaAccess().lookupJavaType(Object.class)}, this); Register inlineCacheKlass = rax; // see definition of IC_Klass in // c1_LIRAssembler_x86.cpp @@ -274,7 +277,7 @@ public class AMD64HotSpotBackend extends HotSpotHostBackend implements LIRGenera AMD64HotSpotMove.decodeKlassPointer(crb, asm, register, heapBase, src, config); if (GeneratePIC.getValue(crb.getOptions())) { asm.movq(heapBase, asm.getPlaceholder(-1)); - crb.recordMark(config.MARKID_NARROW_OOP_BASE_ADDRESS); + crb.recordMark(HotSpotMarkId.NARROW_OOP_BASE_ADDRESS); } else { if (config.narrowKlassBase != 0) { // The heap base register was destroyed above, so restore it @@ -293,9 +296,7 @@ public class AMD64HotSpotBackend extends HotSpotHostBackend implements LIRGenera } asm.align(config.codeEntryAlignment); - crb.recordMark(config.MARKID_OSR_ENTRY); - asm.bind(verifiedEntry); - crb.recordMark(config.MARKID_VERIFIED_ENTRY); + crb.recordMark(crb.compilationResult.getEntryBCI() != -1 ? HotSpotMarkId.OSR_ENTRY : HotSpotMarkId.VERIFIED_ENTRY); if (GeneratePIC.getValue(crb.getOptions())) { // Check for method state @@ -326,9 +327,9 @@ public class AMD64HotSpotBackend extends HotSpotHostBackend implements LIRGenera HotSpotFrameContext frameContext = (HotSpotFrameContext) crb.frameContext; if (!frameContext.isStub) { HotSpotForeignCallsProvider foreignCalls = providers.getForeignCalls(); - crb.recordMark(config.MARKID_EXCEPTION_HANDLER_ENTRY); + crb.recordMark(HotSpotMarkId.EXCEPTION_HANDLER_ENTRY); AMD64Call.directCall(crb, asm, foreignCalls.lookupForeignCall(EXCEPTION_HANDLER), null, false, null); - crb.recordMark(config.MARKID_DEOPT_HANDLER_ENTRY); + crb.recordMark(HotSpotMarkId.DEOPT_HANDLER_ENTRY); AMD64Call.directCall(crb, asm, foreignCalls.lookupForeignCall(DEOPT_BLOB_UNPACK), null, false, null); } else { // No need to emit the stubs for entries back into the method since diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackendFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackendFactory.java index 0132af2ea02..db5f47b7a8b 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackendFactory.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackendFactory.java @@ -31,6 +31,7 @@ import java.util.List; import org.graalvm.compiler.bytecode.BytecodeProvider; import org.graalvm.compiler.core.common.spi.ConstantFieldProvider; +import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider; import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; import org.graalvm.compiler.hotspot.HotSpotBackend; import org.graalvm.compiler.hotspot.HotSpotBackendFactory; @@ -38,11 +39,12 @@ import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; import org.graalvm.compiler.hotspot.HotSpotReplacementsImpl; import org.graalvm.compiler.hotspot.meta.AddressLoweringHotSpotSuitesProvider; import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotPlatformConfigurationProvider; import org.graalvm.compiler.hotspot.meta.HotSpotGraalConstantFieldProvider; import org.graalvm.compiler.hotspot.meta.HotSpotGraphBuilderPlugins; import org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; import org.graalvm.compiler.hotspot.meta.HotSpotLoweringProvider; +import org.graalvm.compiler.hotspot.meta.HotSpotMetaAccessExtensionProvider; +import org.graalvm.compiler.hotspot.meta.HotSpotPlatformConfigurationProvider; import org.graalvm.compiler.hotspot.meta.HotSpotProviders; import org.graalvm.compiler.hotspot.meta.HotSpotRegisters; import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider; @@ -108,6 +110,7 @@ public class AMD64HotSpotBackendFactory extends HotSpotBackendFactory { HotSpotLoweringProvider lowerer; HotSpotStampProvider stampProvider; HotSpotPlatformConfigurationProvider platformConfigurationProvider; + HotSpotMetaAccessExtensionProvider metaAccessExtensionProvider; HotSpotSnippetReflectionProvider snippetReflection; HotSpotReplacementsImpl replacements; HotSpotSuitesProvider suites; @@ -130,14 +133,18 @@ public class AMD64HotSpotBackendFactory extends HotSpotBackendFactory { try (InitTimer rt = timer("create platform configuration provider")) { platformConfigurationProvider = createConfigInfoProvider(config, metaAccess); } + try (InitTimer rt = timer("create MetaAccessExtensionProvider")) { + metaAccessExtensionProvider = createMetaAccessExtensionProvider(); + } try (InitTimer rt = timer("create stamp provider")) { stampProvider = createStampProvider(); } try (InitTimer rt = timer("create Lowerer provider")) { - lowerer = createLowerer(graalRuntime, metaAccess, foreignCalls, registers, constantReflection, platformConfigurationProvider, target); + lowerer = createLowerer(graalRuntime, metaAccess, foreignCalls, registers, constantReflection, platformConfigurationProvider, metaAccessExtensionProvider, target); } - Providers p = new Providers(metaAccess, codeCache, constantReflection, constantFieldProvider, foreignCalls, lowerer, null, stampProvider, platformConfigurationProvider); + Providers p = new Providers(metaAccess, codeCache, constantReflection, constantFieldProvider, foreignCalls, lowerer, null, stampProvider, platformConfigurationProvider, + metaAccessExtensionProvider); try (InitTimer rt = timer("create SnippetReflection provider")) { snippetReflection = createSnippetReflection(graalRuntime, constantReflection, wordTypes); @@ -157,7 +164,7 @@ public class AMD64HotSpotBackendFactory extends HotSpotBackendFactory { suites = createSuites(config, graalRuntime, compilerConfiguration, plugins, registers, replacements, options); } providers = new HotSpotProviders(metaAccess, codeCache, constantReflection, constantFieldProvider, foreignCalls, lowerer, replacements, suites, registers, - snippetReflection, wordTypes, plugins, platformConfigurationProvider); + snippetReflection, wordTypes, plugins, platformConfigurationProvider, metaAccessExtensionProvider); replacements.setProviders(providers); replacements.maybeInitializeEncoder(options); } @@ -216,13 +223,15 @@ public class AMD64HotSpotBackendFactory extends HotSpotBackendFactory { } protected HotSpotLoweringProvider createLowerer(HotSpotGraalRuntimeProvider runtime, HotSpotMetaAccessProvider metaAccess, HotSpotForeignCallsProvider foreignCalls, - HotSpotRegistersProvider registers, HotSpotConstantReflectionProvider constantReflection, PlatformConfigurationProvider platformConfig, TargetDescription target) { - return new AMD64HotSpotLoweringProvider(runtime, metaAccess, foreignCalls, registers, constantReflection, platformConfig, target); + HotSpotRegistersProvider registers, HotSpotConstantReflectionProvider constantReflection, PlatformConfigurationProvider platformConfig, + MetaAccessExtensionProvider metaAccessExtensionProvider, + TargetDescription target) { + return new AMD64HotSpotLoweringProvider(runtime, metaAccess, foreignCalls, registers, constantReflection, platformConfig, metaAccessExtensionProvider, target); } protected Value[] createNativeABICallerSaveRegisters(GraalHotSpotVMConfig config, RegisterConfig regConfig) { List callerSave = new ArrayList<>(regConfig.getAllocatableRegisters().asList()); - if (config.windowsOs) { + if (config.osName.equals("windows")) { // http://msdn.microsoft.com/en-us/library/9z1stfyw.aspx callerSave.remove(AMD64.rdi); callerSave.remove(AMD64.rsi); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java index a9c8db1fb4c..2afe2606f94 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -25,7 +25,7 @@ package org.graalvm.compiler.hotspot.amd64; import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; +import org.graalvm.compiler.hotspot.HotSpotMarkId; import org.graalvm.compiler.lir.LIRFrameState; import org.graalvm.compiler.lir.LIRInstructionClass; import org.graalvm.compiler.lir.Opcode; @@ -45,18 +45,19 @@ final class AMD64HotSpotDirectStaticCallOp extends DirectCallOp { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64HotSpotDirectStaticCallOp.class); private final InvokeKind invokeKind; - private final GraalHotSpotVMConfig config; - AMD64HotSpotDirectStaticCallOp(ResolvedJavaMethod target, Value result, Value[] parameters, Value[] temps, LIRFrameState state, InvokeKind invokeKind, GraalHotSpotVMConfig config) { + AMD64HotSpotDirectStaticCallOp(ResolvedJavaMethod target, Value result, Value[] parameters, Value[] temps, LIRFrameState state, InvokeKind invokeKind) { super(TYPE, target, result, parameters, temps, state); assert invokeKind.isDirect(); this.invokeKind = invokeKind; - this.config = config; } @Override + @SuppressWarnings("try") public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) { - crb.recordMark(invokeKind == InvokeKind.Static ? config.MARKID_INVOKESTATIC : config.MARKID_INVOKESPECIAL); - super.emitCode(crb, masm); + try (CompilationResultBuilder.CallContext callContext = crb.openCallContext(invokeKind.isDirect())) { + crb.recordMark(invokeKind == InvokeKind.Static ? HotSpotMarkId.INVOKESTATIC : HotSpotMarkId.INVOKESPECIAL); + super.emitCode(crb, masm); + } } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java index 9f9101bf486..80b49fc2637 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -32,12 +32,10 @@ import static org.graalvm.compiler.hotspot.HotSpotBackend.EXCEPTION_HANDLER; import static org.graalvm.compiler.hotspot.HotSpotBackend.EXCEPTION_HANDLER_IN_CALLER; import static org.graalvm.compiler.hotspot.HotSpotBackend.Options.GraalArithmeticStubs; import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.JUMP_ADDRESS; -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Reexecutability.NOT_REEXECUTABLE; -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Reexecutability.REEXECUTABLE; import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.COMPUTES_REGISTERS_KILLED; import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.DESTROYS_ALL_CALLER_SAVE_REGISTERS; -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Transition.LEAF; -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Transition.LEAF_NO_VZERO; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.LEAF; import static org.graalvm.compiler.hotspot.replacements.CRC32CSubstitutions.UPDATE_BYTES_CRC32C; import static org.graalvm.compiler.hotspot.replacements.CRC32Substitutions.UPDATE_BYTES_CRC32; import static org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode.BinaryOperation.POW; @@ -47,7 +45,6 @@ import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.Una import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.LOG10; import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.SIN; import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.TAN; -import static jdk.internal.vm.compiler.word.LocationIdentity.any; import org.graalvm.compiler.core.common.LIRKind; import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; @@ -90,80 +87,79 @@ public class AMD64HotSpotForeignCallsProvider extends HotSpotHostForeignCallsPro RegisterValue exception = rax.asValue(LIRKind.reference(word)); RegisterValue exceptionPc = rdx.asValue(LIRKind.value(word)); CallingConvention exceptionCc = new CallingConvention(0, ILLEGAL, exception, exceptionPc); - register(new HotSpotForeignCallLinkageImpl(EXCEPTION_HANDLER, 0L, DESTROYS_ALL_CALLER_SAVE_REGISTERS, LEAF_NO_VZERO, NOT_REEXECUTABLE, exceptionCc, null, any())); - register(new HotSpotForeignCallLinkageImpl(EXCEPTION_HANDLER_IN_CALLER, JUMP_ADDRESS, DESTROYS_ALL_CALLER_SAVE_REGISTERS, LEAF_NO_VZERO, NOT_REEXECUTABLE, exceptionCc, null, - any())); + register(new HotSpotForeignCallLinkageImpl(EXCEPTION_HANDLER, 0L, DESTROYS_ALL_CALLER_SAVE_REGISTERS, exceptionCc, null)); + register(new HotSpotForeignCallLinkageImpl(EXCEPTION_HANDLER_IN_CALLER, JUMP_ADDRESS, DESTROYS_ALL_CALLER_SAVE_REGISTERS, exceptionCc, null)); if (config.useCRC32Intrinsics) { // This stub does callee saving - registerForeignCall(UPDATE_BYTES_CRC32, config.updateBytesCRC32Stub, NativeCall, LEAF_NO_VZERO, NOT_REEXECUTABLE, any()); + registerForeignCall(UPDATE_BYTES_CRC32, config.updateBytesCRC32Stub, NativeCall); } if (config.useCRC32CIntrinsics) { - registerForeignCall(UPDATE_BYTES_CRC32C, config.updateBytesCRC32C, NativeCall, LEAF_NO_VZERO, NOT_REEXECUTABLE, any()); + registerForeignCall(UPDATE_BYTES_CRC32C, config.updateBytesCRC32C, NativeCall); } - link(new AMD64ArrayIndexOfStub(AMD64ArrayIndexOf.STUB_INDEX_OF_TWO_CONSECUTIVE_BYTES, options, providers, + link(new AMD64ArrayIndexOfStub(options, providers, registerStubCall(AMD64ArrayIndexOf.STUB_INDEX_OF_TWO_CONSECUTIVE_BYTES, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); - link(new AMD64ArrayIndexOfStub(AMD64ArrayIndexOf.STUB_INDEX_OF_TWO_CONSECUTIVE_CHARS, options, providers, + link(new AMD64ArrayIndexOfStub(options, providers, registerStubCall(AMD64ArrayIndexOf.STUB_INDEX_OF_TWO_CONSECUTIVE_CHARS, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); - link(new AMD64ArrayIndexOfStub(AMD64ArrayIndexOf.STUB_INDEX_OF_TWO_CONSECUTIVE_CHARS_COMPACT, options, providers, + link(new AMD64ArrayIndexOfStub(options, providers, registerStubCall(AMD64ArrayIndexOf.STUB_INDEX_OF_TWO_CONSECUTIVE_CHARS_COMPACT, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); - link(new AMD64ArrayIndexOfStub(AMD64ArrayIndexOf.STUB_INDEX_OF_1_BYTE, options, providers, + link(new AMD64ArrayIndexOfStub(options, providers, registerStubCall(AMD64ArrayIndexOf.STUB_INDEX_OF_1_BYTE, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); - link(new AMD64ArrayIndexOfStub(AMD64ArrayIndexOf.STUB_INDEX_OF_2_BYTES, options, providers, + link(new AMD64ArrayIndexOfStub(options, providers, registerStubCall(AMD64ArrayIndexOf.STUB_INDEX_OF_2_BYTES, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); - link(new AMD64ArrayIndexOfStub(AMD64ArrayIndexOf.STUB_INDEX_OF_3_BYTES, options, providers, + link(new AMD64ArrayIndexOfStub(options, providers, registerStubCall(AMD64ArrayIndexOf.STUB_INDEX_OF_3_BYTES, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); - link(new AMD64ArrayIndexOfStub(AMD64ArrayIndexOf.STUB_INDEX_OF_4_BYTES, options, providers, + link(new AMD64ArrayIndexOfStub(options, providers, registerStubCall(AMD64ArrayIndexOf.STUB_INDEX_OF_4_BYTES, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); - link(new AMD64ArrayIndexOfStub(AMD64ArrayIndexOf.STUB_INDEX_OF_1_CHAR, options, providers, + link(new AMD64ArrayIndexOfStub(options, providers, registerStubCall(AMD64ArrayIndexOf.STUB_INDEX_OF_1_CHAR, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); - link(new AMD64ArrayIndexOfStub(AMD64ArrayIndexOf.STUB_INDEX_OF_2_CHARS, options, providers, + link(new AMD64ArrayIndexOfStub(options, providers, registerStubCall(AMD64ArrayIndexOf.STUB_INDEX_OF_2_CHARS, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); - link(new AMD64ArrayIndexOfStub(AMD64ArrayIndexOf.STUB_INDEX_OF_3_CHARS, options, providers, + link(new AMD64ArrayIndexOfStub(options, providers, registerStubCall(AMD64ArrayIndexOf.STUB_INDEX_OF_3_CHARS, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); - link(new AMD64ArrayIndexOfStub(AMD64ArrayIndexOf.STUB_INDEX_OF_4_CHARS, options, providers, + link(new AMD64ArrayIndexOfStub(options, providers, registerStubCall(AMD64ArrayIndexOf.STUB_INDEX_OF_4_CHARS, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); - link(new AMD64ArrayIndexOfStub(AMD64ArrayIndexOf.STUB_INDEX_OF_1_CHAR_COMPACT, options, providers, + link(new AMD64ArrayIndexOfStub(options, providers, registerStubCall(AMD64ArrayIndexOf.STUB_INDEX_OF_1_CHAR_COMPACT, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); - link(new AMD64ArrayIndexOfStub(AMD64ArrayIndexOf.STUB_INDEX_OF_2_CHARS_COMPACT, options, providers, + link(new AMD64ArrayIndexOfStub(options, providers, registerStubCall(AMD64ArrayIndexOf.STUB_INDEX_OF_2_CHARS_COMPACT, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); - link(new AMD64ArrayIndexOfStub(AMD64ArrayIndexOf.STUB_INDEX_OF_3_CHARS_COMPACT, options, providers, + link(new AMD64ArrayIndexOfStub(options, providers, registerStubCall(AMD64ArrayIndexOf.STUB_INDEX_OF_3_CHARS_COMPACT, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); - link(new AMD64ArrayIndexOfStub(AMD64ArrayIndexOf.STUB_INDEX_OF_4_CHARS_COMPACT, options, providers, + link(new AMD64ArrayIndexOfStub(options, providers, registerStubCall(AMD64ArrayIndexOf.STUB_INDEX_OF_4_CHARS_COMPACT, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); link(new AMD64ArrayEqualsStub(AMD64ArrayEqualsStub.STUB_BOOLEAN_ARRAY_EQUALS, options, providers, - registerStubCall(AMD64ArrayEqualsStub.STUB_BOOLEAN_ARRAY_EQUALS, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); + registerStubCall(AMD64ArrayEqualsStub.STUB_BOOLEAN_ARRAY_EQUALS, COMPUTES_REGISTERS_KILLED))); link(new AMD64ArrayEqualsStub(AMD64ArrayEqualsStub.STUB_BYTE_ARRAY_EQUALS, options, providers, - registerStubCall(AMD64ArrayEqualsStub.STUB_BYTE_ARRAY_EQUALS, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); + registerStubCall(AMD64ArrayEqualsStub.STUB_BYTE_ARRAY_EQUALS, COMPUTES_REGISTERS_KILLED))); link(new AMD64ArrayEqualsStub(AMD64ArrayEqualsStub.STUB_CHAR_ARRAY_EQUALS, options, providers, - registerStubCall(AMD64ArrayEqualsStub.STUB_CHAR_ARRAY_EQUALS, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); + registerStubCall(AMD64ArrayEqualsStub.STUB_CHAR_ARRAY_EQUALS, COMPUTES_REGISTERS_KILLED))); link(new AMD64ArrayEqualsStub(AMD64ArrayEqualsStub.STUB_SHORT_ARRAY_EQUALS, options, providers, - registerStubCall(AMD64ArrayEqualsStub.STUB_SHORT_ARRAY_EQUALS, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); + registerStubCall(AMD64ArrayEqualsStub.STUB_SHORT_ARRAY_EQUALS, COMPUTES_REGISTERS_KILLED))); link(new AMD64ArrayEqualsStub(AMD64ArrayEqualsStub.STUB_INT_ARRAY_EQUALS, options, providers, - registerStubCall(AMD64ArrayEqualsStub.STUB_INT_ARRAY_EQUALS, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); + registerStubCall(AMD64ArrayEqualsStub.STUB_INT_ARRAY_EQUALS, COMPUTES_REGISTERS_KILLED))); link(new AMD64ArrayEqualsStub(AMD64ArrayEqualsStub.STUB_LONG_ARRAY_EQUALS, options, providers, - registerStubCall(AMD64ArrayEqualsStub.STUB_LONG_ARRAY_EQUALS, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); + registerStubCall(AMD64ArrayEqualsStub.STUB_LONG_ARRAY_EQUALS, COMPUTES_REGISTERS_KILLED))); link(new AMD64ArrayEqualsStub(AMD64ArrayEqualsStub.STUB_FLOAT_ARRAY_EQUALS, options, providers, - registerStubCall(AMD64ArrayEqualsStub.STUB_FLOAT_ARRAY_EQUALS, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); + registerStubCall(AMD64ArrayEqualsStub.STUB_FLOAT_ARRAY_EQUALS, COMPUTES_REGISTERS_KILLED))); link(new AMD64ArrayEqualsStub(AMD64ArrayEqualsStub.STUB_DOUBLE_ARRAY_EQUALS, options, providers, - registerStubCall(AMD64ArrayEqualsStub.STUB_DOUBLE_ARRAY_EQUALS, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); + registerStubCall(AMD64ArrayEqualsStub.STUB_DOUBLE_ARRAY_EQUALS, COMPUTES_REGISTERS_KILLED))); link(new AMD64ArrayEqualsStub(AMD64ArrayEqualsStub.STUB_BYTE_ARRAY_EQUALS_DIRECT, options, providers, - registerStubCall(AMD64ArrayEqualsStub.STUB_BYTE_ARRAY_EQUALS_DIRECT, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); + registerStubCall(AMD64ArrayEqualsStub.STUB_BYTE_ARRAY_EQUALS_DIRECT, COMPUTES_REGISTERS_KILLED))); link(new AMD64ArrayEqualsStub(AMD64ArrayEqualsStub.STUB_CHAR_ARRAY_EQUALS_DIRECT, options, providers, - registerStubCall(AMD64ArrayEqualsStub.STUB_CHAR_ARRAY_EQUALS_DIRECT, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); + registerStubCall(AMD64ArrayEqualsStub.STUB_CHAR_ARRAY_EQUALS_DIRECT, COMPUTES_REGISTERS_KILLED))); link(new AMD64ArrayEqualsStub(AMD64ArrayEqualsStub.STUB_CHAR_ARRAY_EQUALS_BYTE_ARRAY, options, providers, - registerStubCall(AMD64ArrayEqualsStub.STUB_CHAR_ARRAY_EQUALS_BYTE_ARRAY, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); + registerStubCall(AMD64ArrayEqualsStub.STUB_CHAR_ARRAY_EQUALS_BYTE_ARRAY, COMPUTES_REGISTERS_KILLED))); link(new AMD64ArrayCompareToStub(AMD64ArrayCompareToStub.STUB_BYTE_ARRAY_COMPARE_TO_BYTE_ARRAY, options, providers, - registerStubCall(AMD64ArrayCompareToStub.STUB_BYTE_ARRAY_COMPARE_TO_BYTE_ARRAY, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); + registerStubCall(AMD64ArrayCompareToStub.STUB_BYTE_ARRAY_COMPARE_TO_BYTE_ARRAY, COMPUTES_REGISTERS_KILLED))); link(new AMD64ArrayCompareToStub(AMD64ArrayCompareToStub.STUB_BYTE_ARRAY_COMPARE_TO_CHAR_ARRAY, options, providers, - registerStubCall(AMD64ArrayCompareToStub.STUB_BYTE_ARRAY_COMPARE_TO_CHAR_ARRAY, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); + registerStubCall(AMD64ArrayCompareToStub.STUB_BYTE_ARRAY_COMPARE_TO_CHAR_ARRAY, COMPUTES_REGISTERS_KILLED))); link(new AMD64ArrayCompareToStub(AMD64ArrayCompareToStub.STUB_CHAR_ARRAY_COMPARE_TO_BYTE_ARRAY, options, providers, - registerStubCall(AMD64ArrayCompareToStub.STUB_CHAR_ARRAY_COMPARE_TO_BYTE_ARRAY, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); + registerStubCall(AMD64ArrayCompareToStub.STUB_CHAR_ARRAY_COMPARE_TO_BYTE_ARRAY, COMPUTES_REGISTERS_KILLED))); link(new AMD64ArrayCompareToStub(AMD64ArrayCompareToStub.STUB_CHAR_ARRAY_COMPARE_TO_CHAR_ARRAY, options, providers, - registerStubCall(AMD64ArrayCompareToStub.STUB_CHAR_ARRAY_COMPARE_TO_CHAR_ARRAY, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); + registerStubCall(AMD64ArrayCompareToStub.STUB_CHAR_ARRAY_COMPARE_TO_CHAR_ARRAY, COMPUTES_REGISTERS_KILLED))); super.initialize(providers, options); } @@ -176,13 +172,13 @@ public class AMD64HotSpotForeignCallsProvider extends HotSpotHostForeignCallsPro @Override protected void registerMathStubs(GraalHotSpotVMConfig hotSpotVMConfig, HotSpotProviders providers, OptionValues options) { if (GraalArithmeticStubs.getValue(options)) { - link(new AMD64MathStub(SIN, options, providers, registerStubCall(SIN.foreignCallDescriptor, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); - link(new AMD64MathStub(COS, options, providers, registerStubCall(COS.foreignCallDescriptor, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); - link(new AMD64MathStub(TAN, options, providers, registerStubCall(TAN.foreignCallDescriptor, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); - link(new AMD64MathStub(EXP, options, providers, registerStubCall(EXP.foreignCallDescriptor, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); - link(new AMD64MathStub(LOG, options, providers, registerStubCall(LOG.foreignCallDescriptor, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); - link(new AMD64MathStub(LOG10, options, providers, registerStubCall(LOG10.foreignCallDescriptor, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); - link(new AMD64MathStub(POW, options, providers, registerStubCall(POW.foreignCallDescriptor, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); + link(new AMD64MathStub(SIN, options, providers, registerStubCall(SIN.foreignCallSignature, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); + link(new AMD64MathStub(COS, options, providers, registerStubCall(COS.foreignCallSignature, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); + link(new AMD64MathStub(TAN, options, providers, registerStubCall(TAN.foreignCallSignature, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); + link(new AMD64MathStub(EXP, options, providers, registerStubCall(EXP.foreignCallSignature, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); + link(new AMD64MathStub(LOG, options, providers, registerStubCall(LOG.foreignCallSignature, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); + link(new AMD64MathStub(LOG10, options, providers, registerStubCall(LOG10.foreignCallSignature, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); + link(new AMD64MathStub(POW, options, providers, registerStubCall(POW.foreignCallSignature, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); } else { super.registerMathStubs(hotSpotVMConfig, providers, options); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLIRGenerator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLIRGenerator.java index d7a4532d214..2f944e8f38f 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLIRGenerator.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLIRGenerator.java @@ -56,6 +56,7 @@ import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; import org.graalvm.compiler.hotspot.HotSpotLIRGenerationResult; import org.graalvm.compiler.hotspot.HotSpotLIRGenerator; import org.graalvm.compiler.hotspot.HotSpotLockStack; +import org.graalvm.compiler.hotspot.HotSpotMarkId; import org.graalvm.compiler.hotspot.debug.BenchmarkCounters; import org.graalvm.compiler.hotspot.meta.HotSpotConstantLoadAction; import org.graalvm.compiler.hotspot.meta.HotSpotProviders; @@ -476,7 +477,7 @@ public class AMD64HotSpotLIRGenerator extends AMD64LIRGenerator implements HotSp } @Override - public Value emitLoadConfigValue(int markId, LIRKind kind) { + public Value emitLoadConfigValue(HotSpotMarkId markId, LIRKind kind) { Variable result = newVariable(kind); append(new AMD64HotSpotLoadConfigValueOp(markId, result)); return result; @@ -602,7 +603,7 @@ public class AMD64HotSpotLIRGenerator extends AMD64LIRGenerator implements HotSp if (encoding.hasBase() || GeneratePIC.getValue(options)) { if (GeneratePIC.getValue(options)) { Variable baseAddress = newVariable(lirKindTool.getWordKind()); - AMD64HotSpotMove.BaseMove move = new AMD64HotSpotMove.BaseMove(baseAddress, config); + AMD64HotSpotMove.BaseMove move = new AMD64HotSpotMove.BaseMove(baseAddress); append(move); base = baseAddress; } else { @@ -633,7 +634,7 @@ public class AMD64HotSpotLIRGenerator extends AMD64LIRGenerator implements HotSp if (encoding.hasBase() || GeneratePIC.getValue(options)) { if (GeneratePIC.getValue(options)) { Variable baseAddress = newVariable(uncompressedKind); - AMD64HotSpotMove.BaseMove move = new AMD64HotSpotMove.BaseMove(baseAddress, config); + AMD64HotSpotMove.BaseMove move = new AMD64HotSpotMove.BaseMove(baseAddress); append(move); base = baseAddress; } else { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoadConfigValueOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoadConfigValueOp.java index 0bf0abfd910..ec1bf57a669 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoadConfigValueOp.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoadConfigValueOp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -24,28 +24,29 @@ package org.graalvm.compiler.hotspot.amd64; -import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC; import static jdk.vm.ci.code.ValueUtil.asRegister; - -import jdk.vm.ci.amd64.AMD64Kind; -import jdk.vm.ci.code.Register; -import jdk.vm.ci.meta.AllocatableValue; +import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC; import org.graalvm.compiler.asm.amd64.AMD64Address; import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; import org.graalvm.compiler.debug.GraalError; +import org.graalvm.compiler.hotspot.HotSpotMarkId; import org.graalvm.compiler.lir.LIRInstructionClass; import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction; import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +import jdk.vm.ci.amd64.AMD64Kind; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.meta.AllocatableValue; + public final class AMD64HotSpotLoadConfigValueOp extends AMD64LIRInstruction { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64HotSpotLoadConfigValueOp.class); @Def({OperandFlag.REG}) protected AllocatableValue result; - private final int markId; + private final HotSpotMarkId markId; - public AMD64HotSpotLoadConfigValueOp(int markId, AllocatableValue result) { + public AMD64HotSpotLoadConfigValueOp(HotSpotMarkId markId, AllocatableValue result) { super(TYPE); this.result = result; this.markId = markId; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoweringProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoweringProvider.java index 26024d63120..54b2912dc37 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoweringProvider.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoweringProvider.java @@ -26,9 +26,9 @@ package org.graalvm.compiler.hotspot.amd64; import static org.graalvm.compiler.hotspot.HotSpotBackend.Options.GraalArithmeticStubs; -import org.graalvm.compiler.api.replacements.Snippet; import org.graalvm.compiler.core.amd64.AMD64LoweringProviderMixin; import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; +import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider; import org.graalvm.compiler.debug.DebugHandlersFactory; import org.graalvm.compiler.graph.Node; import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; @@ -62,8 +62,9 @@ public class AMD64HotSpotLoweringProvider extends DefaultHotSpotLoweringProvider private AMD64X87MathSnippets.Templates mathSnippets; public AMD64HotSpotLoweringProvider(HotSpotGraalRuntimeProvider runtime, MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls, HotSpotRegistersProvider registers, - HotSpotConstantReflectionProvider constantReflection, PlatformConfigurationProvider platformConfig, TargetDescription target) { - super(runtime, metaAccess, foreignCalls, registers, constantReflection, platformConfig, target); + HotSpotConstantReflectionProvider constantReflection, PlatformConfigurationProvider platformConfig, MetaAccessExtensionProvider metaAccessExtensionProvider, + TargetDescription target) { + super(runtime, metaAccess, foreignCalls, registers, constantReflection, platformConfig, metaAccessExtensionProvider, target); } @Override @@ -100,12 +101,10 @@ public class AMD64HotSpotLoweringProvider extends DefaultHotSpotLoweringProvider } StructuredGraph graph = math.graph(); ResolvedJavaMethod method = graph.method(); - if (method != null) { - if (method.getAnnotation(Snippet.class) != null) { - // In the context of SnippetStub, i.e., Graal-generated stubs, use the LIR - // lowering to emit the stub assembly code instead of the Node lowering. - return; - } + if (method != null && getReplacements().isSnippet(method)) { + // In the context of SnippetStub, i.e., Graal-generated stubs, use the LIR + // lowering to emit the stub assembly code instead of the Node lowering. + return; } if (!GraalArithmeticStubs.getValue(graph.getOptions())) { switch (math.getOperation()) { @@ -127,7 +126,7 @@ public class AMD64HotSpotLoweringProvider extends DefaultHotSpotLoweringProvider } } - ForeignCallNode call = graph.add(new ForeignCallNode(foreignCalls, math.getOperation().foreignCallDescriptor, math.getValue())); + ForeignCallNode call = graph.add(new ForeignCallNode(foreignCalls, math.getOperation().foreignCallSignature, math.getValue())); graph.addAfterFixed(tool.lastFixedNode(), call); math.replaceAtUsages(call); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMove.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMove.java index 0a8eb54740a..62e82e2006b 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMove.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMove.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -24,19 +24,20 @@ package org.graalvm.compiler.hotspot.amd64; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlot; import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC; import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.HINT; import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK; -import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.vm.ci.code.ValueUtil.isRegister; -import static jdk.vm.ci.code.ValueUtil.isStackSlot; import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.core.common.CompressEncoding; import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; +import org.graalvm.compiler.core.common.CompressEncoding; import org.graalvm.compiler.debug.GraalError; import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; +import org.graalvm.compiler.hotspot.HotSpotMarkId; import org.graalvm.compiler.lir.LIRInstructionClass; import org.graalvm.compiler.lir.StandardOp.LoadConstantOp; import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction; @@ -113,18 +114,16 @@ public class AMD64HotSpotMove { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(BaseMove.class); @Def({REG, HINT}) protected AllocatableValue result; - private final GraalHotSpotVMConfig config; - public BaseMove(AllocatableValue result, GraalHotSpotVMConfig config) { + public BaseMove(AllocatableValue result) { super(TYPE); this.result = result; - this.config = config; } @Override public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) { masm.movq(asRegister(result), masm.getPlaceholder(-1)); - crb.recordMark(config.MARKID_NARROW_KLASS_BASE_ADDRESS); + crb.recordMark(HotSpotMarkId.NARROW_KLASS_BASE_ADDRESS); } } @@ -187,7 +186,7 @@ public class AMD64HotSpotMove { if (pic || encoding.hasBase()) { if (pic) { masm.movq(scratch, masm.getPlaceholder(-1)); - crb.recordMark(config.MARKID_NARROW_KLASS_BASE_ADDRESS); + crb.recordMark(HotSpotMarkId.NARROW_KLASS_BASE_ADDRESS); } else { assert encoding.getBase() != 0; masm.movq(scratch, encoding.getBase()); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java index 107cb372cea..14c949c117e 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -28,7 +28,6 @@ import static jdk.vm.ci.amd64.AMD64.rbp; import static jdk.vm.ci.code.ValueUtil.isStackSlot; import static org.graalvm.compiler.hotspot.HotSpotBackend.EXCEPTION_HANDLER_IN_CALLER; -import org.graalvm.compiler.api.replacements.Snippet; import org.graalvm.compiler.core.amd64.AMD64NodeLIRBuilder; import org.graalvm.compiler.core.amd64.AMD64NodeMatchRules; import org.graalvm.compiler.core.common.LIRKind; @@ -58,6 +57,7 @@ import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.spi.NodeValueMap; import org.graalvm.compiler.replacements.nodes.ArrayCompareToNode; import org.graalvm.compiler.replacements.nodes.ArrayEqualsNode; +import org.graalvm.compiler.replacements.nodes.ArrayRegionEqualsNode; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64Kind; @@ -72,9 +72,7 @@ import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod; import jdk.vm.ci.meta.AllocatableValue; import jdk.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.JavaType; -import jdk.vm.ci.meta.ResolvedJavaMethod; import jdk.vm.ci.meta.Value; -import org.graalvm.compiler.replacements.nodes.ArrayRegionEqualsNode; /** * LIR generator specialized for AMD64 HotSpot. @@ -144,7 +142,7 @@ public class AMD64HotSpotNodeLIRBuilder extends AMD64NodeLIRBuilder implements H assert invokeKind.isDirect(); HotSpotResolvedJavaMethod resolvedMethod = (HotSpotResolvedJavaMethod) callTarget.targetMethod(); assert resolvedMethod.isConcrete() : "Cannot make direct call to abstract method."; - append(new AMD64HotSpotDirectStaticCallOp(callTarget.targetMethod(), result, parameters, temps, callState, invokeKind, getGen().config)); + append(new AMD64HotSpotDirectStaticCallOp(callTarget.targetMethod(), result, parameters, temps, callState, invokeKind)); } } @@ -157,7 +155,7 @@ public class AMD64HotSpotNodeLIRBuilder extends AMD64NodeLIRBuilder implements H AllocatableValue targetAddressDst = AMD64.rax.asValue(targetAddressSrc.getValueKind()); gen.emitMove(metaspaceMethodDst, metaspaceMethodSrc); gen.emitMove(targetAddressDst, targetAddressSrc); - append(new AMD64IndirectCallOp(callTarget.targetMethod(), result, parameters, temps, metaspaceMethodDst, targetAddressDst, callState, getGen().config)); + append(new AMD64IndirectCallOp(callTarget.targetMethod(), result, parameters, temps, metaspaceMethodDst, targetAddressDst, callState)); } else { super.emitIndirectCall(callTarget, result, parameters, temps, callState); } @@ -210,8 +208,7 @@ public class AMD64HotSpotNodeLIRBuilder extends AMD64NodeLIRBuilder implements H @Override public ForeignCallLinkage lookupGraalStub(ValueNode valueNode) { - ResolvedJavaMethod method = valueNode.graph().method(); - if (method == null || method.getAnnotation(Snippet.class) != null) { + if (getGen().getResult().getStub() != null) { // Emit assembly for snippet stubs return null; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotSafepointOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotSafepointOp.java index 84ec50d6235..2915dec0122 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotSafepointOp.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotSafepointOp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -24,16 +24,17 @@ package org.graalvm.compiler.hotspot.amd64; -import static org.graalvm.compiler.core.common.NumUtil.isInt; -import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC; -import static org.graalvm.compiler.core.common.GraalOptions.ImmutableCode; import static jdk.vm.ci.amd64.AMD64.rax; import static jdk.vm.ci.amd64.AMD64.rip; +import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC; +import static org.graalvm.compiler.core.common.GraalOptions.ImmutableCode; +import static org.graalvm.compiler.core.common.NumUtil.isInt; import org.graalvm.compiler.asm.amd64.AMD64Address; import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; import org.graalvm.compiler.core.common.LIRKind; import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; +import org.graalvm.compiler.hotspot.HotSpotMarkId; import org.graalvm.compiler.lir.LIRFrameState; import org.graalvm.compiler.lir.LIRInstructionClass; import org.graalvm.compiler.lir.Opcode; @@ -67,7 +68,7 @@ public final class AMD64HotSpotSafepointOp extends AMD64LIRInstruction { this.state = state; this.config = config; this.thread = thread; - if (config.threadLocalHandshakes || isPollingPageFar(config) || ImmutableCode.getValue(tool.getOptions())) { + if (config.useThreadLocalPolling || isPollingPageFar(config) || ImmutableCode.getValue(tool.getOptions())) { temp = tool.getLIRGeneratorTool().newVariable(LIRKind.value(tool.getLIRGeneratorTool().target().arch.getWordKind())); } else { // Don't waste a register if it's unneeded @@ -81,7 +82,7 @@ public final class AMD64HotSpotSafepointOp extends AMD64LIRInstruction { } public static void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler asm, GraalHotSpotVMConfig config, boolean atReturn, LIRFrameState state, Register thread, Register scratch) { - if (config.threadLocalHandshakes) { + if (config.useThreadLocalPolling) { emitThreadLocalPoll(crb, asm, config, atReturn, state, thread, scratch); } else { emitGlobalPoll(crb, asm, config, atReturn, state, scratch); @@ -111,21 +112,21 @@ public final class AMD64HotSpotSafepointOp extends AMD64LIRInstruction { asm.movq(scratch, (AMD64Address) crb.recordDataReferenceInCode(pollingPageAddress, alignment)); } final int pos = asm.position(); - crb.recordMark(atReturn ? config.MARKID_POLL_RETURN_FAR : config.MARKID_POLL_FAR); + crb.recordMark(atReturn ? HotSpotMarkId.POLL_RETURN_FAR : HotSpotMarkId.POLL_FAR); if (state != null) { crb.recordInfopoint(pos, state, InfopointReason.SAFEPOINT); } asm.testl(rax, new AMD64Address(scratch)); } else if (isPollingPageFar(config)) { asm.movq(scratch, config.safepointPollingAddress); - crb.recordMark(atReturn ? config.MARKID_POLL_RETURN_FAR : config.MARKID_POLL_FAR); + crb.recordMark(atReturn ? HotSpotMarkId.POLL_RETURN_FAR : HotSpotMarkId.POLL_FAR); final int pos = asm.position(); if (state != null) { crb.recordInfopoint(pos, state, InfopointReason.SAFEPOINT); } asm.testl(rax, new AMD64Address(scratch)); } else { - crb.recordMark(atReturn ? config.MARKID_POLL_RETURN_NEAR : config.MARKID_POLL_NEAR); + crb.recordMark(atReturn ? HotSpotMarkId.POLL_RETURN_NEAR : HotSpotMarkId.POLL_NEAR); final int pos = asm.position(); if (state != null) { crb.recordInfopoint(pos, state, InfopointReason.SAFEPOINT); @@ -142,7 +143,7 @@ public final class AMD64HotSpotSafepointOp extends AMD64LIRInstruction { assert config.threadPollingPageOffset >= 0; asm.movptr(scratch, new AMD64Address(thread, config.threadPollingPageOffset)); - crb.recordMark(atReturn ? config.MARKID_POLL_RETURN_FAR : config.MARKID_POLL_FAR); + crb.recordMark(atReturn ? HotSpotMarkId.POLL_RETURN_FAR : HotSpotMarkId.POLL_FAR); final int pos = asm.position(); if (state != null) { crb.recordInfopoint(pos, state, InfopointReason.SAFEPOINT); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java index 33d22e7f4e2..62d176d0ded 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -26,6 +26,7 @@ package org.graalvm.compiler.hotspot.amd64; import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; +import org.graalvm.compiler.hotspot.HotSpotMarkId; import org.graalvm.compiler.lir.LIRFrameState; import org.graalvm.compiler.lir.LIRInstructionClass; import org.graalvm.compiler.lir.Opcode; @@ -56,12 +57,15 @@ final class AMD64HotspotDirectVirtualCallOp extends DirectCallOp { } @Override + @SuppressWarnings("try") public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) { - // The mark for an invocation that uses an inline cache must be placed at the - // instruction that loads the Klass from the inline cache. - crb.recordMark(invokeKind == InvokeKind.Virtual ? config.MARKID_INVOKEVIRTUAL : config.MARKID_INVOKEINTERFACE); - // This must be emitted exactly like this to ensure it's patchable - masm.movq(AMD64.rax, config.nonOopBits); - super.emitCall(crb, masm); + try (CompilationResultBuilder.CallContext callContext = crb.openCallContext(invokeKind.isDirect())) { + // The mark for an invocation that uses an inline cache must be placed at the + // instruction that loads the Klass from the inline cache. + crb.recordMark(invokeKind == InvokeKind.Virtual ? HotSpotMarkId.INVOKEVIRTUAL : HotSpotMarkId.INVOKEINTERFACE); + // This must be emitted exactly like this to ensure it's patchable + masm.movq(AMD64.rax, config.nonOopBits); + super.emitCall(crb, masm); + } } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64IndirectCallOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64IndirectCallOp.java index 8769121764b..d2512f8b603 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64IndirectCallOp.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64IndirectCallOp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -28,7 +28,7 @@ import static jdk.vm.ci.code.ValueUtil.asRegister; import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; +import org.graalvm.compiler.hotspot.HotSpotMarkId; import org.graalvm.compiler.lir.LIRFrameState; import org.graalvm.compiler.lir.LIRInstructionClass; import org.graalvm.compiler.lir.Opcode; @@ -58,21 +58,20 @@ final class AMD64IndirectCallOp extends IndirectCallOp { @Use({REG}) protected Value metaspaceMethod; - private final GraalHotSpotVMConfig config; - - AMD64IndirectCallOp(ResolvedJavaMethod targetMethod, Value result, Value[] parameters, Value[] temps, Value metaspaceMethod, Value targetAddress, LIRFrameState state, - GraalHotSpotVMConfig config) { + AMD64IndirectCallOp(ResolvedJavaMethod targetMethod, Value result, Value[] parameters, Value[] temps, Value metaspaceMethod, Value targetAddress, LIRFrameState state) { super(TYPE, targetMethod, result, parameters, temps, targetAddress, state); this.metaspaceMethod = metaspaceMethod; - this.config = config; } @Override + @SuppressWarnings("try") public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) { - crb.recordMark(config.MARKID_INLINE_INVOKE); - Register callReg = asRegister(targetAddress); - assert !callReg.equals(METHOD); - AMD64Call.indirectCall(crb, masm, callReg, callTarget, state); + try (CompilationResultBuilder.CallContext callContext = crb.openCallContext(false)) { + crb.recordMark(HotSpotMarkId.INLINE_INVOKE); + Register callReg = asRegister(targetAddress); + assert !callReg.equals(METHOD); + AMD64Call.indirectCall(crb, masm, callReg, callTarget, state); + } } @Override diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64X87MathSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64X87MathSnippets.java index bb4903aa9f8..caa9a20df88 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64X87MathSnippets.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64X87MathSnippets.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -28,7 +28,7 @@ import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER import org.graalvm.compiler.api.replacements.Snippet; import org.graalvm.compiler.api.replacements.SnippetReflectionProvider; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; +import org.graalvm.compiler.core.common.spi.ForeignCallSignature; import org.graalvm.compiler.debug.DebugHandlersFactory; import org.graalvm.compiler.debug.GraalError; import org.graalvm.compiler.graph.Node.ConstantNodeParameter; @@ -55,7 +55,7 @@ public class AMD64X87MathSnippets implements Snippets { if (Math.abs(input) < PI_4) { return AMD64X87MathIntrinsicNode.compute(input, UnaryOperation.SIN); } - return callDouble1(UnaryOperation.SIN.foreignCallDescriptor, input); + return callDouble1(UnaryOperation.SIN.foreignCallSignature, input); } @Snippet @@ -63,7 +63,7 @@ public class AMD64X87MathSnippets implements Snippets { if (Math.abs(input) < PI_4) { return AMD64X87MathIntrinsicNode.compute(input, UnaryOperation.COS); } - return callDouble1(UnaryOperation.COS.foreignCallDescriptor, input); + return callDouble1(UnaryOperation.COS.foreignCallSignature, input); } @Snippet @@ -71,11 +71,11 @@ public class AMD64X87MathSnippets implements Snippets { if (Math.abs(input) < PI_4) { return AMD64X87MathIntrinsicNode.compute(input, UnaryOperation.TAN); } - return callDouble1(UnaryOperation.TAN.foreignCallDescriptor, input); + return callDouble1(UnaryOperation.TAN.foreignCallSignature, input); } @NodeIntrinsic(value = ForeignCallNode.class) - private static native double callDouble1(@ConstantNodeParameter ForeignCallDescriptor descriptor, double value); + private static native double callDouble1(@ConstantNodeParameter ForeignCallSignature signature, double value); public static class Templates extends AbstractTemplates { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.jdk9.test/src/org/graalvm/compiler/hotspot/jdk9/test/MathDoubleFMATest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.jdk9.test/src/org/graalvm/compiler/hotspot/jdk9/test/MathDoubleFMATest.java index f956883a7f9..1e9ea691da3 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.jdk9.test/src/org/graalvm/compiler/hotspot/jdk9/test/MathDoubleFMATest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.jdk9.test/src/org/graalvm/compiler/hotspot/jdk9/test/MathDoubleFMATest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, 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 @@ -24,6 +24,7 @@ package org.graalvm.compiler.hotspot.jdk9.test; +import static org.junit.Assume.assumeFalse; import static org.junit.Assume.assumeTrue; import java.util.ArrayList; @@ -41,14 +42,12 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; -import jdk.vm.ci.amd64.AMD64; - @RunWith(Parameterized.class) public final class MathDoubleFMATest extends GraalCompilerTest { @Before - public void checkAMD64() { - assumeTrue("skipping AMD64 specific test", getTarget().arch instanceof AMD64); + public void checkNotSPARC() { + assumeFalse("skipping tests on SPARC", isSPARC(getTarget().arch)); HotSpotGraalRuntimeProvider rt = (HotSpotGraalRuntimeProvider) Graal.getRequiredCapability(RuntimeProvider.class); assumeTrue("skipping FMA specific test", rt.getVMConfig().useFMAIntrinsics); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.jdk9.test/src/org/graalvm/compiler/hotspot/jdk9/test/MathFMAConstantInputTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.jdk9.test/src/org/graalvm/compiler/hotspot/jdk9/test/MathFMAConstantInputTest.java index 45aba029bd3..de885952ba8 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.jdk9.test/src/org/graalvm/compiler/hotspot/jdk9/test/MathFMAConstantInputTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.jdk9.test/src/org/graalvm/compiler/hotspot/jdk9/test/MathFMAConstantInputTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, 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 @@ -24,19 +24,17 @@ package org.graalvm.compiler.hotspot.jdk9.test; -import static org.junit.Assume.assumeTrue; +import static org.junit.Assume.assumeFalse; import org.graalvm.compiler.core.test.GraalCompilerTest; import org.junit.Before; import org.junit.Test; -import jdk.vm.ci.amd64.AMD64; - public final class MathFMAConstantInputTest extends GraalCompilerTest { @Before - public void checkAMD64() { - assumeTrue("skipping AMD64 specific test", getTarget().arch instanceof AMD64); + public void checkNotSPARC() { + assumeFalse("skipping test on SPARC ", isSPARC(getTarget().arch)); } public static float floatFMA() { @@ -48,6 +46,16 @@ public final class MathFMAConstantInputTest extends GraalCompilerTest { test("floatFMA"); } + public static float floatFMAWithPi() { + float[] input = {Float.MAX_VALUE, 2.0F, -Float.MAX_VALUE}; + return Math.fma(input[0], input[1], input[2]); + } + + @Test + public void testFloatFMAWithPi() { + test("floatFMAWithPi"); + } + public static double doubleFMA() { return Math.fma(2.0d, 2.0d, 2.0d); } @@ -57,4 +65,14 @@ public final class MathFMAConstantInputTest extends GraalCompilerTest { test("doubleFMA"); } + public static double doubleFMAWithPi() { + double[] input = {Double.MAX_VALUE, 2.0D, -Double.MAX_VALUE}; + return Math.fma(input[0], input[1], input[2]); + } + + @Test + public void testDoubleFMAWithPi() { + test("doubleFMAWithPi"); + } + } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.jdk9.test/src/org/graalvm/compiler/hotspot/jdk9/test/MathFloatFMATest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.jdk9.test/src/org/graalvm/compiler/hotspot/jdk9/test/MathFloatFMATest.java index 597bff5d933..e4990aca5b3 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.jdk9.test/src/org/graalvm/compiler/hotspot/jdk9/test/MathFloatFMATest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.jdk9.test/src/org/graalvm/compiler/hotspot/jdk9/test/MathFloatFMATest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, 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 @@ -24,6 +24,7 @@ package org.graalvm.compiler.hotspot.jdk9.test; +import static org.junit.Assume.assumeFalse; import static org.junit.Assume.assumeTrue; import java.util.ArrayList; @@ -41,14 +42,12 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; -import jdk.vm.ci.amd64.AMD64; - @RunWith(Parameterized.class) public final class MathFloatFMATest extends GraalCompilerTest { @Before - public void checkAMD64() { - assumeTrue("skipping AMD64 specific test", getTarget().arch instanceof AMD64); + public void checkNotSPARC() { + assumeFalse("skipping test on SPARC", isSPARC(getTarget().arch)); HotSpotGraalRuntimeProvider rt = (HotSpotGraalRuntimeProvider) Graal.getRequiredCapability(RuntimeProvider.class); assumeTrue("skipping FMA specific tests", rt.getVMConfig().useFMAIntrinsics); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.jdk9.test/src/org/graalvm/compiler/hotspot/jdk9/test/StringUTF16ToBytesGetCharsTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.jdk9.test/src/org/graalvm/compiler/hotspot/jdk9/test/StringUTF16ToBytesGetCharsTest.java index 1be0dd9eed0..ec75f2a83e4 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.jdk9.test/src/org/graalvm/compiler/hotspot/jdk9/test/StringUTF16ToBytesGetCharsTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.jdk9.test/src/org/graalvm/compiler/hotspot/jdk9/test/StringUTF16ToBytesGetCharsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -29,6 +29,7 @@ import static org.junit.Assume.assumeFalse; import org.graalvm.compiler.core.common.CompilationIdentifier; import org.graalvm.compiler.hotspot.replacements.StringUTF16Substitutions; import org.graalvm.compiler.nodes.StructuredGraph; +import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; import org.graalvm.compiler.nodes.java.NewArrayNode; import org.graalvm.compiler.replacements.arraycopy.ArrayCopyCallNode; import org.graalvm.compiler.replacements.test.MethodSubstitutionTest; @@ -58,7 +59,7 @@ public final class StringUTF16ToBytesGetCharsTest extends MethodSubstitutionTest Class javaclass = Class.forName("java.lang.StringUTF16"); ResolvedJavaMethod caller = getResolvedJavaMethod(javaclass, "toBytes", char[].class, int.class, int.class); - StructuredGraph graph = getReplacements().getIntrinsicGraph(caller, CompilationIdentifier.INVALID_COMPILATION_ID, getDebugContext(), null); + StructuredGraph graph = getReplacements().getIntrinsicGraph(caller, CompilationIdentifier.INVALID_COMPILATION_ID, getDebugContext(), AllowAssumptions.YES, null); assertInGraph(graph, NewArrayNode.class); assertInGraph(graph, ArrayCopyCallNode.class); @@ -89,7 +90,7 @@ public final class StringUTF16ToBytesGetCharsTest extends MethodSubstitutionTest Class javaclass = Class.forName("java.lang.StringUTF16"); ResolvedJavaMethod caller = getResolvedJavaMethod(javaclass, "getChars", byte[].class, int.class, int.class, char[].class, int.class); - StructuredGraph graph = getReplacements().getIntrinsicGraph(caller, CompilationIdentifier.INVALID_COMPILATION_ID, getDebugContext(), null); + StructuredGraph graph = getReplacements().getIntrinsicGraph(caller, CompilationIdentifier.INVALID_COMPILATION_ID, getDebugContext(), AllowAssumptions.YES, null); assertInGraph(graph, ArrayCopyCallNode.class); InstalledCode code = getCode(caller, graph); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/AheadOfTimeCompilationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/AheadOfTimeCompilationTest.java index 8afc68f1b62..6dcf0b7035d 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/AheadOfTimeCompilationTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/AheadOfTimeCompilationTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 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 @@ -67,7 +67,7 @@ public class AheadOfTimeCompilationTest extends HotSpotGraalCompilerTest { @Before public void setUp() { - // Ignore on AArch64 + // Ignore on SPARC Assume.assumeFalse("skipping on AArch64", getTarget().arch instanceof AArch64); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ArrayCopyIntrinsificationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ArrayCopyIntrinsificationTest.java index fa44400f3f0..84e0c85d6c2 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ArrayCopyIntrinsificationTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ArrayCopyIntrinsificationTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -216,11 +216,71 @@ public class ArrayCopyIntrinsificationTest extends GraalCompilerTest { return dst; } + public static Object genericArraycopyCatchNullException(Object src, int srcPos, Object dst, int dstPos, int length) { + boolean caught = false; + try { + System.arraycopy(src, srcPos, dst, dstPos, length); + } catch (NullPointerException e) { + caught = true; + } + return caught; + } + + public static Object genericArraycopyCatchArrayStoreException(Object src, int srcPos, Object dst, int dstPos, int length) { + boolean caught = false; + try { + System.arraycopy(src, srcPos, dst, dstPos, length); + } catch (ArrayStoreException e) { + caught = true; + } + return caught; + } + + public static Object genericArraycopyCatchArrayIndexException(Object src, int srcPos, Object dst, int dstPos, int length) { + boolean caught = false; + try { + System.arraycopy(src, srcPos, dst, dstPos, length); + } catch (ArrayIndexOutOfBoundsException e) { + caught = true; + } + return caught; + } + public static Object[] objectArraycopy(Object[] src, int srcPos, Object[] dst, int dstPos, int length) { System.arraycopy(src, srcPos, dst, dstPos, length); return dst; } + public static Object objectArraycopyCatchNullException(Object[] src, int srcPos, Object[] dst, int dstPos, int length) { + boolean caught = false; + try { + System.arraycopy(src, srcPos, dst, dstPos, length); + } catch (NullPointerException e) { + caught = true; + } + return caught; + } + + public static Object objectArraycopyCatchArrayStoreException(Object[] src, int srcPos, Object[] dst, int dstPos, int length) { + boolean caught = false; + try { + System.arraycopy(src, srcPos, dst, dstPos, length); + } catch (ArrayStoreException e) { + caught = true; + } + return caught; + } + + public static Object objectArraycopyCatchArrayIndexException(Object[] src, int srcPos, Object[] dst, int dstPos, int length) { + boolean caught = false; + try { + System.arraycopy(src, srcPos, dst, dstPos, length); + } catch (ArrayIndexOutOfBoundsException e) { + caught = true; + } + return caught; + } + public static Object[] objectArraycopyExact(Integer[] src, int srcPos, Integer[] dst, int dstPos, int length) { System.arraycopy(src, srcPos, dst, dstPos, length); return dst; @@ -284,4 +344,30 @@ public class ArrayCopyIntrinsificationTest extends GraalCompilerTest { } return copy; } + + @Test + public void testGenericExceptions() { + test("genericArraycopyCatchNullException", null, 4, new byte[128], 2, 3); + test("genericArraycopyCatchNullException", new byte[128], 4, null, 2, 3); + Object[] integerDest = new Integer[128]; + Object[] longSource = new Object[128]; + for (int i = 0; i < longSource.length; i++) { + longSource[i] = Long.valueOf(i); + } + test("genericArraycopyCatchArrayStoreException", longSource, 4, integerDest, 2, 3); + test("genericArraycopyCatchArrayIndexException", new int[128], 0, new int[128], Integer.MAX_VALUE, 1); + } + + @Test + public void testObjectArrayExceptions() { + test("objectArraycopyCatchNullException", null, 4, new Byte[128], 2, 3); + test("objectArraycopyCatchNullException", new Byte[128], 4, null, 2, 3); + Object[] integerDest = new Integer[128]; + Object[] longSource = new Object[128]; + for (int i = 0; i < longSource.length; i++) { + longSource[i] = Long.valueOf(i); + } + test("objectArraycopyCatchArrayStoreException", longSource, 4, integerDest, 2, 3); + test("objectArraycopyCatchArrayIndexException", new Integer[128], 0, new Integer[128], Integer.MAX_VALUE, 1); + } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java index 723f4032af8..d54fd5ce41d 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java @@ -277,8 +277,6 @@ public class CheckGraalIntrinsics extends GraalTest { "jdk/jfr/internal/JVM.getClassId(Ljava/lang/Class;)J"); add(toBeInvestigated, - // Just check if the argument is a compile time constant - "java/lang/invoke/MethodHandleImpl.isCompileConstant(Ljava/lang/Object;)Z", // Only used as a marker for vectorization? "java/util/stream/Streams$RangeIntSpliterator.forEachRemaining(Ljava/util/function/IntConsumer;)V", // Only implemented on non-AMD64 platforms (some logic and runtime call) @@ -372,6 +370,10 @@ public class CheckGraalIntrinsics extends GraalTest { add(ignore, "java/lang/Math.fma(DDD)D", "java/lang/Math.fma(FFF)F"); + } else if (isSPARC(arch)) { + add(toBeInvestigated, + "java/lang/Math.fma(DDD)D", + "java/lang/Math.fma(FFF)F"); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorld.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorld.java index 77e1fd907d2..66bccbb8fc5 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorld.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorld.java @@ -67,6 +67,7 @@ import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; @@ -78,8 +79,8 @@ import java.util.regex.Pattern; import jdk.internal.vm.compiler.collections.EconomicMap; import jdk.internal.vm.compiler.collections.UnmodifiableMapCursor; import org.graalvm.compiler.api.replacements.Snippet; +import org.graalvm.compiler.api.test.ModuleSupport; import org.graalvm.compiler.bytecode.Bytecodes; -import org.graalvm.compiler.core.CompilerThreadFactory; import org.graalvm.compiler.core.phases.HighTier; import org.graalvm.compiler.core.test.ReflectionOptionDescriptors; import org.graalvm.compiler.debug.GlobalMetrics; @@ -99,7 +100,6 @@ import org.graalvm.compiler.options.OptionValues; import org.graalvm.compiler.options.OptionsParser; import org.graalvm.compiler.serviceprovider.GraalUnsafeAccess; import org.graalvm.compiler.serviceprovider.JavaVersionUtil; -import org.graalvm.compiler.api.test.ModuleSupport; import jdk.internal.vm.compiler.libgraal.LibGraal; import jdk.internal.vm.compiler.libgraal.LibGraalScope; import org.graalvm.util.OptionsEncoder; @@ -232,7 +232,7 @@ public final class CompileTheWorld { static class LibGraalParams implements AutoCloseable { static { - LibGraal.registerNativeMethods(HotSpotJVMCIRuntime.runtime(), CompileTheWorld.class); + LibGraal.registerNativeMethods(CompileTheWorld.class); } /** @@ -667,6 +667,40 @@ public final class CompileTheWorld { } } + static final class CTWThread extends Thread { + private final LibGraalParams libgraal; + + CTWThread(Runnable r, LibGraalParams libgraal) { + super(r); + this.libgraal = libgraal; + setName("CTWThread-" + getId()); + setPriority(Thread.MAX_PRIORITY); + setDaemon(true); + } + + @SuppressWarnings("try") + @Override + public void run() { + setContextClassLoader(getClass().getClassLoader()); + try (LibGraalScope scope = libgraal == null ? null : new LibGraalScope()) { + super.run(); + } + } + } + + static final class CTWThreadFactory implements ThreadFactory { + private final LibGraalParams libgraal; + + CTWThreadFactory(LibGraalParams libgraal) { + this.libgraal = libgraal; + } + + @Override + public Thread newThread(Runnable r) { + return new CTWThread(r, libgraal); + } + } + /** * Compiles all methods in all classes in a given class path. * @@ -709,7 +743,7 @@ public final class CompileTheWorld { running = true; } - threadPool = new ThreadPoolExecutor(threadCount, threadCount, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue(), new CompilerThreadFactory("CompileTheWorld")); + threadPool = new ThreadPoolExecutor(threadCount, threadCount, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue(), new CTWThreadFactory(libgraal)); int compileStartAt = startAt; int compileStopAt = stopAt; @@ -972,33 +1006,30 @@ public final class CompileTheWorld { boolean installAsDefault = false; HotSpotInstalledCode installedCode; if (libgraal != null) { - HotSpotJVMCIRuntime runtime = HotSpotJVMCIRuntime.runtime(); - try (LibGraalScope scope = new LibGraalScope(runtime)) { - long methodHandle = LibGraal.translate(runtime, method); - long isolateThread = LibGraalScope.getIsolateThread(); + long methodHandle = LibGraal.translate(method); + long isolateThread = LibGraalScope.getIsolateThread(); - StackTraceBuffer stackTraceBuffer = libgraal.getStackTraceBuffer(); + StackTraceBuffer stackTraceBuffer = libgraal.getStackTraceBuffer(); - long stackTraceBufferAddress = stackTraceBuffer.getAddress(); - long installedCodeHandle = compileMethodInLibgraal(isolateThread, - methodHandle, - useProfilingInfo, - installAsDefault, - libgraal.options.getAddress(), - libgraal.options.size, - libgraal.options.hash, - stackTraceBufferAddress, - stackTraceBuffer.size); + long stackTraceBufferAddress = stackTraceBuffer.getAddress(); + long installedCodeHandle = compileMethodInLibgraal(isolateThread, + methodHandle, + useProfilingInfo, + installAsDefault, + libgraal.options.getAddress(), + libgraal.options.size, + libgraal.options.hash, + stackTraceBufferAddress, + stackTraceBuffer.size); - installedCode = LibGraal.unhand(runtime, HotSpotInstalledCode.class, installedCodeHandle); - if (installedCode == null) { - int length = UNSAFE.getInt(stackTraceBufferAddress); - byte[] data = new byte[length]; - UNSAFE.copyMemory(null, stackTraceBufferAddress + Integer.BYTES, data, ARRAY_BYTE_BASE_OFFSET, length); - String stackTrace = new String(data).trim(); - println(true, String.format("CompileTheWorld (%d) : Error compiling method: %s", counter, method.format("%H.%n(%p):%r"))); - println(true, stackTrace); - } + installedCode = LibGraal.unhand(HotSpotInstalledCode.class, installedCodeHandle); + if (installedCode == null) { + int length = UNSAFE.getInt(stackTraceBufferAddress); + byte[] data = new byte[length]; + UNSAFE.copyMemory(null, stackTraceBufferAddress + Integer.BYTES, data, ARRAY_BYTE_BASE_OFFSET, length); + String stackTrace = new String(data).trim(); + println(true, String.format("CompileTheWorld (%d) : Error compiling method: %s", counter, method.format("%H.%n(%p):%r"))); + println(true, stackTrace); } } else { int entryBCI = JVMCICompiler.INVOCATION_ENTRY_BCI; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ForeignCallDeoptimizeTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ForeignCallDeoptimizeTest.java index c914125cc50..0a50e0f61b8 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ForeignCallDeoptimizeTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ForeignCallDeoptimizeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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 @@ -24,17 +24,14 @@ package org.graalvm.compiler.hotspot.test; -import org.junit.Test; - -import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; import org.graalvm.compiler.core.test.GraalCompilerTest; import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.extended.ForeignCallNode; import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; +import org.junit.Test; import jdk.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.ResolvedJavaMethod; @@ -46,12 +43,11 @@ public class ForeignCallDeoptimizeTest extends GraalCompilerTest { @Override protected void registerInvocationPlugins(InvocationPlugins invocationPlugins) { - ForeignCallsProvider foreignCalls = ((HotSpotProviders) getProviders()).getForeignCalls(); invocationPlugins.register(new InvocationPlugin() { @Override public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode arg) { - ForeignCallNode node = new ForeignCallNode(foreignCalls, HotSpotForeignCallsProviderImpl.TEST_DEOPTIMIZE_CALL_INT, arg); + ForeignCallNode node = new ForeignCallNode(HotSpotForeignCallsProviderImpl.TEST_DEOPTIMIZE_CALL_INT, arg); b.addPush(JavaKind.Int, node); return true; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/GraalOSRTestBase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/GraalOSRTestBase.java index 5c3f229f5c1..85223b28a62 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/GraalOSRTestBase.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/GraalOSRTestBase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotCryptoSubstitutionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotCryptoSubstitutionTest.java index e610a14e683..a7a1c1248db 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotCryptoSubstitutionTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotCryptoSubstitutionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -24,122 +24,103 @@ package org.graalvm.compiler.hotspot.test; -import java.io.ByteArrayOutputStream; import java.io.DataInputStream; import java.io.IOException; import java.io.InputStream; import java.security.AlgorithmParameters; -import java.security.SecureRandom; +import java.security.NoSuchAlgorithmException; import javax.crypto.Cipher; import javax.crypto.KeyGenerator; import javax.crypto.SecretKey; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.debug.DebugContext; import org.graalvm.compiler.hotspot.meta.HotSpotGraphBuilderPlugins; import org.junit.Assert; +import org.junit.Assume; import org.junit.Test; import jdk.vm.ci.code.InstalledCode; -import jdk.vm.ci.meta.ResolvedJavaMethod; /** * Tests the intrinsification of certain crypto methods. */ public class HotSpotCryptoSubstitutionTest extends HotSpotGraalCompilerTest { - @Override - protected InstalledCode addMethod(DebugContext debug, ResolvedJavaMethod method, CompilationResult compResult) { - return getBackend().createDefaultInstalledCode(debug, method, compResult); - } - - SecretKey aesKey; - SecretKey desKey; - byte[] input; - ByteArrayOutputStream aesExpected = new ByteArrayOutputStream(); - ByteArrayOutputStream desExpected = new ByteArrayOutputStream(); + private final byte[] input; public HotSpotCryptoSubstitutionTest() throws Exception { - byte[] seed = {0x4, 0x7, 0x1, 0x1}; - SecureRandom random = new SecureRandom(seed); - KeyGenerator aesKeyGen = KeyGenerator.getInstance("AES"); - KeyGenerator desKeyGen = KeyGenerator.getInstance("DESede"); - aesKeyGen.init(128, random); - desKeyGen.init(168, random); - aesKey = aesKeyGen.generateKey(); - desKey = desKeyGen.generateKey(); input = readClassfile16(getClass()); - - aesExpected.write(runEncryptDecrypt(aesKey, "AES/CBC/NoPadding")); - aesExpected.write(runEncryptDecrypt(aesKey, "AES/CBC/PKCS5Padding")); - - desExpected.write(runEncryptDecrypt(desKey, "DESede/CBC/NoPadding")); - desExpected.write(runEncryptDecrypt(desKey, "DESede/CBC/PKCS5Padding")); } - @Test - public void testAESCryptIntrinsics() throws Exception { - String aesEncryptName = HotSpotGraphBuilderPlugins.lookupIntrinsicName(runtime().getVMConfig(), "com/sun/crypto/provider/AESCrypt", "implEncryptBlock", "encryptBlock"); - String aesDecryptName = HotSpotGraphBuilderPlugins.lookupIntrinsicName(runtime().getVMConfig(), "com/sun/crypto/provider/AESCrypt", "implDecryptBlock", "decryptBlock"); - if (compileAndInstall("com.sun.crypto.provider.AESCrypt", aesEncryptName, aesDecryptName)) { - ByteArrayOutputStream actual = new ByteArrayOutputStream(); - actual.write(runEncryptDecrypt(aesKey, "AES/CBC/NoPadding")); - actual.write(runEncryptDecrypt(aesKey, "AES/CBC/PKCS5Padding")); - Assert.assertArrayEquals(aesExpected.toByteArray(), actual.toByteArray()); - } - } - - @Test - public void testCipherBlockChainingIntrinsics() throws Exception { - String cbcEncryptName = HotSpotGraphBuilderPlugins.lookupIntrinsicName(runtime().getVMConfig(), "com/sun/crypto/provider/CipherBlockChaining", "implEncrypt", "encrypt"); - String cbcDecryptName = HotSpotGraphBuilderPlugins.lookupIntrinsicName(runtime().getVMConfig(), "com/sun/crypto/provider/CipherBlockChaining", "implDecrypt", "decrypt"); - if (compileAndInstall("com.sun.crypto.provider.CipherBlockChaining", cbcEncryptName, cbcDecryptName)) { - ByteArrayOutputStream actual = new ByteArrayOutputStream(); - actual.write(runEncryptDecrypt(aesKey, "AES/CBC/NoPadding")); - actual.write(runEncryptDecrypt(aesKey, "AES/CBC/PKCS5Padding")); - Assert.assertArrayEquals(aesExpected.toByteArray(), actual.toByteArray()); - - actual.reset(); - actual.write(runEncryptDecrypt(desKey, "DESede/CBC/NoPadding")); - actual.write(runEncryptDecrypt(desKey, "DESede/CBC/PKCS5Padding")); - Assert.assertArrayEquals(desExpected.toByteArray(), actual.toByteArray()); - } - } - - /** - * Compiles and installs the substitution for some specified methods. Once installed, the next - * execution of the methods will use the newly installed code. - * - * @param className the name of the class for which substitutions are available - * @param methodNames the names of the substituted methods - * @return true if at least one substitution was compiled and installed - */ - private boolean compileAndInstall(String className, String... methodNames) { - if (!runtime().getVMConfig().useAESIntrinsics) { - return false; - } - Class c; + private void testEncryptDecrypt(String className, String methodName, String generatorAlgorithm, int keySize, String algorithm) throws Exception { + Class klass = null; try { - c = Class.forName(className); + klass = Class.forName(className); } catch (ClassNotFoundException e) { // It's ok to not find the class - a different security provider // may have been installed - return false; + return; } - boolean atLeastOneCompiled = false; - for (String methodName : methodNames) { - if (compileAndInstallSubstitution(c, methodName) != null) { - atLeastOneCompiled = true; - } + KeyGenerator gen = KeyGenerator.getInstance(generatorAlgorithm); + gen.init(keySize); + SecretKey key = gen.generateKey(); + Result expected = runEncryptDecrypt(key, algorithm); + InstalledCode intrinsic = compileAndInstallSubstitution(klass, methodName); + if (intrinsic != null) { + Result actual = runEncryptDecrypt(key, algorithm); + assertEquals(expected, actual); + intrinsic.invalidate(); } - return atLeastOneCompiled; + } + + @Test + public void testAESencryptBlock() throws Exception { + Assume.assumeTrue(runtime().getVMConfig().useAESIntrinsics); + String aesEncryptName = HotSpotGraphBuilderPlugins.lookupIntrinsicName(runtime().getVMConfig(), "com/sun/crypto/provider/AESCrypt", "implEncryptBlock", "encryptBlock"); + testEncryptDecrypt("com.sun.crypto.provider.AESCrypt", aesEncryptName, "AES", 128, "AES/CBC/NoPadding"); + testEncryptDecrypt("com.sun.crypto.provider.AESCrypt", aesEncryptName, "AES", 128, "AES/CBC/PKCS5Padding"); + } + + @Test + public void testAESDecryptBlock() throws Exception { + Assume.assumeTrue(runtime().getVMConfig().useAESIntrinsics); + String aesDecryptName = HotSpotGraphBuilderPlugins.lookupIntrinsicName(runtime().getVMConfig(), "com/sun/crypto/provider/AESCrypt", "implDecryptBlock", "decryptBlock"); + testEncryptDecrypt("com.sun.crypto.provider.AESCrypt", aesDecryptName, "AES", 128, "AES/CBC/NoPadding"); + testEncryptDecrypt("com.sun.crypto.provider.AESCrypt", aesDecryptName, "AES", 128, "AES/CBC/PKCS5Padding"); + } + + @Test + public void testCipherBlockChainingEncrypt() throws Exception { + Assume.assumeTrue(runtime().getVMConfig().useAESIntrinsics); + String cbcEncryptName = HotSpotGraphBuilderPlugins.lookupIntrinsicName(runtime().getVMConfig(), "com/sun/crypto/provider/CipherBlockChaining", "implEncrypt", "encrypt"); + testEncryptDecrypt("com.sun.crypto.provider.CipherBlockChaining", cbcEncryptName, "AES", 128, "AES/CBC/NoPadding"); + testEncryptDecrypt("com.sun.crypto.provider.CipherBlockChaining", cbcEncryptName, "AES", 128, "AES/CBC/PKCS5Padding"); + testEncryptDecrypt("com.sun.crypto.provider.CipherBlockChaining", cbcEncryptName, "DESede", 168, "DESede/CBC/NoPadding"); + testEncryptDecrypt("com.sun.crypto.provider.CipherBlockChaining", cbcEncryptName, "DESede", 168, "DESede/CBC/PKCS5Padding"); + } + + @Test + public void testCipherBlockChainingDecrypt() throws Exception { + Assume.assumeTrue(runtime().getVMConfig().useAESIntrinsics); + String cbcDecryptName = HotSpotGraphBuilderPlugins.lookupIntrinsicName(runtime().getVMConfig(), "com/sun/crypto/provider/CipherBlockChaining", "implDecrypt", "decrypt"); + testEncryptDecrypt("com.sun.crypto.provider.CipherBlockChaining", cbcDecryptName, "AES", 128, "AES/CBC/NoPadding"); + testEncryptDecrypt("com.sun.crypto.provider.CipherBlockChaining", cbcDecryptName, "AES", 128, "AES/CBC/PKCS5Padding"); + testEncryptDecrypt("com.sun.crypto.provider.CipherBlockChaining", cbcDecryptName, "DESede", 168, "DESede/CBC/NoPadding"); + testEncryptDecrypt("com.sun.crypto.provider.CipherBlockChaining", cbcDecryptName, "DESede", 168, "DESede/CBC/PKCS5Padding"); + } + + @Test + public void testCounterModeEncrypt() throws Exception { + Assume.assumeTrue(runtime().getVMConfig().useAESCTRIntrinsics); + testEncryptDecrypt("com.sun.crypto.provider.CounterMode", "implCrypt", "AES", 128, "AES/CTR/NoPadding"); + testEncryptDecrypt("com.sun.crypto.provider.CounterMode", "implCrypt", "AES", 128, "AES/CTR/PKCS5Padding"); + testEncryptDecrypt("com.sun.crypto.provider.CounterMode", "implCrypt", "DESede", 168, "DESede/CTR/NoPadding"); + testEncryptDecrypt("com.sun.crypto.provider.CounterMode", "implCrypt", "DESede", 168, "DESede/CTR/PKCS5Padding"); } AlgorithmParameters algorithmParameters; private byte[] encrypt(byte[] indata, SecretKey key, String algorithm) throws Exception { - byte[] result = indata; Cipher c = Cipher.getInstance(algorithm); @@ -157,7 +138,6 @@ public class HotSpotCryptoSubstitutionTest extends HotSpotGraalCompilerTest { } private byte[] decrypt(byte[] indata, SecretKey key, String algorithm) throws Exception { - byte[] result = indata; Cipher c = Cipher.getInstance(algorithm); @@ -182,11 +162,15 @@ public class HotSpotCryptoSubstitutionTest extends HotSpotGraalCompilerTest { return classFile; } - public byte[] runEncryptDecrypt(SecretKey key, String algorithm) throws Exception { - byte[] indata = input.clone(); - byte[] cipher = encrypt(indata, key, algorithm); - byte[] plain = decrypt(cipher, key, algorithm); - Assert.assertArrayEquals(indata, plain); - return plain; + public Result runEncryptDecrypt(SecretKey key, String algorithm) throws Exception { + try { + byte[] indata = input.clone(); + byte[] cipher = encrypt(indata, key, algorithm); + byte[] plain = decrypt(cipher, key, algorithm); + Assert.assertArrayEquals(indata, plain); + return new Result(plain, null); + } catch (NoSuchAlgorithmException e) { + return new Result(null, e); + } } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotGraalCompilerTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotGraalCompilerTest.java index 5c7b1f5ca3c..a67e2dc2fc3 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotGraalCompilerTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotGraalCompilerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -31,6 +31,7 @@ import org.graalvm.compiler.hotspot.HotSpotBackend; import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; import org.graalvm.compiler.hotspot.meta.HotSpotProviders; import org.graalvm.compiler.nodes.StructuredGraph; +import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; import org.graalvm.compiler.options.OptionValues; import org.graalvm.compiler.runtime.RuntimeProvider; import org.junit.Assume; @@ -73,7 +74,7 @@ public abstract class HotSpotGraalCompilerTest extends GraalCompilerTest { HotSpotProviders providers = rt.getHostBackend().getProviders(); CompilationIdentifier compilationId = runtime().getHostBackend().getCompilationIdentifier(method); OptionValues options = getInitialOptions(); - StructuredGraph graph = providers.getReplacements().getIntrinsicGraph(method, compilationId, getDebugContext(options), null); + StructuredGraph graph = providers.getReplacements().getIntrinsicGraph(method, compilationId, getDebugContext(options), AllowAssumptions.YES, null); if (graph != null) { return getCode(method, graph, true, true, graph.getOptions()); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotResolvedJavaFieldTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotResolvedJavaFieldTest.java index 6e92711ca13..07ebda88604 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotResolvedJavaFieldTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotResolvedJavaFieldTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -42,6 +42,7 @@ import org.junit.Assert; import org.junit.Test; import jdk.vm.ci.hotspot.HotSpotResolvedJavaField; +import jdk.vm.ci.hotspot.HotSpotVMConfigAccess; import jdk.vm.ci.meta.JavaType; import jdk.vm.ci.meta.ResolvedJavaField; import jdk.vm.ci.meta.ResolvedJavaType; @@ -80,8 +81,9 @@ public class HotSpotResolvedJavaFieldTest extends HotSpotGraalCompilerTest { */ private int jvmFieldModifiers() { GraalHotSpotVMConfig config = runtime().getVMConfig(); - int accEnum = config.getConstant("JVM_ACC_ENUM", Integer.class, 0x4000); - int accSynthetic = config.getConstant("JVM_ACC_SYNTHETIC", Integer.class, 0x1000); + HotSpotVMConfigAccess access = new HotSpotVMConfigAccess(config.getStore()); + int accEnum = access.getConstant("JVM_ACC_ENUM", Integer.class, 0x4000); + int accSynthetic = access.getConstant("JVM_ACC_SYNTHETIC", Integer.class, 0x1000); return PUBLIC | PRIVATE | PROTECTED | STATIC | FINAL | VOLATILE | TRANSIENT | accEnum | accSynthetic; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/JVMCIInfopointErrorTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/JVMCIInfopointErrorTest.java index e74d064eef9..70f13685ecd 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/JVMCIInfopointErrorTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/JVMCIInfopointErrorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -37,8 +37,8 @@ import org.graalvm.compiler.core.common.LIRKind; import org.graalvm.compiler.core.common.type.StampFactory; import org.graalvm.compiler.core.test.GraalCompilerTest; import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.DebugContext.Builder; import org.graalvm.compiler.debug.DebugContext.Scope; -import org.graalvm.compiler.debug.DebugHandlersFactory; import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.hotspot.HotSpotCompiledCodeBuilder; import org.graalvm.compiler.lir.FullInfopointOp; @@ -282,7 +282,7 @@ public class JVMCIInfopointErrorTest extends GraalCompilerTest { @SuppressWarnings("try") @Test(expected = Error.class) public void testUnknownJavaValue() { - DebugContext debug = DebugContext.create(getInitialOptions(), DebugHandlersFactory.LOADER); + DebugContext debug = new Builder(getInitialOptions()).build(); try (Scope s = debug.disable()) { /* * Expected: either AssertionError or GraalError, depending on whether the unit test run diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/LambdaStableNameTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/LambdaStableNameTest.java index daee8c99314..008b19ddac7 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/LambdaStableNameTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/LambdaStableNameTest.java @@ -31,6 +31,7 @@ import jdk.vm.ci.meta.ResolvedJavaType; import jdk.vm.ci.runtime.JVMCI; import org.graalvm.compiler.api.runtime.GraalJVMCICompiler; import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.DebugContext.Builder; import org.graalvm.compiler.hotspot.meta.HotSpotJITClassInitializationPlugin; import org.graalvm.compiler.java.LambdaUtils; import org.graalvm.compiler.options.OptionValues; @@ -45,7 +46,7 @@ import org.junit.Test; public class LambdaStableNameTest { private String findStableLambdaName(ResolvedJavaType type) { OptionValues options = new OptionValues(OptionValues.newOptionMap()); - DebugContext debug = DebugContext.create(options, Collections.emptyList()); + DebugContext debug = new Builder(options, Collections.emptyList()).build(); GraalJVMCICompiler compiler = (GraalJVMCICompiler) JVMCI.getRuntime().getCompiler(); Providers providers = compiler.getGraalRuntime().getCapability(RuntimeProvider.class).getHostBackend().getProviders(); final HotSpotJITClassInitializationPlugin initializationPlugin = new HotSpotJITClassInitializationPlugin(); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/MethodSubstitutionEffectTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/MethodSubstitutionEffectTest.java index b8187c8125e..1efe0e86507 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/MethodSubstitutionEffectTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/MethodSubstitutionEffectTest.java @@ -391,14 +391,14 @@ public class MethodSubstitutionEffectTest extends GraalCompilerTest { intrinisicsErrors.add(getResolvedJavaMethod(Substitutee.class, "multiSplitEffectNoMergeInvalid")); for (ResolvedJavaMethod method : intrinisicsWithoutErrors) { - StructuredGraph graph = getProviders().getReplacements().getIntrinsicGraph(method, INVALID_COMPILATION_ID, getDebugContext(method), null); + StructuredGraph graph = getProviders().getReplacements().getIntrinsicGraph(method, INVALID_COMPILATION_ID, getDebugContext(method), AllowAssumptions.YES, null); getCode(method, graph); } for (ResolvedJavaMethod method : intrinisicsErrors) { try (AutoCloseable c = new TTY.Filter(); DebugContext debug = getDebugContext(method); DebugCloseable s = debug.disableIntercept()) { - StructuredGraph graph = getProviders().getReplacements().getIntrinsicGraph(method, INVALID_COMPILATION_ID, debug, null); + StructuredGraph graph = getProviders().getReplacements().getIntrinsicGraph(method, INVALID_COMPILATION_ID, debug, AllowAssumptions.YES, null); getCode(method, graph); Assert.fail("Compilation should not reach this point, must throw an exception before"); } catch (Throwable t) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/MethodSubstitutionForeignCallTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/MethodSubstitutionForeignCallTest.java index 4b61a521ee3..f39719cd645 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/MethodSubstitutionForeignCallTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/MethodSubstitutionForeignCallTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, 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 @@ -30,10 +30,7 @@ import org.graalvm.compiler.api.directives.GraalDirectives; import org.graalvm.compiler.api.replacements.ClassSubstitution; import org.graalvm.compiler.api.replacements.MethodSubstitution; import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.core.common.LIRKind; import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; import org.graalvm.compiler.core.test.GraalCompilerTest; import org.graalvm.compiler.debug.GraalError; import org.graalvm.compiler.debug.TTY; @@ -60,7 +57,9 @@ import jdk.vm.ci.meta.MetaAccessProvider; import jdk.vm.ci.meta.ResolvedJavaMethod; public class MethodSubstitutionForeignCallTest extends GraalCompilerTest { - public static final ForeignCallDescriptor TEST_CALL = new ForeignCallDescriptor("test", int.class, int.class); + public static final ForeignCallDescriptor TEST_CALL_DEOPT = new ForeignCallDescriptor("test", int.class, new Class[]{int.class}, false, new LocationIdentity[0], true, true); + public static final ForeignCallDescriptor TEST_CALL_REEXECUTABLE = new ForeignCallDescriptor("test", int.class, new Class[]{int.class}, true, new LocationIdentity[0], false, false); + public static final ForeignCallDescriptor TEST_CALL_NON_DEOPT = new ForeignCallDescriptor("test", int.class, new Class[]{int.class}, false, new LocationIdentity[0], false, false); public static class A { static void invalidConsecutiveForeignCall1(@SuppressWarnings("unused") int phi) { @@ -135,44 +134,8 @@ public class MethodSubstitutionForeignCallTest extends GraalCompilerTest { @Override public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode arg) { - ForeignCallsProvider foreignCalls = new ForeignCallsProvider() { - @Override - public LIRKind getValueKind(JavaKind javaKind) { - return LIRKind.fromJavaKind(getTarget().arch, javaKind); - } - - @Override - public ForeignCallLinkage lookupForeignCall(ForeignCallDescriptor descriptor) { - throw GraalError.shouldNotReachHere("Test code must not need this method"); - } - - @Override - public boolean isReexecutable(ForeignCallDescriptor descriptor) { - return false; - } - - @Override - public boolean isGuaranteedSafepoint(ForeignCallDescriptor descriptor) { - return true; - } - - @Override - public boolean isAvailable(ForeignCallDescriptor descriptor) { - return true; - } - - @Override - public LocationIdentity[] getKilledLocations(ForeignCallDescriptor descriptor) { - return new LocationIdentity[]{LocationIdentity.any()}; - } - - @Override - public boolean canDeoptimize(ForeignCallDescriptor descriptor) { - return true; - } - }; - ForeignCallNode node = new ForeignCallNode(foreignCalls, TEST_CALL, arg); + ForeignCallNode node = new ForeignCallNode(TEST_CALL_DEOPT, arg); node.setBci(b.bci()); b.addPush(JavaKind.Int, node); return true; @@ -182,44 +145,7 @@ public class MethodSubstitutionForeignCallTest extends GraalCompilerTest { @Override public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode arg) { - ForeignCallsProvider foreignCalls = new ForeignCallsProvider() { - - @Override - public LIRKind getValueKind(JavaKind javaKind) { - return LIRKind.fromJavaKind(getTarget().arch, javaKind); - } - - @Override - public ForeignCallLinkage lookupForeignCall(ForeignCallDescriptor descriptor) { - throw GraalError.shouldNotReachHere("Test code must not need this method"); - } - - @Override - public boolean isReexecutable(ForeignCallDescriptor descriptor) { - return false; - } - - @Override - public boolean isGuaranteedSafepoint(ForeignCallDescriptor descriptor) { - return false; - } - - @Override - public boolean isAvailable(ForeignCallDescriptor descriptor) { - return true; - } - - @Override - public LocationIdentity[] getKilledLocations(ForeignCallDescriptor descriptor) { - return new LocationIdentity[]{LocationIdentity.any()}; - } - - @Override - public boolean canDeoptimize(ForeignCallDescriptor descriptor) { - return false; - } - }; - ForeignCallNode node = new ForeignCallNode(foreignCalls, TEST_CALL, arg); + ForeignCallNode node = new ForeignCallNode(TEST_CALL_NON_DEOPT, arg); node.setBci(b.bci()); b.addPush(JavaKind.Int, node); return true; @@ -229,44 +155,7 @@ public class MethodSubstitutionForeignCallTest extends GraalCompilerTest { @Override public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode arg) { - ForeignCallsProvider foreignCalls = new ForeignCallsProvider() { - - @Override - public LIRKind getValueKind(JavaKind javaKind) { - return LIRKind.fromJavaKind(getTarget().arch, javaKind); - } - - @Override - public ForeignCallLinkage lookupForeignCall(ForeignCallDescriptor descriptor) { - throw GraalError.shouldNotReachHere("Test code must not need this method"); - } - - @Override - public boolean isReexecutable(ForeignCallDescriptor descriptor) { - return true; - } - - @Override - public boolean isGuaranteedSafepoint(ForeignCallDescriptor descriptor) { - return false; - } - - @Override - public boolean isAvailable(ForeignCallDescriptor descriptor) { - return true; - } - - @Override - public LocationIdentity[] getKilledLocations(ForeignCallDescriptor descriptor) { - return new LocationIdentity[]{LocationIdentity.any()}; - } - - @Override - public boolean canDeoptimize(ForeignCallDescriptor descriptor) { - return false; - } - }; - ForeignCallNode node = new ForeignCallNode(foreignCalls, TEST_CALL, arg); + ForeignCallNode node = new ForeignCallNode(TEST_CALL_REEXECUTABLE, arg); node.setBci(b.bci()); b.addPush(JavaKind.Int, node); return true; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ReplaceConstantNodesPhaseTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ReplaceConstantNodesPhaseTest.java index 4a329721d03..d720dd29c4b 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ReplaceConstantNodesPhaseTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ReplaceConstantNodesPhaseTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, 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 diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ReservedStackAccessTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ReservedStackAccessTest.java index 797f7f6cb77..44a2e204a32 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ReservedStackAccessTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ReservedStackAccessTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -34,6 +34,10 @@ import org.junit.Assume; import org.junit.Before; import org.junit.Test; +/** + * Tests the ReservedStackAccess annotation. This test is derived from + * https://github.com/openjdk/jdk/blob/master/test/hotspot/jtreg/runtime/ReservedStack/ReservedStackTest.java + */ public class ReservedStackAccessTest extends HotSpotGraalCompilerTest { @Before public void check() { @@ -72,6 +76,8 @@ public class ReservedStackAccessTest extends HotSpotGraalCompilerTest { List vmArgs = SubprocessUtil.withoutDebuggerArguments(SubprocessUtil.getVMCommandLine()); vmArgs.add("-XX:+UseJVMCICompiler"); vmArgs.add("-Dgraal.Inline=false"); + vmArgs.add("-XX:MaxInlineLevel=2"); + vmArgs.add("-XX:CompileCommand=exclude,java/util/concurrent/locks/ReentrantLock,lock"); vmArgs.add("-XX:CompileCommand=exclude,java/util/concurrent/locks/AbstractOwnableSynchronizer.setExclusiveOwnerThread"); vmArgs.add(SubprocessUtil.PACKAGE_OPENING_OPTIONS); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/TestIntrinsicCompiles.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/TestIntrinsicCompiles.java index faca1bd3071..a9eaf0105ed 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/TestIntrinsicCompiles.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/TestIntrinsicCompiles.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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 @@ -35,6 +35,7 @@ import org.graalvm.compiler.debug.DebugContext; import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; import org.graalvm.compiler.hotspot.meta.HotSpotProviders; import org.graalvm.compiler.nodes.StructuredGraph; +import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; @@ -72,7 +73,7 @@ public class TestIntrinsicCompiles extends GraalCompilerTest { if (plugin instanceof MethodSubstitutionPlugin) { ResolvedJavaMethod method = CheckGraalIntrinsics.resolveIntrinsic(getMetaAccess(), intrinsic); if (!method.isNative()) { - StructuredGraph graph = providers.getReplacements().getIntrinsicGraph(method, INVALID_COMPILATION_ID, debug, null); + StructuredGraph graph = providers.getReplacements().getIntrinsicGraph(method, INVALID_COMPILATION_ID, debug, AllowAssumptions.YES, null); getCode(method, graph); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/AOTGraalHotSpotVMConfig.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/AOTGraalHotSpotVMConfig.java index 694357a3db0..4b205068653 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/AOTGraalHotSpotVMConfig.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/AOTGraalHotSpotVMConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, 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 @@ -44,6 +44,7 @@ public class AOTGraalHotSpotVMConfig extends GraalHotSpotVMConfig { CompressEncoding vmKlassEncoding = super.getKlassEncoding(); aotKlassEncoding = new CompressEncoding(vmKlassEncoding.getBase(), logKlassAlignment); assert check(); + reportErrors(); } @Override diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilationTask.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilationTask.java index f93363e93cd..91e8fbdb01f 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilationTask.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilationTask.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -32,8 +32,6 @@ import static org.graalvm.compiler.core.phases.HighTier.Options.Inline; import static org.graalvm.compiler.java.BytecodeParserOptions.InlineDuringParsing; import java.io.PrintStream; -import java.util.Collections; -import java.util.List; import jdk.internal.vm.compiler.collections.EconomicMap; import org.graalvm.compiler.api.replacements.SnippetReflectionProvider; @@ -44,6 +42,7 @@ import org.graalvm.compiler.core.common.CompilationIdentifier; import org.graalvm.compiler.debug.CounterKey; import org.graalvm.compiler.debug.DebugCloseable; import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.DebugContext.Builder; import org.graalvm.compiler.debug.DebugContext.Description; import org.graalvm.compiler.debug.DebugDumpScope; import org.graalvm.compiler.debug.DebugHandlersFactory; @@ -92,8 +91,8 @@ public class CompilationTask { protected DebugContext createRetryDebugContext(DebugContext initialDebug, OptionValues retryOptions, PrintStream logStream) { SnippetReflectionProvider snippetReflection = compiler.getGraalRuntime().getHostProviders().getSnippetReflection(); Description description = initialDebug.getDescription(); - List factories = Collections.singletonList(new GraalDebugHandlersFactory(snippetReflection)); - return DebugContext.create(retryOptions, description, initialDebug.getGlobalMetrics(), logStream, factories); + DebugHandlersFactory factory = new GraalDebugHandlersFactory(snippetReflection); + return new Builder(retryOptions, factory).globalMetrics(initialDebug.getGlobalMetrics()).description(description).logStream(logStream).build(); } @Override @@ -304,7 +303,7 @@ public class CompilationTask { public HotSpotCompilationRequestResult runCompilation(OptionValues initialOptions) { OptionValues options = filterOptions(initialOptions); HotSpotGraalRuntimeProvider graalRuntime = compiler.getGraalRuntime(); - try (DebugContext debug = graalRuntime.openDebugContext(options, compilationId, getMethod(), compiler.getDebugHandlersFactories(), DebugContext.DEFAULT_LOG_STREAM)) { + try (DebugContext debug = graalRuntime.openDebugContext(options, compilationId, getMethod(), compiler.getDebugHandlersFactories(), DebugContext.getDefaultLogStream())) { return runCompilation(debug); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/EncodedSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/EncodedSnippets.java new file mode 100644 index 00000000000..39cd7fde992 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/EncodedSnippets.java @@ -0,0 +1,448 @@ +/* + * Copyright (c) 2018, 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.hotspot; + +import static jdk.vm.ci.runtime.JVMCI.getRuntime; +import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE; +import static org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING; + +import jdk.internal.vm.compiler.collections.UnmodifiableEconomicMap; +import org.graalvm.compiler.api.runtime.GraalJVMCICompiler; +import org.graalvm.compiler.api.runtime.GraalRuntime; +import org.graalvm.compiler.bytecode.BytecodeProvider; +import org.graalvm.compiler.bytecode.ResolvedJavaMethodBytecode; +import org.graalvm.compiler.core.common.type.Stamp; +import org.graalvm.compiler.core.common.type.StampPair; +import org.graalvm.compiler.core.common.type.SymbolicJVMCIReference; +import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.GraalError; +import org.graalvm.compiler.graph.NodeClass; +import org.graalvm.compiler.nodes.Cancellable; +import org.graalvm.compiler.nodes.EncodedGraph; +import org.graalvm.compiler.nodes.StructuredGraph; +import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin; +import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext; +import org.graalvm.compiler.nodes.graphbuilderconf.MethodSubstitutionPlugin; +import org.graalvm.compiler.nodes.graphbuilderconf.ParameterPlugin; +import org.graalvm.compiler.nodes.spi.SnippetParameterInfo; +import org.graalvm.compiler.options.OptionValues; +import org.graalvm.compiler.phases.util.Providers; +import org.graalvm.compiler.replacements.ConstantBindingParameterPlugin; +import org.graalvm.compiler.replacements.PEGraphDecoder; +import org.graalvm.compiler.replacements.ReplacementsImpl; + +import jdk.vm.ci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.UnresolvedJavaField; +import jdk.vm.ci.meta.UnresolvedJavaMethod; +import jdk.vm.ci.meta.UnresolvedJavaType; + +public class EncodedSnippets { + private final byte[] snippetEncoding; + private final Object[] snippetObjects; + private final NodeClass[] snippetNodeClasses; + private final UnmodifiableEconomicMap snippetStartOffsets; + private final UnmodifiableEconomicMap originalMethods; + private UnmodifiableEconomicMap snippetParameterInfos; + + EncodedSnippets(byte[] snippetEncoding, Object[] snippetObjects, NodeClass[] snippetNodeClasses, UnmodifiableEconomicMap snippetStartOffsets, + UnmodifiableEconomicMap originalMethods, UnmodifiableEconomicMap snippetParameterInfos) { + this.snippetEncoding = snippetEncoding; + this.snippetObjects = snippetObjects; + this.snippetNodeClasses = snippetNodeClasses; + this.snippetStartOffsets = snippetStartOffsets; + this.originalMethods = originalMethods; + this.snippetParameterInfos = snippetParameterInfos; + } + + public byte[] getSnippetEncoding() { + return snippetEncoding; + } + + public NodeClass[] getSnippetNodeClasses() { + return snippetNodeClasses; + } + + public UnmodifiableEconomicMap getSnippetStartOffsets() { + return snippetStartOffsets; + } + + public UnmodifiableEconomicMap getOriginalMethods() { + return originalMethods; + } + + StructuredGraph getMethodSubstitutionGraph(MethodSubstitutionPlugin plugin, ResolvedJavaMethod original, ReplacementsImpl replacements, IntrinsicContext.CompilationContext context, + StructuredGraph.AllowAssumptions allowAssumptions, Cancellable cancellable, OptionValues options) { + IntrinsicContext.CompilationContext contextToUse = context; + if (context == IntrinsicContext.CompilationContext.ROOT_COMPILATION) { + contextToUse = IntrinsicContext.CompilationContext.ROOT_COMPILATION_ENCODING; + } + Integer startOffset = snippetStartOffsets.get(plugin.toString() + contextToUse); + if (startOffset == null) { + throw GraalError.shouldNotReachHere("plugin graph not found: " + plugin + " with " + contextToUse); + } + + ResolvedJavaType accessingClass = replacements.getProviders().getMetaAccess().lookupJavaType(plugin.getDeclaringClass()); + return decodeGraph(original, accessingClass, startOffset, replacements, contextToUse, allowAssumptions, cancellable, options); + } + + /** + * Generate a String name for a method including all type information. Used as a symbolic key + * for lookup. + */ + public static String methodKey(ResolvedJavaMethod method) { + return method.format("%H.%n(%P)"); + } + + @SuppressWarnings("try") + private StructuredGraph decodeGraph(ResolvedJavaMethod method, + ResolvedJavaType accessingClass, + int startOffset, + ReplacementsImpl replacements, + IntrinsicContext.CompilationContext context, + StructuredGraph.AllowAssumptions allowAssumptions, + Cancellable cancellable, + OptionValues options) { + Providers providers = replacements.getProviders(); + EncodedGraph encodedGraph = new SymbolicEncodedGraph(snippetEncoding, startOffset, snippetObjects, snippetNodeClasses, + methodKey(method), accessingClass, method.getDeclaringClass()); + try (DebugContext debug = replacements.openDebugContext("SVMSnippet_", method, options)) { + boolean isSubstitution = true; + StructuredGraph result = new StructuredGraph.Builder(options, debug, allowAssumptions).cancellable(cancellable).method(method).setIsSubstitution(isSubstitution).build(); + PEGraphDecoder graphDecoder = new SubstitutionGraphDecoder(providers, result, replacements, null, method, context, encodedGraph); + + graphDecoder.decode(method, isSubstitution, encodedGraph.trackNodeSourcePosition()); + + assert result.verify(); + return result; + } + } + + StructuredGraph getEncodedSnippet(ResolvedJavaMethod method, ReplacementsImpl replacements, Object[] args, StructuredGraph.AllowAssumptions allowAssumptions, OptionValues options) { + Integer startOffset = null; + if (snippetStartOffsets != null) { + startOffset = snippetStartOffsets.get(methodKey(method)); + } + if (startOffset == null) { + if (IS_IN_NATIVE_IMAGE) { + throw GraalError.shouldNotReachHere("snippet not found: " + method.format("%H.%n(%p)")); + } else { + return null; + } + } + + SymbolicEncodedGraph encodedGraph = new SymbolicEncodedGraph(snippetEncoding, startOffset, snippetObjects, snippetNodeClasses, + originalMethods.get(methodKey(method)), method.getDeclaringClass()); + return decodeSnippetGraph(encodedGraph, method, replacements, args, allowAssumptions, options); + } + + public SnippetParameterInfo getSnippetParameterInfo(ResolvedJavaMethod method) { + SnippetParameterInfo info = snippetParameterInfos.get(methodKey(method)); + assert info != null; + return info; + } + + public boolean isSnippet(ResolvedJavaMethod method) { + return snippetParameterInfos.get(methodKey(method)) != null; + } + + @SuppressWarnings("try") + private static StructuredGraph decodeSnippetGraph(SymbolicEncodedGraph encodedGraph, ResolvedJavaMethod method, ReplacementsImpl replacements, Object[] args, + StructuredGraph.AllowAssumptions allowAssumptions, OptionValues options) { + Providers providers = replacements.getProviders(); + ParameterPlugin parameterPlugin = null; + if (args != null) { + parameterPlugin = new ConstantBindingParameterPlugin(args, providers.getMetaAccess(), replacements.snippetReflection); + } + + try (DebugContext debug = replacements.openDebugContext("SVMSnippet_", method, options)) { + // @formatter:off + boolean isSubstitution = true; + StructuredGraph result = new StructuredGraph.Builder(options, debug, allowAssumptions) + .method(method) + .trackNodeSourcePosition(encodedGraph.trackNodeSourcePosition()) + .setIsSubstitution(isSubstitution) + .build(); + // @formatter:on + try (DebugContext.Scope scope = debug.scope("DecodeSnippetGraph", result)) { + PEGraphDecoder graphDecoder = new SubstitutionGraphDecoder(providers, result, replacements, parameterPlugin, method, INLINE_AFTER_PARSING, encodedGraph); + + graphDecoder.decode(method, isSubstitution, encodedGraph.trackNodeSourcePosition()); + debug.dump(DebugContext.VERBOSE_LEVEL, result, "After decoding"); + + assert result.verify(); + return result; + } catch (Throwable t) { + throw debug.handle(t); + } + } + } + + public static class SubstitutionGraphDecoder extends PEGraphDecoder { + private final ResolvedJavaMethod method; + private final EncodedGraph encodedGraph; + private IntrinsicContext intrinsic; + + SubstitutionGraphDecoder(Providers providers, StructuredGraph result, ReplacementsImpl replacements, ParameterPlugin parameterPlugin, ResolvedJavaMethod method, + IntrinsicContext.CompilationContext context, EncodedGraph encodedGraph) { + super(providers.getCodeCache().getTarget().arch, result, providers, null, + replacements.getGraphBuilderPlugins().getInvocationPlugins(), new InlineInvokePlugin[0], parameterPlugin, + null, null, null); + this.method = method; + this.encodedGraph = encodedGraph; + intrinsic = new IntrinsicContext(method, null, replacements.getDefaultReplacementBytecodeProvider(), context, false); + } + + @Override + protected EncodedGraph lookupEncodedGraph(ResolvedJavaMethod lookupMethod, + MethodSubstitutionPlugin plugin, + BytecodeProvider intrinsicBytecodeProvider, + boolean isSubstitution, + boolean trackNodeSourcePosition) { + if (lookupMethod.equals(method)) { + return encodedGraph; + } else { + throw GraalError.shouldNotReachHere(method.format("%H.%n(%p)")); + } + } + + @Override + protected IntrinsicContext getIntrinsic() { + return intrinsic; + } + } + + static class SymbolicEncodedGraph extends EncodedGraph { + + private final ResolvedJavaType[] accessingClasses; + private final String originalMethod; + + SymbolicEncodedGraph(byte[] encoding, int startOffset, Object[] objects, NodeClass[] types, String originalMethod, ResolvedJavaType... accessingClasses) { + super(encoding, startOffset, objects, types, null, null, null, false, false); + this.accessingClasses = accessingClasses; + this.originalMethod = originalMethod; + } + + SymbolicEncodedGraph(EncodedGraph encodedGraph, ResolvedJavaType declaringClass, String originalMethod) { + this(encodedGraph.getEncoding(), encodedGraph.getStartOffset(), encodedGraph.getObjects(), encodedGraph.getNodeClasses(), + originalMethod, declaringClass); + } + + @Override + public Object getObject(int i) { + Object o = objects[i]; + Object replacement = null; + if (o instanceof SymbolicJVMCIReference) { + for (ResolvedJavaType type : accessingClasses) { + try { + replacement = ((SymbolicJVMCIReference) o).resolve(type); + break; + } catch (NoClassDefFoundError e) { + } + } + } else if (o instanceof UnresolvedJavaType) { + for (ResolvedJavaType type : accessingClasses) { + try { + replacement = ((UnresolvedJavaType) o).resolve(type); + break; + } catch (NoClassDefFoundError e) { + } + } + } else if (o instanceof UnresolvedJavaMethod) { + throw new InternalError(o.toString()); + } else if (o instanceof UnresolvedJavaField) { + for (ResolvedJavaType type : accessingClasses) { + try { + replacement = ((UnresolvedJavaField) o).resolve(type); + break; + } catch (NoClassDefFoundError e) { + } + } + } else if (o instanceof GraalCapability) { + replacement = ((GraalCapability) o).resolve(((GraalJVMCICompiler) getRuntime().getCompiler()).getGraalRuntime()); + } else { + return o; + } + if (replacement != null) { + objects[i] = o = replacement; + } else { + throw new GraalError("Can't resolve " + o); + } + return o; + } + + @Override + public boolean isCallToOriginal(ResolvedJavaMethod callTarget) { + if (originalMethod != null && originalMethod.equals(EncodedSnippets.methodKey(callTarget))) { + return true; + } + return super.isCallToOriginal(callTarget); + } + } + + /** + * Symbolic reference to an object which can be retrieved from + * {@link GraalRuntime#getCapability(Class)}. + */ + static class GraalCapability { + final Class capabilityClass; + + GraalCapability(Class capabilityClass) { + this.capabilityClass = capabilityClass; + } + + public Object resolve(GraalRuntime runtime) { + Object capability = runtime.getCapability(this.capabilityClass); + if (capability != null) { + assert capability.getClass() == capabilityClass; + return capability; + } + throw new InternalError(this.capabilityClass.getName()); + } + } + + static class SymbolicResolvedJavaMethod implements SymbolicJVMCIReference { + final UnresolvedJavaType type; + final String methodName; + final String signature; + + SymbolicResolvedJavaMethod(ResolvedJavaMethod method) { + this.type = UnresolvedJavaType.create(method.getDeclaringClass().getName()); + this.methodName = method.getName(); + this.signature = method.getSignature().toMethodDescriptor(); + } + + @Override + public String toString() { + return "SymbolicResolvedJavaMethod{" + + "declaringType='" + type.getName() + '\'' + + ", methodName='" + methodName + '\'' + + ", signature='" + signature + '\'' + + '}'; + } + + @Override + public ResolvedJavaMethod resolve(ResolvedJavaType accessingClass) { + ResolvedJavaType resolvedType = type.resolve(accessingClass); + if (resolvedType == null) { + throw new InternalError("Could not resolve " + this + " in context of " + accessingClass.toJavaName()); + } + for (ResolvedJavaMethod method : methodName.equals("") ? resolvedType.getDeclaredConstructors() : resolvedType.getDeclaredMethods()) { + if (method.getName().equals(methodName) && method.getSignature().toMethodDescriptor().equals(signature)) { + return method; + } + } + throw new InternalError("Could not resolve " + this + " in context of " + accessingClass.toJavaName()); + } + } + + static class SymbolicResolvedJavaField implements SymbolicJVMCIReference { + final UnresolvedJavaType declaringType; + final String name; + final UnresolvedJavaType signature; + private final boolean isStatic; + + SymbolicResolvedJavaField(ResolvedJavaField field) { + this.declaringType = UnresolvedJavaType.create(field.getDeclaringClass().getName()); + this.name = field.getName(); + this.signature = UnresolvedJavaType.create(field.getType().getName()); + this.isStatic = field.isStatic(); + } + + @Override + public ResolvedJavaField resolve(ResolvedJavaType accessingClass) { + ResolvedJavaType resolvedType = declaringType.resolve(accessingClass); + ResolvedJavaType resolvedFieldType = signature.resolve(accessingClass); + ResolvedJavaField[] fields = isStatic ? resolvedType.getStaticFields() : resolvedType.getInstanceFields(true); + for (ResolvedJavaField field : fields) { + if (field.getName().equals(name)) { + if (field.getType().equals(resolvedFieldType)) { + return field; + } + } + } + throw new InternalError("Could not resolve " + this + " in context of " + accessingClass.toJavaName()); + } + + @Override + public String toString() { + return "SymbolicResolvedJavaField{" + + signature.getName() + ' ' + + declaringType.getName() + '.' + + name + + '}'; + } + } + + static class SymbolicResolvedJavaMethodBytecode implements SymbolicJVMCIReference { + SymbolicResolvedJavaMethod method; + + SymbolicResolvedJavaMethodBytecode(ResolvedJavaMethodBytecode bytecode) { + method = new SymbolicResolvedJavaMethod(bytecode.getMethod()); + } + + @Override + public ResolvedJavaMethodBytecode resolve(ResolvedJavaType accessingClass) { + return new ResolvedJavaMethodBytecode(method.resolve(accessingClass)); + } + } + + static class SymbolicStampPair implements SymbolicJVMCIReference { + Object trustedStamp; + Object uncheckdStamp; + + SymbolicStampPair(StampPair stamp) { + this.trustedStamp = maybeMakeSymbolic(stamp.getTrustedStamp()); + this.uncheckdStamp = maybeMakeSymbolic(stamp.getUncheckedStamp()); + } + + @Override + public StampPair resolve(ResolvedJavaType accessingClass) { + return StampPair.create(resolveStamp(accessingClass, trustedStamp), resolveStamp(accessingClass, uncheckdStamp)); + } + } + + private static Object maybeMakeSymbolic(Stamp trustedStamp) { + if (trustedStamp != null) { + SymbolicJVMCIReference symbolicJVMCIReference = trustedStamp.makeSymbolic(); + if (symbolicJVMCIReference != null) { + return symbolicJVMCIReference; + } + } + return trustedStamp; + } + + private static Stamp resolveStamp(ResolvedJavaType accessingClass, Object stamp) { + if (stamp == null) { + return null; + } + if (stamp instanceof Stamp) { + return (Stamp) stamp; + } + return (Stamp) ((SymbolicJVMCIReference) stamp).resolve(accessingClass); + } + +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java index 4f2c3a99cc0..e7a77962d37 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java @@ -28,18 +28,31 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.List; +import org.graalvm.compiler.api.replacements.Fold; +import org.graalvm.compiler.api.replacements.Fold.InjectedParameter; import org.graalvm.compiler.core.common.CompressEncoding; -import org.graalvm.compiler.hotspot.nodes.GraalHotSpotVMConfigNode; +import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext; +import org.graalvm.compiler.options.OptionValues; import jdk.vm.ci.common.JVMCIError; import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod; import jdk.vm.ci.hotspot.HotSpotVMConfigStore; +import jdk.vm.ci.meta.MetaAccessProvider; import jdk.vm.ci.meta.ResolvedJavaMethod; /** * Used to access native configuration details. */ -public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigBase { +public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigAccess { + + /** + * Sentinel value to use for an {@linkplain InjectedParameter injected} + * {@link GraalHotSpotVMConfig} parameter to a {@linkplain Fold foldable} method. + */ + public static final GraalHotSpotVMConfig INJECTED_VMCONFIG = null; + public static final MetaAccessProvider INJECTED_METAACCESS = null; + public static final OptionValues INJECTED_OPTIONVALUES = null; + public static final IntrinsicContext INJECTED_INTRINSIC_CONTEXT = null; GraalHotSpotVMConfig(HotSpotVMConfigStore store) { super(store); @@ -50,11 +63,12 @@ public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigBase { klassEncoding = new CompressEncoding(narrowKlassBase, narrowKlassShift); assert check(); + reportErrors(); } private final CompressEncoding oopEncoding; private final CompressEncoding klassEncoding; - private final String markWord = versioned.markWordFieldType; + private final String markWord = JDK < 14 ? "markOop" : "markWord"; // JDK-8229258 public CompressEncoding getOopEncoding() { return oopEncoding; @@ -64,14 +78,34 @@ public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigBase { return klassEncoding; } + private final boolean isJDK11Plus = JDK >= 11; + private final boolean isJDK8OrJDK11Plus = JDK == 8 || isJDK11Plus; + + // Certain values were accidentally omitted in JDK 9+ only VM values + // in vmStructs_jvmci.cpp are exposed to JVMCI. In JDK 8, values in any + // vmStructs*.[cpp|hpp] file are exposed to JVMCI. + private final boolean gr21761 = JDK == 8 || (JVMCI ? jvmciGE(JVMCI_20_0_b03) : JDK >= 15); + + private final boolean jdk13Backport = JVMCI ? jvmciGE(JVMCI_19_3_b03) : JDK >= 13; + public final boolean cAssertions = getConstant("ASSERT", Boolean.class); public final int codeEntryAlignment = getFlag("CodeEntryAlignment", Integer.class); public final boolean enableContended = getFlag("EnableContended", Boolean.class); public final boolean restrictContended = getFlag("RestrictContended", Boolean.class); public final int contendedPaddingWidth = getFlag("ContendedPaddingWidth", Integer.class); - public final int fieldsAllocationStyle = versioned.fieldsAllocationStyle; - public final boolean compactFields = versioned.compactFields; + public final int fieldsAllocationStyle; + public final boolean compactFields; + { + // JDK-8236224 + if (JDK >= 15) { + fieldsAllocationStyle = 1; + compactFields = true; + } else { + fieldsAllocationStyle = getFlag("FieldsAllocationStyle", Integer.class); + compactFields = getFlag("CompactFields", Boolean.class); + } + } public final boolean verifyOops = getFlag("VerifyOops", Boolean.class); public final boolean ciTime = getFlag("CITime", Boolean.class); public final boolean ciTimeEach = getFlag("CITimeEach", Boolean.class); @@ -79,7 +113,7 @@ public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigBase { public final int hugeMethodLimit = getFlag("HugeMethodLimit", Integer.class); public final boolean printInlining = getFlag("PrintInlining", Boolean.class); public final boolean inline = getFlag("Inline", Boolean.class); - public final boolean inlineNotify = versioned.inlineNotify; + public final boolean inlineNotify = JDK > 8; public final boolean useFastLocking = getFlag("JVMCIUseFastLocking", Boolean.class); public final boolean forceUnreachable = getFlag("ForceUnreachable", Boolean.class); public final int codeSegmentSize = getFlag("CodeCacheSegmentSize", Integer.class); @@ -93,26 +127,35 @@ public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigBase { public final boolean useBiasedLocking = getFlag("UseBiasedLocking", Boolean.class); public final boolean usePopCountInstruction = getFlag("UsePopCountInstruction", Boolean.class); public final boolean useAESIntrinsics = getFlag("UseAESIntrinsics", Boolean.class); - public final boolean useAESCTRIntrinsics = getFlag("UseAESCTRIntrinsics", Boolean.class, false); + public final boolean useAESCTRIntrinsics = getFlag("UseAESCTRIntrinsics", Boolean.class, false, (JDK == 8 && !IS_OPENJDK) || JDK >= 9); public final boolean useCRC32Intrinsics = getFlag("UseCRC32Intrinsics", Boolean.class); - public final boolean useCRC32CIntrinsics = versioned.useCRC32CIntrinsics; - public final boolean threadLocalHandshakes = versioned.threadLocalHandshakes; - + public final boolean useCRC32CIntrinsics = getFlag("UseCRC32CIntrinsics", Boolean.class, false, JDK >= 9); // JDK-8073583 + public final boolean useThreadLocalPolling; + { + if (JDK >= 14) { + // JDK-8220049, JDK-8220051 + useThreadLocalPolling = true; + } else if (JDK >= 10) { + useThreadLocalPolling = getFlag("ThreadLocalHandshakes", Boolean.class); + } else { + useThreadLocalPolling = false; + } + } private final boolean useMultiplyToLenIntrinsic = getFlag("UseMultiplyToLenIntrinsic", Boolean.class); private final boolean useSHA1Intrinsics = getFlag("UseSHA1Intrinsics", Boolean.class); private final boolean useSHA256Intrinsics = getFlag("UseSHA256Intrinsics", Boolean.class); private final boolean useSHA512Intrinsics = getFlag("UseSHA512Intrinsics", Boolean.class); - private final boolean useGHASHIntrinsics = getFlag("UseGHASHIntrinsics", Boolean.class, false); - private final boolean useBase64Intrinsics = getFlag("UseBASE64Intrinsics", Boolean.class, false); - private final boolean useMontgomeryMultiplyIntrinsic = getFlag("UseMontgomeryMultiplyIntrinsic", Boolean.class, false); - private final boolean useMontgomerySquareIntrinsic = getFlag("UseMontgomerySquareIntrinsic", Boolean.class, false); - private final boolean useMulAddIntrinsic = getFlag("UseMulAddIntrinsic", Boolean.class, false); - private final boolean useSquareToLenIntrinsic = getFlag("UseSquareToLenIntrinsic", Boolean.class, false); - public final boolean useVectorizedMismatchIntrinsic = getFlag("UseVectorizedMismatchIntrinsic", Boolean.class, false); - public final boolean useFMAIntrinsics = getFlag("UseFMA", Boolean.class, false); - public final int useAVX3Threshold = getFlag("AVX3Threshold", Integer.class, 4096); + private final boolean useGHASHIntrinsics = getFlag("UseGHASHIntrinsics", Boolean.class, false, isJDK8OrJDK11Plus); + private final boolean useBase64Intrinsics = getFlag("UseBASE64Intrinsics", Boolean.class, false, isJDK11Plus); + private final boolean useMontgomeryMultiplyIntrinsic = getFlag("UseMontgomeryMultiplyIntrinsic", Boolean.class, false, isJDK8OrJDK11Plus); + private final boolean useMontgomerySquareIntrinsic = getFlag("UseMontgomerySquareIntrinsic", Boolean.class, false, isJDK8OrJDK11Plus); + private final boolean useMulAddIntrinsic = getFlag("UseMulAddIntrinsic", Boolean.class, false, isJDK8OrJDK11Plus); + private final boolean useSquareToLenIntrinsic = getFlag("UseSquareToLenIntrinsic", Boolean.class, false, isJDK8OrJDK11Plus); + public final boolean useVectorizedMismatchIntrinsic = getFlag("UseVectorizedMismatchIntrinsic", Boolean.class, false, isJDK11Plus); + public final boolean useFMAIntrinsics = getFlag("UseFMA", Boolean.class, false, JDK >= 9); + public final int useAVX3Threshold = getFlag("AVX3Threshold", Integer.class, 4096, osArch.equals("amd64") && (JDK >= 14 || (JDK == 11 && JDK_UPDATE >= 6))); - public final boolean preserveFramePointer = getFlag("PreserveFramePointer", Boolean.class, false); + public final boolean preserveFramePointer = getFlag("PreserveFramePointer", Boolean.class); /* * These are methods because in some JDKs the flags are visible but the stubs themselves haven't @@ -167,7 +210,7 @@ public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigBase { } public final boolean useG1GC = getFlag("UseG1GC", Boolean.class); - public final boolean useCMSGC = getFlag("UseConcMarkSweepGC", Boolean.class, false); + public final boolean useCMSGC = getFlag("UseConcMarkSweepGC", Boolean.class, false, JDK < 14); // JDK-8231559 public final int allocatePrefetchStyle = getFlag("AllocatePrefetchStyle", Integer.class); public final int allocatePrefetchInstr = getFlag("AllocatePrefetchInstr", Integer.class); @@ -207,9 +250,9 @@ public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigBase { public final int logKlassAlignment = getConstant("LogKlassAlignmentInBytes", Integer.class); public final int stackShadowPages = getFlag("StackShadowPages", Integer.class); - public final int stackReservedPages = getFlag("StackReservedPages", Integer.class, 0); + public final int stackReservedPages = getFlag("StackReservedPages", Integer.class, 0, JDK >= 9); public final boolean useStackBanging = getFlag("UseStackBanging", Boolean.class); - public final int stackBias = getConstant("STACK_BIAS", Integer.class, 0); + public final int stackBias = getConstant("STACK_BIAS", Integer.class, 0, JDK < 15); public final int vmPageSize = getFieldValue("CompilerToVM::Data::vm_page_size", Integer.class, "int"); public final int markOffset = getFieldOffset("oopDesc::_mark", Integer.class, markWord); @@ -222,8 +265,18 @@ public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigBase { public final int secondarySuperCacheOffset = getFieldOffset("Klass::_secondary_super_cache", Integer.class, "Klass*"); public final int secondarySupersOffset = getFieldOffset("Klass::_secondary_supers", Integer.class, "Array*"); - public final boolean classMirrorIsHandle = versioned.classMirrorIsHandle; - public final int classMirrorOffset = versioned.classMirrorOffset; + public final boolean classMirrorIsHandle; + public final int classMirrorOffset; + { + // JDK-8186777 + if (JDK <= 8) { + classMirrorIsHandle = false; + classMirrorOffset = getFieldOffset("Klass::_java_mirror", Integer.class, "oop"); + } else { + classMirrorIsHandle = true; + classMirrorOffset = getFieldOffset("Klass::_java_mirror", Integer.class, "OopHandle"); + } + } public final int klassSuperKlassOffset = getFieldOffset("Klass::_super", Integer.class, "Klass*"); public final int klassModifierFlagsOffset = getFieldOffset("Klass::_modifier_flags", Integer.class, "jint"); @@ -252,14 +305,14 @@ public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigBase { public final int vtableEntryMethodOffset = getFieldOffset("vtableEntry::_method", Integer.class, "Method*"); public final int instanceKlassInitStateOffset = getFieldOffset("InstanceKlass::_init_state", Integer.class, "u1"); - public final int instanceKlassInitThreadOffset = getFieldOffset("InstanceKlass::_init_thread", Integer.class, "Thread*", -1); + public final int instanceKlassInitThreadOffset = getFieldOffset("InstanceKlass::_init_thread", Integer.class, "Thread*", -1, JDK == 8 || JDK >= 15 || (JVMCI && jvmciGE(JVMCI_20_0_b03))); public final int instanceKlassConstantsOffset = getFieldOffset("InstanceKlass::_constants", Integer.class, "ConstantPool*"); public final int instanceKlassFieldsOffset = getFieldOffset("InstanceKlass::_fields", Integer.class, "Array*"); public final int klassVtableStartOffset = getFieldValue("CompilerToVM::Data::Klass_vtable_start_offset", Integer.class, "int"); public final int klassVtableLengthOffset = getFieldValue("CompilerToVM::Data::Klass_vtable_length_offset", Integer.class, "int"); public final int instanceKlassStateLinked = getConstant("InstanceKlass::linked", Integer.class); - public final int instanceKlassStateBeingInitialized = getConstant("InstanceKlass::being_initialized", Integer.class, -1); + public final int instanceKlassStateBeingInitialized = getConstant("InstanceKlass::being_initialized", Integer.class, -1, JDK == 8 || (JVMCI ? jvmciGE(JVMCI_20_0_b03) : JDK >= 14)); public final int instanceKlassStateFullyInitialized = getConstant("InstanceKlass::fully_initialized", Integer.class); public final int arrayOopDescSize = getFieldValue("CompilerToVM::Data::sizeof_arrayOopDesc", Integer.class, "int"); @@ -299,7 +352,7 @@ public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigBase { public final int jvmAccFieldHasGenericSignature = getConstant("JVM_ACC_FIELD_HAS_GENERIC_SIGNATURE", Integer.class); public final int jvmAccWrittenFlags = getConstant("JVM_ACC_WRITTEN_FLAGS", Integer.class); public final int jvmAccSynthetic = getConstant("JVM_ACC_SYNTHETIC", Integer.class); - public final int jvmAccIsHiddenClass = getConstant("JVM_ACC_IS_HIDDEN_CLASS", Integer.class); + public final int jvmAccIsHiddenClass = getConstant("JVM_ACC_IS_HIDDEN_CLASS", Integer.class, 0, JDK >= 15); // JDK-8219607 public final int jvmciCompileStateCanPostOnExceptionsOffset = getJvmciJvmtiCapabilityOffset("_jvmti_can_post_on_exceptions"); public final int jvmciCompileStateCanPopFrameOffset = getJvmciJvmtiCapabilityOffset("_jvmti_can_pop_frame"); @@ -307,25 +360,29 @@ public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigBase { // Integer.MIN_VALUE if not available private int getJvmciJvmtiCapabilityOffset(String name) { - int offset = getFieldOffset("JVMCICompileState::" + name, Integer.class, "jbyte", Integer.MIN_VALUE); - if (offset == Integer.MIN_VALUE) { - // JDK 12 - offset = getFieldOffset("JVMCIEnv::" + name, Integer.class, "jbyte", Integer.MIN_VALUE); + if (JVMCI) { + return getFieldOffset("JVMCICompileState::" + name, Integer.class, "jbyte"); } - return offset; + if (JDK >= 13) { + return getFieldOffset("JVMCICompileState::" + name, Integer.class, "jbyte"); + } + if (JDK == 12) { + return getFieldOffset("JVMCIEnv::" + name, Integer.class, "jbyte"); + } + return Integer.MIN_VALUE; } public final int threadTlabOffset = getFieldOffset("Thread::_tlab", Integer.class, "ThreadLocalAllocBuffer"); public final int javaThreadAnchorOffset = getFieldOffset("JavaThread::_anchor", Integer.class, "JavaFrameAnchor"); - public final int javaThreadShouldPostOnExceptionsFlagOffset = getFieldOffset("JavaThread::_should_post_on_exceptions_flag", Integer.class, "int", Integer.MIN_VALUE); + public final int javaThreadShouldPostOnExceptionsFlagOffset = getFieldOffset("JavaThread::_should_post_on_exceptions_flag", Integer.class, "int", Integer.MIN_VALUE, JVMCI || JDK >= 12); public final int threadObjectOffset = getFieldOffset("JavaThread::_threadObj", Integer.class, "oop"); - public final int osThreadOffset = getFieldOffset("JavaThread::_osthread", Integer.class, "OSThread*", Integer.MAX_VALUE); + public final int osThreadOffset = getFieldOffset("JavaThread::_osthread", Integer.class, "OSThread*"); public final int threadIsMethodHandleReturnOffset = getFieldOffset("JavaThread::_is_method_handle_return", Integer.class, "int"); public final int threadObjectResultOffset = getFieldOffset("JavaThread::_vm_result", Integer.class, "oop"); public final int jvmciCountersThreadOffset = getFieldOffset("JavaThread::_jvmci_counters", Integer.class, "jlong*"); - public final int doingUnsafeAccessOffset = getFieldOffset("JavaThread::_doing_unsafe_access", Integer.class, "bool", Integer.MAX_VALUE); - public final int javaThreadReservedStackActivationOffset = versioned.javaThreadReservedStackActivationOffset; - public final int jniEnvironmentOffset = getFieldOffset("JavaThread::_jni_environment", Integer.class, "JNIEnv", Integer.MIN_VALUE); + public final int doingUnsafeAccessOffset = getFieldOffset("JavaThread::_doing_unsafe_access", Integer.class, "bool", Integer.MAX_VALUE, JVMCI || JDK >= 14); + public final int javaThreadReservedStackActivationOffset = JDK <= 8 ? 0 : getFieldOffset("JavaThread::_reserved_stack_activation", Integer.class, "address"); // JDK-8046936 + public final int jniEnvironmentOffset = getFieldOffset("JavaThread::_jni_environment", Integer.class, "JNIEnv", Integer.MIN_VALUE, JVMCI || JDK >= 14); public boolean requiresReservedStackCheck(List methods) { if (enableStackReservedZoneAddress != 0 && methods != null) { @@ -367,7 +424,7 @@ public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigBase { * this field is {@value #INVALID_RTLD_DEFAULT_HANDLE}, then this capability is not supported on * the current platform. */ - public final long rtldDefault = getAddress("RTLD_DEFAULT", osName.equals("bsd") || osName.equals("linux") ? null : INVALID_RTLD_DEFAULT_HANDLE); + public final long rtldDefault = getAddress("RTLD_DEFAULT", INVALID_RTLD_DEFAULT_HANDLE, osName.equals("darwin") || osName.equals("linux")); /** * This field is used to pass exception objects into and out of the runtime system during @@ -414,11 +471,16 @@ public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigBase { return javaThreadAnchorOffset + getFieldOffset("JavaFrameAnchor::_last_Java_fp", Integer.class, "intptr_t*"); } - public final int runtimeCallStackSize = getConstant("frame::arg_reg_save_area_bytes", Integer.class, intRequiredOnAMD64); - public final int frameInterpreterFrameSenderSpOffset = getConstant("frame::interpreter_frame_sender_sp_offset", Integer.class, intRequiredOnAMD64); - public final int frameInterpreterFrameLastSpOffset = getConstant("frame::interpreter_frame_last_sp_offset", Integer.class, intRequiredOnAMD64); + public int threadJavaFrameAnchorFlagsOffset() { + assert osArch.equals("sparc"); + return javaThreadAnchorOffset + getFieldOffset("JavaFrameAnchor::_flags", Integer.class, "int"); + } - public final int osThreadInterruptedOffset = getFieldOffset("OSThread::_interrupted", Integer.class, "jint", Integer.MAX_VALUE); + public final int runtimeCallStackSize = getConstant("frame::arg_reg_save_area_bytes", Integer.class, 0, osArch.equals("amd64")); + public final int frameInterpreterFrameSenderSpOffset = getConstant("frame::interpreter_frame_sender_sp_offset", Integer.class, 0, osArch.equals("amd64")); + public final int frameInterpreterFrameLastSpOffset = getConstant("frame::interpreter_frame_last_sp_offset", Integer.class, 0, osArch.equals("amd64")); + + public final int osThreadInterruptedOffset = getFieldOffset("OSThread::_interrupted", Integer.class, "jint", Integer.MAX_VALUE, JDK < 14); public final long markWordHashShift = getConstant(markWordField("hash_shift"), Long.class); @@ -429,15 +491,15 @@ public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigBase { public final long markWordHashMaskInPlace = getConstant(markWordField("hash_mask_in_place"), Long.class); public final int unlockedMask = getConstant(markWordField("unlocked_value"), Integer.class); - public final int monitorMask = getConstant(markWordField("monitor_value"), Integer.class, -1); + public final int monitorMask = getConstant(markWordField("monitor_value"), Integer.class, -1, gr21761); public final int biasedLockPattern = getConstant(markWordField("biased_lock_pattern"), Integer.class); // This field has no type in vmStructs.cpp - public final int objectMonitorOwner = getFieldOffset("ObjectMonitor::_owner", Integer.class, null, -1); - public final int objectMonitorRecursions = getFieldOffset("ObjectMonitor::_recursions", Integer.class, "intptr_t", -1); - public final int objectMonitorCxq = getFieldOffset("ObjectMonitor::_cxq", Integer.class, "ObjectWaiter*", -1); - public final int objectMonitorEntryList = getFieldOffset("ObjectMonitor::_EntryList", Integer.class, "ObjectWaiter*", -1); - public final int objectMonitorSucc = getFieldOffset("ObjectMonitor::_succ", Integer.class, "Thread*", -1); + public final int objectMonitorOwner = getFieldOffset("ObjectMonitor::_owner", Integer.class, null, -1, gr21761); + public final int objectMonitorRecursions = getFieldOffset("ObjectMonitor::_recursions", Integer.class, "intptr_t", -1, gr21761); + public final int objectMonitorCxq = getFieldOffset("ObjectMonitor::_cxq", Integer.class, "ObjectWaiter*", -1, jdk13Backport); + public final int objectMonitorEntryList = getFieldOffset("ObjectMonitor::_EntryList", Integer.class, "ObjectWaiter*", -1, jdk13Backport); + public final int objectMonitorSucc = getFieldOffset("ObjectMonitor::_succ", Integer.class, "Thread*", -1, jdk13Backport); public final int markWordNoHashInPlace = getConstant(markWordField("no_hash_in_place"), Integer.class); public final int markWordNoLockInPlace = getConstant(markWordField("no_lock_in_place"), Integer.class); @@ -458,8 +520,8 @@ public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigBase { return tmp; } - private String markWordField(String simpleName) { - return versioned.markWordClassName + "::" + simpleName; + private static String markWordField(String simpleName) { + return (JDK < 14 ? "markOopDesc::" : "markWord::") + simpleName; } /** @@ -474,14 +536,14 @@ public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigBase { public final int methodAccessFlagsOffset = getFieldOffset("Method::_access_flags", Integer.class, "AccessFlags"); public final int methodConstMethodOffset = getFieldOffset("Method::_constMethod", Integer.class, "ConstMethod*"); - public final int methodIntrinsicIdOffset = versioned.methodIntrinsicIdOffset; - public final int methodFlagsOffset = versioned.methodFlagsOffset; + public final int methodIntrinsicIdOffset = getFieldOffset("Method::_intrinsic_id", Integer.class, JDK <= 8 ? "u1" : "u2"); + public final int methodFlagsOffset = getFieldOffset("Method::_flags", Integer.class, JDK <= 8 ? "u1" : "u2"); public final int methodVtableIndexOffset = getFieldOffset("Method::_vtable_index", Integer.class, "int"); public final int methodCountersOffset = getFieldOffset("Method::_method_counters", Integer.class, "MethodCounters*"); public final int methodDataOffset = getFieldOffset("Method::_method_data", Integer.class, "MethodData*"); public final int methodCompiledEntryOffset = getFieldOffset("Method::_from_compiled_entry", Integer.class, "address"); - public final int methodCodeOffset = versioned.methodCodeOffset; + public final int methodCodeOffset = getFieldOffset("Method::_code", Integer.class, JDK <= 8 ? "nmethod*" : "CompiledMethod*"); public final int methodFlagsCallerSensitive = getConstant("Method::_caller_sensitive", Integer.class); public final int methodFlagsForceInline = getConstant("Method::_force_inline", Integer.class); @@ -492,17 +554,14 @@ public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigBase { public final int invocationCounterOffset = getFieldOffset("MethodCounters::_invocation_counter", Integer.class, "InvocationCounter"); public final int backedgeCounterOffset = getFieldOffset("MethodCounters::_backedge_counter", Integer.class, "InvocationCounter"); - public final int invocationCounterIncrement = versioned.invocationCounterIncrement; - public final int invocationCounterShift = versioned.invocationCounterShift; + public final int invocationCounterIncrement = JDK <= 8 ? 0 : getConstant("InvocationCounter::count_increment", Integer.class); + public final int invocationCounterShift = JDK <= 8 ? 0 : getConstant("InvocationCounter::count_shift", Integer.class); - public final int nmethodEntryOffset = getFieldOffset("nmethod::_verified_entry_point", - Integer.class, "address"); - public final int compilationLevelFullOptimization = getConstant("CompLevel_full_optimization", - Integer.class); + public final int nmethodEntryOffset = getFieldOffset("nmethod::_verified_entry_point", Integer.class, "address"); + public final int compilationLevelFullOptimization = getConstant("CompLevel_full_optimization", Integer.class); public final int constantPoolSize = getFieldValue("CompilerToVM::Data::sizeof_ConstantPool", Integer.class, "int"); - public final int constantPoolLengthOffset = getFieldOffset("ConstantPool::_length", - Integer.class, "int"); + public final int constantPoolLengthOffset = getFieldOffset("ConstantPool::_length", Integer.class, "int"); public final int heapWordSize = getConstant("HeapWordSize", Integer.class); @@ -518,8 +577,16 @@ public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigBase { public final int logOfHRGrainBytes = getFieldValue("HeapRegion::LogOfHRGrainBytes", Integer.class, "int"); - public final long cardtableStartAddress = getFieldValue("CompilerToVM::Data::cardtable_start_address", Long.class, "CardTable::CardValue*"); public final int cardtableShift = getFieldValue("CompilerToVM::Data::cardtable_shift", Integer.class, "int"); + public final long cardtableStartAddress; + { + // JDK-8237497 + if (JDK < 15) { + cardtableStartAddress = getFieldValue("CompilerToVM::Data::cardtable_start_address", Long.class, "jbyte*"); + } else { + cardtableStartAddress = getFieldValue("CompilerToVM::Data::cardtable_start_address", Long.class, "CardTable::CardValue*"); + } + } /** * This is the largest stack offset encodeable in an OopMapValue. Offsets larger than this will @@ -530,15 +597,40 @@ public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigBase { public final long safepointPollingAddress = getFieldValue("os::_polling_page", Long.class, "address"); // G1 Collector Related Values. + public final byte dirtyCardValue; + public final byte g1YoungCardValue; + public final int g1SATBQueueMarkingOffset; + public final int g1SATBQueueIndexOffset; + public final int g1SATBQueueBufferOffset; + public final int g1CardQueueIndexOffset; + public final int g1CardQueueBufferOffset; + { + if (JDK <= 8) { + int dirtyCardQueueBufferOffset = getFieldOffset("PtrQueue::_buf", Integer.class, "void**"); + int dirtyCardQueueIndexOffset = getFieldOffset("PtrQueue::_index", Integer.class, "size_t"); + int satbMarkQueueBufferOffset = dirtyCardQueueBufferOffset; + int satbMarkQueueIndexOffset = dirtyCardQueueIndexOffset; + int satbMarkQueueActiveOffset = getFieldOffset("PtrQueue::_active", Integer.class, "bool"); + int javaThreadSatbMarkQueueOffset = getFieldOffset("JavaThread::_satb_mark_queue", Integer.class); + int javaThreadDirtyCardQueueOffset = getFieldOffset("JavaThread::_dirty_card_queue", Integer.class, "DirtyCardQueue"); - public final byte dirtyCardValue = versioned.dirtyCardValue; - public final byte g1YoungCardValue = versioned.g1YoungCardValue; - - public final int g1SATBQueueMarkingOffset = versioned.g1SATBQueueMarkingOffset; - public final int g1SATBQueueIndexOffset = versioned.g1SATBQueueIndexOffset; - public final int g1SATBQueueBufferOffset = versioned.g1SATBQueueBufferOffset; - public final int g1CardQueueIndexOffset = versioned.g1CardQueueIndexOffset; - public final int g1CardQueueBufferOffset = versioned.g1CardQueueBufferOffset; + dirtyCardValue = getFieldValue("CompilerToVM::Data::dirty_card", Byte.class, "int"); + g1YoungCardValue = getFieldValue("CompilerToVM::Data::g1_young_card", Byte.class, "int"); + g1CardQueueIndexOffset = javaThreadDirtyCardQueueOffset + dirtyCardQueueIndexOffset; + g1CardQueueBufferOffset = javaThreadDirtyCardQueueOffset + dirtyCardQueueBufferOffset; + g1SATBQueueMarkingOffset = javaThreadSatbMarkQueueOffset + satbMarkQueueActiveOffset; + g1SATBQueueIndexOffset = javaThreadSatbMarkQueueOffset + satbMarkQueueIndexOffset; + g1SATBQueueBufferOffset = javaThreadSatbMarkQueueOffset + satbMarkQueueBufferOffset; + } else { + dirtyCardValue = getConstant("CardTable::dirty_card", Byte.class); + g1YoungCardValue = getConstant("G1CardTable::g1_young_gen", Byte.class); + g1SATBQueueMarkingOffset = getConstant("G1ThreadLocalData::satb_mark_queue_active_offset", Integer.class); + g1SATBQueueIndexOffset = getConstant("G1ThreadLocalData::satb_mark_queue_index_offset", Integer.class); + g1SATBQueueBufferOffset = getConstant("G1ThreadLocalData::satb_mark_queue_buffer_offset", Integer.class); + g1CardQueueIndexOffset = getConstant("G1ThreadLocalData::dirty_card_queue_index_offset", Integer.class); + g1CardQueueBufferOffset = getConstant("G1ThreadLocalData::dirty_card_queue_buffer_offset", Integer.class); + } + } public final int klassOffset = getFieldValue("java_lang_Class::_klass_offset", Integer.class, "int"); public final int arrayKlassOffset = getFieldValue("java_lang_Class::_array_klass_offset", Integer.class, "int"); @@ -546,8 +638,16 @@ public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigBase { public final int basicLockSize = getFieldValue("CompilerToVM::Data::sizeof_BasicLock", Integer.class, "int"); public final int basicLockDisplacedHeaderOffset = getFieldOffset("BasicLock::_displaced_header", Integer.class, markWord); - public final int threadPollingPageOffset = getFieldOffset("Thread::_polling_page", Integer.class, "volatile void*", -1); public final int threadAllocatedBytesOffset = getFieldOffset("Thread::_allocated_bytes", Integer.class, "jlong"); + public final int threadPollingPageOffset; + { + // JDK-8237497 + if (JDK < 15) { + threadPollingPageOffset = getFieldOffset("Thread::_polling_page", Integer.class, "address", -1, JDK >= 10); + } else { + threadPollingPageOffset = getFieldOffset("Thread::_polling_page", Integer.class, "volatile void*"); + } + } public final int tlabRefillWasteIncrement = getFlag("TLABWasteIncrement", Integer.class); @@ -605,24 +705,25 @@ public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigBase { // ARMv8-A architecture reference manual D12.2.35 Data Cache Zero ID register says: // * BS, bits [3:0] indicate log2 of the DC ZVA block size in (4-byte) words. // * DZP, bit [4] of indicates whether use of DC ZVA instruction is prohibited. - public final int psrInfoDczidValue = getFieldValue("VM_Version::_psr_info.dczid_el0", Integer.class, "uint32_t", 0x10); + public final int psrInfoDczidValue = getFieldValue("VM_Version::_psr_info.dczid_el0", Integer.class, "uint32_t", 0x10, (JVMCI ? jvmciGE(JVMCI_19_3_b04) : JDK >= 14) && osArch.equals("aarch64")); // FIXME This is only temporary until the GC code is changed. public final boolean inlineContiguousAllocationSupported = getFieldValue("CompilerToVM::Data::_supports_inline_contig_alloc", Boolean.class); public final long heapEndAddress = getFieldValue("CompilerToVM::Data::_heap_end_addr", Long.class, "HeapWord**"); - public final long heapTopAddress = versioned.heapTopAddress; + public final long heapTopAddress = getFieldValue("CompilerToVM::Data::_heap_top_addr", Long.class, JDK <= 8 ? "HeapWord**" : "HeapWord* volatile*"); - public final boolean cmsIncrementalMode = getFlag("CMSIncrementalMode", Boolean.class, false); + public final boolean cmsIncrementalMode = getFlag("CMSIncrementalMode", Boolean.class, false, JDK <= 8); public final long inlineCacheMissStub = getFieldValue("CompilerToVM::Data::SharedRuntime_ic_miss_stub", Long.class, "address"); public final long handleWrongMethodStub = getFieldValue("CompilerToVM::Data::SharedRuntime_handle_wrong_method_stub", Long.class, "address"); public final long deoptBlobUnpack = getFieldValue("CompilerToVM::Data::SharedRuntime_deopt_blob_unpack", Long.class, "address"); - public final long deoptBlobUnpackWithExceptionInTLS = getFieldValue("CompilerToVM::Data::SharedRuntime_deopt_blob_unpack_with_exception_in_tls", Long.class, "address", 0L); + public final long deoptBlobUnpackWithExceptionInTLS = getFieldValue("CompilerToVM::Data::SharedRuntime_deopt_blob_unpack_with_exception_in_tls", Long.class, "address", 0L, + JVMCI ? jvmciGE(JVMCI_19_3_b07) : JDK >= 14); public final long deoptBlobUncommonTrap = getFieldValue("CompilerToVM::Data::SharedRuntime_deopt_blob_uncommon_trap", Long.class, "address"); - public final long codeCacheLowBound = versioned.codeCacheLowBound; - public final long codeCacheHighBound = versioned.codeCacheHighBound; + public final long codeCacheLowBound = getFieldValue(JDK == 8 ? "CompilerToVM::Data::CodeCache_low_bound" : "CodeCache::_low_bound", Long.class, "address"); + public final long codeCacheHighBound = getFieldValue(JDK == 8 ? "CompilerToVM::Data::CodeCache_high_bound" : "CodeCache::_high_bound", Long.class, "address"); public final long aescryptEncryptBlockStub = getFieldValue("StubRoutines::_aescrypt_encryptBlock", Long.class, "address"); public final long aescryptDecryptBlockStub = getFieldValue("StubRoutines::_aescrypt_decryptBlock", Long.class, "address"); @@ -631,27 +732,27 @@ public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigBase { public final long updateBytesCRC32Stub = getFieldValue("StubRoutines::_updateBytesCRC32", Long.class, "address"); public final long crcTableAddress = getFieldValue("StubRoutines::_crc_table_adr", Long.class, "address"); - public final long sha1ImplCompress = getFieldValue("StubRoutines::_sha1_implCompress", Long.class, "address", 0L); - public final long sha1ImplCompressMultiBlock = getFieldValue("StubRoutines::_sha1_implCompressMB", Long.class, "address", 0L); - public final long sha256ImplCompress = getFieldValue("StubRoutines::_sha256_implCompress", Long.class, "address", 0L); - public final long sha256ImplCompressMultiBlock = getFieldValue("StubRoutines::_sha256_implCompressMB", Long.class, "address", 0L); - public final long sha512ImplCompress = getFieldValue("StubRoutines::_sha512_implCompress", Long.class, "address", 0L); - public final long sha512ImplCompressMultiBlock = getFieldValue("StubRoutines::_sha512_implCompressMB", Long.class, "address", 0L); - public final long multiplyToLen = getFieldValue("StubRoutines::_multiplyToLen", Long.class, "address", longRequiredOnAMD64); + public final long sha1ImplCompress = getFieldValue("StubRoutines::_sha1_implCompress", Long.class, "address"); + public final long sha1ImplCompressMultiBlock = getFieldValue("StubRoutines::_sha1_implCompressMB", Long.class, "address"); + public final long sha256ImplCompress = getFieldValue("StubRoutines::_sha256_implCompress", Long.class, "address"); + public final long sha256ImplCompressMultiBlock = getFieldValue("StubRoutines::_sha256_implCompressMB", Long.class, "address"); + public final long sha512ImplCompress = getFieldValue("StubRoutines::_sha512_implCompress", Long.class, "address"); + public final long sha512ImplCompressMultiBlock = getFieldValue("StubRoutines::_sha512_implCompressMB", Long.class, "address"); + public final long multiplyToLen = getFieldValue("StubRoutines::_multiplyToLen", Long.class, "address"); - public final long counterModeAESCrypt = getFieldValue("StubRoutines::_counterMode_AESCrypt", Long.class, "address", 0L); - public final long ghashProcessBlocks = getFieldValue("StubRoutines::_ghash_processBlocks", Long.class, "address", 0L); - public final long base64EncodeBlock = getFieldValue("StubRoutines::_base64_encodeBlock", Long.class, "address", 0L); - public final long crc32cTableTddr = getFieldValue("StubRoutines::_crc32c_table_addr", Long.class, "address", 0L); - public final long updateBytesCRC32C = getFieldValue("StubRoutines::_updateBytesCRC32C", Long.class, "address", 0L); - public final long updateBytesAdler32 = getFieldValue("StubRoutines::_updateBytesAdler32", Long.class, "address", 0L); - public final long squareToLen = getFieldValue("StubRoutines::_squareToLen", Long.class, "address", longRequiredOnAMD64); - public final long mulAdd = getFieldValue("StubRoutines::_mulAdd", Long.class, "address", longRequiredOnAMD64); - public final long montgomeryMultiply = getFieldValue("StubRoutines::_montgomeryMultiply", Long.class, "address", longRequiredOnAMD64); - public final long montgomerySquare = getFieldValue("StubRoutines::_montgomerySquare", Long.class, "address", longRequiredOnAMD64); - public final long vectorizedMismatch = getFieldValue("StubRoutines::_vectorizedMismatch", Long.class, "address", 0L); + public final long counterModeAESCrypt = getFieldValue("StubRoutines::_counterMode_AESCrypt", Long.class, "address", 0L, (JDK == 8 && !IS_OPENJDK) || JDK >= 9); + public final long ghashProcessBlocks = getFieldValue("StubRoutines::_ghash_processBlocks", Long.class, "address", 0L, isJDK8OrJDK11Plus); + public final long base64EncodeBlock = getFieldValue("StubRoutines::_base64_encodeBlock", Long.class, "address", 0L, isJDK11Plus); + public final long crc32cTableTddr = getFieldValue("StubRoutines::_crc32c_table_addr", Long.class, "address", 0L, isJDK11Plus); + public final long updateBytesCRC32C = getFieldValue("StubRoutines::_updateBytesCRC32C", Long.class, "address", 0L, isJDK11Plus); + public final long updateBytesAdler32 = getFieldValue("StubRoutines::_updateBytesAdler32", Long.class, "address", 0L, isJDK11Plus); + public final long squareToLen = getFieldValue("StubRoutines::_squareToLen", Long.class, "address"); + public final long mulAdd = getFieldValue("StubRoutines::_mulAdd", Long.class, "address"); + public final long montgomeryMultiply = getFieldValue("StubRoutines::_montgomeryMultiply", Long.class, "address"); + public final long montgomerySquare = getFieldValue("StubRoutines::_montgomerySquare", Long.class, "address"); + public final long vectorizedMismatch = getFieldValue("StubRoutines::_vectorizedMismatch", Long.class, "address", 0L, isJDK11Plus); - public final long throwDelayedStackOverflowErrorEntry = versioned.throwDelayedStackOverflowErrorEntry; + public final long throwDelayedStackOverflowErrorEntry = JDK <= 8 ? 0 : getFieldValue("StubRoutines::_throw_delayed_StackOverflowError_entry", Long.class, "address"); public final long jbyteArraycopy = getFieldValue("StubRoutines::_jbyte_arraycopy", Long.class, "address"); public final long jshortArraycopy = getFieldValue("StubRoutines::_jshort_arraycopy", Long.class, "address"); @@ -689,10 +790,10 @@ public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigBase { public final long dynamicNewInstanceAddress = getAddress("JVMCIRuntime::dynamic_new_instance"); // Allocation stubs that return null when allocation fails - public final long newInstanceOrNullAddress = getAddress("JVMCIRuntime::new_instance_or_null", 0L); - public final long newArrayOrNullAddress = getAddress("JVMCIRuntime::new_array_or_null", 0L); - public final long newMultiArrayOrNullAddress = getAddress("JVMCIRuntime::new_multi_array_or_null", 0L); - public final long dynamicNewInstanceOrNullAddress = getAddress("JVMCIRuntime::dynamic_new_instance_or_null", 0L); + public final long newInstanceOrNullAddress = getAddress("JVMCIRuntime::new_instance_or_null", 0L, JVMCI || JDK >= 12 || (!IS_OPENJDK && JDK == 11 && JDK_UPDATE >= 7)); + public final long newArrayOrNullAddress = getAddress("JVMCIRuntime::new_array_or_null", 0L, JVMCI || JDK >= 12 || (!IS_OPENJDK && JDK == 11 && JDK_UPDATE >= 7)); + public final long newMultiArrayOrNullAddress = getAddress("JVMCIRuntime::new_multi_array_or_null", 0L, JVMCI || JDK >= 12 || (!IS_OPENJDK && JDK == 11 && JDK_UPDATE >= 7)); + public final long dynamicNewInstanceOrNullAddress = getAddress("JVMCIRuntime::dynamic_new_instance_or_null", 0L, JVMCI || JDK >= 12 || (!IS_OPENJDK && JDK == 11 && JDK_UPDATE >= 7)); public boolean areNullAllocationStubsAvailable() { return newInstanceOrNullAddress != 0L; @@ -719,8 +820,8 @@ public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigBase { public final long exceptionHandlerForPcAddress = getAddress("JVMCIRuntime::exception_handler_for_pc"); public final long monitorenterAddress = getAddress("JVMCIRuntime::monitorenter"); public final long monitorexitAddress = getAddress("JVMCIRuntime::monitorexit"); - public final long notifyAddress = getAddress("JVMCIRuntime::object_notify", 0L); - public final long notifyAllAddress = getAddress("JVMCIRuntime::object_notifyAll", 0L); + public final long notifyAddress = getAddress("JVMCIRuntime::object_notify", 0L, JDK >= 11); + public final long notifyAllAddress = getAddress("JVMCIRuntime::object_notifyAll", 0L, JDK >= 11); public final long throwAndPostJvmtiExceptionAddress = getAddress("JVMCIRuntime::throw_and_post_jvmti_exception"); public final long throwKlassExternalNameExceptionAddress = getAddress("JVMCIRuntime::throw_klass_external_name_exception"); public final long throwClassCastExceptionAddress = getAddress("JVMCIRuntime::throw_class_cast_exception"); @@ -738,7 +839,7 @@ public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigBase { public final long registerFinalizerAddress = getAddress("SharedRuntime::register_finalizer"); public final long exceptionHandlerForReturnAddressAddress = getAddress("SharedRuntime::exception_handler_for_return_address"); public final long osrMigrationEndAddress = getAddress("SharedRuntime::OSR_migration_end"); - public final long enableStackReservedZoneAddress = versioned.enableStackReservedZoneAddress; + public final long enableStackReservedZoneAddress = JDK <= 8 ? 0 : getAddress("SharedRuntime::enable_stack_reserved_zone"); public final long javaTimeMillisAddress = getAddress("os::javaTimeMillis"); public final long javaTimeNanosAddress = getAddress("os::javaTimeNanos"); @@ -773,39 +874,43 @@ public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigBase { public final int deoptimizationUnrollBlockFramePcsOffset = getFieldOffset("Deoptimization::UnrollBlock::_frame_pcs", Integer.class, "address*"); public final int deoptimizationUnrollBlockInitialInfoOffset = getFieldOffset("Deoptimization::UnrollBlock::_initial_info", Integer.class, "intptr_t"); - public final boolean deoptimizationSupportLargeAccessByteArrayVirtualization = getConstant("Deoptimization::_support_large_access_byte_array_virtualization", Boolean.class, false); + // JDK-8231756, GR-16685 + public final boolean deoptimizationSupportLargeAccessByteArrayVirtualization = // + getConstant("Deoptimization::_support_large_access_byte_array_virtualization", Boolean.class, false, JVMCI || JDK >= 15); + + private static final boolean JDK_8245443 = ((JDK == 11 && JDK_UPDATE >= 8) || JDK >= 15); // Checkstyle: stop - public final int MARKID_VERIFIED_ENTRY = getConstant("CodeInstaller::VERIFIED_ENTRY", Integer.class); - public final int MARKID_UNVERIFIED_ENTRY = getConstant("CodeInstaller::UNVERIFIED_ENTRY", Integer.class); - public final int MARKID_OSR_ENTRY = getConstant("CodeInstaller::OSR_ENTRY", Integer.class); - public final int MARKID_EXCEPTION_HANDLER_ENTRY = getConstant("CodeInstaller::EXCEPTION_HANDLER_ENTRY", Integer.class); - public final int MARKID_DEOPT_HANDLER_ENTRY = getConstant("CodeInstaller::DEOPT_HANDLER_ENTRY", Integer.class); - public final int MARKID_INVOKEINTERFACE = getConstant("CodeInstaller::INVOKEINTERFACE", Integer.class); - public final int MARKID_INVOKEVIRTUAL = getConstant("CodeInstaller::INVOKEVIRTUAL", Integer.class); - public final int MARKID_INVOKESTATIC = getConstant("CodeInstaller::INVOKESTATIC", Integer.class); - public final int MARKID_INVOKESPECIAL = getConstant("CodeInstaller::INVOKESPECIAL", Integer.class); - public final int MARKID_INLINE_INVOKE = getConstant("CodeInstaller::INLINE_INVOKE", Integer.class); - public final int MARKID_POLL_NEAR = getConstant("CodeInstaller::POLL_NEAR", Integer.class); - public final int MARKID_POLL_RETURN_NEAR = getConstant("CodeInstaller::POLL_RETURN_NEAR", Integer.class); - public final int MARKID_POLL_FAR = getConstant("CodeInstaller::POLL_FAR", Integer.class); - public final int MARKID_POLL_RETURN_FAR = getConstant("CodeInstaller::POLL_RETURN_FAR", Integer.class); - public final int MARKID_CARD_TABLE_SHIFT = getConstant("CodeInstaller::CARD_TABLE_SHIFT", Integer.class); - public final int MARKID_CARD_TABLE_ADDRESS = getConstant("CodeInstaller::CARD_TABLE_ADDRESS", Integer.class); - public final int MARKID_INVOKE_INVALID = getConstant("CodeInstaller::INVOKE_INVALID", Integer.class); + public final int VERIFIED_ENTRY = getConstant("CodeInstaller::VERIFIED_ENTRY", Integer.class); + public final int UNVERIFIED_ENTRY = getConstant("CodeInstaller::UNVERIFIED_ENTRY", Integer.class); + public final int OSR_ENTRY = getConstant("CodeInstaller::OSR_ENTRY", Integer.class); + public final int EXCEPTION_HANDLER_ENTRY = getConstant("CodeInstaller::EXCEPTION_HANDLER_ENTRY", Integer.class); + public final int DEOPT_HANDLER_ENTRY = getConstant("CodeInstaller::DEOPT_HANDLER_ENTRY", Integer.class); + public final int FRAME_COMPLETE = getConstant("CodeInstaller::FRAME_COMPLETE", Integer.class, -1, (JVMCI ? jvmciGE(JVMCI_20_1_b01) : JDK_8245443)); + public final int INVOKEINTERFACE = getConstant("CodeInstaller::INVOKEINTERFACE", Integer.class); + public final int INVOKEVIRTUAL = getConstant("CodeInstaller::INVOKEVIRTUAL", Integer.class); + public final int INVOKESTATIC = getConstant("CodeInstaller::INVOKESTATIC", Integer.class); + public final int INVOKESPECIAL = getConstant("CodeInstaller::INVOKESPECIAL", Integer.class); + public final int INLINE_INVOKE = getConstant("CodeInstaller::INLINE_INVOKE", Integer.class); + public final int POLL_NEAR = getConstant("CodeInstaller::POLL_NEAR", Integer.class); + public final int POLL_RETURN_NEAR = getConstant("CodeInstaller::POLL_RETURN_NEAR", Integer.class); + public final int POLL_FAR = getConstant("CodeInstaller::POLL_FAR", Integer.class); + public final int POLL_RETURN_FAR = getConstant("CodeInstaller::POLL_RETURN_FAR", Integer.class); + public final int CARD_TABLE_SHIFT = getConstant("CodeInstaller::CARD_TABLE_SHIFT", Integer.class); + public final int CARD_TABLE_ADDRESS = getConstant("CodeInstaller::CARD_TABLE_ADDRESS", Integer.class); + public final int INVOKE_INVALID = getConstant("CodeInstaller::INVOKE_INVALID", Integer.class); + + public final boolean CPU_HAS_INTEL_JCC_ERRATUM = getFieldValue("VM_Version::_has_intel_jcc_erratum", Boolean.class, "bool", + true, "amd64".equals(osArch) && (JVMCI ? jvmciGE(JVMCI_20_1_b01) : JDK >= 15)); /** * The following constants are given default values here since they are missing in the native - * JVMCI-8 code but are still required for {@link GraalHotSpotVMConfigNode#canonical} to work in - * a JDK8 environment. + * JVMCI-8 code but are still required for {@link HotSpotMarkId} to work in a JDK8 environment. */ - public final int MARKID_HEAP_TOP_ADDRESS = getConstant("CodeInstaller::HEAP_TOP_ADDRESS", Integer.class, 17); - public final int MARKID_HEAP_END_ADDRESS = getConstant("CodeInstaller::HEAP_END_ADDRESS", Integer.class, 18); - public final int MARKID_NARROW_KLASS_BASE_ADDRESS = getConstant("CodeInstaller::NARROW_KLASS_BASE_ADDRESS", Integer.class, 19); - public final int MARKID_NARROW_OOP_BASE_ADDRESS = getConstant("CodeInstaller::NARROW_OOP_BASE_ADDRESS", Integer.class, 20); - public final int MARKID_CRC_TABLE_ADDRESS = getConstant("CodeInstaller::CRC_TABLE_ADDRESS", Integer.class, 21); - public final int MARKID_LOG_OF_HEAP_REGION_GRAIN_BYTES = getConstant("CodeInstaller::LOG_OF_HEAP_REGION_GRAIN_BYTES", Integer.class, 22); - public final int MARKID_INLINE_CONTIGUOUS_ALLOCATION_SUPPORTED = getConstant("CodeInstaller::INLINE_CONTIGUOUS_ALLOCATION_SUPPORTED", Integer.class, 23); + public final int NARROW_KLASS_BASE_ADDRESS = getConstant("CodeInstaller::NARROW_KLASS_BASE_ADDRESS", Integer.class, 19, JDK > 9); + public final int NARROW_OOP_BASE_ADDRESS = getConstant("CodeInstaller::NARROW_OOP_BASE_ADDRESS", Integer.class, 20, JDK > 9); + public final int CRC_TABLE_ADDRESS = getConstant("CodeInstaller::CRC_TABLE_ADDRESS", Integer.class, 21, JDK > 9); + public final int LOG_OF_HEAP_REGION_GRAIN_BYTES = getConstant("CodeInstaller::LOG_OF_HEAP_REGION_GRAIN_BYTES", Integer.class, 22, JDK > 9); // Checkstyle: resume diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfigAccess.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfigAccess.java new file mode 100644 index 00000000000..a247d7c79eb --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfigAccess.java @@ -0,0 +1,406 @@ +/* + * Copyright (c) 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.hotspot; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +import org.graalvm.compiler.debug.Assertions; +import org.graalvm.compiler.hotspot.JVMCIVersionCheck.Version; +import org.graalvm.compiler.hotspot.JVMCIVersionCheck.Version2; +import org.graalvm.compiler.hotspot.JVMCIVersionCheck.Version3; +import org.graalvm.compiler.serviceprovider.GraalServices; +import org.graalvm.compiler.serviceprovider.JavaVersionUtil; + +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.hotspot.HotSpotVMConfigAccess; +import jdk.vm.ci.hotspot.HotSpotVMConfigStore; +import jdk.vm.ci.hotspot.VMField; +import jdk.vm.ci.services.Services; + +/** + * Interposes on {@link HotSpotVMConfigAccess} to {@linkplain #isPresent check} when retrieving VM + * configuration values that they are only present in the VM iff expected to be. + */ +public class GraalHotSpotVMConfigAccess { + + protected final HotSpotVMConfigAccess access; + private final Map vmAddresses; + private final Map vmConstants; + private final Map vmFields; + + GraalHotSpotVMConfigAccess(HotSpotVMConfigStore store) { + this.access = new HotSpotVMConfigAccess(store); + this.vmAddresses = store.getAddresses(); + this.vmConstants = store.getConstants(); + this.vmFields = store.getFields(); + + String value = getProperty("os.name"); + switch (value) { + case "Linux": + value = "linux"; + break; + case "SunOS": + value = "solaris"; + break; + case "Mac OS X": + value = "darwin"; + break; + default: + // Of course Windows is different... + if (value.startsWith("Windows")) { + value = "windows"; + } else { + throw new JVMCIError("Unexpected OS name: " + value); + } + } + assert KNOWN_OS_NAMES.contains(value); + this.osName = value; + + String arch = getProperty("os.arch"); + switch (arch) { + case "x86_64": + arch = "amd64"; + break; + case "sparcv9": + arch = "sparc"; + break; + } + osArch = arch; + assert KNOWN_ARCHITECTURES.contains(arch) : arch; + } + + public HotSpotVMConfigStore getStore() { + return access.getStore(); + } + + protected static String getProperty(String name, String def) { + String value = Services.getSavedProperties().get(name); + if (value == null) { + return def; + } + return value; + } + + protected static String getProperty(String name) { + return getProperty(name, null); + } + + public static final Set KNOWN_ARCHITECTURES = new HashSet<>(Arrays.asList("amd64", "sparc", "aarch64")); + public static final Set KNOWN_OS_NAMES = new HashSet<>(Arrays.asList("windows", "linux", "darwin", "solaris")); + + /** + * Name for current OS. Will be a value in {@value #KNOWN_OS_NAMES}. + */ + public final String osName; + + /** + * Name for current CPU architecture. Will be a value in {@value #KNOWN_ARCHITECTURES}. + */ + public final String osArch; + + protected static final Version JVMCI_0_55 = new Version2(0, 55); + protected static final Version JVMCI_20_1_b01 = new Version3(20, 1, 1); + protected static final Version JVMCI_20_0_b03 = new Version3(20, 0, 3); + protected static final Version JVMCI_19_3_b03 = new Version3(19, 3, 3); + protected static final Version JVMCI_19_3_b04 = new Version3(19, 3, 4); + protected static final Version JVMCI_19_3_b07 = new Version3(19, 3, 7); + + public static boolean jvmciGE(Version v) { + return JVMCI_PRERELEASE || !JVMCI_VERSION.isLessThan(v); + } + + public static final int JDK = JavaVersionUtil.JAVA_SPEC; + public static final int JDK_UPDATE = GraalServices.getJavaUpdateVersion(); + public static final boolean IS_OPENJDK = getProperty("java.vm.name", "").startsWith("OpenJDK"); + public static final Version JVMCI_VERSION; + public static final boolean JVMCI; + public static final boolean JVMCI_PRERELEASE; + static { + String vmVersion = getProperty("java.vm.version"); + JVMCI_VERSION = Version.parse(vmVersion); + JVMCI_PRERELEASE = vmVersion.contains("SNAPSHOT") || vmVersion.contains("internal") || vmVersion.contains("-dev"); + JVMCI = JVMCI_VERSION != null || JVMCI_PRERELEASE; + } + + private final List missing = new ArrayList<>(); + private final List unexpected = new ArrayList<>(); + + /** + * Records an error if {@code map.contains(name) != expectPresent}. That is, it's an error if + * {@code value} is unexpectedly present in the VM or is unexpectedly absent from the VM. + * + * @param expectPresent the expectation that the value is present in the VM + */ + private boolean isPresent(String name, Map map, boolean expectPresent) { + if (map.containsKey(name)) { + if (!expectPresent) { + recordError(name, unexpected, String.valueOf(map.get(name))); + } + return true; + } + if (expectPresent) { + recordError(name, missing, null); + } + + return false; + } + + // Only defer errors while in the GraalHotSpotVMConfig + // constructor until reportErrors() is called. + private boolean deferErrors = this instanceof GraalHotSpotVMConfig; + + private void recordError(String name, List list, String unexpectedValue) { + if (JVMCI_PRERELEASE) { + return; + } + String message = name; + if (deferErrors) { + StackTraceElement[] trace = new Exception().getStackTrace(); + for (StackTraceElement e : trace) { + if (e.getClassName().equals(GraalHotSpotVMConfigAccess.class.getName())) { + // Skip methods in GraalHotSpotVMConfigAccess + continue; + } + // Looking for the field assignment in a constructor + if (e.getMethodName().equals("")) { + message += " at " + e; + break; + } + } + } + if (unexpectedValue != null) { + message += " [value: " + unexpectedValue + "]"; + } + list.add(message); + if (!deferErrors) { + reportErrors(); + } + } + + protected void reportErrors() { + deferErrors = false; + if (!missing.isEmpty() || !unexpected.isEmpty()) { + String jvmci = JVMCI_VERSION == null ? "" : " jvmci-" + JVMCI_VERSION; + String runtime = String.format("JDK %d%s %s-%s (java.home=%s, java.vm.name=%s, java.vm.version=%s)", + JDK, jvmci, osName, osArch, + getProperty("java.home"), + getProperty("java.vm.name"), + getProperty("java.vm.version")); + List messages = new ArrayList<>(); + if (!missing.isEmpty()) { + messages.add(String.format("VM config values missing that should be present in %s:%n %s", runtime, + missing.stream().sorted().collect(Collectors.joining(System.lineSeparator() + " ")))); + } + if (!unexpected.isEmpty()) { + messages.add(String.format("VM config values not expected to be present in %s:%n %s", runtime, + unexpected.stream().sorted().collect(Collectors.joining(System.lineSeparator() + " ")))); + } + throw new JVMCIError(String.join(System.lineSeparator(), messages)); + } + } + + /** + * @see HotSpotVMConfigAccess#getAddress(String, Long) + */ + public long getAddress(String name, Long notPresent, boolean expectPresent) { + if (isPresent(name, vmAddresses, expectPresent)) { + return access.getAddress(name, notPresent); + } + return notPresent; + } + + /** + * @see HotSpotVMConfigAccess#getAddress(String) + */ + public long getAddress(String name) { + if (isPresent(name, vmAddresses, true)) { + return access.getAddress(name, 0L); + } + return 0L; + } + + /** + * @see HotSpotVMConfigAccess#getConstant(String, Class, Object) + */ + public T getConstant(String name, Class type, T notPresent, boolean expectPresent) { + if (isPresent(name, vmConstants, expectPresent)) { + return access.getConstant(name, type, notPresent); + } + return notPresent; + } + + /** + * @see HotSpotVMConfigAccess#getConstant(String, Class) + */ + public T getConstant(String name, Class type) { + if (isPresent(name, vmConstants, true)) { + return access.getConstant(name, type); + } + return getDefault(type); + } + + /** + * @see HotSpotVMConfigAccess#getFieldOffset(String, Class, String, Object) + */ + public T getFieldOffset(String name, Class type, String cppType, T notPresent, boolean expectPresent) { + if (isPresent(name, vmFields, expectPresent)) { + return access.getFieldOffset(name, type, cppType, notPresent); + } + return notPresent; + } + + /** + * @see HotSpotVMConfigAccess#getFieldOffset(String, Class, String) + */ + public T getFieldOffset(String name, Class type, String cppType) { + if (isPresent(name, vmFields, true)) { + return access.getFieldOffset(name, type, cppType); + } + return getDefault(type); + } + + /** + * @see HotSpotVMConfigAccess#getFieldOffset(String, Class) + */ + public T getFieldOffset(String name, Class type) { + if (isPresent(name, vmFields, true)) { + return access.getFieldOffset(name, type); + } + return getDefault(type); + } + + /** + * @see HotSpotVMConfigAccess#getFieldAddress(String, String) + */ + public long getFieldAddress(String name, String cppType) { + if (isPresent(name, vmFields, true)) { + return access.getFieldAddress(name, cppType); + } + return 0L; + } + + /** + * @see HotSpotVMConfigAccess#getFieldValue(String, Class, String, Object) + */ + public T getFieldValue(String name, Class type, String cppType, T notPresent, boolean expectPresent) { + if (isPresent(name, vmFields, expectPresent)) { + return access.getFieldValue(name, type, cppType, notPresent); + } + return notPresent; + } + + /** + * @see HotSpotVMConfigAccess#getFieldValue(String, Class, String) + */ + public T getFieldValue(String name, Class type, String cppType) { + if (isPresent(name, vmFields, true)) { + return access.getFieldValue(name, type, cppType); + } + return getDefault(type); + } + + /** + * @see HotSpotVMConfigAccess#getFieldValue(String, Class) + */ + public T getFieldValue(String name, Class type) { + if (isPresent(name, vmFields, true)) { + return access.getFieldValue(name, type); + } + return getDefault(type); + } + + /** + * @see HotSpotVMConfigAccess#getFlag(String, Class) + */ + public T getFlag(String name, Class type) { + try { + return access.getFlag(name, type); + } catch (JVMCIError e) { + recordError(name, missing, null); + return getDefault(type); + } + } + + /** + * @see HotSpotVMConfigAccess#getFlag(String, Class, Object) + */ + @SuppressWarnings("deprecation") + public T getFlag(String name, Class type, T notPresent, boolean expectPresent) { + if (expectPresent) { + return getFlag(name, type); + } + if (Assertions.assertionsEnabled()) { + // There's more overhead for checking unexpectedly + // present flag values due to the fact that a VM call + // not exposed by JVMCI is needed to determine whether + // a flag value is available. As such, only pay the + // overhead when running with assertions enabled. + T sentinel; + if (type == Boolean.class) { + sentinel = type.cast(new Boolean(false)); + } else if (type == Byte.class) { + sentinel = type.cast(new Byte((byte) 123)); + } else if (type == Integer.class) { + sentinel = type.cast(new Integer(1234567890)); + } else if (type == Long.class) { + sentinel = type.cast(new Long(1234567890987654321L)); + } else if (type == String.class) { + sentinel = type.cast(new String("1234567890987654321")); + } else { + throw new JVMCIError("Unsupported flag type: " + type.getName()); + } + T value = access.getFlag(name, type, sentinel); + if (value != sentinel) { + recordError(name, unexpected, String.valueOf(value)); + } + } + return access.getFlag(name, type, notPresent); + } + + private static T getDefault(Class type) { + if (type == Boolean.class) { + return type.cast(Boolean.FALSE); + } + if (type == Byte.class) { + return type.cast(Byte.valueOf((byte) 0)); + } + if (type == Integer.class) { + return type.cast(Integer.valueOf(0)); + } + if (type == Long.class) { + return type.cast(Long.valueOf(0)); + } + if (type == String.class) { + return type.cast(null); + } + throw new JVMCIError("Unsupported VM config value type: " + type.getName()); + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfigBase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfigBase.java deleted file mode 100644 index 6ed2d6b5df0..00000000000 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfigBase.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Copyright (c) 2011, 2020, 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. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -package org.graalvm.compiler.hotspot; - -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; - -import org.graalvm.compiler.api.replacements.Fold; -import org.graalvm.compiler.api.replacements.Fold.InjectedParameter; -import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext; -import org.graalvm.compiler.options.OptionValues; - -import jdk.vm.ci.common.JVMCIError; -import jdk.vm.ci.hotspot.HotSpotVMConfigAccess; -import jdk.vm.ci.hotspot.HotSpotVMConfigStore; -import jdk.vm.ci.meta.MetaAccessProvider; -import jdk.vm.ci.services.Services; - -/** - * Base class of class hierarchy for accessing HotSpot VM configuration. - */ -public abstract class GraalHotSpotVMConfigBase extends HotSpotVMConfigAccess { - - GraalHotSpotVMConfigBase(HotSpotVMConfigStore store) { - super(store); - assert this instanceof GraalHotSpotVMConfig; - versioned = new GraalHotSpotVMConfigVersioned(store); - assert checkVersioned(); - } - - private boolean checkVersioned() { - Class c = versioned.getClass(); - for (Field field : c.getDeclaredFields()) { - int modifiers = field.getModifiers(); - if (!Modifier.isStatic(modifiers)) { - // javac inlines non-static final fields which means - // versioned values are ignored in non-flattened Graal - assert !Modifier.isFinal(modifiers) : "Non-static field in " + c.getName() + " must not be final: " + field.getName(); - } - } - return true; - } - - private static String getProperty(String name, String def) { - String value = Services.getSavedProperties().get(name); - if (value == null) { - return def; - } - return value; - } - - private static String getProperty(String name) { - return getProperty(name, null); - } - - /** - * Contains values that are different between JDK versions. - */ - protected final GraalHotSpotVMConfigVersioned versioned; - - /** - * Sentinel value to use for an {@linkplain InjectedParameter injected} - * {@link GraalHotSpotVMConfig} parameter to a {@linkplain Fold foldable} method. - */ - public static final GraalHotSpotVMConfig INJECTED_VMCONFIG = null; - public static final MetaAccessProvider INJECTED_METAACCESS = null; - public static final OptionValues INJECTED_OPTIONVALUES = null; - public static final IntrinsicContext INJECTED_INTRINSIC_CONTEXT = null; - - public final String osName = getHostOSName(); - public final String osArch = getHostArchitectureName(); - public final boolean windowsOs = getProperty("os.name", "").startsWith("Windows"); - public final boolean linuxOs = getProperty("os.name", "").startsWith("Linux"); - - /** - * Gets the host operating system name. - */ - private static String getHostOSName() { - String osName = getProperty("os.name"); - switch (osName) { - case "Linux": - osName = "linux"; - break; - case "Mac OS X": - osName = "bsd"; - break; - default: - // Of course Windows is different... - if (osName.startsWith("Windows")) { - osName = "windows"; - } else { - throw new JVMCIError("Unexpected OS name: " + osName); - } - } - return osName; - } - - private static String getHostArchitectureName() { - String arch = getProperty("os.arch"); - switch (arch) { - case "x86_64": - arch = "amd64"; - break; - } - return arch; - } - - protected final Integer intRequiredOnAMD64 = osArch.equals("amd64") ? null : 0; - protected final Long longRequiredOnAMD64 = osArch.equals("amd64") ? null : 0L; -} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfigVersioned.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfigVersioned.java deleted file mode 100644 index 08e05884553..00000000000 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfigVersioned.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright (c) 2019, 2020, 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. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -package org.graalvm.compiler.hotspot; - -import jdk.vm.ci.hotspot.HotSpotVMConfigAccess; -import jdk.vm.ci.hotspot.HotSpotVMConfigStore; - -/** - * This is a source with different versions for various JDKs. When modifying/adding a field in this - * class accessed from outside this class, be sure to update the field appropriately in all source - * files named {@code GraalHotSpotVMConfigVersioned.java}. - * - * Fields are grouped according to the most recent JBS issue showing why they are versioned. - * - * JDK Version: 15+ - */ -final class GraalHotSpotVMConfigVersioned extends HotSpotVMConfigAccess { - - GraalHotSpotVMConfigVersioned(HotSpotVMConfigStore store) { - super(store); - } - - // JDK-8210848 - boolean inlineNotify = true; - - // JDK-8073583 - boolean useCRC32CIntrinsics = getFlag("UseCRC32CIntrinsics", Boolean.class); - - // JDK-8046936 - int javaThreadReservedStackActivationOffset = getFieldOffset("JavaThread::_reserved_stack_activation", Integer.class, "address"); - int methodFlagsOffset = getFieldOffset("Method::_flags", Integer.class, "u2"); - long throwDelayedStackOverflowErrorEntry = getFieldValue("StubRoutines::_throw_delayed_StackOverflowError_entry", Long.class, "address"); - long enableStackReservedZoneAddress = getAddress("SharedRuntime::enable_stack_reserved_zone"); - - // JDK-8135085 - int methodIntrinsicIdOffset = getFieldOffset("Method::_intrinsic_id", Integer.class, "u2"); - - // JDK-8151956 - int methodCodeOffset = getFieldOffset("Method::_code", Integer.class, "CompiledMethod*"); - - // JDK-8059606 - int invocationCounterIncrement = getConstant("InvocationCounter::count_increment", Integer.class); - int invocationCounterShift = getConstant("InvocationCounter::count_shift", Integer.class); - - // JDK-8195142 - byte dirtyCardValue = getConstant("CardTable::dirty_card", Byte.class); - byte g1YoungCardValue = getConstant("G1CardTable::g1_young_gen", Byte.class); - - // JDK-8201318 - int g1SATBQueueMarkingOffset = getConstant("G1ThreadLocalData::satb_mark_queue_active_offset", Integer.class); - int g1SATBQueueIndexOffset = getConstant("G1ThreadLocalData::satb_mark_queue_index_offset", Integer.class); - int g1SATBQueueBufferOffset = getConstant("G1ThreadLocalData::satb_mark_queue_buffer_offset", Integer.class); - int g1CardQueueIndexOffset = getConstant("G1ThreadLocalData::dirty_card_queue_index_offset", Integer.class); - int g1CardQueueBufferOffset = getConstant("G1ThreadLocalData::dirty_card_queue_buffer_offset", Integer.class); - - // JDK-8033552 - long heapTopAddress = getFieldValue("CompilerToVM::Data::_heap_top_addr", Long.class, "HeapWord* volatile*"); - - // JDK-8015774 - long codeCacheLowBound = getFieldValue("CodeCache::_low_bound", Long.class, "address"); - long codeCacheHighBound = getFieldValue("CodeCache::_high_bound", Long.class, "address"); - - // JDK-8229258 - String markWordClassName = "markWord"; - String markWordFieldType = "markWord"; - - // JDK-8186777 - int classMirrorOffset = getFieldOffset("Klass::_java_mirror", Integer.class, "OopHandle"); - boolean classMirrorIsHandle = true; - - // JDK-8220049 - boolean threadLocalHandshakes = true; - - // JDK-8236224 - boolean compactFields = true; - int fieldsAllocationStyle = 1; -} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java index 584660e8949..9a994a1f8b3 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -24,7 +24,16 @@ package org.graalvm.compiler.hotspot; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.LEAF; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.NO_LOCATIONS; +import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.TLAB_END_LOCATION; +import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.TLAB_TOP_LOCATION; import static org.graalvm.compiler.replacements.arraycopy.ArrayCopyForeignCalls.UNSAFE_ARRAYCOPY; +import static jdk.internal.vm.compiler.word.LocationIdentity.any; import java.util.EnumSet; @@ -37,9 +46,11 @@ import org.graalvm.compiler.core.common.CompilationIdentifier; import org.graalvm.compiler.core.common.cfg.AbstractBlockBase; import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; +import org.graalvm.compiler.core.common.spi.ForeignCallSignature; import org.graalvm.compiler.core.target.Backend; import org.graalvm.compiler.graph.Node.ConstantNodeParameter; import org.graalvm.compiler.graph.Node.NodeIntrinsic; +import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; import org.graalvm.compiler.hotspot.meta.HotSpotProviders; import org.graalvm.compiler.hotspot.nodes.VMErrorNode; import org.graalvm.compiler.hotspot.nodes.aot.ResolveConstantStubCall; @@ -66,6 +77,7 @@ import org.graalvm.compiler.lir.StandardOp.SaveRegistersOp; import org.graalvm.compiler.lir.ValueConsumer; import org.graalvm.compiler.lir.asm.CompilationResultBuilder; import org.graalvm.compiler.lir.framemap.FrameMap; +import org.graalvm.compiler.nodes.NamedLocationIdentity; import org.graalvm.compiler.nodes.UnwindNode; import org.graalvm.compiler.nodes.extended.ForeignCallNode; import org.graalvm.compiler.options.Option; @@ -75,6 +87,7 @@ import org.graalvm.compiler.options.OptionValues; import org.graalvm.compiler.phases.tiers.SuitesProvider; import org.graalvm.compiler.serviceprovider.JavaVersionUtil; import org.graalvm.compiler.word.Word; +import jdk.internal.vm.compiler.word.LocationIdentity; import jdk.internal.vm.compiler.word.Pointer; import jdk.vm.ci.code.CallingConvention; @@ -87,6 +100,7 @@ import jdk.vm.ci.hotspot.HotSpotCompilationRequest; import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod; import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.ResolvedJavaMethod; import jdk.vm.ci.meta.Value; import jdk.vm.ci.runtime.JVMCICompiler; @@ -108,70 +122,80 @@ public abstract class HotSpotBackend extends Backend implements FrameMap.Referen /** * Descriptor for {@link ExceptionHandlerStub}. This stub is called by the - * {@linkplain GraalHotSpotVMConfig#MARKID_EXCEPTION_HANDLER_ENTRY exception handler} in a - * compiled method. + * {@linkplain HotSpotMarkId#EXCEPTION_HANDLER_ENTRY exception handler} in a compiled method. */ - public static final ForeignCallDescriptor EXCEPTION_HANDLER = new ForeignCallDescriptor("exceptionHandler", void.class, Object.class, Word.class); + public static final HotSpotForeignCallDescriptor EXCEPTION_HANDLER = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, any(), "exceptionHandler", void.class, Object.class, + Word.class); /** * Descriptor for SharedRuntime::get_ic_miss_stub(). */ - public static final ForeignCallDescriptor IC_MISS_HANDLER = new ForeignCallDescriptor("icMissHandler", void.class); + public static final HotSpotForeignCallDescriptor IC_MISS_HANDLER = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS, "icMissHandler", void.class); /** * Descriptor for SharedRuntime::get_handle_wrong_method_stub(). */ - public static final ForeignCallDescriptor WRONG_METHOD_HANDLER = new ForeignCallDescriptor("wrongMethodHandler", void.class); + public static final HotSpotForeignCallDescriptor WRONG_METHOD_HANDLER = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS, "wrongMethodHandler", void.class); /** * Descriptor for {@link UnwindExceptionToCallerStub}. This stub is called by code generated * from {@link UnwindNode}. */ - public static final ForeignCallDescriptor UNWIND_EXCEPTION_TO_CALLER = new ForeignCallDescriptor("unwindExceptionToCaller", void.class, Object.class, Word.class); + public static final HotSpotForeignCallDescriptor UNWIND_EXCEPTION_TO_CALLER = new HotSpotForeignCallDescriptor(SAFEPOINT, NOT_REEXECUTABLE, any(), "unwindExceptionToCaller", void.class, + Object.class, Word.class); /** * Descriptor for the arguments when unwinding to an exception handler in a caller. */ - public static final ForeignCallDescriptor EXCEPTION_HANDLER_IN_CALLER = new ForeignCallDescriptor("exceptionHandlerInCaller", void.class, Object.class, Word.class); + public static final HotSpotForeignCallDescriptor EXCEPTION_HANDLER_IN_CALLER = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, any(), "exceptionHandlerInCaller", + void.class, Object.class, Word.class); private final HotSpotGraalRuntimeProvider runtime; /** * @see AESCryptSubstitutions#encryptBlockStub(ForeignCallDescriptor, Word, Word, Pointer) */ - public static final ForeignCallDescriptor ENCRYPT_BLOCK = new ForeignCallDescriptor("encrypt_block", void.class, Word.class, Word.class, Pointer.class); + public static final HotSpotForeignCallDescriptor ENCRYPT_BLOCK = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Byte), "encrypt_block", + void.class, Word.class, Word.class, Pointer.class); /** * @see AESCryptSubstitutions#decryptBlockStub(ForeignCallDescriptor, Word, Word, Pointer) */ - public static final ForeignCallDescriptor DECRYPT_BLOCK = new ForeignCallDescriptor("decrypt_block", void.class, Word.class, Word.class, Pointer.class); + public static final HotSpotForeignCallDescriptor DECRYPT_BLOCK = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Byte), "decrypt_block", + void.class, Word.class, Word.class, Pointer.class); /** * @see AESCryptSubstitutions#decryptBlockStub(ForeignCallDescriptor, Word, Word, Pointer) */ - public static final ForeignCallDescriptor DECRYPT_BLOCK_WITH_ORIGINAL_KEY = new ForeignCallDescriptor("decrypt_block_with_original_key", void.class, Word.class, Word.class, Pointer.class, + public static final HotSpotForeignCallDescriptor DECRYPT_BLOCK_WITH_ORIGINAL_KEY = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Byte), + "decrypt_block_with_original_key", void.class, Word.class, Word.class, Pointer.class, Pointer.class); /** * @see CipherBlockChainingSubstitutions#crypt */ - public static final ForeignCallDescriptor ENCRYPT = new ForeignCallDescriptor("encrypt", void.class, Word.class, Word.class, Pointer.class, Pointer.class, int.class); + public static final HotSpotForeignCallDescriptor ENCRYPT = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Byte), "encrypt", void.class, + Word.class, Word.class, Pointer.class, Pointer.class, int.class); /** * @see CipherBlockChainingSubstitutions#crypt */ - public static final ForeignCallDescriptor DECRYPT = new ForeignCallDescriptor("decrypt", void.class, Word.class, Word.class, Pointer.class, Pointer.class, int.class); + public static final HotSpotForeignCallDescriptor DECRYPT = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Byte), "decrypt", void.class, + Word.class, Word.class, Pointer.class, Pointer.class, int.class); /** * @see CipherBlockChainingSubstitutions#crypt */ - public static final ForeignCallDescriptor DECRYPT_WITH_ORIGINAL_KEY = new ForeignCallDescriptor("decrypt_with_original_key", void.class, Word.class, Word.class, Pointer.class, Pointer.class, + public static final HotSpotForeignCallDescriptor DECRYPT_WITH_ORIGINAL_KEY = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Byte), + "decrypt_with_original_key", void.class, Word.class, Word.class, Pointer.class, Pointer.class, int.class, Pointer.class); /** * @see BigIntegerSubstitutions#multiplyToLen */ - public static final ForeignCallDescriptor MULTIPLY_TO_LEN = new ForeignCallDescriptor("multiplyToLen", void.class, Word.class, int.class, Word.class, int.class, Word.class, int.class); + public static final HotSpotForeignCallDescriptor MULTIPLY_TO_LEN = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Int), + "multiplyToLen", + void.class, Word.class, int.class, Word.class, int.class, Word.class, int.class); public static void multiplyToLenStub(Word xAddr, int xlen, Word yAddr, int ylen, Word zAddr, int zLen) { multiplyToLenStub(HotSpotBackend.MULTIPLY_TO_LEN, xAddr, xlen, yAddr, ylen, zAddr, zLen); @@ -183,7 +207,9 @@ public abstract class HotSpotBackend extends Backend implements FrameMap.Referen /** * @see BigIntegerSubstitutions#mulAdd */ - public static final ForeignCallDescriptor MUL_ADD = new ForeignCallDescriptor("mulAdd", int.class, Word.class, Word.class, int.class, int.class, int.class); + public static final HotSpotForeignCallDescriptor MUL_ADD = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Int), "mulAdd", + int.class, + Word.class, Word.class, int.class, int.class, int.class); public static int mulAddStub(Word inAddr, Word outAddr, int newOffset, int len, int k) { return mulAddStub(HotSpotBackend.MUL_ADD, inAddr, outAddr, newOffset, len, k); @@ -195,7 +221,8 @@ public abstract class HotSpotBackend extends Backend implements FrameMap.Referen /** * @see BigIntegerSubstitutions#implMontgomeryMultiply */ - public static final ForeignCallDescriptor MONTGOMERY_MULTIPLY = new ForeignCallDescriptor("implMontgomeryMultiply", void.class, Word.class, Word.class, Word.class, int.class, long.class, + public static final HotSpotForeignCallDescriptor MONTGOMERY_MULTIPLY = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Int), + "implMontgomeryMultiply", void.class, Word.class, Word.class, Word.class, int.class, long.class, Word.class); public static void implMontgomeryMultiply(Word aAddr, Word bAddr, Word nAddr, int len, long inv, Word productAddr) { @@ -208,7 +235,8 @@ public abstract class HotSpotBackend extends Backend implements FrameMap.Referen /** * @see BigIntegerSubstitutions#implMontgomerySquare */ - public static final ForeignCallDescriptor MONTGOMERY_SQUARE = new ForeignCallDescriptor("implMontgomerySquare", void.class, Word.class, Word.class, int.class, long.class, Word.class); + public static final HotSpotForeignCallDescriptor MONTGOMERY_SQUARE = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Int), + "implMontgomerySquare", void.class, Word.class, Word.class, int.class, long.class, Word.class); public static void implMontgomerySquare(Word aAddr, Word nAddr, int len, long inv, Word productAddr) { implMontgomerySquare(HotSpotBackend.MONTGOMERY_SQUARE, aAddr, nAddr, len, inv, productAddr); @@ -220,7 +248,9 @@ public abstract class HotSpotBackend extends Backend implements FrameMap.Referen /** * @see BigIntegerSubstitutions#implSquareToLen */ - public static final ForeignCallDescriptor SQUARE_TO_LEN = new ForeignCallDescriptor("implSquareToLen", void.class, Word.class, int.class, Word.class, int.class); + public static final HotSpotForeignCallDescriptor SQUARE_TO_LEN = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Int), + "implSquareToLen", + void.class, Word.class, int.class, Word.class, int.class); public static void implSquareToLen(Word xAddr, int len, Word zAddr, int zLen) { implSquareToLen(SQUARE_TO_LEN, xAddr, len, zAddr, zLen); @@ -232,7 +262,8 @@ public abstract class HotSpotBackend extends Backend implements FrameMap.Referen /** * @see SHASubstitutions#implCompress0 */ - public static final ForeignCallDescriptor SHA_IMPL_COMPRESS = new ForeignCallDescriptor("shaImplCompress", void.class, Word.class, Object.class); + public static final HotSpotForeignCallDescriptor SHA_IMPL_COMPRESS = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, any(), "shaImplCompress", void.class, Word.class, + Object.class); public static void shaImplCompressStub(Word bufAddr, Object state) { shaImplCompressStub(HotSpotBackend.SHA_IMPL_COMPRESS, bufAddr, state); @@ -244,7 +275,8 @@ public abstract class HotSpotBackend extends Backend implements FrameMap.Referen /** * @see SHA2Substitutions#implCompress0 */ - public static final ForeignCallDescriptor SHA2_IMPL_COMPRESS = new ForeignCallDescriptor("sha2ImplCompress", void.class, Word.class, Object.class); + public static final HotSpotForeignCallDescriptor SHA2_IMPL_COMPRESS = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, any(), "sha2ImplCompress", void.class, Word.class, + Object.class); public static void sha2ImplCompressStub(Word bufAddr, Object state) { sha2ImplCompressStub(HotSpotBackend.SHA2_IMPL_COMPRESS, bufAddr, state); @@ -256,7 +288,8 @@ public abstract class HotSpotBackend extends Backend implements FrameMap.Referen /** * @see SHA5Substitutions#implCompress0 */ - public static final ForeignCallDescriptor SHA5_IMPL_COMPRESS = new ForeignCallDescriptor("sha5ImplCompress", void.class, Word.class, Object.class); + public static final HotSpotForeignCallDescriptor SHA5_IMPL_COMPRESS = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, any(), "sha5ImplCompress", void.class, Word.class, + Object.class); public static void sha5ImplCompressStub(Word bufAddr, Object state) { sha5ImplCompressStub(HotSpotBackend.SHA5_IMPL_COMPRESS, bufAddr, state); @@ -268,7 +301,8 @@ public abstract class HotSpotBackend extends Backend implements FrameMap.Referen /** * @see DigestBaseSubstitutions#implCompressMultiBlock0 */ - public static final ForeignCallDescriptor SHA_IMPL_COMPRESS_MB = new ForeignCallDescriptor("shaImplCompressMB", int.class, Word.class, Object.class, int.class, int.class); + public static final HotSpotForeignCallDescriptor SHA_IMPL_COMPRESS_MB = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, any(), "shaImplCompressMB", int.class, Word.class, + Object.class, int.class, int.class); public static int shaImplCompressMBStub(Word bufAddr, Object stateAddr, int ofs, int limit) { return shaImplCompressMBStub(HotSpotBackend.SHA_IMPL_COMPRESS_MB, bufAddr, stateAddr, ofs, limit); @@ -277,7 +311,8 @@ public abstract class HotSpotBackend extends Backend implements FrameMap.Referen @NodeIntrinsic(ForeignCallNode.class) private static native int shaImplCompressMBStub(@ConstantNodeParameter ForeignCallDescriptor descriptor, Word bufAddr, Object state, int ofs, int limit); - public static final ForeignCallDescriptor SHA2_IMPL_COMPRESS_MB = new ForeignCallDescriptor("sha2ImplCompressMB", int.class, Word.class, Object.class, int.class, int.class); + public static final HotSpotForeignCallDescriptor SHA2_IMPL_COMPRESS_MB = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, any(), "sha2ImplCompressMB", int.class, Word.class, + Object.class, int.class, int.class); public static int sha2ImplCompressMBStub(Word bufAddr, Object stateAddr, int ofs, int limit) { return sha2ImplCompressMBStub(HotSpotBackend.SHA2_IMPL_COMPRESS_MB, bufAddr, stateAddr, ofs, limit); @@ -286,7 +321,8 @@ public abstract class HotSpotBackend extends Backend implements FrameMap.Referen @NodeIntrinsic(ForeignCallNode.class) private static native int sha2ImplCompressMBStub(@ConstantNodeParameter ForeignCallDescriptor descriptor, Word bufAddr, Object state, int ofs, int limit); - public static final ForeignCallDescriptor SHA5_IMPL_COMPRESS_MB = new ForeignCallDescriptor("sha5ImplCompressMB", int.class, Word.class, Object.class, int.class, int.class); + public static final HotSpotForeignCallDescriptor SHA5_IMPL_COMPRESS_MB = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, any(), "sha5ImplCompressMB", int.class, Word.class, + Object.class, int.class, int.class); public static int sha5ImplCompressMBStub(Word bufAddr, Object stateAddr, int ofs, int limit) { return sha5ImplCompressMBStub(HotSpotBackend.SHA5_IMPL_COMPRESS_MB, bufAddr, stateAddr, ofs, limit); @@ -300,22 +336,25 @@ public abstract class HotSpotBackend extends Backend implements FrameMap.Referen } @NodeIntrinsic(ForeignCallNode.class) - private static native void unsafeArraycopyStub(@ConstantNodeParameter ForeignCallDescriptor descriptor, Word srcAddr, Word dstAddr, Word size); + private static native void unsafeArraycopyStub(@ConstantNodeParameter ForeignCallSignature descriptor, Word srcAddr, Word dstAddr, Word size); /** * Descriptor for {@code StubRoutines::_ghash_processBlocks}. */ - public static final ForeignCallDescriptor GHASH_PROCESS_BLOCKS = new ForeignCallDescriptor("ghashProcessBlocks", void.class, Word.class, Word.class, Word.class, int.class); + public static final HotSpotForeignCallDescriptor GHASH_PROCESS_BLOCKS = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, any(), "ghashProcessBlocks", void.class, Word.class, + Word.class, Word.class, int.class); /** * Descriptor for {@code StubRoutines::_base64_encodeBlock}. */ - public static final ForeignCallDescriptor BASE64_ENCODE_BLOCK = new ForeignCallDescriptor("base64EncodeBlock", void.class, Word.class, int.class, int.class, Word.class, int.class, boolean.class); + public static final HotSpotForeignCallDescriptor BASE64_ENCODE_BLOCK = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, any(), "base64EncodeBlock", void.class, Word.class, + int.class, int.class, Word.class, int.class, boolean.class); /** * Descriptor for {@code StubRoutines::_counterMode_AESCrypt}. */ - public static final ForeignCallDescriptor COUNTERMODE_IMPL_CRYPT = new ForeignCallDescriptor("counterModeAESCrypt", int.class, Word.class, Word.class, Word.class, Word.class, int.class, + public static final HotSpotForeignCallDescriptor COUNTERMODE_IMPL_CRYPT = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, any(), "counterModeAESCrypt", int.class, + Word.class, Word.class, Word.class, Word.class, int.class, Word.class, Word.class); public static int counterModeAESCrypt(Word srcAddr, Word dstAddr, Word kPtr, Word cntPtr, int len, Word encCntPtr, Word used) { @@ -329,7 +368,8 @@ public abstract class HotSpotBackend extends Backend implements FrameMap.Referen /** * Descriptor for {@code StubRoutines::_vectorizedMismatch}. */ - public static final ForeignCallDescriptor VECTORIZED_MISMATCHED = new ForeignCallDescriptor("vectorizedMismatch", int.class, Word.class, Word.class, int.class, int.class); + public static final HotSpotForeignCallDescriptor VECTORIZED_MISMATCHED = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, any(), "vectorizedMismatch", int.class, Word.class, + Word.class, int.class, int.class); public static int vectorizedMismatch(Word aAddr, Word bAddr, int length, int log2ArrayIndexScale) { return vectorizedMismatchStub(VECTORIZED_MISMATCHED, aAddr, bAddr, length, log2ArrayIndexScale); @@ -341,69 +381,84 @@ public abstract class HotSpotBackend extends Backend implements FrameMap.Referen /** * @see VMErrorNode */ - public static final ForeignCallDescriptor VM_ERROR = new ForeignCallDescriptor("vm_error", void.class, Object.class, Object.class, long.class); + public static final HotSpotForeignCallDescriptor VM_ERROR = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS, "vm_error", void.class, Object.class, Object.class, + long.class); + + private static final LocationIdentity[] TLAB_LOCATIONS = new LocationIdentity[]{TLAB_TOP_LOCATION, TLAB_END_LOCATION}; /** * New multi array stub that throws an {@link OutOfMemoryError} on allocation failure. */ - public static final ForeignCallDescriptor NEW_MULTI_ARRAY = new ForeignCallDescriptor("new_multi_array", Object.class, KlassPointer.class, int.class, Word.class); + public static final HotSpotForeignCallDescriptor NEW_MULTI_ARRAY = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, TLAB_LOCATIONS, "new_multi_array", Object.class, KlassPointer.class, + int.class, Word.class); /** * New multi array stub that will return null on allocation failure. */ - public static final ForeignCallDescriptor NEW_MULTI_ARRAY_OR_NULL = new ForeignCallDescriptor("new_multi_array_or_null", Object.class, KlassPointer.class, int.class, Word.class); + public static final HotSpotForeignCallDescriptor NEW_MULTI_ARRAY_OR_NULL = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, TLAB_LOCATIONS, "new_multi_array_or_null", Object.class, + KlassPointer.class, int.class, Word.class); /** * New array stub that throws an {@link OutOfMemoryError} on allocation failure. */ - public static final ForeignCallDescriptor NEW_ARRAY = new ForeignCallDescriptor("new_array", Object.class, KlassPointer.class, int.class); + public static final HotSpotForeignCallDescriptor NEW_ARRAY = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, TLAB_LOCATIONS, "new_array", Object.class, KlassPointer.class, int.class); /** * New array stub that will return null on allocation failure. */ - public static final ForeignCallDescriptor NEW_ARRAY_OR_NULL = new ForeignCallDescriptor("new_array_or_null", Object.class, KlassPointer.class, int.class); + public static final HotSpotForeignCallDescriptor NEW_ARRAY_OR_NULL = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, TLAB_LOCATIONS, "new_array_or_null", Object.class, + KlassPointer.class, + int.class); /** * New instance stub that throws an {@link OutOfMemoryError} on allocation failure. */ - public static final ForeignCallDescriptor NEW_INSTANCE = new ForeignCallDescriptor("new_instance", Object.class, KlassPointer.class); + public static final HotSpotForeignCallDescriptor NEW_INSTANCE = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, TLAB_LOCATIONS, "new_instance", Object.class, KlassPointer.class); /** * New instance stub that will return null on allocation failure. */ - public static final ForeignCallDescriptor NEW_INSTANCE_OR_NULL = new ForeignCallDescriptor("new_instance_or_null", Object.class, KlassPointer.class); + public static final HotSpotForeignCallDescriptor NEW_INSTANCE_OR_NULL = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, TLAB_LOCATIONS, "new_instance_or_null", Object.class, + KlassPointer.class); /** * @see ResolveConstantStubCall */ - public static final ForeignCallDescriptor RESOLVE_STRING_BY_SYMBOL = new ForeignCallDescriptor("resolve_string_by_symbol", Object.class, Word.class, Word.class); + public static final HotSpotForeignCallDescriptor RESOLVE_STRING_BY_SYMBOL = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, TLAB_LOCATIONS, "resolve_string_by_symbol", Object.class, + Word.class, Word.class); /** * @see ResolveConstantStubCall */ - public static final ForeignCallDescriptor RESOLVE_DYNAMIC_INVOKE = new ForeignCallDescriptor("resolve_dynamic_invoke", Object.class, Word.class); + public static final HotSpotForeignCallDescriptor RESOLVE_DYNAMIC_INVOKE = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, any(), "resolve_dynamic_invoke", Object.class, Word.class); /** * @see ResolveConstantStubCall */ - public static final ForeignCallDescriptor RESOLVE_KLASS_BY_SYMBOL = new ForeignCallDescriptor("resolve_klass_by_symbol", Word.class, Word.class, Word.class); + public static final HotSpotForeignCallDescriptor RESOLVE_KLASS_BY_SYMBOL = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, any(), "resolve_klass_by_symbol", Word.class, Word.class, + Word.class); /** * @see ResolveConstantStubCall */ - public static final ForeignCallDescriptor INITIALIZE_KLASS_BY_SYMBOL = new ForeignCallDescriptor("initialize_klass_by_symbol", Word.class, Word.class, Word.class); + public static final HotSpotForeignCallDescriptor INITIALIZE_KLASS_BY_SYMBOL = new HotSpotForeignCallDescriptor(SAFEPOINT, NOT_REEXECUTABLE, any(), "initialize_klass_by_symbol", Word.class, + Word.class, + Word.class); /** * @see ResolveConstantStubCall */ - public static final ForeignCallDescriptor RESOLVE_METHOD_BY_SYMBOL_AND_LOAD_COUNTERS = new ForeignCallDescriptor("resolve_method_by_symbol_and_load_counters", Word.class, Word.class, Word.class, + public static final HotSpotForeignCallDescriptor RESOLVE_METHOD_BY_SYMBOL_AND_LOAD_COUNTERS = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, NO_LOCATIONS, + "resolve_method_by_symbol_and_load_counters", Word.class, Word.class, Word.class, Word.class); /** * Tiered support. */ - public static final ForeignCallDescriptor INVOCATION_EVENT = new ForeignCallDescriptor("invocation_event", void.class, MethodCountersPointer.class); - public static final ForeignCallDescriptor BACKEDGE_EVENT = new ForeignCallDescriptor("backedge_event", void.class, MethodCountersPointer.class, int.class, int.class); + public static final HotSpotForeignCallDescriptor INVOCATION_EVENT = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, NO_LOCATIONS, "invocation_event", void.class, + MethodCountersPointer.class); + public static final HotSpotForeignCallDescriptor BACKEDGE_EVENT = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, NO_LOCATIONS, "backedge_event", void.class, MethodCountersPointer.class, + int.class, int.class); public HotSpotBackend(HotSpotGraalRuntimeProvider runtime, HotSpotProviders providers) { super(providers); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackendFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackendFactory.java index 10407b40951..251240e6569 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackendFactory.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackendFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -25,8 +25,9 @@ package org.graalvm.compiler.hotspot; import org.graalvm.compiler.bytecode.BytecodeProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotPlatformConfigurationProvider; import org.graalvm.compiler.hotspot.meta.HotSpotGraalConstantFieldProvider; +import org.graalvm.compiler.hotspot.meta.HotSpotMetaAccessExtensionProvider; +import org.graalvm.compiler.hotspot.meta.HotSpotPlatformConfigurationProvider; import org.graalvm.compiler.hotspot.meta.HotSpotSnippetReflectionProvider; import org.graalvm.compiler.hotspot.meta.HotSpotStampProvider; import org.graalvm.compiler.hotspot.word.HotSpotWordTypes; @@ -59,6 +60,10 @@ public abstract class HotSpotBackendFactory { return new HotSpotPlatformConfigurationProvider(config, metaAccess); } + protected HotSpotMetaAccessExtensionProvider createMetaAccessExtensionProvider() { + return new HotSpotMetaAccessExtensionProvider(); + } + protected HotSpotReplacementsImpl createReplacements(TargetDescription target, Providers p, HotSpotSnippetReflectionProvider snippetReflection, BytecodeProvider bytecodeProvider) { return new HotSpotReplacementsImpl(p, snippetReflection, bytecodeProvider, target); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotCompiledCodeBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotCompiledCodeBuilder.java index d61089db9e8..fc516a2314c 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotCompiledCodeBuilder.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotCompiledCodeBuilder.java @@ -24,6 +24,8 @@ package org.graalvm.compiler.hotspot; +import static java.util.Collections.emptyList; +import static java.util.Collections.unmodifiableList; import static org.graalvm.compiler.hotspot.HotSpotCompiledCodeBuilder.Options.ShowSubstitutionSourceInfo; import static org.graalvm.util.CollectionsUtil.anyMatch; @@ -37,11 +39,10 @@ import java.util.List; import java.util.ListIterator; import java.util.Map; -import org.graalvm.compiler.api.replacements.MethodSubstitution; -import org.graalvm.compiler.api.replacements.Snippet; import org.graalvm.compiler.code.CompilationResult; import org.graalvm.compiler.code.CompilationResult.CodeAnnotation; import org.graalvm.compiler.code.CompilationResult.CodeComment; +import org.graalvm.compiler.code.CompilationResult.CodeMark; import org.graalvm.compiler.code.CompilationResult.JumpTable; import org.graalvm.compiler.code.DataSection; import org.graalvm.compiler.code.SourceMapping; @@ -138,10 +139,10 @@ public class HotSpotCompiledCodeBuilder { jvmciCompileState = 0L; } return new HotSpotCompiledNmethod(name, targetCode, targetCodeSize, sites, assumptions, methods, comments, dataSection, dataSectionAlignment, dataSectionPatches, isImmutablePIC, - totalFrameSize, customStackArea, hsMethod, entryBCI, id, jvmciCompileState, hasUnsafeAccess); + totalFrameSize, customStackArea, hsMethod, entryBCI, id, jvmciCompileState, hasUnsafeAccess); } else { return new HotSpotCompiledCode(name, targetCode, targetCodeSize, sites, assumptions, methods, comments, dataSection, dataSectionAlignment, dataSectionPatches, isImmutablePIC, - totalFrameSize, customStackArea); + totalFrameSize, customStackArea); } } @@ -211,6 +212,23 @@ public class HotSpotCompiledCodeBuilder { } } + + /** + * @return the list of {@link Mark marks} converted from the {@link CodeMark CodeMarks}. + */ + private static List getTranslatedMarks(List codeMarks) { + if (codeMarks.isEmpty()) { + return emptyList(); + } + // The HotSpot backend needs these in the exact form of a Mark so convert all the marks + // to that form. + List translated = new ArrayList<>(codeMarks.size()); + for (CodeMark m : codeMarks) { + translated.add(new Mark(m.pcOffset, m.id.getId())); + } + return unmodifiableList(translated); + } + /** * HotSpot expects sites to be presented in ascending order of PC (see * {@code DebugInformationRecorder::add_new_pc_offset}). In addition, it expects @@ -218,11 +236,11 @@ public class HotSpotCompiledCodeBuilder { */ private static Site[] getSortedSites(CompilationResult target, OptionValues options, boolean includeSourceInfo) { List sites = new ArrayList<>( - target.getExceptionHandlers().size() + target.getInfopoints().size() + target.getDataPatches().size() + target.getMarks().size() + target.getSourceMappings().size()); + target.getExceptionHandlers().size() + target.getInfopoints().size() + target.getDataPatches().size() + target.getMarks().size() + target.getSourceMappings().size()); sites.addAll(target.getExceptionHandlers()); sites.addAll(target.getInfopoints()); sites.addAll(target.getDataPatches()); - sites.addAll(target.getMarks()); + sites.addAll(getTranslatedMarks(target.getMarks())); if (includeSourceInfo) { /* @@ -332,7 +350,7 @@ public class HotSpotCompiledCodeBuilder { private static boolean verifyTrim(NodeSourcePosition sourcePosition) { for (NodeSourcePosition sp = sourcePosition; sp != null; sp = sp.getCaller()) { - assert (sp.getMethod().getAnnotation(Snippet.class) == null && sp.getMethod().getAnnotation(MethodSubstitution.class) == null); + assert !sp.isSubstitution(); } return true; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotDebugInfoBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotDebugInfoBuilder.java index 35c82be9826..dcecfc75f14 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotDebugInfoBuilder.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotDebugInfoBuilder.java @@ -29,8 +29,6 @@ import static jdk.vm.ci.code.BytecodeFrame.isPlaceholderBci; import java.util.ArrayList; import java.util.List; -import org.graalvm.compiler.api.replacements.MethodSubstitution; -import org.graalvm.compiler.api.replacements.Snippet; import org.graalvm.compiler.bytecode.Bytecodes; import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; import org.graalvm.compiler.core.gen.DebugInfoBuilder; @@ -38,6 +36,8 @@ import org.graalvm.compiler.graph.GraalGraphError; import org.graalvm.compiler.graph.NodeSourcePosition; import org.graalvm.compiler.hotspot.meta.DefaultHotSpotLoweringProvider; import org.graalvm.compiler.lir.VirtualStackSlot; +import org.graalvm.compiler.nodeinfo.Verbosity; +import org.graalvm.compiler.nodes.DeoptimizeNode; import org.graalvm.compiler.nodes.FrameState; import org.graalvm.compiler.nodes.FullInfopointNode; import org.graalvm.compiler.nodes.ValueNode; @@ -65,7 +65,7 @@ public class HotSpotDebugInfoBuilder extends DebugInfoBuilder { private HotSpotCodeCacheProvider codeCacheProvider; public HotSpotDebugInfoBuilder(NodeValueMap nodeValueMap, HotSpotLockStack lockStack, HotSpotLIRGenerator gen) { - super(nodeValueMap, gen.getResult().getLIR().getDebug()); + super(nodeValueMap, gen.getProviders().getMetaAccessExtensionProvider(), gen.getResult().getLIR().getDebug()); this.lockStack = lockStack; this.codeCacheProvider = gen.getProviders().getCodeCache(); } @@ -100,7 +100,7 @@ public class HotSpotDebugInfoBuilder extends DebugInfoBuilder { if (node instanceof ForeignCallNode) { ForeignCallNode call = (ForeignCallNode) node; ForeignCallDescriptor descriptor = call.getDescriptor(); - if (DefaultHotSpotLoweringProvider.RuntimeCalls.runtimeCalls.containsValue(descriptor)) { + if (DefaultHotSpotLoweringProvider.RuntimeCalls.runtimeCalls.containsValue(descriptor.getSignature())) { return true; } } @@ -120,6 +120,9 @@ public class HotSpotDebugInfoBuilder extends DebugInfoBuilder { } } } + if (node instanceof DeoptimizeNode) { + assert !topState.duringCall() : topState.toString(Verbosity.Debugger); + } return true; } @@ -144,8 +147,7 @@ public class HotSpotDebugInfoBuilder extends DebugInfoBuilder { StringBuilder sb = new StringBuilder("parsing "); ResolvedJavaMethod method = pos.getMethod(); MetaUtil.appendLocation(sb, method, pos.getBCI()); - if (method.getAnnotation(MethodSubstitution.class) != null || - method.getAnnotation(Snippet.class) != null) { + if (pos.isSubstitution()) { replacementMethodWithProblematicSideEffect = method; } context.add(sb.toString()); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotForeignCallLinkage.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotForeignCallLinkage.java index 19768c734c3..9c8c8769ceb 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotForeignCallLinkage.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotForeignCallLinkage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -26,8 +26,8 @@ package org.graalvm.compiler.hotspot; import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; import org.graalvm.compiler.core.target.Backend; +import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; import org.graalvm.compiler.hotspot.stubs.Stub; -import jdk.internal.vm.compiler.word.LocationIdentity; import jdk.vm.ci.meta.InvokeTarget; @@ -46,76 +46,14 @@ public interface HotSpotForeignCallLinkage extends ForeignCallLinkage, InvokeTar COMPUTES_REGISTERS_KILLED } - /** - * Constants for specifying whether a call is a leaf or not and whether a - * {@code JavaFrameAnchor} prologue and epilogue is required around the call. A leaf function - * does not lock, GC or throw exceptions. - */ - enum Transition { - /** - * A call to a leaf function that is guaranteed to not use floating point registers. - * Consequently, floating point registers cleanup will be waived. On AMD64, this means the - * compiler will no longer emit vzeroupper instruction around the foreign call, which it - * normally does for unknown foreign calls to avoid potential SSE-AVX transition penalty. - * Besides, this foreign call will never have its caller stack inspected by the VM. That is, - * {@code JavaFrameAnchor} management around the call can be omitted. - */ - LEAF_NO_VZERO, - - /** - * A call to a leaf function that might use floating point registers but will never have its - * caller stack inspected. That is, {@code JavaFrameAnchor} management around the call can - * be omitted. - */ - LEAF, - - /** - * A call to a leaf function that might use floating point registers and may have its caller - * stack inspected. That is, {@code JavaFrameAnchor} management code around the call is - * required. - */ - STACK_INSPECTABLE_LEAF, - - /** - * A function that may lock, GC or raise an exception and thus requires debug info to be - * associated with a call site to the function. The execution stack may be inspected while - * in the called function. That is, {@code JavaFrameAnchor} management code around the call - * is required. - */ - SAFEPOINT, - } - - /** - * Constants specifying when a foreign call or stub call is re-executable. - */ - enum Reexecutability { - /** - * Denotes a call that cannot be re-executed. If an exception is raised, the call is - * deoptimized and the exception is passed on to be dispatched. If the call can throw an - * exception it needs to have a precise frame state. - */ - NOT_REEXECUTABLE, - - /** - * Denotes a call that can always be re-executed. If an exception is raised by the call it - * may be cleared, compiled code deoptimized and reexecuted. Since the call has no side - * effects it is assumed that the same exception will be thrown. - */ - REEXECUTABLE - } + @Override + HotSpotForeignCallDescriptor getDescriptor(); /** * Sentinel marker for a computed jump address. */ long JUMP_ADDRESS = 0xDEADDEADBEEFBEEFL; - /** - * Determines if the call has side effects. - */ - boolean isReexecutable(); - - LocationIdentity[] getKilledLocations(); - void setCompiledStub(Stub stub); RegisterEffect getEffect(); @@ -149,9 +87,4 @@ public interface HotSpotForeignCallLinkage extends ForeignCallLinkage, InvokeTar * Gets the VM symbol associated with the target {@linkplain #getAddress() address} of the call. */ String getSymbol(); - - /** - * Identifies foreign calls which are guaranteed to include a safepoint check. - */ - boolean isGuaranteedSafepoint(); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotForeignCallLinkageImpl.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotForeignCallLinkageImpl.java index 3bfdc169169..aeab84b84db 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotForeignCallLinkageImpl.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotForeignCallLinkageImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -30,10 +30,10 @@ import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEff import jdk.internal.vm.compiler.collections.EconomicSet; import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; import org.graalvm.compiler.core.target.Backend; +import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProvider; import org.graalvm.compiler.hotspot.stubs.Stub; import org.graalvm.compiler.word.WordTypes; -import jdk.internal.vm.compiler.word.LocationIdentity; import jdk.vm.ci.code.CallingConvention; import jdk.vm.ci.code.CallingConvention.Type; @@ -58,7 +58,7 @@ public class HotSpotForeignCallLinkageImpl extends HotSpotForeignCallTarget impl /** * The descriptor of the call. */ - protected final ForeignCallDescriptor descriptor; + protected final HotSpotForeignCallDescriptor descriptor; /** * Non-null (eventually) iff this is a call to a compiled {@linkplain Stub stub}. @@ -78,20 +78,11 @@ public class HotSpotForeignCallLinkageImpl extends HotSpotForeignCallTarget impl private final RegisterEffect effect; - private final Transition transition; - /** * The registers and stack slots defined/killed by the call. */ private Value[] temporaries = AllocatableValue.NONE; - /** - * The memory locations killed by the call. - */ - private final LocationIdentity[] killedLocations; - - private final Reexecutability reexecutability; - /** * Creates a {@link HotSpotForeignCallLinkage}. * @@ -101,19 +92,12 @@ public class HotSpotForeignCallLinkageImpl extends HotSpotForeignCallTarget impl * temporaries which are always destroyed) * @param outgoingCcType outgoing (caller) calling convention type * @param incomingCcType incoming (callee) calling convention type (can be null) - * @param transition specifies if this is a {@linkplain #needsDebugInfo() leaf} call - * @param reexecutability specifies if the call can be re-executed without (meaningful) side - * effects. Deoptimization will not return to a point before a call that cannot be - * re-executed. - * @param killedLocations the memory locations killed by the call */ public static HotSpotForeignCallLinkage create(MetaAccessProvider metaAccess, CodeCacheProvider codeCache, WordTypes wordTypes, HotSpotForeignCallsProvider foreignCalls, - ForeignCallDescriptor descriptor, long address, RegisterEffect effect, Type outgoingCcType, Type incomingCcType, Transition transition, Reexecutability reexecutability, - LocationIdentity... killedLocations) { + HotSpotForeignCallDescriptor descriptor, long address, RegisterEffect effect, Type outgoingCcType, Type incomingCcType) { CallingConvention outgoingCc = createCallingConvention(metaAccess, codeCache, wordTypes, foreignCalls, descriptor, outgoingCcType); CallingConvention incomingCc = incomingCcType == null ? null : createCallingConvention(metaAccess, codeCache, wordTypes, foreignCalls, descriptor, incomingCcType); - HotSpotForeignCallLinkageImpl linkage = new HotSpotForeignCallLinkageImpl(descriptor, address, effect, transition, reexecutability, outgoingCc, incomingCc, - killedLocations); + HotSpotForeignCallLinkageImpl linkage = new HotSpotForeignCallLinkageImpl(descriptor, address, effect, outgoingCc, incomingCc); if (outgoingCcType == HotSpotCallingConventionType.NativeCall) { linkage.temporaries = foreignCalls.getNativeABICallerSaveRegisters(); } @@ -144,18 +128,15 @@ public class HotSpotForeignCallLinkageImpl extends HotSpotForeignCallTarget impl return javaType; } - public HotSpotForeignCallLinkageImpl(ForeignCallDescriptor descriptor, long address, RegisterEffect effect, Transition transition, Reexecutability reexecutability, - CallingConvention outgoingCallingConvention, CallingConvention incomingCallingConvention, LocationIdentity... killedLocations) { + public HotSpotForeignCallLinkageImpl(HotSpotForeignCallDescriptor descriptor, long address, RegisterEffect effect, + CallingConvention outgoingCallingConvention, CallingConvention incomingCallingConvention) { super(address); this.descriptor = descriptor; this.address = address; this.effect = effect; - this.transition = transition; - this.reexecutability = reexecutability; assert outgoingCallingConvention != null : "only incomingCallingConvention can be null"; this.outgoingCallingConvention = outgoingCallingConvention; this.incomingCallingConvention = incomingCallingConvention != null ? incomingCallingConvention : outgoingCallingConvention; - this.killedLocations = killedLocations; } @Override @@ -173,26 +154,11 @@ public class HotSpotForeignCallLinkageImpl extends HotSpotForeignCallTarget impl return sb.toString(); } - @Override - public boolean isReexecutable() { - return reexecutability == Reexecutability.REEXECUTABLE; - } - - @Override - public boolean isGuaranteedSafepoint() { - return transition == Transition.SAFEPOINT; - } - @Override public RegisterEffect getEffect() { return effect; } - @Override - public LocationIdentity[] getKilledLocations() { - return killedLocations; - } - @Override public CallingConvention getOutgoingCallingConvention() { return outgoingCallingConvention; @@ -217,7 +183,7 @@ public class HotSpotForeignCallLinkageImpl extends HotSpotForeignCallTarget impl } @Override - public ForeignCallDescriptor getDescriptor() { + public HotSpotForeignCallDescriptor getDescriptor() { return descriptor; } @@ -278,17 +244,17 @@ public class HotSpotForeignCallLinkageImpl extends HotSpotForeignCallTarget impl @Override public boolean needsDebugInfo() { - return transition == Transition.SAFEPOINT; + return descriptor.canDeoptimize(); } @Override public boolean mayContainFP() { - return transition != Transition.LEAF_NO_VZERO; + return descriptor.getTransition() != HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO; } @Override public boolean needsJavaFrameAnchor() { - if (transition == Transition.SAFEPOINT || transition == Transition.STACK_INSPECTABLE_LEAF) { + if (descriptor.getTransition() == HotSpotForeignCallDescriptor.Transition.SAFEPOINT || descriptor.getTransition() == HotSpotForeignCallDescriptor.Transition.STACK_INSPECTABLE_LEAF) { if (stub != null) { // The stub will do the JavaFrameAnchor management // around the runtime call(s) it makes @@ -309,4 +275,5 @@ public class HotSpotForeignCallLinkageImpl extends HotSpotForeignCallTarget impl public boolean needsClearUpperVectorRegisters() { return isCompiledStub() && mayContainFP(); } + } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalCompiler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalCompiler.java index cf03cfb7308..58b84fedede 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalCompiler.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalCompiler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -139,7 +139,7 @@ public class HotSpotGraalCompiler implements GraalJVMCICompiler, Cancellable { compilationCounters.countCompilation(method); } CompilationRequestResult r = null; - try (DebugContext debug = graalRuntime.openDebugContext(options, task.getCompilationIdentifier(), method, getDebugHandlersFactories(), DebugContext.DEFAULT_LOG_STREAM); + try (DebugContext debug = graalRuntime.openDebugContext(options, task.getCompilationIdentifier(), method, getDebugHandlersFactories(), DebugContext.getDefaultLogStream()); Activation a = debug.activate()) { r = task.runCompilation(debug); } @@ -176,7 +176,8 @@ public class HotSpotGraalCompiler implements GraalJVMCICompiler, Cancellable { 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, this); + AllowAssumptions allowAssumptions = AllowAssumptions.ifTrue(OptAssumptions.getValue(options)); + StructuredGraph graph = method.isNative() || isOSR ? null : providers.getReplacements().getIntrinsicGraph(method, compilationId, debug, allowAssumptions, this); if (graph == null) { SpeculationLog speculationLog = method.getSpeculationLog(); @@ -184,7 +185,7 @@ public class HotSpotGraalCompiler implements GraalJVMCICompiler, Cancellable { speculationLog.collectFailedSpeculations(); } // @formatter:off - graph = new StructuredGraph.Builder(options, debug, AllowAssumptions.ifTrue(OptAssumptions.getValue(options))). + graph = new StructuredGraph.Builder(options, debug, allowAssumptions). method(method). cancellable(this). entryBCI(entryBCI). diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntime.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntime.java index fab3642f58e..9a363196fc3 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntime.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntime.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -28,6 +28,7 @@ import static jdk.vm.ci.common.InitTimer.timer; import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime; import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC; import static org.graalvm.compiler.core.common.GraalOptions.HotSpotPrintInlining; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigAccess.JDK; import java.io.PrintStream; import java.util.ArrayList; @@ -45,10 +46,14 @@ import org.graalvm.compiler.api.replacements.SnippetReflectionProvider; import org.graalvm.compiler.api.runtime.GraalRuntime; import org.graalvm.compiler.core.CompilationWrapper.ExceptionAction; import org.graalvm.compiler.core.common.CompilationIdentifier; +import org.graalvm.compiler.core.common.CompilationListenerProfiler; +import org.graalvm.compiler.core.common.CompilerProfiler; import org.graalvm.compiler.core.common.GraalOptions; import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; import org.graalvm.compiler.core.target.Backend; +import org.graalvm.compiler.debug.Assertions; import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.DebugContext.Builder; import org.graalvm.compiler.debug.DebugContext.Description; import org.graalvm.compiler.debug.DebugHandlersFactory; import org.graalvm.compiler.debug.DebugOptions; @@ -98,8 +103,10 @@ import jdk.vm.ci.services.Services; public final class HotSpotGraalRuntime implements HotSpotGraalRuntimeProvider { private static final boolean IS_AOT = Boolean.parseBoolean(Services.getSavedProperties().get("com.oracle.graalvm.isaot")); + /** - * A factory for {@link HotSpotGraalManagementRegistration} injected by {@code LibGraalFeature}. + * A factory for a {@link HotSpotGraalManagementRegistration} injected by + * {@code Target_org_graalvm_compiler_hotspot_HotSpotGraalRuntime}. */ private static final Supplier AOT_INJECTED_MANAGEMENT = null; @@ -142,6 +149,8 @@ public final class HotSpotGraalRuntime implements HotSpotGraalRuntimeProvider { private final DiagnosticsOutputDirectory outputDirectory; private final Map compilationProblemsPerAction; + private final CompilerProfiler compilerProfiler; + /** * @param nameQualifier a qualifier to be added to this runtime's {@linkplain #getName() name} * @param compilerConfigurationFactory factory for the compiler configuration @@ -175,7 +184,14 @@ public final class HotSpotGraalRuntime implements HotSpotGraalRuntimeProvider { management = GraalServices.loadSingle(HotSpotGraalManagementRegistration.class, false); } if (management != null) { - management.initialize(this, config); + try { + management.initialize(this, config); + } catch (ThreadDeath td) { + throw td; + } catch (Throwable error) { + TTY.println("Cannot install GraalVM MBean due to " + error.getMessage()); + management = null; + } } BackendMap backendMap = compilerConfigurationFactory.createBackendMap(); @@ -223,6 +239,8 @@ public final class HotSpotGraalRuntime implements HotSpotGraalRuntimeProvider { runtimeStartTime = System.nanoTime(); bootstrapJVMCI = config.getFlag("BootstrapJVMCI", Boolean.class); + + this.compilerProfiler = GraalServices.loadSingle(CompilerProfiler.class, false); } /** @@ -230,47 +248,70 @@ public final class HotSpotGraalRuntime implements HotSpotGraalRuntimeProvider { */ public enum HotSpotGC { // Supported GCs - Serial(true, "UseSerialGC"), - Parallel(true, "UseParallelGC", "UseParallelOldGC", "UseParNewGC"), - CMS(true, "UseConcMarkSweepGC"), - G1(true, "UseG1GC"), + Serial(true, "UseSerialGC", true), + Parallel(true, "UseParallelGC", true, "UseParallelOldGC", JDK < 15, "UseParNewGC", JDK < 10), + CMS(true, "UseConcMarkSweepGC", JDK < 14), + G1(true, "UseG1GC", true), // Unsupported GCs - Epsilon(false, "UseEpsilonGC"), - Z(false, "UseZGC"); + Epsilon(false, "UseEpsilonGC", JDK >= 11), + Z(false, "UseZGC", JDK >= 11); - HotSpotGC(boolean supported, String... flags) { + HotSpotGC(boolean supported, + String flag1, boolean expectFlagPresent1, + String flag2, boolean expectFlagPresent2, + String flag3, boolean expectFlagPresent3) { this.supported = supported; - this.flags = flags; + this.expectFlagsPresent = new boolean[]{expectFlagPresent1, expectFlagPresent2, expectFlagPresent3}; + this.flags = new String[]{flag1, flag2, flag3}; + } + + HotSpotGC(boolean supported, String flag, boolean expectFlagPresent) { + this.supported = supported; + this.expectFlagsPresent = new boolean[]{expectFlagPresent}; + this.flags = new String[]{flag}; } final boolean supported; + final boolean[] expectFlagsPresent; private final String[] flags; public boolean isSelected(GraalHotSpotVMConfig config) { - for (String flag : flags) { + boolean selected = false; + for (int i = 0; i < flags.length; i++) { final boolean notPresent = false; - if (config.getFlag(flag, Boolean.class, notPresent)) { - return true; + if (config.getFlag(flags[i], Boolean.class, notPresent, expectFlagsPresent[i])) { + selected = true; + if (!Assertions.assertionsEnabled()) { + // When asserting, check that isSelected works for all flag names + break; + } } } - return false; + return selected; } - } private HotSpotGC getSelectedGC() throws GraalError { + HotSpotGC selected = null; for (HotSpotGC gc : HotSpotGC.values()) { if (gc.isSelected(config)) { if (!gc.supported) { throw new GraalError(gc.name() + " garbage collector is not supported by Graal"); } - return gc; + selected = gc; + if (!Assertions.assertionsEnabled()) { + // When asserting, check that isSelected works for all HotSpotGC values + break; + } } } - // As of JDK 9, exactly one GC flag is guaranteed to be selected. - // On JDK 8, the default GC is Serial when no GC flag is true. - return HotSpotGC.Serial; + if (selected == null) { + // As of JDK 9, exactly one GC flag is guaranteed to be selected. + // On JDK 8, the default GC is Serial when no GC flag is true. + selected = HotSpotGC.Serial; + } + return selected; } private HotSpotBackend registerBackend(HotSpotBackend backend) { @@ -310,8 +351,18 @@ public final class HotSpotGraalRuntime implements HotSpotGraalRuntimeProvider { } } } + Description description = new Description(compilable, compilationId.toString(CompilationIdentifier.Verbosity.ID)); - return DebugContext.create(compilationOptions, description, metricValues, logStream, factories); + Builder builder = new Builder(compilationOptions, factories).// + globalMetrics(metricValues).// + description(description).// + logStream(logStream); + if (compilerProfiler != null) { + int compileId = ((HotSpotCompilationIdentifier) compilationId).getRequest().getId(); + builder.compilationListener(new CompilationListenerProfiler(compilerProfiler, compileId)); + } + return builder.build(); + } @Override @@ -383,6 +434,11 @@ public final class HotSpotGraalRuntime implements HotSpotGraalRuntimeProvider { */ private volatile boolean shutdown; + /** + * Shutdown hooks that should be run on the same thread doing the shutdown. + */ + private List shutdownHooks = new ArrayList<>(); + /** * Take action related to entering a new execution phase. * @@ -394,8 +450,29 @@ public final class HotSpotGraalRuntime implements HotSpotGraalRuntimeProvider { } } - void shutdown() { + /** + * Adds a {@link Runnable} that will be run when this runtime is {@link #shutdown()}. The + * runnable will be run on the same thread doing the shutdown. All the advice for regular + * {@linkplain Runtime#addShutdownHook(Thread) shutdown hooks} also applies here but even more + * so since the hook runs on the shutdown thread. + */ + public synchronized void addShutdownHook(Runnable hook) { + if (!shutdown) { + shutdownHooks.add(hook); + } + } + + synchronized void shutdown() { shutdown = true; + + for (Runnable r : shutdownHooks) { + try { + r.run(); + } catch (Throwable e) { + e.printStackTrace(TTY.out); + } + } + metricValues.print(optionsRef.get()); phaseTransition("final"); @@ -453,7 +530,7 @@ public final class HotSpotGraalRuntime implements HotSpotGraalRuntimeProvider { // ------- Management interface --------- - private final HotSpotGraalManagementRegistration management; + private HotSpotGraalManagementRegistration management; /** * @returns the management object for this runtime or {@code null} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotHostBackend.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotHostBackend.java index 0f297ce8189..4140c912a9a 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotHostBackend.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotHostBackend.java @@ -27,15 +27,18 @@ package org.graalvm.compiler.hotspot; import static jdk.vm.ci.code.CodeUtil.K; import static jdk.vm.ci.code.CodeUtil.getCallingConvention; import static jdk.vm.ci.common.InitTimer.timer; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.NO_LOCATIONS; import java.util.Collections; import org.graalvm.compiler.core.common.CompilationIdentifier; import org.graalvm.compiler.core.common.NumUtil; import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; import org.graalvm.compiler.core.gen.LIRGenerationProvider; import org.graalvm.compiler.debug.DebugHandlersFactory; +import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; import org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; import org.graalvm.compiler.hotspot.meta.HotSpotLoweringProvider; import org.graalvm.compiler.hotspot.meta.HotSpotProviders; @@ -67,21 +70,25 @@ public abstract class HotSpotHostBackend extends HotSpotBackend implements LIRGe /** * Descriptor for {@code SharedRuntime::deopt_blob()->unpack()}. */ - public static final ForeignCallDescriptor DEOPT_BLOB_UNPACK = new ForeignCallDescriptor("deopt_blob()->unpack()", void.class); + public static final HotSpotForeignCallDescriptor DEOPT_BLOB_UNPACK = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS, "deopt_blob()->unpack()", void.class); /** * Descriptor for {@code SharedRuntime::deopt_blob()->unpack_with_exception_in_tls()}. */ - public static final ForeignCallDescriptor DEOPT_BLOB_UNPACK_WITH_EXCEPTION_IN_TLS = new ForeignCallDescriptor("deopt_blob()->unpack_with_exception_in_tls()", void.class); + public static final HotSpotForeignCallDescriptor DEOPT_BLOB_UNPACK_WITH_EXCEPTION_IN_TLS = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS, + "deopt_blob()->unpack_with_exception_in_tls()", void.class); /** * Descriptor for {@code SharedRuntime::deopt_blob()->uncommon_trap()}. */ - public static final ForeignCallDescriptor DEOPT_BLOB_UNCOMMON_TRAP = new ForeignCallDescriptor("deopt_blob()->uncommon_trap()", void.class); + public static final HotSpotForeignCallDescriptor DEOPT_BLOB_UNCOMMON_TRAP = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS, "deopt_blob()->uncommon_trap()", + void.class); - public static final ForeignCallDescriptor ENABLE_STACK_RESERVED_ZONE = new ForeignCallDescriptor("enableStackReservedZoneEntry", void.class, Word.class); + public static final HotSpotForeignCallDescriptor ENABLE_STACK_RESERVED_ZONE = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS, "enableStackReservedZoneEntry", + void.class, Word.class); - public static final ForeignCallDescriptor THROW_DELAYED_STACKOVERFLOW_ERROR = new ForeignCallDescriptor("throwDelayedStackoverflowError", void.class); + public static final HotSpotForeignCallDescriptor THROW_DELAYED_STACKOVERFLOW_ERROR = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS, "throwDelayedStackoverflowError", + void.class); protected final GraalHotSpotVMConfig config; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotLIRGenerator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotLIRGenerator.java index b20e7623b40..d2543724ec3 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotLIRGenerator.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotLIRGenerator.java @@ -103,7 +103,7 @@ public interface HotSpotLIRGenerator extends LIRGeneratorTool { * @param kind type of the value to load * @return value of loaded global in register */ - default Value emitLoadConfigValue(int markId, LIRKind kind) { + default Value emitLoadConfigValue(HotSpotMarkId markId, LIRKind kind) { throw new GraalError("Emitting code to load a config value is not currently supported on %s", target().arch); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotMarkId.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotMarkId.java new file mode 100644 index 00000000000..bfb9e0f9c42 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotMarkId.java @@ -0,0 +1,113 @@ +/* + * Copyright (c) 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + + +package org.graalvm.compiler.hotspot; + +import static org.graalvm.compiler.debug.GraalError.shouldNotReachHere; + +import org.graalvm.compiler.code.CompilationResult; + +import jdk.vm.ci.common.NativeImageReinitialize; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; + +/** + * Constants used to mark special positions in code being installed into the code cache by Graal C++ + * code. + */ +public enum HotSpotMarkId implements CompilationResult.MarkId { + VERIFIED_ENTRY(false), + UNVERIFIED_ENTRY(false), + OSR_ENTRY(false), + EXCEPTION_HANDLER_ENTRY(false), + DEOPT_HANDLER_ENTRY(false), + FRAME_COMPLETE(true, true), + INVOKEINTERFACE(false), + INVOKEVIRTUAL(false), + INVOKESTATIC(false), + INVOKESPECIAL(false), + INLINE_INVOKE(false), + POLL_NEAR(false), + POLL_RETURN_NEAR(false), + POLL_FAR(false), + POLL_RETURN_FAR(false), + CARD_TABLE_ADDRESS(true), + NARROW_KLASS_BASE_ADDRESS(true), + NARROW_OOP_BASE_ADDRESS(true), + CRC_TABLE_ADDRESS(true), + LOG_OF_HEAP_REGION_GRAIN_BYTES(true); + + private final boolean isMarkAfter; + @NativeImageReinitialize private Integer value; + private final boolean optional; + + HotSpotMarkId(boolean isMarkAfter) { + this(isMarkAfter, false); + } + + HotSpotMarkId(boolean isMarkAfter, boolean optional) { + this.isMarkAfter = isMarkAfter; + this.optional = optional; + } + + private Integer getValue() { + if (value == null) { + Long result = HotSpotJVMCIRuntime.runtime().getConfigStore().getConstants().get("CodeInstaller::" + name()); + if (result != null) { + this.value = result.intValue(); + } else if (!optional) { + throw shouldNotReachHere("Unsupported Mark " + name()); + } + } + return value; + } + + @Override + public String getName() { + return name(); + } + + @Override + public Object getId() { + assert isAvailable() : this; + return getValue(); + } + + @Override + public boolean isMarkAfter() { + return isMarkAfter; + } + + public boolean isAvailable() { + return getValue() != null; + } + + @Override + public String toString() { + return "HotSpotCodeMark{" + name() + + ", value=" + getValue() + + ", optional=" + optional + + '}'; + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotReplacementsImpl.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotReplacementsImpl.java index 8c64da2c57e..775337d4289 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotReplacementsImpl.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotReplacementsImpl.java @@ -30,8 +30,6 @@ import static org.graalvm.compiler.core.common.GraalOptions.UseEncodedGraphs; import static org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING; import static org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.ROOT_COMPILATION; -import java.util.Set; - import jdk.internal.vm.compiler.collections.EconomicSet; import org.graalvm.compiler.api.replacements.SnippetReflectionProvider; import org.graalvm.compiler.bytecode.BytecodeProvider; @@ -44,11 +42,13 @@ import org.graalvm.compiler.hotspot.word.HotSpotOperation; import org.graalvm.compiler.nodes.Cancellable; import org.graalvm.compiler.nodes.Invoke; import org.graalvm.compiler.nodes.StructuredGraph; +import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderPlugin; import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext; import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; import org.graalvm.compiler.nodes.graphbuilderconf.MethodSubstitutionPlugin; +import org.graalvm.compiler.nodes.spi.SnippetParameterInfo; import org.graalvm.compiler.options.OptionValues; import org.graalvm.compiler.phases.util.Providers; import org.graalvm.compiler.printer.GraalDebugHandlersFactory; @@ -73,6 +73,9 @@ public class HotSpotReplacementsImpl extends ReplacementsImpl { } public void maybeInitializeEncoder(OptionValues options) { + if (IS_IN_NATIVE_IMAGE) { + return; + } if (IS_BUILDING_NATIVE_IMAGE || UseEncodedGraphs.getValue(options)) { synchronized (HotSpotReplacementsImpl.class) { if (snippetEncoder == null) { @@ -82,22 +85,39 @@ public class HotSpotReplacementsImpl extends ReplacementsImpl { } } + /** + * Returns true if this Replacements is being used for preparation of snippets and substitutions + * for libgraal. + */ + public boolean isEncodingSnippets() { + return false; + } + @Override public Class getIntrinsifyingPlugin(ResolvedJavaMethod method) { - return method.getAnnotation(HotSpotOperation.class) != null ? HotSpotWordOperationPlugin.class : super.getIntrinsifyingPlugin(method); + if (!IS_IN_NATIVE_IMAGE) { + if (method.getAnnotation(HotSpotOperation.class) != null) { + return HotSpotWordOperationPlugin.class; + } + } + return super.getIntrinsifyingPlugin(method); } @Override public void registerMethodSubstitution(MethodSubstitutionPlugin plugin) { - if (snippetEncoder != null) { - snippetEncoder.registerMethodSubstitution(plugin); + if (!IS_IN_NATIVE_IMAGE) { + if (snippetEncoder != null) { + snippetEncoder.registerMethodSubstitution(plugin); + } } } @Override public void registerConditionalPlugin(InvocationPlugin plugin) { - if (snippetEncoder != null) { - snippetEncoder.registerConditionalPlugin(plugin); + if (!IS_IN_NATIVE_IMAGE) { + if (snippetEncoder != null) { + snippetEncoder.registerConditionalPlugin(plugin); + } } } @@ -106,7 +126,7 @@ public class HotSpotReplacementsImpl extends ReplacementsImpl { } @Override - public StructuredGraph getIntrinsicGraph(ResolvedJavaMethod method, CompilationIdentifier compilationId, DebugContext debug, Cancellable cancellable) { + public StructuredGraph getIntrinsicGraph(ResolvedJavaMethod method, CompilationIdentifier compilationId, DebugContext debug, AllowAssumptions allowAssumptions, Cancellable cancellable) { boolean useEncodedGraphs = UseEncodedGraphs.getValue(debug.getOptions()); if (IS_IN_NATIVE_IMAGE || useEncodedGraphs) { HotSpotReplacementsImpl replacements = (HotSpotReplacementsImpl) providers.getReplacements(); @@ -117,17 +137,18 @@ public class HotSpotReplacementsImpl extends ReplacementsImpl { replacements.maybeInitializeEncoder(debug.getOptions()); replacements.registerMethodSubstitution(msp); } - StructuredGraph methodSubstitution = replacements.getMethodSubstitution(msp, method, ROOT_COMPILATION, StructuredGraph.AllowAssumptions.YES, cancellable, debug.getOptions()); + StructuredGraph methodSubstitution = replacements.getMethodSubstitution(msp, method, ROOT_COMPILATION, allowAssumptions, cancellable, debug.getOptions()); methodSubstitution.resetDebug(debug); return methodSubstitution; } return null; } - return super.getIntrinsicGraph(method, compilationId, debug, cancellable); + return super.getIntrinsicGraph(method, compilationId, debug, allowAssumptions, cancellable); } @Override - public StructuredGraph getSubstitution(ResolvedJavaMethod targetMethod, int invokeBci, boolean trackNodeSourcePosition, NodeSourcePosition replaceePosition, OptionValues options) { + public StructuredGraph getSubstitution(ResolvedJavaMethod targetMethod, int invokeBci, boolean trackNodeSourcePosition, NodeSourcePosition replaceePosition, + AllowAssumptions allowAssumptions, OptionValues options) { boolean useEncodedGraphs = UseEncodedGraphs.getValue(options); if (IS_IN_NATIVE_IMAGE || useEncodedGraphs) { InvocationPlugin plugin = getGraphBuilderPlugins().getInvocationPlugins().lookupInvocation(targetMethod); @@ -139,20 +160,22 @@ public class HotSpotReplacementsImpl extends ReplacementsImpl { } // This assumes the normal path creates the graph using // GraphBuilderConfiguration.getSnippetDefault with omits exception edges - StructuredGraph subst = getMethodSubstitution(msPlugin, targetMethod, INLINE_AFTER_PARSING, StructuredGraph.AllowAssumptions.NO, null, options); + StructuredGraph subst = getMethodSubstitution(msPlugin, targetMethod, INLINE_AFTER_PARSING, allowAssumptions, null, options); return subst; } } - return super.getSubstitution(targetMethod, invokeBci, trackNodeSourcePosition, replaceePosition, options); + return super.getSubstitution(targetMethod, invokeBci, trackNodeSourcePosition, replaceePosition, allowAssumptions, options); } @Override public void notifyNotInlined(GraphBuilderContext b, ResolvedJavaMethod method, Invoke invoke) { - if (b.parsingIntrinsic() && snippetEncoder != null) { - if (getIntrinsifyingPlugin(method) != null) { - snippetEncoder.addDelayedInvocationPluginMethod(method); - return; + if (!IS_IN_NATIVE_IMAGE) { + if (b.parsingIntrinsic() && snippetEncoder != null) { + if (getIntrinsifyingPlugin(method) != null) { + snippetEncoder.addDelayedInvocationPluginMethod(method); + return; + } } } super.notifyNotInlined(b, method, invoke); @@ -177,38 +200,59 @@ public class HotSpotReplacementsImpl extends ReplacementsImpl { } } + @Override + public SnippetParameterInfo getSnippetParameterInfo(ResolvedJavaMethod method) { + if (IS_IN_NATIVE_IMAGE) { + OptionValues options = null; + if (getEncodedSnippets(options) == null) { + throw GraalError.shouldNotReachHere("encoded snippets not found"); + } + return getEncodedSnippets(options).getSnippetParameterInfo(method); + } + return super.getSnippetParameterInfo(method); + } + + @Override + public boolean isSnippet(ResolvedJavaMethod method) { + if (IS_IN_NATIVE_IMAGE) { + if (encodedSnippets == null) { + throw GraalError.shouldNotReachHere("encoded snippets not found"); + } + return encodedSnippets.isSnippet(method); + } + return super.isSnippet(method); + } + @Override public void closeSnippetRegistration() { snippetRegistrationClosed = true; } - public static SymbolicSnippetEncoder.EncodedSnippets getEncodedSnippets(OptionValues options) { + public static EncodedSnippets getEncodedSnippets(OptionValues options) { if (!IS_IN_NATIVE_IMAGE && snippetEncoder != null) { snippetEncoder.encode(options); } return encodedSnippets; } - public Set getSnippetMethods() { - if (snippetEncoder != null) { - return snippetEncoder.getSnippetMethods(); - } - return null; + public void clearSnippetParameterNames() { + assert snippetEncoder != null; + snippetEncoder.clearSnippetParameterNames(); } - static void setEncodedSnippets(SymbolicSnippetEncoder.EncodedSnippets encodedSnippets) { + static void setEncodedSnippets(EncodedSnippets encodedSnippets) { HotSpotReplacementsImpl.encodedSnippets = encodedSnippets; } public boolean encode(OptionValues options) { - SymbolicSnippetEncoder encoder = HotSpotReplacementsImpl.snippetEncoder; + SymbolicSnippetEncoder encoder = snippetEncoder; if (encoder != null) { return encoder.encode(options); } return false; } - private static volatile SymbolicSnippetEncoder.EncodedSnippets encodedSnippets; + private static volatile EncodedSnippets encodedSnippets; @NativeImageReinitialize private static SymbolicSnippetEncoder snippetEncoder; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotTTYStreamProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotTTYStreamProvider.java index ed90b7dcfe1..60d9abf4b2f 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotTTYStreamProvider.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotTTYStreamProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -26,7 +26,9 @@ package org.graalvm.compiler.hotspot; import static org.graalvm.compiler.hotspot.HotSpotGraalOptionValues.GRAAL_OPTION_PROPERTY_PREFIX; import static org.graalvm.compiler.hotspot.HotSpotGraalOptionValues.defaultOptions; +import static jdk.internal.vm.compiler.word.LocationIdentity.ANY_LOCATION; +import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; @@ -40,7 +42,11 @@ import org.graalvm.compiler.options.Option; import org.graalvm.compiler.options.OptionKey; import org.graalvm.compiler.options.OptionType; import org.graalvm.compiler.serviceprovider.GraalServices; +import org.graalvm.compiler.serviceprovider.IsolateUtil; import org.graalvm.compiler.serviceprovider.ServiceProvider; +import org.graalvm.compiler.word.Word; +import jdk.internal.vm.compiler.word.Pointer; +import jdk.internal.vm.compiler.word.WordFactory; import jdk.vm.ci.common.NativeImageReinitialize; import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; @@ -53,7 +59,10 @@ public class HotSpotTTYStreamProvider implements TTYStreamProvider { // @formatter:off @Option(help = "File to which logging is sent. A %p in the name will be replaced with a string identifying " + - "the process, usually the process id and %t will be replaced by System.currentTimeMillis(). " + + "the process, usually the process id and %t will be replaced by System.currentTimeMillis(). " + + "If the current runtime is in an isolate, then %i will be replaced by '' " + + "otherwise %i is removed. An %I is the same as %i except that the replacement is " + + "'@'. " + "Using %o as filename sends logging to System.out whereas %e sends logging to System.err.", type = OptionType.Expert) public static final LogStreamOptionKey LogFile = new LogStreamOptionKey(); // @formatter:on @@ -64,6 +73,55 @@ public class HotSpotTTYStreamProvider implements TTYStreamProvider { return Options.LogFile.getStream(); } + static { + Word.ensureInitialized(); + } + + /** + * Gets a pointer to a global word initialized to 0. + */ + private static Pointer getBarrierPointer() { + // Substituted by Target_org_graalvm_compiler_hotspot_HotSpotTTYStreamProvider + return WordFactory.nullPointer(); + } + + /** + * Executes {@code action}. If {@code barrier.isNonNull()}, then {@code barrier} is used to + * ensure the action is executed exactly once in the process (i.e. synchronized across all + * threads and isolates) and that threads will block here until the action is guaranteed to have + * been executed. Note that each {@code barrier} is specific to a specific {@code action} and + * cannot be used for any other action. + */ + private static boolean execute(Runnable action, Pointer barrier) { + if (barrier.isNull()) { + action.run(); + return true; + } + final long initial = 0L; + final long executing = 1L; + final long executed = 2L; + + while (true) { + long value = barrier.readLong(0); + if (value == initial) { + if (barrier.compareAndSwapLong(0, value, executing, ANY_LOCATION) == value) { + action.run(); + barrier.writeLong(0, executed); + return true; + } + } else { + if (value == executed) { + return false; + } + try { + Thread.sleep(5); + } catch (InterruptedException e) { + } + value = barrier.readLong(0); + } + } + } + /** * An option for a configurable file name that can also open a {@link PrintStream} on the file. * If no value is given for the option, the stream will output to HotSpot's @@ -84,10 +142,16 @@ public class HotSpotTTYStreamProvider implements TTYStreamProvider { private static String makeFilename(String nameTemplate) { String name = nameTemplate; if (name.contains("%p")) { - name = name.replaceAll("%p", GraalServices.getExecutionID()); + name = name.replace("%p", GraalServices.getExecutionID()); + } + if (name.contains("%i")) { + name = name.replace("%i", IsolateUtil.getIsolateID(false)); + } + if (name.contains("%I")) { + name = name.replace("%I", IsolateUtil.getIsolateID(true)); } if (name.contains("%t")) { - name = name.replaceAll("%t", String.valueOf(System.currentTimeMillis())); + name = name.replace("%t", String.valueOf(System.currentTimeMillis())); } for (String subst : new String[]{"%o", "%e"}) { @@ -108,7 +172,7 @@ public class HotSpotTTYStreamProvider implements TTYStreamProvider { class DelayedOutputStream extends OutputStream { @NativeImageReinitialize private volatile OutputStream lazy; - private OutputStream lazy() { + private OutputStream lazy() throws FileNotFoundException { if (lazy == null) { synchronized (this) { if (lazy == null) { @@ -123,27 +187,29 @@ public class HotSpotTTYStreamProvider implements TTYStreamProvider { lazy = System.err; break; default: - try { - final boolean enableAutoflush = true; - FileOutputStream result = new FileOutputStream(name); - if (!Services.IS_IN_NATIVE_IMAGE) { - printVMConfig(enableAutoflush, result); - } else { - // There are no VM arguments for the libgraal - // library. + boolean executed = execute(() -> { + File file = new File(name); + if (file.exists()) { + file.delete(); } - lazy = result; - } catch (FileNotFoundException e) { - throw new RuntimeException("couldn't open file: " + name, e); + }, getBarrierPointer()); + final boolean enableAutoflush = true; + FileOutputStream result = new FileOutputStream(name, true); + if (executed) { + printVMConfig(enableAutoflush, result); } + lazy = result; } return lazy; } lazy = HotSpotJVMCIRuntime.runtime().getLogStream(); - PrintStream ps = new PrintStream(lazy); - ps.printf("[Use -D%sLogFile= to redirect Graal log output to a file.]%n", GRAAL_OPTION_PROPERTY_PREFIX); - ps.flush(); + execute(() -> { + PrintStream ps = new PrintStream(lazy); + ps.printf("[Use -D%sLogFile= to redirect Graal log output to a file.]%n", GRAAL_OPTION_PROPERTY_PREFIX); + ps.flush(); + + }, getBarrierPointer()); } } } @@ -195,5 +261,4 @@ public class HotSpotTTYStreamProvider implements TTYStreamProvider { return new PrintStream(new DelayedOutputStream()); } } - } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/JFRCompilerProfiler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/JFRCompilerProfiler.java new file mode 100644 index 00000000000..626c5c908ce --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/JFRCompilerProfiler.java @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.hotspot; + +import org.graalvm.compiler.core.common.CompilerProfiler; +import org.graalvm.compiler.serviceprovider.ServiceProvider; + +import jdk.vm.ci.hotspot.JFR; +import jdk.vm.ci.meta.ResolvedJavaMethod; + +/** + * A HotSpot JFR implementation of {@link CompilerProfiler}. + */ +@ServiceProvider(CompilerProfiler.class) +public final class JFRCompilerProfiler implements CompilerProfiler { + + @Override + public long getTicks() { + return JFR.Ticks.now(); + } + + @Override + public void notifyCompilerPhaseEvent(int compileId, long startTime, String name, int nestingLevel) { + JFR.CompilerPhaseEvent.write(startTime, name, compileId, nestingLevel); + } + + @Override + public void notifyCompilerInlingEvent(int compileId, ResolvedJavaMethod caller, ResolvedJavaMethod callee, + boolean succeeded, String message, int bci) { + JFR.CompilerInliningEvent.write(compileId, caller, callee, succeeded, message, bci); + } + +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/JVMCIVersionCheck.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/JVMCIVersionCheck.java index 270bde1fb91..c25b74b3f16 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/JVMCIVersionCheck.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/JVMCIVersionCheck.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -43,11 +43,18 @@ import java.util.regex.Pattern; */ public final class JVMCIVersionCheck { - private static final Version JVMCI_MIN_VERSION = new Version3(19, 3, 4); + private static final Version JVMCI_MIN_VERSION = new Version3(20, 1, 2); public interface Version { boolean isLessThan(Version other); + default boolean isGreaterThan(Version other) { + if (!isLessThan(other)) { + return !equals(other); + } + return false; + } + static Version parse(String vmVersion) { Matcher m = Pattern.compile(".*-jvmci-(\\d+)\\.(\\d+)-b(\\d+).*").matcher(vmVersion); if (m.matches()) { @@ -98,6 +105,20 @@ public final class JVMCIVersionCheck { return false; } + @Override + public boolean equals(Object obj) { + if (obj instanceof Version2) { + Version2 that = (Version2) obj; + return this.major == that.major && this.minor == that.minor; + } + return false; + } + + @Override + public int hashCode() { + return this.major ^ this.minor; + } + @Override public String toString() { if (major >= 19) { @@ -139,6 +160,20 @@ public final class JVMCIVersionCheck { return false; } + @Override + public boolean equals(Object obj) { + if (obj instanceof Version3) { + Version3 that = (Version3) obj; + return this.major == that.major && this.minor == that.minor && this.build == that.build; + } + return false; + } + + @Override + public int hashCode() { + return this.major ^ this.minor ^ this.build; + } + @Override public String toString() { return String.format("%d.%d-b%02d", major, minor, build); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/SymbolicSnippetEncoder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/SymbolicSnippetEncoder.java index 5c6ff405f32..a210a721e3b 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/SymbolicSnippetEncoder.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/SymbolicSnippetEncoder.java @@ -24,10 +24,10 @@ package org.graalvm.compiler.hotspot; -import static jdk.vm.ci.runtime.JVMCI.getRuntime; import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE; import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE; import static org.graalvm.compiler.core.common.GraalOptions.UseEncodedGraphs; +import static org.graalvm.compiler.hotspot.EncodedSnippets.methodKey; import static org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createIntrinsicInlineInfo; import static org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING; import static org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.ROOT_COMPILATION_ENCODING; @@ -43,13 +43,10 @@ import java.util.Set; import jdk.internal.vm.compiler.collections.EconomicMap; import jdk.internal.vm.compiler.collections.EconomicSet; import jdk.internal.vm.compiler.collections.MapCursor; -import jdk.internal.vm.compiler.collections.UnmodifiableEconomicMap; import org.graalvm.compiler.api.replacements.Fold; import org.graalvm.compiler.api.replacements.MethodSubstitution; import org.graalvm.compiler.api.replacements.Snippet; import org.graalvm.compiler.api.replacements.SnippetReflectionProvider; -import org.graalvm.compiler.api.runtime.GraalJVMCICompiler; -import org.graalvm.compiler.api.runtime.GraalRuntime; import org.graalvm.compiler.bytecode.BytecodeProvider; import org.graalvm.compiler.bytecode.ResolvedJavaMethodBytecode; import org.graalvm.compiler.core.common.type.AbstractObjectStamp; @@ -62,13 +59,18 @@ import org.graalvm.compiler.graph.Node; import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.graph.NodeMap; import org.graalvm.compiler.graph.NodeSourcePosition; +import org.graalvm.compiler.hotspot.EncodedSnippets.GraalCapability; +import org.graalvm.compiler.hotspot.EncodedSnippets.SymbolicEncodedGraph; +import org.graalvm.compiler.hotspot.EncodedSnippets.SymbolicResolvedJavaField; +import org.graalvm.compiler.hotspot.EncodedSnippets.SymbolicResolvedJavaMethod; +import org.graalvm.compiler.hotspot.EncodedSnippets.SymbolicResolvedJavaMethodBytecode; +import org.graalvm.compiler.hotspot.EncodedSnippets.SymbolicStampPair; import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProvider; import org.graalvm.compiler.hotspot.meta.HotSpotProviders; import org.graalvm.compiler.java.BytecodeParser; import org.graalvm.compiler.java.GraphBuilderPhase; import org.graalvm.compiler.nodeinfo.Verbosity; import org.graalvm.compiler.nodes.CallTargetNode; -import org.graalvm.compiler.nodes.Cancellable; import org.graalvm.compiler.nodes.ConstantNode; import org.graalvm.compiler.nodes.EncodedGraph; import org.graalvm.compiler.nodes.FrameState; @@ -91,6 +93,7 @@ import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin; import org.graalvm.compiler.nodes.graphbuilderconf.ParameterPlugin; import org.graalvm.compiler.nodes.java.AccessFieldNode; import org.graalvm.compiler.nodes.java.MethodCallTargetNode; +import org.graalvm.compiler.nodes.spi.SnippetParameterInfo; import org.graalvm.compiler.nodes.virtual.VirtualObjectNode; import org.graalvm.compiler.options.OptionValues; import org.graalvm.compiler.phases.OptimisticOptimizations; @@ -117,8 +120,6 @@ import jdk.vm.ci.meta.MethodHandleAccessProvider; import jdk.vm.ci.meta.ResolvedJavaField; import jdk.vm.ci.meta.ResolvedJavaMethod; import jdk.vm.ci.meta.ResolvedJavaType; -import jdk.vm.ci.meta.UnresolvedJavaField; -import jdk.vm.ci.meta.UnresolvedJavaMethod; import jdk.vm.ci.meta.UnresolvedJavaType; /** @@ -134,14 +135,9 @@ public class SymbolicSnippetEncoder { */ private final HotSpotSnippetReplacementsImpl snippetReplacements; - /** - * The set of all snippet methods that have been encoded. - */ - private final Set snippetMethods = Collections.synchronizedSet(new HashSet<>()); - /** * A mapping from the method substitution method to the original method name. The string key and - * values are produced using {@link #methodKey(ResolvedJavaMethod)}. + * values are produced using {@link EncodedSnippets#methodKey(ResolvedJavaMethod)}. */ private final EconomicMap originalMethods = EconomicMap.create(); @@ -158,6 +154,8 @@ public class SymbolicSnippetEncoder { */ private EconomicMap preparedSnippetGraphs = EconomicMap.create(); + private EconomicMap snippetParameterInfos = EconomicMap.create(); + private EconomicSet knownPlugins = EconomicSet.create(); private EconomicSet conditionalPlugins = EconomicSet.create(); @@ -173,8 +171,11 @@ public class SymbolicSnippetEncoder { delayedInvocationPluginMethods.add(method); } - Set getSnippetMethods() { - return snippetMethods; + public void clearSnippetParameterNames() { + MapCursor cursor = snippetParameterInfos.getEntries(); + while (cursor.advance()) { + cursor.getValue().clearNames(); + } } protected class SnippetInlineInvokePlugin implements InlineInvokePlugin { @@ -242,14 +243,6 @@ public class SymbolicSnippetEncoder { } } - /** - * Generate a String name for a method including all type information. Used as a symbolic key - * for lookup. - */ - private static String methodKey(ResolvedJavaMethod method) { - return method.format("%H.%n(%P)"); - } - SymbolicSnippetEncoder(HotSpotReplacementsImpl replacements) { this.originalReplacements = replacements; GraphBuilderConfiguration.Plugins plugins = replacements.getGraphBuilderPlugins(); @@ -285,135 +278,10 @@ public class SymbolicSnippetEncoder { assert method.getAnnotation(MethodSubstitution.class) != null : "MethodSubstitution must be annotated with @" + MethodSubstitution.class.getSimpleName(); String originalMethodString = plugin.originalMethodAsString(); StructuredGraph subst = buildGraph(method, original, originalMethodString, null, true, false, context, options); - snippetMethods.add(method); originalMethods.put(methodKey(method), originalMethodString); preparedSnippetGraphs.put(plugin.toString() + context, subst); } - public static class EncodedSnippets { - private final byte[] snippetEncoding; - private final Object[] snippetObjects; - private final NodeClass[] snippetNodeClasses; - private final UnmodifiableEconomicMap snippetStartOffsets; - private final UnmodifiableEconomicMap originalMethods; - - EncodedSnippets(byte[] snippetEncoding, Object[] snippetObjects, NodeClass[] snippetNodeClasses, UnmodifiableEconomicMap snippetStartOffsets, - UnmodifiableEconomicMap originalMethods) { - this.snippetEncoding = snippetEncoding; - this.snippetObjects = snippetObjects; - this.snippetNodeClasses = snippetNodeClasses; - this.snippetStartOffsets = snippetStartOffsets; - this.originalMethods = originalMethods; - } - - public byte[] getSnippetEncoding() { - return snippetEncoding; - } - - public NodeClass[] getSnippetNodeClasses() { - return snippetNodeClasses; - } - - public UnmodifiableEconomicMap getSnippetStartOffsets() { - return snippetStartOffsets; - } - - public UnmodifiableEconomicMap getOriginalMethods() { - return originalMethods; - } - - StructuredGraph getMethodSubstitutionGraph(MethodSubstitutionPlugin plugin, ResolvedJavaMethod original, ReplacementsImpl replacements, IntrinsicContext.CompilationContext context, - StructuredGraph.AllowAssumptions allowAssumptions, Cancellable cancellable, OptionValues options) { - IntrinsicContext.CompilationContext contextToUse = context; - if (context == IntrinsicContext.CompilationContext.ROOT_COMPILATION) { - contextToUse = IntrinsicContext.CompilationContext.ROOT_COMPILATION_ENCODING; - } - Integer startOffset = snippetStartOffsets.get(plugin.toString() + contextToUse); - if (startOffset == null) { - throw GraalError.shouldNotReachHere("plugin graph not found: " + plugin + " with " + contextToUse); - } - - ResolvedJavaType accessingClass = replacements.getProviders().getMetaAccess().lookupJavaType(plugin.getDeclaringClass()); - return decodeGraph(original, accessingClass, startOffset, replacements, contextToUse, allowAssumptions, cancellable, options); - } - - @SuppressWarnings("try") - private StructuredGraph decodeGraph(ResolvedJavaMethod method, - ResolvedJavaType accessingClass, - int startOffset, - ReplacementsImpl replacements, - IntrinsicContext.CompilationContext context, - StructuredGraph.AllowAssumptions allowAssumptions, - Cancellable cancellable, - OptionValues options) { - Providers providers = replacements.getProviders(); - EncodedGraph encodedGraph = new SymbolicEncodedGraph(snippetEncoding, startOffset, snippetObjects, snippetNodeClasses, - methodKey(method), accessingClass, method.getDeclaringClass()); - try (DebugContext debug = replacements.openDebugContext("SVMSnippet_", method, options)) { - StructuredGraph result = new StructuredGraph.Builder(options, debug, allowAssumptions).cancellable(cancellable).method(method).setIsSubstitution(true).build(); - PEGraphDecoder graphDecoder = new SubstitutionGraphDecoder(providers, result, replacements, null, method, context, encodedGraph); - - graphDecoder.decode(method, result.isSubstitution(), encodedGraph.trackNodeSourcePosition()); - - assert result.verify(); - return result; - } - } - - StructuredGraph getEncodedSnippet(ResolvedJavaMethod method, ReplacementsImpl replacements, Object[] args, StructuredGraph.AllowAssumptions allowAssumptions, OptionValues options) { - Integer startOffset = null; - if (snippetStartOffsets != null) { - startOffset = snippetStartOffsets.get(methodKey(method)); - } - if (startOffset == null) { - if (IS_IN_NATIVE_IMAGE) { - throw GraalError.shouldNotReachHere("snippet not found: " + method.format("%H.%n(%p)")); - } else { - return null; - } - } - - SymbolicEncodedGraph encodedGraph = new SymbolicEncodedGraph(snippetEncoding, startOffset, snippetObjects, snippetNodeClasses, - originalMethods.get(methodKey(method)), method.getDeclaringClass()); - return decodeSnippetGraph(encodedGraph, method, replacements, args, allowAssumptions, options); - } - - } - - private static class SubstitutionGraphDecoder extends PEGraphDecoder { - private final ResolvedJavaMethod method; - private final EncodedGraph encodedGraph; - private IntrinsicContext intrinsic; - - SubstitutionGraphDecoder(Providers providers, StructuredGraph result, ReplacementsImpl replacements, ParameterPlugin parameterPlugin, ResolvedJavaMethod method, - IntrinsicContext.CompilationContext context, EncodedGraph encodedGraph) { - super(providers.getCodeCache().getTarget().arch, result, providers, null, - replacements.getGraphBuilderPlugins().getInvocationPlugins(), new InlineInvokePlugin[0], parameterPlugin, - null, null, null, null); - this.method = method; - this.encodedGraph = encodedGraph; - intrinsic = new IntrinsicContext(method, null, replacements.getDefaultReplacementBytecodeProvider(), context, false); - } - - @Override - protected EncodedGraph lookupEncodedGraph(ResolvedJavaMethod lookupMethod, - MethodSubstitutionPlugin plugin, - BytecodeProvider intrinsicBytecodeProvider, - boolean isSubstitution, - boolean trackNodeSourcePosition) { - if (lookupMethod.equals(method)) { - return encodedGraph; - } else { - throw GraalError.shouldNotReachHere(method.format("%H.%n(%p)")); - } - } - - @Override - protected IntrinsicContext getIntrinsic() { - return intrinsic; - } - } - private StructuredGraph buildGraph(ResolvedJavaMethod method, ResolvedJavaMethod original, String originalMethodString, Object receiver, boolean requireInlining, boolean trackNodeSourcePosition, IntrinsicContext.CompilationContext context, OptionValues options) { assert method.hasBytecodes() : "Snippet must not be abstract or native"; @@ -460,16 +328,17 @@ public class SymbolicSnippetEncoder { try (DebugContext debug = replacements.openDebugContext("SVMSnippet_", method, options)) { // @formatter:off + boolean isSubstitution = true; StructuredGraph result = new StructuredGraph.Builder(options, debug, allowAssumptions) .method(method) .trackNodeSourcePosition(encodedGraph.trackNodeSourcePosition()) - .setIsSubstitution(true) + .setIsSubstitution(isSubstitution) .build(); // @formatter:on try (DebugContext.Scope scope = debug.scope("DecodeSnippetGraph", result)) { - PEGraphDecoder graphDecoder = new SubstitutionGraphDecoder(providers, result, replacements, parameterPlugin, method, INLINE_AFTER_PARSING, encodedGraph); + PEGraphDecoder graphDecoder = new EncodedSnippets.SubstitutionGraphDecoder(providers, result, replacements, parameterPlugin, method, INLINE_AFTER_PARSING, encodedGraph); - graphDecoder.decode(method, result.isSubstitution(), encodedGraph.trackNodeSourcePosition()); + graphDecoder.decode(method, isSubstitution, encodedGraph.trackNodeSourcePosition()); debug.dump(DebugContext.VERBOSE_LEVEL, result, "After decoding"); assert result.verify(); @@ -494,7 +363,7 @@ public class SymbolicSnippetEncoder { HotSpotProviders newProviders = new HotSpotProviders(originalProvider.getMetaAccess(), originalProvider.getCodeCache(), constantReflection, originalProvider.getConstantFieldProvider(), originalProvider.getForeignCalls(), originalProvider.getLowerer(), null, originalProvider.getSuites(), originalProvider.getRegisters(), snippetReflection, originalProvider.getWordTypes(), originalProvider.getGraphBuilderPlugins(), - originalProvider.getPlatformConfigurationProvider()); + originalProvider.getPlatformConfigurationProvider(), originalProvider.getMetaAccessExtensionProvider()); HotSpotSnippetReplacementsImpl filteringReplacements = new HotSpotSnippetReplacementsImpl(newProviders, snippetReflection, originalProvider.getReplacements().getDefaultReplacementBytecodeProvider(), originalProvider.getCodeCache().getTarget()); filteringReplacements.setGraphBuilderPlugins(originalProvider.getReplacements().getGraphBuilderPlugins()); @@ -567,8 +436,8 @@ public class SymbolicSnippetEncoder { originalMethods.put(key, methodKey(original)); } StructuredGraph snippet = buildGraph(method, original, null, receiver, true, trackNodeSourcePosition, INLINE_AFTER_PARSING, options); - snippetMethods.add(method); preparedSnippetGraphs.put(key, snippet); + snippetParameterInfos.put(key, new SnippetParameterInfo(method)); } } @@ -600,7 +469,7 @@ public class SymbolicSnippetEncoder { snippetObjects[i] = o; } debug.log("Encoded %d snippet preparedSnippetGraphs using %d bytes with %d objects", snippetStartOffsets.size(), snippetEncoding.length, snippetObjects.length); - return new EncodedSnippets(snippetEncoding, snippetObjects, snippetNodeClasses, snippetStartOffsets, originalMethods); + return new EncodedSnippets(snippetEncoding, snippetObjects, snippetNodeClasses, snippetStartOffsets, originalMethods, snippetParameterInfos); } /** @@ -608,10 +477,12 @@ public class SymbolicSnippetEncoder { */ @SuppressWarnings("try") public boolean encode(OptionValues options) { - EncodedSnippets encodedSnippets = maybeEncodeSnippets(options); - if (encodedSnippets != null) { - HotSpotReplacementsImpl.setEncodedSnippets(encodedSnippets); - return true; + if (!IS_IN_NATIVE_IMAGE) { + EncodedSnippets encodedSnippets = maybeEncodeSnippets(options); + if (encodedSnippets != null) { + HotSpotReplacementsImpl.setEncodedSnippets(encodedSnippets); + return true; + } } return false; } @@ -620,216 +491,6 @@ public class SymbolicSnippetEncoder { return snippetReplacements.openDebugContext(idPrefix, method, options); } - static class SymbolicEncodedGraph extends EncodedGraph { - - private final ResolvedJavaType[] accessingClasses; - private final String originalMethod; - - SymbolicEncodedGraph(byte[] encoding, int startOffset, Object[] objects, NodeClass[] types, String originalMethod, ResolvedJavaType... accessingClasses) { - super(encoding, startOffset, objects, types, null, null, null, false, false); - this.accessingClasses = accessingClasses; - this.originalMethod = originalMethod; - } - - SymbolicEncodedGraph(EncodedGraph encodedGraph, ResolvedJavaType declaringClass, String originalMethod) { - this(encodedGraph.getEncoding(), encodedGraph.getStartOffset(), encodedGraph.getObjects(), encodedGraph.getNodeClasses(), - originalMethod, declaringClass); - } - - @Override - public Object getObject(int i) { - Object o = objects[i]; - Object replacement = null; - if (o instanceof SymbolicJVMCIReference) { - for (ResolvedJavaType type : accessingClasses) { - try { - replacement = ((SymbolicJVMCIReference) o).resolve(type); - break; - } catch (NoClassDefFoundError e) { - } - } - } else if (o instanceof UnresolvedJavaType) { - for (ResolvedJavaType type : accessingClasses) { - try { - replacement = ((UnresolvedJavaType) o).resolve(type); - break; - } catch (NoClassDefFoundError e) { - } - } - } else if (o instanceof UnresolvedJavaMethod) { - throw new InternalError(o.toString()); - } else if (o instanceof UnresolvedJavaField) { - for (ResolvedJavaType type : accessingClasses) { - try { - replacement = ((UnresolvedJavaField) o).resolve(type); - break; - } catch (NoClassDefFoundError e) { - } - } - } else if (o instanceof GraalCapability) { - replacement = ((GraalCapability) o).resolve(((GraalJVMCICompiler) getRuntime().getCompiler()).getGraalRuntime()); - } else { - return o; - } - if (replacement != null) { - objects[i] = o = replacement; - } else { - throw new GraalError("Can't resolve " + o); - } - return o; - } - - @Override - public boolean isCallToOriginal(ResolvedJavaMethod callTarget) { - if (originalMethod != null && originalMethod.equals(methodKey(callTarget))) { - return true; - } - return super.isCallToOriginal(callTarget); - } - } - - /** - * Symbolic reference to an object which can be retrieved from - * {@link GraalRuntime#getCapability(Class)}. - */ - static class GraalCapability { - final Class capabilityClass; - - GraalCapability(Class capabilityClass) { - this.capabilityClass = capabilityClass; - } - - public Object resolve(GraalRuntime runtime) { - Object capability = runtime.getCapability(this.capabilityClass); - if (capability != null) { - assert capability.getClass() == capabilityClass; - return capability; - } - throw new InternalError(this.capabilityClass.getName()); - } - } - - static class SymbolicResolvedJavaMethod implements SymbolicJVMCIReference { - final UnresolvedJavaType type; - final String methodName; - final String signature; - - SymbolicResolvedJavaMethod(ResolvedJavaMethod method) { - this.type = UnresolvedJavaType.create(method.getDeclaringClass().getName()); - this.methodName = method.getName(); - this.signature = method.getSignature().toMethodDescriptor(); - } - - @Override - public String toString() { - return "SymbolicResolvedJavaMethod{" + - "declaringType='" + type.getName() + '\'' + - ", methodName='" + methodName + '\'' + - ", signature='" + signature + '\'' + - '}'; - } - - @Override - public ResolvedJavaMethod resolve(ResolvedJavaType accessingClass) { - ResolvedJavaType resolvedType = type.resolve(accessingClass); - if (resolvedType == null) { - throw new InternalError("Could not resolve " + this + " in context of " + accessingClass.toJavaName()); - } - for (ResolvedJavaMethod method : methodName.equals("") ? resolvedType.getDeclaredConstructors() : resolvedType.getDeclaredMethods()) { - if (method.getName().equals(methodName) && method.getSignature().toMethodDescriptor().equals(signature)) { - return method; - } - } - throw new InternalError("Could not resolve " + this + " in context of " + accessingClass.toJavaName()); - } - } - - static class SymbolicResolvedJavaField implements SymbolicJVMCIReference { - final UnresolvedJavaType declaringType; - final String name; - final UnresolvedJavaType signature; - private final boolean isStatic; - - SymbolicResolvedJavaField(ResolvedJavaField field) { - this.declaringType = UnresolvedJavaType.create(field.getDeclaringClass().getName()); - this.name = field.getName(); - this.signature = UnresolvedJavaType.create(field.getType().getName()); - this.isStatic = field.isStatic(); - } - - @Override - public ResolvedJavaField resolve(ResolvedJavaType accessingClass) { - ResolvedJavaType resolvedType = declaringType.resolve(accessingClass); - ResolvedJavaType resolvedFieldType = signature.resolve(accessingClass); - ResolvedJavaField[] fields = isStatic ? resolvedType.getStaticFields() : resolvedType.getInstanceFields(true); - for (ResolvedJavaField field : fields) { - if (field.getName().equals(name)) { - if (field.getType().equals(resolvedFieldType)) { - return field; - } - } - } - throw new InternalError("Could not resolve " + this + " in context of " + accessingClass.toJavaName()); - } - - @Override - public String toString() { - return "SymbolicResolvedJavaField{" + - signature.getName() + ' ' + - declaringType.getName() + '.' + - name + - '}'; - } - } - - static class SymbolicResolvedJavaMethodBytecode implements SymbolicJVMCIReference { - SymbolicResolvedJavaMethod method; - - SymbolicResolvedJavaMethodBytecode(ResolvedJavaMethodBytecode bytecode) { - method = new SymbolicResolvedJavaMethod(bytecode.getMethod()); - } - - @Override - public ResolvedJavaMethodBytecode resolve(ResolvedJavaType accessingClass) { - return new ResolvedJavaMethodBytecode(method.resolve(accessingClass)); - } - } - - static class SymbolicStampPair implements SymbolicJVMCIReference { - Object trustedStamp; - Object uncheckdStamp; - - SymbolicStampPair(StampPair stamp) { - this.trustedStamp = maybeMakeSymbolic(stamp.getTrustedStamp()); - this.uncheckdStamp = maybeMakeSymbolic(stamp.getUncheckedStamp()); - } - - @Override - public StampPair resolve(ResolvedJavaType accessingClass) { - return StampPair.create(resolveStamp(accessingClass, trustedStamp), resolveStamp(accessingClass, uncheckdStamp)); - } - } - - private static Object maybeMakeSymbolic(Stamp trustedStamp) { - if (trustedStamp != null) { - SymbolicJVMCIReference symbolicJVMCIReference = trustedStamp.makeSymbolic(); - if (symbolicJVMCIReference != null) { - return symbolicJVMCIReference; - } - } - return trustedStamp; - } - - private static Stamp resolveStamp(ResolvedJavaType accessingClass, Object stamp) { - if (stamp == null) { - return null; - } - if (stamp instanceof Stamp) { - return (Stamp) stamp; - } - return (Stamp) ((SymbolicJVMCIReference) stamp).resolve(accessingClass); - } - public static class HotSpotSubstrateConstantReflectionProvider implements ConstantReflectionProvider { private final ConstantReflectionProvider constantReflection; @@ -1082,6 +743,12 @@ public class SymbolicSnippetEncoder { protected GraphMaker createGraphMaker(ResolvedJavaMethod substitute, ResolvedJavaMethod original) { return new SnippetGraphMaker(this, substitute, original); } + + @Override + public boolean isEncodingSnippets() { + return true; + } + } class SnippetGraphMaker extends ReplacementsImpl.GraphMaker { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java index b47fd242732..bb7cd9713d3 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java @@ -46,7 +46,9 @@ import org.graalvm.compiler.api.directives.GraalDirectives; import org.graalvm.compiler.core.common.CompressEncoding; import org.graalvm.compiler.core.common.GraalOptions; import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; +import org.graalvm.compiler.core.common.spi.ForeignCallSignature; import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; +import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider; import org.graalvm.compiler.core.common.type.ObjectStamp; import org.graalvm.compiler.core.common.type.Stamp; import org.graalvm.compiler.core.common.type.StampFactory; @@ -144,12 +146,12 @@ import org.graalvm.compiler.nodes.java.InstanceOfDynamicNode; import org.graalvm.compiler.nodes.java.InstanceOfNode; import org.graalvm.compiler.nodes.java.LoadExceptionObjectNode; import org.graalvm.compiler.nodes.java.MethodCallTargetNode; +import org.graalvm.compiler.nodes.java.MonitorEnterNode; import org.graalvm.compiler.nodes.java.MonitorExitNode; import org.graalvm.compiler.nodes.java.MonitorIdNode; import org.graalvm.compiler.nodes.java.NewArrayNode; import org.graalvm.compiler.nodes.java.NewInstanceNode; import org.graalvm.compiler.nodes.java.NewMultiArrayNode; -import org.graalvm.compiler.nodes.java.RawMonitorEnterNode; import org.graalvm.compiler.nodes.memory.FloatingReadNode; import org.graalvm.compiler.nodes.memory.OnHeapMemoryAccess.BarrierType; import org.graalvm.compiler.nodes.memory.ReadNode; @@ -209,8 +211,9 @@ public abstract class DefaultHotSpotLoweringProvider extends DefaultJavaLowering protected ForeignCallSnippets.Templates foreignCallSnippets; public DefaultHotSpotLoweringProvider(HotSpotGraalRuntimeProvider runtime, MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls, HotSpotRegistersProvider registers, - HotSpotConstantReflectionProvider constantReflection, PlatformConfigurationProvider platformConfig, TargetDescription target) { - super(metaAccess, foreignCalls, platformConfig, target, runtime.getVMConfig().useCompressedOops); + HotSpotConstantReflectionProvider constantReflection, PlatformConfigurationProvider platformConfig, MetaAccessExtensionProvider metaAccessExtensionProvider, + TargetDescription target) { + super(metaAccess, foreignCalls, platformConfig, metaAccessExtensionProvider, target, runtime.getVMConfig().useCompressedOops); this.runtime = runtime; this.registers = registers; this.constantReflection = constantReflection; @@ -296,7 +299,8 @@ public abstract class DefaultHotSpotLoweringProvider extends DefaultJavaLowering if (instanceOfDynamicNode.allowsNull()) { ValueNode object = instanceOfDynamicNode.getObject(); LogicNode newTypeCheck = graph.addOrUniqueWithInputs( - InstanceOfDynamicNode.create(graph.getAssumptions(), tool.getConstantReflection(), instanceOfDynamicNode.getMirrorOrHub(), object, false)); + InstanceOfDynamicNode.create(graph.getAssumptions(), tool.getConstantReflection(), instanceOfDynamicNode.getMirrorOrHub(), object, + false/* null checked below */, instanceOfDynamicNode.isExact())); LogicNode newNode = LogicNode.or(graph.unique(IsNullNode.create(object)), newTypeCheck, GraalDirectives.UNLIKELY_PROBABILITY); instanceOfDynamicNode.replaceAndDelete(newNode); } @@ -337,9 +341,11 @@ public abstract class DefaultHotSpotLoweringProvider extends DefaultJavaLowering if (graph.getGuardsStage().areFrameStatesAtDeopts()) { allocationSnippets.lower((VerifyHeapNode) n, tool); } - } else if (n instanceof RawMonitorEnterNode) { + } else if (n instanceof MonitorEnterNode) { if (graph.getGuardsStage().areFrameStatesAtDeopts()) { - monitorSnippets.lower((RawMonitorEnterNode) n, registers, tool); + monitorSnippets.lower((MonitorEnterNode) n, registers, tool); + } else { + loadHubForMonitorEnterNode((MonitorEnterNode) n, tool, graph); } } else if (n instanceof MonitorExitNode) { if (graph.getGuardsStage().areFrameStatesAtDeopts()) { @@ -427,6 +433,14 @@ public abstract class DefaultHotSpotLoweringProvider extends DefaultJavaLowering } + protected void loadHubForMonitorEnterNode(MonitorEnterNode monitor, LoweringTool tool, StructuredGraph graph) { + if (monitor.getObjectData() == null) { + ValueNode objectNonNull = createNullCheckedValue(monitor.object(), monitor, tool); + monitor.setObject(objectNonNull); + monitor.setObjectData(graph.addOrUnique(LoadHubNode.create(objectNonNull, tool.getStampProvider(), tool.getMetaAccess(), tool.getConstantReflection()))); + } + } + private static void lowerComputeObjectAddressNode(ComputeObjectAddressNode n) { /* * Lower the node into a ComputeObjectAddress node and an Add but ensure that it's below any @@ -591,6 +605,7 @@ public abstract class DefaultHotSpotLoweringProvider extends DefaultJavaLowering private void lowerStoreHubNode(StoreHubNode storeHub, StructuredGraph graph) { WriteNode hub = createWriteHub(graph, storeHub.getObject(), storeHub.getValue()); + hub.setStateAfter(storeHub.stateAfter()); graph.replaceFixed(storeHub, hub); } @@ -599,7 +614,7 @@ public abstract class DefaultHotSpotLoweringProvider extends DefaultJavaLowering if (graph.getGuardsStage() == StructuredGraph.GuardsStage.FIXED_DEOPTS) { StartNode newStart = graph.add(new StartNode()); ParameterNode buffer = graph.addWithoutUnique(new ParameterNode(0, StampPair.createSingle(StampFactory.forKind(runtime.getTarget().wordJavaKind)))); - ForeignCallNode migrationEnd = graph.add(new ForeignCallNode(foreignCalls, OSR_MIGRATION_END, buffer)); + ForeignCallNode migrationEnd = graph.add(new ForeignCallNode(OSR_MIGRATION_END, buffer)); migrationEnd.setStateAfter(osrStart.stateAfter()); newStart.setNext(migrationEnd); FixedNode next = osrStart.next(); @@ -649,7 +664,7 @@ public abstract class DefaultHotSpotLoweringProvider extends DefaultJavaLowering // write the displaced mark to the correct stack slot AddressNode addressDisplacedMark = createOffsetAddress(graph, beginLockScope, runtime.getVMConfig().basicLockDisplacedHeaderOffset); - WriteNode writeStackSlot = graph.add(new WriteNode(addressDisplacedMark, DISPLACED_MARK_WORD_LOCATION, loadDisplacedHeader, BarrierType.NONE, false)); + WriteNode writeStackSlot = graph.add(new WriteNode(addressDisplacedMark, DISPLACED_MARK_WORD_LOCATION, loadDisplacedHeader, BarrierType.NONE)); graph.addBeforeFixed(migrationEnd, writeStackSlot); // load the lock object from the osr buffer @@ -682,17 +697,17 @@ public abstract class DefaultHotSpotLoweringProvider extends DefaultJavaLowering } public static final class RuntimeCalls { - public static final EnumMap runtimeCalls; + public static final EnumMap runtimeCalls; static { runtimeCalls = new EnumMap<>(BytecodeExceptionKind.class); - runtimeCalls.put(BytecodeExceptionKind.ARRAY_STORE, new ForeignCallDescriptor("createArrayStoreException", ArrayStoreException.class, Object.class)); - runtimeCalls.put(BytecodeExceptionKind.CLASS_CAST, new ForeignCallDescriptor("createClassCastException", ClassCastException.class, Object.class, KlassPointer.class)); - runtimeCalls.put(BytecodeExceptionKind.NULL_POINTER, new ForeignCallDescriptor("createNullPointerException", NullPointerException.class)); - runtimeCalls.put(BytecodeExceptionKind.OUT_OF_BOUNDS, new ForeignCallDescriptor("createOutOfBoundsException", ArrayIndexOutOfBoundsException.class, int.class, int.class)); - runtimeCalls.put(BytecodeExceptionKind.DIVISION_BY_ZERO, new ForeignCallDescriptor("createDivisionByZeroException", ArithmeticException.class)); - runtimeCalls.put(BytecodeExceptionKind.INTEGER_EXACT_OVERFLOW, new ForeignCallDescriptor("createIntegerExactOverflowException", ArithmeticException.class)); - runtimeCalls.put(BytecodeExceptionKind.LONG_EXACT_OVERFLOW, new ForeignCallDescriptor("createLongExactOverflowException", ArithmeticException.class)); + runtimeCalls.put(BytecodeExceptionKind.ARRAY_STORE, new ForeignCallSignature("createArrayStoreException", ArrayStoreException.class, Object.class)); + runtimeCalls.put(BytecodeExceptionKind.CLASS_CAST, new ForeignCallSignature("createClassCastException", ClassCastException.class, Object.class, KlassPointer.class)); + runtimeCalls.put(BytecodeExceptionKind.NULL_POINTER, new ForeignCallSignature("createNullPointerException", NullPointerException.class)); + runtimeCalls.put(BytecodeExceptionKind.OUT_OF_BOUNDS, new ForeignCallSignature("createOutOfBoundsException", ArrayIndexOutOfBoundsException.class, int.class, int.class)); + runtimeCalls.put(BytecodeExceptionKind.DIVISION_BY_ZERO, new ForeignCallSignature("createDivisionByZeroException", ArithmeticException.class)); + runtimeCalls.put(BytecodeExceptionKind.INTEGER_EXACT_OVERFLOW, new ForeignCallSignature("createIntegerExactOverflowException", ArithmeticException.class)); + runtimeCalls.put(BytecodeExceptionKind.LONG_EXACT_OVERFLOW, new ForeignCallSignature("createLongExactOverflowException", ArithmeticException.class)); } } @@ -714,18 +729,20 @@ public abstract class DefaultHotSpotLoweringProvider extends DefaultJavaLowering return; } - ForeignCallDescriptor descriptor = RuntimeCalls.runtimeCalls.get(node.getExceptionKind()); + ForeignCallDescriptor descriptor = foreignCalls.getDescriptor(RuntimeCalls.runtimeCalls.get(node.getExceptionKind())); assert descriptor != null; StructuredGraph graph = node.graph(); - ForeignCallNode foreignCallNode = graph.add(new ForeignCallNode(foreignCalls, descriptor, node.stamp(NodeView.DEFAULT), node.getArguments())); + ForeignCallNode foreignCallNode = graph.add(new ForeignCallNode(descriptor, node.stamp(NodeView.DEFAULT), node.getArguments())); /* * The original BytecodeExceptionNode has a rethrowException FrameState which isn't suitable * for deopt because the exception to be thrown come from this call so it's not available in * the debug info. The foreign call needs a stateDuring instead so it can deopt with a * pending exception. */ - foreignCallNode.setStateAfter(node.createStateDuring()); + foreignCallNode.setStateDuring(node.createStateDuring()); + // Keep a proper stateAfter for use by FSA + foreignCallNode.setStateAfter(node.stateAfter()); graph.replaceFixedWithFixed(node, foreignCallNode); } @@ -774,7 +791,7 @@ public abstract class DefaultHotSpotLoweringProvider extends DefaultJavaLowering } AddressNode address = createOffsetAddress(graph, object, runtime.getVMConfig().hubOffset); - return graph.add(new WriteNode(address, HUB_WRITE_LOCATION, writeValue, BarrierType.NONE, false)); + return graph.add(new WriteNode(address, HUB_WRITE_LOCATION, writeValue, BarrierType.NONE)); } @Override @@ -787,11 +804,6 @@ public abstract class DefaultHotSpotLoweringProvider extends DefaultJavaLowering return runtime.getVMConfig().arrayOopDescLengthOffset(); } - @Override - public final JavaKind getStorageKind(ResolvedJavaField field) { - return field.getJavaKind(); - } - @Override public ObjectCloneSnippets.Templates getObjectCloneSnippets() { return objectCloneSnippets; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotForeignCallDescriptor.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotForeignCallDescriptor.java new file mode 100644 index 00000000000..66950383ebc --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotForeignCallDescriptor.java @@ -0,0 +1,131 @@ +/* + * Copyright (c) 2013, 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.hotspot.meta; + +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT; + +import java.util.Arrays; + +import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; +import org.graalvm.compiler.core.common.spi.ForeignCallSignature; +import jdk.internal.vm.compiler.word.LocationIdentity; + +public class HotSpotForeignCallDescriptor extends ForeignCallDescriptor { + + /** + * Constants for specifying whether a call is a leaf or not and whether a + * {@code JavaFrameAnchor} prologue and epilogue is required around the call. A leaf function + * does not lock, GC or throw exceptions. + */ + public enum Transition { + /** + * A call to a leaf function that is guaranteed to not use floating point registers. + * Consequently, floating point registers cleanup will be waived. On AMD64, this means the + * compiler will no longer emit vzeroupper instruction around the foreign call, which it + * normally does for unknown foreign calls to avoid potential SSE-AVX transition penalty. + * Besides, this foreign call will never have its caller stack inspected by the VM. That is, + * {@code JavaFrameAnchor} management around the call can be omitted. + */ + LEAF_NO_VZERO, + + /** + * A call to a leaf function that might use floating point registers but will never have its + * caller stack inspected. That is, {@code JavaFrameAnchor} management around the call can + * be omitted. + */ + LEAF, + + /** + * A call to a leaf function that might use floating point registers and may have its caller + * stack inspected. That is, {@code JavaFrameAnchor} management code around the call is + * required. + */ + STACK_INSPECTABLE_LEAF, + + /** + * A function that may lock, GC or raise an exception and thus requires debug info to be + * associated with a call site to the function. The execution stack may be inspected while + * in the called function. That is, {@code JavaFrameAnchor} management code around the call + * is required. + */ + SAFEPOINT, + } + + /** + * Constants specifying when a foreign call or stub call is re-executable. + */ + public enum Reexecutability { + /** + * Denotes a call that cannot be re-executed. If an exception is raised, the call is + * deoptimized and the exception is passed on to be dispatched. If the call can throw an + * exception it needs to have a precise frame state. + */ + NOT_REEXECUTABLE, + + /** + * Denotes a call that can always be re-executed. If an exception is raised by the call it + * may be cleared, compiled code deoptimized and reexecuted. Since the call has no side + * effects it is assumed that the same exception will be thrown. + */ + REEXECUTABLE + } + + private final Transition transition; + private final Reexecutability reexecutability; + + public HotSpotForeignCallDescriptor(Transition transition, Reexecutability reexecutability, LocationIdentity[] killedLocations, String name, Class resultType, Class... argumentTypes) { + super(name, resultType, argumentTypes, reexecutability == Reexecutability.REEXECUTABLE, killedLocations, transition == SAFEPOINT, transition == SAFEPOINT); + this.transition = transition; + this.reexecutability = reexecutability; + } + + public HotSpotForeignCallDescriptor(Transition transition, Reexecutability reexecutability, LocationIdentity killedLocation, String name, Class resultType, Class... argumentTypes) { + this(transition, reexecutability, killedLocation == null ? HotSpotForeignCallsProviderImpl.NO_LOCATIONS : new LocationIdentity[]{killedLocation}, name, resultType, argumentTypes); + } + + public HotSpotForeignCallDescriptor(ForeignCallSignature signature, Transition transition, Reexecutability reexecutability, LocationIdentity[] killedLocations) { + this(transition, reexecutability, killedLocations, signature.getName(), signature.getResultType(), signature.getArgumentTypes()); + } + + public Transition getTransition() { + return transition; + } + + public Reexecutability getReexecutability() { + return reexecutability; + } + + @Override + public String toString() { + return "HotSpotForeignCallDescriptor{" + signature + + ", isReexecutable=" + isReexecutable + + ", canDeoptimize=" + canDeoptimize + + ", isGuaranteedSafepoint=" + isGuaranteedSafepoint + + ", killedLocations=" + Arrays.toString(killedLocations) + + ", transition=" + transition + + ", reexecutability=" + reexecutability + + '}'; + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotForeignCallsProviderImpl.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotForeignCallsProviderImpl.java index bcb595eab41..50ff33faf47 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotForeignCallsProviderImpl.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotForeignCallsProviderImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -27,7 +27,12 @@ package org.graalvm.compiler.hotspot.meta; import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.JavaCall; import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.JavaCallee; import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.DESTROYS_ALL_CALLER_SAVE_REGISTERS; -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Transition.SAFEPOINT; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT; +import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.MARK_WORD_LOCATION; +import static jdk.internal.vm.compiler.word.LocationIdentity.any; import java.util.ArrayList; import java.util.List; @@ -35,13 +40,14 @@ import java.util.List; import jdk.internal.vm.compiler.collections.EconomicMap; import org.graalvm.compiler.core.common.LIRKind; import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; +import org.graalvm.compiler.core.common.spi.ForeignCallSignature; import org.graalvm.compiler.debug.GraalError; import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Reexecutability; import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Transition; import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkageImpl; import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; +import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability; +import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition; import org.graalvm.compiler.hotspot.stubs.ForeignCallStub; import org.graalvm.compiler.hotspot.stubs.Stub; import org.graalvm.compiler.options.OptionValues; @@ -60,17 +66,23 @@ import jdk.vm.ci.meta.MetaAccessProvider; */ public abstract class HotSpotForeignCallsProviderImpl implements HotSpotForeignCallsProvider { - public static final ForeignCallDescriptor OSR_MIGRATION_END = new ForeignCallDescriptor("OSR_migration_end", void.class, long.class); - public static final ForeignCallDescriptor IDENTITY_HASHCODE = new ForeignCallDescriptor("identity_hashcode", int.class, Object.class); - public static final ForeignCallDescriptor VERIFY_OOP = new ForeignCallDescriptor("verify_oop", Object.class, Object.class); - public static final ForeignCallDescriptor LOAD_AND_CLEAR_EXCEPTION = new ForeignCallDescriptor("load_and_clear_exception", Object.class, Word.class); + public static final LocationIdentity[] NO_LOCATIONS = {}; - public static final ForeignCallDescriptor TEST_DEOPTIMIZE_CALL_INT = new ForeignCallDescriptor("test_deoptimize_call_int", int.class, int.class); + public static final HotSpotForeignCallDescriptor OSR_MIGRATION_END = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, NO_LOCATIONS, "OSR_migration_end", void.class, long.class); + public static final HotSpotForeignCallDescriptor IDENTITY_HASHCODE = new HotSpotForeignCallDescriptor(SAFEPOINT, NOT_REEXECUTABLE, MARK_WORD_LOCATION, "identity_hashcode", int.class, + Object.class); + public static final HotSpotForeignCallDescriptor VERIFY_OOP = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS, "verify_oop", Object.class, + Object.class); + public static final HotSpotForeignCallDescriptor LOAD_AND_CLEAR_EXCEPTION = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, any(), "load_and_clear_exception", Object.class, + Word.class); + + public static final HotSpotForeignCallDescriptor TEST_DEOPTIMIZE_CALL_INT = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, any(), "test_deoptimize_call_int", int.class, int.class); protected final HotSpotJVMCIRuntime jvmciRuntime; protected final HotSpotGraalRuntimeProvider runtime; - protected final EconomicMap foreignCalls = EconomicMap.create(); + protected final EconomicMap foreignCalls = EconomicMap.create(); + protected final EconomicMap signatureMap = EconomicMap.create(); protected final MetaAccessProvider metaAccess; protected final CodeCacheProvider codeCache; protected final WordTypes wordTypes; @@ -88,34 +100,19 @@ public abstract class HotSpotForeignCallsProviderImpl implements HotSpotForeignC * Registers the linkage for a foreign call. */ public HotSpotForeignCallLinkage register(HotSpotForeignCallLinkage linkage) { - assert !foreignCalls.containsKey(linkage.getDescriptor()) : "already registered linkage for " + linkage.getDescriptor(); - foreignCalls.put(linkage.getDescriptor(), linkage); + assert !foreignCalls.containsKey(linkage.getDescriptor().getSignature()) : "already registered linkage for " + linkage.getDescriptor(); + foreignCalls.put(linkage.getDescriptor().getSignature(), linkage); return linkage; } - /** - * Return true if the descriptor has already been registered. - */ - public boolean isRegistered(ForeignCallDescriptor descriptor) { - return foreignCalls.containsKey(descriptor); - } - /** * Creates and registers the details for linking a foreign call to a {@link Stub}. * * @param descriptor the signature of the call to the stub - * @param transition specifies if this is a {@linkplain Transition#LEAF leaf} call - * @param reexecutability specifies if the stub call can be re-executed without (meaningful) - * side effects. Deoptimization will not return to a point before a stub call that - * cannot be re-executed. - * @param killedLocations the memory locations killed by the stub call */ public HotSpotForeignCallLinkage registerStubCall( - ForeignCallDescriptor descriptor, - Transition transition, - Reexecutability reexecutability, - RegisterEffect effect, - LocationIdentity... killedLocations) { + HotSpotForeignCallDescriptor descriptor, + RegisterEffect effect) { return register(HotSpotForeignCallLinkageImpl.create(metaAccess, codeCache, wordTypes, @@ -123,10 +120,18 @@ public abstract class HotSpotForeignCallsProviderImpl implements HotSpotForeignC descriptor, 0L, effect, JavaCall, - JavaCallee, - transition, - reexecutability, - killedLocations)); + JavaCallee)); + } + + public HotSpotForeignCallLinkage registerStubCall( + ForeignCallSignature signature, + Transition transition, + Reexecutability reexecutability, + RegisterEffect effect, + LocationIdentity... killedLocations) { + HotSpotForeignCallDescriptor descriptor = new HotSpotForeignCallDescriptor(signature, transition, reexecutability, killedLocations); + signatureMap.put(signature, descriptor); + return registerStubCall(descriptor, effect); } /** @@ -137,22 +142,17 @@ public abstract class HotSpotForeignCallsProviderImpl implements HotSpotForeignC * @param descriptor the signature of the foreign call * @param address the address of the code to call (must be non-zero) * @param outgoingCcType outgoing (caller) calling convention type - * @param transition specifies if this is a {@linkplain Transition#LEAF leaf} call - * @param reexecutability specifies if the foreign call can be re-executed without (meaningful) - * side effects. Deoptimization will not return to a point before a foreign call that - * cannot be re-executed. - * @param killedLocations the memory locations killed by the foreign call */ public HotSpotForeignCallLinkage registerForeignCall( - ForeignCallDescriptor descriptor, + HotSpotForeignCallDescriptor descriptor, long address, - CallingConvention.Type outgoingCcType, - Transition transition, - Reexecutability reexecutability, - LocationIdentity... killedLocations) { + CallingConvention.Type outgoingCcType) { + if (address == 0) { + throw new IllegalArgumentException("address must be non-zero"); + } Class resultType = descriptor.getResultType(); - assert address != 0 : descriptor; - assert transition != SAFEPOINT || resultType.isPrimitive() || Word.class.isAssignableFrom(resultType) : "non-leaf foreign calls must return objects in thread local storage: " + descriptor; + assert descriptor.getTransition() != SAFEPOINT || resultType.isPrimitive() || Word.class.isAssignableFrom(resultType) : "non-leaf foreign calls must return objects in thread local storage: " + + descriptor; return register(HotSpotForeignCallLinkageImpl.create(metaAccess, codeCache, wordTypes, @@ -161,10 +161,8 @@ public abstract class HotSpotForeignCallsProviderImpl implements HotSpotForeignC address, DESTROYS_ALL_CALLER_SAVE_REGISTERS, outgoingCcType, - null, // incomingCcType - transition, - reexecutability, - killedLocations)); + null // incomingCcType + )); } /** @@ -175,22 +173,14 @@ public abstract class HotSpotForeignCallsProviderImpl implements HotSpotForeignC * @param address the address of the foreign code to call * @param prependThread true if the JavaThread value for the current thread is to be prepended * to the arguments for the call to {@code address} - * @param transition specifies if this is a {@linkplain Transition#LEAF leaf} call - * @param reexecutability specifies if the foreign call can be re-executed without (meaningful) - * side effects. Deoptimization will not return to a point before a foreign call that - * cannot be re-executed. - * @param killedLocations the memory locations killed by the foreign call */ public void linkForeignCall(OptionValues options, HotSpotProviders providers, - ForeignCallDescriptor descriptor, + HotSpotForeignCallDescriptor descriptor, long address, - boolean prependThread, - Transition transition, - Reexecutability reexecutability, - LocationIdentity... killedLocations) { + boolean prependThread) { if (address != 0) { - ForeignCallStub stub = new ForeignCallStub(options, jvmciRuntime, providers, address, descriptor, prependThread, transition, reexecutability, killedLocations); + ForeignCallStub stub = new ForeignCallStub(options, jvmciRuntime, providers, address, descriptor, prependThread); HotSpotForeignCallLinkage linkage = stub.getLinkage(); HotSpotForeignCallLinkage targetLinkage = stub.getTargetLinkage(); linkage.setCompiledStub(stub); @@ -202,12 +192,10 @@ public abstract class HotSpotForeignCallsProviderImpl implements HotSpotForeignC public static final boolean PREPEND_THREAD = true; public static final boolean DONT_PREPEND_THREAD = !PREPEND_THREAD; - public static final LocationIdentity[] NO_LOCATIONS = {}; - @Override public HotSpotForeignCallLinkage lookupForeignCall(ForeignCallDescriptor descriptor) { assert foreignCalls != null : descriptor; - HotSpotForeignCallLinkage callTarget = foreignCalls.get(descriptor); + HotSpotForeignCallLinkage callTarget = foreignCalls.get(descriptor.getSignature()); if (callTarget == null) { throw GraalError.shouldNotReachHere("missing implementation for runtime call: " + descriptor); } @@ -216,32 +204,17 @@ public abstract class HotSpotForeignCallsProviderImpl implements HotSpotForeignC } @Override - public boolean isAvailable(ForeignCallDescriptor descriptor) { - return foreignCalls.containsKey(descriptor); + public HotSpotForeignCallDescriptor getDescriptor(ForeignCallSignature signature) { + HotSpotForeignCallDescriptor descriptor = signatureMap.get(signature); + assert descriptor != null : signature; + return descriptor; } - @Override - public boolean isReexecutable(ForeignCallDescriptor descriptor) { - assert foreignCalls.containsKey(descriptor) : "unknown foreign call: " + descriptor; - return foreignCalls.get(descriptor).isReexecutable(); - } - - @Override - public boolean canDeoptimize(ForeignCallDescriptor descriptor) { - assert foreignCalls.containsKey(descriptor) : "unknown foreign call: " + descriptor; - return foreignCalls.get(descriptor).needsDebugInfo(); - } - - @Override - public boolean isGuaranteedSafepoint(ForeignCallDescriptor descriptor) { - assert foreignCalls.containsKey(descriptor) : "unknown foreign call: " + descriptor; - return foreignCalls.get(descriptor).isGuaranteedSafepoint(); - } - - @Override - public LocationIdentity[] getKilledLocations(ForeignCallDescriptor descriptor) { - assert foreignCalls.containsKey(descriptor) : "unknown foreign call: " + descriptor; - return foreignCalls.get(descriptor).getKilledLocations(); + HotSpotForeignCallDescriptor createDescriptor(ForeignCallSignature signature, Transition transition, Reexecutability reexecutability, LocationIdentity... killLocations) { + assert signatureMap.get(signature) == null; + HotSpotForeignCallDescriptor descriptor = new HotSpotForeignCallDescriptor(signature, transition, reexecutability, killLocations); + signatureMap.put(signature, descriptor); + return descriptor; } @Override diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java index cea5a0c9713..02bca74d8db 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java @@ -24,7 +24,9 @@ package org.graalvm.compiler.hotspot.meta; +import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE; import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigAccess.JDK; import static org.graalvm.compiler.hotspot.HotSpotBackend.BASE64_ENCODE_BLOCK; import static org.graalvm.compiler.hotspot.HotSpotBackend.GHASH_PROCESS_BLOCKS; import static org.graalvm.compiler.hotspot.meta.HotSpotAOTProfilingPlugin.Options.TieredAOT; @@ -62,9 +64,9 @@ import org.graalvm.compiler.hotspot.replacements.DigestBaseSubstitutions; import org.graalvm.compiler.hotspot.replacements.FastNotifyNode; import org.graalvm.compiler.hotspot.replacements.HotSpotArraySubstitutions; import org.graalvm.compiler.hotspot.replacements.HotSpotClassSubstitutions; +import org.graalvm.compiler.hotspot.replacements.HotSpotReflectionGetCallerClassNode; import org.graalvm.compiler.hotspot.replacements.IdentityHashCodeNode; import org.graalvm.compiler.hotspot.replacements.ObjectCloneNode; -import org.graalvm.compiler.hotspot.replacements.ReflectionGetCallerClassNode; import org.graalvm.compiler.hotspot.replacements.ReflectionSubstitutions; import org.graalvm.compiler.hotspot.replacements.SHA2Substitutions; import org.graalvm.compiler.hotspot.replacements.SHA5Substitutions; @@ -89,6 +91,7 @@ import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver; import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; import org.graalvm.compiler.nodes.graphbuilderconf.NodeIntrinsicPluginFactory; +import org.graalvm.compiler.nodes.java.DynamicNewInstanceNode; import org.graalvm.compiler.nodes.memory.OnHeapMemoryAccess.BarrierType; import org.graalvm.compiler.nodes.memory.ReadNode; import org.graalvm.compiler.nodes.memory.address.AddressNode; @@ -103,6 +106,7 @@ import org.graalvm.compiler.replacements.NodeIntrinsificationProvider; import org.graalvm.compiler.replacements.ReplacementsImpl; import org.graalvm.compiler.replacements.StandardGraphBuilderPlugins; import org.graalvm.compiler.replacements.arraycopy.ArrayCopyNode; +import org.graalvm.compiler.replacements.nodes.MacroNode.MacroParams; import org.graalvm.compiler.serviceprovider.GraalServices; import org.graalvm.compiler.serviceprovider.JavaVersionUtil; import org.graalvm.compiler.word.WordOperationPlugin; @@ -149,11 +153,13 @@ public class HotSpotGraphBuilderPlugins { Plugins plugins = new Plugins(invocationPlugins); NodeIntrinsificationProvider nodeIntrinsificationProvider = new NodeIntrinsificationProvider(metaAccess, snippetReflection, foreignCalls, wordTypes, target); - HotSpotWordOperationPlugin wordOperationPlugin = new HotSpotWordOperationPlugin(snippetReflection, wordTypes); - HotSpotNodePlugin nodePlugin = new HotSpotNodePlugin(wordOperationPlugin, config, wordTypes); + if (!IS_IN_NATIVE_IMAGE) { + HotSpotWordOperationPlugin wordOperationPlugin = new HotSpotWordOperationPlugin(snippetReflection, wordTypes); + HotSpotNodePlugin nodePlugin = new HotSpotNodePlugin(wordOperationPlugin, config, wordTypes); - plugins.appendTypePlugin(nodePlugin); - plugins.appendNodePlugin(nodePlugin); + plugins.appendTypePlugin(nodePlugin); + plugins.appendNodePlugin(nodePlugin); + } if (!GeneratePIC.getValue(options)) { plugins.appendNodePlugin(new MethodHandlePlugin(constantReflection.getMethodHandleAccess(), true)); } @@ -179,7 +185,7 @@ public class HotSpotGraphBuilderPlugins { public void run() { registerObjectPlugins(invocationPlugins, options, config, replacements); registerClassPlugins(plugins, config, replacements); - registerSystemPlugins(invocationPlugins, foreignCalls); + registerSystemPlugins(invocationPlugins); registerThreadPlugins(invocationPlugins, metaAccess, wordTypes, config, replacements); if (!GeneratePIC.getValue(options)) { registerCallSitePlugins(invocationPlugins); @@ -191,9 +197,9 @@ public class HotSpotGraphBuilderPlugins { registerCRC32CPlugins(invocationPlugins, config, replacements); registerBigIntegerPlugins(invocationPlugins, config, replacements); registerSHAPlugins(invocationPlugins, config, replacements); - registerGHASHPlugins(invocationPlugins, config, metaAccess, foreignCalls); + registerGHASHPlugins(invocationPlugins, config, metaAccess); registerCounterModePlugins(invocationPlugins, config, replacements); - registerBase64Plugins(invocationPlugins, config, metaAccess, foreignCalls); + registerBase64Plugins(invocationPlugins, config, metaAccess); registerUnsafePlugins(invocationPlugins, config, replacements); StandardGraphBuilderPlugins.registerInvocationPlugins(metaAccess, snippetReflection, invocationPlugins, replacements, true, false, true); registerArrayPlugins(invocationPlugins, replacements); @@ -221,7 +227,7 @@ public class HotSpotGraphBuilderPlugins { @Override public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) { ValueNode object = receiver.get(); - b.addPush(JavaKind.Object, new ObjectCloneNode(b.getInvokeKind(), targetMethod, b.bci(), b.getInvokeReturnStamp(b.getAssumptions()), object)); + b.addPush(JavaKind.Object, new ObjectCloneNode(MacroParams.of(b, targetMethod, object))); return true; } @@ -235,7 +241,7 @@ public class HotSpotGraphBuilderPlugins { @Override public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) { ValueNode object = receiver.get(); - b.addPush(JavaKind.Int, new IdentityHashCodeNode(object)); + b.addPush(JavaKind.Int, new IdentityHashCodeNode(object, b.bci())); return true; } @@ -289,7 +295,7 @@ public class HotSpotGraphBuilderPlugins { r.registerMethodSubstitution(HotSpotClassSubstitutions.class, "isHidden", Receiver.class); } - if (config.getFieldOffset("ArrayKlass::_component_mirror", Integer.class, "oop", Integer.MAX_VALUE) != Integer.MAX_VALUE) { + if (config.getFieldOffset("ArrayKlass::_component_mirror", Integer.class, "oop", Integer.MAX_VALUE, JDK <= 8) != Integer.MAX_VALUE) { r.registerMethodSubstitution(HotSpotClassSubstitutions.class, "getComponentType", Receiver.class); } } @@ -303,7 +309,7 @@ public class HotSpotGraphBuilderPlugins { if (folded != null) { b.addPush(JavaKind.Object, folded); } else { - b.addPush(JavaKind.Object, new CallSiteTargetNode(b.getInvokeKind(), targetMethod, b.bci(), b.getInvokeReturnStamp(b.getAssumptions()), callSite)); + b.addPush(JavaKind.Object, new CallSiteTargetNode(MacroParams.of(b, targetMethod, callSite))); } return true; } @@ -323,7 +329,7 @@ public class HotSpotGraphBuilderPlugins { r.register0("getCallerClass", new InvocationPlugin() { @Override public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) { - b.addPush(JavaKind.Object, new ReflectionGetCallerClassNode(b.getInvokeKind(), targetMethod, b.bci(), b.getInvokeReturnStamp(b.getAssumptions()))); + b.addPush(JavaKind.Object, new HotSpotReflectionGetCallerClassNode(MacroParams.of(b, targetMethod))); return true; } @@ -345,6 +351,22 @@ public class HotSpotGraphBuilderPlugins { String substituteMethodName = config.doingUnsafeAccessOffset != Integer.MAX_VALUE ? "copyMemoryGuarded" : "copyMemory"; r.registerMethodSubstitution(HotSpotUnsafeSubstitutions.class, HotSpotUnsafeSubstitutions.copyMemoryName, substituteMethodName, Receiver.class, Object.class, long.class, Object.class, long.class, long.class); + + r.register2("allocateInstance", Receiver.class, Class.class, new InvocationPlugin() { + @Override + public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver unsafe, ValueNode clazz) { + /* Emits a null-check for the otherwise unused receiver. */ + unsafe.get(); + /* + * Note that the provided clazz might not be initialized. The HotSpot lowering + * snippet for DynamicNewInstanceNode performs the necessary class initialization + * check. Such a DynamicNewInstanceNode is also never constant folded to a + * NewInstanceNode. + */ + b.addPush(JavaKind.Object, new DynamicNewInstanceNode(b.nullCheckedValue(clazz, DeoptimizationAction.None), true)); + return true; + } + }); } private static final LocationIdentity INSTANCE_KLASS_CONSTANTS = NamedLocationIdentity.immutable("InstanceKlass::_constants"); @@ -426,14 +448,14 @@ public class HotSpotGraphBuilderPlugins { }); } - private static void registerSystemPlugins(InvocationPlugins plugins, ForeignCallsProvider foreignCalls) { + private static void registerSystemPlugins(InvocationPlugins plugins) { Registration r = new Registration(plugins, System.class); - r.register0("currentTimeMillis", new ForeignCallPlugin(foreignCalls, HotSpotHostForeignCallsProvider.JAVA_TIME_MILLIS)); - r.register0("nanoTime", new ForeignCallPlugin(foreignCalls, HotSpotHostForeignCallsProvider.JAVA_TIME_NANOS)); + r.register0("currentTimeMillis", new ForeignCallPlugin(HotSpotHostForeignCallsProvider.JAVA_TIME_MILLIS)); + r.register0("nanoTime", new ForeignCallPlugin(HotSpotHostForeignCallsProvider.JAVA_TIME_NANOS)); r.register1("identityHashCode", Object.class, new InvocationPlugin() { @Override public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode object) { - b.addPush(JavaKind.Int, new IdentityHashCodeNode(object)); + b.addPush(JavaKind.Int, new IdentityHashCodeNode(object, b.bci())); return true; } @@ -550,6 +572,7 @@ public class HotSpotGraphBuilderPlugins { assert config.cipherBlockChainingEncryptAESCryptStub != 0L; assert config.cipherBlockChainingDecryptAESCryptStub != 0L; String arch = config.osArch; + String decryptSuffix = arch.equals("sparc") ? "WithOriginalKey" : ""; Registration r = new Registration(plugins, "com.sun.crypto.provider.CipherBlockChaining", replacements); @@ -558,7 +581,7 @@ public class HotSpotGraphBuilderPlugins { byte[].class, int.class); Pair cbcDecryptName = selectIntrinsicName(config, "com/sun/crypto/provider/CipherBlockChaining", "implDecrypt", "decrypt"); - registerAndCheckMismatch(r, CipherBlockChainingSubstitutions.class, cbcDecryptName, cbcDecryptName.getLeft(), Receiver.class, byte[].class, int.class, int.class, + registerAndCheckMismatch(r, CipherBlockChainingSubstitutions.class, cbcDecryptName, cbcDecryptName.getLeft() + decryptSuffix, Receiver.class, byte[].class, int.class, int.class, byte[].class, int.class); r = new Registration(plugins, "com.sun.crypto.provider.AESCrypt", replacements); @@ -567,7 +590,7 @@ public class HotSpotGraphBuilderPlugins { registerAndCheckMismatch(r, AESCryptSubstitutions.class, aesEncryptName, Receiver.class, byte[].class, int.class, byte[].class, int.class); Pair aesDecryptName = selectIntrinsicName(config, "com/sun/crypto/provider/AESCrypt", "implDecryptBlock", "decryptBlock"); - registerAndCheckMismatch(r, AESCryptSubstitutions.class, aesDecryptName, aesDecryptName.getLeft(), Receiver.class, byte[].class, int.class, byte[].class, int.class); + registerAndCheckMismatch(r, AESCryptSubstitutions.class, aesDecryptName, aesDecryptName.getLeft() + decryptSuffix, Receiver.class, byte[].class, int.class, byte[].class, int.class); } } @@ -635,7 +658,7 @@ public class HotSpotGraphBuilderPlugins { } } - private static void registerGHASHPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls) { + private static void registerGHASHPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, MetaAccessProvider metaAccess) { if (config.useGHASHIntrinsics()) { assert config.ghashProcessBlocks != 0L; Registration r = new Registration(plugins, "com.sun.crypto.provider.GHASH"); @@ -661,7 +684,7 @@ public class HotSpotGraphBuilderPlugins { ComputeObjectAddressNode dataAddress = b.add(new ComputeObjectAddressNode(data, dataOffset)); ComputeObjectAddressNode stateAddress = b.add(new ComputeObjectAddressNode(state, ConstantNode.forInt(longArrayBaseOffset))); ComputeObjectAddressNode hashSubkeyAddress = b.add(new ComputeObjectAddressNode(hashSubkey, ConstantNode.forInt(longArrayBaseOffset))); - b.add(new ForeignCallNode(foreignCalls, GHASH_PROCESS_BLOCKS, stateAddress, hashSubkeyAddress, dataAddress, blocks)); + b.add(new ForeignCallNode(GHASH_PROCESS_BLOCKS, stateAddress, hashSubkeyAddress, dataAddress, blocks)); return true; } }); @@ -677,7 +700,7 @@ public class HotSpotGraphBuilderPlugins { } } - private static void registerBase64Plugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls) { + private static void registerBase64Plugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, MetaAccessProvider metaAccess) { if (config.useBase64Intrinsics()) { Registration r = new Registration(plugins, "java.util.Base64$Encoder"); r.register7("encodeBlock", @@ -702,7 +725,7 @@ public class HotSpotGraphBuilderPlugins { int byteArrayBaseOffset = metaAccess.getArrayBaseOffset(JavaKind.Byte); ComputeObjectAddressNode srcAddress = b.add(new ComputeObjectAddressNode(src, ConstantNode.forInt(byteArrayBaseOffset))); ComputeObjectAddressNode dstAddress = b.add(new ComputeObjectAddressNode(dst, ConstantNode.forInt(byteArrayBaseOffset))); - b.add(new ForeignCallNode(foreignCalls, BASE64_ENCODE_BLOCK, srcAddress, sp, sl, dstAddress, dp, isURL)); + b.add(new ForeignCallNode(BASE64_ENCODE_BLOCK, srcAddress, sp, sl, dstAddress, dp, isURL)); return true; } }); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java index b483fd4d174..8d711426e82 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java @@ -67,32 +67,28 @@ import static org.graalvm.compiler.hotspot.HotSpotBackend.UNWIND_EXCEPTION_TO_CA import static org.graalvm.compiler.hotspot.HotSpotBackend.VECTORIZED_MISMATCHED; import static org.graalvm.compiler.hotspot.HotSpotBackend.VM_ERROR; import static org.graalvm.compiler.hotspot.HotSpotBackend.WRONG_METHOD_HANDLER; -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Reexecutability.NOT_REEXECUTABLE; -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Reexecutability.REEXECUTABLE; import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.DESTROYS_ALL_CALLER_SAVE_REGISTERS; -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Transition.LEAF; -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Transition.LEAF_NO_VZERO; -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Transition.SAFEPOINT; -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Transition.STACK_INSPECTABLE_LEAF; import static org.graalvm.compiler.hotspot.HotSpotHostBackend.DEOPT_BLOB_UNCOMMON_TRAP; import static org.graalvm.compiler.hotspot.HotSpotHostBackend.DEOPT_BLOB_UNPACK; import static org.graalvm.compiler.hotspot.HotSpotHostBackend.DEOPT_BLOB_UNPACK_WITH_EXCEPTION_IN_TLS; import static org.graalvm.compiler.hotspot.HotSpotHostBackend.ENABLE_STACK_RESERVED_ZONE; import static org.graalvm.compiler.hotspot.HotSpotHostBackend.THROW_DELAYED_STACKOVERFLOW_ERROR; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.LEAF; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT; import static org.graalvm.compiler.hotspot.replacements.AssertionSnippets.ASSERTION_VM_MESSAGE_C; +import static org.graalvm.compiler.hotspot.replacements.HotSpotAllocationSnippets.DYNAMIC_NEW_INSTANCE; +import static org.graalvm.compiler.hotspot.replacements.HotSpotAllocationSnippets.DYNAMIC_NEW_INSTANCE_OR_NULL; import static org.graalvm.compiler.hotspot.replacements.HotSpotG1WriteBarrierSnippets.G1WBPOSTCALL; import static org.graalvm.compiler.hotspot.replacements.HotSpotG1WriteBarrierSnippets.G1WBPRECALL; import static org.graalvm.compiler.hotspot.replacements.HotSpotG1WriteBarrierSnippets.VALIDATE_OBJECT; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.MARK_WORD_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.TLAB_END_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.TLAB_TOP_LOCATION; import static org.graalvm.compiler.hotspot.replacements.Log.LOG_OBJECT; import static org.graalvm.compiler.hotspot.replacements.Log.LOG_PRIMITIVE; import static org.graalvm.compiler.hotspot.replacements.Log.LOG_PRINTF; import static org.graalvm.compiler.hotspot.replacements.MonitorSnippets.MONITORENTER; import static org.graalvm.compiler.hotspot.replacements.MonitorSnippets.MONITOREXIT; -import static org.graalvm.compiler.hotspot.replacements.HotSpotAllocationSnippets.DYNAMIC_NEW_INSTANCE; -import static org.graalvm.compiler.hotspot.replacements.HotSpotAllocationSnippets.DYNAMIC_NEW_INSTANCE_OR_NULL; import static org.graalvm.compiler.hotspot.stubs.ExceptionHandlerStub.EXCEPTION_HANDLER_FOR_PC; import static org.graalvm.compiler.hotspot.stubs.StubUtil.VM_MESSAGE_C; import static org.graalvm.compiler.hotspot.stubs.UnwindExceptionToCallerStub.EXCEPTION_HANDLER_FOR_RETURN_ADDRESS; @@ -110,11 +106,11 @@ import java.util.EnumMap; import jdk.internal.vm.compiler.collections.EconomicMap; import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; +import org.graalvm.compiler.core.common.spi.ForeignCallSignature; import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; import org.graalvm.compiler.debug.GraalError; import org.graalvm.compiler.hotspot.CompilerRuntimeHotSpotVMConfig; import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; import org.graalvm.compiler.hotspot.stubs.ArrayStoreExceptionStub; import org.graalvm.compiler.hotspot.stubs.ClassCastExceptionStub; @@ -146,11 +142,11 @@ import jdk.vm.ci.meta.MetaAccessProvider; */ public abstract class HotSpotHostForeignCallsProvider extends HotSpotForeignCallsProviderImpl implements ArrayCopyForeignCalls { - public static final ForeignCallDescriptor JAVA_TIME_MILLIS = new ForeignCallDescriptor("javaTimeMillis", long.class); - public static final ForeignCallDescriptor JAVA_TIME_NANOS = new ForeignCallDescriptor("javaTimeNanos", long.class); + public static final HotSpotForeignCallDescriptor JAVA_TIME_MILLIS = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS, "javaTimeMillis", long.class); + public static final HotSpotForeignCallDescriptor JAVA_TIME_NANOS = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS, "javaTimeNanos", long.class); - public static final ForeignCallDescriptor NOTIFY = new ForeignCallDescriptor("object_notify", boolean.class, Object.class); - public static final ForeignCallDescriptor NOTIFY_ALL = new ForeignCallDescriptor("object_notifyAll", boolean.class, Object.class); + public static final HotSpotForeignCallDescriptor NOTIFY = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, any(), "object_notify", boolean.class, Object.class); + public static final HotSpotForeignCallDescriptor NOTIFY_ALL = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, any(), "object_notifyAll", boolean.class, Object.class); public HotSpotHostForeignCallsProvider(HotSpotJVMCIRuntime jvmciRuntime, HotSpotGraalRuntimeProvider runtime, MetaAccessProvider metaAccess, CodeCacheProvider codeCache, WordTypes wordTypes) { @@ -167,56 +163,68 @@ public abstract class HotSpotHostForeignCallsProvider extends HotSpotForeignCall } @Override - public ForeignCallDescriptor lookupArraycopyDescriptor(JavaKind kind, boolean aligned, boolean disjoint, boolean uninit, boolean killAny) { - if (uninit) { - assert kind == JavaKind.Object; + public ForeignCallDescriptor lookupArraycopyDescriptor(JavaKind kind, boolean aligned, boolean disjoint, boolean uninit, LocationIdentity killedLocation) { + // We support Object arraycopy killing the Object array location or ANY. We support + // primitive arraycopy killing the kind's array location or INIT. + // This is enough for well-typed copies and for the kind of type punning done by + // StringUTF16Substitutions#getChars. This will need more work if at some point we need to + // support more general type punning, e.g., writing char-typed data into a byte array. + boolean killAny = killedLocation.isAny(); + boolean killInit = killedLocation.isInit(); + if (kind.isObject()) { + assert !killInit : "unsupported"; + assert killAny || killedLocation.equals(NamedLocationIdentity.getArrayLocation(kind)); + return objectArraycopyDescriptors[aligned ? 1 : 0][disjoint ? 1 : 0][uninit ? 1 : 0][killAny ? 1 : 0]; + } else { + assert kind.isPrimitive(); assert !killAny : "unsupported"; - return uninitObjectArraycopyDescriptors[aligned ? 1 : 0][disjoint ? 1 : 0]; + assert killInit || killedLocation.equals(NamedLocationIdentity.getArrayLocation(kind)); + return primitiveArraycopyDescriptors[aligned ? 1 : 0][disjoint ? 1 : 0][killInit ? 1 : 0].get(kind); } - if (killAny) { - return arraycopyDescriptorsKillAny[aligned ? 1 : 0][disjoint ? 1 : 0].get(kind); - } - return arraycopyDescriptors[aligned ? 1 : 0][disjoint ? 1 : 0].get(kind); } - @SuppressWarnings("unchecked") private static final EnumMap[][] arraycopyDescriptors = (EnumMap[][]) new EnumMap[2][2]; - @SuppressWarnings("unchecked") private static final EnumMap[][] arraycopyDescriptorsKillAny = (EnumMap[][]) new EnumMap[2][2]; + // indexed by aligned, disjoint, killInit + @SuppressWarnings("unchecked") private static final EnumMap[][][] primitiveArraycopyDescriptors = (EnumMap[][][]) new EnumMap[2][2][2]; - private static final ForeignCallDescriptor[][] uninitObjectArraycopyDescriptors = new ForeignCallDescriptor[2][2]; + // indexed by aligned, disjoint, uninit, killAny + private static final ForeignCallDescriptor[][][][] objectArraycopyDescriptors = new ForeignCallDescriptor[2][2][2][2]; + // indexed by uninit private static final ForeignCallDescriptor[] checkcastArraycopyDescriptors = new ForeignCallDescriptor[2]; static { // Populate the EnumMap instances - for (int i = 0; i < arraycopyDescriptors.length; i++) { - for (int j = 0; j < arraycopyDescriptors[i].length; j++) { - arraycopyDescriptors[i][j] = new EnumMap<>(JavaKind.class); - arraycopyDescriptorsKillAny[i][j] = new EnumMap<>(JavaKind.class); + for (int i = 0; i < primitiveArraycopyDescriptors.length; i++) { + for (int j = 0; j < primitiveArraycopyDescriptors[i].length; j++) { + for (int k = 0; k < primitiveArraycopyDescriptors[i][j].length; k++) { + primitiveArraycopyDescriptors[i][j][k] = new EnumMap<>(JavaKind.class); + } } } } - private void registerArraycopyDescriptor(EconomicMap descMap, JavaKind kind, boolean aligned, boolean disjoint, boolean uninit, boolean killAny, long routine) { + private void registerArraycopyDescriptor(EconomicMap descMap, JavaKind kind, boolean aligned, boolean disjoint, boolean uninit, LocationIdentity killedLocation, + long routine) { + boolean killAny = killedLocation.isAny(); + boolean killInit = killedLocation.isInit(); ForeignCallDescriptor desc = descMap.get(routine); if (desc == null) { - desc = buildDescriptor(kind, aligned, disjoint, uninit, killAny, routine); + desc = buildDescriptor(kind, aligned, disjoint, uninit, killedLocation, routine); descMap.put(routine, desc); } - if (uninit) { - assert kind == JavaKind.Object; - uninitObjectArraycopyDescriptors[aligned ? 1 : 0][disjoint ? 1 : 0] = desc; - } else if (killAny) { - arraycopyDescriptorsKillAny[aligned ? 1 : 0][disjoint ? 1 : 0].put(kind, desc); + if (kind.isObject()) { + objectArraycopyDescriptors[aligned ? 1 : 0][disjoint ? 1 : 0][uninit ? 1 : 0][killAny ? 1 : 0] = desc; } else { - arraycopyDescriptors[aligned ? 1 : 0][disjoint ? 1 : 0].put(kind, desc); + primitiveArraycopyDescriptors[aligned ? 1 : 0][disjoint ? 1 : 0][killInit ? 1 : 0].put(kind, desc); } } - private ForeignCallDescriptor buildDescriptor(JavaKind kind, boolean aligned, boolean disjoint, boolean uninit, boolean killAny, long routine) { + private ForeignCallDescriptor buildDescriptor(JavaKind kind, boolean aligned, boolean disjoint, boolean uninit, LocationIdentity killedLocation, long routine) { assert !uninit || kind == JavaKind.Object; - String name = kind + (aligned ? "Aligned" : "") + (disjoint ? "Disjoint" : "") + (uninit ? "Uninit" : "") + "Arraycopy" + (killAny ? "KillAny" : ""); - ForeignCallDescriptor desc = new ForeignCallDescriptor(name, void.class, Word.class, Word.class, Word.class); - LocationIdentity killed = killAny ? LocationIdentity.any() : NamedLocationIdentity.getArrayLocation(kind); - registerForeignCall(desc, routine, NativeCall, LEAF_NO_VZERO, NOT_REEXECUTABLE, killed); + boolean killAny = killedLocation.isAny(); + boolean killInit = killedLocation.isInit(); + String name = kind + (aligned ? "Aligned" : "") + (disjoint ? "Disjoint" : "") + (uninit ? "Uninit" : "") + "Arraycopy" + (killInit ? "KillInit" : killAny ? "KillAny" : ""); + HotSpotForeignCallDescriptor desc = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, killedLocation, name, void.class, Word.class, Word.class, Word.class); + registerForeignCall(desc, routine, NativeCall); return desc; } @@ -229,9 +237,10 @@ public abstract class HotSpotHostForeignCallsProvider extends HotSpotForeignCall // c_rarg3 - size_t ckoff (super_check_offset) // c_rarg4 - oop ckval (super_klass) // return: 0 = success, n = number of copied elements xor'd with -1. - ForeignCallDescriptor desc = new ForeignCallDescriptor(name, int.class, Word.class, Word.class, Word.class, Word.class, Word.class); LocationIdentity killed = NamedLocationIdentity.any(); - registerForeignCall(desc, routine, NativeCall, LEAF_NO_VZERO, NOT_REEXECUTABLE, killed); + HotSpotForeignCallDescriptor desc = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, killed, name, int.class, Word.class, Word.class, Word.class, Word.class, + Word.class); + registerForeignCall(desc, routine, NativeCall); checkcastArraycopyDescriptors[uninit ? 1 : 0] = desc; } @@ -255,47 +264,56 @@ public abstract class HotSpotHostForeignCallsProvider extends HotSpotForeignCall * they kill different memory so they still have to be distinct. */ EconomicMap descMap = EconomicMap.create(); - registerArraycopyDescriptor(descMap, kind, false, false, uninit, false, routine); - registerArraycopyDescriptor(descMap, kind, true, false, uninit, false, alignedRoutine); - registerArraycopyDescriptor(descMap, kind, false, true, uninit, false, disjointRoutine); - registerArraycopyDescriptor(descMap, kind, true, true, uninit, false, alignedDisjointRoutine); + LocationIdentity arrayLocation = NamedLocationIdentity.getArrayLocation(kind); + registerArraycopyDescriptor(descMap, kind, false, false, uninit, arrayLocation, routine); + registerArraycopyDescriptor(descMap, kind, true, false, uninit, arrayLocation, alignedRoutine); + registerArraycopyDescriptor(descMap, kind, false, true, uninit, arrayLocation, disjointRoutine); + registerArraycopyDescriptor(descMap, kind, true, true, uninit, arrayLocation, alignedDisjointRoutine); - if (!uninit) { + if (kind.isPrimitive()) { + assert !uninit; + EconomicMap killInitDescMap = EconomicMap.create(); + registerArraycopyDescriptor(killInitDescMap, kind, false, false, uninit, LocationIdentity.init(), routine); + registerArraycopyDescriptor(killInitDescMap, kind, true, false, uninit, LocationIdentity.init(), alignedRoutine); + registerArraycopyDescriptor(killInitDescMap, kind, false, true, uninit, LocationIdentity.init(), disjointRoutine); + registerArraycopyDescriptor(killInitDescMap, kind, true, true, uninit, LocationIdentity.init(), alignedDisjointRoutine); + } else { + assert kind.isObject(); EconomicMap killAnyDescMap = EconomicMap.create(); - registerArraycopyDescriptor(killAnyDescMap, kind, false, false, uninit, true, routine); - registerArraycopyDescriptor(killAnyDescMap, kind, true, false, uninit, true, alignedRoutine); - registerArraycopyDescriptor(killAnyDescMap, kind, false, true, uninit, true, disjointRoutine); - registerArraycopyDescriptor(killAnyDescMap, kind, true, true, uninit, true, alignedDisjointRoutine); + registerArraycopyDescriptor(killAnyDescMap, kind, false, false, uninit, LocationIdentity.any(), routine); + registerArraycopyDescriptor(killAnyDescMap, kind, true, false, uninit, LocationIdentity.any(), alignedRoutine); + registerArraycopyDescriptor(killAnyDescMap, kind, false, true, uninit, LocationIdentity.any(), disjointRoutine); + registerArraycopyDescriptor(killAnyDescMap, kind, true, true, uninit, LocationIdentity.any(), alignedDisjointRoutine); } } public void initialize(HotSpotProviders providers, OptionValues options) { GraalHotSpotVMConfig c = runtime.getVMConfig(); - registerForeignCall(DEOPT_BLOB_UNPACK, c.deoptBlobUnpack, NativeCall, LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS); + registerForeignCall(DEOPT_BLOB_UNPACK, c.deoptBlobUnpack, NativeCall); if (c.deoptBlobUnpackWithExceptionInTLS != 0) { - registerForeignCall(DEOPT_BLOB_UNPACK_WITH_EXCEPTION_IN_TLS, c.deoptBlobUnpackWithExceptionInTLS, NativeCall, LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS); + registerForeignCall(DEOPT_BLOB_UNPACK_WITH_EXCEPTION_IN_TLS, c.deoptBlobUnpackWithExceptionInTLS, NativeCall); } - registerForeignCall(DEOPT_BLOB_UNCOMMON_TRAP, c.deoptBlobUncommonTrap, NativeCall, LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS); - registerForeignCall(IC_MISS_HANDLER, c.inlineCacheMissStub, NativeCall, LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS); + registerForeignCall(DEOPT_BLOB_UNCOMMON_TRAP, c.deoptBlobUncommonTrap, NativeCall); + registerForeignCall(IC_MISS_HANDLER, c.inlineCacheMissStub, NativeCall); if (c.enableStackReservedZoneAddress != 0) { assert c.throwDelayedStackOverflowErrorEntry != 0 : "both must exist"; - registerForeignCall(ENABLE_STACK_RESERVED_ZONE, c.enableStackReservedZoneAddress, NativeCall, LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS); - registerForeignCall(THROW_DELAYED_STACKOVERFLOW_ERROR, c.throwDelayedStackOverflowErrorEntry, NativeCall, LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS); + registerForeignCall(ENABLE_STACK_RESERVED_ZONE, c.enableStackReservedZoneAddress, NativeCall); + registerForeignCall(THROW_DELAYED_STACKOVERFLOW_ERROR, c.throwDelayedStackOverflowErrorEntry, NativeCall); } - registerForeignCall(JAVA_TIME_MILLIS, c.javaTimeMillisAddress, NativeCall, LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS); - registerForeignCall(JAVA_TIME_NANOS, c.javaTimeNanosAddress, NativeCall, LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS); + registerForeignCall(JAVA_TIME_MILLIS, c.javaTimeMillisAddress, NativeCall); + registerForeignCall(JAVA_TIME_NANOS, c.javaTimeNanosAddress, NativeCall); registerMathStubs(c, providers, options); - registerForeignCall(ARITHMETIC_FREM, c.fremAddress, NativeCall, LEAF, REEXECUTABLE, NO_LOCATIONS); - registerForeignCall(ARITHMETIC_DREM, c.dremAddress, NativeCall, LEAF, REEXECUTABLE, NO_LOCATIONS); + registerForeignCall(createDescriptor(ARITHMETIC_FREM, LEAF, REEXECUTABLE, NO_LOCATIONS), c.fremAddress, NativeCall); + registerForeignCall(createDescriptor(ARITHMETIC_DREM, LEAF, REEXECUTABLE, NO_LOCATIONS), c.dremAddress, NativeCall); - registerForeignCall(LOAD_AND_CLEAR_EXCEPTION, c.loadAndClearExceptionAddress, NativeCall, LEAF_NO_VZERO, NOT_REEXECUTABLE, any()); + registerForeignCall(LOAD_AND_CLEAR_EXCEPTION, c.loadAndClearExceptionAddress, NativeCall); - registerForeignCall(EXCEPTION_HANDLER_FOR_PC, c.exceptionHandlerForPcAddress, NativeCall, SAFEPOINT, REEXECUTABLE, any()); - registerForeignCall(EXCEPTION_HANDLER_FOR_RETURN_ADDRESS, c.exceptionHandlerForReturnAddressAddress, NativeCall, SAFEPOINT, REEXECUTABLE, any()); + registerForeignCall(EXCEPTION_HANDLER_FOR_PC, c.exceptionHandlerForPcAddress, NativeCall); + registerForeignCall(EXCEPTION_HANDLER_FOR_RETURN_ADDRESS, c.exceptionHandlerForReturnAddressAddress, NativeCall); CreateExceptionStub.registerForeignCalls(c, this); @@ -303,27 +321,27 @@ public abstract class HotSpotHostForeignCallsProvider extends HotSpotForeignCall * This message call is registered twice, where the second one must only be used for calls * that do not return, i.e., that exit the VM. */ - registerForeignCall(VM_MESSAGE_C, c.vmMessageAddress, NativeCall, SAFEPOINT, REEXECUTABLE, NO_LOCATIONS); - registerForeignCall(ASSERTION_VM_MESSAGE_C, c.vmMessageAddress, NativeCall, LEAF, REEXECUTABLE, NO_LOCATIONS); + registerForeignCall(VM_MESSAGE_C, c.vmMessageAddress, NativeCall); + registerForeignCall(ASSERTION_VM_MESSAGE_C, c.vmMessageAddress, NativeCall); - linkForeignCall(options, providers, NEW_INSTANCE, c.newInstanceAddress, PREPEND_THREAD, SAFEPOINT, REEXECUTABLE, TLAB_TOP_LOCATION, TLAB_END_LOCATION); - linkForeignCall(options, providers, NEW_ARRAY, c.newArrayAddress, PREPEND_THREAD, SAFEPOINT, REEXECUTABLE, TLAB_TOP_LOCATION, TLAB_END_LOCATION); - linkForeignCall(options, providers, NEW_MULTI_ARRAY, c.newMultiArrayAddress, PREPEND_THREAD, SAFEPOINT, REEXECUTABLE, TLAB_TOP_LOCATION, TLAB_END_LOCATION); - linkForeignCall(options, providers, DYNAMIC_NEW_INSTANCE, c.dynamicNewInstanceAddress, PREPEND_THREAD, SAFEPOINT, REEXECUTABLE); + linkForeignCall(options, providers, NEW_INSTANCE, c.newInstanceAddress, PREPEND_THREAD); + linkForeignCall(options, providers, NEW_ARRAY, c.newArrayAddress, PREPEND_THREAD); + linkForeignCall(options, providers, NEW_MULTI_ARRAY, c.newMultiArrayAddress, PREPEND_THREAD); + linkForeignCall(options, providers, DYNAMIC_NEW_INSTANCE, c.dynamicNewInstanceAddress, PREPEND_THREAD); if (c.areNullAllocationStubsAvailable()) { - linkForeignCall(options, providers, NEW_INSTANCE_OR_NULL, c.newInstanceOrNullAddress, PREPEND_THREAD, SAFEPOINT, REEXECUTABLE, TLAB_TOP_LOCATION, TLAB_END_LOCATION); - linkForeignCall(options, providers, NEW_ARRAY_OR_NULL, c.newArrayOrNullAddress, PREPEND_THREAD, SAFEPOINT, REEXECUTABLE, TLAB_TOP_LOCATION, TLAB_END_LOCATION); - linkForeignCall(options, providers, NEW_MULTI_ARRAY_OR_NULL, c.newMultiArrayOrNullAddress, PREPEND_THREAD, SAFEPOINT, REEXECUTABLE, TLAB_TOP_LOCATION, TLAB_END_LOCATION); - linkForeignCall(options, providers, DYNAMIC_NEW_INSTANCE_OR_NULL, c.dynamicNewInstanceOrNullAddress, PREPEND_THREAD, SAFEPOINT, REEXECUTABLE); + linkForeignCall(options, providers, NEW_INSTANCE_OR_NULL, c.newInstanceOrNullAddress, PREPEND_THREAD); + linkForeignCall(options, providers, NEW_ARRAY_OR_NULL, c.newArrayOrNullAddress, PREPEND_THREAD); + linkForeignCall(options, providers, NEW_MULTI_ARRAY_OR_NULL, c.newMultiArrayOrNullAddress, PREPEND_THREAD); + linkForeignCall(options, providers, DYNAMIC_NEW_INSTANCE_OR_NULL, c.dynamicNewInstanceOrNullAddress, PREPEND_THREAD); } - link(new ExceptionHandlerStub(options, providers, foreignCalls.get(EXCEPTION_HANDLER))); + link(new ExceptionHandlerStub(options, providers, foreignCalls.get(EXCEPTION_HANDLER.getSignature()))); link(new UnwindExceptionToCallerStub(options, providers, - registerStubCall(UNWIND_EXCEPTION_TO_CALLER, SAFEPOINT, NOT_REEXECUTABLE, DESTROYS_ALL_CALLER_SAVE_REGISTERS, any()))); - link(new VerifyOopStub(options, providers, registerStubCall(VERIFY_OOP, LEAF_NO_VZERO, REEXECUTABLE, DESTROYS_ALL_CALLER_SAVE_REGISTERS, NO_LOCATIONS))); + registerStubCall(UNWIND_EXCEPTION_TO_CALLER, DESTROYS_ALL_CALLER_SAVE_REGISTERS))); + link(new VerifyOopStub(options, providers, registerStubCall(VERIFY_OOP, DESTROYS_ALL_CALLER_SAVE_REGISTERS))); - EnumMap exceptionRuntimeCalls = DefaultHotSpotLoweringProvider.RuntimeCalls.runtimeCalls; + EnumMap exceptionRuntimeCalls = DefaultHotSpotLoweringProvider.RuntimeCalls.runtimeCalls; link(new ArrayStoreExceptionStub(options, providers, registerStubCall(exceptionRuntimeCalls.get(BytecodeExceptionKind.ARRAY_STORE), SAFEPOINT, NOT_REEXECUTABLE, DESTROYS_ALL_CALLER_SAVE_REGISTERS, any()))); link(new ClassCastExceptionStub(options, providers, @@ -339,34 +357,34 @@ public abstract class HotSpotHostForeignCallsProvider extends HotSpotForeignCall link(new LongExactOverflowExceptionStub(options, providers, registerStubCall(exceptionRuntimeCalls.get(BytecodeExceptionKind.LONG_EXACT_OVERFLOW), SAFEPOINT, NOT_REEXECUTABLE, DESTROYS_ALL_CALLER_SAVE_REGISTERS, any()))); - linkForeignCall(options, providers, IDENTITY_HASHCODE, c.identityHashCodeAddress, PREPEND_THREAD, SAFEPOINT, NOT_REEXECUTABLE, MARK_WORD_LOCATION); - linkForeignCall(options, providers, REGISTER_FINALIZER, c.registerFinalizerAddress, PREPEND_THREAD, SAFEPOINT, NOT_REEXECUTABLE, any()); - linkForeignCall(options, providers, MONITORENTER, c.monitorenterAddress, PREPEND_THREAD, SAFEPOINT, NOT_REEXECUTABLE, any()); - linkForeignCall(options, providers, MONITOREXIT, c.monitorexitAddress, PREPEND_THREAD, STACK_INSPECTABLE_LEAF, NOT_REEXECUTABLE, any()); - linkForeignCall(options, providers, NOTIFY, c.notifyAddress, PREPEND_THREAD, LEAF_NO_VZERO, NOT_REEXECUTABLE, any()); - linkForeignCall(options, providers, NOTIFY_ALL, c.notifyAllAddress, PREPEND_THREAD, LEAF_NO_VZERO, NOT_REEXECUTABLE, any()); - linkForeignCall(options, providers, LOG_PRINTF, c.logPrintfAddress, PREPEND_THREAD, LEAF, REEXECUTABLE, NO_LOCATIONS); - linkForeignCall(options, providers, LOG_OBJECT, c.logObjectAddress, PREPEND_THREAD, LEAF, REEXECUTABLE, NO_LOCATIONS); - linkForeignCall(options, providers, LOG_PRIMITIVE, c.logPrimitiveAddress, PREPEND_THREAD, LEAF, REEXECUTABLE, NO_LOCATIONS); - linkForeignCall(options, providers, VM_ERROR, c.vmErrorAddress, PREPEND_THREAD, LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS); - linkForeignCall(options, providers, OSR_MIGRATION_END, c.osrMigrationEndAddress, DONT_PREPEND_THREAD, LEAF_NO_VZERO, NOT_REEXECUTABLE, NO_LOCATIONS); - linkForeignCall(options, providers, G1WBPRECALL, c.writeBarrierPreAddress, PREPEND_THREAD, LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS); - linkForeignCall(options, providers, G1WBPOSTCALL, c.writeBarrierPostAddress, PREPEND_THREAD, LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS); - linkForeignCall(options, providers, VALIDATE_OBJECT, c.validateObject, PREPEND_THREAD, LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS); + linkForeignCall(options, providers, IDENTITY_HASHCODE, c.identityHashCodeAddress, PREPEND_THREAD); + linkForeignCall(options, providers, createDescriptor(REGISTER_FINALIZER, SAFEPOINT, NOT_REEXECUTABLE, any()), c.registerFinalizerAddress, PREPEND_THREAD); + linkForeignCall(options, providers, MONITORENTER, c.monitorenterAddress, PREPEND_THREAD); + linkForeignCall(options, providers, MONITOREXIT, c.monitorexitAddress, PREPEND_THREAD); + linkForeignCall(options, providers, NOTIFY, c.notifyAddress, PREPEND_THREAD); + linkForeignCall(options, providers, NOTIFY_ALL, c.notifyAllAddress, PREPEND_THREAD); + linkForeignCall(options, providers, LOG_PRINTF, c.logPrintfAddress, PREPEND_THREAD); + linkForeignCall(options, providers, LOG_OBJECT, c.logObjectAddress, PREPEND_THREAD); + linkForeignCall(options, providers, LOG_PRIMITIVE, c.logPrimitiveAddress, PREPEND_THREAD); + linkForeignCall(options, providers, VM_ERROR, c.vmErrorAddress, PREPEND_THREAD); + linkForeignCall(options, providers, OSR_MIGRATION_END, c.osrMigrationEndAddress, DONT_PREPEND_THREAD); + linkForeignCall(options, providers, G1WBPRECALL, c.writeBarrierPreAddress, PREPEND_THREAD); + linkForeignCall(options, providers, G1WBPOSTCALL, c.writeBarrierPostAddress, PREPEND_THREAD); + linkForeignCall(options, providers, VALIDATE_OBJECT, c.validateObject, PREPEND_THREAD); if (GeneratePIC.getValue(options)) { - registerForeignCall(WRONG_METHOD_HANDLER, c.handleWrongMethodStub, NativeCall, LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS); + registerForeignCall(WRONG_METHOD_HANDLER, c.handleWrongMethodStub, NativeCall); CompilerRuntimeHotSpotVMConfig cr = new CompilerRuntimeHotSpotVMConfig(HotSpotJVMCIRuntime.runtime().getConfigStore()); - linkForeignCall(options, providers, RESOLVE_STRING_BY_SYMBOL, cr.resolveStringBySymbol, PREPEND_THREAD, SAFEPOINT, REEXECUTABLE, TLAB_TOP_LOCATION, TLAB_END_LOCATION); - linkForeignCall(options, providers, RESOLVE_DYNAMIC_INVOKE, cr.resolveDynamicInvoke, PREPEND_THREAD, SAFEPOINT, REEXECUTABLE, any()); - linkForeignCall(options, providers, RESOLVE_KLASS_BY_SYMBOL, cr.resolveKlassBySymbol, PREPEND_THREAD, SAFEPOINT, REEXECUTABLE, any()); - linkForeignCall(options, providers, RESOLVE_METHOD_BY_SYMBOL_AND_LOAD_COUNTERS, cr.resolveMethodBySymbolAndLoadCounters, PREPEND_THREAD, SAFEPOINT, REEXECUTABLE, NO_LOCATIONS); - linkForeignCall(options, providers, INITIALIZE_KLASS_BY_SYMBOL, cr.initializeKlassBySymbol, PREPEND_THREAD, SAFEPOINT, NOT_REEXECUTABLE, any()); - linkForeignCall(options, providers, INVOCATION_EVENT, cr.invocationEvent, PREPEND_THREAD, SAFEPOINT, REEXECUTABLE, NO_LOCATIONS); - linkForeignCall(options, providers, BACKEDGE_EVENT, cr.backedgeEvent, PREPEND_THREAD, SAFEPOINT, REEXECUTABLE, NO_LOCATIONS); + linkForeignCall(options, providers, RESOLVE_STRING_BY_SYMBOL, cr.resolveStringBySymbol, PREPEND_THREAD); + linkForeignCall(options, providers, RESOLVE_DYNAMIC_INVOKE, cr.resolveDynamicInvoke, PREPEND_THREAD); + linkForeignCall(options, providers, RESOLVE_KLASS_BY_SYMBOL, cr.resolveKlassBySymbol, PREPEND_THREAD); + linkForeignCall(options, providers, RESOLVE_METHOD_BY_SYMBOL_AND_LOAD_COUNTERS, cr.resolveMethodBySymbolAndLoadCounters, PREPEND_THREAD); + linkForeignCall(options, providers, INITIALIZE_KLASS_BY_SYMBOL, cr.initializeKlassBySymbol, PREPEND_THREAD); + linkForeignCall(options, providers, INVOCATION_EVENT, cr.invocationEvent, PREPEND_THREAD); + linkForeignCall(options, providers, BACKEDGE_EVENT, cr.backedgeEvent, PREPEND_THREAD); } - linkForeignCall(options, providers, TEST_DEOPTIMIZE_CALL_INT, c.testDeoptimizeCallInt, PREPEND_THREAD, SAFEPOINT, REEXECUTABLE, any()); + linkForeignCall(options, providers, TEST_DEOPTIMIZE_CALL_INT, c.testDeoptimizeCallInt, PREPEND_THREAD); registerArrayCopy(JavaKind.Byte, c.jbyteArraycopy, c.jbyteAlignedArraycopy, c.jbyteDisjointArraycopy, c.jbyteAlignedDisjointArraycopy); registerArrayCopy(JavaKind.Boolean, c.jbyteArraycopy, c.jbyteAlignedArraycopy, c.jbyteDisjointArraycopy, c.jbyteAlignedDisjointArraycopy); @@ -382,45 +400,42 @@ public abstract class HotSpotHostForeignCallsProvider extends HotSpotForeignCall registerCheckcastArraycopyDescriptor(true, c.checkcastArraycopyUninit); registerCheckcastArraycopyDescriptor(false, c.checkcastArraycopy); - registerForeignCall(GENERIC_ARRAYCOPY, c.genericArraycopy, NativeCall, LEAF_NO_VZERO, NOT_REEXECUTABLE, NamedLocationIdentity.any()); - registerForeignCall(UNSAFE_ARRAYCOPY, c.unsafeArraycopy, NativeCall, LEAF_NO_VZERO, NOT_REEXECUTABLE, NamedLocationIdentity.any()); + registerForeignCall(createDescriptor(GENERIC_ARRAYCOPY, LEAF_NO_VZERO, NOT_REEXECUTABLE, NamedLocationIdentity.any()), c.genericArraycopy, NativeCall); + registerForeignCall(createDescriptor(UNSAFE_ARRAYCOPY, LEAF_NO_VZERO, NOT_REEXECUTABLE, NamedLocationIdentity.any()), c.unsafeArraycopy, NativeCall); if (c.useMultiplyToLenIntrinsic()) { - registerForeignCall(MULTIPLY_TO_LEN, c.multiplyToLen, NativeCall, LEAF_NO_VZERO, NOT_REEXECUTABLE, - NamedLocationIdentity.getArrayLocation(JavaKind.Int)); + registerForeignCall(MULTIPLY_TO_LEN, c.multiplyToLen, NativeCall); } if (c.useSHA1Intrinsics()) { - registerForeignCall(SHA_IMPL_COMPRESS, c.sha1ImplCompress, NativeCall, LEAF, NOT_REEXECUTABLE, NamedLocationIdentity.any()); - registerForeignCall(SHA_IMPL_COMPRESS_MB, c.sha1ImplCompressMultiBlock, NativeCall, LEAF, NOT_REEXECUTABLE, NamedLocationIdentity.any()); + registerForeignCall(SHA_IMPL_COMPRESS, c.sha1ImplCompress, NativeCall); + registerForeignCall(SHA_IMPL_COMPRESS_MB, c.sha1ImplCompressMultiBlock, NativeCall); } if (c.useSHA256Intrinsics()) { - registerForeignCall(SHA2_IMPL_COMPRESS, c.sha256ImplCompress, NativeCall, LEAF, NOT_REEXECUTABLE, NamedLocationIdentity.any()); - registerForeignCall(SHA2_IMPL_COMPRESS_MB, c.sha256ImplCompressMultiBlock, NativeCall, LEAF, NOT_REEXECUTABLE, NamedLocationIdentity.any()); + registerForeignCall(SHA2_IMPL_COMPRESS, c.sha256ImplCompress, NativeCall); + registerForeignCall(SHA2_IMPL_COMPRESS_MB, c.sha256ImplCompressMultiBlock, NativeCall); } if (c.useSHA512Intrinsics()) { - registerForeignCall(SHA5_IMPL_COMPRESS, c.sha512ImplCompress, NativeCall, LEAF, NOT_REEXECUTABLE, NamedLocationIdentity.any()); - registerForeignCall(SHA5_IMPL_COMPRESS_MB, c.sha512ImplCompressMultiBlock, NativeCall, LEAF, NOT_REEXECUTABLE, NamedLocationIdentity.any()); + registerForeignCall(SHA5_IMPL_COMPRESS, c.sha512ImplCompress, NativeCall); + registerForeignCall(SHA5_IMPL_COMPRESS_MB, c.sha512ImplCompressMultiBlock, NativeCall); } if (c.useGHASHIntrinsics()) { - registerForeignCall(GHASH_PROCESS_BLOCKS, c.ghashProcessBlocks, NativeCall, LEAF, NOT_REEXECUTABLE, NamedLocationIdentity.any()); + registerForeignCall(GHASH_PROCESS_BLOCKS, c.ghashProcessBlocks, NativeCall); } if (c.useBase64Intrinsics()) { - registerForeignCall(BASE64_ENCODE_BLOCK, c.base64EncodeBlock, NativeCall, LEAF, NOT_REEXECUTABLE, NamedLocationIdentity.any()); + registerForeignCall(BASE64_ENCODE_BLOCK, c.base64EncodeBlock, NativeCall); } if (c.useMulAddIntrinsic()) { - registerForeignCall(MUL_ADD, c.mulAdd, NativeCall, LEAF_NO_VZERO, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Int)); + registerForeignCall(MUL_ADD, c.mulAdd, NativeCall); } if (c.useMontgomeryMultiplyIntrinsic()) { - registerForeignCall(MONTGOMERY_MULTIPLY, c.montgomeryMultiply, NativeCall, LEAF_NO_VZERO, NOT_REEXECUTABLE, - NamedLocationIdentity.getArrayLocation(JavaKind.Int)); + registerForeignCall(MONTGOMERY_MULTIPLY, c.montgomeryMultiply, NativeCall); } if (c.useMontgomerySquareIntrinsic()) { - registerForeignCall(MONTGOMERY_SQUARE, c.montgomerySquare, NativeCall, LEAF_NO_VZERO, NOT_REEXECUTABLE, - NamedLocationIdentity.getArrayLocation(JavaKind.Int)); + registerForeignCall(MONTGOMERY_SQUARE, c.montgomerySquare, NativeCall); } if (c.useSquareToLenIntrinsic()) { - registerForeignCall(SQUARE_TO_LEN, c.squareToLen, NativeCall, LEAF_NO_VZERO, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Int)); + registerForeignCall(SQUARE_TO_LEN, c.squareToLen, NativeCall); } if (c.useAESIntrinsics) { @@ -431,12 +446,9 @@ public abstract class HotSpotHostForeignCallsProvider extends HotSpotForeignCall */ try { // These stubs do callee saving - registerForeignCall(ENCRYPT_BLOCK, c.aescryptEncryptBlockStub, NativeCall, LEAF, NOT_REEXECUTABLE, - NamedLocationIdentity.getArrayLocation(JavaKind.Byte)); - registerForeignCall(DECRYPT_BLOCK, c.aescryptDecryptBlockStub, NativeCall, LEAF, NOT_REEXECUTABLE, - NamedLocationIdentity.getArrayLocation(JavaKind.Byte)); - registerForeignCall(DECRYPT_BLOCK_WITH_ORIGINAL_KEY, c.aescryptDecryptBlockStub, NativeCall, LEAF, NOT_REEXECUTABLE, - NamedLocationIdentity.getArrayLocation(JavaKind.Byte)); + registerForeignCall(ENCRYPT_BLOCK, c.aescryptEncryptBlockStub, NativeCall); + registerForeignCall(DECRYPT_BLOCK, c.aescryptDecryptBlockStub, NativeCall); + registerForeignCall(DECRYPT_BLOCK_WITH_ORIGINAL_KEY, c.aescryptDecryptBlockStub, NativeCall); } catch (GraalError e) { if (!(e.getCause() instanceof ClassNotFoundException)) { throw e; @@ -444,12 +456,9 @@ public abstract class HotSpotHostForeignCallsProvider extends HotSpotForeignCall } try { // These stubs do callee saving - registerForeignCall(ENCRYPT, c.cipherBlockChainingEncryptAESCryptStub, NativeCall, LEAF, NOT_REEXECUTABLE, - NamedLocationIdentity.getArrayLocation(JavaKind.Byte)); - registerForeignCall(DECRYPT, c.cipherBlockChainingDecryptAESCryptStub, NativeCall, LEAF, NOT_REEXECUTABLE, - NamedLocationIdentity.getArrayLocation(JavaKind.Byte)); - registerForeignCall(DECRYPT_WITH_ORIGINAL_KEY, c.cipherBlockChainingDecryptAESCryptStub, NativeCall, LEAF, NOT_REEXECUTABLE, - NamedLocationIdentity.getArrayLocation(JavaKind.Byte)); + registerForeignCall(ENCRYPT, c.cipherBlockChainingEncryptAESCryptStub, NativeCall); + registerForeignCall(DECRYPT, c.cipherBlockChainingDecryptAESCryptStub, NativeCall); + registerForeignCall(DECRYPT_WITH_ORIGINAL_KEY, c.cipherBlockChainingDecryptAESCryptStub, NativeCall); } catch (GraalError e) { if (!(e.getCause() instanceof ClassNotFoundException)) { throw e; @@ -459,31 +468,24 @@ public abstract class HotSpotHostForeignCallsProvider extends HotSpotForeignCall if (c.useAESCTRIntrinsics) { assert (c.counterModeAESCrypt != 0L); - registerForeignCall(COUNTERMODE_IMPL_CRYPT, c.counterModeAESCrypt, NativeCall, LEAF, NOT_REEXECUTABLE, - NamedLocationIdentity.any()); + registerForeignCall(COUNTERMODE_IMPL_CRYPT, c.counterModeAESCrypt, NativeCall); } if (c.useVectorizedMismatchIntrinsic) { assert (c.vectorizedMismatch != 0L); - registerForeignCall(VECTORIZED_MISMATCHED, c.vectorizedMismatch, NativeCall, LEAF, NOT_REEXECUTABLE, - NamedLocationIdentity.any()); + registerForeignCall(VECTORIZED_MISMATCHED, c.vectorizedMismatch, NativeCall); } } - public HotSpotForeignCallLinkage getForeignCall(ForeignCallDescriptor descriptor) { - assert foreignCalls != null : descriptor; - return foreignCalls.get(descriptor); - } - @SuppressWarnings("unused") protected void registerMathStubs(GraalHotSpotVMConfig hotSpotVMConfig, HotSpotProviders providers, OptionValues options) { - registerForeignCall(SIN.foreignCallDescriptor, hotSpotVMConfig.arithmeticSinAddress, NativeCall, LEAF, REEXECUTABLE, NO_LOCATIONS); - registerForeignCall(COS.foreignCallDescriptor, hotSpotVMConfig.arithmeticCosAddress, NativeCall, LEAF, REEXECUTABLE, NO_LOCATIONS); - registerForeignCall(TAN.foreignCallDescriptor, hotSpotVMConfig.arithmeticTanAddress, NativeCall, LEAF, REEXECUTABLE, NO_LOCATIONS); - registerForeignCall(EXP.foreignCallDescriptor, hotSpotVMConfig.arithmeticExpAddress, NativeCall, LEAF, REEXECUTABLE, NO_LOCATIONS); - registerForeignCall(LOG.foreignCallDescriptor, hotSpotVMConfig.arithmeticLogAddress, NativeCall, LEAF, REEXECUTABLE, NO_LOCATIONS); - registerForeignCall(LOG10.foreignCallDescriptor, hotSpotVMConfig.arithmeticLog10Address, NativeCall, LEAF, REEXECUTABLE, NO_LOCATIONS); - registerForeignCall(POW.foreignCallDescriptor, hotSpotVMConfig.arithmeticPowAddress, NativeCall, LEAF, REEXECUTABLE, NO_LOCATIONS); + registerForeignCall(createDescriptor(SIN.foreignCallSignature, LEAF, REEXECUTABLE, NO_LOCATIONS), hotSpotVMConfig.arithmeticSinAddress, NativeCall); + registerForeignCall(createDescriptor(COS.foreignCallSignature, LEAF, REEXECUTABLE, NO_LOCATIONS), hotSpotVMConfig.arithmeticCosAddress, NativeCall); + registerForeignCall(createDescriptor(TAN.foreignCallSignature, LEAF, REEXECUTABLE, NO_LOCATIONS), hotSpotVMConfig.arithmeticTanAddress, NativeCall); + registerForeignCall(createDescriptor(EXP.foreignCallSignature, LEAF, REEXECUTABLE, NO_LOCATIONS), hotSpotVMConfig.arithmeticExpAddress, NativeCall); + registerForeignCall(createDescriptor(LOG.foreignCallSignature, LEAF, REEXECUTABLE, NO_LOCATIONS), hotSpotVMConfig.arithmeticLogAddress, NativeCall); + registerForeignCall(createDescriptor(LOG10.foreignCallSignature, LEAF, REEXECUTABLE, NO_LOCATIONS), hotSpotVMConfig.arithmeticLog10Address, NativeCall); + registerForeignCall(createDescriptor(POW.foreignCallSignature, LEAF, REEXECUTABLE, NO_LOCATIONS), hotSpotVMConfig.arithmeticPowAddress, NativeCall); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotMetaAccessExtensionProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotMetaAccessExtensionProvider.java new file mode 100644 index 00000000000..eca57f1e494 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotMetaAccessExtensionProvider.java @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.hotspot.meta; + +import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider; + +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ResolvedJavaType; + +public class HotSpotMetaAccessExtensionProvider implements MetaAccessExtensionProvider { + @Override + public JavaKind getStorageKind(JavaType type) { + return type.getJavaKind(); + } + + @Override + public boolean canConstantFoldDynamicAllocation(ResolvedJavaType type) { + /* + * The HotSpot lowering of DynamicNewInstanceNode includes an explicit is-initialized check + * and deoptimizes, but the lowering of NewInstanceNode does not. So we must not constant + * fold a non-initialized instance allocation. + */ + return type.isArray() || type.isInitialized(); + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotObjdumpDisassemblerProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotObjdumpDisassemblerProvider.java index 5edf3f4f903..fe9a64929f4 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotObjdumpDisassemblerProvider.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotObjdumpDisassemblerProvider.java @@ -52,7 +52,6 @@ import jdk.vm.ci.code.TargetDescription; import jdk.vm.ci.code.site.Call; import jdk.vm.ci.code.site.DataPatch; import jdk.vm.ci.code.site.Infopoint; -import jdk.vm.ci.code.site.Mark; import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider; import jdk.vm.ci.services.Services; @@ -97,8 +96,8 @@ public class HotSpotObjdumpDisassemblerProvider extends HotSpotDisassemblerProvi for (DataPatch site : compResult.getDataPatches()) { putAnnotation(annotations, site.pcOffset, "{" + site.reference.toString() + "}"); } - for (Mark mark : compResult.getMarks()) { - putAnnotation(annotations, mark.pcOffset, codeCache.getMarkName(mark)); + for (CompilationResult.CodeMark mark : compResult.getMarks()) { + putAnnotation(annotations, mark.pcOffset, mark.id.getName()); } for (CodeAnnotation a : compResult.getCodeAnnotations()) { putAnnotation(annotations, a.getPosition(), a.toString()); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotProviders.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotProviders.java index d007c521df8..580e87e6ed8 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotProviders.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotProviders.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -26,7 +26,7 @@ package org.graalvm.compiler.hotspot.meta; import org.graalvm.compiler.api.replacements.SnippetReflectionProvider; import org.graalvm.compiler.core.common.spi.ConstantFieldProvider; -import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; +import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider; import org.graalvm.compiler.hotspot.word.HotSpotWordTypes; import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; import org.graalvm.compiler.nodes.spi.LoweringProvider; @@ -34,7 +34,6 @@ import org.graalvm.compiler.nodes.spi.Replacements; import org.graalvm.compiler.phases.tiers.SuitesProvider; import org.graalvm.compiler.phases.util.Providers; -import jdk.vm.ci.code.CodeCacheProvider; import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider; import jdk.vm.ci.meta.ConstantReflectionProvider; import jdk.vm.ci.meta.MetaAccessProvider; @@ -50,18 +49,17 @@ public class HotSpotProviders extends Providers { private final SnippetReflectionProvider snippetReflection; private final HotSpotWordTypes wordTypes; private final Plugins graphBuilderPlugins; - private final HotSpotPlatformConfigurationProvider platformConfigurationProvider; public HotSpotProviders(MetaAccessProvider metaAccess, HotSpotCodeCacheProvider codeCache, ConstantReflectionProvider constantReflection, ConstantFieldProvider constantField, HotSpotForeignCallsProvider foreignCalls, LoweringProvider lowerer, Replacements replacements, SuitesProvider suites, HotSpotRegistersProvider registers, - SnippetReflectionProvider snippetReflection, HotSpotWordTypes wordTypes, Plugins graphBuilderPlugins, HotSpotPlatformConfigurationProvider platformConfigurationProvider) { - super(metaAccess, codeCache, constantReflection, constantField, foreignCalls, lowerer, replacements, new HotSpotStampProvider(), platformConfigurationProvider); + SnippetReflectionProvider snippetReflection, HotSpotWordTypes wordTypes, Plugins graphBuilderPlugins, HotSpotPlatformConfigurationProvider platformConfigurationProvider, + MetaAccessExtensionProvider metaAccessExtensionProvider) { + super(metaAccess, codeCache, constantReflection, constantField, foreignCalls, lowerer, replacements, new HotSpotStampProvider(), platformConfigurationProvider, metaAccessExtensionProvider); this.suites = suites; this.registers = registers; this.snippetReflection = snippetReflection; this.wordTypes = wordTypes; this.graphBuilderPlugins = graphBuilderPlugins; - this.platformConfigurationProvider = platformConfigurationProvider; } @Override @@ -96,53 +94,33 @@ public class HotSpotProviders extends Providers { @Override public HotSpotPlatformConfigurationProvider getPlatformConfigurationProvider() { - return platformConfigurationProvider; - } - - @Override - public Providers copyWith(MetaAccessProvider substitution) { - return new HotSpotProviders(substitution, getCodeCache(), getConstantReflection(), getConstantFieldProvider(), getForeignCalls(), getLowerer(), getReplacements(), getSuites(), - getRegisters(), getSnippetReflection(), getWordTypes(), getGraphBuilderPlugins(), getPlatformConfigurationProvider()); - } - - @Override - public Providers copyWith(CodeCacheProvider substitution) { - return new HotSpotProviders(getMetaAccess(), (HotSpotCodeCacheProvider) substitution, getConstantReflection(), getConstantFieldProvider(), getForeignCalls(), getLowerer(), getReplacements(), - getSuites(), getRegisters(), getSnippetReflection(), getWordTypes(), getGraphBuilderPlugins(), getPlatformConfigurationProvider()); + return (HotSpotPlatformConfigurationProvider) super.getPlatformConfigurationProvider(); } @Override public Providers copyWith(ConstantReflectionProvider substitution) { + assert this.getClass() == HotSpotProviders.class : "must override in " + getClass(); return new HotSpotProviders(getMetaAccess(), getCodeCache(), substitution, getConstantFieldProvider(), getForeignCalls(), getLowerer(), getReplacements(), getSuites(), - getRegisters(), getSnippetReflection(), getWordTypes(), getGraphBuilderPlugins(), getPlatformConfigurationProvider()); + getRegisters(), getSnippetReflection(), getWordTypes(), getGraphBuilderPlugins(), getPlatformConfigurationProvider(), getMetaAccessExtensionProvider()); } @Override public Providers copyWith(ConstantFieldProvider substitution) { + assert this.getClass() == HotSpotProviders.class : "must override in " + getClass(); return new HotSpotProviders(getMetaAccess(), getCodeCache(), getConstantReflection(), substitution, getForeignCalls(), getLowerer(), getReplacements(), getSuites(), - getRegisters(), getSnippetReflection(), getWordTypes(), getGraphBuilderPlugins(), getPlatformConfigurationProvider()); - } - - @Override - public Providers copyWith(ForeignCallsProvider substitution) { - return new HotSpotProviders(getMetaAccess(), getCodeCache(), getConstantReflection(), getConstantFieldProvider(), (HotSpotForeignCallsProvider) substitution, getLowerer(), getReplacements(), - getSuites(), getRegisters(), getSnippetReflection(), getWordTypes(), getGraphBuilderPlugins(), getPlatformConfigurationProvider()); - } - - @Override - public Providers copyWith(LoweringProvider substitution) { - return new HotSpotProviders(getMetaAccess(), getCodeCache(), getConstantReflection(), getConstantFieldProvider(), getForeignCalls(), substitution, getReplacements(), getSuites(), - getRegisters(), getSnippetReflection(), getWordTypes(), getGraphBuilderPlugins(), getPlatformConfigurationProvider()); + getRegisters(), getSnippetReflection(), getWordTypes(), getGraphBuilderPlugins(), getPlatformConfigurationProvider(), getMetaAccessExtensionProvider()); } @Override public Providers copyWith(Replacements substitution) { + assert this.getClass() == HotSpotProviders.class : "must override in " + getClass(); return new HotSpotProviders(getMetaAccess(), getCodeCache(), getConstantReflection(), getConstantFieldProvider(), getForeignCalls(), getLowerer(), substitution, getSuites(), - getRegisters(), getSnippetReflection(), getWordTypes(), getGraphBuilderPlugins(), getPlatformConfigurationProvider()); + getRegisters(), getSnippetReflection(), getWordTypes(), getGraphBuilderPlugins(), getPlatformConfigurationProvider(), getMetaAccessExtensionProvider()); } public Providers copyWith(Plugins substitution) { + assert this.getClass() == HotSpotProviders.class : "must override in " + getClass(); return new HotSpotProviders(getMetaAccess(), getCodeCache(), getConstantReflection(), getConstantFieldProvider(), getForeignCalls(), getLowerer(), getReplacements(), getSuites(), - getRegisters(), getSnippetReflection(), getWordTypes(), substitution, getPlatformConfigurationProvider()); + getRegisters(), getSnippetReflection(), getWordTypes(), substitution, getPlatformConfigurationProvider(), getMetaAccessExtensionProvider()); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotSuitesProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotSuitesProvider.java index 06b79a365d4..4a05f12a5f1 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotSuitesProvider.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotSuitesProvider.java @@ -86,11 +86,13 @@ public class HotSpotSuitesProvider extends SuitesProviderBase { Suites ret = defaultSuitesCreator.createSuites(options); if (ImmutableCode.getValue(options)) { + ListIterator> midTierLowering = ret.getMidTier().findPhase(LoweringPhase.class); + // lowering introduces class constants, therefore it must be after lowering - ret.getHighTier().appendPhase(new LoadJavaMirrorWithKlassPhase(config)); + midTierLowering.add(new LoadJavaMirrorWithKlassPhase(config)); if (VerifyPhases.getValue(options)) { - ret.getHighTier().appendPhase(new AheadOfTimeVerificationPhase()); + midTierLowering.add(new AheadOfTimeVerificationPhase()); } if (GeneratePIC.getValue(options)) { @@ -100,7 +102,6 @@ public class HotSpotSuitesProvider extends SuitesProviderBase { if (HotSpotAOTProfilingPlugin.Options.TieredAOT.getValue(options)) { highTierLowering.add(new FinalizeProfileNodesPhase(HotSpotAOTProfilingPlugin.Options.TierAInvokeInlineeNotifyFreqLog.getValue(options))); } - ListIterator> midTierLowering = ret.getMidTier().findPhase(LoweringPhase.class); midTierLowering.add(new ReplaceConstantNodesPhase(true)); // Replace possible constants after GC barrier expansion. diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/GraalHotSpotVMConfigNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/GraalHotSpotVMConfigNode.java index a191e24a514..79f28e60d50 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/GraalHotSpotVMConfigNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/GraalHotSpotVMConfigNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -25,27 +25,29 @@ package org.graalvm.compiler.hotspot.nodes; import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1; import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1; -import org.graalvm.compiler.api.replacements.Fold; -import org.graalvm.compiler.api.replacements.Fold.InjectedParameter; import org.graalvm.compiler.core.common.type.Stamp; import org.graalvm.compiler.core.common.type.StampFactory; +import org.graalvm.compiler.debug.GraalError; import org.graalvm.compiler.graph.Node; import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.graph.spi.Canonicalizable; import org.graalvm.compiler.graph.spi.CanonicalizerTool; import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; import org.graalvm.compiler.hotspot.HotSpotLIRGenerator; +import org.graalvm.compiler.hotspot.HotSpotMarkId; +import org.graalvm.compiler.hotspot.HotSpotReplacementsImpl; import org.graalvm.compiler.nodeinfo.NodeInfo; import org.graalvm.compiler.nodes.ConstantNode; import org.graalvm.compiler.nodes.calc.FloatingNode; +import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; import org.graalvm.compiler.nodes.spi.LIRLowerable; import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.ResolvedJavaMethod; import jdk.vm.ci.meta.Value; /** @@ -56,18 +58,7 @@ public class GraalHotSpotVMConfigNode extends FloatingNode implements LIRLowerab public static final NodeClass TYPE = NodeClass.create(GraalHotSpotVMConfigNode.class); private final GraalHotSpotVMConfig config; - protected final int markId; - - /** - * Constructor for {@link #areConfigValuesConstant()}. - * - * @param config - */ - public GraalHotSpotVMConfigNode(@InjectedNodeParameter GraalHotSpotVMConfig config) { - super(TYPE, StampFactory.forKind(JavaKind.Boolean)); - this.config = config; - this.markId = 0; - } + protected final HotSpotMarkId markId; /** * Constructor for node intrinsics below. @@ -75,7 +66,7 @@ public class GraalHotSpotVMConfigNode extends FloatingNode implements LIRLowerab * @param config * @param markId id of the config value */ - public GraalHotSpotVMConfigNode(@InjectedNodeParameter Stamp stamp, @InjectedNodeParameter GraalHotSpotVMConfig config, int markId) { + public GraalHotSpotVMConfigNode(@InjectedNodeParameter Stamp stamp, @InjectedNodeParameter GraalHotSpotVMConfig config, HotSpotMarkId markId) { super(TYPE, stamp); this.config = config; this.markId = markId; @@ -88,7 +79,7 @@ public class GraalHotSpotVMConfigNode extends FloatingNode implements LIRLowerab * @param markId id of the config value * @param kind explicit type of the node */ - public GraalHotSpotVMConfigNode(GraalHotSpotVMConfig config, int markId, JavaKind kind) { + public GraalHotSpotVMConfigNode(GraalHotSpotVMConfig config, HotSpotMarkId markId, JavaKind kind) { super(TYPE, StampFactory.forKind(kind)); this.config = config; this.markId = markId; @@ -101,95 +92,49 @@ public class GraalHotSpotVMConfigNode extends FloatingNode implements LIRLowerab } @NodeIntrinsic - private static native boolean areConfigValuesConstant(); + private static native long loadLongConfigValue(@ConstantNodeParameter HotSpotMarkId markId); @NodeIntrinsic - private static native long loadLongConfigValue(@ConstantNodeParameter int markId); - - @NodeIntrinsic - private static native int loadIntConfigValue(@ConstantNodeParameter int markId); - - @NodeIntrinsic - private static native byte loadByteConfigValue(@ConstantNodeParameter int markId); + private static native int loadIntConfigValue(@ConstantNodeParameter HotSpotMarkId markId); public static long cardTableAddress() { - return loadLongConfigValue(cardTableAddressMark(INJECTED_VMCONFIG)); - } - - public static boolean isCardTableAddressConstant() { - return areConfigValuesConstant(); - } - - public static long heapTopAddress() { - return loadLongConfigValue(heapTopAddressMark(INJECTED_VMCONFIG)); - } - - public static long heapEndAddress() { - return loadLongConfigValue(heapEndAddressMark(INJECTED_VMCONFIG)); + return loadLongConfigValue(HotSpotMarkId.CARD_TABLE_ADDRESS); } public static long crcTableAddress() { - return loadLongConfigValue(crcTableAddressMark(INJECTED_VMCONFIG)); + return loadLongConfigValue(HotSpotMarkId.CRC_TABLE_ADDRESS); } public static int logOfHeapRegionGrainBytes() { - return loadIntConfigValue(logOfHeapRegionGrainBytesMark(INJECTED_VMCONFIG)); + return loadIntConfigValue(HotSpotMarkId.LOG_OF_HEAP_REGION_GRAIN_BYTES); } - public static boolean inlineContiguousAllocationSupported() { - return loadByteConfigValue(inlineContiguousAllocationSupportedMark(INJECTED_VMCONFIG)) != 0; - } - - @Fold - public static int cardTableAddressMark(@InjectedParameter GraalHotSpotVMConfig config) { - return config.MARKID_CARD_TABLE_ADDRESS; - } - - @Fold - public static int heapTopAddressMark(@InjectedParameter GraalHotSpotVMConfig config) { - return config.MARKID_HEAP_TOP_ADDRESS; - } - - @Fold - public static int heapEndAddressMark(@InjectedParameter GraalHotSpotVMConfig config) { - return config.MARKID_HEAP_END_ADDRESS; - } - - @Fold - public static int crcTableAddressMark(@InjectedParameter GraalHotSpotVMConfig config) { - return config.MARKID_CRC_TABLE_ADDRESS; - } - - @Fold - public static int logOfHeapRegionGrainBytesMark(@InjectedParameter GraalHotSpotVMConfig config) { - return config.MARKID_LOG_OF_HEAP_REGION_GRAIN_BYTES; - } - - @Fold - public static int inlineContiguousAllocationSupportedMark(@InjectedParameter GraalHotSpotVMConfig config) { - return config.MARKID_INLINE_CONTIGUOUS_ALLOCATION_SUPPORTED; + @SuppressWarnings("unused") + public static boolean intrinsify(GraphBuilderContext b, ResolvedJavaMethod method, @InjectedNodeParameter Stamp returnStamp, @InjectedNodeParameter GraalHotSpotVMConfig config, + HotSpotMarkId mark) { + HotSpotReplacementsImpl replacements = (HotSpotReplacementsImpl) b.getReplacements(); + if (replacements.isEncodingSnippets()) { + // This plugin must be deferred so that these constants aren't embedded in libgraal + return false; + } + b.addPush(returnStamp.getStackKind(), new GraalHotSpotVMConfigNode(returnStamp, config, mark)); + return true; } @Override public Node canonical(CanonicalizerTool tool) { - if (markId == 0) { - return ConstantNode.forBoolean(!GeneratePIC.getValue(tool.getOptions())); - } - if (!GeneratePIC.getValue(tool.getOptions())) { - if (markId == config.MARKID_CARD_TABLE_ADDRESS) { + Boolean generatePIC = GeneratePIC.getValue(tool.getOptions()); + if (markId == null) { + return ConstantNode.forBoolean(!generatePIC); + } else if (!generatePIC) { + if (markId == HotSpotMarkId.CARD_TABLE_ADDRESS) { return ConstantNode.forLong(config.cardtableStartAddress); - } else if (markId == config.MARKID_HEAP_TOP_ADDRESS) { - return ConstantNode.forLong(config.heapTopAddress); - } else if (markId == config.MARKID_HEAP_END_ADDRESS) { - return ConstantNode.forLong(config.heapEndAddress); - } else if (markId == config.MARKID_CRC_TABLE_ADDRESS) { + } else if (markId == HotSpotMarkId.CRC_TABLE_ADDRESS) { return ConstantNode.forLong(config.crcTableAddress); - } else if (markId == config.MARKID_LOG_OF_HEAP_REGION_GRAIN_BYTES) { + } else if (markId == HotSpotMarkId.LOG_OF_HEAP_REGION_GRAIN_BYTES) { return ConstantNode.forInt(config.logOfHRGrainBytes); - } else if (markId == config.MARKID_INLINE_CONTIGUOUS_ALLOCATION_SUPPORTED) { - return ConstantNode.forBoolean(config.inlineContiguousAllocationSupported); } else { - assert false; + throw GraalError.shouldNotReachHere(markId.toString()); } } return this; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/KlassBeingInitializedCheckNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/KlassBeingInitializedCheckNode.java index 682b7ba6078..c176e070676 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/KlassBeingInitializedCheckNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/KlassBeingInitializedCheckNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, 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 @@ -33,7 +33,6 @@ import org.graalvm.compiler.nodeinfo.NodeInfo; import org.graalvm.compiler.nodes.DeoptimizingFixedWithNextNode; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; @NodeInfo(cycles = CYCLES_4, size = SIZE_16) public class KlassBeingInitializedCheckNode extends DeoptimizingFixedWithNextNode implements Lowerable { @@ -55,8 +54,4 @@ public class KlassBeingInitializedCheckNode extends DeoptimizingFixedWithNextNod return true; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/StubForeignCallNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/StubForeignCallNode.java index ee37b674624..e913ac1ce6b 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/StubForeignCallNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/StubForeignCallNode.java @@ -56,15 +56,15 @@ public final class StubForeignCallNode extends FixedWithNextNode implements LIRL public static final NodeClass TYPE = NodeClass.create(StubForeignCallNode.class); @Input NodeInputList arguments; - protected final ForeignCallsProvider foreignCalls; + private final ForeignCallsProvider foreignCalls; protected final ForeignCallDescriptor descriptor; public StubForeignCallNode(@InjectedNodeParameter ForeignCallsProvider foreignCalls, @InjectedNodeParameter Stamp stamp, ForeignCallDescriptor descriptor, ValueNode... arguments) { super(TYPE, stamp); + this.foreignCalls = foreignCalls; this.arguments = new NodeInputList<>(this, arguments); this.descriptor = descriptor; - this.foreignCalls = foreignCalls; } public ForeignCallDescriptor getDescriptor() { @@ -73,7 +73,7 @@ public final class StubForeignCallNode extends FixedWithNextNode implements LIRL @Override public LocationIdentity[] getKilledLocationIdentities() { - LocationIdentity[] killedLocations = foreignCalls.getKilledLocations(descriptor); + LocationIdentity[] killedLocations = descriptor.getKilledLocations(); killedLocations = Arrays.copyOf(killedLocations, killedLocations.length + 1); killedLocations[killedLocations.length - 1] = HotSpotReplacementsUtil.PENDING_EXCEPTION_LOCATION; return killedLocations; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/InitializeKlassNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/InitializeKlassNode.java index c51020e86bd..e06b3f7a2bc 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/InitializeKlassNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/InitializeKlassNode.java @@ -35,7 +35,6 @@ import org.graalvm.compiler.nodes.NodeView; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.memory.SingleMemoryKill; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import jdk.internal.vm.compiler.word.LocationIdentity; @NodeInfo(cycles = CYCLES_4, size = SIZE_16, allowedUsageTypes = {Memory}) @@ -49,11 +48,6 @@ public class InitializeKlassNode extends DeoptimizingFixedWithNextNode implement this.value = value; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - public ValueNode value() { return value; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveConstantNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveConstantNode.java index 1c06379403d..f5410cdb925 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveConstantNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveConstantNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -34,7 +34,6 @@ import org.graalvm.compiler.nodes.DeoptimizingFixedWithNextNode; import org.graalvm.compiler.nodes.NodeView; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; @NodeInfo(cycles = CYCLES_4, size = SIZE_16) public class ResolveConstantNode extends DeoptimizingFixedWithNextNode implements Lowerable { @@ -55,11 +54,6 @@ public class ResolveConstantNode extends DeoptimizingFixedWithNextNode implement this.action = HotSpotConstantLoadAction.RESOLVE; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - public ValueNode value() { return value; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveDynamicConstantNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveDynamicConstantNode.java index daf5b152912..4ca2e5bf48f 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveDynamicConstantNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveDynamicConstantNode.java @@ -27,7 +27,6 @@ package org.graalvm.compiler.hotspot.nodes.aot; import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_4; import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_16; -import jdk.internal.vm.compiler.word.LocationIdentity; import org.graalvm.compiler.core.common.type.Stamp; import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.nodeinfo.InputType; @@ -36,7 +35,7 @@ import org.graalvm.compiler.nodes.DeoptimizingFixedWithNextNode; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.memory.SingleMemoryKill; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; +import jdk.internal.vm.compiler.word.LocationIdentity; @NodeInfo(cycles = CYCLES_4, size = SIZE_16, allowedUsageTypes = {InputType.Memory}) public class ResolveDynamicConstantNode extends DeoptimizingFixedWithNextNode implements Lowerable, SingleMemoryKill { @@ -53,11 +52,6 @@ public class ResolveDynamicConstantNode extends DeoptimizingFixedWithNextNode im return value; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @Override public boolean canDeoptimize() { return true; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveMethodAndLoadCountersNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveMethodAndLoadCountersNode.java index fee0f23f46f..61281540692 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveMethodAndLoadCountersNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveMethodAndLoadCountersNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -33,7 +33,6 @@ import org.graalvm.compiler.nodeinfo.NodeInfo; import org.graalvm.compiler.nodes.DeoptimizingFixedWithNextNode; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import jdk.vm.ci.meta.ResolvedJavaMethod; @@ -50,11 +49,6 @@ public class ResolveMethodAndLoadCountersNode extends DeoptimizingFixedWithNextN this.hub = hub; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - public ResolvedJavaMethod getMethod() { return method; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileNode.java index d6e888938e3..b4b680e98a7 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -40,16 +40,17 @@ import org.graalvm.compiler.nodes.ControlSplitNode; import org.graalvm.compiler.nodes.DeoptimizingFixedWithNextNode; import org.graalvm.compiler.nodes.StructuredGraph; import org.graalvm.compiler.nodes.ValueNode; +import org.graalvm.compiler.nodes.memory.SingleMemoryKill; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.options.Option; import org.graalvm.compiler.options.OptionKey; import org.graalvm.compiler.options.OptionType; +import jdk.internal.vm.compiler.word.LocationIdentity; import jdk.vm.ci.meta.ResolvedJavaMethod; @NodeInfo(cycles = CYCLES_IGNORED, cyclesRationale = "profiling should be ignored", size = SIZE_IGNORED, sizeRationale = "profiling should be ignored") -public abstract class ProfileNode extends DeoptimizingFixedWithNextNode implements Simplifiable, Lowerable { +public abstract class ProfileNode extends DeoptimizingFixedWithNextNode implements SingleMemoryKill, Simplifiable, Lowerable { public static class Options { @Option(help = "Control probabilistic profiling on AMD64", type = OptionType.Expert)// public static final OptionKey ProbabilisticProfiling = new OptionKey<>(true); @@ -84,11 +85,6 @@ public abstract class ProfileNode extends DeoptimizingFixedWithNextNode implemen return true; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - public ResolvedJavaMethod getProfiledMethod() { return method; } @@ -145,4 +141,9 @@ public abstract class ProfileNode extends DeoptimizingFixedWithNextNode implemen } } } + + @Override + public LocationIdentity getKilledLocationIdentity() { + return LocationIdentity.any(); + } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/OnStackReplacementPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/OnStackReplacementPhase.java index 041800eebcb..0b2b49d74dd 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/OnStackReplacementPhase.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/OnStackReplacementPhase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -223,8 +223,8 @@ public class OnStackReplacementPhase extends Phase { } } - osr.replaceAtUsages(InputType.Guard, osrStart); - osr.replaceAtUsages(InputType.Anchor, osrStart); + osr.replaceAtUsages(osrStart, InputType.Guard); + osr.replaceAtUsages(osrStart, InputType.Anchor); } debug.dump(DebugContext.DETAILED_LEVEL, graph, "OnStackReplacement after replacing entry proxies"); GraphUtil.killCFG(start); @@ -238,6 +238,7 @@ public class OnStackReplacementPhase extends Phase { MonitorIdNode id = osrState.monitorIdAt(i); ValueNode lockedObject = osrState.lockAt(i); OSRMonitorEnterNode osrMonitorEnter = graph.add(new OSRMonitorEnterNode(lockedObject, id)); + osrMonitorEnter.setStateAfter(osrStart.stateAfter()); for (Node usage : id.usages()) { if (usage instanceof AccessMonitorNode) { AccessMonitorNode access = (AccessMonitorNode) usage; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/AOTInliningPolicy.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/AOTInliningPolicy.java index 8e2433b47b6..24d75bd6eda 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/AOTInliningPolicy.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/AOTInliningPolicy.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -67,13 +67,14 @@ public class AOTInliningPolicy extends GreedyInliningPolicy { @Override public Decision isWorthInlining(Replacements replacements, MethodInvocation invocation, InlineInfo calleeInfo, int inliningDepth, boolean fullyProcessed) { OptionValues options = calleeInfo.graph().getOptions(); - final boolean isTracing = GraalOptions.TraceInlining.getValue(options); + final boolean isTracing = GraalOptions.TraceInlining.getValue(options) || calleeInfo.graph().getDebug().hasCompilationListener(); + final InlineInfo info = invocation.callee(); for (int i = 0; i < info.numberOfMethods(); ++i) { HotSpotResolvedObjectType t = (HotSpotResolvedObjectType) info.methodAt(i).getDeclaringClass(); if (t.getFingerprint() == 0) { - return InliningPolicy.Decision.NO; + return InliningPolicy.Decision.NO.withReason(isTracing, "missing fingerprint"); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/ReplaceConstantNodesPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/ReplaceConstantNodesPhase.java index f9cf6166097..74889ee0a93 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/ReplaceConstantNodesPhase.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/ReplaceConstantNodesPhase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/AESCryptSubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/AESCryptSubstitutions.java index 9061fc5db4e..cdbfc323e17 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/AESCryptSubstitutions.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/AESCryptSubstitutions.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -24,8 +24,8 @@ package org.graalvm.compiler.hotspot.replacements; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_INTRINSIC_CONTEXT; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_METAACCESS; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_INTRINSIC_CONTEXT; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_METAACCESS; import static org.graalvm.compiler.hotspot.HotSpotBackend.DECRYPT_BLOCK; import static org.graalvm.compiler.hotspot.HotSpotBackend.DECRYPT_BLOCK_WITH_ORIGINAL_KEY; import static org.graalvm.compiler.hotspot.HotSpotBackend.ENCRYPT_BLOCK; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/AssertionSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/AssertionSnippets.java index b80240afc1e..4e08bec2e96 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/AssertionSnippets.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/AssertionSnippets.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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 @@ -26,6 +26,9 @@ package org.graalvm.compiler.hotspot.replacements; import static org.graalvm.compiler.api.directives.GraalDirectives.SLOWPATH_PROBABILITY; import static org.graalvm.compiler.api.directives.GraalDirectives.injectBranchProbability; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.LEAF; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.NO_LOCATIONS; import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER; import static org.graalvm.compiler.replacements.nodes.CStringConstant.cstring; @@ -35,7 +38,9 @@ import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; import org.graalvm.compiler.debug.DebugHandlersFactory; import org.graalvm.compiler.graph.Node.ConstantNodeParameter; import org.graalvm.compiler.graph.Node.NodeIntrinsic; +import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; import org.graalvm.compiler.hotspot.meta.HotSpotProviders; +import org.graalvm.compiler.hotspot.nodes.StubForeignCallNode; import org.graalvm.compiler.hotspot.nodes.StubStartNode; import org.graalvm.compiler.nodes.StructuredGraph; import org.graalvm.compiler.nodes.extended.ForeignCallNode; @@ -56,25 +61,29 @@ public class AssertionSnippets implements Snippets { * This call can only be used with true for the "vmError" parameter, so that it can be * configured to be a leaf method. */ - public static final ForeignCallDescriptor ASSERTION_VM_MESSAGE_C = new ForeignCallDescriptor("assertionVmMessageC", void.class, boolean.class, Word.class, long.class, long.class, long.class); + public static final HotSpotForeignCallDescriptor ASSERTION_VM_MESSAGE_C = new HotSpotForeignCallDescriptor(LEAF, REEXECUTABLE, NO_LOCATIONS, "assertionVmMessageC", void.class, boolean.class, + Word.class, long.class, long.class, long.class); @Snippet - public static void assertion(boolean condition, @ConstantParameter String message) { + public static void assertion(boolean condition, @ConstantParameter String message, long l1, long l2) { if (injectBranchProbability(SLOWPATH_PROBABILITY, !condition)) { - vmMessageC(ASSERTION_VM_MESSAGE_C, true, cstring(message), 0L, 0L, 0L); + vmMessageC(ASSERTION_VM_MESSAGE_C, true, cstring(message), l1, l2, 0L); } } @Snippet - public static void stubAssertion(boolean condition, @ConstantParameter String message) { + public static void stubAssertion(boolean condition, @ConstantParameter String message, long l1, long l2) { if (injectBranchProbability(SLOWPATH_PROBABILITY, !condition)) { - vmMessageC(ASSERTION_VM_MESSAGE_C, true, cstring(message), 0L, 0L, 0L); + vmMessageStub(ASSERTION_VM_MESSAGE_C, true, cstring(message), l1, l2, 0L); } } @NodeIntrinsic(ForeignCallNode.class) static native void vmMessageC(@ConstantNodeParameter ForeignCallDescriptor stubPrintfC, boolean vmError, Word format, long v1, long v2, long v3); + @NodeIntrinsic(StubForeignCallNode.class) + static native void vmMessageStub(@ConstantNodeParameter ForeignCallDescriptor stubPrintfC, boolean vmError, Word format, long v1, long v2, long v3); + public static class Templates extends AbstractTemplates { private final SnippetInfo assertion = snippet(AssertionSnippets.class, "assertion"); @@ -89,7 +98,8 @@ public class AssertionSnippets implements Snippets { Arguments args = new Arguments(graph.start() instanceof StubStartNode ? stubAssertion : assertion, graph.getGuardsStage(), tool.getLoweringStage()); args.add("condition", assertionNode.condition()); args.addConst("message", "failed runtime assertion in snippet/stub: " + assertionNode.message() + " (" + graph.method() + ")"); - + args.add("l1", assertionNode.getL1()); + args.add("l2", assertionNode.getL2()); template(assertionNode, args).instantiate(providers.getMetaAccess(), assertionNode, DEFAULT_REPLACER, args); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CRC32CSubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CRC32CSubstitutions.java index 1af5c089eae..b89c9bb3efb 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CRC32CSubstitutions.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CRC32CSubstitutions.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -24,13 +24,17 @@ package org.graalvm.compiler.hotspot.replacements; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_METAACCESS; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_METAACCESS; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO; +import static jdk.internal.vm.compiler.word.LocationIdentity.any; import org.graalvm.compiler.api.replacements.ClassSubstitution; import org.graalvm.compiler.api.replacements.MethodSubstitution; import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; import org.graalvm.compiler.graph.Node.ConstantNodeParameter; import org.graalvm.compiler.graph.Node.NodeIntrinsic; +import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; import org.graalvm.compiler.nodes.ComputeObjectAddressNode; import org.graalvm.compiler.nodes.extended.ForeignCallNode; import org.graalvm.compiler.replacements.ReplacementsUtil; @@ -60,7 +64,8 @@ public class CRC32CSubstitutions { return updateBytesCRC32(UPDATE_BYTES_CRC32C, crc, bufAddr, end - off); } - public static final ForeignCallDescriptor UPDATE_BYTES_CRC32C = new ForeignCallDescriptor("updateBytesCRC32C", int.class, int.class, WordBase.class, int.class); + public static final HotSpotForeignCallDescriptor UPDATE_BYTES_CRC32C = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, any(), "updateBytesCRC32C", int.class, int.class, + WordBase.class, int.class); @NodeIntrinsic(ForeignCallNode.class) public static native int updateBytesCRC32(@ConstantNodeParameter ForeignCallDescriptor descriptor, int crc, WordBase buf, int length); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CRC32Substitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CRC32Substitutions.java index 8a344664af6..0cb3f32cddb 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CRC32Substitutions.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CRC32Substitutions.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -24,7 +24,10 @@ package org.graalvm.compiler.hotspot.replacements; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_METAACCESS; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_METAACCESS; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO; +import static jdk.internal.vm.compiler.word.LocationIdentity.any; import java.util.zip.CRC32; @@ -33,6 +36,7 @@ import org.graalvm.compiler.api.replacements.MethodSubstitution; import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; import org.graalvm.compiler.graph.Node.ConstantNodeParameter; import org.graalvm.compiler.graph.Node.NodeIntrinsic; +import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; import org.graalvm.compiler.hotspot.nodes.GraalHotSpotVMConfigNode; import org.graalvm.compiler.nodes.ComputeObjectAddressNode; import org.graalvm.compiler.nodes.extended.ForeignCallNode; @@ -103,7 +107,8 @@ public class CRC32Substitutions { return updateBytesCRC32(UPDATE_BYTES_CRC32, crc, bufAddr, len); } - public static final ForeignCallDescriptor UPDATE_BYTES_CRC32 = new ForeignCallDescriptor("updateBytesCRC32", int.class, int.class, WordBase.class, int.class); + public static final HotSpotForeignCallDescriptor UPDATE_BYTES_CRC32 = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, any(), "updateBytesCRC32", int.class, int.class, + WordBase.class, int.class); @NodeIntrinsic(ForeignCallNode.class) public static native int updateBytesCRC32(@ConstantNodeParameter ForeignCallDescriptor descriptor, int crc, WordBase buf, int length); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CallSiteTargetNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CallSiteTargetNode.java index f29c918491e..bf42bc79ff2 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CallSiteTargetNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CallSiteTargetNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -24,13 +24,11 @@ package org.graalvm.compiler.hotspot.replacements; -import org.graalvm.compiler.core.common.type.StampPair; import org.graalvm.compiler.graph.Node; import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.graph.spi.Canonicalizable; import org.graalvm.compiler.graph.spi.CanonicalizerTool; import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind; import org.graalvm.compiler.nodes.ConstantNode; import org.graalvm.compiler.nodes.InvokeNode; import org.graalvm.compiler.nodes.ValueNode; @@ -42,15 +40,14 @@ import jdk.vm.ci.hotspot.HotSpotObjectConstant; import jdk.vm.ci.meta.Assumptions; import jdk.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.MetaAccessProvider; -import jdk.vm.ci.meta.ResolvedJavaMethod; @NodeInfo public final class CallSiteTargetNode extends MacroStateSplitNode implements Canonicalizable, Lowerable { public static final NodeClass TYPE = NodeClass.create(CallSiteTargetNode.class); - public CallSiteTargetNode(InvokeKind invokeKind, ResolvedJavaMethod targetMethod, int bci, StampPair returnStamp, ValueNode receiver) { - super(TYPE, invokeKind, targetMethod, bci, returnStamp, receiver); + public CallSiteTargetNode(MacroParams p) { + super(TYPE, p); } private ValueNode getCallSite() { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CipherBlockChainingSubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CipherBlockChainingSubstitutions.java index 75d01c0a6a1..253b43e97a0 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CipherBlockChainingSubstitutions.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CipherBlockChainingSubstitutions.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -24,8 +24,8 @@ package org.graalvm.compiler.hotspot.replacements; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_INTRINSIC_CONTEXT; import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_METAACCESS; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_INTRINSIC_CONTEXT; import static org.graalvm.compiler.hotspot.HotSpotBackend.DECRYPT; import static org.graalvm.compiler.hotspot.HotSpotBackend.DECRYPT_WITH_ORIGINAL_KEY; import static org.graalvm.compiler.hotspot.HotSpotBackend.ENCRYPT; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ClassGetHubNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ClassGetHubNode.java index dca1423ae86..bcf14667a8a 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ClassGetHubNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ClassGetHubNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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 @@ -49,7 +49,6 @@ import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; import org.graalvm.compiler.nodes.memory.ReadNode; import org.graalvm.compiler.nodes.memory.address.AddressNode; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import jdk.internal.vm.compiler.word.LocationIdentity; import jdk.vm.ci.meta.Constant; @@ -123,11 +122,6 @@ public final class ClassGetHubNode extends FloatingNode implements Lowerable, Ca return canonical(this, tool.getMetaAccess(), tool.getConstantReflection(), tool.allUsagesAvailable(), stamp(NodeView.DEFAULT), clazz); } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @NodeIntrinsic public static native KlassPointer readClass(Class clazzNonNull); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CounterModeSubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CounterModeSubstitutions.java index 6ac5b6b44d2..a93b1f5b1b1 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CounterModeSubstitutions.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CounterModeSubstitutions.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, 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 @@ -24,11 +24,12 @@ package org.graalvm.compiler.hotspot.replacements; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_INTRINSIC_CONTEXT; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_METAACCESS; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_INTRINSIC_CONTEXT; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_METAACCESS; import static org.graalvm.compiler.hotspot.replacements.CipherBlockChainingSubstitutions.aesCryptType; import static org.graalvm.compiler.hotspot.replacements.CipherBlockChainingSubstitutions.embeddedCipherOffset; import static org.graalvm.compiler.nodes.PiNode.piCastNonNull; +import static org.graalvm.compiler.nodes.java.InstanceOfNode.doInstanceof; import org.graalvm.compiler.api.replacements.ClassSubstitution; import org.graalvm.compiler.api.replacements.Fold; @@ -53,23 +54,27 @@ public class CounterModeSubstitutions { static int implCrypt(Object receiver, byte[] in, int inOff, int len, byte[] out, int outOff) { Object realReceiver = piCastNonNull(receiver, HotSpotReplacementsUtil.methodHolderClass(INJECTED_INTRINSIC_CONTEXT)); Object embeddedCipher = RawLoadNode.load(realReceiver, embeddedCipherOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any()); - Object aesCipher = piCastNonNull(embeddedCipher, aesCryptType(INJECTED_INTRINSIC_CONTEXT)); + if (doInstanceof(aesCryptType(INJECTED_INTRINSIC_CONTEXT), embeddedCipher)) { + Object aesCipher = piCastNonNull(embeddedCipher, aesCryptType(INJECTED_INTRINSIC_CONTEXT)); - Word srcAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(in, ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte) + inOff)); - Word dstAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(out, ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte) + outOff)); - Word usedPtr = WordFactory.unsigned(ComputeObjectAddressNode.get(realReceiver, usedOffset(INJECTED_INTRINSIC_CONTEXT))); + Word srcAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(in, ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte) + inOff)); + Word dstAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(out, ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte) + outOff)); + Word usedPtr = WordFactory.unsigned(ComputeObjectAddressNode.get(realReceiver, usedOffset(INJECTED_INTRINSIC_CONTEXT))); - int cntOffset = counterOffset(INJECTED_INTRINSIC_CONTEXT); - int encCntOffset = encCounterOffset(INJECTED_INTRINSIC_CONTEXT); - Object kObject = RawLoadNode.load(aesCipher, AESCryptSubstitutions.kOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any()); - Object cntObj = RawLoadNode.load(realReceiver, cntOffset, JavaKind.Object, LocationIdentity.any()); - Object encCntObj = RawLoadNode.load(realReceiver, encCntOffset, JavaKind.Object, LocationIdentity.any()); + int cntOffset = counterOffset(INJECTED_INTRINSIC_CONTEXT); + int encCntOffset = encCounterOffset(INJECTED_INTRINSIC_CONTEXT); + Object kObject = RawLoadNode.load(aesCipher, AESCryptSubstitutions.kOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any()); + Object cntObj = RawLoadNode.load(realReceiver, cntOffset, JavaKind.Object, LocationIdentity.any()); + Object encCntObj = RawLoadNode.load(realReceiver, encCntOffset, JavaKind.Object, LocationIdentity.any()); - Word kPtr = Word.objectToTrackedPointer(kObject).add(ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Int)); - Word cntPtr = Word.objectToTrackedPointer(cntObj).add(ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte)); - Word encCntPtr = Word.objectToTrackedPointer(encCntObj).add(ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte)); + Word kPtr = Word.objectToTrackedPointer(kObject).add(ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Int)); + Word cntPtr = Word.objectToTrackedPointer(cntObj).add(ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte)); + Word encCntPtr = Word.objectToTrackedPointer(encCntObj).add(ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte)); - return HotSpotBackend.counterModeAESCrypt(srcAddr, dstAddr, kPtr, cntPtr, len, encCntPtr, usedPtr); + return HotSpotBackend.counterModeAESCrypt(srcAddr, dstAddr, kPtr, cntPtr, len, encCntPtr, usedPtr); + } else { + return implCrypt(realReceiver, in, inOff, len, out, outOff); + } } static ResolvedJavaType counterModeType(IntrinsicContext context) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/DigestBaseSubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/DigestBaseSubstitutions.java index 09f2fe929ca..3c07b7e4dff 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/DigestBaseSubstitutions.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/DigestBaseSubstitutions.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, 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 @@ -25,8 +25,8 @@ package org.graalvm.compiler.hotspot.replacements; import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_METAACCESS; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_INTRINSIC_CONTEXT; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_VMCONFIG; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_INTRINSIC_CONTEXT; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; import static org.graalvm.compiler.nodes.java.InstanceOfNode.doInstanceof; import org.graalvm.compiler.api.replacements.ClassSubstitution; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/FastNotifyNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/FastNotifyNode.java index 1351905e7a0..33c251c32cb 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/FastNotifyNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/FastNotifyNode.java @@ -38,7 +38,6 @@ import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.memory.AbstractMemoryCheckpoint; import org.graalvm.compiler.nodes.memory.SingleMemoryKill; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import jdk.internal.vm.compiler.word.LocationIdentity; @NodeInfo(cycles = CYCLES_2, size = SIZE_0, allowedUsageTypes = Memory) @@ -60,11 +59,6 @@ public class FastNotifyNode extends AbstractMemoryCheckpoint implements Lowerabl this.bci = bci; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - public boolean isNotifyAll() { return notifyAll; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotAllocationSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotAllocationSnippets.java index c759164dfc5..4ae2a9aea0e 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotAllocationSnippets.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotAllocationSnippets.java @@ -29,14 +29,17 @@ import static jdk.vm.ci.meta.DeoptimizationAction.None; import static jdk.vm.ci.meta.DeoptimizationReason.RuntimeConstraint; import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC; import static org.graalvm.compiler.core.common.GraalOptions.MinimalBulkZeroingSize; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_OPTIONVALUES; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_VMCONFIG; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_OPTIONVALUES; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_ARRAY; import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_ARRAY_OR_NULL; import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_INSTANCE; import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_INSTANCE_OR_NULL; import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_MULTI_ARRAY; import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_MULTI_ARRAY_OR_NULL; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.NO_LOCATIONS; import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.CLASS_ARRAY_KLASS_LOCATION; import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.CLASS_INIT_STATE_LOCATION; import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.HUB_WRITE_LOCATION; @@ -66,7 +69,7 @@ import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.FAST_PAT import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY; import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.VERY_FAST_PATH_PROBABILITY; import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability; -import static org.graalvm.compiler.replacements.ReplacementsUtil.runtimeAssert; +import static org.graalvm.compiler.replacements.ReplacementsUtil.dynamicAssert; import static org.graalvm.compiler.replacements.ReplacementsUtil.staticAssert; import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER; import static org.graalvm.compiler.replacements.nodes.CStringConstant.cstring; @@ -83,6 +86,7 @@ import org.graalvm.compiler.debug.GraalError; import org.graalvm.compiler.graph.Node.ConstantNodeParameter; import org.graalvm.compiler.graph.Node.NodeIntrinsic; import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; +import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; import org.graalvm.compiler.hotspot.meta.HotSpotProviders; import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider; import org.graalvm.compiler.hotspot.nodes.KlassBeingInitializedCheckNode; @@ -128,9 +132,10 @@ import jdk.vm.ci.meta.ResolvedJavaType; public class HotSpotAllocationSnippets extends AllocationSnippets { /** New dynamic array stub that throws an {@link OutOfMemoryError} on allocation failure. */ - public static final ForeignCallDescriptor DYNAMIC_NEW_INSTANCE = new ForeignCallDescriptor("dynamic_new_instance", Object.class, Class.class); + public static final HotSpotForeignCallDescriptor DYNAMIC_NEW_INSTANCE = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, NO_LOCATIONS, "dynamic_new_instance", Object.class, Class.class); /** New dynamic array stub that returns null on allocation failure. */ - public static final ForeignCallDescriptor DYNAMIC_NEW_INSTANCE_OR_NULL = new ForeignCallDescriptor("dynamic_new_instance_or_null", Object.class, Class.class); + public static final HotSpotForeignCallDescriptor DYNAMIC_NEW_INSTANCE_OR_NULL = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, NO_LOCATIONS, "dynamic_new_instance_or_null", + Object.class, Class.class); private final GraalHotSpotVMConfig config; private final Register threadRegister; @@ -290,7 +295,7 @@ public class HotSpotAllocationSnippets extends AllocationSnippets { if (knownElementKind == JavaKind.Illegal) { layoutHelper = readLayoutHelper(nonNullKlass); } else { - runtimeAssert(knownLayoutHelper == readLayoutHelper(nonNullKlass), "layout mismatch"); + dynamicAssert(knownLayoutHelper == readLayoutHelper(nonNullKlass), "layout mismatch"); layoutHelper = knownLayoutHelper; } //@formatter:off diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotClassSubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotClassSubstitutions.java index bd6ebc82349..bf0cdd4e2ba 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotClassSubstitutions.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotClassSubstitutions.java @@ -25,7 +25,7 @@ package org.graalvm.compiler.hotspot.replacements; import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_METAACCESS; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_METAACCESS; import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.ARRAY_KLASS_COMPONENT_MIRROR; import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.KLASS_ACCESS_FLAGS_LOCATION; import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.KLASS_MODIFIER_FLAGS_LOCATION; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java index c6beadc0528..0178ca4c802 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, 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 @@ -24,13 +24,17 @@ package org.graalvm.compiler.hotspot.replacements; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_METAACCESS; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_VMCONFIG; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_METAACCESS; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.NO_LOCATIONS; import org.graalvm.compiler.core.common.CompressEncoding; import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; import org.graalvm.compiler.debug.DebugHandlersFactory; import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; +import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl; import org.graalvm.compiler.hotspot.meta.HotSpotProviders; import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider; @@ -59,9 +63,10 @@ import jdk.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.ResolvedJavaType; public final class HotSpotG1WriteBarrierSnippets extends G1WriteBarrierSnippets { - public static final ForeignCallDescriptor G1WBPRECALL = new ForeignCallDescriptor("write_barrier_pre", void.class, Object.class); - public static final ForeignCallDescriptor G1WBPOSTCALL = new ForeignCallDescriptor("write_barrier_post", void.class, Word.class); - public static final ForeignCallDescriptor VALIDATE_OBJECT = new ForeignCallDescriptor("validate_object", boolean.class, Word.class, Word.class); + public static final HotSpotForeignCallDescriptor G1WBPRECALL = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS, "write_barrier_pre", void.class, Object.class); + public static final HotSpotForeignCallDescriptor G1WBPOSTCALL = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS, "write_barrier_post", void.class, Word.class); + public static final HotSpotForeignCallDescriptor VALIDATE_OBJECT = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS, "validate_object", boolean.class, Word.class, + Word.class); private final GraalHotSpotVMConfig config; private final Register threadRegister; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReflectionGetCallerClassNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReflectionGetCallerClassNode.java new file mode 100644 index 00000000000..3f74f0df984 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReflectionGetCallerClassNode.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2013, 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.hotspot.replacements; + +import org.graalvm.compiler.graph.NodeClass; +import org.graalvm.compiler.nodeinfo.NodeInfo; +import org.graalvm.compiler.replacements.nodes.ReflectionGetCallerClassNode; + +import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; + +@NodeInfo +public final class HotSpotReflectionGetCallerClassNode extends ReflectionGetCallerClassNode { + + public static final NodeClass TYPE = NodeClass.create(HotSpotReflectionGetCallerClassNode.class); + + public HotSpotReflectionGetCallerClassNode(MacroParams p) { + super(TYPE, p); + } + + @Override + protected boolean isCallerSensitive(ResolvedJavaMethod method) { + return ((HotSpotResolvedJavaMethod) method).isCallerSensitive(); + } + + @Override + protected boolean ignoredBySecurityStackWalk(ResolvedJavaMethod method) { + return ((HotSpotResolvedJavaMethod) method).ignoredBySecurityStackWalk(); + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java index e0be3868bfe..4cc503912a2 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java @@ -24,8 +24,8 @@ package org.graalvm.compiler.hotspot.replacements; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_METAACCESS; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_VMCONFIG; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_METAACCESS; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.VERIFY_OOP; import java.lang.ref.Reference; @@ -872,6 +872,10 @@ public class HotSpotReplacementsUtil { return config.gcTotalCollectionsAddress(); } + public static String referentFieldName() { + return "referent"; + } + @Fold public static long referentOffset(@InjectedParameter MetaAccessProvider metaAccessProvider) { return referentField(metaAccessProvider).getOffset(); @@ -879,7 +883,7 @@ public class HotSpotReplacementsUtil { @Fold public static ResolvedJavaField referentField(@InjectedParameter MetaAccessProvider metaAccessProvider) { - return getField(metaAccessProvider.lookupJavaType(Reference.class), "referent"); + return getField(referenceType(metaAccessProvider), referentFieldName()); } @Fold diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotSerialWriteBarrierSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotSerialWriteBarrierSnippets.java index 44352a2cce7..734584fc9d4 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotSerialWriteBarrierSnippets.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotSerialWriteBarrierSnippets.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, 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 @@ -24,7 +24,7 @@ package org.graalvm.compiler.hotspot.replacements; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_VMCONFIG; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; import org.graalvm.compiler.debug.DebugHandlersFactory; import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HubGetClassNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HubGetClassNode.java index b2c3afd7edd..9ecfc3772fe 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HubGetClassNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HubGetClassNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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 @@ -42,7 +42,6 @@ import org.graalvm.compiler.nodes.calc.ConvertNode; import org.graalvm.compiler.nodes.calc.FloatingNode; import org.graalvm.compiler.nodes.extended.HubGetClassNodeInterface; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.ConstantReflectionProvider; @@ -85,11 +84,6 @@ public final class HubGetClassNode extends FloatingNode implements Lowerable, Ca } } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @NodeIntrinsic public static native Class readClass(KlassPointer hub); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/IdentityHashCodeNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/IdentityHashCodeNode.java index 551fa80221d..8194dd22c08 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/IdentityHashCodeNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/IdentityHashCodeNode.java @@ -35,29 +35,30 @@ import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.graph.spi.Canonicalizable; import org.graalvm.compiler.graph.spi.CanonicalizerTool; import org.graalvm.compiler.nodeinfo.NodeInfo; +import org.graalvm.compiler.nodes.AbstractStateSplit; import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.FixedWithNextNode; +import org.graalvm.compiler.nodes.DeoptBciSupplier; import org.graalvm.compiler.nodes.NodeView; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.memory.SingleMemoryKill; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import jdk.internal.vm.compiler.word.LocationIdentity; import jdk.vm.ci.hotspot.HotSpotObjectConstant; import jdk.vm.ci.meta.JavaConstant; @NodeInfo(cycles = CYCLES_0, size = SIZE_0) -public class IdentityHashCodeNode extends FixedWithNextNode implements Canonicalizable, Lowerable, SingleMemoryKill { +public class IdentityHashCodeNode extends AbstractStateSplit implements Canonicalizable, Lowerable, SingleMemoryKill, DeoptBciSupplier { public static final NodeClass TYPE = NodeClass.create(IdentityHashCodeNode.class); @Input ValueNode object; + private int bci; - public IdentityHashCodeNode(ValueNode object) { + public IdentityHashCodeNode(ValueNode object, int bci) { super(TYPE, StampFactory.forInteger(32)); this.object = object; - + this.bci = bci; } @Override @@ -69,6 +70,16 @@ public class IdentityHashCodeNode extends FixedWithNextNode implements Canonical return object; } + @Override + public int bci() { + return bci; + } + + @Override + public void setBci(int bci) { + this.bci = bci; + } + @Override public Node canonical(CanonicalizerTool tool) { if (object.isConstant()) { @@ -88,13 +99,4 @@ public class IdentityHashCodeNode extends FixedWithNextNode implements Canonical } return this; } - - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - - @NodeIntrinsic - public static native int identityHashCode(Object object); - } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/InstanceOfSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/InstanceOfSnippets.java index 8441c692fed..8c10a6c4638 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/InstanceOfSnippets.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/InstanceOfSnippets.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -198,7 +198,8 @@ public class InstanceOfSnippets implements Snippets { * Type test used when the type being tested against is not known at compile time. */ @Snippet - public static Object instanceofDynamic(KlassPointer hub, Object object, Object trueValue, Object falseValue, @ConstantParameter boolean allowNull, @ConstantParameter Counters counters) { + public static Object instanceofDynamic(KlassPointer hub, Object object, Object trueValue, Object falseValue, @ConstantParameter boolean allowNull, @ConstantParameter boolean exact, + @ConstantParameter Counters counters) { if (probability(NOT_FREQUENT_PROBABILITY, object == null)) { counters.isNull.inc(); if (allowNull) { @@ -209,6 +210,14 @@ public class InstanceOfSnippets implements Snippets { } GuardingNode anchorNode = SnippetAnchorNode.anchor(); KlassPointer nonNullObjectHub = loadHubIntrinsic(PiNode.piCastNonNull(object, anchorNode)); + if (exact) { + if (probability(LIKELY_PROBABILITY, nonNullObjectHub.notEqual(hub))) { + counters.exactMiss.inc(); + return falseValue; + } + counters.exactHit.inc(); + return trueValue; + } // The hub of a primitive type can be null => always return false in this case. if (BranchProbabilityNode.probability(BranchProbabilityNode.FAST_PATH_PROBABILITY, !hub.isNull())) { if (checkUnknownSubType(hub, nonNullObjectHub, counters)) { @@ -326,6 +335,7 @@ public class InstanceOfSnippets implements Snippets { args.add("trueValue", replacer.trueValue); args.add("falseValue", replacer.falseValue); args.addConst("allowNull", instanceOf.allowsNull()); + args.addConst("exact", instanceOf.isExact()); args.addConst("counters", counters); return args; } else if (replacer.instanceOf instanceof ClassIsAssignableFromNode) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/KlassLayoutHelperNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/KlassLayoutHelperNode.java index a737e5e685f..35aab319015 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/KlassLayoutHelperNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/KlassLayoutHelperNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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 @@ -27,9 +27,6 @@ package org.graalvm.compiler.hotspot.replacements; import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1; import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1; -import jdk.vm.ci.meta.ConstantReflectionProvider; -import jdk.vm.ci.meta.MetaAccessProvider; -import jdk.vm.ci.meta.ResolvedJavaMethod; import org.graalvm.compiler.core.common.type.ObjectStamp; import org.graalvm.compiler.core.common.type.Stamp; import org.graalvm.compiler.core.common.type.StampFactory; @@ -46,11 +43,13 @@ import org.graalvm.compiler.nodes.calc.FloatingNode; import org.graalvm.compiler.nodes.extended.LoadHubNode; import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import jdk.vm.ci.hotspot.HotSpotResolvedObjectType; import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.ConstantReflectionProvider; import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; import jdk.vm.ci.meta.ResolvedJavaType; /** @@ -143,11 +142,6 @@ public final class KlassLayoutHelperNode extends FloatingNode implements Canonic return self; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - public ValueNode getHub() { return klass; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/LoadExceptionObjectSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/LoadExceptionObjectSnippets.java index 6a770eaac42..fc488212b5c 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/LoadExceptionObjectSnippets.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/LoadExceptionObjectSnippets.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -97,7 +97,7 @@ public class LoadExceptionObjectSnippets implements Snippets { Stamp stamp = wordTypes.getWordStamp(wordType); ReadRegisterNode thread = graph.add(new ReadRegisterNode(stamp, registers.getThreadRegister(), true, false)); graph.addBeforeFixed(loadExceptionObject, thread); - ForeignCallNode loadExceptionC = graph.add(new ForeignCallNode(providers.getForeignCalls(), LOAD_AND_CLEAR_EXCEPTION, thread)); + ForeignCallNode loadExceptionC = graph.add(new ForeignCallNode(LOAD_AND_CLEAR_EXCEPTION, thread)); loadExceptionC.setStateAfter(loadExceptionObject.stateAfter()); graph.replaceFixedWithFixed(loadExceptionObject, loadExceptionC); } else { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/Log.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/Log.java index b6d910bdea2..3aa3da3a8a4 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/Log.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/Log.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -24,6 +24,9 @@ package org.graalvm.compiler.hotspot.replacements; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.LEAF; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.NO_LOCATIONS; import static org.graalvm.compiler.replacements.nodes.CStringConstant.cstring; import java.io.PrintStream; @@ -31,6 +34,7 @@ import java.io.PrintStream; import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; import org.graalvm.compiler.graph.Node.ConstantNodeParameter; import org.graalvm.compiler.graph.Node.NodeIntrinsic; +import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; import org.graalvm.compiler.nodes.extended.ForeignCallNode; import org.graalvm.compiler.word.Word; @@ -43,9 +47,12 @@ import jdk.vm.ci.meta.JavaKind; */ public final class Log { - public static final ForeignCallDescriptor LOG_PRIMITIVE = new ForeignCallDescriptor("logPrimitive", void.class, int.class, long.class, boolean.class); - public static final ForeignCallDescriptor LOG_OBJECT = new ForeignCallDescriptor("logObject", void.class, Object.class, boolean.class, boolean.class); - public static final ForeignCallDescriptor LOG_PRINTF = new ForeignCallDescriptor("logPrintf", void.class, Word.class, long.class, long.class, long.class); + public static final HotSpotForeignCallDescriptor LOG_PRIMITIVE = new HotSpotForeignCallDescriptor(LEAF, REEXECUTABLE, NO_LOCATIONS, "logPrimitive", void.class, int.class, long.class, + boolean.class); + public static final HotSpotForeignCallDescriptor LOG_OBJECT = new HotSpotForeignCallDescriptor(LEAF, REEXECUTABLE, NO_LOCATIONS, "logObject", void.class, Object.class, boolean.class, + boolean.class); + public static final HotSpotForeignCallDescriptor LOG_PRINTF = new HotSpotForeignCallDescriptor(LEAF, REEXECUTABLE, NO_LOCATIONS, "logPrintf", void.class, Word.class, long.class, long.class, + long.class); @NodeIntrinsic(ForeignCallNode.class) private static native void log(@ConstantNodeParameter ForeignCallDescriptor logObject, Object object, boolean asString, boolean newline); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/MonitorSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/MonitorSnippets.java index 89fb274c298..9959f9605b0 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/MonitorSnippets.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/MonitorSnippets.java @@ -27,8 +27,11 @@ package org.graalvm.compiler.hotspot.replacements; import static jdk.vm.ci.code.MemoryBarriers.LOAD_STORE; import static jdk.vm.ci.code.MemoryBarriers.STORE_LOAD; import static jdk.vm.ci.code.MemoryBarriers.STORE_STORE; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_OPTIONVALUES; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_VMCONFIG; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_OPTIONVALUES; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.STACK_INSPECTABLE_LEAF; import static org.graalvm.compiler.hotspot.nodes.AcquiredCASLockNode.mark; import static org.graalvm.compiler.hotspot.nodes.BeginLockScopeNode.beginLockScope; import static org.graalvm.compiler.hotspot.nodes.EndLockScopeNode.endLockScope; @@ -76,10 +79,12 @@ import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.VERY_FAS import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability; import static org.graalvm.compiler.nodes.extended.MembarNode.memoryBarrier; import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER; +import static jdk.internal.vm.compiler.word.LocationIdentity.any; import static jdk.internal.vm.compiler.word.WordFactory.unsigned; import static jdk.internal.vm.compiler.word.WordFactory.zero; import java.util.List; +import java.util.Objects; import org.graalvm.compiler.api.replacements.Fold; import org.graalvm.compiler.api.replacements.Snippet; @@ -95,6 +100,7 @@ import org.graalvm.compiler.graph.Node.ConstantNodeParameter; import org.graalvm.compiler.graph.Node.NodeIntrinsic; import org.graalvm.compiler.graph.iterators.NodeIterable; import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; +import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; import org.graalvm.compiler.hotspot.meta.HotSpotProviders; import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider; import org.graalvm.compiler.hotspot.nodes.CurrentLockNode; @@ -117,8 +123,8 @@ import org.graalvm.compiler.nodes.extended.BranchProbabilityNode; import org.graalvm.compiler.nodes.extended.ForeignCallNode; import org.graalvm.compiler.nodes.extended.MembarNode; import org.graalvm.compiler.nodes.java.MethodCallTargetNode; +import org.graalvm.compiler.nodes.java.MonitorEnterNode; import org.graalvm.compiler.nodes.java.MonitorExitNode; -import org.graalvm.compiler.nodes.java.RawMonitorEnterNode; import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.nodes.type.StampTool; import org.graalvm.compiler.options.OptionValues; @@ -232,7 +238,7 @@ public class MonitorSnippets implements Snippets { @Snippet public static void monitorenter(Object object, KlassPointer hub, @ConstantParameter int lockDepth, @ConstantParameter Register threadRegister, @ConstantParameter Register stackPointerRegister, - @ConstantParameter boolean trace, @ConstantParameter Counters counters, @ConstantParameter boolean biasable) { + @ConstantParameter boolean trace, @ConstantParameter Counters counters) { verifyOop(object); // Load the mark word - this includes a null-check on object @@ -247,7 +253,7 @@ public class MonitorSnippets implements Snippets { incCounter(); - if (biasable && useBiasedLocking(INJECTED_VMCONFIG)) { + if (useBiasedLocking(INJECTED_VMCONFIG)) { if (tryEnterBiased(object, hub, lock, mark, threadRegister, trace, counters)) { return; } @@ -487,10 +493,10 @@ public class MonitorSnippets implements Snippets { @Snippet public static void monitorexit(Object object, @ConstantParameter int lockDepth, @ConstantParameter Register threadRegister, @ConstantParameter boolean trace, - @ConstantParameter Counters counters, @ConstantParameter boolean biasable) { + @ConstantParameter Counters counters) { trace(trace, " object: 0x%016lx\n", Word.objectToTrackedPointer(object)); final Word mark = loadWordFromObject(object, markOffset(INJECTED_VMCONFIG)); - if (biasable && useBiasedLocking(INJECTED_VMCONFIG)) { + if (useBiasedLocking(INJECTED_VMCONFIG)) { // Check for biased locking unlock case, which is a no-op // Note: we do not have to check the thread ID for two reasons. // First, the interpreter checks for IllegalMonitorStateException at @@ -583,6 +589,7 @@ public class MonitorSnippets implements Snippets { if (probability(FREQUENT_PROBABILITY, succ.isNonNull())) { // There may be a thread spinning on this monitor. Temporarily setting // the monitor owner to null, and hope that the other thread will grab it. + memoryBarrier(LOAD_STORE | STORE_STORE); monitor.writeWord(ownerOffset, zero()); memoryBarrier(STORE_STORE | STORE_LOAD); succ = monitor.readWord(succOffset, OBJECT_MONITOR_SUCC_LOCATION); @@ -771,7 +778,7 @@ public class MonitorSnippets implements Snippets { this.counters = new Counters(factory); } - public void lower(RawMonitorEnterNode monitorenterNode, HotSpotRegistersProvider registers, LoweringTool tool) { + public void lower(MonitorEnterNode monitorenterNode, HotSpotRegistersProvider registers, LoweringTool tool) { StructuredGraph graph = monitorenterNode.graph(); checkBalancedMonitors(graph, tool); @@ -781,13 +788,12 @@ public class MonitorSnippets implements Snippets { if (useFastLocking) { args = new Arguments(monitorenter, graph.getGuardsStage(), tool.getLoweringStage()); args.add("object", monitorenterNode.object()); - args.add("hub", monitorenterNode.getHub()); + args.add("hub", Objects.requireNonNull(monitorenterNode.getObjectData())); args.addConst("lockDepth", monitorenterNode.getMonitorId().getLockDepth()); args.addConst("threadRegister", registers.getThreadRegister()); args.addConst("stackPointerRegister", registers.getStackPointerRegister()); args.addConst("trace", isTracingEnabledForType(monitorenterNode.object()) || isTracingEnabledForMethod(graph)); args.addConst("counters", counters); - args.addConst("biasable", monitorenterNode.isBiasable()); } else { args = new Arguments(monitorenterStub, graph.getGuardsStage(), tool.getLoweringStage()); args.add("object", monitorenterNode.object()); @@ -813,7 +819,6 @@ public class MonitorSnippets implements Snippets { args.addConst("threadRegister", registers.getThreadRegister()); args.addConst("trace", isTracingEnabledForType(monitorexitNode.object()) || isTracingEnabledForMethod(graph)); args.addConst("counters", counters); - args.addConst("biasable", monitorexitNode.isBiasable()); template(monitorexitNode, args).instantiate(providers.getMetaAccess(), monitorexitNode, DEFAULT_REPLACER, args); } @@ -892,8 +897,9 @@ public class MonitorSnippets implements Snippets { } } - public static final ForeignCallDescriptor MONITORENTER = new ForeignCallDescriptor("monitorenter", void.class, Object.class, Word.class); - public static final ForeignCallDescriptor MONITOREXIT = new ForeignCallDescriptor("monitorexit", void.class, Object.class, Word.class); + public static final HotSpotForeignCallDescriptor MONITORENTER = new HotSpotForeignCallDescriptor(SAFEPOINT, NOT_REEXECUTABLE, any(), "monitorenter", void.class, Object.class, Word.class); + public static final HotSpotForeignCallDescriptor MONITOREXIT = new HotSpotForeignCallDescriptor(STACK_INSPECTABLE_LEAF, NOT_REEXECUTABLE, any(), "monitorexit", void.class, Object.class, + Word.class); @NodeIntrinsic(ForeignCallNode.class) private static native void monitorenterStubC(@ConstantNodeParameter ForeignCallDescriptor descriptor, Object object, Word lock); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ObjectCloneNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ObjectCloneNode.java index 7bb37908f00..0065ea5e811 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ObjectCloneNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ObjectCloneNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -31,7 +31,6 @@ import org.graalvm.compiler.debug.DebugContext; import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.hotspot.meta.HotSpotLoweringProvider; import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind; import org.graalvm.compiler.nodes.NodeView; import org.graalvm.compiler.nodes.ParameterNode; import org.graalvm.compiler.nodes.ReturnNode; @@ -57,12 +56,12 @@ public final class ObjectCloneNode extends BasicObjectCloneNode { public static final NodeClass TYPE = NodeClass.create(ObjectCloneNode.class); - public ObjectCloneNode(InvokeKind invokeKind, ResolvedJavaMethod targetMethod, int bci, StampPair returnStamp, ValueNode receiver) { - super(TYPE, invokeKind, targetMethod, bci, returnStamp, receiver); + public ObjectCloneNode(MacroParams p) { + super(TYPE, p); } @Override - protected Stamp computeStamp(ValueNode object) { + public Stamp computeStamp(ValueNode object) { if (getConcreteType(object.stamp(NodeView.DEFAULT)) != null) { return AbstractPointerStamp.pointerNonNull(object.stamp(NodeView.DEFAULT)); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ObjectCloneSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ObjectCloneSnippets.java index c3fd244cb6c..dfa36323b0a 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ObjectCloneSnippets.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ObjectCloneSnippets.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -24,7 +24,7 @@ package org.graalvm.compiler.hotspot.replacements; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_VMCONFIG; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; import java.util.EnumMap; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ObjectSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ObjectSnippets.java index be611c9efc6..b447d7e375d 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ObjectSnippets.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ObjectSnippets.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, 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 @@ -109,7 +109,7 @@ public class ObjectSnippets implements Snippets { InvokeNode invoke = (InvokeNode) replacements.get(originalNode); assert invoke.asNode().graph() == graph; // Here we need to fix the bci of the invoke - invoke.replaceBci(fn.getBci()); + invoke.setBci(fn.getBci()); invoke.setStateDuring(null); invoke.setStateAfter(null); invoke.setStateDuring(stateDuringCall); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHA2Substitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHA2Substitutions.java index ca92dd270ae..6ab65916713 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHA2Substitutions.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHA2Substitutions.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -24,8 +24,8 @@ package org.graalvm.compiler.hotspot.replacements; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_INTRINSIC_CONTEXT; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_METAACCESS; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_INTRINSIC_CONTEXT; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_METAACCESS; import org.graalvm.compiler.api.replacements.ClassSubstitution; import org.graalvm.compiler.api.replacements.Fold; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHA5Substitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHA5Substitutions.java index 255e3c91e9f..fdbe762e2cc 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHA5Substitutions.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHA5Substitutions.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -24,8 +24,8 @@ package org.graalvm.compiler.hotspot.replacements; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_INTRINSIC_CONTEXT; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_METAACCESS; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_INTRINSIC_CONTEXT; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_METAACCESS; import org.graalvm.compiler.api.replacements.ClassSubstitution; import org.graalvm.compiler.api.replacements.Fold; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHASubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHASubstitutions.java index dd383e79b89..f57cc2ef876 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHASubstitutions.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHASubstitutions.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -24,8 +24,8 @@ package org.graalvm.compiler.hotspot.replacements; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_INTRINSIC_CONTEXT; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_METAACCESS; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_INTRINSIC_CONTEXT; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_METAACCESS; import org.graalvm.compiler.api.replacements.ClassSubstitution; import org.graalvm.compiler.api.replacements.Fold; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/StringToBytesSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/StringToBytesSnippets.java index 8ee22e45c44..b19d7cbc694 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/StringToBytesSnippets.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/StringToBytesSnippets.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -24,7 +24,7 @@ package org.graalvm.compiler.hotspot.replacements; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_METAACCESS; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_METAACCESS; import static org.graalvm.compiler.replacements.ReplacementsUtil.getArrayBaseOffset; import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/StringUTF16Substitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/StringUTF16Substitutions.java index 0e48fd2eab5..482483f57e0 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/StringUTF16Substitutions.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/StringUTF16Substitutions.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -24,7 +24,7 @@ package org.graalvm.compiler.hotspot.replacements; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_VMCONFIG; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY; import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability; @@ -57,8 +57,7 @@ public class StringUTF16Substitutions { } byte[] val = (byte[]) NewArrayNode.newUninitializedArray(Byte.TYPE, length << 1); // the intrinsic does not perform bounds/type checks, so it can be used here. - // Using KillsAny variant since we are reading and writing 2 different types. - ArrayCopyCallNode.disjointArraycopyKillsAny(value, srcBegin, val, 0, length, JavaKind.Char, HotSpotReplacementsUtil.getHeapWordSize(INJECTED_VMCONFIG)); + ArrayCopyCallNode.disjointArraycopyKillsInit(value, srcBegin, val, 0, length, JavaKind.Char, HotSpotReplacementsUtil.getHeapWordSize(INJECTED_VMCONFIG)); return val; } @@ -72,7 +71,7 @@ public class StringUTF16Substitutions { DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.BoundsCheckException); } // The intrinsic does not perform bounds/type checks, so it can be used here. - // Using KillsAny variant since we are reading and writing 2 different types. - ArrayCopyCallNode.disjointArraycopyKillsAny(value, srcBegin, dst, dstBegin, length, JavaKind.Char, HotSpotReplacementsUtil.getHeapWordSize(INJECTED_VMCONFIG)); + ArrayCopyCallNode.disjointArraycopyDifferentKinds(value, srcBegin, dst, dstBegin, length, JavaKind.Char, JavaKind.Byte, JavaKind.Char, + HotSpotReplacementsUtil.getHeapWordSize(INJECTED_VMCONFIG)); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/UnsafeCopyMemoryNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/UnsafeCopyMemoryNode.java index b8c7a68211e..34897dc5b06 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/UnsafeCopyMemoryNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/UnsafeCopyMemoryNode.java @@ -39,7 +39,6 @@ import org.graalvm.compiler.nodes.memory.MemoryAccess; import org.graalvm.compiler.nodes.memory.MemoryKill; import org.graalvm.compiler.nodes.memory.SingleMemoryKill; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import jdk.internal.vm.compiler.word.LocationIdentity; @NodeInfo(cycles = CYCLES_64, size = SIZE_16, allowedUsageTypes = {Memory}) @@ -79,11 +78,6 @@ public class UnsafeCopyMemoryNode extends AbstractStateSplit implements Lowerabl return LocationIdentity.any(); } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @Override public LocationIdentity getLocationIdentity() { return getKilledLocationIdentity(); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/UnsafeSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/UnsafeSnippets.java index 542e035e47d..b7cf38025ed 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/UnsafeSnippets.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/UnsafeSnippets.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, 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 @@ -24,7 +24,7 @@ package org.graalvm.compiler.hotspot.replacements; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_VMCONFIG; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.doingUnsafeAccessOffset; import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java index 6d5f9f7729a..79872f3a0e5 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -25,33 +25,60 @@ package org.graalvm.compiler.hotspot.replacements.arraycopy; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_VMCONFIG; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; +import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.FREQUENT_PROBABILITY; +import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY; +import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY; +import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY; +import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability; import org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil; import org.graalvm.compiler.hotspot.word.KlassPointer; +import org.graalvm.compiler.nodes.PiNode; +import org.graalvm.compiler.nodes.SnippetAnchorNode; +import org.graalvm.compiler.nodes.extended.GuardedUnsafeLoadNode; +import org.graalvm.compiler.nodes.extended.GuardingNode; +import org.graalvm.compiler.nodes.extended.RawStoreNode; +import org.graalvm.compiler.replacements.ReplacementsUtil; +import org.graalvm.compiler.replacements.arraycopy.ArrayCopyCallNode; import org.graalvm.compiler.replacements.arraycopy.ArrayCopySnippets; +import org.graalvm.compiler.replacements.arraycopy.CheckcastArrayCopyCallNode; import org.graalvm.compiler.word.Word; +import jdk.internal.vm.compiler.word.LocationIdentity; import jdk.internal.vm.compiler.word.Pointer; import jdk.internal.vm.compiler.word.WordFactory; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.MetaAccessProvider; + public class HotSpotArraycopySnippets extends ArrayCopySnippets { - @Override public Pointer loadHub(Object nonNullSrc) { return HotSpotReplacementsUtil.loadHub(nonNullSrc).asWord(); } @Override + public boolean hubsEqual(Object nonNullSrc, Object nonNullDest) { + Pointer srcHub = loadHub(nonNullSrc); + Pointer destHub = loadHub(nonNullDest); + return srcHub == destHub; + } + public Word getSuperCheckOffset(Pointer destElemKlass) { return WordFactory.signed(destElemKlass.readInt(HotSpotReplacementsUtil.superCheckOffsetOffset(INJECTED_VMCONFIG), HotSpotReplacementsUtil.KLASS_SUPER_CHECK_OFFSET_LOCATION)); } - @Override public int getReadLayoutHelper(Pointer srcHub) { return HotSpotReplacementsUtil.readLayoutHelper(KlassPointer.fromWord(srcHub)); } @Override + public boolean layoutHelpersEqual(Object nonNullSrc, Object nonNullDest) { + Pointer srcHub = loadHub(nonNullSrc); + Pointer destHub = loadHub(nonNullDest); + return getReadLayoutHelper(srcHub) == getReadLayoutHelper(destHub); + } + public Pointer getDestElemClass(Pointer destKlassPointer) { KlassPointer destKlass = (KlassPointer.fromWord(destKlassPointer)); return destKlass.readKlassPointer(HotSpotReplacementsUtil.arrayClassElementOffset(INJECTED_VMCONFIG), @@ -62,4 +89,60 @@ public class HotSpotArraycopySnippets extends ArrayCopySnippets { protected int heapWordSize() { return HotSpotReplacementsUtil.getHeapWordSize(INJECTED_VMCONFIG); } + + @Override + protected void doExactArraycopyWithSlowPathWork(Object src, int srcPos, Object dest, int destPos, int length, JavaKind elementKind, LocationIdentity arrayLocation, Counters counters, + MetaAccessProvider metaAccess) { + int scale = ReplacementsUtil.arrayIndexScale(metaAccess, elementKind); + int arrayBaseOffset = ReplacementsUtil.getArrayBaseOffset(metaAccess, elementKind); + long sourceOffset = arrayBaseOffset + (long) srcPos * scale; + long destOffset = arrayBaseOffset + (long) destPos * scale; + + GuardingNode anchor = SnippetAnchorNode.anchor(); + if (probability(NOT_FREQUENT_PROBABILITY, src == dest && srcPos < destPos)) { + // bad aliased case so we need to copy the array from back to front + for (int position = length - 1; position >= 0; position--) { + Object value = GuardedUnsafeLoadNode.guardedLoad(src, sourceOffset + ((long) position) * scale, elementKind, arrayLocation, anchor); + RawStoreNode.storeObject(dest, destOffset + ((long) position) * scale, value, elementKind, arrayLocation, true); + } + } else { + for (int position = 0; position < length; position++) { + Object value = GuardedUnsafeLoadNode.guardedLoad(src, sourceOffset + ((long) position) * scale, elementKind, arrayLocation, anchor); + RawStoreNode.storeObject(dest, destOffset + ((long) position) * scale, value, elementKind, arrayLocation, true); + } + } + } + + @Override + @SuppressWarnings("unused") + protected void doCheckcastArraycopyWithSlowPathWork(Object src, int srcPos, Object dest, int destPos, int length, JavaKind elementKind, LocationIdentity arrayLocation, Counters counters) { + if (probability(FREQUENT_PROBABILITY, length > 0)) { + Object nonNullSrc = PiNode.asNonNullObject(src); + Object nonNullDest = PiNode.asNonNullObject(dest); + Pointer srcKlass = loadHub(nonNullSrc); + Pointer destKlass = loadHub(nonNullDest); + if (probability(LIKELY_PROBABILITY, srcKlass == destKlass) || probability(LIKELY_PROBABILITY, nonNullDest.getClass() == Object[].class)) { + // no storecheck required. + counters.objectCheckcastSameTypeCounter.inc(); + counters.objectCheckcastSameTypeCopiedCounter.add(length); + ArrayCopyCallNode.arraycopyObjectKillsAny(nonNullSrc, srcPos, nonNullDest, destPos, length, heapWordSize()); + } else { + Pointer destElemKlass = getDestElemClass(destKlass); + Word superCheckOffset = getSuperCheckOffset(destElemKlass); + + counters.objectCheckcastDifferentTypeCounter.inc(); + counters.objectCheckcastDifferentTypeCopiedCounter.add(length); + + int copiedElements = CheckcastArrayCopyCallNode.checkcastArraycopy(nonNullSrc, srcPos, nonNullDest, destPos, length, superCheckOffset, destElemKlass, false); + if (probability(SLOW_PATH_PROBABILITY, copiedElements != 0)) { + /* + * the stub doesn't throw the ArrayStoreException, but returns the number of + * copied elements (xor'd with -1). + */ + copiedElements ^= -1; + System.arraycopy(nonNullSrc, srcPos + copiedElements, nonNullDest, destPos + copiedElements, length - copiedElements); + } + } + } + } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/profiling/ProbabilisticProfileSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/profiling/ProbabilisticProfileSnippets.java index 2b40644e4d8..a9bdf2c9010 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/profiling/ProbabilisticProfileSnippets.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/profiling/ProbabilisticProfileSnippets.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -29,6 +29,7 @@ import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil. import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.invocationCounterIncrement; import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.invocationCounterOffset; import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.invocationCounterShift; +import static org.graalvm.compiler.hotspot.replacements.profiling.ProfileSnippets.METHOD_COUNTERS; import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY; import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability; import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER; @@ -82,8 +83,8 @@ public class ProbabilisticProfileSnippets implements Snippets { @Snippet public static void profileMethodEntryWithProbability(MethodCountersPointer counters, int random, int step, int stepLog, @ConstantParameter int freqLog, @ConstantParameter int probLog) { if (probability(1.0 / (1 << probLog), shouldProfile(probLog, random))) { - int counterValue = counters.readInt(invocationCounterOffset(INJECTED_VMCONFIG)) + ((invocationCounterIncrement(INJECTED_VMCONFIG) * step) << probLog); - counters.writeInt(invocationCounterOffset(INJECTED_VMCONFIG), counterValue); + int counterValue = counters.readInt(invocationCounterOffset(INJECTED_VMCONFIG), METHOD_COUNTERS) + ((invocationCounterIncrement(INJECTED_VMCONFIG) * step) << probLog); + counters.writeIntSideEffectFree(invocationCounterOffset(INJECTED_VMCONFIG), counterValue, METHOD_COUNTERS); if (freqLog >= 0) { int mask = notificationMask(freqLog, probLog, stepLog); if (probability(SLOW_PATH_PROBABILITY, (counterValue & (mask << invocationCounterShift(INJECTED_VMCONFIG))) == 0)) { @@ -100,8 +101,8 @@ public class ProbabilisticProfileSnippets implements Snippets { public static void profileBackedgeWithProbability(MethodCountersPointer counters, int random, int step, int stepLog, @ConstantParameter int freqLog, @ConstantParameter int probLog, int bci, int targetBci) { if (probability(1.0 / (1 << probLog), shouldProfile(probLog, random))) { - int counterValue = counters.readInt(backedgeCounterOffset(INJECTED_VMCONFIG)) + ((invocationCounterIncrement(INJECTED_VMCONFIG) * step) << probLog); - counters.writeInt(backedgeCounterOffset(INJECTED_VMCONFIG), counterValue); + int counterValue = counters.readInt(backedgeCounterOffset(INJECTED_VMCONFIG), METHOD_COUNTERS) + ((invocationCounterIncrement(INJECTED_VMCONFIG) * step) << probLog); + counters.writeIntSideEffectFree(backedgeCounterOffset(INJECTED_VMCONFIG), counterValue, METHOD_COUNTERS); int mask = notificationMask(freqLog, probLog, stepLog); if (probability(SLOW_PATH_PROBABILITY, (counterValue & (mask << invocationCounterShift(INJECTED_VMCONFIG))) == 0)) { methodBackedgeEvent(HotSpotBackend.BACKEDGE_EVENT, counters, bci, targetBci); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/profiling/ProfileSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/profiling/ProfileSnippets.java index 5562972c933..12b534108ef 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/profiling/ProfileSnippets.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/profiling/ProfileSnippets.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -48,6 +48,7 @@ import org.graalvm.compiler.hotspot.nodes.profiling.ProfileInvokeNode; import org.graalvm.compiler.hotspot.nodes.profiling.ProfileNode; import org.graalvm.compiler.hotspot.word.MethodCountersPointer; import org.graalvm.compiler.nodes.ConstantNode; +import org.graalvm.compiler.nodes.NamedLocationIdentity; import org.graalvm.compiler.nodes.StructuredGraph; import org.graalvm.compiler.nodes.extended.ForeignCallNode; import org.graalvm.compiler.nodes.spi.LoweringTool; @@ -61,8 +62,11 @@ import org.graalvm.compiler.replacements.Snippets; import jdk.vm.ci.code.CodeUtil; import jdk.vm.ci.code.TargetDescription; +import jdk.internal.vm.compiler.word.LocationIdentity; public class ProfileSnippets implements Snippets { + public static final LocationIdentity METHOD_COUNTERS = NamedLocationIdentity.mutable("MethodCounters"); + @NodeIntrinsic(ForeignCallNode.class) public static native void methodInvocationEvent(@ConstantNodeParameter ForeignCallDescriptor descriptor, MethodCountersPointer counters); @@ -75,8 +79,8 @@ public class ProfileSnippets implements Snippets { @Snippet public static void profileMethodEntry(MethodCountersPointer counters, int step, int stepLog, @ConstantParameter int freqLog) { - int counterValue = counters.readInt(invocationCounterOffset(INJECTED_VMCONFIG)) + invocationCounterIncrement(INJECTED_VMCONFIG) * step; - counters.writeInt(invocationCounterOffset(INJECTED_VMCONFIG), counterValue); + int counterValue = counters.readInt(invocationCounterOffset(INJECTED_VMCONFIG), METHOD_COUNTERS) + invocationCounterIncrement(INJECTED_VMCONFIG) * step; + counters.writeIntSideEffectFree(invocationCounterOffset(INJECTED_VMCONFIG), counterValue, METHOD_COUNTERS); if (freqLog >= 0) { final int mask = notificationMask(freqLog, stepLog); if (probability(SLOW_PATH_PROBABILITY, (counterValue & (mask << invocationCounterShift(INJECTED_VMCONFIG))) == 0)) { @@ -90,8 +94,8 @@ public class ProfileSnippets implements Snippets { @Snippet public static void profileBackedge(MethodCountersPointer counters, int step, int stepLog, @ConstantParameter int freqLog, int bci, int targetBci) { - int counterValue = counters.readInt(backedgeCounterOffset(INJECTED_VMCONFIG)) + invocationCounterIncrement(INJECTED_VMCONFIG) * step; - counters.writeInt(backedgeCounterOffset(INJECTED_VMCONFIG), counterValue); + int counterValue = counters.readInt(backedgeCounterOffset(INJECTED_VMCONFIG), METHOD_COUNTERS) + invocationCounterIncrement(INJECTED_VMCONFIG) * step; + counters.writeIntSideEffectFree(backedgeCounterOffset(INJECTED_VMCONFIG), counterValue, METHOD_COUNTERS); final int mask = notificationMask(freqLog, stepLog); if (probability(SLOW_PATH_PROBABILITY, (counterValue & (mask << invocationCounterShift(INJECTED_VMCONFIG))) == 0)) { methodBackedgeEvent(HotSpotBackend.BACKEDGE_EVENT, counters, bci, targetBci); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/CreateExceptionStub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/CreateExceptionStub.java index bfe11c5b507..f74cdfb54cb 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/CreateExceptionStub.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/CreateExceptionStub.java @@ -25,9 +25,9 @@ package org.graalvm.compiler.hotspot.stubs; import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.NativeCall; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_OPTIONVALUES; -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Reexecutability.REEXECUTABLE; -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Transition.SAFEPOINT; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_OPTIONVALUES; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT; import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.clearPendingException; import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.registerAsWord; import static jdk.internal.vm.compiler.word.LocationIdentity.any; @@ -37,8 +37,8 @@ import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; import org.graalvm.compiler.graph.Node.ConstantNodeParameter; import org.graalvm.compiler.graph.Node.NodeIntrinsic; import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase; import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; +import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl; import org.graalvm.compiler.hotspot.meta.HotSpotProviders; import org.graalvm.compiler.hotspot.nodes.DeoptimizeWithExceptionInCallerNode; @@ -116,17 +116,18 @@ public class CreateExceptionStub extends SnippetStub { // keep both the deopt and return paths, so include a test against the exception which we // know should always succeed. if ((alwayDeoptimize(INJECTED_OPTIONVALUES) && clearPendingException != null) || - (reportsDeoptimization(GraalHotSpotVMConfigBase.INJECTED_VMCONFIG) && deoptimized != 0)) { + (reportsDeoptimization(GraalHotSpotVMConfig.INJECTED_VMCONFIG) && deoptimized != 0)) { DeoptimizeWithExceptionInCallerNode.deopt(clearPendingException); } return clearPendingException; } - private static final ForeignCallDescriptor THROW_AND_POST_JVMTI_EXCEPTION = new ForeignCallDescriptor("throw_and_post_jvmti_exception", int.class, Word.class, Word.class, Word.class); - private static final ForeignCallDescriptor THROW_KLASS_EXTERNAL_NAME_EXCEPTION = new ForeignCallDescriptor("throw_klass_external_name_exception", int.class, Word.class, Word.class, - KlassPointer.class); - private static final ForeignCallDescriptor THROW_CLASS_CAST_EXCEPTION = new ForeignCallDescriptor("throw_class_cast_exception", int.class, Word.class, Word.class, KlassPointer.class, - KlassPointer.class); + private static final HotSpotForeignCallDescriptor THROW_AND_POST_JVMTI_EXCEPTION = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, any(), "throw_and_post_jvmti_exception", int.class, + Word.class, Word.class, Word.class); + private static final HotSpotForeignCallDescriptor THROW_KLASS_EXTERNAL_NAME_EXCEPTION = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, any(), "throw_klass_external_name_exception", + int.class, Word.class, Word.class, KlassPointer.class); + private static final HotSpotForeignCallDescriptor THROW_CLASS_CAST_EXCEPTION = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, any(), "throw_class_cast_exception", int.class, Word.class, + Word.class, KlassPointer.class, KlassPointer.class); @NodeIntrinsic(StubForeignCallNode.class) private static native int throwAndPostJvmtiException(@ConstantNodeParameter ForeignCallDescriptor d, Word thread, Word type, Word message); @@ -138,8 +139,8 @@ public class CreateExceptionStub extends SnippetStub { private static native int throwClassCastException(@ConstantNodeParameter ForeignCallDescriptor d, Word thread, Word type, KlassPointer objKlass, KlassPointer targetKlass); public static void registerForeignCalls(GraalHotSpotVMConfig c, HotSpotForeignCallsProviderImpl foreignCalls) { - foreignCalls.registerForeignCall(THROW_AND_POST_JVMTI_EXCEPTION, c.throwAndPostJvmtiExceptionAddress, NativeCall, SAFEPOINT, REEXECUTABLE, any()); - foreignCalls.registerForeignCall(THROW_KLASS_EXTERNAL_NAME_EXCEPTION, c.throwKlassExternalNameExceptionAddress, NativeCall, SAFEPOINT, REEXECUTABLE, any()); - foreignCalls.registerForeignCall(THROW_CLASS_CAST_EXCEPTION, c.throwClassCastExceptionAddress, NativeCall, SAFEPOINT, REEXECUTABLE, any()); + foreignCalls.registerForeignCall(THROW_AND_POST_JVMTI_EXCEPTION, c.throwAndPostJvmtiExceptionAddress, NativeCall); + foreignCalls.registerForeignCall(THROW_KLASS_EXTERNAL_NAME_EXCEPTION, c.throwKlassExternalNameExceptionAddress, NativeCall); + foreignCalls.registerForeignCall(THROW_CLASS_CAST_EXCEPTION, c.throwClassCastExceptionAddress, NativeCall); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ExceptionHandlerStub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ExceptionHandlerStub.java index 1c56d385f2c..25044c28f1d 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ExceptionHandlerStub.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ExceptionHandlerStub.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -25,6 +25,8 @@ package org.graalvm.compiler.hotspot.stubs; import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT; import static org.graalvm.compiler.hotspot.nodes.JumpToExceptionHandlerNode.jumpToExceptionHandler; import static org.graalvm.compiler.hotspot.nodes.PatchReturnAddressNode.patchReturnAddress; import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.readExceptionOop; @@ -37,6 +39,7 @@ import static org.graalvm.compiler.hotspot.stubs.StubUtil.decipher; import static org.graalvm.compiler.hotspot.stubs.StubUtil.fatal; import static org.graalvm.compiler.hotspot.stubs.StubUtil.newDescriptor; import static org.graalvm.compiler.hotspot.stubs.StubUtil.printf; +import static jdk.internal.vm.compiler.word.LocationIdentity.any; import org.graalvm.compiler.api.replacements.Fold; import org.graalvm.compiler.api.replacements.Fold.InjectedParameter; @@ -49,6 +52,8 @@ import org.graalvm.compiler.graph.Node.NodeIntrinsic; import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; import org.graalvm.compiler.hotspot.HotSpotBackend; import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; +import org.graalvm.compiler.hotspot.HotSpotMarkId; +import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; import org.graalvm.compiler.hotspot.meta.HotSpotProviders; import org.graalvm.compiler.hotspot.nodes.StubForeignCallNode; import org.graalvm.compiler.options.OptionValues; @@ -58,10 +63,10 @@ import jdk.internal.vm.compiler.word.WordFactory; import jdk.vm.ci.code.Register; /** - * Stub called by the {@linkplain GraalHotSpotVMConfig#MARKID_EXCEPTION_HANDLER_ENTRY exception - * handler entry point} in a compiled method. This entry point is used when returning to a method to - * handle an exception thrown by a callee. It is not used for routing implicit exceptions. - * Therefore, it does not need to save any registers as HotSpot uses a caller save convention. + * Stub called by the {@linkplain HotSpotMarkId#EXCEPTION_HANDLER_ENTRY exception handler entry + * point} in a compiled method. This entry point is used when returning to a method to handle an + * exception thrown by a callee. It is not used for routing implicit exceptions. Therefore, it does + * not need to save any registers as HotSpot uses a caller save convention. *

    * The descriptor for a call to this stub is {@link HotSpotBackend#EXCEPTION_HANDLER}. */ @@ -143,7 +148,8 @@ public class ExceptionHandlerStub extends SnippetStub { return Assertions.assertionsEnabled() || cAssertionsEnabled(config); } - public static final ForeignCallDescriptor EXCEPTION_HANDLER_FOR_PC = newDescriptor(ExceptionHandlerStub.class, "exceptionHandlerForPc", Word.class, Word.class); + public static final HotSpotForeignCallDescriptor EXCEPTION_HANDLER_FOR_PC = newDescriptor(SAFEPOINT, REEXECUTABLE, any(), ExceptionHandlerStub.class, "exceptionHandlerForPc", Word.class, + Word.class); @NodeIntrinsic(value = StubForeignCallNode.class) public static native Word exceptionHandlerForPc(@ConstantNodeParameter ForeignCallDescriptor exceptionHandlerForPc, Word thread); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ForeignCallSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ForeignCallSnippets.java index bcbc2b2e38f..90bec894268 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ForeignCallSnippets.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ForeignCallSnippets.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -25,7 +25,7 @@ package org.graalvm.compiler.hotspot.stubs; import static jdk.vm.ci.meta.DeoptimizationReason.RuntimeConstraint; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_VMCONFIG; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.clearPendingException; import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.getPendingException; import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.loadHubIntrinsic; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ForeignCallStub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ForeignCallStub.java index 75ad5720c9d..b2ad73bf252 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ForeignCallStub.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ForeignCallStub.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -43,9 +43,9 @@ import org.graalvm.compiler.debug.DebugContext; import org.graalvm.compiler.debug.GraalError; import org.graalvm.compiler.debug.JavaMethodContext; import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Reexecutability; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Transition; import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkageImpl; +import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; +import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition; import org.graalvm.compiler.hotspot.meta.HotSpotLoweringProvider; import org.graalvm.compiler.hotspot.meta.HotSpotProviders; import org.graalvm.compiler.hotspot.nodes.StubForeignCallNode; @@ -60,7 +60,6 @@ import org.graalvm.compiler.replacements.GraphKit; import org.graalvm.compiler.replacements.nodes.ReadRegisterNode; import org.graalvm.compiler.word.Word; import org.graalvm.compiler.word.WordTypes; -import jdk.internal.vm.compiler.word.LocationIdentity; import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; import jdk.vm.ci.hotspot.HotSpotSignature; @@ -103,22 +102,18 @@ public class ForeignCallStub extends Stub { * @param descriptor the signature of the call to this stub * @param prependThread true if the JavaThread value for the current thread is to be prepended * to the arguments for the call to {@code address} - * @param reexecutability specifies if the stub call can be re-executed without (meaningful) - * side effects. Deoptimization will not return to a point before a stub call that - * cannot be re-executed. - * @param killedLocations the memory locations killed by the stub call */ - public ForeignCallStub(OptionValues options, HotSpotJVMCIRuntime runtime, HotSpotProviders providers, long address, ForeignCallDescriptor descriptor, boolean prependThread, - Transition transition, Reexecutability reexecutability, LocationIdentity... killedLocations) { + public ForeignCallStub(OptionValues options, HotSpotJVMCIRuntime runtime, HotSpotProviders providers, long address, HotSpotForeignCallDescriptor descriptor, boolean prependThread) { super(options, providers, HotSpotForeignCallLinkageImpl.create(providers.getMetaAccess(), providers.getCodeCache(), providers.getWordTypes(), providers.getForeignCalls(), descriptor, 0L, - COMPUTES_REGISTERS_KILLED, JavaCall, JavaCallee, transition, reexecutability, killedLocations)); + COMPUTES_REGISTERS_KILLED, JavaCall, JavaCallee)); this.jvmciRuntime = runtime; this.prependThread = prependThread; MetaAccessProvider metaAccess = providers.getMetaAccess(); Class[] targetParameterTypes = createTargetParameters(descriptor); - ForeignCallDescriptor targetSig = new ForeignCallDescriptor(descriptor.getName() + ":C", descriptor.getResultType(), targetParameterTypes); + HotSpotForeignCallDescriptor targetSig = new HotSpotForeignCallDescriptor(descriptor.getTransition(), descriptor.getReexecutability(), descriptor.getKilledLocations(), + descriptor.getName() + ":C", descriptor.getResultType(), targetParameterTypes); target = HotSpotForeignCallLinkageImpl.create(metaAccess, providers.getCodeCache(), providers.getWordTypes(), providers.getForeignCalls(), targetSig, address, - DESTROYS_ALL_CALLER_SAVE_REGISTERS, NativeCall, NativeCall, transition, reexecutability, killedLocations); + DESTROYS_ALL_CALLER_SAVE_REGISTERS, NativeCall, NativeCall); } /** @@ -235,7 +230,7 @@ public class ForeignCallStub extends Stub { Class[] args = linkage.getDescriptor().getArgumentTypes(); boolean isObjectResult = !LIRKind.isValue(linkage.getOutgoingCallingConvention().getReturn()); // Do we want to clear the pending exception? - boolean shouldClearException = linkage.isReexecutable(); + boolean shouldClearException = linkage.getDescriptor().isReexecutable(); try { HotSpotLoweringProvider lowerer = (HotSpotLoweringProvider) providers.getLowerer(); Templates foreignCallSnippets = lowerer.getForeignCallSnippets(); @@ -245,6 +240,7 @@ public class ForeignCallStub extends Stub { ResolvedJavaMethod thisMethod = getGraphMethod(); GraphKit kit = new GraphKit(debug, thisMethod, providers, wordTypes, providers.getGraphBuilderPlugins(), compilationId, toString()); StructuredGraph graph = kit.getGraph(); + graph.disableFrameStateVerification(); ParameterNode[] params = createParameters(kit, args); ReadRegisterNode thread = kit.append(new ReadRegisterNode(providers.getRegisters().getThreadRegister(), wordTypes.getWordKind(), true, false)); ValueNode result = createTargetCall(kit, params, thread); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/SnippetStub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/SnippetStub.java index ba429a032b2..6f8e56eacf0 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/SnippetStub.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/SnippetStub.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -25,8 +25,6 @@ package org.graalvm.compiler.hotspot.stubs; import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter; -import org.graalvm.compiler.api.replacements.Snippet.NonNullParameter; import org.graalvm.compiler.core.common.CompilationIdentifier; import org.graalvm.compiler.core.common.type.StampFactory; import org.graalvm.compiler.debug.DebugContext; @@ -38,14 +36,13 @@ import org.graalvm.compiler.nodes.ParameterNode; import org.graalvm.compiler.nodes.StructuredGraph; import org.graalvm.compiler.nodes.StructuredGraph.GuardsStage; import org.graalvm.compiler.nodes.spi.LoweringTool; +import org.graalvm.compiler.nodes.spi.SnippetParameterInfo; import org.graalvm.compiler.options.OptionValues; import org.graalvm.compiler.phases.common.CanonicalizerPhase; import org.graalvm.compiler.phases.common.LoweringPhase; import org.graalvm.compiler.replacements.SnippetTemplate; import org.graalvm.compiler.replacements.Snippets; -import jdk.vm.ci.meta.Local; -import jdk.vm.ci.meta.LocalVariableTable; import jdk.vm.ci.meta.ResolvedJavaMethod; /** @@ -90,11 +87,12 @@ public abstract class SnippetStub extends Stub implements Snippets { protected StructuredGraph getGraph(DebugContext debug, CompilationIdentifier compilationId) { // Stubs cannot have optimistic assumptions since they have // to be valid for the entire run of the VM. - final StructuredGraph graph = buildInitialGraph(debug, compilationId, makeConstArgs()); + SnippetParameterInfo info = providers.getReplacements().getSnippetParameterInfo(method); + final StructuredGraph graph = buildInitialGraph(debug, compilationId, makeConstArgs(info)); try (DebugContext.Scope outer = debug.scope("SnippetStub", graph)) { for (ParameterNode param : graph.getNodes(ParameterNode.TYPE)) { int index = param.index(); - if (method.getParameterAnnotation(NonNullParameter.class, index) != null) { + if (info.isNonNullParameter(index)) { param.setStamp(param.stamp(NodeView.DEFAULT).join(StampFactory.objectNonNull())); } } @@ -114,23 +112,10 @@ public abstract class SnippetStub extends Stub implements Snippets { return providers.getReplacements().getSnippet(method, null, args, false, null, options).copyWithIdentifier(compilationId, debug); } - protected boolean checkConstArg(int index, String expectedName) { - assert method.getParameterAnnotation(ConstantParameter.class, index) != null : String.format("parameter %d of %s is expected to be constant", index, method.format("%H.%n(%p)")); - LocalVariableTable lvt = method.getLocalVariableTable(); - if (lvt != null) { - Local local = lvt.getLocal(index, 0); - assert local != null; - String actualName = local.getName(); - assert actualName.equals(expectedName) : String.format("parameter %d of %s is expected to be named %s, not %s", index, method.format("%H.%n(%p)"), expectedName, actualName); - } - return true; - } - - protected Object[] makeConstArgs() { - int count = method.getSignature().getParameterCount(false); - Object[] args = new Object[count]; + protected Object[] makeConstArgs(SnippetParameterInfo info) { + Object[] args = new Object[info.getParameterCount()]; for (int i = 0; i < args.length; i++) { - if (method.getParameterAnnotation(ConstantParameter.class, i) != null) { + if (info.isConstantParameter(i)) { args[i] = getConstantParameterValue(i, null); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/Stub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/Stub.java index a6ce097070d..742bd39181e 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/Stub.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/Stub.java @@ -24,11 +24,9 @@ package org.graalvm.compiler.hotspot.stubs; -import static java.util.Collections.singletonList; import static org.graalvm.compiler.core.GraalCompiler.emitFrontEnd; import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC; import static org.graalvm.compiler.core.common.GraalOptions.RegisterPressure; -import static org.graalvm.compiler.debug.DebugContext.DEFAULT_LOG_STREAM; import static org.graalvm.compiler.debug.DebugOptions.DebugStubsAndSnippets; import static org.graalvm.compiler.hotspot.HotSpotHostBackend.DEOPT_BLOB_UNCOMMON_TRAP; import static org.graalvm.util.CollectionsUtil.allMatch; @@ -42,6 +40,7 @@ import org.graalvm.compiler.core.common.CompilationIdentifier; import org.graalvm.compiler.core.common.GraalOptions; import org.graalvm.compiler.core.target.Backend; import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.DebugContext.Builder; import org.graalvm.compiler.debug.DebugContext.Description; import org.graalvm.compiler.hotspot.HotSpotCompiledCodeBuilder; import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; @@ -162,7 +161,7 @@ public abstract class Stub { @Override public String toString() { - return "Stub<" + linkage.getDescriptor() + ">"; + return "Stub<" + linkage.getDescriptor().getSignature() + ">"; } /** @@ -180,7 +179,8 @@ public abstract class Stub { private DebugContext openDebugContext(DebugContext outer) { if (DebugStubsAndSnippets.getValue(options)) { Description description = new Description(linkage, "Stub_" + nextStubId.incrementAndGet()); - return DebugContext.create(options, description, outer.getGlobalMetrics(), DEFAULT_LOG_STREAM, singletonList(new GraalDebugHandlersFactory(providers.getSnippetReflection()))); + GraalDebugHandlersFactory factory = new GraalDebugHandlersFactory(providers.getSnippetReflection()); + return new Builder(options, factory).globalMetrics(outer.getGlobalMetrics()).description(description).build(); } return DebugContext.disabled(options); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/StubUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/StubUtil.java index 7a85f6c1a29..b0e1d2d4482 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/StubUtil.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/StubUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -24,6 +24,8 @@ package org.graalvm.compiler.hotspot.stubs; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT; import static org.graalvm.compiler.replacements.nodes.CStringConstant.cstring; import java.lang.reflect.Method; @@ -37,10 +39,12 @@ import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; import org.graalvm.compiler.graph.Node.ConstantNodeParameter; import org.graalvm.compiler.graph.Node.NodeIntrinsic; import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; +import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; import org.graalvm.compiler.hotspot.nodes.StubForeignCallNode; import org.graalvm.compiler.hotspot.nodes.VMErrorNode; import org.graalvm.compiler.hotspot.replacements.Log; import org.graalvm.compiler.word.Word; +import jdk.internal.vm.compiler.word.LocationIdentity; import jdk.internal.vm.compiler.word.WordFactory; //JaCoCo Exclude @@ -50,11 +54,14 @@ import jdk.internal.vm.compiler.word.WordFactory; */ public class StubUtil { - public static final ForeignCallDescriptor VM_MESSAGE_C = newDescriptor(StubUtil.class, "vmMessageC", void.class, boolean.class, Word.class, long.class, long.class, long.class); + public static final HotSpotForeignCallDescriptor VM_MESSAGE_C = newDescriptor(SAFEPOINT, REEXECUTABLE, null, StubUtil.class, "vmMessageC", void.class, boolean.class, Word.class, long.class, + long.class, long.class); - public static ForeignCallDescriptor newDescriptor(Class stubClass, String name, Class resultType, Class... argumentTypes) { - ForeignCallDescriptor d = new ForeignCallDescriptor(name, resultType, argumentTypes); - assert descriptorFor(stubClass, name).equals(d) : descriptorFor(stubClass, name) + " != " + d; + public static HotSpotForeignCallDescriptor newDescriptor(HotSpotForeignCallDescriptor.Transition safepoint, HotSpotForeignCallDescriptor.Reexecutability reexecutable, + LocationIdentity killLocation, + Class stubClass, String name, Class resultType, Class... argumentTypes) { + HotSpotForeignCallDescriptor d = new HotSpotForeignCallDescriptor(safepoint, reexecutable, killLocation, name, resultType, argumentTypes); + assert descriptorFor(stubClass, name, resultType, argumentTypes); return d; } @@ -63,14 +70,14 @@ public class StubUtil { * {@code stubClass} and returns a {@link ForeignCallDescriptor} based on its signature and the * value of {@code hasSideEffect}. */ - private static ForeignCallDescriptor descriptorFor(Class stubClass, String name) { + private static boolean descriptorFor(Class stubClass, String name, Class resultType, Class[] argumentTypes) { Method found = null; for (Method method : stubClass.getDeclaredMethods()) { if (Modifier.isStatic(method.getModifiers()) && method.getAnnotation(NodeIntrinsic.class) != null && method.getName().equals(name)) { if (method.getAnnotation(NodeIntrinsic.class).value().equals(StubForeignCallNode.class)) { assert found == null : "found more than one foreign call named " + name + " in " + stubClass; - assert method.getParameterTypes().length != 0 && method.getParameterTypes()[0] == ForeignCallDescriptor.class : "first parameter of foreign call '" + name + "' in " + stubClass + - " must be of type " + ForeignCallDescriptor.class.getSimpleName(); + assert method.getParameterTypes().length != 0 && method.getParameterTypes()[0] == ForeignCallDescriptor.class : "first parameter of foreign call '" + name + "' in " + + stubClass + " must be of type " + ForeignCallDescriptor.class.getSimpleName(); found = method; } } @@ -78,7 +85,9 @@ public class StubUtil { assert found != null : "could not find foreign call named " + name + " in " + stubClass; List> paramList = Arrays.asList(found.getParameterTypes()); Class[] cCallTypes = paramList.subList(1, paramList.size()).toArray(new Class[paramList.size() - 1]); - return new ForeignCallDescriptor(name, found.getReturnType(), cCallTypes); + assert resultType.equals(found.getReturnType()) : found; + assert Arrays.equals(cCallTypes, argumentTypes) : found; + return true; } /** diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/UnwindExceptionToCallerStub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/UnwindExceptionToCallerStub.java index e571b62639a..718673cafb2 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/UnwindExceptionToCallerStub.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/UnwindExceptionToCallerStub.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -26,6 +26,8 @@ package org.graalvm.compiler.hotspot.stubs; import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_OPTIONVALUES; import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; +import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT; import static org.graalvm.compiler.hotspot.nodes.JumpToExceptionHandlerInCallerNode.jumpToExceptionHandlerInCaller; import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.registerAsWord; import static org.graalvm.compiler.hotspot.stubs.ExceptionHandlerStub.checkExceptionNotNull; @@ -34,6 +36,7 @@ import static org.graalvm.compiler.hotspot.stubs.StubUtil.cAssertionsEnabled; import static org.graalvm.compiler.hotspot.stubs.StubUtil.decipher; import static org.graalvm.compiler.hotspot.stubs.StubUtil.newDescriptor; import static org.graalvm.compiler.hotspot.stubs.StubUtil.printf; +import static jdk.internal.vm.compiler.word.LocationIdentity.any; import org.graalvm.compiler.api.replacements.Fold; import org.graalvm.compiler.api.replacements.Fold.InjectedParameter; @@ -45,6 +48,7 @@ import org.graalvm.compiler.graph.Node.ConstantNodeParameter; import org.graalvm.compiler.graph.Node.NodeIntrinsic; import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; +import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; import org.graalvm.compiler.hotspot.meta.HotSpotProviders; import org.graalvm.compiler.hotspot.nodes.StubForeignCallNode; import org.graalvm.compiler.nodes.UnwindNode; @@ -112,8 +116,8 @@ public class UnwindExceptionToCallerStub extends SnippetStub { return Assertions.assertionsEnabled() || cAssertionsEnabled(config); } - public static final ForeignCallDescriptor EXCEPTION_HANDLER_FOR_RETURN_ADDRESS = newDescriptor(UnwindExceptionToCallerStub.class, "exceptionHandlerForReturnAddress", Word.class, Word.class, - Word.class); + public static final HotSpotForeignCallDescriptor EXCEPTION_HANDLER_FOR_RETURN_ADDRESS = newDescriptor(SAFEPOINT, REEXECUTABLE, any(), UnwindExceptionToCallerStub.class, + "exceptionHandlerForReturnAddress", Word.class, Word.class, Word.class); @NodeIntrinsic(value = StubForeignCallNode.class) public static native Word exceptionHandlerForReturnAddress(@ConstantNodeParameter ForeignCallDescriptor exceptionHandlerForReturnAddress, Word thread, Word returnAddress); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/MetaspacePointer.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/MetaspacePointer.java index ef082860826..8326e259312 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/MetaspacePointer.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/word/MetaspacePointer.java @@ -989,4 +989,490 @@ public abstract class MetaspacePointer { */ @Operation(opcode = Opcode.WRITE_POINTER) public abstract void writeObject(int offset, Object val); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + *

    + * The offset is always treated as a {@link SignedWord} value. However, the static type is + * {@link WordBase} to avoid the frequent casts of {@link UnsignedWord} values (where the caller + * knows that the highest-order bit of the unsigned value is never used). + * + * @param offset the signed offset for the memory access + * @param locationIdentity the identity of the write + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeByteSideEffectFree(WordBase offset, byte val, LocationIdentity locationIdentity); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + *

    + * The offset is always treated as a {@link SignedWord} value. However, the static type is + * {@link WordBase} to avoid the frequent casts of {@link UnsignedWord} values (where the caller + * knows that the highest-order bit of the unsigned value is never used). + * + * @param offset the signed offset for the memory access + * @param locationIdentity the identity of the write + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeCharSideEffectFree(WordBase offset, char val, LocationIdentity locationIdentity); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + *

    + * The offset is always treated as a {@link SignedWord} value. However, the static type is + * {@link WordBase} to avoid the frequent casts of {@link UnsignedWord} values (where the caller + * knows that the highest-order bit of the unsigned value is never used). + * + * @param offset the signed offset for the memory access + * @param locationIdentity the identity of the write + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeShortSideEffectFree(WordBase offset, short val, LocationIdentity locationIdentity); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + *

    + * The offset is always treated as a {@link SignedWord} value. However, the static type is + * {@link WordBase} to avoid the frequent casts of {@link UnsignedWord} values (where the caller + * knows that the highest-order bit of the unsigned value is never used). + * + * @param offset the signed offset for the memory access + * @param locationIdentity the identity of the write + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeIntSideEffectFree(WordBase offset, int val, LocationIdentity locationIdentity); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + *

    + * The offset is always treated as a {@link SignedWord} value. However, the static type is + * {@link WordBase} to avoid the frequent casts of {@link UnsignedWord} values (where the caller + * knows that the highest-order bit of the unsigned value is never used). + * + * @param offset the signed offset for the memory access + * @param locationIdentity the identity of the write + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeLongSideEffectFree(WordBase offset, long val, LocationIdentity locationIdentity); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + *

    + * The offset is always treated as a {@link SignedWord} value. However, the static type is + * {@link WordBase} to avoid the frequent casts of {@link UnsignedWord} values (where the caller + * knows that the highest-order bit of the unsigned value is never used). + * + * @param offset the signed offset for the memory access + * @param locationIdentity the identity of the write + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeFloatSideEffectFree(WordBase offset, float val, LocationIdentity locationIdentity); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + *

    + * The offset is always treated as a {@link SignedWord} value. However, the static type is + * {@link WordBase} to avoid the frequent casts of {@link UnsignedWord} values (where the caller + * knows that the highest-order bit of the unsigned value is never used). + * + * @param offset the signed offset for the memory access + * @param locationIdentity the identity of the write + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeDoubleSideEffectFree(WordBase offset, double val, LocationIdentity locationIdentity); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + *

    + * The offset is always treated as a {@link SignedWord} value. However, the static type is + * {@link WordBase} to avoid the frequent casts of {@link UnsignedWord} values (where the caller + * knows that the highest-order bit of the unsigned value is never used). + * + * @param offset the signed offset for the memory access + * @param locationIdentity the identity of the write + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeWordSideEffectFree(WordBase offset, WordBase val, LocationIdentity locationIdentity); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + *

    + * The offset is always treated as a {@link SignedWord} value. However, the static type is + * {@link WordBase} to avoid the frequent casts of {@link UnsignedWord} values (where the caller + * knows that the highest-order bit of the unsigned value is never used). + * + * @param offset the signed offset for the memory access + * @param locationIdentity the identity of the write + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeObjectSideEffectFree(WordBase offset, Object val, LocationIdentity locationIdentity); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + * + * @param offset the signed offset for the memory access + * @param locationIdentity the identity of the write + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeByteSideEffectFree(int offset, byte val, LocationIdentity locationIdentity); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + * + * @param offset the signed offset for the memory access + * @param locationIdentity the identity of the write + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeCharSideEffectFree(int offset, char val, LocationIdentity locationIdentity); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + * + * @param offset the signed offset for the memory access + * @param locationIdentity the identity of the write + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeShortSideEffectFree(int offset, short val, LocationIdentity locationIdentity); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + * + * @param offset the signed offset for the memory access + * @param locationIdentity the identity of the write + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeIntSideEffectFree(int offset, int val, LocationIdentity locationIdentity); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + * + * @param offset the signed offset for the memory access + * @param locationIdentity the identity of the write + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeLongSideEffectFree(int offset, long val, LocationIdentity locationIdentity); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + * + * @param offset the signed offset for the memory access + * @param locationIdentity the identity of the write + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeFloatSideEffectFree(int offset, float val, LocationIdentity locationIdentity); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + * + * @param offset the signed offset for the memory access + * @param locationIdentity the identity of the write + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeDoubleSideEffectFree(int offset, double val, LocationIdentity locationIdentity); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + * + * @param offset the signed offset for the memory access + * @param locationIdentity the identity of the write + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeWordSideEffectFree(int offset, WordBase val, LocationIdentity locationIdentity); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + * + * @param offset the signed offset for the memory access + * @param locationIdentity the identity of the write + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeObjectSideEffectFree(int offset, Object val, LocationIdentity locationIdentity); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + *

    + * The offset is always treated as a {@link SignedWord} value. However, the static type is + * {@link WordBase} to avoid the frequent casts of {@link UnsignedWord} values (where the caller + * knows that the highest-order bit of the unsigned value is never used). + * + * @param offset the signed offset for the memory access + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeByteSideEffectFree(WordBase offset, byte val); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + *

    + * The offset is always treated as a {@link SignedWord} value. However, the static type is + * {@link WordBase} to avoid the frequent casts of {@link UnsignedWord} values (where the caller + * knows that the highest-order bit of the unsigned value is never used). + * + * @param offset the signed offset for the memory access + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeCharSideEffectFree(WordBase offset, char val); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + *

    + * The offset is always treated as a {@link SignedWord} value. However, the static type is + * {@link WordBase} to avoid the frequent casts of {@link UnsignedWord} values (where the caller + * knows that the highest-order bit of the unsigned value is never used). + * + * @param offset the signed offset for the memory access + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeShortSideEffectFree(WordBase offset, short val); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + *

    + * The offset is always treated as a {@link SignedWord} value. However, the static type is + * {@link WordBase} to avoid the frequent casts of {@link UnsignedWord} values (where the caller + * knows that the highest-order bit of the unsigned value is never used). + * + * @param offset the signed offset for the memory access + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeIntSideEffectFree(WordBase offset, int val); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + *

    + * The offset is always treated as a {@link SignedWord} value. However, the static type is + * {@link WordBase} to avoid the frequent casts of {@link UnsignedWord} values (where the caller + * knows that the highest-order bit of the unsigned value is never used). + * + * @param offset the signed offset for the memory access + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeLongSideEffectFree(WordBase offset, long val); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + *

    + * The offset is always treated as a {@link SignedWord} value. However, the static type is + * {@link WordBase} to avoid the frequent casts of {@link UnsignedWord} values (where the caller + * knows that the highest-order bit of the unsigned value is never used). + * + * @param offset the signed offset for the memory access + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeFloatSideEffectFree(WordBase offset, float val); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + *

    + * The offset is always treated as a {@link SignedWord} value. However, the static type is + * {@link WordBase} to avoid the frequent casts of {@link UnsignedWord} values (where the caller + * knows that the highest-order bit of the unsigned value is never used). + * + * @param offset the signed offset for the memory access + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeDoubleSideEffectFree(WordBase offset, double val); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + *

    + * The offset is always treated as a {@link SignedWord} value. However, the static type is + * {@link WordBase} to avoid the frequent casts of {@link UnsignedWord} values (where the caller + * knows that the highest-order bit of the unsigned value is never used). + * + * @param offset the signed offset for the memory access + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeWordSideEffectFree(WordBase offset, WordBase val); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + *

    + * The offset is always treated as a {@link SignedWord} value. However, the static type is + * {@link WordBase} to avoid the frequent casts of {@link UnsignedWord} values (where the caller + * knows that the highest-order bit of the unsigned value is never used). + * + * @param offset the signed offset for the memory access + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeObjectSideEffectFree(WordBase offset, Object val); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + * + * @param offset the signed offset for the memory access + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeByteSideEffectFree(int offset, byte val); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + * + * @param offset the signed offset for the memory access + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeCharSideEffectFree(int offset, char val); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + * + * @param offset the signed offset for the memory access + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeShortSideEffectFree(int offset, short val); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + * + * @param offset the signed offset for the memory access + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeIntSideEffectFree(int offset, int val); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. + * + * @param offset the signed offset for the memory access + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeLongSideEffectFree(int offset, long val); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + * + * @param offset the signed offset for the memory access + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeFloatSideEffectFree(int offset, float val); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + * + * @param offset the signed offset for the memory access + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeDoubleSideEffectFree(int offset, double val); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + * + * @param offset the signed offset for the memory access + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeWordSideEffectFree(int offset, WordBase val); + + /** + * Writes the memory at address {@code (this + offset)}. Both the base address and offset are in + * bytes. The write is side-effect free, it is not a part of the JVM state and can be repeated + * after deoptimization. + * + * @param offset the signed offset for the memory access + * @param val the value to be written to memory + */ + @Operation(opcode = Opcode.WRITE_POINTER_SIDE_EFFECT_FREE) + public abstract void writeObjectSideEffectFree(int offset, Object val); + } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BciBlockMapping.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BciBlockMapping.java index 82a3e09ad32..0e401b43778 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BciBlockMapping.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BciBlockMapping.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020, 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 @@ -233,11 +233,14 @@ import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.Iterator; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.TreeSet; +import java.util.function.ToIntFunction; import jdk.internal.vm.compiler.collections.EconomicMap; +import jdk.internal.vm.compiler.collections.EconomicSet; import jdk.internal.vm.compiler.collections.Equivalence; import org.graalvm.compiler.bytecode.Bytecode; import org.graalvm.compiler.bytecode.BytecodeLookupSwitch; @@ -247,11 +250,17 @@ import org.graalvm.compiler.bytecode.BytecodeTableSwitch; import org.graalvm.compiler.bytecode.Bytecodes; import org.graalvm.compiler.core.common.PermanentBailoutException; import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.DebugContext.Scope; import org.graalvm.compiler.debug.GraalError; +import org.graalvm.compiler.debug.JavaMethodContext; +import org.graalvm.compiler.options.Option; +import org.graalvm.compiler.options.OptionKey; +import org.graalvm.compiler.options.OptionType; import org.graalvm.compiler.options.OptionValues; import jdk.vm.ci.code.BytecodeFrame; import jdk.vm.ci.meta.ExceptionHandler; +import jdk.vm.ci.meta.JavaMethod; /** * Builds a mapping between bytecodes and basic blocks and builds a conservative control flow graph @@ -280,8 +289,9 @@ import jdk.vm.ci.meta.ExceptionHandler; * maximum subroutine nesting of 4. Otherwise, a bailout is thrown. *

    * Loops in the methods are detected. If a method contains an irreducible loop (a loop with more - * than one entry), a bailout is thrown. This simplifies the compiler later on since only structured - * loops need to be supported. + * than one entry), a bailout is thrown or block duplication is attempted to make the loop + * reducible. This simplifies the compiler later on since only structured loops need to be + * supported. *

    * A data flow analysis computes the live local variables from the point of view of the interpreter. * The result is used later to prune frame states, i.e., remove local variable entries that are @@ -290,17 +300,24 @@ import jdk.vm.ci.meta.ExceptionHandler; * The algorithms and analysis in this class are conservative and do not use any assumptions or * profiling information. */ -public final class BciBlockMapping { +public final class BciBlockMapping implements JavaMethodContext { + public static class Options { + @Option(help = "When enabled, some limited amount of duplication will be performed in order compile code containing irreducible loops.")// + public static final OptionKey DuplicateIrreducibleLoops = new OptionKey<>(true); + @Option(help = "How much duplication can happen because of irreducible loops before bailing out.", type = OptionType.Expert)// + public static final OptionKey MaxDuplicationFactor = new OptionKey<>(2.0); + } + + private static final int UNASSIGNED_ID = -1; public static class BciBlock implements Cloneable { - int id; + int id = UNASSIGNED_ID; final int startBci; int endBci; // The bci of the last bytecode in the block private boolean isExceptionEntry; private boolean isLoopHeader; int loopId; - int loopEnd; List successors; private int predecessorCount; @@ -308,6 +325,8 @@ public final class BciBlockMapping { private boolean active; long loops; JSRData jsrData; + List loopIdChain; + boolean duplicate; public static class JSRData implements Cloneable { public EconomicMap jsrAlternatives; @@ -378,6 +397,28 @@ public final class BciBlockMapping { } } + public BciBlock duplicate() { + try { + BciBlock block = (BciBlock) super.clone(); + if (block.jsrData != null) { + throw new PermanentBailoutException("Can not duplicate block with JSR data"); + } + block.successors = new ArrayList<>(successors); + block.loops = 0; + block.loopId = 0; + block.id = UNASSIGNED_ID; + block.isLoopHeader = false; + block.visited = false; + block.active = false; + block.predecessorCount = 0; + block.loopIdChain = null; + block.duplicate = true; + return block; + } catch (CloneNotSupportedException e) { + throw new RuntimeException(e); + } + } + @Override public String toString() { StringBuilder sb = new StringBuilder("B").append(getId()); @@ -394,13 +435,12 @@ public final class BciBlockMapping { } } sb.append(']'); + if (duplicate) { + sb.append(" (duplicate)"); + } return sb.toString(); } - public int getLoopDepth() { - return Long.bitCount(loops); - } - public boolean isLoopHeader() { return isLoopHeader; } @@ -413,65 +453,8 @@ public final class BciBlockMapping { return successors.get(index); } - /** - * Get the loop id of the inner most loop. - * - * @return the loop id of the most inner loop or -1 if not part of any loop - */ public int getLoopId() { - long l = loops; - if (l == 0) { - return -1; - } - int pos = 0; - for (int lMask = 1; (l & lMask) == 0; lMask = lMask << 1) { - pos++; - } - return pos; - } - - /** - * Iterate over loop ids. - */ - public Iterable loopIdIterable() { - return new Iterable() { - @Override - public Iterator iterator() { - return idIterator(loops); - } - }; - } - - private static Iterator idIterator(long field) { - return new Iterator() { - - long l = field; - int pos = 0; - int lMask = 1; - - @Override - public Integer next() { - for (; (l & lMask) == 0; lMask = lMask << 1) { - pos++; - } - l &= ~lMask; - return pos; - } - - @Override - public boolean hasNext() { - return l != 0; - } - }; - - } - - public double probability() { - return 1D; - } - - public BciBlock getPostdominator() { - return null; + return loopId; } private JSRData getOrCreateJSRData() { @@ -583,6 +566,21 @@ public final class BciBlockMapping { public boolean isExceptionDispatch() { return false; } + + public void getDebugProperties(Map properties) { + properties.put("assignedId", this.getId()); + properties.put("startBci", this.getStartBci()); + properties.put("endBci", this.getEndBci()); + properties.put("isExceptionEntry", this.isExceptionEntry()); + properties.put("isLoopHeader", this.isLoopHeader()); + properties.put("loopId", this.getLoopId()); + properties.put("loops", Long.toBinaryString(this.getLoops())); + properties.put("predecessorCount", this.getPredecessorCount()); + properties.put("active", this.active); + properties.put("visited", this.visited); + properties.put("duplicate", this.duplicate); + // JSRData? + } } public static class ExceptionDispatchBlock extends BciBlock { @@ -613,18 +611,71 @@ public final class BciBlockMapping { public boolean isExceptionDispatch() { return true; } + + @Override + public void getDebugProperties(Map properties) { + super.getDebugProperties(properties); + properties.put("deoptBci", this.deoptBci); + if (this.handler != null) { + properties.put("catch type", this.handler.getCatchType()); + } + } } - private static final class TraversalStep { - private BciBlock block; + private static class TraversalStep { + private final TraversalStep pred; + private final BciBlock block; private int currentSuccessorIndex; private long loops; - private TraversalStep(BciBlock block) { + TraversalStep(TraversalStep pred, BciBlock block) { + this.pred = pred; this.block = block; this.currentSuccessorIndex = 0; this.loops = 0; } + + TraversalStep(BciBlock block) { + this(null, block); + } + + @Override + public String toString() { + if (pred == null) { + return "TraversalStep{block=" + block + + ", currentSuccessorIndex=" + currentSuccessorIndex + + ", loops=" + Long.toBinaryString(loops) + + '}'; + } + return "TraversalStep{" + + "pred=" + pred + + ", block=" + block + + ", currentSuccessorIndex=" + currentSuccessorIndex + + ", loops=" + Long.toBinaryString(loops) + + '}'; + } + } + + private static final class DuplicationTraversalStep extends TraversalStep { + private final BciBlock loopHeader; + private final EconomicMap duplicationMap; + + DuplicationTraversalStep(TraversalStep pred, BciBlock block, BciBlock loopHeader) { + super(pred, block); + this.loopHeader = loopHeader; + this.duplicationMap = EconomicMap.create(); + } + + DuplicationTraversalStep(DuplicationTraversalStep pred, BciBlock block) { + super(pred, block); + this.loopHeader = pred.loopHeader; + this.duplicationMap = pred.duplicationMap; + } + + @Override + public String toString() { + return super.toString() + " (duplicating " + loopHeader + ")"; + } } /** @@ -643,6 +694,9 @@ public final class BciBlockMapping { private int blocksNotYetAssignedId; private final DebugContext debug; + private int postJsrBlockCount; + private int newDuplicateBlocks; + private int duplicateBlocks; /** * Creates a new BlockMap instance from {@code code}. @@ -665,21 +719,30 @@ public final class BciBlockMapping { BciBlock[] blockMap = new BciBlock[codeSize]; makeExceptionEntries(blockMap); iterateOverBytecodes(blockMap, stream); + startBlock = blockMap[0]; + if (debug.isDumpEnabled(DebugContext.INFO_LEVEL)) { + debug.dump(DebugContext.INFO_LEVEL, this, code.getMethod().format("After iterateOverBytecodes %f %R %H.%n(%P)")); + } if (hasJsrBytecodes) { if (!SupportJsrBytecodes.getValue(options)) { throw new JsrNotSupportedBailout("jsr/ret parsing disabled"); } - createJsrAlternatives(blockMap, blockMap[0]); + createJsrAlternatives(blockMap, startBlock); + if (debug.isDumpEnabled(DebugContext.INFO_LEVEL)) { + debug.dump(DebugContext.INFO_LEVEL, this, code.getMethod().format("After createJsrAlternatives %f %R %H.%n(%P)")); + } } + postJsrBlockCount = blocksNotYetAssignedId; if (debug.isLogEnabled()) { this.log(blockMap, "Before BlockOrder"); } computeBlockOrder(blockMap); - fixLoopBits(blockMap); + if (debug.isDumpEnabled(DebugContext.INFO_LEVEL)) { + debug.dump(DebugContext.INFO_LEVEL, this, code.getMethod().format("After computeBlockOrder %f %R %H.%n(%P)")); + } assert verify(); - startBlock = blockMap[0]; if (debug.isLogEnabled()) { this.log(blockMap, "Before LivenessAnalysis"); } @@ -1157,43 +1220,18 @@ public final class BciBlockMapping { return lastHandler; } - private boolean loopChanges; - - private void fixLoopBits(BciBlock[] blockMap) { - do { - loopChanges = false; - for (BciBlock b : blocks) { - b.visited = false; - } - - long loop = fixLoopBits(blockMap[0]); - - if (loop != 0) { - // There is a path from a loop end to the method entry that does not pass the loop - // header. - // Therefore, the loop is non reducible (has more than one entry). - // We don't want to compile such methods because the IR only supports structured - // loops. - throw new PermanentBailoutException("Non-reducible loop: %016x", loop); - } - } while (loopChanges); - } - private void computeBlockOrder(BciBlock[] blockMap) { int maxBlocks = blocksNotYetAssignedId; this.blocks = new BciBlock[blocksNotYetAssignedId]; - long loop = computeBlockOrder(blockMap[0]); - - if (loop != 0) { - // There is a path from a loop end to the method entry that does not pass the loop - // header. Therefore, the loop is non reducible (has more than one entry). - // We don't want to compile such methods because the IR only supports structured loops. - throw new PermanentBailoutException("Non-reducible loop"); + computeBlockOrder(blockMap[0]); + int duplicatedBlocks = newDuplicateBlocks + duplicateBlocks; + if (duplicatedBlocks > 0) { + debug.log(DebugContext.INFO_LEVEL, "Duplicated %d blocks. Original block count: %d", duplicatedBlocks, postJsrBlockCount); } // Purge null entries for unreached blocks and sort blocks such that loop bodies are always // consecutively in the array. - int blockCount = maxBlocks - blocksNotYetAssignedId + 1; + int blockCount = maxBlocks - blocksNotYetAssignedId + 1 + duplicateBlocks; BciBlock[] newBlocks = new BciBlock[blockCount]; int next = 0; for (int i = 0; i < blocks.length; ++i) { @@ -1218,12 +1256,10 @@ public final class BciBlockMapping { private int handleLoopHeader(BciBlock[] newBlocks, int nextStart, int i, BciBlock loopHeader) { int next = nextStart; - int endOfLoop = nextStart - 1; for (int j = i + 1; j < blocks.length; ++j) { BciBlock other = blocks[j]; if (other != null && (other.loops & (1L << loopHeader.loopId)) != 0) { other.setId(next); - endOfLoop = next; newBlocks[next++] = other; blocks[j] = null; if (other.isLoopHeader) { @@ -1231,7 +1267,6 @@ public final class BciBlockMapping { } } } - loopHeader.loopEnd = endOfLoop; return next; } @@ -1242,12 +1277,24 @@ public final class BciBlockMapping { } public static String toString(BciBlock[] blockMap, BciBlock[] loopHeadersMap) { + if (blockMap == null) { + return "no blockmap"; + } StringBuilder sb = new StringBuilder(); + Map debugIds = new HashMap<>(); + int[] nextDebugId = new int[]{-2}; + ToIntFunction getId = b -> { + int id = b.getId(); + if (id < 0) { + id = debugIds.computeIfAbsent(b, bb -> nextDebugId[0]--); + } + return id; + }; for (BciBlock b : blockMap) { if (b == null) { continue; } - sb.append("B").append(b.getId()).append("[").append(b.startBci).append("..").append(b.endBci).append("]"); + sb.append("B").append(getId.applyAsInt(b)).append("[").append(b.startBci).append("..").append(b.endBci).append("]"); if (b.isLoopHeader) { sb.append(" LoopHeader"); } @@ -1263,18 +1310,21 @@ public final class BciBlockMapping { if (sb.charAt(sb.length() - 1) != '[') { sb.append(", "); } - sb.append("B").append(s.getId()); + sb.append("B").append(getId.applyAsInt(s)); } sb.append("]"); } - if (b.loops != 0L) { + if (b.loops != 0L && loopHeadersMap != null) { sb.append(" Loops=["); - for (int pos : b.loopIdIterable()) { - if (sb.charAt(sb.length() - 1) == '[') { + long loops = b.loops; + do { + int pos = Long.numberOfTrailingZeros(loops); + if (sb.charAt(sb.length() - 1) != '[') { sb.append(", "); } - sb.append("B").append(loopHeadersMap[pos].getId()); - } + sb.append("B").append(getId.applyAsInt(loopHeadersMap[pos])); + loops ^= loops & -loops; + } while (loops != 0); sb.append("]"); } sb.append(System.lineSeparator()); @@ -1299,153 +1349,221 @@ public final class BciBlockMapping { */ private int nextLoop; - /** - * Mark the block as a loop header, using the next available loop number. Also checks for corner - * cases that we don't want to compile. - */ private void makeLoopHeader(BciBlock block) { - if (!block.isLoopHeader) { - block.isLoopHeader = true; - - if (block.isExceptionEntry) { - // Loops that are implicitly formed by an exception handler lead to all sorts of - // corner cases. - // Don't compile such methods for now, until we see a concrete case that allows - // checking for correctness. - throw new PermanentBailoutException("Loop formed by an exception handler"); - } - if (nextLoop >= LOOP_HEADER_MAX_CAPACITY) { - // This restriction can be removed by using a fall-back to a BitSet in case we have - // more than 64 loops - // Don't compile such methods for now, until we see a concrete case that allows - // checking for correctness. - throw new PermanentBailoutException("Too many loops in method"); - } - - assert block.loops == 0; - block.loops = 1L << nextLoop; - debug.log("makeLoopHeader(%s) -> %x", block, block.loops); - if (loopHeaders == null) { - loopHeaders = new BciBlock[LOOP_HEADER_INITIAL_CAPACITY]; - } else if (nextLoop >= loopHeaders.length) { - loopHeaders = Arrays.copyOf(loopHeaders, LOOP_HEADER_MAX_CAPACITY); - } - loopHeaders[nextLoop] = block; - block.loopId = nextLoop; - nextLoop++; + assert !block.isLoopHeader; + block.isLoopHeader = true; + if (block.isExceptionEntry) { + // Loops that are implicitly formed by an exception handler lead to all sorts of + // corner cases. + // Don't compile such methods for now, until we see a concrete case that allows + // checking for correctness. + throw new PermanentBailoutException("Loop formed by an exception handler"); + } + if (nextLoop >= LOOP_HEADER_MAX_CAPACITY) { + // This restriction can be removed by using a fall-back to a BitSet in case we have + // more than 64 loops + // Don't compile such methods for now, until we see a concrete case that allows + // checking for correctness. + throw new PermanentBailoutException("Too many loops in method"); + } + block.loops |= 1L << nextLoop; + debug.log("makeLoopHeader(%s) -> %x", block, block.loops); + if (loopHeaders == null) { + loopHeaders = new BciBlock[LOOP_HEADER_INITIAL_CAPACITY]; + } else if (nextLoop >= loopHeaders.length) { + loopHeaders = Arrays.copyOf(loopHeaders, LOOP_HEADER_MAX_CAPACITY); + } + loopHeaders[nextLoop] = block; + block.loopId = nextLoop; + nextLoop++; + } + + private void propagateLoopBits(TraversalStep step, long loopBits) { + TraversalStep s = step; + while (s != null && (s.block.loops & loopBits) != loopBits) { + s.block.loops |= loopBits; + if (s.block.loopIdChain != null) { + for (TraversalStep chain : s.block.loopIdChain) { + propagateLoopBits(chain, loopBits); + } + } + s = s.pred; } - assert Long.bitCount(block.loops) == 1; } /** - * Non-recursive depth-first traversal of the control flow graph. The flag - * {@linkplain BciBlock#visited} is used to visit every block only once. The flag - * {@linkplain BciBlock#active} is used to detect cycles (backward edges) + * Computes a block pre-order, finds and marks loops. + * + *

    + * This uses a depth-first traversal of the blocks. In order to detect irreducible loops, blocks + * are marked as belonging to a block as soon as that is known. This is done by keeping a linked + * list of the currently "active" blocks (the path from entry to the current block). To be able + * to do this marking correctly when in the case of nested loops, merge points (including loop + * headers) remember the path from their predecessor (see + * {@link #propagateLoopBits(TraversalStep, long)}). + *

    + * Since loops are marked eagerly, forward entries into an existing loop without going through + * the loop header (i.e., irreducible loops) can be detected easily. In this case, if + * {@link Options#DuplicateIrreducibleLoops} is enabled, the traversal starts to duplicate + * blocks until it either exits the loop or reaches the header. Since this is a depth-first + * traversal and the loop header is not active, we know that the loop and its inner-loops were + * until then reducible. + *

    + * This is not recursive to avoid stack overflow issues. */ - private long computeBlockOrder(BciBlock initialBlock) { + private void computeBlockOrder(BciBlock initialBlock) { ArrayDeque workStack = new ArrayDeque<>(); workStack.push(new TraversalStep(initialBlock)); - while (true) { + while (!workStack.isEmpty()) { TraversalStep step = workStack.peek(); BciBlock block = step.block; if (step.currentSuccessorIndex == 0) { block.visited = true; block.active = true; - } else { - BciBlock successor = block.getSuccessor(step.currentSuccessorIndex - 1); - if (successor.active) { - // Reached block via backward branch. - step.loops |= (1L << successor.loopId); - } } if (step.currentSuccessorIndex < block.successors.size()) { BciBlock successor = block.getSuccessors().get(step.currentSuccessorIndex); + if (step instanceof DuplicationTraversalStep) { + DuplicationTraversalStep duplicationStep = (DuplicationTraversalStep) step; + BciBlock targetHeader = duplicationStep.loopHeader; + if (successor != targetHeader && (successor.loops & 1 << targetHeader.loopId) != 0) { + // neither the target header nor an exit: duplicate or merge with duplicate + BciBlock duplicate = duplicationStep.duplicationMap.get(successor); + if (duplicate == null) { + duplicate = successor.duplicate(); + newDuplicateBlocks++; + duplicationStep.duplicationMap.put(successor, duplicate); + } + successor = duplicate; + successor.predecessorCount++; + block.successors.set(step.currentSuccessorIndex, successor); + } else { + debug.dump(DebugContext.DETAILED_LEVEL, this, "Exiting duplication @ %s", successor); + debug.log("Exiting duplication @ %s", successor); + successor.predecessorCount++; + } + } if (successor.visited) { + long loopBits; + boolean duplicationStarted = false; if (successor.active) { // Reached block via backward branch. - makeLoopHeader(successor); - step.loops |= successor.loops; - } else if (successor.isLoopHeader) { - step.loops |= successor.loops & ~(1L << successor.loopId); + if (!successor.isLoopHeader) { + makeLoopHeader(successor); + } + loopBits = successor.loops; } else { - step.loops |= successor.loops; + // re-reaching control-flow through new path. + // Find loop bits + loopBits = successor.loops; + if (successor.isLoopHeader) { + // this is a forward edge + loopBits &= ~(1L << successor.loopId); + } + // Check if we are re-entering a loop in an irreducible way + long checkBits = loopBits; + int outermostInactiveLoopId = -1; + while (checkBits != 0) { + int id = Long.numberOfTrailingZeros(checkBits); + if (!loopHeaders[id].active) { + if (!Options.DuplicateIrreducibleLoops.getValue(debug.getOptions())) { + throw new PermanentBailoutException("Irreducible"); + } else if (outermostInactiveLoopId == -1 || (loopHeaders[id].loops & 1L << outermostInactiveLoopId) == 0) { + outermostInactiveLoopId = id; + } + } + checkBits &= ~(1L << id); + } + if (outermostInactiveLoopId != -1) { + assert !(step instanceof DuplicationTraversalStep); + // we need to duplicate until we can merge with this loop's header + successor.predecessorCount--; + BciBlock duplicate = successor.duplicate(); + duplicate.predecessorCount++; + block.successors.set(step.currentSuccessorIndex, duplicate); + DuplicationTraversalStep duplicationStep = new DuplicationTraversalStep(step, duplicate, loopHeaders[outermostInactiveLoopId]); + workStack.push(duplicationStep); + debug.log("Starting duplication @ %s", duplicate); + debug.dump(DebugContext.DETAILED_LEVEL, this, "Starting duplication @ %s", duplicate); + duplicationStep.duplicationMap.put(successor, duplicate); + newDuplicateBlocks++; + duplicationStarted = true; + } } + if (!duplicationStarted) { + propagateLoopBits(step, loopBits); + if (successor.loopIdChain == null) { + successor.loopIdChain = new ArrayList<>(2); + } + successor.loopIdChain.add(step); + debug.dump(DebugContext.DETAILED_LEVEL, this, "After re-reaching %s", successor); + } + } else if (step instanceof DuplicationTraversalStep) { + workStack.push(new DuplicationTraversalStep((DuplicationTraversalStep) step, successor)); } else { - workStack.push(new TraversalStep(successor)); + workStack.push(new TraversalStep(step, successor)); } step.currentSuccessorIndex++; } else { // We processed all the successors of this block. - block.loops = step.loops; - debug.log("computeBlockOrder(%s) -> %x", block, block.loops); - - if (block.isLoopHeader) { - step.loops &= ~(1L << block.loopId); - } - block.active = false; + assert checkBlocks(blocksNotYetAssignedId, block); blocksNotYetAssignedId--; - blocks[blocksNotYetAssignedId] = block; - - workStack.pop(); - if (!workStack.isEmpty()) { - workStack.peek().loops |= step.loops; - } else { - return step.loops; - } - } - } - } - - private long fixLoopBits(BciBlock initialBlock) { - ArrayDeque workStack = new ArrayDeque<>(); - workStack.push(new TraversalStep(initialBlock)); - while (true) { - TraversalStep step = workStack.peek(); - BciBlock block = step.block; - if (step.currentSuccessorIndex == 0) { - block.visited = true; - step.loops = block.loops; - } - if (step.currentSuccessorIndex < block.getSuccessors().size()) { - BciBlock successor = block.getSuccessors().get(step.currentSuccessorIndex); - if (successor.visited) { - // Return cached loop information for this block. - if (successor.isLoopHeader) { - step.loops |= successor.loops & ~(1L << successor.loopId); - } else { - step.loops |= successor.loops; + if (blocksNotYetAssignedId < 0) { + // this should only happen if duplication is active + assert Options.DuplicateIrreducibleLoops.getValue(debug.getOptions()); + duplicateBlocks += newDuplicateBlocks; + if (duplicateBlocks > postJsrBlockCount * Options.MaxDuplicationFactor.getValue(debug.getOptions())) { + throw new PermanentBailoutException("Non-reducible loop requires too much duplication"); } - } else { - workStack.push(new TraversalStep(successor)); + // there are new duplicate blocks, re-number + debug.log(DebugContext.INFO_LEVEL, "Re-numbering blocks to make room for duplicates (old length: %d; new blocks: %d)", blocks.length, newDuplicateBlocks); + BciBlock[] newBlocks = new BciBlock[blocks.length + newDuplicateBlocks]; + for (int i = 0; i < blocks.length; i++) { + newBlocks[i + newDuplicateBlocks] = blocks[i]; + assert blocks[i].id == UNASSIGNED_ID; + } + blocksNotYetAssignedId += newDuplicateBlocks; + assert blocksNotYetAssignedId >= 0; + newDuplicateBlocks = 0; + blocks = newBlocks; } - step.currentSuccessorIndex++; - } else { - if (block.loops != step.loops) { - loopChanges = true; - block.loops = step.loops; - debug.log("fixLoopBits0(%s) -> %x", block, block.loops); - } - - if (block.isLoopHeader) { - step.loops &= ~(1L << block.loopId); - } - + blocks[blocksNotYetAssignedId] = block; + debug.log("computeBlockOrder(%s) -> %x", block, block.loops); + debug.dump(DebugContext.DETAILED_LEVEL, this, "After adding %s", block); workStack.pop(); - if (!workStack.isEmpty()) { - workStack.peek().loops |= step.loops; - } else { - return step.loops; - } } } + long loops = initialBlock.loops; + if (initialBlock.isLoopHeader) { + loops &= ~(1L << initialBlock.loopId); + } + GraalError.guarantee(loops == 0, "Irreducible loops should already have been detected to duplicated"); } + private boolean checkBlocks(int start, BciBlock inserting) { + for (int i = 0; i < start; i++) { + assert blocks[i] == null; + } + EconomicSet seen = EconomicSet.create(blocks.length - start); + for (int i = start; i < blocks.length; i++) { + assert blocks[i] != null; + assert seen.add(blocks[i]); + } + assert !seen.contains(inserting) : "Trying to add " + inserting + " again"; + return true; + } + + @SuppressWarnings("try") public static BciBlockMapping create(BytecodeStream stream, Bytecode code, OptionValues options, DebugContext debug) { BciBlockMapping map = new BciBlockMapping(code, debug); - map.build(stream, options); - if (debug.isDumpEnabled(DebugContext.INFO_LEVEL)) { - debug.dump(DebugContext.INFO_LEVEL, map, code.getMethod().format("After block building %f %R %H.%n(%P)")); + try (Scope scope = debug.scope("BciBlockMapping", map)) { + map.build(stream, options); + if (debug.isDumpEnabled(DebugContext.INFO_LEVEL)) { + debug.dump(DebugContext.INFO_LEVEL, map, code.getMethod().format("After block building %f %R %H.%n(%P)")); + } + } catch (Throwable t) { + throw debug.handle(t); } return map; @@ -1470,4 +1588,9 @@ public final class BciBlockMapping { public int getBlockCount() { return blocks.length; } + + @Override + public JavaMethod asJavaMethod() { + return code.getMethod(); + } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java index 53657787e07..4b2c79c6851 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java @@ -38,6 +38,7 @@ import static jdk.vm.ci.meta.DeoptimizationReason.UnreachedCode; import static jdk.vm.ci.meta.DeoptimizationReason.Unresolved; import static jdk.vm.ci.runtime.JVMCICompiler.INVOCATION_ENTRY_BCI; import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE; +import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE; import static org.graalvm.compiler.bytecode.Bytecodes.AALOAD; import static org.graalvm.compiler.bytecode.Bytecodes.AASTORE; import static org.graalvm.compiler.bytecode.Bytecodes.ACONST_NULL; @@ -247,6 +248,7 @@ import static org.graalvm.compiler.core.common.GraalOptions.HotSpotPrintInlining import static org.graalvm.compiler.core.common.GraalOptions.PrintProfilingInformation; import static org.graalvm.compiler.core.common.GraalOptions.StressExplicitExceptionCode; import static org.graalvm.compiler.core.common.GraalOptions.StressInvokeWithExceptionNode; +import static org.graalvm.compiler.core.common.GraalOptions.TraceInlining; import static org.graalvm.compiler.core.common.type.StampFactory.objectNonNull; import static org.graalvm.compiler.debug.GraalError.guarantee; import static org.graalvm.compiler.debug.GraalError.shouldNotReachHere; @@ -270,7 +272,6 @@ import jdk.internal.vm.compiler.collections.EconomicMap; import jdk.internal.vm.compiler.collections.Equivalence; import jdk.internal.vm.compiler.collections.UnmodifiableEconomicMap; import org.graalvm.compiler.api.replacements.Fold; -import org.graalvm.compiler.api.replacements.MethodSubstitution; import org.graalvm.compiler.api.replacements.Snippet; import org.graalvm.compiler.bytecode.Bytecode; import org.graalvm.compiler.bytecode.BytecodeDisassembler; @@ -333,10 +334,11 @@ import org.graalvm.compiler.nodes.FrameState; import org.graalvm.compiler.nodes.FullInfopointNode; import org.graalvm.compiler.nodes.IfNode; import org.graalvm.compiler.nodes.InliningLog; +import org.graalvm.compiler.nodes.InliningLog.PlaceholderInvokable; +import org.graalvm.compiler.nodes.Invokable; import org.graalvm.compiler.nodes.Invoke; import org.graalvm.compiler.nodes.InvokeNode; import org.graalvm.compiler.nodes.InvokeWithExceptionNode; -import org.graalvm.compiler.nodes.KillingBeginNode; import org.graalvm.compiler.nodes.LogicConstantNode; import org.graalvm.compiler.nodes.LogicNegationNode; import org.graalvm.compiler.nodes.LogicNode; @@ -354,6 +356,7 @@ import org.graalvm.compiler.nodes.StructuredGraph; import org.graalvm.compiler.nodes.UnwindNode; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.ValuePhiNode; +import org.graalvm.compiler.nodes.WithExceptionNode; import org.graalvm.compiler.nodes.calc.AddNode; import org.graalvm.compiler.nodes.calc.AndNode; import org.graalvm.compiler.nodes.calc.CompareNode; @@ -1534,18 +1537,6 @@ public class BytecodeParser implements GraphBuilderContext { return ConditionalNode.create((LogicNode) x, NodeView.DEFAULT); } - protected NewInstanceNode createNewInstance(ResolvedJavaType type, boolean fillContents) { - return new NewInstanceNode(type, fillContents); - } - - protected NewArrayNode createNewArray(ResolvedJavaType elementType, ValueNode length, boolean fillContents) { - return new NewArrayNode(elementType, length, fillContents); - } - - protected NewMultiArrayNode createNewMultiArray(ResolvedJavaType type, ValueNode[] dimensions) { - return new NewMultiArrayNode(type, dimensions); - } - protected ValueNode genLoadField(ValueNode receiver, ResolvedJavaField field) { StampPair stamp = graphBuilderConfig.getPlugins().getOverridingStamp(this, field.getType(), false); if (stamp == null) { @@ -1561,7 +1552,7 @@ public class BytecodeParser implements GraphBuilderContext { return new StateSplitProxyNode(fieldRead); } - protected ValueNode maybeEmitExplicitNullCheck(ValueNode receiver) { + public ValueNode maybeEmitExplicitNullCheck(ValueNode receiver) { if (StampTool.isPointerNonNull(receiver.stamp(NodeView.DEFAULT)) || !needsExplicitNullCheckException(receiver)) { return receiver; } @@ -1598,7 +1589,7 @@ public class BytecodeParser implements GraphBuilderContext { return emitBytecodeExceptionCheck(condition, false, BytecodeExceptionKind.DIVISION_BY_ZERO); } - private AbstractBeginNode emitBytecodeExceptionCheck(LogicNode condition, boolean passingOnTrue, BytecodeExceptionKind exceptionKind, ValueNode... arguments) { + public AbstractBeginNode emitBytecodeExceptionCheck(LogicNode condition, boolean passingOnTrue, BytecodeExceptionKind exceptionKind, ValueNode... arguments) { if (passingOnTrue ? condition.isTautology() : condition.isContradiction()) { return null; } @@ -1950,7 +1941,7 @@ public class BytecodeParser implements GraphBuilderContext { assert intrinsicContext.isPostParseInlined(); invokeBci = UNKNOWN_BCI; profile = null; - edgeAction = graph.method().getAnnotation(Snippet.class) == null ? ExceptionEdgeAction.INCLUDE_AND_HANDLE : ExceptionEdgeAction.OMIT; + edgeAction = getReplacements().isSnippet(graph.method()) ? ExceptionEdgeAction.OMIT : ExceptionEdgeAction.INCLUDE_AND_HANDLE; } if (originalMethod.isStatic()) { @@ -2073,11 +2064,7 @@ public class BytecodeParser implements GraphBuilderContext { if (exceptionEdge == ExceptionEdgeAction.OMIT) { return createInvoke(invokeBci, callTarget, resultType); } else { - Invoke invoke = createInvokeWithException(invokeBci, callTarget, resultType, exceptionEdge); - AbstractBeginNode beginNode = graph.add(KillingBeginNode.create(LocationIdentity.any())); - invoke.setNext(beginNode); - lastInstr = beginNode; - return invoke; + return createInvokeWithException(invokeBci, callTarget, resultType, exceptionEdge); } } @@ -2289,7 +2276,12 @@ public class BytecodeParser implements GraphBuilderContext { try (DebugCloseable context = openNodeContext(targetMethod, 1)) { genGetField(resolvedField, receiver); notifyBeforeInline(targetMethod); - printInlining(targetMethod, targetMethod, true, "inline accessor method (bytecode parsing)"); + String reason = "inline accessor method (bytecode parsing)"; + printInlining(targetMethod, targetMethod, true, reason); + if (TraceInlining.getValue(options) || debug.hasCompilationListener()) { + PlaceholderInvokable invoke = new PlaceholderInvokable(method, targetMethod, bci()); + graph.getInliningLog().addDecision(invoke, true, "GraphBuilderPhase", null, null, reason); + } notifyAfterInline(targetMethod); } return true; @@ -2338,7 +2330,7 @@ public class BytecodeParser implements GraphBuilderContext { if (node instanceof Invoke) { Invoke invoke = (Invoke) node; if (invoke.bci() == BytecodeFrame.UNKNOWN_BCI) { - invoke.replaceBci(bci()); + invoke.setBci(bci()); } if (node instanceof InvokeWithExceptionNode) { // The graphs for MethodSubsitutions are produced assuming that @@ -2367,7 +2359,7 @@ public class BytecodeParser implements GraphBuilderContext { } } else if (node instanceof ForeignCallNode) { ForeignCallNode call = (ForeignCallNode) node; - if (call.getBci() == BytecodeFrame.UNKNOWN_BCI) { + if (call.bci() == BytecodeFrame.UNKNOWN_BCI) { call.setBci(bci()); if (call.stateAfter() != null && call.stateAfter().bci == BytecodeFrame.INVALID_FRAMESTATE_BCI) { call.setStateAfter(inlineScope.stateBefore); @@ -2438,7 +2430,7 @@ public class BytecodeParser implements GraphBuilderContext { } private boolean inline(ResolvedJavaMethod targetMethod, ResolvedJavaMethod inlinedMethod, BytecodeProvider intrinsicBytecodeProvider, ValueNode[] args) { - try (InliningLog.RootScope scope = graph.getInliningLog().openRootScope(targetMethod, bci())) { + try (InliningLog.RootScope scope = graph.getInliningLog().openRootScope(method, targetMethod, bci())) { IntrinsicContext intrinsic = this.intrinsicContext; if (intrinsic == null && !graphBuilderConfig.insertFullInfopoints() && @@ -2448,6 +2440,9 @@ public class BytecodeParser implements GraphBuilderContext { return true; } + Invokable logInliningInvokable = scope != null ? scope.getInvoke() : debug.hasCompilationListener() ? new PlaceholderInvokable(method, targetMethod, bci()) : null; + boolean logInliningDecision = logInliningInvokable != null; + if (intrinsic != null && intrinsic.isCallToOriginal(targetMethod)) { if (intrinsic.isCompilationRoot()) { // A root compiled intrinsic needs to deoptimize @@ -2456,15 +2451,15 @@ public class BytecodeParser implements GraphBuilderContext { // from the start node of the intrinsic append(new DeoptimizeNode(InvalidateRecompile, RuntimeConstraint)); printInlining(targetMethod, inlinedMethod, true, "compilation root (bytecode parsing)"); - if (scope != null) { - graph.getInliningLog().addDecision(scope.getInvoke(), true, "GraphBuilderPhase", null, null, "compilation root"); + if (logInliningDecision) { + graph.getInliningLog().addDecision(logInliningInvokable, true, "GraphBuilderPhase", null, null, "compilation root"); } return true; } else { if (intrinsic.getOriginalMethod().isNative()) { printInlining(targetMethod, inlinedMethod, false, "native method (bytecode parsing)"); - if (scope != null) { - graph.getInliningLog().addDecision(scope.getInvoke(), false, "GraphBuilderPhase", null, null, "native method"); + if (logInliningDecision) { + graph.getInliningLog().addDecision(logInliningInvokable, false, "GraphBuilderPhase", null, null, "native method"); } return false; } @@ -2474,16 +2469,16 @@ public class BytecodeParser implements GraphBuilderContext { // intrinsic method (see FrameStateBuilder.create(int bci)). notifyBeforeInline(inlinedMethod); printInlining(targetMethod, inlinedMethod, true, "partial intrinsic exit (bytecode parsing)"); - if (scope != null) { - graph.getInliningLog().addDecision(scope.getInvoke(), true, "GraphBuilderPhase", null, null, "partial intrinsic exit"); + if (logInliningDecision) { + graph.getInliningLog().addDecision(logInliningInvokable, true, "GraphBuilderPhase", null, null, "partial intrinsic exit"); } parseAndInlineCallee(intrinsic.getOriginalMethod(), args, null); notifyAfterInline(inlinedMethod); return true; } else { printInlining(targetMethod, inlinedMethod, false, "partial intrinsic exit (bytecode parsing)"); - if (scope != null) { - graph.getInliningLog().addDecision(scope.getInvoke(), false, "GraphBuilderPhase", null, null, "partial intrinsic exit"); + if (logInliningDecision) { + graph.getInliningLog().addDecision(logInliningInvokable, false, "GraphBuilderPhase", null, null, "partial intrinsic exit"); } return false; } @@ -2497,15 +2492,15 @@ public class BytecodeParser implements GraphBuilderContext { if (inlinedMethod.hasBytecodes()) { notifyBeforeInline(inlinedMethod); printInlining(targetMethod, inlinedMethod, true, "inline method (bytecode parsing)"); - if (scope != null) { - graph.getInliningLog().addDecision(scope.getInvoke(), true, "GraphBuilderPhase", null, null, "inline method"); + if (logInliningDecision) { + graph.getInliningLog().addDecision(logInliningInvokable, true, "GraphBuilderPhase", null, null, "inline method"); } parseAndInlineCallee(inlinedMethod, args, intrinsic); notifyAfterInline(inlinedMethod); } else { printInlining(targetMethod, inlinedMethod, false, "no bytecodes (abstract or native) (bytecode parsing)"); - if (scope != null) { - graph.getInliningLog().addDecision(scope.getInvoke(), false, "GraphBuilderPhase", null, null, "no bytecodes (abstract or native)"); + if (logInliningDecision) { + graph.getInliningLog().addDecision(logInliningInvokable, false, "GraphBuilderPhase", null, null, "no bytecodes (abstract or native)"); } return false; } @@ -2531,6 +2526,7 @@ public class BytecodeParser implements GraphBuilderContext { * intrinsic) can be inlined. */ protected boolean canInlinePartialIntrinsicExit() { + assert !IS_IN_NATIVE_IMAGE; return InlinePartialIntrinsicExitDuringParsing.getValue(options) && !IS_BUILDING_NATIVE_IMAGE && method.getAnnotation(Snippet.class) == null; } @@ -2595,7 +2591,7 @@ public class BytecodeParser implements GraphBuilderContext { : (calleeIntrinsicContext != null ? new IntrinsicScope(this, targetMethod, args) : new InliningScope(this, targetMethod, args))) { BytecodeParser parser = graphBuilderInstance.createBytecodeParser(graph, this, targetMethod, INVOCATION_ENTRY_BCI, calleeIntrinsicContext); - boolean targetIsSubstitution = targetMethod.isAnnotationPresent(MethodSubstitution.class); + boolean targetIsSubstitution = parsingIntrinsic(); FrameStateBuilder startFrameState = new FrameStateBuilder(parser, parser.code, graph, graphBuilderConfig.retainLocalVariables() && !targetIsSubstitution); if (!targetMethod.isStatic()) { args[0] = nullCheckedValue(args[0]); @@ -2717,7 +2713,9 @@ public class BytecodeParser implements GraphBuilderContext { // without a return value on the top of stack. assert stateSplit instanceof Invoke; ResolvedJavaMethod targetMethod = ((Invoke) stateSplit).getTargetMethod(); - assert targetMethod != null && (targetMethod.getAnnotation(Fold.class) != null || targetMethod.getAnnotation(Node.NodeIntrinsic.class) != null); + if (!IS_IN_NATIVE_IMAGE) { + assert targetMethod != null && (targetMethod.getAnnotation(Fold.class) != null || targetMethod.getAnnotation(Node.NodeIntrinsic.class) != null); + } state = new FrameState(BytecodeFrame.AFTER_BCI); } else { state = new FrameState(BytecodeFrame.AFTER_BCI, returnVal); @@ -2777,7 +2775,9 @@ public class BytecodeParser implements GraphBuilderContext { ValueNode receiver = graph.start().stateAfter().localAt(0); assert receiver != null && receiver.getStackKind() == JavaKind.Object; if (RegisterFinalizerNode.mayHaveFinalizer(receiver, graph.getAssumptions())) { - append(new RegisterFinalizerNode(receiver)); + RegisterFinalizerNode regFin = new RegisterFinalizerNode(receiver); + append(regFin); + regFin.setStateAfter(graph.start().stateAfter()); } } genInfoPointNode(InfopointReason.METHOD_END, x); @@ -2801,8 +2801,9 @@ public class BytecodeParser implements GraphBuilderContext { protected void genMonitorEnter(ValueNode x, int bci) { MonitorIdNode monitorId = graph.add(new MonitorIdNode(frameState.lockDepth(true))); - MonitorEnterNode monitorEnter = append(createMonitorEnterNode(x, monitorId)); - frameState.pushLock(x, monitorId); + ValueNode object = maybeEmitExplicitNullCheck(x); + MonitorEnterNode monitorEnter = append(createMonitorEnterNode(object, monitorId)); + frameState.pushLock(object, monitorId); monitorEnter.setStateAfter(createFrameState(bci, monitorEnter)); } @@ -2922,12 +2923,25 @@ public class BytecodeParser implements GraphBuilderContext { FixedWithNextNode fixedWithNextNode = (FixedWithNextNode) fixedNode; assert fixedWithNextNode.next() == null : "cannot append instruction to instruction which isn't end"; lastInstr = fixedWithNextNode; + } else if (fixedNode instanceof WithExceptionNode) { + lastInstr = updateWithExceptionNode((WithExceptionNode) fixedNode); } else { lastInstr = null; } } } + private AbstractBeginNode updateWithExceptionNode(WithExceptionNode withExceptionNode) { + if (withExceptionNode.exceptionEdge() == null) { + AbstractBeginNode exceptionEdge = handleException(null, bci(), false); + withExceptionNode.setExceptionEdge(exceptionEdge); + } + assert withExceptionNode.next() == null : "new WithExceptionNode with existing next"; + AbstractBeginNode nextBegin = graph.add(withExceptionNode.createNextBegin()); + withExceptionNode.setNext(nextBegin); + return nextBegin; + } + private Target checkLoopExit(Target target, BciBlock targetBlock) { if (currentBlock != null) { long exits = currentBlock.loops & ~targetBlock.loops; @@ -4331,22 +4345,36 @@ public class BytecodeParser implements GraphBuilderContext { if (intrinsicContext != null) { constantPool.loadReferencedType(cpi, bytecode); } else if (graphBuilderConfig.eagerResolving()) { - /* - * Since we're potentially triggering class initialization here, we need synchronization - * to mitigate the potential for class initialization related deadlock being caused by - * the compiler (e.g., https://github.com/graalvm/graal-core/pull/232/files#r90788550). - */ - synchronized (BytecodeParser.class) { - ClassInitializationPlugin classInitializationPlugin = graphBuilderConfig.getPlugins().getClassInitializationPlugin(); - if (classInitializationPlugin != null) { - classInitializationPlugin.loadReferencedType(this, constantPool, cpi, bytecode); - } else { - constantPool.loadReferencedType(cpi, bytecode); + Object lock = loadReferenceTypeLock(); + if (lock != null) { + synchronized (lock) { + loadReferenceType(cpi, bytecode); } + } else { + loadReferenceType(cpi, bytecode); } } } + /** + * Gets the object to lock when resolving and initializing a type referenced by a constant pool + * entry. + * + * @return {@code null} if no synchronization is necessary + */ + protected Object loadReferenceTypeLock() { + return BytecodeParser.class; + } + + private void loadReferenceType(int cpi, int bytecode) { + ClassInitializationPlugin classInitializationPlugin = graphBuilderConfig.getPlugins().getClassInitializationPlugin(); + if (classInitializationPlugin != null) { + classInitializationPlugin.loadReferencedType(this, constantPool, cpi, bytecode); + } else { + constantPool.loadReferencedType(cpi, bytecode); + } + } + protected JavaType maybeEagerlyResolve(JavaType type, ResolvedJavaType accessingClass) { if (graphBuilderConfig.eagerResolving() || parsingIntrinsic()) { return type.resolve(accessingClass); @@ -4544,7 +4572,7 @@ public class BytecodeParser implements GraphBuilderContext { } } - frameState.push(JavaKind.Object, append(createNewInstance(resolvedType, true))); + frameState.push(JavaKind.Object, append(new NewInstanceNode(resolvedType, true))); } /** @@ -4587,7 +4615,7 @@ public class BytecodeParser implements GraphBuilderContext { } } - frameState.push(JavaKind.Object, append(createNewArray(elementType, length, true))); + frameState.push(JavaKind.Object, append(new NewArrayNode(elementType, length, true))); } private void genNewObjectArray(int cpi) { @@ -4618,7 +4646,7 @@ public class BytecodeParser implements GraphBuilderContext { } } - frameState.push(JavaKind.Object, append(createNewArray(resolvedType, length, true))); + frameState.push(JavaKind.Object, append(new NewArrayNode(resolvedType, length, true))); } private void genNewMultiArray(int cpi) { @@ -4656,7 +4684,7 @@ public class BytecodeParser implements GraphBuilderContext { } } - frameState.push(JavaKind.Object, append(createNewMultiArray(resolvedType, dims))); + frameState.push(JavaKind.Object, append(new NewMultiArrayNode(resolvedType, dims))); } protected void genGetField(int cpi, int opcode) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/FrameStateBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/FrameStateBuilder.java index 4b8831a9843..f374b2275ee 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/FrameStateBuilder.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/FrameStateBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -275,6 +275,11 @@ public final class FrameStateBuilder implements SideEffectsState { monitorIds = other.monitorIds.length == 0 ? other.monitorIds : other.monitorIds.clone(); assert lockedObjects.length == monitorIds.length; + + if (other.sideEffects != null) { + sideEffects = new ArrayList<>(); + sideEffects.addAll(other.sideEffects); + } } private static ValueNode[] allocateArray(int length) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/LambdaUtils.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/LambdaUtils.java index 33317ce3df9..ce208d7b074 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/LambdaUtils.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/LambdaUtils.java @@ -49,7 +49,7 @@ import jdk.vm.ci.meta.ResolvedJavaMethod; import jdk.vm.ci.meta.ResolvedJavaType; public final class LambdaUtils { - private static final Pattern LAMBDA_PATTERN = Pattern.compile("\\$\\$Lambda\\$\\d+/[^/]+;"); + private static final Pattern LAMBDA_PATTERN = Pattern.compile("\\$\\$Lambda\\$\\d+[/\\.][^/]+;"); private static final char[] HEX = "0123456789abcdef".toCharArray(); private static GraphBuilderConfiguration buildLambdaParserConfig(ClassInitializationPlugin cip) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/SwitchHashTableTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/SwitchHashTableTest.java index d1fdf62284a..8ad63b35ea1 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/SwitchHashTableTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/SwitchHashTableTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, 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 @@ -24,37 +24,15 @@ package org.graalvm.compiler.jtt.optimize; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Random; -import java.util.Set; -import java.util.stream.Collectors; - import org.graalvm.compiler.jtt.JTTTest; -import org.graalvm.compiler.lir.hashing.HashFunction; -import org.graalvm.compiler.lir.hashing.Hasher; import org.junit.Test; -import jdk.vm.ci.meta.JavaConstant; - /* * Tests optimization of hash table switches. * Code generated by `SwitchHashTableTest.TestGenerator.main` */ public class SwitchHashTableTest extends JTTTest { - @Test - public void checkHashFunctionInstances() { - List coveredByTestCases = Arrays.asList("val >> min", "val", "val >> (val & min)", "(val >> min) ^ val", "val - min", "rotateRight(val, prime)", "rotateRight(val, prime) ^ val", - "rotateRight(val, prime) + val", "(val >> min) * val", "(val * prime) >> min"); - Set functions = HashFunction.instances().stream().map(Object::toString).collect(Collectors.toSet()); - functions.removeAll(coveredByTestCases); - assertTrue("The following hash functions are not covered by the `Switch03` test: " + functions + - ". Re-run the `Switch03.TestGenerator.main` and update the test class.", functions.isEmpty()); - } - // Hasher[function=rotateRight(val, prime), effort=4, cardinality=16] public static int test1(int arg) { switch (arg) { case 3080012: @@ -103,7 +81,6 @@ public class SwitchHashTableTest extends JTTTest { runTest("test1", 3080013); // miss } - // Hasher[function=rotateRight(val, prime) ^ val, effort=5, cardinality=28] public static int test2(int arg) { switch (arg) { case 718707335: @@ -152,7 +129,6 @@ public class SwitchHashTableTest extends JTTTest { runTest("test2", 718707337); // miss } - // Hasher[function=(val * prime) >> min, effort=4, cardinality=16] public static int test3(int arg) { switch (arg) { case 880488712: @@ -201,7 +177,6 @@ public class SwitchHashTableTest extends JTTTest { runTest("test3", 880488713); // miss } - // Hasher[function=rotateRight(val, prime) + val, effort=5, cardinality=28] public static int test4(int arg) { switch (arg) { case 189404658: @@ -250,7 +225,6 @@ public class SwitchHashTableTest extends JTTTest { runTest("test4", 189404659); // miss } - // Hasher[function=val - min, effort=2, cardinality=24] public static int test5(int arg) { switch (arg) { case 527674226: @@ -299,7 +273,6 @@ public class SwitchHashTableTest extends JTTTest { runTest("test5", 527674227); // miss } - // Hasher[function=val, effort=1, cardinality=24] public static int test6(int arg) { switch (arg) { case 676979121: @@ -348,7 +321,6 @@ public class SwitchHashTableTest extends JTTTest { runTest("test6", 676979122); // miss } - // Hasher[function=(val >> min) ^ val, effort=3, cardinality=16] public static int test7(int arg) { switch (arg) { case 634218696: @@ -397,7 +369,6 @@ public class SwitchHashTableTest extends JTTTest { runTest("test7", 634218697); // miss } - // Hasher[function=val >> min, effort=2, cardinality=16] public static int test8(int arg) { switch (arg) { case 473982403: @@ -446,7 +417,6 @@ public class SwitchHashTableTest extends JTTTest { runTest("test8", 473982404); // miss } - // Hasher[function=val >> (val & min), effort=3, cardinality=16] public static int test9(int arg) { switch (arg) { case 15745090: @@ -495,7 +465,6 @@ public class SwitchHashTableTest extends JTTTest { runTest("test9", 15745091); // miss } - // Hasher[function=(val >> min) * val, effort=4, cardinality=28] public static int test10(int arg) { switch (arg) { case 989358996: @@ -543,93 +512,4 @@ public class SwitchHashTableTest extends JTTTest { runTest("test10", 989359109); // above runTest("test10", 989358997); // miss } - - public static class TestGenerator { - - private static int nextId = 0; - private static final int size = 15; - private static double minDensity = 0.5; - - // test code generator - public static void main(String[] args) { - - Random r = new Random(0); - Set seen = new HashSet<>(); - Set all = HashFunction.instances().stream().map(Object::toString).collect(Collectors.toSet()); - - println("@Test"); - println("public void checkHashFunctionInstances() {"); - println(" List coveredByTestCases = Arrays.asList(" + String.join(", ", all.stream().map(s -> "\"" + s + "\"").collect(Collectors.toSet())) + ");"); - println(" Set functions = HashFunction.instances().stream().map(Object::toString).collect(Collectors.toSet());"); - println(" functions.removeAll(coveredByTestCases);"); - println(" assertTrue(\"The following hash functions are not covered by the `Switch03` test: \" + functions +"); - println(" \". Re-run the `Switch03.TestGenerator.main` and update the test class.\", functions.isEmpty());"); - println("}"); - - while (seen.size() < all.size()) { - int v = r.nextInt(Integer.MAX_VALUE / 2); - List keys = new ArrayList<>(); - while (keys.size() < 15) { - keys.add(v); - v += r.nextInt(15); - } - keys.sort(Integer::compare); - double density = ((double) keys.size() + 1) / (keys.get(keys.size() - 1) - keys.get(0)); - if (density < minDensity) { - Hasher.forKeys(toConstants(keys), minDensity).ifPresent(h -> { - String f = h.function().toString(); - if (!seen.contains(f)) { - gen(keys, h); - seen.add(f); - } - }); - } - } - } - - private static void gen(List keys, Hasher hasher) { - int id = ++nextId; - - println("// " + hasher + ""); - println("public static int test" + id + "(int arg) {"); - println(" switch (arg) {"); - - for (Integer key : keys) { - println(" case " + key + ": return " + key + ";"); - } - - println(" default: return -1;"); - println(" }"); - println("}"); - - int miss = keys.get(0) + 1; - while (keys.contains(miss)) { - miss++; - } - - println("@Test"); - println("public void run" + id + "() throws Throwable {"); - println(" runTest(\"test" + id + "\", 0); // zero "); - println(" runTest(\"test" + id + "\", " + (keys.get(0) - 1) + "); // bellow "); - println(" runTest(\"test" + id + "\", " + keys.get(0) + "); // first "); - println(" runTest(\"test" + id + "\", " + keys.get(size / 2) + "); // middle "); - println(" runTest(\"test" + id + "\", " + keys.get(size - 1) + "); // last "); - println(" runTest(\"test" + id + "\", " + (keys.get(size - 1) + 1) + "); // above "); - println(" runTest(\"test" + id + "\", " + miss + "); // miss "); - println("}"); - } - - private static void println(String s) { - System.out.println(s); - } - - private static JavaConstant[] toConstants(List keys) { - JavaConstant[] ckeys = new JavaConstant[keys.size()]; - - for (int i = 0; i < keys.size(); i++) { - ckeys[i] = JavaConstant.forInt(keys.get(i)); - } - return ckeys; - } - } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticOp.java index 2e676757a8c..dd680e514e7 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticOp.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticOp.java @@ -461,8 +461,9 @@ public enum AArch64ArithmeticOp { } } - public static class ExtendedAddShiftOp extends AArch64LIRInstruction { - private static final LIRInstructionClass TYPE = LIRInstructionClass.create(ExtendedAddShiftOp.class); + public static class ExtendedAddSubShiftOp extends AArch64LIRInstruction { + private static final LIRInstructionClass TYPE = LIRInstructionClass.create(ExtendedAddSubShiftOp.class); + @Opcode private final AArch64ArithmeticOp op; @Def(REG) protected AllocatableValue result; @Use(REG) protected AllocatableValue src1; @Use(REG) protected AllocatableValue src2; @@ -475,8 +476,9 @@ public enum AArch64ArithmeticOp { * @param extendType defines how src2 is extended to the same size as src1. * @param shiftAmt must be in range 0 to 4. */ - public ExtendedAddShiftOp(AllocatableValue result, AllocatableValue src1, AllocatableValue src2, AArch64Assembler.ExtendType extendType, int shiftAmt) { + public ExtendedAddSubShiftOp(AArch64ArithmeticOp op, AllocatableValue result, AllocatableValue src1, AllocatableValue src2, AArch64Assembler.ExtendType extendType, int shiftAmt) { super(TYPE); + this.op = op; this.result = result; this.src1 = src1; this.src2 = src2; @@ -487,7 +489,16 @@ public enum AArch64ArithmeticOp { @Override public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) { int size = result.getPlatformKind().getSizeInBytes() * Byte.SIZE; - masm.add(size, asRegister(result), asRegister(src1), asRegister(src2), extendType, shiftAmt); + switch (op) { + case ADD: + masm.add(size, asRegister(result), asRegister(src1), asRegister(src2), extendType, shiftAmt); + break; + case SUB: + masm.sub(size, asRegister(result), asRegister(src1), asRegister(src2), extendType, shiftAmt); + break; + default: + throw GraalError.shouldNotReachHere(); + } } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Move.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Move.java index 07c3b282f35..b52745ffcc0 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Move.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Move.java @@ -307,6 +307,45 @@ public class AArch64Move { } } + public static final class VolatileLoadOp extends AArch64LIRInstruction { + public static final LIRInstructionClass TYPE = LIRInstructionClass.create(VolatileLoadOp.class); + protected final AArch64Kind kind; + @State protected LIRFrameState state; + @Def protected AllocatableValue result; + @Use protected AllocatableValue address; + + public VolatileLoadOp(AArch64Kind kind, AllocatableValue result, AllocatableValue address, LIRFrameState state) { + super(TYPE); + this.kind = kind; + this.result = result; + this.address = address; + this.state = state; + if (state != null) { + throw GraalError.shouldNotReachHere("Can't handle implicit null check"); + } + } + + @Override + protected void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) { + int srcSize = kind.getSizeInBytes() * Byte.SIZE; + int destSize = result.getPlatformKind().getSizeInBytes() * Byte.SIZE; + if (kind.isInteger()) { + masm.ldar(srcSize, asRegister(result), asRegister(address)); + } else { + assert srcSize == destSize; + try (ScratchRegister r1 = masm.getScratchRegister()) { + Register rscratch1 = r1.getRegister(); + masm.ldar(srcSize, rscratch1, asRegister(address)); + masm.fmov(destSize, asRegister(result), rscratch1); + } + } + } + + public AArch64Kind getKind() { + return kind; + } + } + public static class StoreOp extends MemOp { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(StoreOp.class); @Use protected AllocatableValue input; @@ -341,6 +380,43 @@ public class AArch64Move { } } + public static class VolatileStoreOp extends AArch64LIRInstruction { + public static final LIRInstructionClass TYPE = LIRInstructionClass.create(VolatileStoreOp.class); + protected final AArch64Kind kind; + @State protected LIRFrameState state; + @Use protected AllocatableValue input; + @Use protected AllocatableValue address; + + public VolatileStoreOp(AArch64Kind kind, AllocatableValue address, AllocatableValue input, LIRFrameState state) { + super(TYPE); + this.kind = kind; + this.address = address; + this.input = input; + this.state = state; + if (state != null) { + throw GraalError.shouldNotReachHere("Can't handle implicit null check"); + } + } + + @Override + protected void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) { + int destSize = kind.getSizeInBytes() * Byte.SIZE; + if (kind.isInteger()) { + masm.stlr(destSize, asRegister(input), asRegister(address)); + } else { + try (ScratchRegister r1 = masm.getScratchRegister()) { + Register rscratch1 = r1.getRegister(); + masm.fmov(destSize, rscratch1, asRegister(input)); + masm.stlr(destSize, rscratch1, asRegister(address)); + } + } + } + + public AArch64Kind getKind() { + return kind; + } + } + public static final class NullCheckOp extends AArch64LIRInstruction implements NullCheck { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(NullCheckOp.class); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64SpeculativeBarrier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64SpeculativeBarrier.java index 88cd8d76546..3e5c5fc6ba5 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64SpeculativeBarrier.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64SpeculativeBarrier.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -38,6 +38,6 @@ public class AArch64SpeculativeBarrier extends AArch64LIRInstruction { @Override protected void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) { - masm.csdb(); + masm.fullSystemBarrier(); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ControlFlow.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ControlFlow.java index e31e1a5519c..680444e121f 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ControlFlow.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ControlFlow.java @@ -555,25 +555,39 @@ public class AMD64ControlFlow { public static final class FloatBranchOp extends BranchOp { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(FloatBranchOp.class); protected boolean unorderedIsTrue; + protected boolean isSelfEqualsCheck; public FloatBranchOp(Condition condition, boolean unorderedIsTrue, LabelRef trueDestination, LabelRef falseDestination, double trueDestinationProbability) { + this(condition, unorderedIsTrue, trueDestination, falseDestination, trueDestinationProbability, false); + } + + public FloatBranchOp(Condition condition, boolean unorderedIsTrue, LabelRef trueDestination, LabelRef falseDestination, double trueDestinationProbability, boolean isSelfEqualsCheck) { super(TYPE, floatCond(condition), trueDestination, falseDestination, trueDestinationProbability); this.unorderedIsTrue = unorderedIsTrue; + this.isSelfEqualsCheck = isSelfEqualsCheck; } @Override protected void jcc(AMD64MacroAssembler masm, boolean negate, LabelRef target) { - ConditionFlag condition1 = negate ? condition.negate() : condition; - boolean unorderedIsTrue1 = negate ? !unorderedIsTrue : unorderedIsTrue; Label label = target.label(); Label endLabel = new Label(); - if (unorderedIsTrue1 && !trueOnUnordered(condition1)) { - masm.jcc(ConditionFlag.Parity, label); - } else if (!unorderedIsTrue1 && trueOnUnordered(condition1)) { - masm.jccb(ConditionFlag.Parity, endLabel); + if (isSelfEqualsCheck) { + // The condition is x == x, i.e., !isNaN(x). + assert !unorderedIsTrue; + ConditionFlag notNaN = negate ? ConditionFlag.Parity : ConditionFlag.NoParity; + masm.jcc(notNaN, label); + masm.bind(endLabel); + } else { + ConditionFlag condition1 = negate ? condition.negate() : condition; + boolean unorderedIsTrue1 = negate ? !unorderedIsTrue : unorderedIsTrue; + if (unorderedIsTrue1 && !trueOnUnordered(condition1)) { + masm.jcc(ConditionFlag.Parity, label); + } else if (!unorderedIsTrue1 && trueOnUnordered(condition1)) { + masm.jccb(ConditionFlag.Parity, endLabel); + } + masm.jcc(condition1, label); + masm.bind(endLabel); } - masm.jcc(condition1, label); - masm.bind(endLabel); } } @@ -786,11 +800,13 @@ public class AMD64ControlFlow { masm.jmp(scratchReg); // Inserting padding so that jump the table address is aligned + int entrySize; if (defaultTarget != null) { - masm.align(8); + entrySize = 8; } else { - masm.align(4); + entrySize = 4; } + masm.align(entrySize); // Patch LEA instruction above now that we know the position of the jump table // this is ugly but there is no better way to do this given the assembler API @@ -818,7 +834,7 @@ public class AMD64ControlFlow { } } - JumpTable jt = new JumpTable(jumpTablePos, keys[0].asInt(), keys[keys.length - 1].asInt(), 4); + JumpTable jt = new JumpTable(jumpTablePos, keys[0].asInt(), keys[keys.length - 1].asInt(), entrySize); crb.compilationResult.addAnnotation(jt); } } @@ -877,7 +893,7 @@ public class AMD64ControlFlow { @Override public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) { - cmove(crb, masm, result, false, condition, false, trueValue, falseValue); + cmove(crb, masm, result, false, condition, false, trueValue, falseValue, false); } } @@ -889,31 +905,35 @@ public class AMD64ControlFlow { @Alive({REG}) protected Value falseValue; private final ConditionFlag condition; private final boolean unorderedIsTrue; + private final boolean isSelfEqualsCheck; - public FloatCondMoveOp(Variable result, Condition condition, boolean unorderedIsTrue, Variable trueValue, Variable falseValue) { + public FloatCondMoveOp(Variable result, Condition condition, boolean unorderedIsTrue, Variable trueValue, Variable falseValue, boolean isSelfEqualsCheck) { super(TYPE); this.result = result; this.condition = floatCond(condition); this.unorderedIsTrue = unorderedIsTrue; this.trueValue = trueValue; this.falseValue = falseValue; + this.isSelfEqualsCheck = isSelfEqualsCheck; } @Override public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) { - cmove(crb, masm, result, true, condition, unorderedIsTrue, trueValue, falseValue); + cmove(crb, masm, result, true, condition, unorderedIsTrue, trueValue, falseValue, isSelfEqualsCheck); } } private static void cmove(CompilationResultBuilder crb, AMD64MacroAssembler masm, Value result, boolean isFloat, ConditionFlag condition, boolean unorderedIsTrue, Value trueValue, - Value falseValue) { + Value falseValue, boolean isSelfEqualsCheck) { // check that we don't overwrite an input operand before it is used. assert !result.equals(trueValue); + // The isSelfEqualsCheck condition is x == x, i.e., !isNaN(x). + ConditionFlag moveCondition = (isSelfEqualsCheck ? ConditionFlag.NoParity : condition); AMD64Move.move(crb, masm, result, falseValue); - cmove(crb, masm, result, condition, trueValue); + cmove(crb, masm, result, moveCondition, trueValue); - if (isFloat) { + if (isFloat && !isSelfEqualsCheck) { if (unorderedIsTrue && !trueOnUnordered(condition)) { cmove(crb, masm, result, ConditionFlag.Parity, trueValue); } else if (!unorderedIsTrue && trueOnUnordered(condition)) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Move.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Move.java index 64dbf927af6..7ce3e033a4b 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Move.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Move.java @@ -615,6 +615,9 @@ public class AMD64Move { case DOUBLE: masm.movsd(dest, input); break; + case V128_QWORD: + masm.movdqu(dest, input); + break; default: throw GraalError.shouldNotReachHere("kind=" + kind + " input=" + input + " result=" + result); } @@ -641,6 +644,9 @@ public class AMD64Move { case DOUBLE: masm.movdbl(result, src); break; + case V128_QWORD: + masm.movdqu(result, src); + break; default: throw GraalError.shouldNotReachHere("kind=" + kind + " input=" + input + " result=" + result); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIR.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIR.java index cba33b23eca..1ccf988a995 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIR.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIR.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020, 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 diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScan.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScan.java index 51dc475e396..3a3b717bbde 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScan.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScan.java @@ -211,6 +211,22 @@ public class LinearScan { this.detailedAsserts = Assertions.detailedAssertionsEnabled(ir.getOptions()); } + /** + * Compute the variable number of the given operand. + * + * @param operand + * @return the variable number of the supplied operand or {@code -1} if the supplied operand + * describes a register + */ + public int getVariableNumber(int operand) { + // check if its a variable + if (operand >= firstVariableNumber) { + return operand - firstVariableNumber; + } + // register case + return -1; + } + public LIRGenerationResult getLIRGenerationResult() { return res; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanAllocationPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanAllocationPhase.java index 8187f0874ba..6f11d6f6f21 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanAllocationPhase.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanAllocationPhase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, 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 @@ -25,8 +25,9 @@ package org.graalvm.compiler.lir.alloc.lsra; import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.DebugContext.CompilerPhaseScope; import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import static org.graalvm.compiler.lir.phases.AllocationPhase.AllocationContext; +import org.graalvm.compiler.lir.phases.AllocationPhase.AllocationContext; import org.graalvm.compiler.lir.phases.LIRPhase; import jdk.vm.ci.code.TargetDescription; @@ -49,11 +50,12 @@ abstract class LinearScanAllocationPhase { @SuppressWarnings("try") public final void apply(TargetDescription target, LIRGenerationResult lirGenRes, AllocationContext context, boolean dumpLIR) { DebugContext debug = lirGenRes.getLIR().getDebug(); - try (DebugContext.Scope s = debug.scope(getName(), this)) { + CharSequence name = getName(); + try (DebugContext.Scope s = debug.scope(name, this); CompilerPhaseScope cps = debug.enterCompilerPhase(name);) { run(target, lirGenRes, context); if (dumpLIR) { if (debug.isDumpEnabled(DebugContext.VERBOSE_LEVEL)) { - debug.dump(DebugContext.VERBOSE_LEVEL, lirGenRes.getLIR(), "After %s", getName()); + debug.dump(DebugContext.VERBOSE_LEVEL, lirGenRes.getLIR(), "After %s", name); } } } catch (Throwable e) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java index cba3fbfa37d..0159130349c 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -61,6 +61,7 @@ import org.graalvm.compiler.lir.alloc.lsra.Interval.SpillState; import org.graalvm.compiler.lir.alloc.lsra.LinearScan.BlockData; import org.graalvm.compiler.lir.gen.LIRGenerationResult; import org.graalvm.compiler.lir.phases.AllocationPhase.AllocationContext; +import org.graalvm.compiler.lir.util.IndexedValueMap; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.RegisterArray; @@ -71,7 +72,6 @@ import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.Value; import jdk.vm.ci.meta.ValueKind; -import org.graalvm.compiler.lir.util.IndexedValueMap; public class LinearScanLifetimeAnalysisPhase extends LinearScanAllocationPhase { @@ -160,8 +160,17 @@ public class LinearScanLifetimeAnalysisPhase extends LinearScanAllocationPhase { @SuppressWarnings("try") void computeLocalLiveSets() { int liveSize = allocator.liveSetSize(); - - intervalInLoop = new BitMap2D(allocator.operandSize(), allocator.numLoops()); + int variables = allocator.operandSize(); + int loops = allocator.numLoops(); + long nBits = (long) variables * loops; + try { + if (nBits > Integer.MAX_VALUE) { + throw new OutOfMemoryError(); + } + intervalInLoop = new BitMap2D(variables, loops); + } catch (OutOfMemoryError e) { + throw new PermanentBailoutException(e, "Cannot handle %d variables in %d loops", variables, loops); + } try { final BitSet liveGenScratch = new BitSet(liveSize); @@ -390,8 +399,22 @@ public class LinearScanLifetimeAnalysisPhase extends LinearScanAllocationPhase { if (Assertions.detailedAssertionsEnabled(allocator.getOptions())) { reportFailure(numBlocks); } + BitSet bs = allocator.getBlockData(startBlock).liveIn; + StringBuilder sb = new StringBuilder(); + for (int i = bs.nextSetBit(0); i >= 0; i = bs.nextSetBit(i + 1)) { + int variableNumber = allocator.getVariableNumber(i); + if (variableNumber >= 0) { + sb.append("v").append(variableNumber); + } else { + sb.append(allocator.getRegisters().get(i)); + } + sb.append(System.lineSeparator()); + if (i == Integer.MAX_VALUE) { + break; + } + } // bailout if this occurs in product mode. - throw new GraalError("liveIn set of first block must be empty: " + allocator.getBlockData(startBlock).liveIn); + throw new GraalError("liveIn set of first block must be empty: " + allocator.getBlockData(startBlock).liveIn + " Live operands:" + sb.toString()); } } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/CompilationResultBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/CompilationResultBuilder.java index acf00a14fbc..2cd5e238353 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/CompilationResultBuilder.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/CompilationResultBuilder.java @@ -70,11 +70,11 @@ import jdk.vm.ci.code.DebugInfo; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.StackSlot; import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.code.site.Call; import jdk.vm.ci.code.site.ConstantReference; import jdk.vm.ci.code.site.DataSectionReference; import jdk.vm.ci.code.site.Infopoint; import jdk.vm.ci.code.site.InfopointReason; -import jdk.vm.ci.code.site.Mark; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.InvokeTarget; import jdk.vm.ci.meta.JavaConstant; @@ -246,8 +246,12 @@ public class CompilationResultBuilder { compilationResult.setMaxInterpreterFrameSize(maxInterpreterFrameSize); } - public Mark recordMark(Object id) { - return compilationResult.recordMark(asm.position(), id); + public CompilationResult.CodeMark recordMark(CompilationResult.MarkId id) { + CompilationResult.CodeMark mark = compilationResult.recordMark(asm.position(), id); + if (currentCallContext != null) { + currentCallContext.recordMark(mark); + } + return mark; } public void blockComment(String s) { @@ -308,7 +312,10 @@ public class CompilationResultBuilder { public void recordDirectCall(int posBefore, int posAfter, InvokeTarget callTarget, LIRFrameState info) { DebugInfo debugInfo = info != null ? info.debugInfo() : null; - compilationResult.recordCall(posBefore, posAfter - posBefore, callTarget, debugInfo, true); + Call call = compilationResult.recordCall(posBefore, posAfter - posBefore, callTarget, debugInfo, true); + if (currentCallContext != null) { + currentCallContext.recordCall(call); + } } public void recordIndirectCall(int posBefore, int posAfter, InvokeTarget callTarget, LIRFrameState info) { @@ -688,4 +695,38 @@ public class CompilationResultBuilder { } return false; } + + private CallContext currentCallContext; + + public final class CallContext implements AutoCloseable { + private CompilationResult.CodeMark mark; + private Call call; + + @Override + public void close() { + currentCallContext = null; + compilationResult.recordCallContext(mark, call); + } + + void recordCall(Call c) { + assert this.call == null : "Recording call twice"; + this.call = c; + } + + void recordMark(CompilationResult.CodeMark m) { + assert this.mark == null : "Recording mark twice"; + this.mark = m; + } + } + + public CallContext openCallContext(boolean direct) { + if (currentCallContext != null) { + throw GraalError.shouldNotReachHere("Call context already open"); + } + // Currently only AOT requires call context information and only for direct calls. + if (compilationResult.isImmutablePIC() && direct) { + currentCallContext = new CallContext(); + } + return currentCallContext; + } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/dfa/MarkBasePointersPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/dfa/MarkBasePointersPhase.java index 7077dcfab1f..525202de3e3 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/dfa/MarkBasePointersPhase.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/dfa/MarkBasePointersPhase.java @@ -24,6 +24,11 @@ package org.graalvm.compiler.lir.dfa; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + import org.graalvm.compiler.core.common.LIRKind; import org.graalvm.compiler.lir.LIR; import org.graalvm.compiler.lir.LIRFrameState; @@ -39,11 +44,6 @@ import jdk.vm.ci.code.TargetDescription; import jdk.vm.ci.meta.Value; import jdk.vm.ci.meta.ValueKind; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - /** * Record all derived reference base pointers in a frame state. */ @@ -58,16 +58,13 @@ public final class MarkBasePointersPhase extends AllocationPhase { private final class BasePointersSet extends ValueSet { - private final IndexedValueMap variables; private final Map> baseDerivedRefs; BasePointersSet() { - variables = new IndexedValueMap(); baseDerivedRefs = new HashMap<>(); } private BasePointersSet(BasePointersSet other) { - variables = new IndexedValueMap(other.variables); // Deep copy. baseDerivedRefs = new HashMap<>(other.baseDerivedRefs.size()); for (Map.Entry> entry : other.baseDerivedRefs.entrySet()) { @@ -97,7 +94,6 @@ public final class MarkBasePointersPhase extends AllocationPhase { public void put(Value v) { Variable base = (Variable) v.getValueKind(LIRKind.class).getDerivedReferenceBase(); assert !base.getValueKind(LIRKind.class).isValue(); - variables.put(base.index, base); Set derivedRefs = baseDerivedRefs.get(base.index); assert verifyDerivedRefs(v, base.index); @@ -112,8 +108,6 @@ public final class MarkBasePointersPhase extends AllocationPhase { @Override public void putAll(BasePointersSet v) { - variables.putAll(v.variables); - for (Map.Entry> entry : v.baseDerivedRefs.entrySet()) { Integer k = entry.getKey(); Set derivedRefsOther = entry.getValue(); @@ -135,7 +129,6 @@ public final class MarkBasePointersPhase extends AllocationPhase { Set derivedRefs = baseDerivedRefs.get(base.index); // Just mark the base pointer as null if no derived references exist. if (derivedRefs == null) { - variables.put(base.index, null); return; } @@ -143,17 +136,29 @@ public final class MarkBasePointersPhase extends AllocationPhase { if (derivedRefs.contains(v)) { derivedRefs.remove(v); if (derivedRefs.isEmpty()) { - variables.put(base.index, null); baseDerivedRefs.remove(base.index); } } } + private IndexedValueMap getMap() { + IndexedValueMap result = new IndexedValueMap(); + for (Set entry : baseDerivedRefs.values()) { + if (entry.isEmpty()) { + continue; + } + Value v = entry.iterator().next(); + Variable base = (Variable) v.getValueKind(LIRKind.class).getDerivedReferenceBase(); + result.put(base.index, base); + } + return result; + } + @Override public boolean equals(Object obj) { if (obj instanceof Marker.BasePointersSet) { BasePointersSet other = (BasePointersSet) obj; - return variables.equals(other.variables) && baseDerivedRefs.equals(other.baseDerivedRefs); + return baseDerivedRefs.equals(other.baseDerivedRefs); } else { return false; } @@ -167,9 +172,7 @@ public final class MarkBasePointersPhase extends AllocationPhase { @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("[BasePointersSet] variables: "); - sb.append(variables.toString()); - sb.append(" baseDerivedRefs map: {"); + sb.append("[BasePointersSet] baseDerivedRefs map: {"); boolean mapHaveElement = false; for (Map.Entry> entry : baseDerivedRefs.entrySet()) { @@ -216,7 +219,8 @@ public final class MarkBasePointersPhase extends AllocationPhase { @Override protected void processState(LIRInstruction op, LIRFrameState info, BasePointersSet values) { - info.setLiveBasePointers(new IndexedValueMap(values.variables)); + info.setLiveBasePointers(values.getMap()); } + } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/ArithmeticLIRGeneratorTool.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/ArithmeticLIRGeneratorTool.java index 9f05d9ce6d3..181aa333116 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/ArithmeticLIRGeneratorTool.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/ArithmeticLIRGeneratorTool.java @@ -100,8 +100,12 @@ public interface ArithmeticLIRGeneratorTool { Variable emitLoad(LIRKind kind, Value address, LIRFrameState state); + Variable emitVolatileLoad(LIRKind kind, Value address, LIRFrameState state); + void emitStore(ValueKind kind, Value address, Value input, LIRFrameState state); + void emitVolatileStore(ValueKind kind, Value address, Value input, LIRFrameState state); + @SuppressWarnings("unused") default Value emitFusedMultiplyAdd(Value a, Value b, Value c) { throw GraalError.unimplemented("No specialized implementation available"); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGenerator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGenerator.java index b1de4dc7bcc..ee883a7cdf0 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGenerator.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGenerator.java @@ -62,7 +62,7 @@ import org.graalvm.compiler.lir.StandardOp.LabelOp; import org.graalvm.compiler.lir.StandardOp.ZapRegistersOp; import org.graalvm.compiler.lir.SwitchStrategy; import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.hashing.Hasher; +import org.graalvm.compiler.lir.hashing.IntHasher; import org.graalvm.compiler.options.Option; import org.graalvm.compiler.options.OptionKey; import org.graalvm.compiler.options.OptionType; @@ -482,8 +482,8 @@ public abstract class LIRGenerator implements LIRGeneratorTool { int keyCount = keyConstants.length; double minDensity = 1 / Math.sqrt(strategy.getAverageEffort()); - Optional hasher = hasherFor(keyConstants, minDensity); - double hashTableSwitchDensity = hasher.map(h -> keyCount / (double) h.cardinality()).orElse(0d); + Optional hasher = hasherFor(keyConstants, minDensity); + double hashTableSwitchDensity = hasher.map(h -> (double) keyCount / h.cardinality).orElse(0d); // The value range computation below may overflow, so compute it as a long. long valueRange = (long) keyConstants[keyCount - 1].asInt() - (long) keyConstants[0].asInt() + 1; double tableSwitchDensity = keyCount / (double) valueRange; @@ -498,11 +498,10 @@ public abstract class LIRGenerator implements LIRGeneratorTool { emitStrategySwitch(strategy, value, keyTargets, defaultTarget); } else { if (hashTableSwitchDensity > tableSwitchDensity) { - Hasher h = hasher.get(); - int cardinality = h.cardinality(); - LabelRef[] targets = new LabelRef[cardinality]; - JavaConstant[] keys = new JavaConstant[cardinality]; - for (int i = 0; i < cardinality; i++) { + IntHasher h = hasher.get(); + LabelRef[] targets = new LabelRef[h.cardinality]; + JavaConstant[] keys = new JavaConstant[h.cardinality]; + for (int i = 0; i < h.cardinality; i++) { keys[i] = JavaConstant.INT_0; targets[i] = defaultTarget; } @@ -532,12 +531,12 @@ public abstract class LIRGenerator implements LIRGeneratorTool { protected abstract void emitTableSwitch(int lowKey, LabelRef defaultTarget, LabelRef[] targets, Value key); @SuppressWarnings("unused") - protected Optional hasherFor(JavaConstant[] keyConstants, double minDensity) { + protected Optional hasherFor(JavaConstant[] keyConstants, double minDensity) { return Optional.empty(); } @SuppressWarnings("unused") - protected void emitHashTableSwitch(Hasher hasher, JavaConstant[] keys, LabelRef defaultTarget, LabelRef[] targets, Value value) { + protected void emitHashTableSwitch(IntHasher hasher, JavaConstant[] keys, LabelRef defaultTarget, LabelRef[] targets, Value value) { throw new UnsupportedOperationException(getClass().getSimpleName() + " doesn't support hash table switches"); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/hashing/HashFunction.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/hashing/HashFunction.java deleted file mode 100644 index ab45366054c..00000000000 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/hashing/HashFunction.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * Copyright (c) 2018, 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. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -package org.graalvm.compiler.lir.hashing; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.function.BiFunction; -import java.util.function.Function; - -import org.graalvm.compiler.lir.gen.ArithmeticLIRGenerator; - -import jdk.vm.ci.meta.JavaConstant; -import jdk.vm.ci.meta.Value; - -/** - * This class provides a set of cheap imperfect hash functions based on the paper "Improving Switch - * Statement Performance with Hashing Optimized at Compile Time". - * (http://programming.sirrida.de/hashsuper.pdf) - */ -public abstract class HashFunction { - - /** - * Applies the hash function. - * - * @param value the value to be hashed - * @param min {@code value} is guaranteed to be greater or equal to this minimum - * @return the hash value within int range - */ - public abstract int apply(int value, int min); - - /** - * Generates LIR that implements the hash function in terms of value and min. - * - * @param value the value to be hashed - * @param min the lowest key - * @param gen the lir generator - * @return new lir value with the hash function applied - */ - public abstract Value gen(Value value, Value min, ArithmeticLIRGenerator gen); - - /** - * Returns an estimate of number of CPU cycles necessary to apply the hash function. - */ - public abstract int effort(); - - /** - * @return a list of all available hash functions - */ - public static final List instances() { - return Collections.unmodifiableList(instances); - } - - private static List instances = new ArrayList<>(); - - private static int[] mersennePrimes = {3, 7, 31, 127, 8191, 131071, 524287, 2147483647}; - - static { - //@formatter:off - - add("val", 0, - (val, min) -> val, - gen -> (val, min) -> val); - - add("val - min", 1, - (val, min) -> val - min, - gen -> (val, min) -> gen.emitSub(val, min, false)); - - add("val >> min", 1, - (val, min) -> val >> min, - gen -> (val, min) -> gen.emitShr(val, min)); - - add("val >> (val & min)", 2, - (val, min) -> val >> (val & min), - gen -> (val, min) -> gen.emitShr(val, gen.emitAnd(val, min))); - - add("(val >> min) ^ val", 2, - (val, min) -> (val >> min) ^ val, - gen -> (val, min) -> gen.emitXor(gen.emitShr(val, min), val)); - - add("(val >> min) * val", 3, - (val, min) -> (val >> min) * val, - gen -> (val, min) -> gen.emitMul(gen.emitShr(val, min), val, false)); - - addWithPrimes("(val * prime) >> min", 3, - prime -> (val, min) -> (val * prime) >> min, - (gen, prime) -> (val, min) -> gen.emitShr(gen.emitMul(val, prime, false), min)); - - addWithPrimes("rotateRight(val, prime)", 3, - prime -> (val, min) -> Integer.rotateRight(val, prime), - (gen, prime) -> (val, min) -> gen.emitRor(val, prime)); - - addWithPrimes("rotateRight(val, prime) + val", 4, - prime -> (val, min) -> Integer.rotateRight(val, prime) + val, - (gen, prime) -> (val, min) -> gen.emitAdd(gen.emitRor(val, prime), val, false)); - - addWithPrimes("rotateRight(val, prime) ^ val", 4, - prime -> (val, min) -> Integer.rotateRight(val, prime) ^ val, - (gen, prime) -> (val, min) -> gen.emitXor(gen.emitRor(val, prime), val)); - //@formatter:on - } - - private static void add(String toString, int effort, BiFunction f, Function> gen) { - instances.add(new HashFunction() { - - @Override - public int apply(int value, int min) { - return f.apply(value, min); - } - - @Override - public int effort() { - return effort; - } - - @Override - public String toString() { - return toString; - } - - @Override - public Value gen(Value val, Value min, ArithmeticLIRGenerator t) { - return gen.apply(t).apply(t.emitNarrow(val, 32), t.emitNarrow(min, 32)); - } - }); - } - - private static void addWithPrimes(String toString, int effort, Function> f, - BiFunction> gen) { - for (int p : mersennePrimes) { - add(toString, effort, f.apply(p), g -> gen.apply(g, g.getLIRGen().emitJavaConstant(JavaConstant.forInt(p)))); - } - } -} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/hashing/Hasher.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/hashing/Hasher.java deleted file mode 100644 index 960e3a9b1be..00000000000 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/hashing/Hasher.java +++ /dev/null @@ -1,175 +0,0 @@ -/* - * Copyright (c) 2018, 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. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -package org.graalvm.compiler.lir.hashing; - -import java.util.Comparator; -import java.util.HashSet; -import java.util.Optional; -import java.util.Set; -import java.util.TreeSet; - -import jdk.vm.ci.meta.JavaKind; -import org.graalvm.compiler.lir.gen.ArithmeticLIRGenerator; - -import jdk.vm.ci.meta.JavaConstant; -import jdk.vm.ci.meta.Value; - -/** - * This class holds a hash function at a specific cardinality and min value (lowest key). The - * cardinality is the required size of the hash table to make the hasher injective for the provided - * keys. - */ -public final class Hasher { - - /** - * Tries to find a hash function without conflicts for the provided keys. - * - * @param keys the keys - * @param minDensity the minimum density of the switch table. Used to determine the maximum - * cardinality of the hash function - * @return an optional hasher - */ - public static Optional forKeys(JavaConstant[] keys, double minDensity) { - assert checkKeyKind(keys); - if (keys.length <= 2) { - return Optional.empty(); - } else { - int maxCardinality = (int) Math.round(keys.length / minDensity); - assert checkIfSorted(keys); - TreeSet candidates = new TreeSet<>(new Comparator() { - @Override - public int compare(Hasher o1, Hasher o2) { - int d = o1.cardinality - o2.cardinality; - if (d != 0) { - return d; - } else { - return o1.effort() - o2.effort(); - } - } - }); - int min = keys[0].asInt(); - for (HashFunction f : HashFunction.instances()) { - for (int cardinality = keys.length; cardinality < maxCardinality; cardinality++) { - if (isValid(keys, min, f, cardinality)) { - candidates.add(new Hasher(f, cardinality, min)); - break; - } - } - } - if (candidates.isEmpty()) { - return Optional.empty(); - } else { - return Optional.of(candidates.first()); - } - } - } - - private static boolean checkKeyKind(JavaConstant[] keys) { - for (int i = 0; i < keys.length; i++) { - if (keys[i].getJavaKind() != JavaKind.Int) { - throw new AssertionError(String.format("Key at index %d is not an int: %s", i, keys[i])); - } - } - return true; - } - - private static boolean checkIfSorted(JavaConstant[] keys) { - for (int i = 1; i < keys.length; i++) { - if (keys[i - 1].asInt() >= keys[i].asInt()) { - throw new AssertionError("Keys array is not sorted"); - } - } - return true; - } - - private static boolean isValid(JavaConstant[] keys, int min, HashFunction function, int cardinality) { - Set seen = new HashSet<>(keys.length); - for (JavaConstant key : keys) { - int hash = function.apply(key.asInt(), min) & (cardinality - 1); - if (!seen.add(hash)) { - return false; - } - } - return true; - } - - private final HashFunction function; - private final int cardinality; - private final int min; - - private Hasher(HashFunction function, int cardinality, int min) { - this.function = function; - this.cardinality = cardinality; - this.min = min; - } - - /** - * Applies the hash function. - * - * @param value the value to be hashed - * @return the hash value - */ - public int hash(int value) { - return function.apply(value, min) & (cardinality - 1); - } - - /** - * Applies the hash function to a lir value. - * - * @param value the value to be hashed - * @param gen the lir generator - * @return the hashed lir value - */ - public Value hash(Value value, ArithmeticLIRGenerator gen) { - Value h = function.gen(value, gen.getLIRGen().emitJavaConstant(JavaConstant.forInt(min)), gen); - return gen.emitAnd(h, gen.getLIRGen().emitJavaConstant(JavaConstant.forInt(cardinality - 1))); - } - - /** - * @return the hashing effort - */ - public int effort() { - return function.effort() + 1; - } - - /** - * @return the cardinality of the hash function that should match the size of the table switch. - */ - public int cardinality() { - return cardinality; - } - - /** - * @return the hash function - */ - public HashFunction function() { - return function; - } - - @Override - public String toString() { - return "Hasher[function=" + function + ", effort=" + effort() + ", cardinality=" + cardinality + "]"; - } -} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/hashing/IntHasher.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/hashing/IntHasher.java new file mode 100644 index 00000000000..c083bb350a9 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/hashing/IntHasher.java @@ -0,0 +1,140 @@ +/* + * Copyright (c) 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.lir.hashing; + +import java.util.Arrays; +import java.util.Optional; + +/** + * Generates an injective hash function for the provided keys. The cardinality is the next power of + * two of the length of the keys array. The hash can be obtained by calling the `hash` method or + * using: (value * factor) >> shift & (cardinality - 1) If `factor` is 1, it can be omitted. If + * `shift` is 0, it can be omitted. + */ +public final class IntHasher { + + public final int cardinality; + public final short factor; + public final byte shift; + + private IntHasher(int cardinality, short factor, byte shift) { + this.cardinality = cardinality; + this.factor = factor; + this.shift = shift; + } + + // 1 + the first 9999 prime numbers + private static final Short[] factors = new Short[1000]; + + static { + // simple prime number generation + int pos = 0; + short i = 1; + while (pos < factors.length) { + boolean factor = true; + for (int j = 2; j < i; j++) { + // ignore if a previous number + // is a factor + if (i % j == 0) { + factor = false; + break; + } + } + if (factor) { + factors[pos] = i; + pos++; + } + i++; + } + + // prioritize simplifiable factors + Arrays.sort(factors, (a, b) -> { + if (canSimplify(a) && !canSimplify(b)) { + return -1; + } else if (!canSimplify(a) && canSimplify(b)) { + return 1; + } else { + return 0; + } + }); + } + + // returns true if the factor multiplication can be simplified to cheaper operations + private static boolean canSimplify(short factor) { + return isPowerOf2(factor - 1) || isPowerOf2(factor + 1) || isPowerOf2(-factor); + } + + private static boolean isPowerOf2(int n) { + return (n & n - 1) == 0; + } + + private static final double log2 = Math.log(2); + + public static Optional forKeys(int[] keys) { + + int length = keys.length; + + // next power of 2 of keys.length + int cardinality = 1 << ((int) (Math.log(keys.length - 1) / log2)) + 1; + + // number of bits required for the mask + int maskBits = (int) (Math.log(cardinality) / log2 + 1); + + int[] scratch = new int[length]; + boolean[] seen = new boolean[cardinality]; + + for (short factor : factors) { + + // apply factor to keys + for (int i = 0; i < length; i++) { + scratch[i] = keys[i] * factor; + } + + // find a shift that makes the function injective + outer: for (byte shift = 0; shift < Integer.SIZE - maskBits; shift++) { + Arrays.fill(seen, false); + for (int h = 0; h < length; h++) { + int idx = scratch[h] >> shift & (cardinality - 1); + if (!seen[idx]) { + seen[idx] = true; + } else { + continue outer; + } + } + return Optional.of(new IntHasher(cardinality, factor, shift)); + } + } + return Optional.empty(); + } + + public int hash(int value) { + return ((value * factor) >> shift) & (cardinality - 1); + } + + @Override + public String toString() { + return "IntHasher [cardinality=" + cardinality + ", factor=" + factor + ", shift=" + shift + "]"; + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/LIRPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/LIRPhase.java index b19748639e8..541d3d51ded 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/LIRPhase.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/phases/LIRPhase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -28,6 +28,7 @@ import java.util.regex.Pattern; import org.graalvm.compiler.debug.DebugCloseable; import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.DebugContext.CompilerPhaseScope; import org.graalvm.compiler.debug.MemUseTrackerKey; import org.graalvm.compiler.debug.TimerKey; import org.graalvm.compiler.lir.LIR; @@ -112,8 +113,11 @@ public abstract class LIRPhase { @SuppressWarnings("try") public final void apply(TargetDescription target, LIRGenerationResult lirGenRes, C context, boolean dumpLIR) { DebugContext debug = lirGenRes.getLIR().getDebug(); - try (DebugContext.Scope s = debug.scope(getName(), this)) { - try (DebugCloseable a = timer.start(debug); DebugCloseable c = memUseTracker.start(debug)) { + CharSequence name = getName(); + try (DebugContext.Scope s = debug.scope(name, this)) { + try (CompilerPhaseScope cps = debug.enterCompilerPhase(name); + DebugCloseable a = timer.start(debug); + DebugCloseable c = memUseTracker.start(debug)) { run(target, lirGenRes, context); if (dumpLIR && debug.areScopesEnabled()) { dumpAfter(lirGenRes); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/stackslotalloc/StackSlotAllocatorUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/stackslotalloc/StackSlotAllocatorUtil.java index c43b4e3259f..f22f853e868 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/stackslotalloc/StackSlotAllocatorUtil.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/stackslotalloc/StackSlotAllocatorUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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 @@ -40,16 +40,16 @@ public final class StackSlotAllocatorUtil { /** * The number of allocated stack slots. */ - public static CounterKey allocatedSlots = DebugContext.counter("StackSlotAllocator[allocatedSlots]"); + public static final CounterKey allocatedSlots = DebugContext.counter("StackSlotAllocator[allocatedSlots]"); /** * The number of reused stack slots. */ - public static CounterKey reusedSlots = DebugContext.counter("StackSlotAllocator[reusedSlots]"); + public static final CounterKey reusedSlots = DebugContext.counter("StackSlotAllocator[reusedSlots]"); /** * The size (in bytes) required for all allocated stack slots. Note that this number corresponds * to the actual frame size and might include alignment. */ - public static CounterKey allocatedFramesize = DebugContext.counter("StackSlotAllocator[AllocatedFramesize]"); + public static final CounterKey allocatedFramesize = DebugContext.counter("StackSlotAllocator[AllocatedFramesize]"); /** The size (in bytes) required for all virtual stack slots. */ - public static CounterKey virtualFramesize = DebugContext.counter("StackSlotAllocator[VirtualFramesize]"); + public static final CounterKey virtualFramesize = DebugContext.counter("StackSlotAllocator[VirtualFramesize]"); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/ConvertDeoptimizeToGuardPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/ConvertDeoptimizeToGuardPhase.java index 0b1c72b2ff5..b54d77fefe1 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/ConvertDeoptimizeToGuardPhase.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/ConvertDeoptimizeToGuardPhase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -60,11 +60,11 @@ import org.graalvm.compiler.nodes.ValuePhiNode; import org.graalvm.compiler.nodes.calc.CompareNode; import org.graalvm.compiler.nodes.cfg.Block; import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.nodes.spi.LoweringProvider; import org.graalvm.compiler.nodes.util.GraphUtil; import org.graalvm.compiler.phases.BasePhase; import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase; import org.graalvm.compiler.phases.common.LazyValue; +import org.graalvm.compiler.phases.util.Providers; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.DeoptimizationAction; @@ -82,6 +82,9 @@ import jdk.vm.ci.meta.DeoptimizationAction; * */ public class ConvertDeoptimizeToGuardPhase extends BasePhase { + + private static final Providers EMPTY_PROVIDERS = new Providers(null, null, null, null, null, null, null, null, null, null); + @Override @SuppressWarnings("try") protected void run(final StructuredGraph graph, CoreProviders context) { @@ -95,7 +98,7 @@ public class ConvertDeoptimizeToGuardPhase extends BasePhase { continue; } try (DebugCloseable closable = d.withNodeSourcePosition()) { - propagateFixed(d, d, context != null ? context.getLowerer() : null, lazyLoops); + propagateFixed(d, d, context, lazyLoops); } } @@ -164,14 +167,14 @@ public class ConvertDeoptimizeToGuardPhase extends BasePhase { } if (xs != null && ys != null && compare.condition().foldCondition(xs, ys, context.getConstantReflection(), compare.unorderedIsTrue()) == fixedGuard.isNegated()) { try (DebugCloseable position = fixedGuard.withNodeSourcePosition()) { - propagateFixed(mergePredecessor, fixedGuard, context.getLowerer(), lazyLoops); + propagateFixed(mergePredecessor, fixedGuard, context, lazyLoops); } } } } @SuppressWarnings("try") - private static void propagateFixed(FixedNode from, StaticDeoptimizingNode deopt, LoweringProvider loweringProvider, LazyValue lazyLoops) { + private static void propagateFixed(FixedNode from, StaticDeoptimizingNode deopt, CoreProviders providers, LazyValue lazyLoops) { Node current = from; while (current != null) { if (GraalOptions.GuardPriorities.getValue(from.getOptions()) && current instanceof FixedGuardNode) { @@ -186,10 +189,10 @@ public class ConvertDeoptimizeToGuardPhase extends BasePhase { FixedNode next = mergeNode.next(); while (mergeNode.isAlive()) { AbstractEndNode end = mergeNode.forwardEnds().first(); - propagateFixed(end, deopt, loweringProvider, lazyLoops); + propagateFixed(end, deopt, providers, lazyLoops); } if (next.isAlive()) { - propagateFixed(next, deopt, loweringProvider, lazyLoops); + propagateFixed(next, deopt, providers, lazyLoops); } return; } else if (current.predecessor() instanceof IfNode) { @@ -219,13 +222,13 @@ public class ConvertDeoptimizeToGuardPhase extends BasePhase { if (survivingSuccessor instanceof LoopExitNode) { newGuard = ProxyNode.forGuard(guard, (LoopExitNode) survivingSuccessor); } - survivingSuccessor.replaceAtUsages(InputType.Guard, newGuard); + survivingSuccessor.replaceAtUsages(newGuard, InputType.Guard); graph.getDebug().log("Converting deopt on %-5s branch of %s to guard for remaining branch %s.", negateGuardCondition, ifNode, survivingSuccessor); FixedNode next = pred.next(); pred.setNext(guard); guard.setNext(next); - SimplifierTool simplifierTool = GraphUtil.getDefaultSimplifier(null, null, null, false, graph.getAssumptions(), graph.getOptions(), loweringProvider); + SimplifierTool simplifierTool = GraphUtil.getDefaultSimplifier(providers != null ? providers : EMPTY_PROVIDERS, false, graph.getAssumptions(), graph.getOptions()); survivingSuccessor.simplify(simplifierTool); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopTransformations.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopTransformations.java index 53aa12cf23d..5b4c0346d9f 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopTransformations.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopTransformations.java @@ -97,8 +97,7 @@ public abstract class LoopTransformations { LoopBeginNode loopBegin = loop.loopBegin(); StructuredGraph graph = loopBegin.graph(); int initialNodeCount = graph.getNodeCount(); - SimplifierTool defaultSimplifier = GraphUtil.getDefaultSimplifier(context.getMetaAccess(), context.getConstantReflection(), context.getConstantFieldProvider(), - canonicalizer.getCanonicalizeReads(), graph.getAssumptions(), graph.getOptions()); + SimplifierTool defaultSimplifier = GraphUtil.getDefaultSimplifier(context, canonicalizer.getCanonicalizeReads(), graph.getAssumptions(), graph.getOptions()); /* * IMPORTANT: Canonicalizations inside the body of the remaining loop can introduce new * control flow that is not automatically picked up by the control flow graph computation of @@ -178,7 +177,7 @@ public abstract class LoopTransformations { ControlSplitNode duplicatedControlSplit = duplicateLoop.getDuplicatedNode(controlSplitNode); if (duplicatedControlSplit.isAlive()) { AbstractBeginNode survivingSuccessor = (AbstractBeginNode) position.get(duplicatedControlSplit); - survivingSuccessor.replaceAtUsages(InputType.Guard, newBegin); + survivingSuccessor.replaceAtUsages(newBegin, InputType.Guard); graph.removeSplitPropagate(duplicatedControlSplit, survivingSuccessor); } } @@ -187,7 +186,7 @@ public abstract class LoopTransformations { for (ControlSplitNode controlSplitNode : controlSplitNodeSet) { if (controlSplitNode.isAlive()) { AbstractBeginNode survivingSuccessor = (AbstractBeginNode) firstPosition.get(controlSplitNode); - survivingSuccessor.replaceAtUsages(InputType.Guard, originalLoopBegin); + survivingSuccessor.replaceAtUsages(originalLoopBegin, InputType.Guard); graph.removeSplitPropagate(controlSplitNode, survivingSuccessor); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentInside.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentInside.java index e469e9a355f..bb0d29bcbaa 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentInside.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentInside.java @@ -37,6 +37,7 @@ import org.graalvm.compiler.debug.GraalError; import org.graalvm.compiler.graph.Graph.DuplicationReplacement; import org.graalvm.compiler.graph.Node; import org.graalvm.compiler.graph.NodeBitMap; +import org.graalvm.compiler.graph.Position; import org.graalvm.compiler.graph.iterators.NodeIterable; import org.graalvm.compiler.nodes.AbstractBeginNode; import org.graalvm.compiler.nodes.AbstractEndNode; @@ -62,7 +63,7 @@ import org.graalvm.compiler.nodes.StateSplit; import org.graalvm.compiler.nodes.StructuredGraph; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.ValuePhiNode; -import org.graalvm.compiler.nodes.VirtualState.NodeClosure; +import org.graalvm.compiler.nodes.VirtualState.NodePositionClosure; import org.graalvm.compiler.nodes.calc.AddNode; import org.graalvm.compiler.nodes.calc.CompareNode; import org.graalvm.compiler.nodes.calc.ConditionalNode; @@ -579,12 +580,11 @@ public class LoopFragmentInside extends LoopFragment { ValueNode initializer = firstPhi; if (duplicateState != null) { // fix the merge's state after - duplicateState.applyToNonVirtual(new NodeClosure() { - + duplicateState.applyToNonVirtual(new NodePositionClosure() { @Override - public void apply(Node from, ValueNode node) { - if (node == phi) { - from.replaceFirstInput(phi, firstPhi); + public void apply(Node from, Position p) { + if (p.get(from) == phi) { + p.set(from, firstPhi); } } }); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/FrameStateAssigmentPhaseBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/FrameStateAssigmentPhaseBenchmark.java index 549b6d26f46..3dc0f1b3c29 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/FrameStateAssigmentPhaseBenchmark.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/FrameStateAssigmentPhaseBenchmark.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -27,12 +27,10 @@ package org.graalvm.compiler.microbenchmarks.graal; import java.util.StringTokenizer; import org.openjdk.jmh.annotations.Benchmark; -import org.openjdk.jmh.annotations.Warmup; import org.graalvm.compiler.microbenchmarks.graal.util.FrameStateAssignmentState; import org.graalvm.compiler.microbenchmarks.graal.util.MethodSpec; -@Warmup(iterations = 15) public class FrameStateAssigmentPhaseBenchmark extends GraalBenchmark { @MethodSpec(declaringClass = StringTokenizer.class, name = "nextToken", parameters = {String.class}) diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/GraalBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/GraalBenchmark.java index f27bac81c8e..a95c0de24ac 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/GraalBenchmark.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/GraalBenchmark.java @@ -24,10 +24,6 @@ package org.graalvm.compiler.microbenchmarks.graal; -import static org.graalvm.compiler.microbenchmarks.graal.GraalBenchmark.Defaults.FORKS; -import static org.graalvm.compiler.microbenchmarks.graal.GraalBenchmark.Defaults.MEASUREMENT_ITERATIONS; -import static org.graalvm.compiler.microbenchmarks.graal.GraalBenchmark.Defaults.WARMUP_ITERATIONS; - import org.graalvm.compiler.api.test.ModuleSupport; import org.openjdk.jmh.annotations.Fork; @@ -39,17 +35,11 @@ import org.openjdk.jmh.annotations.Warmup; * for each benchmark option. Individual options can be overridden in the subclasses or by an * individual benchmark. */ -@Warmup(iterations = WARMUP_ITERATIONS) -@Measurement(iterations = MEASUREMENT_ITERATIONS) -@Fork(FORKS) +@Warmup(iterations = 8, time = 5) +@Measurement(iterations = 5, time = 5) +@Fork(3) public class GraalBenchmark { static { ModuleSupport.exportAndOpenAllPackagesToUnnamed("jdk.internal.vm.compiler"); } - - public static class Defaults { - public static final int MEASUREMENT_ITERATIONS = 5; - public static final int WARMUP_ITERATIONS = 5; - public static final int FORKS = 1; - } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/GraphCopyBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/GraphCopyBenchmark.java index a2852d9eb57..e892fd464cb 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/GraphCopyBenchmark.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/GraphCopyBenchmark.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -25,7 +25,6 @@ package org.graalvm.compiler.microbenchmarks.graal; import org.openjdk.jmh.annotations.Benchmark; -import org.openjdk.jmh.annotations.Warmup; import org.graalvm.compiler.graph.Graph; import org.graalvm.compiler.microbenchmarks.graal.util.GraalState; @@ -76,7 +75,6 @@ public class GraphCopyBenchmark extends GraalBenchmark { } @Benchmark - @Warmup(iterations = 20) public StructuredGraph nullness(Nullness s, GraalState g) { return (StructuredGraph) s.graph.copy(g.debug); } @@ -128,7 +126,6 @@ public class GraphCopyBenchmark extends GraalBenchmark { } @Benchmark - @Warmup(iterations = 20) public StructuredGraph search(Search s, GraalState g) { return (StructuredGraph) s.graph.copy(g.debug); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/NodeBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/NodeBenchmark.java index 110364e9a1f..f011b183bef 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/NodeBenchmark.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/NodeBenchmark.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -27,7 +27,6 @@ package org.graalvm.compiler.microbenchmarks.graal; import java.util.HashMap; import org.openjdk.jmh.annotations.Benchmark; -import org.openjdk.jmh.annotations.Warmup; import org.openjdk.jmh.infra.Blackhole; import org.graalvm.compiler.graph.Node; @@ -37,6 +36,7 @@ import org.graalvm.compiler.microbenchmarks.graal.util.MethodSpec; import org.graalvm.compiler.microbenchmarks.graal.util.NodesState; import org.graalvm.compiler.microbenchmarks.graal.util.NodesState.NodePair; import org.graalvm.compiler.nodes.ConstantNode; +import org.graalvm.compiler.nodes.StructuredGraph; import org.graalvm.compiler.nodes.calc.AddNode; import org.graalvm.compiler.nodes.util.GraphUtil; @@ -46,8 +46,28 @@ public class NodeBenchmark extends GraalBenchmark { public static class StringEquals extends NodesState { } + /** + * Variation of {@link StringEquals} that calls {@link StructuredGraph#maybeCompress()} after + * every N iterations. The prevents benchmarks that mutate the graph by adding and removing + * nodes from causing {@link OutOfMemoryError}s. + */ + @MethodSpec(declaringClass = String.class, name = "equals") + public static class StringEqualsWithGraphCompression extends NodesState { + private static final int N = 100_000; + + private int latch = N; + + @Override + public void afterInvocation() { + super.afterInvocation(); + if (--latch == 0) { + graph.maybeCompress(); + latch = N; + } + } + } + @Benchmark - @Warmup(iterations = 20) public int getNodeClass(StringEquals s) { int sum = 0; for (Node n : s.nodes) { @@ -101,7 +121,7 @@ public class NodeBenchmark extends GraalBenchmark { } @Benchmark - public void createAndDeleteAdd(StringEquals s, Blackhole bh) { + public void createAndDeleteAdd(StringEqualsWithGraphCompression s, Blackhole bh) { AddNode addNode = new AddNode(ConstantNode.forInt(40), ConstantNode.forInt(2)); s.graph.addOrUniqueWithInputs(addNode); GraphUtil.killWithUnusedFloatingInputs(addNode); @@ -109,7 +129,7 @@ public class NodeBenchmark extends GraalBenchmark { } @Benchmark - public void createAndDeleteConstant(StringEquals s, Blackhole bh) { + public void createAndDeleteConstant(StringEqualsWithGraphCompression s, Blackhole bh) { ConstantNode constantNode = ConstantNode.forInt(42); s.graph.addOrUnique(constantNode); GraphUtil.killWithUnusedFloatingInputs(constantNode); @@ -126,7 +146,6 @@ public class NodeBenchmark extends GraalBenchmark { } @Benchmark - @Warmup(iterations = 20) public void nodeBitmap(StringEquals s, @SuppressWarnings("unused") GraalState g) { NodeBitMap bitMap = s.graph.createNodeBitMap(); for (Node node : s.graph.getNodes()) { @@ -147,7 +166,6 @@ public class NodeBenchmark extends GraalBenchmark { // Checkstyle: stop method name check @Benchmark - @Warmup(iterations = 20) public int valueEquals_STRING_EQUALS(StringEquals s) { int result = 0; for (NodePair np : s.valueEqualsNodePairs) { @@ -161,7 +179,6 @@ public class NodeBenchmark extends GraalBenchmark { } @Benchmark - @Warmup(iterations = 20) public int valueEquals_HASHMAP_COMPUTE_IF_ABSENT(HashMapComputeIfAbsent s) { int result = 0; for (NodePair np : s.valueEqualsNodePairs) { @@ -175,7 +192,6 @@ public class NodeBenchmark extends GraalBenchmark { } @Benchmark - @Warmup(iterations = 20) public int valueNumberLeaf_HASHMAP_COMPUTE_IF_ABSENT(HashMapComputeIfAbsent s) { int result = 0; for (Node n : s.valueNumberableLeafNodes) { @@ -185,7 +201,6 @@ public class NodeBenchmark extends GraalBenchmark { } @Benchmark - @Warmup(iterations = 20) public int valueNumberLeaf_STRING_EQUALS(StringEquals s) { int result = 0; for (Node n : s.valueNumberableLeafNodes) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/SchedulePhaseBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/SchedulePhaseBenchmark.java index 4f4ba4b8ad9..3d0561668e8 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/SchedulePhaseBenchmark.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/SchedulePhaseBenchmark.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -28,16 +28,12 @@ import java.util.Arrays; import org.graalvm.compiler.phases.schedule.SchedulePhase; import org.openjdk.jmh.annotations.Benchmark; -import org.openjdk.jmh.annotations.Measurement; -import org.openjdk.jmh.annotations.Warmup; import org.graalvm.compiler.microbenchmarks.graal.util.MethodSpec; import org.graalvm.compiler.microbenchmarks.graal.util.ScheduleState; import org.graalvm.compiler.nodes.cfg.ControlFlowGraph; import org.graalvm.compiler.phases.schedule.SchedulePhase.SchedulingStrategy; -@Warmup(iterations = 20) -@Measurement(iterations = 10) public class SchedulePhaseBenchmark extends GraalBenchmark { @MethodSpec(declaringClass = String.class, name = "equals") diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraalState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraalState.java index 08369b78493..f0e2b93b16e 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraalState.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraalState.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -26,8 +26,8 @@ package org.graalvm.compiler.microbenchmarks.graal.util; import org.graalvm.compiler.api.test.Graal; import org.graalvm.compiler.core.target.Backend; -import org.graalvm.compiler.debug.DebugHandlersFactory; import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.DebugContext.Builder; import org.graalvm.compiler.options.OptionValues; import org.graalvm.compiler.phases.util.Providers; import org.graalvm.compiler.runtime.RuntimeProvider; @@ -51,7 +51,7 @@ public class GraalState { public GraalState() { options = Graal.getRequiredCapability(OptionValues.class); - debug = DebugContext.create(options, DebugHandlersFactory.LOADER); + debug = new Builder(options).build(); backend = Graal.getRequiredCapability(RuntimeProvider.class).getHostBackend(); providers = backend.getProviders(); metaAccess = providers.getMetaAccess(); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/GraalCompilerState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/GraalCompilerState.java index df35bc3400c..ddf295ac3d2 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/GraalCompilerState.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/GraalCompilerState.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -51,7 +51,7 @@ import org.graalvm.compiler.core.gen.LIRCompilerBackend; import org.graalvm.compiler.core.gen.LIRGenerationProvider; import org.graalvm.compiler.core.target.Backend; import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugHandlersFactory; +import org.graalvm.compiler.debug.DebugContext.Builder; import org.graalvm.compiler.lir.LIR; import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory; import org.graalvm.compiler.lir.gen.LIRGenerationResult; @@ -123,7 +123,7 @@ public abstract class GraalCompilerState { this.options = Graal.getRequiredCapability(OptionValues.class); this.backend = Graal.getRequiredCapability(RuntimeProvider.class).getHostBackend(); this.providers = backend.getProviders(); - this.debug = DebugContext.create(options, DebugHandlersFactory.LOADER); + this.debug = new Builder(options).build(); } protected boolean useProfilingInfo() { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/RegisterAllocationTimeBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/RegisterAllocationTimeBenchmark.java index 75ca95dd170..5f1071bf8c7 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/RegisterAllocationTimeBenchmark.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/RegisterAllocationTimeBenchmark.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -27,12 +27,8 @@ package org.graalvm.compiler.microbenchmarks.lir; import org.graalvm.compiler.lir.gen.LIRGenerationResult; import org.graalvm.compiler.microbenchmarks.graal.GraalBenchmark; import org.openjdk.jmh.annotations.Benchmark; -import org.openjdk.jmh.annotations.Measurement; import org.openjdk.jmh.annotations.Param; -import org.openjdk.jmh.annotations.Warmup; -@Warmup(iterations = 10) -@Measurement(iterations = 10) public class RegisterAllocationTimeBenchmark extends GraalBenchmark { public static class State extends GraalCompilerState.AllocationStage { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/IfNodeCanonicalizationTest2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/IfNodeCanonicalizationTest2.java new file mode 100644 index 00000000000..eaff38cbb2e --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/IfNodeCanonicalizationTest2.java @@ -0,0 +1,168 @@ +/* + * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, Arm Limited. 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + + +package org.graalvm.compiler.nodes.test; + +import org.graalvm.compiler.core.test.GraalCompilerTest; +import org.graalvm.compiler.nodes.StructuredGraph; +import org.graalvm.compiler.nodes.calc.ConditionalNode; +import org.graalvm.compiler.options.OptionValues; +import org.graalvm.compiler.phases.Phase; +import org.graalvm.compiler.phases.tiers.Suites; +import org.junit.Assert; +import org.junit.Test; + +public class IfNodeCanonicalizationTest2 extends GraalCompilerTest { + private StructuredGraph structuredGraph; + + @Override + protected Suites createSuites(OptionValues opts) { + Suites suites = super.createSuites(opts); + suites.getLowTier().appendPhase(new Phase() { + @Override + protected void run(StructuredGraph graph) { + structuredGraph = graph; + } + }); + return suites; + } + + /** + * Math.min() tests for integer type, which can be simplified to conditional move. + */ + public int minInt(int m, int n) { + return Math.min(m, n); + } + + @Test + public void testMinInt() { + test("minInt", 1, 2); + checkConditionalNode("minInt", 1); + } + + public long minLong(long m, long n) { + return Math.min(m, n); + } + + @Test + public void testMinLong() { + test("minLong", 1L, 2L); + checkConditionalNode("minLong", 1); + } + + /** + * Math.max() tests for integer type, which can be simplified to conditional move. + */ + public int maxInt(int m, int n) { + return Math.max(m, n); + } + + @Test + public void testMaxInt() { + test("maxInt", 1, 2); + checkConditionalNode("maxInt", 1); + } + + public long maxLong(long m, long n) { + return Math.max(m, n); + } + + @Test + public void testMaxLong() { + test("maxLong", 1L, 2L); + checkConditionalNode("maxLong", 1); + } + + /** + * General min test for integer type, which can be simplified to conditional move. + */ + public int generalMin(int m, int n) { + int value; + if (m <= n) { + value = m; + } else { + value = n; + } + return 2 * value; + } + + @Test + public void testGeneralMin() { + test("generalMin", 1, 2); + checkConditionalNode("generalMin", 1); + } + + /** + * General max test for integer type, which can be simplified to conditional move. + */ + public int generalMax(int m, int n) { + if (m >= n) { + return m; + } + return n; + } + + @Test + public void testGeneralMax() { + test("generalMax", 1, 2); + checkConditionalNode("generalMax", 1); + } + + /** + * General conditional set tests for integer type, which can be simplified to conditional move. + */ + public int integerEqualsCondMove(int m, int n, int a, int b) { + if (m == n) { + return a; + } + return b; + } + + @Test + public void testIntegerEqualsCondMove() { + test("integerEqualsCondMove", 1, 2, 2, 4); + checkConditionalNode("integerEqualsCondMove", 1); + } + + public int isNullCondMove(Object obj, int m, int n) { + if (obj == null) { + return m; + } + return n; + } + + @Test + public void testIsNullCondMove() { + test("isNullCondMove", new Object(), 1, 2); + checkConditionalNode("isNullCondMove", 1); + } + + private void checkConditionalNode(String methodName, int expected) { + compile(getResolvedJavaMethod(methodName), null); + int actual = structuredGraph.getNodes().filter(ConditionalNode.class).count(); + Assert.assertEquals(expected, actual); + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/NegateNodeCanonicalizationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/NegateNodeCanonicalizationTest.java index 285f0770988..3f0ad455c14 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/NegateNodeCanonicalizationTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/NegateNodeCanonicalizationTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -28,8 +28,8 @@ import static org.graalvm.compiler.core.test.GraalCompilerTest.getInitialOptions import static org.junit.Assert.assertEquals; import org.graalvm.compiler.core.common.type.ArithmeticOpTable; -import org.graalvm.compiler.debug.DebugHandlersFactory; import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.DebugContext.Builder; import org.graalvm.compiler.nodes.ConstantNode; import org.graalvm.compiler.nodes.NodeView; import org.graalvm.compiler.nodes.StructuredGraph; @@ -50,7 +50,7 @@ public class NegateNodeCanonicalizationTest { @Before public void before() { OptionValues options = getInitialOptions(); - DebugContext debug = DebugContext.create(options, DebugHandlersFactory.LOADER); + DebugContext debug = new Builder(options).build(); graph = new StructuredGraph.Builder(options, debug, AllowAssumptions.YES).build(); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ShortCircuitOrNodeTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ShortCircuitOrNodeTest.java index 2b0899b6b3e..2b78db34fd9 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ShortCircuitOrNodeTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ShortCircuitOrNodeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -26,6 +26,7 @@ package org.graalvm.compiler.nodes.test; import java.util.function.Function; +import org.graalvm.compiler.api.test.Graal; import org.graalvm.compiler.core.test.GraalCompilerTest; import org.graalvm.compiler.nodes.ConstantNode; import org.graalvm.compiler.nodes.LogicNode; @@ -39,12 +40,8 @@ import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.FloatingReadPhase; -import org.graalvm.compiler.phases.common.IncrementalCanonicalizerPhase; -import org.graalvm.compiler.phases.common.LoweringPhase; +import org.graalvm.compiler.phases.tiers.Suites; +import org.graalvm.compiler.runtime.RuntimeProvider; import org.junit.Assert; import org.junit.Test; @@ -377,11 +374,9 @@ public class ShortCircuitOrNodeTest extends GraalCompilerTest { for (int i = 1; i <= 64; ++i) { String snippet = "testCascadeSnippet" + i; StructuredGraph graph = parseEager(snippet, AllowAssumptions.YES); - CoreProviders context = getProviders(); - CanonicalizerPhase canonicalizer = createCanonicalizerPhase(); - canonicalizer.apply(graph, context); - new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context); - new IncrementalCanonicalizerPhase<>(canonicalizer, new FloatingReadPhase()).apply(graph, context); + Suites s = Graal.getRequiredCapability(RuntimeProvider.class).getHostBackend().getSuites().getDefaultSuites(getInitialOptions()); + s.getHighTier().apply(graph, getDefaultHighTierContext()); + s.getMidTier().apply(graph, getDefaultMidTierContext()); int shortCircuitCount = graph.getNodes(ShortCircuitOrNode.TYPE).count(); int trueCount = testInputCombinations(snippet); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/StructuredGraphTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/StructuredGraphTest.java index ae69ad61e73..68d373c06a3 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/StructuredGraphTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/StructuredGraphTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -26,7 +26,7 @@ package org.graalvm.compiler.nodes.test; import org.graalvm.compiler.core.test.GraalCompilerTest; import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugHandlersFactory; +import org.graalvm.compiler.debug.DebugContext.Builder; import org.graalvm.compiler.nodes.StructuredGraph; import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; import org.graalvm.compiler.options.OptionValues; @@ -40,7 +40,7 @@ public class StructuredGraphTest extends GraalCompilerTest { @Test public void testGetBytecodeSize() { OptionValues options = getInitialOptions(); - DebugContext debug = DebugContext.create(options, DebugHandlersFactory.LOADER); + DebugContext debug = new Builder(options).build(); ResolvedJavaMethod rootMethod = getResolvedJavaMethod("testGetBytecodeSize"); // Test graph with root method and inlined methods diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractBeginNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractBeginNode.java index 876b0b12af6..4cc20b6d133 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractBeginNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractBeginNode.java @@ -71,8 +71,8 @@ public abstract class AbstractBeginNode extends FixedWithNextNode implements LIR if (!hasNoUsages()) { AbstractBeginNode prevBegin = prevBegin(evacuateFrom); assert prevBegin != null; - replaceAtUsages(InputType.Anchor, prevBegin); - replaceAtUsages(InputType.Guard, prevBegin); + replaceAtUsages(prevBegin, InputType.Anchor); + replaceAtUsages(prevBegin, InputType.Guard); assert anchored().isEmpty() : anchored().snapshot(); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractMergeNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractMergeNode.java index 05b586271e1..2d9d33dee14 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractMergeNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractMergeNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020, 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 @@ -39,6 +39,7 @@ import org.graalvm.compiler.graph.iterators.NodeIterable; import org.graalvm.compiler.graph.spi.Simplifiable; import org.graalvm.compiler.graph.spi.SimplifierTool; import org.graalvm.compiler.nodeinfo.NodeInfo; +import org.graalvm.compiler.nodes.StructuredGraph.FrameStateVerificationFeature; import org.graalvm.compiler.nodes.memory.MemoryPhiNode; import org.graalvm.compiler.nodes.spi.LIRLowerable; import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; @@ -258,4 +259,14 @@ public abstract class AbstractMergeNode extends BeginStateSplitNode implements I } } } + + protected boolean verifyState() { + return this.stateAfter != null; + } + + @Override + public boolean verify() { + assert !this.graph().getFrameStateVerification().implies(FrameStateVerificationFeature.MERGES) || verifyState() : "Merge must have a state until FSA " + this; + return super.verify(); + } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractStateSplit.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractStateSplit.java index 8506477ee71..76d7c971162 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractStateSplit.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractStateSplit.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -28,6 +28,7 @@ import org.graalvm.compiler.core.common.type.Stamp; import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.nodeinfo.InputType; import org.graalvm.compiler.nodeinfo.NodeInfo; +import org.graalvm.compiler.nodes.StructuredGraph.FrameStateVerificationFeature; /** * Provides an implementation of {@link StateSplit}. @@ -63,4 +64,11 @@ public abstract class AbstractStateSplit extends FixedWithNextNode implements St super(c, stamp); this.stateAfter = stateAfter; } + + @Override + public boolean verify() { + assert !hasSideEffect() || !this.graph().getFrameStateVerification().implies(FrameStateVerificationFeature.STATE_SPLITS) || + this.stateAfter != null : "State split with side-effect must have a state until FSA " + this; + return super.verify(); + } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ComputeObjectAddressNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ComputeObjectAddressNode.java index 2ce1525f6ff..dfc7dfa6fa1 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ComputeObjectAddressNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ComputeObjectAddressNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -33,7 +33,6 @@ import org.graalvm.compiler.nodeinfo.NodeSize; import org.graalvm.compiler.nodes.calc.SignExtendNode; import org.graalvm.compiler.nodes.debug.ControlFlowAnchored; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import jdk.vm.ci.meta.JavaKind; @@ -57,11 +56,6 @@ public final class ComputeObjectAddressNode extends FixedWithNextNode implements @NodeIntrinsic public static native long get(Object array, long offset); - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - public ValueNode getObject() { return object; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptBciSupplier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptBciSupplier.java new file mode 100644 index 00000000000..c1d7ab77367 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptBciSupplier.java @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.nodes; + +/** + * A marker interface for nodes that represent operations that can deoptimize and thus need a BCI to + * deopt to. + */ +public interface DeoptBciSupplier { + + /** + * @return the byte code index (BCI) associated with the node implementing this interface + */ + int bci(); + + /** + * Remember the byte code index (BCI) for code generation or lowering purposes. For example, + * nodes lowering to foreign calls that can safepoint require a valid BCI for computations of + * the during-state of such a foreign call. + */ + @SuppressWarnings("unused") + void setBci(int bci); +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptimizeNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptimizeNode.java index 07142f8365e..376da2202a1 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptimizeNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptimizeNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020, 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 @@ -30,7 +30,6 @@ import org.graalvm.compiler.lir.gen.LIRGeneratorTool; import org.graalvm.compiler.nodeinfo.NodeInfo; import org.graalvm.compiler.nodes.spi.LIRLowerable; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; import jdk.vm.ci.meta.DeoptimizationAction; @@ -89,11 +88,6 @@ public final class DeoptimizeNode extends AbstractDeoptimizeNode implements Lowe this.reason = reason; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @SuppressWarnings("deprecation") public int getDebugId() { int deoptDebugId = debugId; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptimizingNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptimizingNode.java index 0e9fec67609..156e2b2b159 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptimizingNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DeoptimizingNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -55,6 +55,10 @@ public interface DeoptimizingNode extends NodeWithState { void setStateBefore(FrameState state); FrameState stateBefore(); + + default boolean canUseAsStateDuring() { + return false; + } } /** diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DynamicDeoptimizeNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DynamicDeoptimizeNode.java index 0daeed67998..6ab8fc98535 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DynamicDeoptimizeNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/DynamicDeoptimizeNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -31,7 +31,6 @@ import org.graalvm.compiler.graph.spi.CanonicalizerTool; import org.graalvm.compiler.nodeinfo.NodeInfo; import org.graalvm.compiler.nodes.spi.LIRLowerable; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; import jdk.vm.ci.meta.JavaConstant; @@ -67,11 +66,6 @@ public final class DynamicDeoptimizeNode extends AbstractDeoptimizeNode implemen return getSpeculation(); } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @Override public void generate(NodeLIRBuilderTool generator) { generator.getLIRGeneratorTool().emitDeoptimize(generator.operand(actionAndReason), generator.operand(speculation), generator.state(this)); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FrameState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FrameState.java index 3b2e8d22d8a..4236955f8b5 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FrameState.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FrameState.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020, 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 @@ -35,19 +35,21 @@ import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED; import java.util.ArrayList; import java.util.Collections; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Objects; -import org.graalvm.compiler.api.replacements.MethodSubstitution; import org.graalvm.compiler.bytecode.Bytecode; import org.graalvm.compiler.bytecode.Bytecodes; import org.graalvm.compiler.core.common.type.StampFactory; import org.graalvm.compiler.debug.GraalError; import org.graalvm.compiler.graph.IterableNodeType; +import org.graalvm.compiler.graph.Node; import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.graph.NodeInputList; import org.graalvm.compiler.graph.NodeSourcePosition; +import org.graalvm.compiler.graph.Position; import org.graalvm.compiler.graph.iterators.NodeIterable; import org.graalvm.compiler.nodeinfo.InputType; import org.graalvm.compiler.nodeinfo.NodeInfo; @@ -581,7 +583,7 @@ public final class FrameState extends VirtualState implements IterableNodeType { * when it's a substitution or it's null. */ assertTrue(outerFrameState != null || graph() == null || graph().method() == null || code == null || Objects.equals(graph().method(), code.getMethod()) || - graph().method().getAnnotation(MethodSubstitution.class) != null, "wrong outerFrameState %s != %s", code == null ? "null" : code.getMethod(), graph().method()); + graph().isSubstitution(), "wrong outerFrameState %s != %s", code == null ? "null" : code.getMethod(), graph().method()); if (monitorIds() != null && monitorIds().size() > 0) { int depth = outerLockDepth(); for (MonitorIdNode monitor : monitorIds()) { @@ -607,33 +609,6 @@ public final class FrameState extends VirtualState implements IterableNodeType { return depth; } - @Override - public void applyToNonVirtual(NodeClosure closure) { - for (ValueNode value : values) { - if (value != null) { - closure.apply(this, value); - } - } - - if (monitorIds != null) { - for (MonitorIdNode monitorId : monitorIds) { - if (monitorId != null) { - closure.apply(this, monitorId); - } - } - } - - if (virtualObjectMappings != null) { - for (EscapeObjectState state : virtualObjectMappings) { - state.applyToNonVirtual(closure); - } - } - - if (outerFrameState() != null) { - outerFrameState().applyToNonVirtual(closure); - } - } - @Override public void applyToVirtual(VirtualClosure closure) { closure.apply(this); @@ -647,6 +622,27 @@ public final class FrameState extends VirtualState implements IterableNodeType { } } + @Override + public void applyToNonVirtual(NodePositionClosure closure) { + Iterator iter = inputPositions().iterator(); + while (iter.hasNext()) { + Position pos = iter.next(); + if (pos.get(this) != null) { + if (pos.getInputType() == InputType.Value || pos.getInputType() == Association) { + closure.apply(this, pos); + } + } + } + if (virtualObjectMappings != null) { + for (EscapeObjectState state : virtualObjectMappings) { + state.applyToNonVirtual(closure); + } + } + if (outerFrameState() != null) { + outerFrameState().applyToNonVirtual(closure); + } + } + @Override public boolean isPartOfThisState(VirtualState state) { if (state == this) { @@ -668,4 +664,5 @@ public final class FrameState extends VirtualState implements IterableNodeType { public boolean isExceptionHandlingBCI() { return bci == BytecodeFrame.AFTER_EXCEPTION_BCI || bci == BytecodeFrame.UNWIND_BCI; } + } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GetObjectAddressNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GetObjectAddressNode.java index 39f13cffcc5..d9c7b3d170d 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GetObjectAddressNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GetObjectAddressNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -27,7 +27,6 @@ package org.graalvm.compiler.nodes; import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2; import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1; -import org.graalvm.compiler.api.replacements.Snippet; import org.graalvm.compiler.core.common.LIRKind; import org.graalvm.compiler.core.common.type.StampFactory; import org.graalvm.compiler.graph.NodeClass; @@ -67,7 +66,7 @@ public final class GetObjectAddressNode extends FixedWithNextNode implements LIR @Override public boolean verify() { - assert graph().getGuardsStage().areFrameStatesAtDeopts() || graph().method().getAnnotation(Snippet.class) != null : "GetObjectAddressNode can't be used directly until frame states are fixed"; + assert graph().getGuardsStage().areFrameStatesAtDeopts() || graph().isSubstitution() : "GetObjectAddressNode can't be used directly until frame states are fixed"; return super.verify(); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphDecoder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphDecoder.java index fd0ab3f3928..980790dbe92 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphDecoder.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphDecoder.java @@ -65,6 +65,7 @@ import org.graalvm.compiler.nodes.GraphDecoder.MethodScope; import org.graalvm.compiler.nodes.GraphDecoder.ProxyPlaceholder; import org.graalvm.compiler.nodes.calc.FloatingNode; import org.graalvm.compiler.nodes.extended.IntegerSwitchNode; +import org.graalvm.compiler.nodes.extended.SwitchNode; import org.graalvm.compiler.nodes.graphbuilderconf.LoopExplosionPlugin.LoopExplosionKind; import org.graalvm.compiler.options.OptionValues; @@ -98,6 +99,11 @@ public class GraphDecoder { public final EncodedGraph encodedGraph; /** The highest node order id that a fixed node has in the EncodedGraph. */ public final int maxFixedNodeOrderId; + /** + * Number of bytes needed to encode an order id (order ids have a per-encoded-graph fixed + * size). + */ + public final int orderIdWidth; /** Access to the encoded graph. */ public final TypeReader reader; /** The kind of loop explosion to be performed during decoding. */ @@ -125,8 +131,8 @@ public class GraphDecoder { if (encodedGraph != null) { reader = UnsafeArrayTypeReader.create(encodedGraph.getEncoding(), encodedGraph.getStartOffset(), architecture.supportsUnalignedMemoryAccess()); maxFixedNodeOrderId = reader.getUVInt(); + int nodeCount = reader.getUVInt(); if (encodedGraph.nodeStartOffsets == null) { - int nodeCount = reader.getUVInt(); int[] nodeStartOffsets = new int[nodeCount]; for (int i = 0; i < nodeCount; i++) { nodeStartOffsets[i] = encodedGraph.getStartOffset() - reader.getUVInt(); @@ -134,9 +140,18 @@ public class GraphDecoder { encodedGraph.nodeStartOffsets = nodeStartOffsets; graph.setGuardsStage((StructuredGraph.GuardsStage) readObject(this)); } + + if (nodeCount <= GraphEncoder.MAX_INDEX_1_BYTE) { + orderIdWidth = 1; + } else if (nodeCount <= GraphEncoder.MAX_INDEX_2_BYTES) { + orderIdWidth = 2; + } else { + orderIdWidth = 4; + } } else { reader = null; maxFixedNodeOrderId = 0; + orderIdWidth = 0; } if (loopExplosion.useExplosion()) { @@ -388,7 +403,8 @@ public class GraphDecoder { public final int exceptionNextOrderId; public JavaConstant constantReceiver; - protected InvokeData(Invoke invoke, ResolvedJavaType contextType, int invokeOrderId, int callTargetOrderId, int stateAfterOrderId, int nextOrderId, int nextNextOrderId, int exceptionOrderId, + protected InvokeData(Invoke invoke, ResolvedJavaType contextType, int invokeOrderId, int callTargetOrderId, int stateAfterOrderId, int nextOrderId, int nextNextOrderId, + int exceptionOrderId, int exceptionStateOrderId, int exceptionNextOrderId) { this.invoke = invoke; this.contextType = contextType; @@ -608,8 +624,12 @@ public class GraphDecoder { LoopScope outerScope = loopScope.outer; int nextIterationNumber = outerScope.nextIterationFromLoopExitDuplication.isEmpty() ? outerScope.loopIteration + 1 : outerScope.nextIterationFromLoopExitDuplication.getLast().loopIteration + 1; + Node[] initialCreatedNodes = outerScope.initialCreatedNodes == null ? null + : (methodScope.loopExplosion.mergeLoops() + ? Arrays.copyOf(outerScope.initialCreatedNodes, outerScope.initialCreatedNodes.length) + : outerScope.initialCreatedNodes); successorAddScope = new LoopScope(methodScope, outerScope.outer, outerScope.loopDepth, nextIterationNumber, outerScope.loopBeginOrderId, LoopScopeTrigger.LOOP_EXIT_DUPLICATION, - outerScope.initialCreatedNodes == null ? null : Arrays.copyOf(outerScope.initialCreatedNodes, outerScope.initialCreatedNodes.length), + initialCreatedNodes, Arrays.copyOf(loopScope.initialCreatedNodes, loopScope.initialCreatedNodes.length), outerScope.nextIterationFromLoopExitDuplication, outerScope.nextIterationFromLoopEndDuplication, @@ -638,6 +658,12 @@ public class GraphDecoder { assert node.getNodeClass() == methodScope.encodedGraph.getNodeClasses()[typeId]; makeFixedNodeInputs(methodScope, loopScope, node); readProperties(methodScope, node); + + if ((node instanceof IfNode || node instanceof SwitchNode) && + earlyCanonicalization(methodScope, successorAddScope, nodeOrderId, node)) { + return loopScope; + } + makeSuccessorStubs(methodScope, successorAddScope, node, updatePredecessors); LoopScope resultScope = loopScope; @@ -685,7 +711,7 @@ public class GraphDecoder { int nextIterationNumber = loopScope.nextIterationsFromUnrolling.isEmpty() ? loopScope.loopIteration + 1 : loopScope.nextIterationsFromUnrolling.getLast().loopIteration + 1; LoopScope outerLoopMergeScope = new LoopScope(methodScope, loopScope.outer, loopScope.loopDepth, nextIterationNumber, loopScope.loopBeginOrderId, LoopScopeTrigger.LOOP_BEGIN_UNROLLING, - Arrays.copyOf(loopScope.initialCreatedNodes, loopScope.initialCreatedNodes.length), + methodScope.loopExplosion.mergeLoops() ? Arrays.copyOf(loopScope.initialCreatedNodes, loopScope.initialCreatedNodes.length) : loopScope.initialCreatedNodes, Arrays.copyOf(loopScope.initialCreatedNodes, loopScope.initialCreatedNodes.length), loopScope.nextIterationFromLoopExitDuplication, loopScope.nextIterationFromLoopEndDuplication, @@ -947,7 +973,7 @@ public class GraphDecoder { if (trigger != null) { int nextIterationNumber = nextIterations.isEmpty() ? loopScope.loopIteration + 1 : nextIterations.getLast().loopIteration + 1; LoopScope nextIterationScope = new LoopScope(methodScope, loopScope.outer, loopScope.loopDepth, nextIterationNumber, loopScope.loopBeginOrderId, trigger, - Arrays.copyOf(loopScope.initialCreatedNodes, loopScope.initialCreatedNodes.length), + methodScope.loopExplosion.mergeLoops() ? Arrays.copyOf(loopScope.initialCreatedNodes, loopScope.initialCreatedNodes.length) : loopScope.initialCreatedNodes, Arrays.copyOf(loopScope.initialCreatedNodes, loopScope.initialCreatedNodes.length), loopScope.nextIterationFromLoopExitDuplication, loopScope.nextIterationFromLoopEndDuplication, @@ -972,6 +998,23 @@ public class GraphDecoder { protected void handleFixedNode(MethodScope methodScope, LoopScope loopScope, int nodeOrderId, FixedNode node) { } + /** + * Hook for subclasses for early canonicalization of IfNodes and IntegerSwitchNodes. + * + * "Early" means that this is called before successor stubs creation. Therefore, all successors + * are null a this point, and calling any method using them without prior manual initialization + * will fail. + * + * @param methodScope The current method. + * @param loopScope The current loop. + * @param nodeOrderId The orderId of the node. + * @param node The node to be simplified. + * @return true if canonicalization happened, false otherwise. + */ + protected boolean earlyCanonicalization(MethodScope methodScope, LoopScope loopScope, int nodeOrderId, FixedNode node) { + return false; + } + protected void handleProxyNodes(MethodScope methodScope, LoopScope loopScope, LoopExitNode loopExit) { assert loopExit.stateAfter() == null; int stateAfterOrderId = readOrderId(methodScope); @@ -1486,7 +1529,8 @@ public class GraphDecoder { if (node instanceof Invoke) { assert node instanceof InvokeNode || node instanceof InvokeWithExceptionNode : "The only two Invoke node classes. Got " + node.getClass(); if (edges.type() == Edges.Type.Successors) { - assert edges.getCount() == (node instanceof InvokeWithExceptionNode ? 2 : 1) : "InvokeNode has one successor (next); InvokeWithExceptionNode has two successors (next, exceptionEdge)"; + assert edges.getCount() == (node instanceof InvokeWithExceptionNode ? 2 + : 1) : "InvokeNode has one successor (next); InvokeWithExceptionNode has two successors (next, exceptionEdge)"; return true; } else { assert edges.type() == Edges.Type.Inputs; @@ -1517,7 +1561,15 @@ public class GraphDecoder { } protected int readOrderId(MethodScope methodScope) { - return methodScope.reader.getUVInt(); + switch (methodScope.orderIdWidth) { + case 1: + return methodScope.reader.getU1(); + case 2: + return methodScope.reader.getU2(); + case 4: + return methodScope.reader.getS4(); + } + throw GraalError.shouldNotReachHere("Invalid orderIdWidth: " + methodScope.orderIdWidth); } protected Object readObject(MethodScope methodScope) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphEncoder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphEncoder.java index 0e5e3d51e46..d38cb4f27da 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphEncoder.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphEncoder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -124,6 +124,14 @@ public class GraphEncoder { * The orderId of the first actual node after the {@link StructuredGraph#start() start node}. */ public static final int FIRST_NODE_ORDER_ID = 2; + /** + * Maximum unsigned integer fitting on 1 byte. + */ + public static final int MAX_INDEX_1_BYTE = 1 << 8 - 1; + /** + * Maximum unsigned integer fitting on 2 bytes. + */ + public static final int MAX_INDEX_2_BYTES = 1 << 16 - 1; /** * The known offset between the orderId of a {@link AbstractBeginNode} and its @@ -435,7 +443,14 @@ public class GraphEncoder { } protected void writeOrderId(Node node, NodeOrder nodeOrder) { - writer.putUV(node == null ? NULL_ORDER_ID : nodeOrder.orderIds.get(node)); + int id = node == null ? NULL_ORDER_ID : nodeOrder.orderIds.get(node); + if (nodeOrder.nextOrderId <= MAX_INDEX_1_BYTE) { + writer.putU1(id); + } else if (nodeOrder.nextOrderId <= MAX_INDEX_2_BYTES) { + writer.putU2(id); + } else { + writer.putS4(id); + } } protected void writeObjectId(Object object) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/IfNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/IfNode.java index cd01b55fb58..3fdbe593b80 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/IfNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/IfNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020, 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 @@ -68,6 +68,7 @@ import org.graalvm.compiler.nodes.calc.IntegerLessThanNode; import org.graalvm.compiler.nodes.calc.IntegerNormalizeCompareNode; import org.graalvm.compiler.nodes.calc.IsNullNode; import org.graalvm.compiler.nodes.calc.ObjectEqualsNode; +import org.graalvm.compiler.nodes.cfg.Block; import org.graalvm.compiler.nodes.extended.UnboxNode; import org.graalvm.compiler.nodes.java.InstanceOfNode; import org.graalvm.compiler.nodes.java.LoadFieldNode; @@ -96,6 +97,10 @@ public final class IfNode extends ControlSplitNode implements Simplifiable, LIRL private static final CounterKey CORRECTED_PROBABILITIES = DebugContext.counter("CorrectedProbabilities"); + /* + * Any change to successor fields (reordering, renaming, adding or removing) would need an + * according update to SimplifyingGraphDecoder#earlyCanonicalization. + */ @Successor AbstractBeginNode trueSuccessor; @Successor AbstractBeginNode falseSuccessor; @Input(InputType.Condition) LogicNode condition; @@ -810,9 +815,8 @@ public final class IfNode extends ControlSplitNode implements Simplifiable, LIRL } if (comparableCondition != null) { - Condition combined = conditionA.join(comparableCondition); - if (combined == null) { - // The two conditions are disjoint => can reorder. + if (conditionA.trueIsDisjoint(comparableCondition)) { + // The truth of the two conditions is disjoint => can reorder. debug.log("Can swap disjoint coditions on same values: %s and %s", conditionA, comparableCondition); return true; } @@ -918,9 +922,11 @@ public final class IfNode extends ControlSplitNode implements Simplifiable, LIRL } if (trueSuccessor() instanceof LoopExitNode) { + FrameState stateAfter = ((LoopExitNode) trueSuccessor()).stateAfter(); LoopBeginNode loopBegin = ((LoopExitNode) trueSuccessor()).loopBegin(); assert loopBegin == ((LoopExitNode) falseSuccessor()).loopBegin(); LoopExitNode loopExitNode = graph().add(new LoopExitNode(loopBegin)); + loopExitNode.setStateAfter(stateAfter); graph().addBeforeFixed(this, loopExitNode); if (graph().hasValueProxies() && needsProxy) { value = graph().addOrUnique(new ValueProxyNode(value, loopExitNode)); @@ -1024,6 +1030,43 @@ public final class IfNode extends ControlSplitNode implements Simplifiable, LIRL return null; } + private List getNodesForBlock(AbstractBeginNode successor) { + StructuredGraph.ScheduleResult schedule = graph().getLastSchedule(); + if (schedule == null) { + return null; + } + if (schedule.getCFG().getNodeToBlock().isNew(successor)) { + // This can occur when nodes were created after the last schedule. + return null; + } + Block block = schedule.getCFG().blockFor(successor); + if (block == null) { + return null; + } + return schedule.nodesFor(block); + } + + /** + * Check whether conversion of an If to a Conditional causes extra unconditional work. Generally + * that transformation is beneficial if it doesn't result in extra work in the main path. + */ + private boolean isSafeConditionalInput(ValueNode value, AbstractBeginNode successor) { + assert successor.hasNoUsages(); + if (value.isConstant() || value instanceof ParameterNode || condition.inputs().contains(value)) { + // Assume constants are cheap to evaluate and Parameters are always evaluated. Any input + // to the condition itself is also unconditionally evaluated. + return true; + } + + if (value instanceof FixedNode && graph().isAfterFixedReadPhase()) { + List nodes = getNodesForBlock(successor); + // The successor block is empty so assume that this input evaluated before the + // condition. + return nodes != null && nodes.size() == 2; + } + return false; + } + private ValueNode canonicalizeConditionalCascade(SimplifierTool tool, ValueNode trueValue, ValueNode falseValue) { if (trueValue.getStackKind() != falseValue.getStackKind()) { return null; @@ -1031,7 +1074,7 @@ public final class IfNode extends ControlSplitNode implements Simplifiable, LIRL if (trueValue.getStackKind() != JavaKind.Int && trueValue.getStackKind() != JavaKind.Long) { return null; } - if (trueValue.isConstant() && falseValue.isConstant()) { + if (isSafeConditionalInput(trueValue, trueSuccessor) && isSafeConditionalInput(falseValue, falseSuccessor)) { return graph().unique(new ConditionalNode(condition(), trueValue, falseValue)); } ValueNode value = canonicalizeConditionalViaImplies(trueValue, falseValue); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InliningLog.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InliningLog.java index 03f46b6a194..9b9e7451626 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InliningLog.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InliningLog.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -24,18 +24,20 @@ package org.graalvm.compiler.nodes; -import jdk.vm.ci.meta.MetaUtil; -import jdk.vm.ci.meta.ResolvedJavaMethod; +import java.util.ArrayList; +import java.util.List; +import java.util.function.BiConsumer; + import jdk.internal.vm.compiler.collections.EconomicMap; import jdk.internal.vm.compiler.collections.Equivalence; import jdk.internal.vm.compiler.collections.MapCursor; import jdk.internal.vm.compiler.collections.UnmodifiableEconomicMap; +import org.graalvm.compiler.debug.DebugContext; import org.graalvm.compiler.debug.GraalError; import org.graalvm.compiler.graph.Node; -import java.util.ArrayList; -import java.util.List; -import java.util.function.BiConsumer; +import jdk.vm.ci.meta.MetaUtil; +import jdk.vm.ci.meta.ResolvedJavaMethod; /** * This class contains all inlining decisions performed on a graph during the compilation. @@ -144,12 +146,14 @@ public class InliningLog { private final Callsite root; private final EconomicMap leaves; private final boolean enabled; + private final DebugContext debug; - public InliningLog(ResolvedJavaMethod rootMethod, boolean enabled) { + public InliningLog(ResolvedJavaMethod rootMethod, boolean enabled, DebugContext debug) { this.root = new Callsite(null, null); this.root.target = rootMethod; this.leaves = EconomicMap.create(Equivalence.IDENTITY_WITH_SYSTEM_HASHCODE); this.enabled = enabled; + this.debug = debug; } /** @@ -160,6 +164,10 @@ public class InliningLog { * and the {@link InliningLog} of the inlined graph must be provided. */ public void addDecision(Invokable invoke, boolean positive, String phase, EconomicMap replacements, InliningLog calleeLog, String reason, Object... args) { + if (debug.hasCompilationListener()) { + String message = String.format(reason, args); + debug.notifyInlining(invoke.getContextMethod(), invoke.getTargetMethod(), positive, message, invoke.bci()); + } if (!enabled) { return; } @@ -401,10 +409,12 @@ public class InliningLog { } public static final class PlaceholderInvokable implements Invokable { - private int bci; - private ResolvedJavaMethod method; + private final int bci; + private final ResolvedJavaMethod callerMethod; + private final ResolvedJavaMethod method; - public PlaceholderInvokable(ResolvedJavaMethod method, int bci) { + public PlaceholderInvokable(ResolvedJavaMethod callerMethod, ResolvedJavaMethod method, int bci) { + this.callerMethod = callerMethod; this.method = method; this.bci = bci; } @@ -419,6 +429,11 @@ public class InliningLog { return bci; } + @Override + public void setBci(int bci) { + GraalError.shouldNotReachHere(); + } + @Override public boolean isAlive() { return false; @@ -428,10 +443,15 @@ public class InliningLog { public FixedNode asFixedNode() { throw new UnsupportedOperationException("Parsed invokable is a placeholder, not a concrete node."); } + + @Override + public ResolvedJavaMethod getContextMethod() { + return callerMethod; + } } - public RootScope openRootScope(ResolvedJavaMethod target, int bci) { - return openRootScope(new PlaceholderInvokable(target, bci)); + public RootScope openRootScope(ResolvedJavaMethod callerMethod, ResolvedJavaMethod target, int bci) { + return openRootScope(new PlaceholderInvokable(callerMethod, target, bci)); } public RootScope openRootScope(Invokable invoke) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/Invokable.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/Invokable.java index 7d9f5d1c07e..ba64322fdda 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/Invokable.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/Invokable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -32,10 +32,15 @@ import org.graalvm.compiler.graph.Node; /** * A marker interface for nodes that represent calls to other methods. */ -public interface Invokable { +public interface Invokable extends DeoptBciSupplier { ResolvedJavaMethod getTargetMethod(); - int bci(); + /** + * Returns the {@linkplain ResolvedJavaMethod method} from which the call is executed. + * + * @return the method from which the call is executed. + */ + ResolvedJavaMethod getContextMethod(); default boolean isAlive() { return asFixedNode().isAlive(); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/Invoke.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/Invoke.java index 27ac3141c03..abc805a3399 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/Invoke.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/Invoke.java @@ -42,9 +42,6 @@ public interface Invoke extends StateSplit, Lowerable, SingleMemoryKill, Deoptim CallTargetNode callTarget(); - @Override - int bci(); - Node predecessor(); ValueNode classInit(); @@ -67,13 +64,7 @@ public interface Invoke extends StateSplit, Lowerable, SingleMemoryKill, Deoptim return callTarget() != null ? callTarget().targetMethod() : null; } - /** - * Returns the {@linkplain ResolvedJavaMethod method} from which this invoke is executed. This - * is the caller method and in the case of inlining may be different from the method of the - * graph this node is in. - * - * @return the method from which this invoke is executed. - */ + @Override default ResolvedJavaMethod getContextMethod() { FrameState state = stateAfter(); if (state == null) { @@ -119,5 +110,4 @@ public interface Invoke extends StateSplit, Lowerable, SingleMemoryKill, Deoptim return callTarget().invokeKind(); } - void replaceBci(int newBci); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeNode.java index 7aff4c633f9..4099bd156b8 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeNode.java @@ -24,6 +24,7 @@ package org.graalvm.compiler.nodes; +import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE; import static org.graalvm.compiler.nodeinfo.InputType.Extension; import static org.graalvm.compiler.nodeinfo.InputType.Memory; import static org.graalvm.compiler.nodeinfo.InputType.State; @@ -50,7 +51,6 @@ import org.graalvm.compiler.nodes.java.MethodCallTargetNode; import org.graalvm.compiler.nodes.memory.AbstractMemoryCheckpoint; import org.graalvm.compiler.nodes.memory.SingleMemoryKill; import org.graalvm.compiler.nodes.spi.LIRLowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; import org.graalvm.compiler.nodes.spi.UncheckedInterfaceProvider; import jdk.internal.vm.compiler.word.LocationIdentity; @@ -112,12 +112,6 @@ public final class InvokeNode extends AbstractMemoryCheckpoint implements Invoke this.identity = invoke.getKilledLocationIdentity(); } - @Override - public void replaceBci(int newBci) { - assert BytecodeFrame.isPlaceholderBci(bci) && !BytecodeFrame.isPlaceholderBci(newBci) : "can only replace placeholder with better bci"; - bci = newBci; - } - @Override protected void afterClone(Node other) { updateInliningLogAfterClone(other); @@ -161,9 +155,11 @@ public final class InvokeNode extends AbstractMemoryCheckpoint implements Invoke @Override public boolean isAllowedUsageType(InputType type) { if (!super.isAllowedUsageType(type)) { - if (getStackKind() != JavaKind.Void) { - if (callTarget instanceof MethodCallTargetNode && ((MethodCallTargetNode) callTarget).targetMethod().getAnnotation(NodeIntrinsic.class) != null) { - return true; + if (!IS_IN_NATIVE_IMAGE) { + if (getStackKind() != JavaKind.Void) { + if (callTarget instanceof MethodCallTargetNode && ((MethodCallTargetNode) callTarget).targetMethod().getAnnotation(NodeIntrinsic.class) != null) { + return true; + } } } return false; @@ -185,11 +181,6 @@ public final class InvokeNode extends AbstractMemoryCheckpoint implements Invoke return identity; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @Override public void generate(NodeLIRBuilderTool gen) { gen.emitInvoke(this); @@ -211,6 +202,12 @@ public final class InvokeNode extends AbstractMemoryCheckpoint implements Invoke return bci; } + @Override + public void setBci(int newBci) { + assert BytecodeFrame.isPlaceholderBci(bci) && !BytecodeFrame.isPlaceholderBci(newBci) : "can only replace placeholder with better bci"; + bci = newBci; + } + @Override public boolean canDeoptimize() { return true; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeWithExceptionNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeWithExceptionNode.java index fc2178d2460..d68ca889453 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeWithExceptionNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeWithExceptionNode.java @@ -42,7 +42,6 @@ import org.graalvm.compiler.nodeinfo.Verbosity; import org.graalvm.compiler.nodes.java.MethodCallTargetNode; import org.graalvm.compiler.nodes.memory.SingleMemoryKill; import org.graalvm.compiler.nodes.spi.LIRLowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; import org.graalvm.compiler.nodes.spi.UncheckedInterfaceProvider; import org.graalvm.compiler.nodes.util.GraphUtil; @@ -51,13 +50,9 @@ import jdk.internal.vm.compiler.word.LocationIdentity; import jdk.vm.ci.code.BytecodeFrame; @NodeInfo(nameTemplate = "Invoke!#{p#targetMethod/s}", allowedUsageTypes = {Memory}, cycles = CYCLES_UNKNOWN, size = SIZE_UNKNOWN) -public final class InvokeWithExceptionNode extends ControlSplitNode implements Invoke, IterableNodeType, SingleMemoryKill, LIRLowerable, UncheckedInterfaceProvider { +public final class InvokeWithExceptionNode extends WithExceptionNode implements Invoke, IterableNodeType, SingleMemoryKill, LIRLowerable, UncheckedInterfaceProvider { public static final NodeClass TYPE = NodeClass.create(InvokeWithExceptionNode.class); - private static final double EXCEPTION_PROBA = 1e-5; - - @Successor AbstractBeginNode next; - @Successor AbstractBeginNode exceptionEdge; @OptionalInput ValueNode classInit; @Input(Extension) CallTargetNode callTarget; @OptionalInput(State) FrameState stateDuring; @@ -65,7 +60,6 @@ public final class InvokeWithExceptionNode extends ControlSplitNode implements I protected int bci; protected boolean polymorphic; protected boolean useForInlining; - protected double exceptionProbability; public InvokeWithExceptionNode(CallTargetNode callTarget, AbstractBeginNode exceptionEdge, int bci) { super(TYPE, callTarget.returnStamp().getTrustedStamp()); @@ -74,7 +68,6 @@ public final class InvokeWithExceptionNode extends ControlSplitNode implements I this.callTarget = callTarget; this.polymorphic = false; this.useForInlining = true; - this.exceptionProbability = EXCEPTION_PROBA; } @Override @@ -87,25 +80,6 @@ public final class InvokeWithExceptionNode extends ControlSplitNode implements I return this; } - public AbstractBeginNode exceptionEdge() { - return exceptionEdge; - } - - public void setExceptionEdge(AbstractBeginNode x) { - updatePredecessor(exceptionEdge, x); - exceptionEdge = x; - } - - @Override - public AbstractBeginNode next() { - return next; - } - - public void setNext(AbstractBeginNode x) { - updatePredecessor(next, x); - next = x; - } - @Override public CallTargetNode callTarget() { return callTarget; @@ -165,11 +139,6 @@ public final class InvokeWithExceptionNode extends ControlSplitNode implements I } } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @Override public void generate(NodeLIRBuilderTool gen) { gen.emitInvoke(this); @@ -205,12 +174,6 @@ public final class InvokeWithExceptionNode extends ControlSplitNode implements I return debugProperties; } - public void killExceptionEdge() { - AbstractBeginNode edge = exceptionEdge(); - setExceptionEdge(null); - GraphUtil.killCFG(edge); - } - @SuppressWarnings("try") public AbstractBeginNode killKillingBegin() { AbstractBeginNode begin = next(); @@ -227,16 +190,11 @@ public final class InvokeWithExceptionNode extends ControlSplitNode implements I } @Override - public void replaceBci(int newBci) { + public void setBci(int newBci) { assert BytecodeFrame.isPlaceholderBci(bci) && !BytecodeFrame.isPlaceholderBci(newBci) : "can only replace placeholder with better bci"; bci = newBci; } - @Override - public double probability(AbstractBeginNode successor) { - return successor == next ? 1 - exceptionProbability : exceptionProbability; - } - @Override public boolean canDeoptimize() { return true; @@ -253,11 +211,6 @@ public final class InvokeWithExceptionNode extends ControlSplitNode implements I this.stateDuring = stateDuring; } - @Override - public AbstractBeginNode getPrimarySuccessor() { - return this.next(); - } - @Override public Stamp uncheckedStamp() { return this.callTarget.returnStamp().getUncheckedStamp(); @@ -274,17 +227,6 @@ public final class InvokeWithExceptionNode extends ControlSplitNode implements I return classInit; } - @Override - public boolean setProbability(AbstractBeginNode successor, double value) { - // Cannot set probability for exception invokes. - return false; - } - - @Override - public int getSuccessorCount() { - return 2; - } - /** * Replaces this InvokeWithExceptionNode with a normal InvokeNode. Kills the exception dispatch * code. @@ -298,4 +240,9 @@ public final class InvokeWithExceptionNode extends ControlSplitNode implements I GraphUtil.killCFG(oldException); return newInvoke; } + + @Override + public InvokeNode replaceWithNonThrowing() { + return replaceWithInvoke(); + } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/KillingBeginNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/KillingBeginNode.java index 988c0c90ae8..bb21ae6cc60 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/KillingBeginNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/KillingBeginNode.java @@ -33,6 +33,10 @@ import org.graalvm.compiler.nodeinfo.NodeInfo; import org.graalvm.compiler.nodes.memory.SingleMemoryKill; import jdk.internal.vm.compiler.word.LocationIdentity; +/** + * A begin node that kills a single memory location. See {@link MultiKillingBeginNode} for a version + * with multiple killed locations. + */ @NodeInfo(allowedUsageTypes = {Memory}, cycles = CYCLES_0, size = SIZE_0) public final class KillingBeginNode extends AbstractBeginNode implements SingleMemoryKill { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopBeginNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopBeginNode.java index 724be7acf5e..46cb8facc43 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopBeginNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopBeginNode.java @@ -35,6 +35,7 @@ import org.graalvm.compiler.graph.iterators.NodeIterable; import org.graalvm.compiler.graph.spi.SimplifierTool; import org.graalvm.compiler.nodeinfo.InputType; import org.graalvm.compiler.nodeinfo.NodeInfo; +import org.graalvm.compiler.nodes.StructuredGraph.FrameStateVerificationFeature; import org.graalvm.compiler.nodes.calc.AddNode; import org.graalvm.compiler.nodes.extended.GuardingNode; import org.graalvm.compiler.nodes.spi.LIRLowerable; @@ -423,4 +424,9 @@ public final class LoopBeginNode extends AbstractMergeNode implements IterableNo public boolean isOsrLoop() { return osrLoop; } + + @Override + protected boolean verifyState() { + return !this.graph().getFrameStateVerification().implies(FrameStateVerificationFeature.LOOP_BEGINS) || super.verifyState(); + } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopExitNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopExitNode.java index 3592dba066e..04448c073ce 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopExitNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopExitNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -35,6 +35,7 @@ import org.graalvm.compiler.graph.iterators.NodeIterable; import org.graalvm.compiler.graph.spi.Simplifiable; import org.graalvm.compiler.graph.spi.SimplifierTool; import org.graalvm.compiler.nodeinfo.NodeInfo; +import org.graalvm.compiler.nodes.StructuredGraph.FrameStateVerificationFeature; import org.graalvm.compiler.nodes.util.GraphUtil; @NodeInfo(allowedUsageTypes = {Association}, cycles = CYCLES_0, size = SIZE_0) @@ -122,4 +123,15 @@ public final class LoopExitNode extends BeginStateSplitNode implements IterableN graph().removeFixed(begin); } } + + @Override + public boolean verify() { + /* + * State verification for loop exits is special in that loop exits with exception handling + * BCIs must not survive until code generation, thus they are cleared shortly before frame + * state assignment, thus we only verify them until their removal + */ + assert !this.graph().getFrameStateVerification().implies(FrameStateVerificationFeature.LOOP_EXITS) || this.stateAfter != null : "Loop exit must have a state until FSA " + this; + return super.verify(); + } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/MergeNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/MergeNode.java index fe5f4afed39..a49d9091596 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/MergeNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/MergeNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020, 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 @@ -53,6 +53,6 @@ public final class MergeNode extends AbstractMergeNode { @Override public boolean verify() { assertTrue(this.forwardEndCount() > 1, "Must merge more than one end."); - return true; + return super.verify(); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/MultiKillingBeginNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/MultiKillingBeginNode.java new file mode 100644 index 00000000000..aa6a82f4b2f --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/MultiKillingBeginNode.java @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.nodes; + +import static org.graalvm.compiler.nodeinfo.InputType.Memory; +import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0; +import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0; + +import org.graalvm.compiler.graph.NodeClass; +import org.graalvm.compiler.nodeinfo.NodeInfo; +import org.graalvm.compiler.nodes.memory.MultiMemoryKill; +import jdk.internal.vm.compiler.word.LocationIdentity; + +/** + * A begin node that kills multiple memory locations. See {@link KillingBeginNode} for a version + * with a single killed location. + */ +@NodeInfo(allowedUsageTypes = {Memory}, cycles = CYCLES_0, size = SIZE_0) +public final class MultiKillingBeginNode extends AbstractBeginNode implements MultiMemoryKill { + + public static final NodeClass TYPE = NodeClass.create(MultiKillingBeginNode.class); + protected LocationIdentity[] locationIdentities; + + public MultiKillingBeginNode(LocationIdentity[] locationIdentities) { + super(TYPE); + this.locationIdentities = locationIdentities; + } + + public static AbstractBeginNode begin(FixedNode with, LocationIdentity[] locationIdentities) { + if (with instanceof MultiKillingBeginNode) { + return (MultiKillingBeginNode) with; + } + AbstractBeginNode begin = with.graph().add(MultiKillingBeginNode.create(locationIdentities)); + begin.setNext(with); + return begin; + } + + public static AbstractBeginNode create(LocationIdentity[] locationIdentities) { + return new MultiKillingBeginNode(locationIdentities); + } + + @Override + public LocationIdentity[] getKilledLocationIdentities() { + return locationIdentities; + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/SafepointNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/SafepointNode.java index 0bb36daf736..b24e74c2303 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/SafepointNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/SafepointNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -32,7 +32,6 @@ import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.nodeinfo.NodeInfo; import org.graalvm.compiler.nodes.spi.LIRLowerable; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; /** @@ -51,11 +50,6 @@ public final class SafepointNode extends DeoptimizingFixedWithNextNode implement super(TYPE, StampFactory.forVoid()); } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @Override public void generate(NodeLIRBuilderTool gen) { gen.visitSafepointNode(this); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ShortCircuitOrNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ShortCircuitOrNode.java index 789f4c11959..233fef28a6a 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ShortCircuitOrNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ShortCircuitOrNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -29,6 +29,7 @@ import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0; import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0; import org.graalvm.compiler.core.common.spi.ConstantFieldProvider; +import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider; import org.graalvm.compiler.core.common.type.IntegerStamp; import org.graalvm.compiler.core.common.type.Stamp; import org.graalvm.compiler.graph.IterableNodeType; @@ -303,6 +304,11 @@ public final class ShortCircuitOrNode extends LogicNode implements IterableNodeT return tool.getConstantFieldProvider(); } + @Override + public MetaAccessExtensionProvider getMetaAccessExtensionProvider() { + return tool.getMetaAccessExtensionProvider(); + } + @Override public boolean canonicalizeReads() { return tool.canonicalizeReads(); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/SimplifyingGraphDecoder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/SimplifyingGraphDecoder.java index 0c43c9447d1..644d355b99a 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/SimplifyingGraphDecoder.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/SimplifyingGraphDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -30,28 +30,30 @@ import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED; import java.util.List; -import org.graalvm.compiler.core.common.spi.ConstantFieldProvider; import org.graalvm.compiler.core.common.type.Stamp; +import org.graalvm.compiler.debug.Assertions; import org.graalvm.compiler.debug.DebugCloseable; +import org.graalvm.compiler.graph.Edges; import org.graalvm.compiler.graph.Node; import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.graph.spi.Canonicalizable; import org.graalvm.compiler.graph.spi.CanonicalizerTool; +import org.graalvm.compiler.nodeinfo.InputType; import org.graalvm.compiler.nodeinfo.NodeInfo; import org.graalvm.compiler.nodes.calc.FloatingNode; +import org.graalvm.compiler.nodes.extended.AnchoringNode; import org.graalvm.compiler.nodes.extended.GuardingNode; import org.graalvm.compiler.nodes.extended.IntegerSwitchNode; import org.graalvm.compiler.nodes.java.ArrayLengthNode; import org.graalvm.compiler.nodes.java.LoadFieldNode; import org.graalvm.compiler.nodes.java.LoadIndexedNode; import org.graalvm.compiler.nodes.spi.CoreProviders; +import org.graalvm.compiler.nodes.spi.CoreProvidersDelegate; import org.graalvm.compiler.nodes.util.GraphUtil; import org.graalvm.compiler.options.OptionValues; import jdk.vm.ci.code.Architecture; import jdk.vm.ci.meta.Assumptions; -import jdk.vm.ci.meta.ConstantReflectionProvider; -import jdk.vm.ci.meta.MetaAccessProvider; /** * Graph decoder that simplifies nodes during decoding. The standard @@ -65,12 +67,13 @@ public class SimplifyingGraphDecoder extends GraphDecoder { protected final boolean canonicalizeReads; protected final CanonicalizerTool canonicalizerTool; - protected class PECanonicalizerTool implements CanonicalizerTool { + protected class PECanonicalizerTool extends CoreProvidersDelegate implements CanonicalizerTool { private final Assumptions assumptions; private final OptionValues options; public PECanonicalizerTool(Assumptions assumptions, OptionValues options) { + super(providers); this.assumptions = assumptions; this.options = options; } @@ -80,21 +83,6 @@ public class SimplifyingGraphDecoder extends GraphDecoder { return options; } - @Override - public MetaAccessProvider getMetaAccess() { - return providers.getMetaAccess(); - } - - @Override - public ConstantReflectionProvider getConstantReflection() { - return providers.getConstantReflection(); - } - - @Override - public ConstantFieldProvider getConstantFieldProvider() { - return providers.getConstantFieldProvider(); - } - @Override public boolean canonicalizeReads() { return canonicalizeReads; @@ -118,8 +106,8 @@ public class SimplifyingGraphDecoder extends GraphDecoder { } } - @NodeInfo(cycles = CYCLES_IGNORED, size = SIZE_IGNORED, allowedUsageTypes = {Guard}) - static class CanonicalizeToNullNode extends FloatingNode implements Canonicalizable, GuardingNode { + @NodeInfo(cycles = CYCLES_IGNORED, size = SIZE_IGNORED, allowedUsageTypes = {Guard, InputType.Anchor}) + static class CanonicalizeToNullNode extends FloatingNode implements Canonicalizable, GuardingNode, AnchoringNode { public static final NodeClass TYPE = NodeClass.create(CanonicalizeToNullNode.class); protected CanonicalizeToNullNode(Stamp stamp) { @@ -150,7 +138,7 @@ public class SimplifyingGraphDecoder extends GraphDecoder { if (mergeNode.forwardEndCount() == 1) { graph.reduceTrivialMerge(mergeNode); } - } else if (node instanceof BeginNode || node instanceof KillingBeginNode) { + } else if (node instanceof BeginNode || node instanceof KillingBeginNode || node instanceof MultiKillingBeginNode) { if (!(node.predecessor() instanceof ControlSplitNode) && node.hasNoUsages()) { GraphUtil.unlinkFixedNode((AbstractBeginNode) node); node.safeDelete(); @@ -199,6 +187,10 @@ public class SimplifyingGraphDecoder extends GraphDecoder { * @param node The node to be canonicalized. */ protected Node canonicalizeFixedNode(MethodScope methodScope, Node node) { + /* + * Duplicate cases for frequent classes (LoadFieldNode, LoadIndexedNode and ArrayLengthNode) + * to improve performance (Haeubl, 2017). + */ if (node instanceof LoadFieldNode) { LoadFieldNode loadFieldNode = (LoadFieldNode) node; return loadFieldNode.canonical(canonicalizerTool); @@ -222,36 +214,13 @@ public class SimplifyingGraphDecoder extends GraphDecoder { if (ifNode.condition() instanceof LogicNegationNode) { ifNode.eliminateNegation(); } - if (ifNode.condition() instanceof LogicConstantNode) { - boolean condition = ((LogicConstantNode) ifNode.condition()).getValue(); - AbstractBeginNode survivingSuccessor = ifNode.getSuccessor(condition); - AbstractBeginNode deadSuccessor = ifNode.getSuccessor(!condition); - - graph.removeSplit(ifNode, survivingSuccessor); - assert deadSuccessor.next() == null : "must not be parsed yet"; - deadSuccessor.safeDelete(); - } - return node; + return ifNode; } else if (node instanceof LoadIndexedNode) { LoadIndexedNode loadIndexedNode = (LoadIndexedNode) node; return loadIndexedNode.canonical(canonicalizerTool); } else if (node instanceof ArrayLengthNode) { ArrayLengthNode arrayLengthNode = (ArrayLengthNode) node; return arrayLengthNode.canonical(canonicalizerTool); - } else if (node instanceof IntegerSwitchNode && ((IntegerSwitchNode) node).value().isConstant()) { - IntegerSwitchNode switchNode = (IntegerSwitchNode) node; - int value = switchNode.value().asJavaConstant().asInt(); - AbstractBeginNode survivingSuccessor = switchNode.successorAtKey(value); - List allSuccessors = switchNode.successors().snapshot(); - - graph.removeSplit(switchNode, survivingSuccessor); - for (Node successor : allSuccessors) { - if (successor != survivingSuccessor) { - assert ((AbstractBeginNode) successor).next() == null : "must not be parsed yet"; - successor.safeDelete(); - } - } - return node; } else if (node instanceof Canonicalizable) { return ((Canonicalizable) node).canonical(canonicalizerTool); } else { @@ -259,6 +228,66 @@ public class SimplifyingGraphDecoder extends GraphDecoder { } } + @Override + protected boolean earlyCanonicalization(MethodScope methodScope, LoopScope loopScope, int nodeOrderId, FixedNode node) { + if (node instanceof IfNode && ((IfNode) node).condition() instanceof LogicConstantNode) { + IfNode ifNode = (IfNode) node; + + assert !(ifNode.condition() instanceof LogicNegationNode) : "Negation of a constant must have been canonicalized before"; + + int survivingIndex = ((LogicConstantNode) ifNode.condition()).getValue() ? 0 : 1; + + /* Check that the node has the expected encoding. */ + if (Assertions.assertionsEnabled()) { + Edges edges = ifNode.getNodeClass().getSuccessorEdges(); + assert edges.getDirectCount() == 2 : "IfNode expected to have 2 direct successors"; + assert edges.getName(0).equals("trueSuccessor") : "Unexpected IfNode encoding"; + assert edges.getName(1).equals("falseSuccessor") : "Unexpected IfNode encoding"; + assert edges.getCount() == 2 : "IntegerSwitchNode expected to have 0 indirect successor"; + } + + /* Read the surviving successor order id. */ + long successorsByteIndex = methodScope.reader.getByteIndex(); + methodScope.reader.setByteIndex(successorsByteIndex + survivingIndex * methodScope.orderIdWidth); + int survivingOrderId = readOrderId(methodScope); + methodScope.reader.setByteIndex(successorsByteIndex + 2 * methodScope.orderIdWidth); + + AbstractBeginNode survivingSuccessor = (AbstractBeginNode) makeStubNode(methodScope, loopScope, survivingOrderId); + graph.removeSplit(ifNode, survivingSuccessor); + return true; + } else if (node instanceof IntegerSwitchNode && ((IntegerSwitchNode) node).value().isConstant()) { + /* + * Avoid spawning all successors for trivially canonicalizable switches, this ensures + * that bytecode interpreters with huge switches do not allocate nodes that are removed + * straight away during PE. + */ + IntegerSwitchNode switchNode = (IntegerSwitchNode) node; + int value = switchNode.value().asJavaConstant().asInt(); + int survivingIndex = switchNode.successorIndexAtKey(value); + + /* Check that the node has the expected encoding. */ + if (Assertions.assertionsEnabled()) { + Edges edges = switchNode.getNodeClass().getSuccessorEdges(); + assert edges.getDirectCount() == 0 : "IntegerSwitchNode expected to have 0 direct successor"; + assert edges.getCount() == 1 : "IntegerSwitchNode expected to have 1 indirect successor"; + assert edges.getName(0).equals("successors") : "Unexpected IntegerSwitchNode encoding"; + } + + /* Read the surviving successor order id. */ + int size = methodScope.reader.getSVInt(); + long successorsByteIndex = methodScope.reader.getByteIndex(); + methodScope.reader.setByteIndex(successorsByteIndex + survivingIndex * methodScope.orderIdWidth); + int survivingOrderId = readOrderId(methodScope); + methodScope.reader.setByteIndex(successorsByteIndex + size * methodScope.orderIdWidth); + + AbstractBeginNode survivingSuccessor = (AbstractBeginNode) makeStubNode(methodScope, loopScope, survivingOrderId); + graph.removeSplit(switchNode, survivingSuccessor); + return true; + } else { + return false; + } + } + private static Node canonicalizeFixedNodeToNull(FixedNode node) { /* * When a node is unnecessary, we must not remove it right away because there might be nodes diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/SnippetAnchorNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/SnippetAnchorNode.java index c004c2c1700..3f867a5ee41 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/SnippetAnchorNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/SnippetAnchorNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -48,8 +48,8 @@ public final class SnippetAnchorNode extends FixedWithNextNode implements Simpli @Override public void simplify(SimplifierTool tool) { AbstractBeginNode prevBegin = AbstractBeginNode.prevBegin(this); - replaceAtUsages(Anchor, prevBegin); - replaceAtUsages(Guard, prevBegin); + replaceAtUsages(prevBegin, Anchor); + replaceAtUsages(prevBegin, Guard); if (tool.allUsagesAvailable() && hasNoUsages()) { graph().removeFixed(this); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java index 21d49cee950..8ca44d81db3 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java @@ -24,8 +24,11 @@ package org.graalvm.compiler.nodes; +import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE; + import java.util.ArrayList; import java.util.Collections; +import java.util.EnumSet; import java.util.Iterator; import java.util.List; import java.util.SortedSet; @@ -81,8 +84,7 @@ public final class StructuredGraph extends Graph implements JavaMethodContext { /** * The different stages of the compilation of a {@link Graph} regarding the status of * {@link GuardNode guards}, {@link DeoptimizingNode deoptimizations} and {@link FrameState - * framestates}. The stage of a graph progresses monotonously. - * + * frame states}. The stage of a graph progresses monotonously. */ public enum GuardsStage { /** @@ -344,6 +346,76 @@ public final class StructuredGraph extends Graph implements JavaMethodContext { private boolean isAfterFixedReadPhase = false; private boolean hasValueProxies = true; private boolean isAfterExpandLogic = false; + private FrameStateVerification frameStateVerification; + + /** + * Different node types verified during {@linkplain FrameStateVerification}. See + * {@linkplain FrameStateVerification} for details. + */ + public enum FrameStateVerificationFeature { + STATE_SPLITS, + MERGES, + LOOP_BEGINS, + LOOP_EXITS + } + + /** + * The different stages of the compilation of a {@link Graph} regarding the status of + * {@linkplain FrameState} verification of {@linkplain AbstractStateSplit} state after. + * Verification starts with the mode {@linkplain FrameStateVerification#ALL}, i.e., all state + * splits with side-effects, merges and loop exits need a proper state after. The verification + * mode progresses monotonously until the {@linkplain FrameStateVerification#NONE} mode is + * reached. From there on, no further {@linkplain AbstractStateSplit#stateAfter} verification + * happens. + */ + public enum FrameStateVerification { + /** + * Verify all {@linkplain AbstractStateSplit} nodes that return {@code true} for + * {@linkplain AbstractStateSplit#hasSideEffect()} have a + * {@linkplain AbstractStateSplit#stateAfter} assigned. Additionally, verify + * {@linkplain LoopExitNode} and {@linkplain AbstractMergeNode} have a valid + * {@linkplain AbstractStateSplit#stateAfter}. This is necessary to avoid missing + * {@linkplain FrameState} after optimizations. See {@link GraphUtil#mayRemoveSplit} for + * more details. + * + * This stage is the initial verification stage for every graph. + */ + ALL(EnumSet.allOf(FrameStateVerificationFeature.class)), + /** + * Same as {@linkplain #ALL} except that {@linkplain LoopExitNode} nodes are no longer + * verified. + */ + ALL_EXCEPT_LOOP_EXIT(EnumSet.complementOf(EnumSet.of(FrameStateVerificationFeature.LOOP_EXITS))), + /** + * Same as {@linkplain #ALL_EXCEPT_LOOP_EXIT} except that {@linkplain LoopBeginNode} are no + * longer verified. + */ + ALL_EXCEPT_LOOPS(EnumSet.complementOf(EnumSet.of(FrameStateVerificationFeature.LOOP_BEGINS, FrameStateVerificationFeature.LOOP_EXITS))), + /** + * Verification is disabled. Typically used after assigning {@linkplain FrameState} to + * {@linkplain DeoptimizeNode} or for {@linkplain Snippet} compilations. + */ + NONE(EnumSet.noneOf(FrameStateVerificationFeature.class)); + + private EnumSet features; + + FrameStateVerification(EnumSet features) { + this.features = features; + } + + /** + * Determines if the current verification mode implies this feature. + * + * @param feature the other verification feature to check + * @return {@code true} if this verification mode implies the feature, {@code false} + * otherwise + */ + boolean implies(FrameStateVerificationFeature feature) { + return this.features.contains(feature); + } + + } + private final boolean useProfilingInfo; private final Cancellable cancellable; private final boolean isSubstitution; @@ -415,17 +487,20 @@ public final class StructuredGraph extends Graph implements JavaMethodContext { this.isSubstitution = isSubstitution; assert checkIsSubstitutionInvariants(method, isSubstitution); this.cancellable = cancellable; - this.inliningLog = new InliningLog(rootMethod, GraalOptions.TraceInlining.getValue(options)); + this.inliningLog = new InliningLog(rootMethod, GraalOptions.TraceInlining.getValue(options), debug); this.callerContext = context; + this.frameStateVerification = isSubstitution ? FrameStateVerification.NONE : FrameStateVerification.ALL; } private static boolean checkIsSubstitutionInvariants(ResolvedJavaMethod method, boolean isSubstitution) { - if (method != null) { - if (method.getAnnotation(Snippet.class) != null || method.getAnnotation(MethodSubstitution.class) != null) { - assert isSubstitution : "Graph for method " + method.format("%H.%n(%p)") + - " annotated by " + Snippet.class.getName() + " or " + - MethodSubstitution.class.getName() + - " must have its `isSubstitution` field set to true"; + if (!IS_IN_NATIVE_IMAGE) { + if (method != null) { + if (method.getAnnotation(Snippet.class) != null || method.getAnnotation(MethodSubstitution.class) != null) { + assert isSubstitution : "Graph for method " + method.format("%H.%n(%p)") + + " annotated by " + Snippet.class.getName() + " or " + + MethodSubstitution.class.getName() + + " must have its `isSubstitution` field set to true"; + } } } return true; @@ -568,7 +643,7 @@ public final class StructuredGraph extends Graph implements JavaMethodContext { @SuppressWarnings("try") private StructuredGraph copy(String newName, Consumer> duplicationMapCallback, CompilationIdentifier newCompilationId, DebugContext debugForCopy) { - AllowAssumptions allowAssumptions = AllowAssumptions.ifNonNull(assumptions); + AllowAssumptions allowAssumptions = allowAssumptions(); StructuredGraph copy = new StructuredGraph(newName, method(), entryBCI, @@ -774,6 +849,17 @@ public final class StructuredGraph extends Graph implements JavaMethodContext { node.replaceAtUsagesAndDelete(replacement); } + @SuppressWarnings("static-method") + public void replaceWithExceptionSplit(WithExceptionNode node, WithExceptionNode replacement) { + assert node != null && replacement != null && node.isAlive() && replacement.isAlive() : "cannot replace " + node + " with " + replacement; + node.replaceAtPredecessor(replacement); + AbstractBeginNode next = node.next(); + AbstractBeginNode exceptionEdge = node.exceptionEdge(); + node.replaceAtUsagesAndDelete(replacement); + replacement.setNext(next); + replacement.setExceptionEdge(exceptionEdge); + } + @SuppressWarnings("static-method") public void addAfterFixed(FixedWithNextNode node, FixedNode newNode) { assert node != null && newNode != null && node.isAlive() && newNode.isAlive() : "cannot add " + newNode + " after " + node; @@ -936,6 +1022,16 @@ public final class StructuredGraph extends Graph implements JavaMethodContext { return assumptions; } + /** + * Returns the AllowAssumptions status for this graph. + * + * @return {@code AllowAssumptions.YES} if this graph allows recording assumptions, + * {@code AllowAssumptions.NO} otherwise + */ + public AllowAssumptions allowAssumptions() { + return AllowAssumptions.ifNonNull(assumptions); + } + /** * Checks that any method referenced from a {@link FrameState} is also in the set of methods * parsed while building this graph. @@ -1085,13 +1181,39 @@ public final class StructuredGraph extends Graph implements JavaMethodContext { return speculationLog; } + public FrameStateVerification getFrameStateVerification() { + return frameStateVerification; + } + + public void weakenFrameStateVerification(FrameStateVerification newFrameStateVerification) { + if (frameStateVerification == FrameStateVerification.NONE) { + return; + } + if (newFrameStateVerification == FrameStateVerification.NONE) { + /* + * Unit tests and substitution graphs can disable verification early on in the + * compilation pipeline. + */ + frameStateVerification = FrameStateVerification.NONE; + return; + } + assert frameStateVerification.ordinal() < newFrameStateVerification.ordinal() : "Old verification " + frameStateVerification + " must imply new verification " + newFrameStateVerification + + ", i.e., verification can only be relaxed over the course of compilation"; + frameStateVerification = newFrameStateVerification; + } + + public void disableFrameStateVerification() { + weakenFrameStateVerification(FrameStateVerification.NONE); + } + public void clearAllStateAfter() { + weakenFrameStateVerification(FrameStateVerification.NONE); for (Node node : getNodes()) { if (node instanceof StateSplit) { FrameState stateAfter = ((StateSplit) node).stateAfter(); if (stateAfter != null) { ((StateSplit) node).setStateAfter(null); - // 2 nodes referencing the same framestate + // 2 nodes referencing the same frame state if (stateAfter.isAlive()) { GraphUtil.killWithUnusedFloatingInputs(stateAfter); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/UnreachableBeginNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/UnreachableBeginNode.java new file mode 100644 index 00000000000..b356f1fa2da --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/UnreachableBeginNode.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.nodes; + +import org.graalvm.compiler.graph.NodeClass; +import org.graalvm.compiler.nodeinfo.NodeCycles; +import org.graalvm.compiler.nodeinfo.NodeInfo; +import org.graalvm.compiler.nodeinfo.NodeSize; +import org.graalvm.compiler.nodes.memory.SingleMemoryKill; +import jdk.internal.vm.compiler.word.LocationIdentity; + +/** + * Allows to build control flow structures that are syntactically correct (can be processed by all + * Graal phases) but known to be unreachable, i.e., known to be removed at a later point in the + * compilation pipeline. Useful together with {@link UnreachableControlSinkNode}. + */ +@NodeInfo(cycles = NodeCycles.CYCLES_IGNORED, size = NodeSize.SIZE_IGNORED) +public final class UnreachableBeginNode extends AbstractBeginNode implements SingleMemoryKill { + + public static final NodeClass TYPE = NodeClass.create(UnreachableBeginNode.class); + + public UnreachableBeginNode() { + super(TYPE); + } + + @Override + public LocationIdentity getKilledLocationIdentity() { + return LocationIdentity.any(); + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/UnreachableControlSinkNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/UnreachableControlSinkNode.java new file mode 100644 index 00000000000..d48747e5462 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/UnreachableControlSinkNode.java @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.nodes; + +import org.graalvm.compiler.core.common.type.StampFactory; +import org.graalvm.compiler.graph.NodeClass; +import org.graalvm.compiler.nodeinfo.NodeCycles; +import org.graalvm.compiler.nodeinfo.NodeInfo; +import org.graalvm.compiler.nodeinfo.NodeSize; + +/** + * See also {@link org.graalvm.compiler.nodes.UnreachableBeginNode}. + */ +@NodeInfo(cycles = NodeCycles.CYCLES_IGNORED, size = NodeSize.SIZE_IGNORED) +public final class UnreachableControlSinkNode extends ControlSinkNode { + + public static final NodeClass TYPE = NodeClass.create(UnreachableControlSinkNode.class); + + public UnreachableControlSinkNode() { + super(TYPE, StampFactory.forVoid()); + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/UnwindNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/UnwindNode.java index 958ec066012..3e9c48c3380 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/UnwindNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/UnwindNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -32,7 +32,6 @@ import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.nodeinfo.NodeInfo; import org.graalvm.compiler.nodes.spi.LIRLowerable; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; import jdk.vm.ci.meta.JavaKind; @@ -56,11 +55,6 @@ public final class UnwindNode extends ControlSinkNode implements Lowerable, LIRL this.exception = exception; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @Override public void generate(NodeLIRBuilderTool gen) { gen.getLIRGeneratorTool().emitUnwind(gen.operand(exception())); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/VirtualState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/VirtualState.java index c74ad9541f6..9a0097b451d 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/VirtualState.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/VirtualState.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -26,6 +26,7 @@ package org.graalvm.compiler.nodes; import org.graalvm.compiler.graph.Node; import org.graalvm.compiler.graph.NodeClass; +import org.graalvm.compiler.graph.Position; import org.graalvm.compiler.nodeinfo.InputType; import org.graalvm.compiler.nodeinfo.NodeInfo; @@ -47,6 +48,11 @@ public abstract class VirtualState extends Node { public abstract void apply(Node usage, T node); } + public abstract static class NodePositionClosure { + + public abstract void apply(T from, Position p); + } + public interface VirtualClosure { void apply(VirtualState node); @@ -54,7 +60,7 @@ public abstract class VirtualState extends Node { public abstract VirtualState duplicateWithVirtualState(); - public abstract void applyToNonVirtual(NodeClosure closure); + public abstract void applyToNonVirtual(NodePositionClosure closure); /** * Performs a pre-order iteration over all elements reachable from this state that are a diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/WithExceptionNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/WithExceptionNode.java new file mode 100644 index 00000000000..5723fe94b49 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/WithExceptionNode.java @@ -0,0 +1,126 @@ +/* + * Copyright (c) 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.nodes; + +import org.graalvm.compiler.core.common.type.Stamp; +import org.graalvm.compiler.graph.NodeClass; +import org.graalvm.compiler.nodeinfo.NodeInfo; +import org.graalvm.compiler.nodes.extended.ForeignCallWithExceptionNode; +import org.graalvm.compiler.nodes.memory.MultiMemoryKill; +import org.graalvm.compiler.nodes.memory.SingleMemoryKill; +import org.graalvm.compiler.nodes.util.GraphUtil; + +/** + * Base class for fixed nodes that have exactly two successors: A "next" successor for normal + * execution, and an "exception edge" successor for exceptional control flow. + */ +@NodeInfo +public abstract class WithExceptionNode extends ControlSplitNode { + + public static final NodeClass TYPE = NodeClass.create(WithExceptionNode.class); + + protected WithExceptionNode(NodeClass c, Stamp stamp) { + super(c, stamp); + } + + private static final double EXCEPTION_PROBABILITY = 1e-5; + + @Successor protected AbstractBeginNode next; + @Successor protected AbstractBeginNode exceptionEdge; + + public AbstractBeginNode next() { + return next; + } + + public void setNext(AbstractBeginNode x) { + updatePredecessor(next, x); + next = x; + } + + @Override + public AbstractBeginNode getPrimarySuccessor() { + return this.next(); + } + + public AbstractBeginNode exceptionEdge() { + return exceptionEdge; + } + + public void setExceptionEdge(AbstractBeginNode x) { + updatePredecessor(exceptionEdge, x); + exceptionEdge = x; + } + + public void killExceptionEdge() { + AbstractBeginNode edge = exceptionEdge(); + setExceptionEdge(null); + GraphUtil.killCFG(edge); + } + + @Override + public double probability(AbstractBeginNode successor) { + return successor == next ? 1 - EXCEPTION_PROBABILITY : EXCEPTION_PROBABILITY; + } + + @Override + public boolean setProbability(AbstractBeginNode successor, double value) { + // Cannot set probability for nodes with exceptions. + return false; + } + + @Override + public int getSuccessorCount() { + return 2; + } + + /** + * Converts this node into a variant with the same semantics but without an exception edge. The + * default implementation does not change the node class, but instead only marks the exception + * path as unused. A later lowering of the node needs to take care of the actual removal of the + * exception path, e.g., by lowering into a {@link ForeignCallWithExceptionNode}. + */ + public FixedNode replaceWithNonThrowing() { + killExceptionEdge(); + AbstractBeginNode newExceptionEdge = graph().add(new UnreachableBeginNode()); + newExceptionEdge.setNext(graph().add(new UnreachableControlSinkNode())); + setExceptionEdge(newExceptionEdge); + return this; + } + + /** + * Create a begin node appropriate as this node's next successor. In particular, if this node is + * a memory kill, this should create a {@link KillingBeginNode} or {@link MultiKillingBeginNode} + * with the appropriate location identities. + */ + public AbstractBeginNode createNextBegin() { + if (this instanceof SingleMemoryKill) { + return KillingBeginNode.create(((SingleMemoryKill) this).getKilledLocationIdentity()); + } else if (this instanceof MultiMemoryKill) { + return MultiKillingBeginNode.create(((MultiMemoryKill) this).getKilledLocationIdentities()); + } else { + return new BeginNode(); + } + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/FloatConvertNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/FloatConvertNode.java index a8158ff6f01..31f22a177bd 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/FloatConvertNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/FloatConvertNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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 @@ -39,7 +39,6 @@ import org.graalvm.compiler.nodes.NodeView; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; import jdk.vm.ci.meta.Constant; @@ -115,11 +114,6 @@ public final class FloatConvertNode extends UnaryArithmeticNode return this; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @Override public void generate(NodeLIRBuilderTool nodeValueMap, ArithmeticLIRGeneratorTool gen) { nodeValueMap.setResult(this, gen.emitFloatConvert(getFloatConvert(), nodeValueMap.operand(getValue()))); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerDivRemNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerDivRemNode.java index a3dcb813396..cb94c55314a 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerDivRemNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerDivRemNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -37,7 +37,6 @@ import org.graalvm.compiler.nodes.NodeView; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.extended.GuardingNode; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; @NodeInfo(cycles = CYCLES_32, size = SIZE_1) public abstract class IntegerDivRemNode extends FixedBinaryNode implements Lowerable, IterableNodeType { @@ -84,11 +83,6 @@ public abstract class IntegerDivRemNode extends FixedBinaryNode implements Lower return type; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @Override public boolean canDeoptimize() { return canDeopt; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/NegateNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/NegateNode.java index 66f3677177c..80eee5bd1de 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/NegateNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/NegateNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020, 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 @@ -31,6 +31,7 @@ import static org.graalvm.compiler.nodes.calc.BinaryArithmeticNode.getArithmetic import org.graalvm.compiler.core.common.type.ArithmeticOpTable; import org.graalvm.compiler.core.common.type.ArithmeticOpTable.UnaryOp; import org.graalvm.compiler.core.common.type.ArithmeticOpTable.UnaryOp.Neg; +import org.graalvm.compiler.core.common.type.IntegerStamp; import org.graalvm.compiler.core.common.type.FloatStamp; import org.graalvm.compiler.core.common.type.Stamp; import org.graalvm.compiler.graph.NodeClass; @@ -91,6 +92,17 @@ public final class NegateNode extends UnaryArithmeticNode implements Narrow SubNode sub = (SubNode) forValue; return SubNode.create(sub.getY(), sub.getX(), view); } + // e.g. -(x >> 31) => x >>> 31 + if (forValue instanceof RightShiftNode) { + RightShiftNode shift = (RightShiftNode) forValue; + Stamp stamp = forValue.stamp(view); + if (shift.getY().isConstant() && stamp instanceof IntegerStamp) { + int shiftAmount = shift.getY().asJavaConstant().asInt(); + if (shiftAmount == ((IntegerStamp) stamp).getBits() - 1) { + return UnsignedRightShiftNode.create(shift.getX(), shift.getY(), view); + } + } + } return null; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ObjectEqualsNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ObjectEqualsNode.java index 3a29e5b3a56..b990c3e5256 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ObjectEqualsNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ObjectEqualsNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -182,7 +182,8 @@ public final class ObjectEqualsNode extends PointerEqualsNode implements Virtual if (type.equals(metaAccess.lookupJavaType(Integer.class)) || type.equals(metaAccess.lookupJavaType(Long.class))) { // both are virtual without identity: check contents assert xVirtual.entryCount() == 1 && yVirtual.entryCount() == 1; - assert xVirtual.entryKind(0).getStackKind() == JavaKind.Int || xVirtual.entryKind(0) == JavaKind.Long; + assert xVirtual.entryKind(tool.getMetaAccessExtensionProvider(), 0).getStackKind() == JavaKind.Int || + xVirtual.entryKind(tool.getMetaAccessExtensionProvider(), 0) == JavaKind.Long; return new IntegerEqualsNode(tool.getEntry(xVirtual, 0), tool.getEntry(yVirtual, 0)); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/RemNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/RemNode.java index 4f68c75d806..eba5fda066d 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/RemNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/RemNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -37,7 +37,6 @@ import org.graalvm.compiler.nodes.ConstantNode; import org.graalvm.compiler.nodes.NodeView; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; @NodeInfo(shortName = "%", cycles = CYCLES_32/* div */) @@ -68,11 +67,6 @@ public class RemNode extends BinaryArithmeticNode implements Lowerable { return table.getRem(); } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @Override public void generate(NodeLIRBuilderTool nodeValueMap, ArithmeticLIRGeneratorTool gen) { nodeValueMap.setResult(this, gen.emitRem(nodeValueMap.operand(getX()), nodeValueMap.operand(getY()), null)); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnpackEndianHalfNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnpackEndianHalfNode.java index 89a8c3a02a4..2b4c7a6c7e8 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnpackEndianHalfNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnpackEndianHalfNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, 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 @@ -36,7 +36,6 @@ import org.graalvm.compiler.nodes.ConstantNode; import org.graalvm.compiler.nodes.NodeView; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import jdk.vm.ci.meta.JavaKind; @@ -75,11 +74,6 @@ public final class UnpackEndianHalfNode extends UnaryNode implements Lowerable { return this; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - public void lower(ByteOrder byteOrder) { ValueNode result = value; if (value.getStackKind() == JavaKind.Double) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/Block.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/Block.java index 15328068f0f..3dbf483a0a6 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/Block.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/Block.java @@ -35,9 +35,9 @@ import org.graalvm.compiler.nodeinfo.Verbosity; import org.graalvm.compiler.nodes.AbstractBeginNode; import org.graalvm.compiler.nodes.FixedNode; import org.graalvm.compiler.nodes.FixedWithNextNode; -import org.graalvm.compiler.nodes.InvokeWithExceptionNode; import org.graalvm.compiler.nodes.LoopBeginNode; import org.graalvm.compiler.nodes.LoopEndNode; +import org.graalvm.compiler.nodes.WithExceptionNode; import org.graalvm.compiler.nodes.memory.MultiMemoryKill; import org.graalvm.compiler.nodes.memory.SingleMemoryKill; import jdk.internal.vm.compiler.word.LocationIdentity; @@ -95,7 +95,7 @@ public final class Block extends AbstractBlockBase { @Override public boolean isExceptionEntry() { Node predecessor = getBeginNode().predecessor(); - return predecessor != null && predecessor instanceof InvokeWithExceptionNode && getBeginNode() == ((InvokeWithExceptionNode) predecessor).exceptionEdge(); + return predecessor != null && predecessor instanceof WithExceptionNode && getBeginNode() == ((WithExceptionNode) predecessor).exceptionEdge(); } public Block getFirstPredecessor() { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/SideEffectNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/SideEffectNode.java index efac73c8003..3526c5be067 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/SideEffectNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/SideEffectNode.java @@ -64,7 +64,9 @@ public class SideEffectNode extends AbstractMemoryCheckpoint implements LIRLower @Override public void generate(NodeLIRBuilderTool generator) { - generator.setResult(this, generator.operand(value)); + if (value != null) { + generator.setResult(this, generator.operand(value)); + } } @Override diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/StringToBytesNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/StringToBytesNode.java index 3da87f5a2c6..d9f099b349f 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/StringToBytesNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/StringToBytesNode.java @@ -35,7 +35,6 @@ import org.graalvm.compiler.nodes.FixedWithNextNode; import org.graalvm.compiler.nodes.NamedLocationIdentity; import org.graalvm.compiler.nodes.memory.SingleMemoryKill; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import jdk.internal.vm.compiler.word.LocationIdentity; import jdk.vm.ci.meta.JavaKind; @@ -60,11 +59,6 @@ public final class StringToBytesNode extends FixedWithNextNode implements Lowera return value; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @Override public LocationIdentity getKilledLocationIdentity() { return NamedLocationIdentity.getArrayLocation(JavaKind.Byte); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/VerifyHeapNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/VerifyHeapNode.java index f4bc85ec1d3..8692a4b1780 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/VerifyHeapNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/VerifyHeapNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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 @@ -34,7 +34,6 @@ import org.graalvm.compiler.nodes.FixedNode; import org.graalvm.compiler.nodes.FixedWithNextNode; import org.graalvm.compiler.nodes.StructuredGraph; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; /** * A node for platform dependent verification of the Java heap. Intended to be used for debugging @@ -54,11 +53,6 @@ public final class VerifyHeapNode extends FixedWithNextNode implements Lowerable super(TYPE, StampFactory.forVoid()); } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - public static void addBefore(FixedNode position) { StructuredGraph graph = position.graph(); graph.addBeforeFixed(position, graph.add(new VerifyHeapNode())); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/AbstractBoxingNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/AbstractBoxingNode.java new file mode 100644 index 00000000000..da6220976f6 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/AbstractBoxingNode.java @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.nodes.extended; + +import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2; +import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2; + +import org.graalvm.compiler.core.common.type.Stamp; +import org.graalvm.compiler.debug.GraalError; +import org.graalvm.compiler.graph.NodeClass; +import org.graalvm.compiler.graph.spi.Canonicalizable; +import org.graalvm.compiler.nodeinfo.InputType; +import org.graalvm.compiler.nodeinfo.NodeInfo; +import org.graalvm.compiler.nodes.FixedWithNextNode; +import org.graalvm.compiler.nodes.ValueNode; +import org.graalvm.compiler.nodes.ValueNodeUtil; +import org.graalvm.compiler.nodes.memory.MemoryAccess; +import org.graalvm.compiler.nodes.memory.MemoryKill; +import org.graalvm.compiler.nodes.spi.Lowerable; +import org.graalvm.compiler.nodes.spi.Virtualizable; +import jdk.internal.vm.compiler.word.LocationIdentity; + +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.ResolvedJavaType; + +@NodeInfo(cycles = CYCLES_2, size = SIZE_2) +public abstract class AbstractBoxingNode extends FixedWithNextNode implements Virtualizable, Lowerable, Canonicalizable.Unary, MemoryAccess { + public static final NodeClass TYPE = NodeClass.create(AbstractBoxingNode.class); + + @Input protected ValueNode value; + protected final JavaKind boxingKind; + protected final LocationIdentity accessedLocation; + + public AbstractBoxingNode(NodeClass c, ValueNode value, JavaKind boxingKind, Stamp s, LocationIdentity accessedLocation) { + super(c, s); + this.value = value; + this.boxingKind = boxingKind; + this.accessedLocation = accessedLocation; + } + + public static ResolvedJavaField getValueField(ResolvedJavaType resultType) { + for (ResolvedJavaField f : resultType.getInstanceFields(false)) { + if (f.getName().equals("value")) { + return f; + } + } + throw GraalError.shouldNotReachHere(); + } + + @Override + public ValueNode getValue() { + return value; + } + + public JavaKind getBoxingKind() { + return boxingKind; + } + + @Override + public MemoryKill getLastLocationAccess() { + return lastLocationAccess; + } + + @OptionalInput(InputType.Memory) MemoryKill lastLocationAccess; + + @Override + public void setLastLocationAccess(MemoryKill newlla) { + updateUsages(ValueNodeUtil.asNode(lastLocationAccess), ValueNodeUtil.asNode(newlla)); + lastLocationAccess = newlla; + } + + @Override + public LocationIdentity getLocationIdentity() { + return accessedLocation; + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BoxNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BoxNode.java index 2481ddbf556..235e1879e42 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BoxNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BoxNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -33,18 +33,20 @@ import org.graalvm.compiler.core.common.type.TypeReference; import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.graph.spi.Canonicalizable; import org.graalvm.compiler.graph.spi.CanonicalizerTool; +import org.graalvm.compiler.nodeinfo.InputType; import org.graalvm.compiler.nodeinfo.NodeCycles; import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.FixedWithNextNode; +import org.graalvm.compiler.nodes.FieldLocationIdentity; import org.graalvm.compiler.nodes.NodeView; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.java.MonitorIdNode; +import org.graalvm.compiler.nodes.memory.SingleMemoryKill; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.nodes.spi.VirtualizableAllocation; import org.graalvm.compiler.nodes.spi.VirtualizerTool; import org.graalvm.compiler.nodes.type.StampTool; import org.graalvm.compiler.nodes.virtual.VirtualBoxingNode; +import jdk.internal.vm.compiler.word.LocationIdentity; import jdk.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.ResolvedJavaType; @@ -53,35 +55,25 @@ import jdk.vm.ci.meta.ResolvedJavaType; * This node represents the boxing of a primitive value. This corresponds to a call to the valueOf * methods in Integer, Long, etc. */ -@NodeInfo(cycles = NodeCycles.CYCLES_8, size = SIZE_8) -public class BoxNode extends FixedWithNextNode implements VirtualizableAllocation, Lowerable, Canonicalizable.Unary { +@NodeInfo(cycles = NodeCycles.CYCLES_8, size = SIZE_8, allowedUsageTypes = {InputType.Memory, InputType.Value}) +public abstract class BoxNode extends AbstractBoxingNode implements VirtualizableAllocation, Lowerable, Canonicalizable.Unary { public static final NodeClass TYPE = NodeClass.create(BoxNode.class); - @Input private ValueNode value; - protected final JavaKind boxingKind; - public BoxNode(ValueNode value, ResolvedJavaType resultType, JavaKind boxingKind) { + private BoxNode(ValueNode value, ResolvedJavaType resultType, JavaKind boxingKind) { this(TYPE, value, resultType, boxingKind); } - public BoxNode(NodeClass c, ValueNode value, ResolvedJavaType resultType, JavaKind boxingKind) { - super(c, StampFactory.objectNonNull(TypeReference.createExactTrusted(resultType))); + private BoxNode(NodeClass c, ValueNode value, ResolvedJavaType resultType, JavaKind boxingKind) { + super(c, value, boxingKind, StampFactory.objectNonNull(TypeReference.createExactTrusted(resultType)), new FieldLocationIdentity(getValueField(resultType))); this.value = value; - this.boxingKind = boxingKind; } - public JavaKind getBoxingKind() { - return boxingKind; - } - - @Override - public ValueNode getValue() { - return value; - } - - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); + public static BoxNode create(ValueNode value, ResolvedJavaType resultType, JavaKind boxingKind) { + if (boxingKind == JavaKind.Boolean) { + return new PureBoxNode(value, resultType, boxingKind); + } + return new AllocatingBoxNode(value, resultType, boxingKind); } @Override @@ -108,4 +100,34 @@ public class BoxNode extends FixedWithNextNode implements VirtualizableAllocatio tool.createVirtualObject(newVirtual, new ValueNode[]{alias}, Collections. emptyList(), false); tool.replaceWithVirtual(newVirtual); } + + @NodeInfo(cycles = NodeCycles.CYCLES_8, size = SIZE_8, allowedUsageTypes = {InputType.Memory, InputType.Value}) + private static class PureBoxNode extends BoxNode { + public static final NodeClass TYPE = NodeClass.create(PureBoxNode.class); + + protected PureBoxNode(ValueNode value, ResolvedJavaType resultType, JavaKind boxingKind) { + super(TYPE, value, resultType, boxingKind); + } + + } + + @NodeInfo(cycles = NodeCycles.CYCLES_8, size = SIZE_8, allowedUsageTypes = {InputType.Memory, InputType.Value}) + private static class AllocatingBoxNode extends BoxNode implements SingleMemoryKill { + public static final NodeClass TYPE = NodeClass.create(AllocatingBoxNode.class); + + protected AllocatingBoxNode(ValueNode value, ResolvedJavaType resultType, JavaKind boxingKind) { + super(TYPE, value, resultType, boxingKind); + } + + @Override + public LocationIdentity getLocationIdentity() { + return LocationIdentity.INIT_LOCATION; + } + + @Override + public LocationIdentity getKilledLocationIdentity() { + return getLocationIdentity(); + } + + } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BytecodeExceptionNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BytecodeExceptionNode.java index ff3c8a5f73a..cbeff5abc6f 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BytecodeExceptionNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BytecodeExceptionNode.java @@ -43,7 +43,6 @@ import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.memory.AbstractMemoryCheckpoint; import org.graalvm.compiler.nodes.memory.SingleMemoryKill; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import jdk.internal.vm.compiler.word.LocationIdentity; import jdk.vm.ci.meta.JavaKind; @@ -114,11 +113,6 @@ public final class BytecodeExceptionNode extends AbstractMemoryCheckpoint implem return this; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - public NodeInputList getArguments() { return arguments; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/FixedValueAnchorNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/FixedValueAnchorNode.java index 7a2339b7c31..6071beaa58f 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/FixedValueAnchorNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/FixedValueAnchorNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -28,6 +28,7 @@ import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0; import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0; import org.graalvm.compiler.core.common.type.Stamp; +import org.graalvm.compiler.core.common.type.StampFactory; import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.nodeinfo.NodeInfo; import org.graalvm.compiler.nodes.FixedWithNextNode; @@ -41,7 +42,7 @@ import org.graalvm.compiler.nodes.spi.ValueProxy; public class FixedValueAnchorNode extends FixedWithNextNode implements LIRLowerable, ValueProxy, GuardingNode { public static final NodeClass TYPE = NodeClass.create(FixedValueAnchorNode.class); - @Input ValueNode object; + @OptionalInput ValueNode object; private Stamp predefinedStamp; public ValueNode object() { @@ -49,7 +50,7 @@ public class FixedValueAnchorNode extends FixedWithNextNode implements LIRLowera } protected FixedValueAnchorNode(NodeClass c, ValueNode object) { - super(c, object.stamp(NodeView.DEFAULT)); + super(c, object == null ? StampFactory.forVoid() : object.stamp(NodeView.DEFAULT)); this.object = object; } @@ -65,7 +66,7 @@ public class FixedValueAnchorNode extends FixedWithNextNode implements LIRLowera @Override public boolean inferStamp() { - if (predefinedStamp == null) { + if (predefinedStamp == null && object != null) { return updateStamp(stamp.join(object.stamp(NodeView.DEFAULT))); } else { return false; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ForeignCall.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ForeignCall.java new file mode 100644 index 00000000000..3c08d683520 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ForeignCall.java @@ -0,0 +1,96 @@ +/* + * Copyright (c) 2011, 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.nodes.extended; + +import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; +import org.graalvm.compiler.graph.NodeInputList; +import org.graalvm.compiler.nodes.DeoptBciSupplier; +import org.graalvm.compiler.nodes.DeoptimizingNode; +import org.graalvm.compiler.nodes.FrameState; +import org.graalvm.compiler.nodes.StateSplit; +import org.graalvm.compiler.nodes.ValueNode; +import org.graalvm.compiler.nodes.memory.MultiMemoryKill; +import org.graalvm.compiler.nodes.spi.LIRLowerable; +import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; +import jdk.internal.vm.compiler.word.LocationIdentity; + +import jdk.vm.ci.code.BytecodeFrame; +import jdk.vm.ci.meta.Value; + +/** + * Interface for all nodes implementing a {@linkplain ForeignCallDescriptor foreign} call. Provides + * implementations for several operations concerning foreign calls. + */ +public interface ForeignCall extends LIRLowerable, DeoptimizingNode.DeoptDuring, MultiMemoryKill, StateSplit, DeoptBciSupplier { + + NodeInputList getArguments(); + + @Override + void setBci(int bci); + + ForeignCallDescriptor getDescriptor(); + + @Override + default LocationIdentity[] getKilledLocationIdentities() { + return getDescriptor().getKilledLocations(); + } + + default Value[] operands(NodeLIRBuilderTool gen) { + Value[] operands = new Value[getArguments().size()]; + for (int i = 0; i < operands.length; i++) { + operands[i] = gen.operand(getArguments().get(i)); + } + return operands; + } + + @Override + default void computeStateDuring(FrameState currentStateAfter) { + assert stateDuring() == null; + FrameState newStateDuring; + if ((currentStateAfter.stackSize() > 0 && currentStateAfter.stackAt(currentStateAfter.stackSize() - 1) == this) || + (currentStateAfter.stackSize() > 1 && currentStateAfter.stackAt(currentStateAfter.stackSize() - 2) == this)) { + // The result of this call is on the top of stack, so roll back to the previous bci. + assert bci() != BytecodeFrame.UNKNOWN_BCI : this; + newStateDuring = currentStateAfter.duplicateModified(currentStateAfter.graph(), bci(), false, true, this.asNode().getStackKind(), null, null); + } else { + newStateDuring = currentStateAfter; + } + setStateDuring(newStateDuring); + } + + @Override + default boolean canDeoptimize() { + return getDescriptor().canDeoptimize(); + } + + default boolean isGuaranteedSafepoint() { + return getDescriptor().isGuaranteedSafepoint(); + } + + @Override + default void generate(NodeLIRBuilderTool gen) { + gen.emitForeignCall(this); + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ForeignCallNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ForeignCallNode.java index 80045679fcf..718cfa2899d 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ForeignCallNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ForeignCallNode.java @@ -32,7 +32,7 @@ import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2; import java.util.List; import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; +import org.graalvm.compiler.core.common.spi.ForeignCallSignature; import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; import org.graalvm.compiler.core.common.type.Stamp; import org.graalvm.compiler.core.common.type.StampFactory; @@ -40,21 +40,15 @@ import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.graph.NodeInputList; import org.graalvm.compiler.nodeinfo.NodeInfo; import org.graalvm.compiler.nodeinfo.Verbosity; -import org.graalvm.compiler.nodes.DeoptimizingNode; import org.graalvm.compiler.nodes.FrameState; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; import org.graalvm.compiler.nodes.memory.AbstractMemoryCheckpoint; -import org.graalvm.compiler.nodes.memory.MultiMemoryKill; -import org.graalvm.compiler.nodes.spi.LIRLowerable; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; -import jdk.internal.vm.compiler.word.LocationIdentity; import jdk.vm.ci.code.BytecodeFrame; import jdk.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.ResolvedJavaMethod; import jdk.vm.ci.meta.ResolvedJavaType; -import jdk.vm.ci.meta.Value; /** * Node for a {@linkplain ForeignCallDescriptor foreign} call. @@ -67,27 +61,33 @@ import jdk.vm.ci.meta.Value; size = SIZE_2, sizeRationale = "Rough estimation of the call operation itself.") // @formatter:on -public class ForeignCallNode extends AbstractMemoryCheckpoint implements LIRLowerable, DeoptimizingNode.DeoptDuring, MultiMemoryKill { +public class ForeignCallNode extends AbstractMemoryCheckpoint implements ForeignCall { public static final NodeClass TYPE = NodeClass.create(ForeignCallNode.class); @Input protected NodeInputList arguments; @OptionalInput(State) protected FrameState stateDuring; - protected final ForeignCallsProvider foreignCalls; protected final ForeignCallDescriptor descriptor; protected int bci = BytecodeFrame.UNKNOWN_BCI; public static boolean intrinsify(GraphBuilderContext b, ResolvedJavaMethod targetMethod, @InjectedNodeParameter Stamp returnStamp, @InjectedNodeParameter ForeignCallsProvider foreignCalls, - ForeignCallDescriptor descriptor, ValueNode... arguments) { - if (!foreignCalls.isAvailable(descriptor)) { - // When using encoded snippets a graph main contain a reference to a foreign call that's - // not actually available in the current configuration. It's assumed that further - // simplification of the graph will eliminate this call completely. - return false; - } + ForeignCallSignature signature, ValueNode... arguments) { + ForeignCallDescriptor descriptor = foreignCalls.getDescriptor(signature); + return doIntrinsify(b, targetMethod, returnStamp, descriptor, arguments, false); + } - ForeignCallNode node = new ForeignCallNode(foreignCalls, descriptor, arguments); - node.setStamp(returnStamp); + public static boolean intrinsify(GraphBuilderContext b, ResolvedJavaMethod targetMethod, @InjectedNodeParameter Stamp returnStamp, ForeignCallDescriptor descriptor, ValueNode... arguments) { + return doIntrinsify(b, targetMethod, returnStamp, descriptor, arguments, false); + } + + static boolean doIntrinsify(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Stamp returnStamp, ForeignCallDescriptor descriptor, ValueNode[] arguments, boolean withException) { + ForeignCall node; + if (withException) { + node = new ForeignCallWithExceptionNode(descriptor, arguments); + } else { + node = new ForeignCallNode(descriptor, arguments); + } + node.asNode().setStamp(returnStamp); assert verifyDescriptor(b, targetMethod, descriptor); @@ -103,9 +103,9 @@ public class ForeignCallNode extends AbstractMemoryCheckpoint implements LIRLowe JavaKind returnKind = targetMethod.getSignature().getReturnKind(); if (returnKind == JavaKind.Void) { - b.add(node); + b.add(node.asNode()); } else { - b.addPush(returnKind, node); + b.addPush(returnKind, node.asNode()); } return true; @@ -122,65 +122,44 @@ public class ForeignCallNode extends AbstractMemoryCheckpoint implements LIRLowe return true; } - public ForeignCallNode(ForeignCallsProvider foreignCalls, ForeignCallDescriptor descriptor, ValueNode... arguments) { - this(TYPE, foreignCalls, descriptor, arguments); + public ForeignCallNode(ForeignCallsProvider foreignCalls, ForeignCallSignature signature, ValueNode... arguments) { + this(TYPE, foreignCalls.getDescriptor(signature), arguments); } - public ForeignCallNode(ForeignCallsProvider foreignCalls, ForeignCallDescriptor descriptor, Stamp stamp, List arguments) { + public ForeignCallNode(ForeignCallDescriptor descriptor, ValueNode... arguments) { + this(TYPE, descriptor, arguments); + } + + public ForeignCallNode(ForeignCallDescriptor descriptor, Stamp stamp, List arguments) { super(TYPE, stamp); this.arguments = new NodeInputList<>(this, arguments); this.descriptor = descriptor; - this.foreignCalls = foreignCalls; assert descriptor.getArgumentTypes().length == this.arguments.size() : "wrong number of arguments to " + this; } - public ForeignCallNode(ForeignCallsProvider foreignCalls, ForeignCallDescriptor descriptor, Stamp stamp) { + public ForeignCallNode(ForeignCallDescriptor descriptor, Stamp stamp) { super(TYPE, stamp); this.arguments = new NodeInputList<>(this); this.descriptor = descriptor; - this.foreignCalls = foreignCalls; } - protected ForeignCallNode(NodeClass c, ForeignCallsProvider foreignCalls, ForeignCallDescriptor descriptor, ValueNode... arguments) { + protected ForeignCallNode(NodeClass c, ForeignCallDescriptor descriptor, ValueNode... arguments) { super(c, StampFactory.forKind(JavaKind.fromJavaClass(descriptor.getResultType()))); this.arguments = new NodeInputList<>(this, arguments); this.descriptor = descriptor; - this.foreignCalls = foreignCalls; assert descriptor.getArgumentTypes().length == this.arguments.size() : "wrong number of arguments to " + this; } @Override public boolean hasSideEffect() { - return !foreignCalls.isReexecutable(descriptor); + return !descriptor.isReexecutable(); } + @Override public ForeignCallDescriptor getDescriptor() { return descriptor; } - @Override - public LocationIdentity[] getKilledLocationIdentities() { - return foreignCalls.getKilledLocations(descriptor); - } - - protected Value[] operands(NodeLIRBuilderTool gen) { - Value[] operands = new Value[arguments.size()]; - for (int i = 0; i < operands.length; i++) { - operands[i] = gen.operand(arguments.get(i)); - } - return operands; - } - - @Override - public void generate(NodeLIRBuilderTool gen) { - ForeignCallLinkage linkage = gen.getLIRGeneratorTool().getForeignCalls().lookupForeignCall(descriptor); - Value[] operands = operands(gen); - Value result = gen.getLIRGeneratorTool().emitForeignCall(linkage, gen.state(this), operands); - if (result != null) { - gen.setResult(this, result); - } - } - @Override public void setStateAfter(FrameState x) { assert hasSideEffect() || x == null; @@ -198,31 +177,20 @@ public class ForeignCallNode extends AbstractMemoryCheckpoint implements LIRLowe this.stateDuring = stateDuring; } - public int getBci() { + @Override + public int bci() { return bci; } - /** - * Set the {@code bci} of the invoke bytecode for use when converting a stateAfter into a - * stateDuring. - */ + @Override public void setBci(int bci) { assert this.bci == BytecodeFrame.UNKNOWN_BCI || this.bci == bci; this.bci = bci; } @Override - public void computeStateDuring(FrameState currentStateAfter) { - FrameState newStateDuring; - if ((currentStateAfter.stackSize() > 0 && currentStateAfter.stackAt(currentStateAfter.stackSize() - 1) == this) || - (currentStateAfter.stackSize() > 1 && currentStateAfter.stackAt(currentStateAfter.stackSize() - 2) == this)) { - // The result of this call is on the top of stack, so roll back to the previous bci. - assert bci != BytecodeFrame.UNKNOWN_BCI : this; - newStateDuring = currentStateAfter.duplicateModified(currentStateAfter.graph(), bci, false, true, this.getStackKind(), null, null); - } else { - newStateDuring = currentStateAfter; - } - setStateDuring(newStateDuring); + public NodeInputList getArguments() { + return arguments; } @Override @@ -232,17 +200,4 @@ public class ForeignCallNode extends AbstractMemoryCheckpoint implements LIRLowe } return super.toString(verbosity); } - - @Override - public boolean canDeoptimize() { - return foreignCalls.canDeoptimize(descriptor); - } - - public boolean isGuaranteedSafepoint() { - return foreignCalls.isGuaranteedSafepoint(descriptor); - } - - public NodeInputList getArguments() { - return arguments; - } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ForeignCallWithExceptionNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ForeignCallWithExceptionNode.java new file mode 100644 index 00000000000..50bef788af4 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ForeignCallWithExceptionNode.java @@ -0,0 +1,174 @@ +/* + * Copyright (c) 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.nodes.extended; + +import static org.graalvm.compiler.nodeinfo.InputType.Memory; +import static org.graalvm.compiler.nodeinfo.InputType.State; +import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2; +import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2; + +import java.util.Arrays; + +import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; +import org.graalvm.compiler.core.common.type.Stamp; +import org.graalvm.compiler.core.common.type.StampFactory; +import org.graalvm.compiler.graph.NodeClass; +import org.graalvm.compiler.graph.NodeInputList; +import org.graalvm.compiler.graph.spi.Simplifiable; +import org.graalvm.compiler.graph.spi.SimplifierTool; +import org.graalvm.compiler.nodeinfo.NodeInfo; +import org.graalvm.compiler.nodeinfo.Verbosity; +import org.graalvm.compiler.nodes.AbstractBeginNode; +import org.graalvm.compiler.nodes.FixedNode; +import org.graalvm.compiler.nodes.FrameState; +import org.graalvm.compiler.nodes.MultiKillingBeginNode; +import org.graalvm.compiler.nodes.UnreachableBeginNode; +import org.graalvm.compiler.nodes.ValueNode; +import org.graalvm.compiler.nodes.WithExceptionNode; +import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import org.graalvm.compiler.nodes.util.GraphUtil; + +import jdk.vm.ci.code.BytecodeFrame; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.ResolvedJavaMethod; + +/** + * Node for a {@linkplain ForeignCallDescriptor foreign} call with an {@linkplain WithExceptionNode + * exception edge}. + */ +// @formatter:off +@NodeInfo(nameTemplate = "ForeignCallWithException#{p#descriptor/s}", + allowedUsageTypes = Memory, + cycles = CYCLES_2, + cyclesRationale = "Rough estimation of the call operation itself.", + size = SIZE_2, + sizeRationale = "Rough estimation of the call operation itself.") +// @formatter:on +public class ForeignCallWithExceptionNode extends WithExceptionNode implements ForeignCall, Simplifiable { + public static final NodeClass TYPE = NodeClass.create(ForeignCallWithExceptionNode.class); + + @Input protected NodeInputList arguments; + @OptionalInput(State) protected FrameState stateDuring; + @OptionalInput(State) protected FrameState stateAfter; + + protected final ForeignCallDescriptor descriptor; + protected int bci = BytecodeFrame.UNKNOWN_BCI; + + public static boolean intrinsify(GraphBuilderContext b, ResolvedJavaMethod targetMethod, @InjectedNodeParameter Stamp returnStamp, ForeignCallDescriptor descriptor, ValueNode... arguments) { + return ForeignCallNode.doIntrinsify(b, targetMethod, returnStamp, descriptor, arguments, true); + } + + public ForeignCallWithExceptionNode(ForeignCallDescriptor descriptor, ValueNode... arguments) { + this(TYPE, descriptor, arguments); + } + + protected ForeignCallWithExceptionNode(NodeClass c, ForeignCallDescriptor descriptor, ValueNode... arguments) { + super(c, StampFactory.forKind(JavaKind.fromJavaClass(descriptor.getResultType()))); + this.arguments = new NodeInputList<>(this, arguments); + this.descriptor = descriptor; + assert descriptor.getArgumentTypes().length == this.arguments.size() : "wrong number of arguments to " + this; + } + + @Override + public boolean hasSideEffect() { + return !descriptor.isReexecutable(); + } + + @Override + public ForeignCallDescriptor getDescriptor() { + return descriptor; + } + + @Override + public FrameState stateAfter() { + return stateAfter; + } + + @Override + public void setStateAfter(FrameState stateAfter) { + assert hasSideEffect() || stateAfter == null; + updateUsages(this.stateAfter(), stateAfter); + this.stateAfter = stateAfter; + } + + @Override + public FrameState stateDuring() { + return stateDuring; + } + + @Override + public void setStateDuring(FrameState stateDuring) { + updateUsages(this.stateDuring, stateDuring); + this.stateDuring = stateDuring; + } + + @Override + public int bci() { + return bci; + } + + @Override + public void setBci(int bci) { + assert this.bci == BytecodeFrame.UNKNOWN_BCI || this.bci == bci; + this.bci = bci; + } + + @Override + public String toString(Verbosity verbosity) { + if (verbosity == Verbosity.Name) { + return super.toString(verbosity) + "#" + descriptor; + } + return super.toString(verbosity); + } + + @Override + public NodeInputList getArguments() { + return arguments; + } + + @Override + public void simplify(SimplifierTool tool) { + if (exceptionEdge instanceof UnreachableBeginNode) { + FixedNode replacement = replaceWithNonThrowing(); + tool.addToWorkList(replacement); + } + } + + @Override + public FixedNode replaceWithNonThrowing() { + ForeignCallNode foreignCall = this.asNode().graph().add(new ForeignCallNode(descriptor, stamp, arguments)); + foreignCall.setStateAfter(stateAfter()); + foreignCall.setStateDuring(stateDuring()); + + AbstractBeginNode nextBegin = this.next; + AbstractBeginNode oldException = this.exceptionEdge; + graph().replaceSplitWithFixed(this, foreignCall, nextBegin); + GraphUtil.killCFG(oldException); + if (nextBegin instanceof MultiKillingBeginNode && Arrays.equals(((MultiKillingBeginNode) nextBegin).getKilledLocationIdentities(), this.getKilledLocationIdentities())) { + foreignCall.graph().removeFixed(nextBegin); + } + return foreignCall; + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/GetClassNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/GetClassNode.java index c70cfdc3916..9c548317387 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/GetClassNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/GetClassNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -38,7 +38,6 @@ import org.graalvm.compiler.nodes.NodeView; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.calc.FloatingNode; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.nodes.spi.Virtualizable; import org.graalvm.compiler.nodes.spi.VirtualizerTool; import org.graalvm.compiler.nodes.virtual.VirtualObjectNode; @@ -66,11 +65,6 @@ public final class GetClassNode extends FloatingNode implements Lowerable, Canon assert ((ObjectStamp) object.stamp(NodeView.DEFAULT)).nonNull(); } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - public static ValueNode tryFold(MetaAccessProvider metaAccess, ConstantReflectionProvider constantReflection, NodeView view, ValueNode object) { if (metaAccess != null && object != null && object.stamp(view) instanceof ObjectStamp) { ObjectStamp objectStamp = (ObjectStamp) object.stamp(view); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/IntegerSwitchNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/IntegerSwitchNode.java index f93167a4b8f..8bf3ed70582 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/IntegerSwitchNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/IntegerSwitchNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020, 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 @@ -69,12 +69,19 @@ public final class IntegerSwitchNode extends SwitchNode implements LIRLowerable, public static final NodeClass TYPE = NodeClass.create(IntegerSwitchNode.class); protected final int[] keys; + /** + * True if keys are contiguous ([n, n+1, n+2, n+3, ..., n+k]). + * + * When this is the case, we can lookup successor index in O(1). + */ + protected final boolean areKeysContiguous; public IntegerSwitchNode(ValueNode value, AbstractBeginNode[] successors, int[] keys, double[] keyProbabilities, int[] keySuccessors) { super(TYPE, value, successors, keySuccessors, keyProbabilities); assert keySuccessors.length == keys.length + 1; assert keySuccessors.length == keyProbabilities.length; this.keys = keys; + areKeysContiguous = keys.length < 2 || keys[keys.length - 1] - keys[0] + 1 == keys.length; assert value.stamp(NodeView.DEFAULT) instanceof PrimitiveStamp && value.stamp(NodeView.DEFAULT).getStackKind().isNumericInteger(); assert assertSorted(); assert assertNoUntargettedSuccessor(); @@ -151,10 +158,12 @@ public final class IntegerSwitchNode extends SwitchNode implements LIRLowerable, } public int successorIndexAtKey(int key) { - for (int i = 0; i < keyCount(); i++) { - if (keys[i] == key) { - return keySuccessorIndex(i); - } + if (areKeysContiguous && keys[0] <= key && key <= keys[keys.length - 1]) { + return keySuccessorIndex(key - keys[0]); + } + int index = Arrays.binarySearch(keys, key); + if (index >= 0) { + return keySuccessorIndex(index); } return keySuccessorIndex(keyCount()); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/JavaReadNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/JavaReadNode.java index 91964cd8e52..24bb7b6de36 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/JavaReadNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/JavaReadNode.java @@ -38,7 +38,6 @@ import org.graalvm.compiler.nodes.memory.FixedAccessNode; import org.graalvm.compiler.nodes.memory.ReadNode; import org.graalvm.compiler.nodes.memory.address.AddressNode; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import jdk.internal.vm.compiler.word.LocationIdentity; import jdk.vm.ci.meta.JavaKind; @@ -64,11 +63,6 @@ public final class JavaReadNode extends FixedAccessNode implements Lowerable, Gu this.compressible = compressible; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @Override public boolean canNullCheck() { return true; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/JavaWriteNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/JavaWriteNode.java index 3b12c2962c5..cccbee9ba18 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/JavaWriteNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/JavaWriteNode.java @@ -35,7 +35,6 @@ import org.graalvm.compiler.nodes.memory.MemoryAccess; import org.graalvm.compiler.nodes.memory.SingleMemoryKill; import org.graalvm.compiler.nodes.memory.address.AddressNode; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import jdk.internal.vm.compiler.word.LocationIdentity; import jdk.vm.ci.meta.JavaKind; @@ -50,16 +49,20 @@ public final class JavaWriteNode extends AbstractWriteNode implements Lowerable, public static final NodeClass TYPE = NodeClass.create(JavaWriteNode.class); protected final JavaKind writeKind; protected final boolean compressible; + protected final boolean hasSideEffect; + + public JavaWriteNode(JavaKind writeKind, AddressNode address, LocationIdentity location, ValueNode value, BarrierType barrierType, boolean compressible, boolean hasSideEffect) { + super(TYPE, address, location, value, barrierType); + this.writeKind = writeKind; + this.compressible = compressible; + this.hasSideEffect = hasSideEffect; + } public JavaWriteNode(JavaKind writeKind, AddressNode address, LocationIdentity location, ValueNode value, BarrierType barrierType, boolean compressible) { super(TYPE, address, location, value, barrierType); this.writeKind = writeKind; this.compressible = compressible; - } - - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); + this.hasSideEffect = true; } @Override @@ -84,4 +87,9 @@ public final class JavaWriteNode extends AbstractWriteNode implements Lowerable, public Stamp getAccessStamp(NodeView view) { return value().stamp(view); } + + @Override + public boolean hasSideEffect() { + return hasSideEffect; + } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadArrayComponentHubNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadArrayComponentHubNode.java index 594056173a1..a8a7f5627c4 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadArrayComponentHubNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadArrayComponentHubNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -37,7 +37,6 @@ import org.graalvm.compiler.nodes.ConstantNode; import org.graalvm.compiler.nodes.FixedWithNextNode; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.nodes.spi.StampProvider; import jdk.vm.ci.meta.ConstantReflectionProvider; @@ -75,11 +74,6 @@ public final class LoadArrayComponentHubNode extends FixedWithNextNode implement return value; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @Override public Node canonical(CanonicalizerTool tool, ValueNode forValue) { return findSynonym(this, forValue, stamp, tool.getMetaAccess(), tool.getConstantReflection()); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadHubNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadHubNode.java index 631a6285046..84db2e5050e 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadHubNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadHubNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -41,7 +41,6 @@ import org.graalvm.compiler.nodes.NodeView; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.calc.FloatingNode; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.nodes.spi.StampProvider; import org.graalvm.compiler.nodes.spi.Virtualizable; import org.graalvm.compiler.nodes.spi.VirtualizerTool; @@ -90,11 +89,6 @@ public final class LoadHubNode extends FloatingNode implements Lowerable, Canoni this.value = value; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @Override public ValueNode canonical(CanonicalizerTool tool) { if (!GeneratePIC.getValue(tool.getOptions())) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadHubOrNullNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadHubOrNullNode.java index d9eb146a559..54f9cd06f95 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadHubOrNullNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadHubOrNullNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -41,7 +41,6 @@ import org.graalvm.compiler.nodes.NodeView; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.calc.FloatingNode; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.nodes.spi.StampProvider; import org.graalvm.compiler.nodes.spi.Virtualizable; import org.graalvm.compiler.nodes.spi.VirtualizerTool; @@ -90,11 +89,6 @@ public final class LoadHubOrNullNode extends FloatingNode implements Lowerable, this.value = value; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @Override public ValueNode canonical(CanonicalizerTool tool) { if (!GeneratePIC.getValue(tool.getOptions())) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadMethodNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadMethodNode.java index d9795ffb779..5eb3b6f953b 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadMethodNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadMethodNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -40,7 +40,6 @@ import org.graalvm.compiler.nodes.FixedWithNextNode; import org.graalvm.compiler.nodes.NodeView; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.nodes.type.StampTool; import jdk.vm.ci.meta.Assumptions; @@ -82,11 +81,6 @@ public final class LoadMethodNode extends FixedWithNextNode implements Lowerable } } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @Override public Node canonical(CanonicalizerTool tool) { if (hub instanceof LoadHubNode) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/OSRStartNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/OSRStartNode.java index f5b1edbd4fd..ccb982f6b0d 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/OSRStartNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/OSRStartNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -29,7 +29,6 @@ import org.graalvm.compiler.graph.iterators.NodeIterable; import org.graalvm.compiler.nodeinfo.NodeInfo; import org.graalvm.compiler.nodes.StartNode; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; @NodeInfo public final class OSRStartNode extends StartNode implements Lowerable { @@ -39,11 +38,6 @@ public final class OSRStartNode extends StartNode implements Lowerable { super(TYPE); } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - public NodeIterable getOSRLocals() { return usages().filter(OSRLocalNode.class); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawLoadNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawLoadNode.java index 34803a25d16..1d2d93d90f5 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawLoadNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawLoadNode.java @@ -41,7 +41,6 @@ import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.calc.ReinterpretNode; import org.graalvm.compiler.nodes.java.LoadFieldNode; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.nodes.spi.Virtualizable; import org.graalvm.compiler.nodes.spi.VirtualizerTool; import org.graalvm.compiler.nodes.type.StampTool; @@ -87,11 +86,6 @@ public class RawLoadNode extends UnsafeAccessNode implements Lowerable, Virtuali super(c, StampFactory.forKind(accessKind.getStackKind()), object, offset, accessKind, locationIdentity, false); } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @Override public void virtualize(VirtualizerTool tool) { ValueNode alias = tool.getAlias(object()); @@ -104,9 +98,9 @@ public class RawLoadNode extends UnsafeAccessNode implements Lowerable, Virtuali if (entryIndex != -1) { ValueNode entry = tool.getEntry(virtual, entryIndex); - JavaKind entryKind = virtual.entryKind(entryIndex); + JavaKind entryKind = virtual.entryKind(tool.getMetaAccessExtensionProvider(), entryIndex); - if (virtual.isVirtualByteArrayAccess(accessKind())) { + if (virtual.isVirtualByteArrayAccess(tool.getMetaAccessExtensionProvider(), accessKind())) { if (virtual.canVirtualizeLargeByteArrayUnsafeRead(entry, entryIndex, accessKind(), tool)) { tool.replaceWith(VirtualArrayNode.virtualizeByteArrayRead(entry, accessKind(), stamp)); } @@ -138,6 +132,11 @@ public class RawLoadNode extends UnsafeAccessNode implements Lowerable, Virtuali } } + @Override + public boolean isVolatile() { + return false; + } + @Override public Node canonical(CanonicalizerTool tool) { if (!isAnyLocationForced() && getLocationIdentity().isAny()) { @@ -171,7 +170,10 @@ public class RawLoadNode extends UnsafeAccessNode implements Lowerable, Virtuali } @Override - protected ValueNode cloneAsArrayAccess(ValueNode location, LocationIdentity identity) { + protected ValueNode cloneAsArrayAccess(ValueNode location, LocationIdentity identity, boolean volatileAccess) { + if (volatileAccess) { + return new RawVolatileLoadNode(object(), location, accessKind(), identity); + } return new RawLoadNode(object(), location, accessKind(), identity); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawStoreNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawStoreNode.java index c8278df0b02..10fe57e5dca 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawStoreNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawStoreNode.java @@ -37,7 +37,6 @@ import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.java.StoreFieldNode; import org.graalvm.compiler.nodes.memory.SingleMemoryKill; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.nodes.spi.Virtualizable; import org.graalvm.compiler.nodes.spi.VirtualizerTool; import org.graalvm.compiler.nodes.virtual.VirtualObjectNode; @@ -58,21 +57,32 @@ public final class RawStoreNode extends UnsafeAccessNode implements StateSplit, @Input ValueNode value; @OptionalInput(State) FrameState stateAfter; private final boolean needsBarrier; + private boolean isVolatile; public RawStoreNode(ValueNode object, ValueNode offset, ValueNode value, JavaKind accessKind, LocationIdentity locationIdentity) { - this(object, offset, value, accessKind, locationIdentity, true); + this(object, offset, value, accessKind, locationIdentity, true, false, null, false); } public RawStoreNode(ValueNode object, ValueNode offset, ValueNode value, JavaKind accessKind, LocationIdentity locationIdentity, boolean needsBarrier) { - this(object, offset, value, accessKind, locationIdentity, needsBarrier, null, false); + this(object, offset, value, accessKind, locationIdentity, needsBarrier, false, null, false); + } + + public RawStoreNode(ValueNode object, ValueNode offset, ValueNode value, JavaKind accessKind, LocationIdentity locationIdentity, boolean needsBarrier, boolean isVolatile) { + this(object, offset, value, accessKind, locationIdentity, needsBarrier, isVolatile, null, false); } public RawStoreNode(ValueNode object, ValueNode offset, ValueNode value, JavaKind accessKind, LocationIdentity locationIdentity, boolean needsBarrier, FrameState stateAfter, boolean forceAnyLocation) { + this(object, offset, value, accessKind, locationIdentity, needsBarrier, false, stateAfter, forceAnyLocation); + } + + public RawStoreNode(ValueNode object, ValueNode offset, ValueNode value, JavaKind accessKind, LocationIdentity locationIdentity, boolean needsBarrier, boolean isVolatile, FrameState stateAfter, + boolean forceAnyLocation) { super(TYPE, StampFactory.forVoid(), object, offset, accessKind, locationIdentity, forceAnyLocation); this.value = value; this.needsBarrier = needsBarrier; this.stateAfter = stateAfter; + this.isVolatile = isVolatile; assert accessKind != JavaKind.Void && accessKind != JavaKind.Illegal; } @@ -111,11 +121,6 @@ public final class RawStoreNode extends UnsafeAccessNode implements StateSplit, return value; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @Override public void virtualize(VirtualizerTool tool) { ValueNode alias = tool.getAlias(object()); @@ -132,14 +137,19 @@ public final class RawStoreNode extends UnsafeAccessNode implements StateSplit, } } + @Override + public boolean isVolatile() { + return isVolatile; + } + @Override protected ValueNode cloneAsFieldAccess(Assumptions assumptions, ResolvedJavaField field, boolean volatileAccess) { return new StoreFieldNode(field.isStatic() ? null : object(), field, value(), stateAfter(), volatileAccess); } @Override - protected ValueNode cloneAsArrayAccess(ValueNode location, LocationIdentity identity) { - return new RawStoreNode(object(), location, value, accessKind(), identity, needsBarrier, stateAfter(), isAnyLocationForced()); + protected ValueNode cloneAsArrayAccess(ValueNode location, LocationIdentity identity, boolean volatileAccess) { + return new RawStoreNode(object(), location, value, accessKind(), identity, needsBarrier, volatileAccess, stateAfter(), isAnyLocationForced()); } public FrameState getState() { @@ -148,6 +158,9 @@ public final class RawStoreNode extends UnsafeAccessNode implements StateSplit, @Override public LocationIdentity getKilledLocationIdentity() { + if (isVolatile()) { + return LocationIdentity.any(); + } return getLocationIdentity(); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawVolatileLoadNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawVolatileLoadNode.java new file mode 100644 index 00000000000..ebff295b9ad --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawVolatileLoadNode.java @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, Red Hat Inc. 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + + +package org.graalvm.compiler.nodes.extended; + +import jdk.vm.ci.meta.JavaKind; +import org.graalvm.compiler.graph.NodeClass; +import org.graalvm.compiler.nodeinfo.NodeInfo; +import org.graalvm.compiler.nodes.ValueNode; +import org.graalvm.compiler.nodes.memory.SingleMemoryKill; +import jdk.internal.vm.compiler.word.LocationIdentity; + +import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2; +import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1; + +@NodeInfo(cycles = CYCLES_2, size = SIZE_1) +public class RawVolatileLoadNode extends RawLoadNode implements SingleMemoryKill { + public static final NodeClass TYPE = NodeClass.create(RawVolatileLoadNode.class); + + public RawVolatileLoadNode(ValueNode object, ValueNode offset, JavaKind accessKind, LocationIdentity locationIdentity) { + super(TYPE, object, offset, accessKind, locationIdentity); + } + + @Override + public LocationIdentity getKilledLocationIdentity() { + return LocationIdentity.any(); + } + + @Override + public boolean isVolatile() { + return true; + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/StateSplitProxyNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/StateSplitProxyNode.java index 284ddc178d2..b2738ed508a 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/StateSplitProxyNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/StateSplitProxyNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -82,7 +82,7 @@ public final class StateSplitProxyNode extends FixedValueAnchorNode implements C @Override public Node canonical(CanonicalizerTool tool) { - if (object.isConstant() && !delayElimination || stateAfter == null) { + if (!delayElimination && (object != null && object.isConstant()) || stateAfter == null) { return object; } return this; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/StoreHubNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/StoreHubNode.java index f8d371ec31e..3a629daf26b 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/StoreHubNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/StoreHubNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -30,13 +30,12 @@ import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1; import org.graalvm.compiler.core.common.type.StampFactory; import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.FixedWithNextNode; +import org.graalvm.compiler.nodes.AbstractStateSplit; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; @NodeInfo(cycles = CYCLES_2, size = SIZE_1) -public final class StoreHubNode extends FixedWithNextNode implements Lowerable { +public final class StoreHubNode extends AbstractStateSplit implements Lowerable { public static final NodeClass TYPE = NodeClass.create(StoreHubNode.class); @Input ValueNode value; @@ -56,11 +55,7 @@ public final class StoreHubNode extends FixedWithNextNode implements Lowerable { this.object = object; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @NodeIntrinsic public static native void write(Object object, Object value); + } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnboxNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnboxNode.java index b73795dcb92..a36f53e7845 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnboxNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnboxNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -31,12 +31,12 @@ import org.graalvm.compiler.core.common.type.StampFactory; import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.graph.spi.Canonicalizable; import org.graalvm.compiler.graph.spi.CanonicalizerTool; +import org.graalvm.compiler.nodeinfo.InputType; import org.graalvm.compiler.nodeinfo.NodeInfo; import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.FixedWithNextNode; +import org.graalvm.compiler.nodes.FieldLocationIdentity; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.nodes.spi.Virtualizable; import org.graalvm.compiler.nodes.spi.VirtualizerTool; import org.graalvm.compiler.nodes.type.StampTool; @@ -48,22 +48,21 @@ import jdk.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.MetaAccessProvider; import jdk.vm.ci.meta.ResolvedJavaType; -@NodeInfo(cycles = CYCLES_2, size = SIZE_2) -public final class UnboxNode extends FixedWithNextNode implements Virtualizable, Lowerable, Canonicalizable.Unary { +@NodeInfo(cycles = CYCLES_2, size = SIZE_2, allowedUsageTypes = {InputType.Memory, InputType.Value}) +public final class UnboxNode extends AbstractBoxingNode implements Virtualizable, Lowerable, Canonicalizable.Unary { public static final NodeClass TYPE = NodeClass.create(UnboxNode.class); - @Input protected ValueNode value; - protected final JavaKind boxingKind; - @Override - public ValueNode getValue() { - return value; + public UnboxNode(ValueNode value, JavaKind boxingKind, FieldLocationIdentity location) { + super(TYPE, value, boxingKind, StampFactory.forKind(boxingKind.getStackKind()), location); } - public UnboxNode(ValueNode value, JavaKind boxingKind) { - super(TYPE, StampFactory.forKind(boxingKind.getStackKind())); - this.value = value; - this.boxingKind = boxingKind; + public UnboxNode(ValueNode value, JavaKind boxingKind, MetaAccessProvider metaAccess) { + super(TYPE, value, boxingKind, StampFactory.forKind(boxingKind.getStackKind()), new FieldLocationIdentity(getValueField(getResultType(metaAccess, boxingKind)))); + } + + private static ResolvedJavaType getResultType(MetaAccessProvider metaAccess, JavaKind boxingKind) { + return metaAccess.lookupJavaType(boxingKind.toBoxedJavaClass()); } public static ValueNode create(MetaAccessProvider metaAccess, ConstantReflectionProvider constantReflection, ValueNode value, JavaKind boxingKind) { @@ -71,16 +70,12 @@ public final class UnboxNode extends FixedWithNextNode implements Virtualizable, if (synonym != null) { return synonym; } - return new UnboxNode(value, boxingKind); - } - - public JavaKind getBoxingKind() { - return boxingKind; + return new UnboxNode(value, boxingKind, metaAccess); } @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); + public ValueNode getValue() { + return value; } @Override @@ -123,4 +118,5 @@ public final class UnboxNode extends FixedWithNextNode implements Virtualizable, } return null; } + } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeAccessNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeAccessNode.java index 7fb4441c880..8423c989100 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeAccessNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeAccessNode.java @@ -58,6 +58,8 @@ public abstract class UnsafeAccessNode extends FixedWithNextNode implements Cano protected final LocationIdentity locationIdentity; protected final boolean forceAnyLocation; + public abstract boolean isVolatile(); + protected UnsafeAccessNode(NodeClass c, Stamp stamp, ValueNode object, ValueNode offset, JavaKind accessKind, LocationIdentity locationIdentity, boolean forceAnyLocation) { super(c, stamp); @@ -109,11 +111,7 @@ public abstract class UnsafeAccessNode extends FixedWithNextNode implements Cano // this is never a valid access of an arbitrary address. if (field != null && field.getJavaKind() == this.accessKind()) { assert !graph().isAfterFloatingReadPhase() : "cannot add more precise memory location after floating read phase"; - // Unsafe accesses never have volatile semantics. - // Memory barriers are placed around such an unsafe access at construction - // time if necessary, unlike AccessFieldNodes which encapsulate their - // potential volatile semantics. - return cloneAsFieldAccess(graph().getAssumptions(), field, false); + return cloneAsFieldAccess(graph().getAssumptions(), field, isVolatile()); } } } @@ -122,7 +120,7 @@ public abstract class UnsafeAccessNode extends FixedWithNextNode implements Cano if (receiverType != null && receiverType.isArray()) { LocationIdentity identity = NamedLocationIdentity.getArrayLocation(receiverType.getComponentType().getJavaKind()); assert !graph().isAfterFloatingReadPhase() : "cannot add more precise memory location after floating read phase"; - return cloneAsArrayAccess(offset(), identity); + return cloneAsArrayAccess(offset(), identity, isVolatile()); } } @@ -135,7 +133,7 @@ public abstract class UnsafeAccessNode extends FixedWithNextNode implements Cano protected abstract ValueNode cloneAsFieldAccess(Assumptions assumptions, ResolvedJavaField field, boolean volatileAccess); - protected abstract ValueNode cloneAsArrayAccess(ValueNode location, LocationIdentity identity); + protected abstract ValueNode cloneAsArrayAccess(ValueNode location, LocationIdentity identity, boolean volatileAccess); /** * In this method we check if the unsafe access is to a static field. This is the case when diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeMemoryLoadNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeMemoryLoadNode.java index 264aef9ea27..88b97cd6d01 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeMemoryLoadNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeMemoryLoadNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -33,7 +33,6 @@ import org.graalvm.compiler.nodeinfo.NodeInfo; import org.graalvm.compiler.nodes.FixedWithNextNode; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import jdk.internal.vm.compiler.word.LocationIdentity; import jdk.vm.ci.meta.JavaKind; @@ -65,11 +64,6 @@ public class UnsafeMemoryLoadNode extends FixedWithNextNode implements Lowerable return kind; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - public LocationIdentity getLocationIdentity() { return locationIdentity; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeMemoryStoreNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeMemoryStoreNode.java index d80b1cfa99a..f3f0fd6e954 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeMemoryStoreNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeMemoryStoreNode.java @@ -34,7 +34,6 @@ import org.graalvm.compiler.nodes.AbstractStateSplit; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.memory.SingleMemoryKill; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import jdk.internal.vm.compiler.word.LocationIdentity; import jdk.vm.ci.meta.JavaKind; @@ -71,11 +70,6 @@ public class UnsafeMemoryStoreNode extends AbstractStateSplit implements Lowerab return kind; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @Override public LocationIdentity getKilledLocationIdentity() { return locationIdentity; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/ForeignCallPlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/ForeignCallPlugin.java index bc346933f0a..5cf53c5156d 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/ForeignCallPlugin.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/ForeignCallPlugin.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -25,7 +25,6 @@ package org.graalvm.compiler.nodes.graphbuilderconf; import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; -import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.extended.ForeignCallNode; @@ -35,17 +34,15 @@ import jdk.vm.ci.meta.ResolvedJavaMethod; * {@link InvocationPlugin} for converting a method call directly to a foreign call. */ public final class ForeignCallPlugin implements InvocationPlugin { - private final ForeignCallsProvider foreignCalls; private final ForeignCallDescriptor descriptor; - public ForeignCallPlugin(ForeignCallsProvider foreignCalls, ForeignCallDescriptor descriptor) { - this.foreignCalls = foreignCalls; + public ForeignCallPlugin(ForeignCallDescriptor descriptor) { this.descriptor = descriptor; } @Override public boolean execute(GraphBuilderContext b, ResolvedJavaMethod targetMethod, InvocationPlugin.Receiver receiver, ValueNode[] args) { - ForeignCallNode foreignCall = new ForeignCallNode(foreignCalls, descriptor, args); + ForeignCallNode foreignCall = new ForeignCallNode(descriptor, args); foreignCall.setBci(b.bci()); b.addPush(targetMethod.getSignature().getReturnKind(), foreignCall); return true; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java index 82fe65c10ff..c7d082548b7 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -37,11 +37,13 @@ import org.graalvm.compiler.core.common.type.StampPair; import org.graalvm.compiler.debug.GraalError; import org.graalvm.compiler.nodes.AbstractBeginNode; import org.graalvm.compiler.nodes.AbstractMergeNode; +import org.graalvm.compiler.nodes.BeginNode; import org.graalvm.compiler.nodes.CallTargetNode; import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind; import org.graalvm.compiler.nodes.ConstantNode; import org.graalvm.compiler.nodes.DynamicPiNode; import org.graalvm.compiler.nodes.FixedGuardNode; +import org.graalvm.compiler.nodes.IfNode; import org.graalvm.compiler.nodes.Invoke; import org.graalvm.compiler.nodes.LogicNode; import org.graalvm.compiler.nodes.NodeView; @@ -54,6 +56,7 @@ import org.graalvm.compiler.nodes.calc.NarrowNode; import org.graalvm.compiler.nodes.calc.SignExtendNode; import org.graalvm.compiler.nodes.calc.ZeroExtendNode; import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind; +import org.graalvm.compiler.nodes.extended.GuardingNode; import org.graalvm.compiler.nodes.java.InstanceOfDynamicNode; import org.graalvm.compiler.nodes.type.StampTool; @@ -283,8 +286,17 @@ public interface GraphBuilderContext extends GraphBuilderTool { default ValueNode nullCheckedValue(ValueNode value, DeoptimizationAction action) { if (!StampTool.isPointerNonNull(value)) { LogicNode condition = getGraph().unique(IsNullNode.create(value)); - FixedGuardNode fixedGuard = append(new FixedGuardNode(condition, NullCheckException, action, true)); - ValueNode nonNullReceiver = getGraph().addOrUniqueWithInputs(PiNode.create(value, objectNonNull(), fixedGuard)); + GuardingNode guardingNode; + if (needsExplicitException()) { + AbstractBeginNode exceptionPath = genExplicitExceptionEdge(BytecodeExceptionKind.NULL_POINTER); + IfNode ifNode = append(new IfNode(condition, exceptionPath, null, 0.01)); + BeginNode nonNullPath = append(new BeginNode()); + ifNode.setFalseSuccessor(nonNullPath); + guardingNode = nonNullPath; + } else { + guardingNode = append(new FixedGuardNode(condition, NullCheckException, action, true)); + } + ValueNode nonNullReceiver = getGraph().addOrUniqueWithInputs(PiNode.create(value, objectNonNull(), guardingNode.asNode())); // TODO: Propogating the non-null into the frame state would // remove subsequent null-checks on the same value. However, // it currently causes an assertion failure when merging states. diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/IntrinsicContext.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/IntrinsicContext.java index 4bf09d4136c..8925c6f9cd0 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/IntrinsicContext.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/IntrinsicContext.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -28,9 +28,10 @@ import static jdk.vm.ci.code.BytecodeFrame.AFTER_BCI; import static jdk.vm.ci.code.BytecodeFrame.AFTER_EXCEPTION_BCI; import static jdk.vm.ci.code.BytecodeFrame.BEFORE_BCI; import static jdk.vm.ci.code.BytecodeFrame.INVALID_FRAMESTATE_BCI; -import static org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.ROOT_COMPILATION_ENCODING; +import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE; import static org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING; import static org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.ROOT_COMPILATION; +import static org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.ROOT_COMPILATION_ENCODING; import org.graalvm.compiler.api.replacements.MethodSubstitution; import org.graalvm.compiler.bytecode.BytecodeProvider; @@ -88,7 +89,7 @@ public class IntrinsicContext { this.compilationContext = compilationContext; this.allowPartialIntrinsicArgumentMismatch = allowPartialIntrinsicArgumentMismatch; assert !isCompilationRoot() || method.hasBytecodes() : "Cannot root compile intrinsic for native or abstract method " + method.format("%H.%n(%p)"); - assert !method.equals(intrinsic) || method.getAnnotation(MethodSubstitution.class) == null : "method and intrinsic must be different: " + method + " " + intrinsic; + assert IS_IN_NATIVE_IMAGE || !method.equals(intrinsic) || method.getAnnotation(MethodSubstitution.class) == null : "method and intrinsic must be different: " + method + " " + intrinsic; } /** diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractNewObjectNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractNewObjectNode.java index 95d690391d7..7b2a36f49c8 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractNewObjectNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractNewObjectNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020, 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 @@ -34,7 +34,6 @@ import org.graalvm.compiler.nodes.DeoptimizingFixedWithNextNode; import org.graalvm.compiler.nodes.FrameState; import org.graalvm.compiler.nodes.extended.MembarNode; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import jdk.vm.ci.code.MemoryBarriers; @@ -65,11 +64,6 @@ public abstract class AbstractNewObjectNode extends DeoptimizingFixedWithNextNod return fillContents; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @Override public boolean canDeoptimize() { return true; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractUnsafeCompareAndSwapNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractUnsafeCompareAndSwapNode.java index af76e5d575e..ec5c8a80c05 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractUnsafeCompareAndSwapNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractUnsafeCompareAndSwapNode.java @@ -44,7 +44,6 @@ import org.graalvm.compiler.nodes.calc.ObjectEqualsNode; import org.graalvm.compiler.nodes.memory.AbstractMemoryCheckpoint; import org.graalvm.compiler.nodes.memory.SingleMemoryKill; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.nodes.spi.Virtualizable; import org.graalvm.compiler.nodes.spi.VirtualizerTool; import org.graalvm.compiler.nodes.virtual.VirtualArrayNode; @@ -101,11 +100,6 @@ public abstract class AbstractUnsafeCompareAndSwapNode extends AbstractMemoryChe return locationIdentity; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @Override public void virtualize(VirtualizerTool tool) { ValueNode offsetAlias = tool.getAlias(offset); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessFieldNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessFieldNode.java index 508bf561178..fc88036f93d 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessFieldNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessFieldNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020, 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 @@ -36,7 +36,6 @@ import org.graalvm.compiler.nodeinfo.Verbosity; import org.graalvm.compiler.nodes.FixedWithNextNode; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import jdk.vm.ci.meta.ResolvedJavaField; @@ -109,11 +108,6 @@ public abstract class AccessFieldNode extends FixedWithNextNode implements Lower return volatileAccess; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @Override public String toString(Verbosity verbosity) { if (verbosity == Verbosity.Name) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessIndexedNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessIndexedNode.java index 94f3efcb56c..c749f69df6a 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessIndexedNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessIndexedNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020, 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 @@ -31,7 +31,6 @@ import org.graalvm.compiler.nodeinfo.NodeInfo; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.extended.GuardingNode; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import jdk.vm.ci.meta.JavaKind; @@ -81,8 +80,4 @@ public abstract class AccessIndexedNode extends AccessArrayNode implements Lower return elementKind; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessMonitorNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessMonitorNode.java index 916e3708b1e..d42108a4cb4 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessMonitorNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AccessMonitorNode.java @@ -53,6 +53,12 @@ public abstract class AccessMonitorNode extends AbstractMemoryCheckpoint impleme @Input ValueNode object; @Input(Association) MonitorIdNode monitorId; + /** + * Additional information already loaded from {@link #object} in an early lowering stage to + * facilitate value numbering and high-level optimizations. The value is VM-dependent. + */ + @OptionalInput private ValueNode objectData; + protected AccessMonitorNode(NodeClass c, ValueNode object, MonitorIdNode monitorId, boolean biasable) { super(c, StampFactory.forVoid()); this.object = object; @@ -89,18 +95,19 @@ public abstract class AccessMonitorNode extends AbstractMemoryCheckpoint impleme this.object = lockedObject; } + public ValueNode getObjectData() { + return objectData; + } + + public void setObjectData(ValueNode objectData) { + updateUsages(this.objectData, objectData); + this.objectData = objectData; + } + public MonitorIdNode getMonitorId() { return monitorId; } - public void disableBiasedLocking() { - this.biasable = false; - } - - public boolean isBiasable() { - return biasable; - } - protected boolean biasable = true; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ArrayLengthNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ArrayLengthNode.java index 41f0f99ae6d..931686ec7b8 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ArrayLengthNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ArrayLengthNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020, 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 @@ -38,7 +38,6 @@ import org.graalvm.compiler.nodes.FixedWithNextNode; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.spi.ArrayLengthProvider; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.nodes.spi.Virtualizable; import org.graalvm.compiler.nodes.spi.VirtualizerTool; import org.graalvm.compiler.nodes.util.GraphUtil; @@ -105,11 +104,6 @@ public final class ArrayLengthNode extends FixedWithNextNode implements Canonica return GraphUtil.arrayLength(originalArray, ArrayLengthProvider.FindLengthMode.CANONICALIZE_READ, constantReflection); } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @NodeIntrinsic public static native int arrayLength(Object array); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AtomicReadAndWriteNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AtomicReadAndWriteNode.java index 95ae53a5496..316eee1bf39 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AtomicReadAndWriteNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AtomicReadAndWriteNode.java @@ -34,7 +34,6 @@ import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.memory.AbstractMemoryCheckpoint; import org.graalvm.compiler.nodes.memory.SingleMemoryKill; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import jdk.internal.vm.compiler.word.LocationIdentity; import jdk.vm.ci.meta.JavaKind; @@ -84,8 +83,4 @@ public final class AtomicReadAndWriteNode extends AbstractMemoryCheckpoint imple return locationIdentity; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ClassIsAssignableFromNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ClassIsAssignableFromNode.java index 62b6b05c713..c46dad3b010 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ClassIsAssignableFromNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ClassIsAssignableFromNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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 @@ -37,7 +37,6 @@ import org.graalvm.compiler.nodes.BinaryOpLogicNode; import org.graalvm.compiler.nodes.LogicConstantNode; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import jdk.vm.ci.meta.ConstantReflectionProvider; import jdk.vm.ci.meta.ResolvedJavaType; @@ -78,11 +77,6 @@ public final class ClassIsAssignableFromNode extends BinaryOpLogicNode implement return this; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @Override public Stamp getSucceedingStampForX(boolean negated, Stamp xStamp, Stamp yStamp) { return null; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/DynamicNewArrayNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/DynamicNewArrayNode.java index b35df1e1c92..7e65ef61197 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/DynamicNewArrayNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/DynamicNewArrayNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -106,7 +106,7 @@ public class DynamicNewArrayNode extends AbstractNewArrayNode implements Canonic return this; } ResolvedJavaType type = tool.getConstantReflection().asJavaType(elementType.asConstant()); - if (type != null && type.getArrayClass() != null && !throwsIllegalArgumentException(type)) { + if (type != null && !throwsIllegalArgumentException(type) && tool.getMetaAccessExtensionProvider().canConstantFoldDynamicAllocation(type)) { return createNewArrayNode(type); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/DynamicNewInstanceNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/DynamicNewInstanceNode.java index 51bd453237a..2120a122872 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/DynamicNewInstanceNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/DynamicNewInstanceNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -78,18 +78,13 @@ public class DynamicNewInstanceNode extends AbstractNewObjectNode implements Can return this; } ResolvedJavaType type = tool.getConstantReflection().asJavaType(clazz.asConstant()); - if (type != null && type.isInitialized() && !throwsInstantiationException(type, tool.getMetaAccess())) { - return createNewInstanceNode(type); + if (type != null && !throwsInstantiationException(type, tool.getMetaAccess()) && tool.getMetaAccessExtensionProvider().canConstantFoldDynamicAllocation(type)) { + return new NewInstanceNode(type, fillContents(), stateBefore()); } } return this; } - /** Hook for subclasses to instantiate a subclass of {@link NewInstanceNode}. */ - protected NewInstanceNode createNewInstanceNode(ResolvedJavaType type) { - return new NewInstanceNode(type, fillContents(), stateBefore()); - } - public static boolean throwsInstantiationException(Class type, Class classClass) { return type.isPrimitive() || type.isArray() || type.isInterface() || Modifier.isAbstract(type.getModifiers()) || type == classClass; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ExceptionObjectNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ExceptionObjectNode.java index e6cd1517887..1da73ff428b 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ExceptionObjectNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ExceptionObjectNode.java @@ -29,15 +29,18 @@ import jdk.vm.ci.meta.MetaAccessProvider; import org.graalvm.compiler.core.common.type.StampFactory; import org.graalvm.compiler.core.common.type.TypeReference; +import org.graalvm.compiler.graph.Node; import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.nodeinfo.InputType; import org.graalvm.compiler.nodeinfo.NodeInfo; import org.graalvm.compiler.nodes.AbstractBeginNode; +import org.graalvm.compiler.nodes.BeginNode; import org.graalvm.compiler.nodes.BeginStateSplitNode; -import org.graalvm.compiler.nodes.InvokeWithExceptionNode; import org.graalvm.compiler.nodes.KillingBeginNode; +import org.graalvm.compiler.nodes.MultiKillingBeginNode; import org.graalvm.compiler.nodes.NodeView; import org.graalvm.compiler.nodes.StructuredGraph; +import org.graalvm.compiler.nodes.memory.MultiMemoryKill; import org.graalvm.compiler.nodes.memory.SingleMemoryKill; import org.graalvm.compiler.nodes.spi.Lowerable; import org.graalvm.compiler.nodes.spi.LoweringTool; @@ -80,12 +83,22 @@ public final class ExceptionObjectNode extends BeginStateSplitNode implements Lo * Now the lowering to BeginNode+LoadExceptionNode can be performed, since no more * deopts can float in between the begin node and the load exception node. */ - LocationIdentity locationsKilledByInvoke = ((InvokeWithExceptionNode) predecessor()).getKilledLocationIdentity(); - AbstractBeginNode entry = graph().add(KillingBeginNode.create(locationsKilledByInvoke)); + Node predecessor = predecessor(); + AbstractBeginNode entry; + if (predecessor instanceof SingleMemoryKill) { + LocationIdentity locationsKilledByPredecessor = ((SingleMemoryKill) predecessor).getKilledLocationIdentity(); + entry = graph().add(KillingBeginNode.create(locationsKilledByPredecessor)); + } else if (predecessor instanceof MultiMemoryKill) { + LocationIdentity[] locationsKilledByPredecessor = ((MultiMemoryKill) predecessor).getKilledLocationIdentities(); + entry = graph().add(MultiKillingBeginNode.create(locationsKilledByPredecessor)); + } else { + entry = graph().add(new BeginNode()); + } + LoadExceptionObjectNode loadException = graph().add(new LoadExceptionObjectNode(stamp(NodeView.DEFAULT))); loadException.setStateAfter(stateAfter()); - replaceAtUsages(InputType.Value, loadException); + replaceAtUsages(loadException, InputType.Value); graph().replaceFixedWithFixed(this, entry); entry.graph().addAfterFixed(entry, loadException); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ForeignCallDescriptors.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ForeignCallDescriptors.java index ca1b667818f..26bc60f3452 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ForeignCallDescriptors.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ForeignCallDescriptors.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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 @@ -24,7 +24,7 @@ package org.graalvm.compiler.nodes.java; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; +import org.graalvm.compiler.core.common.spi.ForeignCallSignature; /** * The foreign call descriptors used by nodes in this package. @@ -37,6 +37,6 @@ public class ForeignCallDescriptors { /** * @see RegisterFinalizerNode */ - public static final ForeignCallDescriptor REGISTER_FINALIZER = new ForeignCallDescriptor("registerFinalizer", void.class, Object.class); + public static final ForeignCallSignature REGISTER_FINALIZER = new ForeignCallSignature("registerFinalizer", void.class, Object.class); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/InstanceOfDynamicNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/InstanceOfDynamicNode.java index 6a091dbbd99..3dd803b7272 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/InstanceOfDynamicNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/InstanceOfDynamicNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020, 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 @@ -39,7 +39,6 @@ import org.graalvm.compiler.nodes.LogicNode; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.calc.IsNullNode; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import jdk.vm.ci.meta.Assumptions; import jdk.vm.ci.meta.ConstantReflectionProvider; @@ -86,11 +85,6 @@ public class InstanceOfDynamicNode extends BinaryOpLogicNode implements Canonica return !isMirror(); } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - private static LogicNode findSynonym(Assumptions assumptions, ConstantReflectionProvider constantReflection, ValueNode forMirror, ValueNode forObject, boolean allowNull, boolean exact) { if (forMirror.isConstant()) { ResolvedJavaType t = constantReflection.asJavaType(forMirror.asConstant()); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/InstanceOfNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/InstanceOfNode.java index 9163814144c..8e637474cc5 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/InstanceOfNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/InstanceOfNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020, 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 @@ -48,7 +48,6 @@ import org.graalvm.compiler.nodes.calc.IsNullNode; import org.graalvm.compiler.nodes.extended.AnchoringNode; import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.nodes.spi.Virtualizable; import org.graalvm.compiler.nodes.spi.VirtualizerTool; import org.graalvm.compiler.nodes.type.StampTool; @@ -109,11 +108,6 @@ public class InstanceOfNode extends UnaryOpLogicNode implements Lowerable, Virtu } } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @Override public ValueNode canonical(CanonicalizerTool tool, ValueNode forValue) { NodeView view = NodeView.from(tool); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoadExceptionObjectNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoadExceptionObjectNode.java index c7fc759dd12..bbddd0d9d90 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoadExceptionObjectNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoadExceptionObjectNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020, 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 @@ -32,7 +32,6 @@ import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.nodeinfo.NodeInfo; import org.graalvm.compiler.nodes.AbstractStateSplit; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; @NodeInfo(cycles = CYCLES_8, size = SIZE_8) public final class LoadExceptionObjectNode extends AbstractStateSplit implements Lowerable { @@ -43,8 +42,4 @@ public final class LoadExceptionObjectNode extends AbstractStateSplit implements super(TYPE, stamp); } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoadIndexedNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoadIndexedNode.java index 5631b0b2092..c65dc44283f 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoadIndexedNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoadIndexedNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020, 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 @@ -129,7 +129,7 @@ public class LoadIndexedNode extends AccessIndexedNode implements Virtualizable, int idx = indexValue.isConstant() ? indexValue.asJavaConstant().asInt() : -1; if (idx >= 0 && idx < virtual.entryCount()) { ValueNode entry = tool.getEntry(virtual, idx); - if (virtual.isVirtualByteArrayAccess(elementKind())) { + if (virtual.isVirtualByteArrayAccess(tool.getMetaAccessExtensionProvider(), elementKind())) { if (virtual.canVirtualizeLargeByteArrayUnsafeRead(entry, idx, elementKind(), tool)) { tool.replaceWith(VirtualArrayNode.virtualizeByteArrayRead(entry, elementKind(), stamp)); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MonitorEnterNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MonitorEnterNode.java index 56b247a43c0..fdf52fb89ac 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MonitorEnterNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MonitorEnterNode.java @@ -34,7 +34,6 @@ import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.extended.MonitorEnter; import org.graalvm.compiler.nodes.memory.SingleMemoryKill; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.nodes.spi.Virtualizable; import org.graalvm.compiler.nodes.spi.VirtualizerTool; import org.graalvm.compiler.nodes.virtual.VirtualObjectNode; @@ -61,11 +60,6 @@ public class MonitorEnterNode extends AccessMonitorNode implements Virtualizable return LocationIdentity.any(); } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @Override public void virtualize(VirtualizerTool tool) { ValueNode alias = tool.getAlias(object()); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MonitorExitNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MonitorExitNode.java index 88163356e60..88e5fc910d2 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MonitorExitNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MonitorExitNode.java @@ -34,7 +34,6 @@ import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.extended.MonitorExit; import org.graalvm.compiler.nodes.memory.SingleMemoryKill; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.nodes.spi.Virtualizable; import org.graalvm.compiler.nodes.spi.VirtualizerTool; import org.graalvm.compiler.nodes.virtual.VirtualObjectNode; @@ -74,11 +73,6 @@ public final class MonitorExitNode extends AccessMonitorNode implements Virtuali return LocationIdentity.any(); } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @Override public void virtualize(VirtualizerTool tool) { ValueNode alias = tool.getAlias(object()); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewArrayNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewArrayNode.java index ed59d9d8364..f08e26eeed9 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewArrayNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewArrayNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020, 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 @@ -100,26 +100,20 @@ public class NewArrayNode extends AbstractNewArrayNode implements VirtualizableA int constantLength = lengthAlias.asJavaConstant().asInt(); if (constantLength >= 0 && constantLength <= tool.getMaximumEntryCount()) { ValueNode[] state = new ValueNode[constantLength]; - ConstantNode defaultForKind = constantLength == 0 ? null : defaultElementValue(); - for (int i = 0; i < constantLength; i++) { - state[i] = defaultForKind; + if (constantLength > 0) { + ConstantNode defaultForKind = ConstantNode.defaultForKind(tool.getMetaAccessExtensionProvider().getStorageKind(elementType()), graph()); + for (int i = 0; i < constantLength; i++) { + state[i] = defaultForKind; + } } - VirtualObjectNode virtualObject = createVirtualArrayNode(constantLength); + + VirtualObjectNode virtualObject = new VirtualArrayNode(elementType(), constantLength); tool.createVirtualObject(virtualObject, state, Collections. emptyList(), false); tool.replaceWithVirtual(virtualObject); } } } - protected VirtualArrayNode createVirtualArrayNode(int constantLength) { - return new VirtualArrayNode(elementType(), constantLength); - } - - /* Factored out in a separate method so that subclasses can override it. */ - protected ConstantNode defaultElementValue() { - return ConstantNode.defaultForKind(elementType().getJavaKind(), graph()); - } - @Override @SuppressWarnings("try") public void simplify(SimplifierTool tool) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewInstanceNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewInstanceNode.java index 6b37f9b62d6..921db1cbafc 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewInstanceNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewInstanceNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020, 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 @@ -80,23 +80,14 @@ public class NewInstanceNode extends AbstractNewObjectNode implements Virtualiza * they're excluded from escape analysis. */ if (!tool.getMetaAccess().lookupJavaType(Reference.class).isAssignableFrom(instanceClass)) { - VirtualInstanceNode virtualObject = createVirtualInstanceNode(true); + VirtualInstanceNode virtualObject = new VirtualInstanceNode(instanceClass(), true); ResolvedJavaField[] fields = virtualObject.getFields(); ValueNode[] state = new ValueNode[fields.length]; for (int i = 0; i < state.length; i++) { - state[i] = defaultFieldValue(fields[i]); + state[i] = ConstantNode.defaultForKind(tool.getMetaAccessExtensionProvider().getStorageKind(fields[i].getType()), graph()); } tool.createVirtualObject(virtualObject, state, Collections. emptyList(), false); tool.replaceWithVirtual(virtualObject); } } - - protected VirtualInstanceNode createVirtualInstanceNode(boolean hasIdentity) { - return new VirtualInstanceNode(instanceClass(), hasIdentity); - } - - /* Factored out in a separate method so that subclasses can override it. */ - protected ConstantNode defaultFieldValue(ResolvedJavaField field) { - return ConstantNode.defaultForKind(field.getType().getJavaKind(), graph()); - } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewMultiArrayNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewMultiArrayNode.java index 072c969e891..6c85ecea0ce 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewMultiArrayNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewMultiArrayNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020, 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 @@ -27,7 +27,6 @@ package org.graalvm.compiler.nodes.java; import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8; import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8; -import jdk.vm.ci.meta.ConstantReflectionProvider; import org.graalvm.compiler.core.common.type.StampFactory; import org.graalvm.compiler.core.common.type.TypeReference; import org.graalvm.compiler.graph.NodeClass; @@ -38,8 +37,8 @@ import org.graalvm.compiler.nodes.DeoptimizingFixedWithNextNode; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.spi.ArrayLengthProvider; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; +import jdk.vm.ci.meta.ConstantReflectionProvider; import jdk.vm.ci.meta.ResolvedJavaType; /** @@ -75,11 +74,6 @@ public class NewMultiArrayNode extends DeoptimizingFixedWithNextNode implements assert dimensions.length > 0 && type.isArray(); } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - public ResolvedJavaType type() { return type; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/RawMonitorEnterNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/RawMonitorEnterNode.java deleted file mode 100644 index 1b041212104..00000000000 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/RawMonitorEnterNode.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Copyright (c) 2009, 2020, 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. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -package org.graalvm.compiler.nodes.java; - -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64; - -import org.graalvm.compiler.core.common.type.ObjectStamp; -import org.graalvm.compiler.graph.IterableNodeType; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.extended.MonitorEnter; -import org.graalvm.compiler.nodes.memory.SingleMemoryKill; -import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.nodes.spi.Virtualizable; -import org.graalvm.compiler.nodes.spi.VirtualizerTool; -import org.graalvm.compiler.nodes.virtual.VirtualObjectNode; -import jdk.internal.vm.compiler.word.LocationIdentity; - -/** - * The {@code RawMonitorEnterNode} represents the acquisition of a monitor. The object needs to - * already be non-null and the hub is an additional parameter to the node. - */ -// @formatter:off -@NodeInfo(cycles = CYCLES_64, - cyclesRationale = "Rough estimation of the enter operation", - size = SIZE_64) -// @formatter:on -public final class RawMonitorEnterNode extends AccessMonitorNode implements Virtualizable, Lowerable, IterableNodeType, MonitorEnter, SingleMemoryKill { - - public static final NodeClass TYPE = NodeClass.create(RawMonitorEnterNode.class); - - @Input ValueNode hub; - - public RawMonitorEnterNode(ValueNode object, ValueNode hub, MonitorIdNode monitorId) { - super(TYPE, object, monitorId); - assert ((ObjectStamp) object.stamp(NodeView.DEFAULT)).nonNull(); - this.hub = hub; - } - - public RawMonitorEnterNode(ValueNode object, ValueNode hub, MonitorIdNode monitorId, boolean biasable) { - super(TYPE, object, monitorId, biasable); - assert ((ObjectStamp) object.stamp(NodeView.DEFAULT)).nonNull(); - this.hub = hub; - } - - @Override - public LocationIdentity getKilledLocationIdentity() { - return LocationIdentity.any(); - } - - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - - @Override - public void virtualize(VirtualizerTool tool) { - ValueNode alias = tool.getAlias(object()); - if (alias instanceof VirtualObjectNode) { - VirtualObjectNode virtual = (VirtualObjectNode) alias; - if (virtual.hasIdentity()) { - tool.addLock(virtual, getMonitorId()); - tool.delete(); - } - } - } - - public ValueNode getHub() { - return hub; - } - -} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/SideEffectFreeWrite.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/SideEffectFreeWrite.java new file mode 100644 index 00000000000..9cc526b2b92 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/SideEffectFreeWrite.java @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.nodes.memory; + +import org.graalvm.compiler.graph.NodeClass; +import org.graalvm.compiler.nodeinfo.NodeInfo; +import org.graalvm.compiler.nodes.FrameState; +import org.graalvm.compiler.nodes.ValueNode; +import org.graalvm.compiler.nodes.memory.address.AddressNode; +import jdk.internal.vm.compiler.word.LocationIdentity; + +/** + * This is a special form of write node that does not have a side effect to the interpreter, i.e., + * it does not modify memory that is visible to other threads or modifies state beyond what is + * captured in {@link FrameState} nodes. Thus is should only be used with caution in suitable + * scenarios. + */ +@NodeInfo(nameTemplate = "SideEffectFreeWrite#{p#location/s}") +public class SideEffectFreeWrite extends WriteNode { + + public static final NodeClass TYPE = NodeClass.create(SideEffectFreeWrite.class); + + public SideEffectFreeWrite(AddressNode address, LocationIdentity location, ValueNode value, BarrierType barrierType) { + super(TYPE, address, location, value, barrierType); + } + + public static WriteNode createWithoutSideEffect(AddressNode address, LocationIdentity location, ValueNode value) { + return new SideEffectFreeWrite(address, location, value, BarrierType.NONE); + } + + @Override + public boolean hasSideEffect() { + return false; + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/VolatileReadNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/VolatileReadNode.java index f9ca2df45b9..e42e59f7e1e 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/VolatileReadNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/VolatileReadNode.java @@ -26,24 +26,43 @@ package org.graalvm.compiler.nodes.memory; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.memory.address.AddressNode; -import jdk.internal.vm.compiler.word.LocationIdentity; - import static org.graalvm.compiler.nodeinfo.InputType.Memory; import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2; import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1; -@NodeInfo(nameTemplate = "Read#{p#location/s}", allowedUsageTypes = Memory, cycles = CYCLES_2, size = SIZE_1) -public class VolatileReadNode extends ReadNode implements SingleMemoryKill { +import org.graalvm.compiler.core.common.LIRKind; +import org.graalvm.compiler.core.common.type.Stamp; +import org.graalvm.compiler.graph.NodeClass; +import org.graalvm.compiler.graph.spi.Simplifiable; +import org.graalvm.compiler.graph.spi.SimplifierTool; +import org.graalvm.compiler.nodeinfo.NodeInfo; +import org.graalvm.compiler.nodes.NodeView; +import org.graalvm.compiler.nodes.memory.address.AddressNode; +import org.graalvm.compiler.nodes.spi.Lowerable; +import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; +import jdk.internal.vm.compiler.word.LocationIdentity; + +@NodeInfo(nameTemplate = "VolatileRead#{p#location/s}", allowedUsageTypes = Memory, cycles = CYCLES_2, size = SIZE_1) +public class VolatileReadNode extends ReadNode implements SingleMemoryKill, Lowerable, Simplifiable { public static final NodeClass TYPE = NodeClass.create(VolatileReadNode.class); public VolatileReadNode(AddressNode address, LocationIdentity location, Stamp stamp, BarrierType barrierType) { super(TYPE, address, location, stamp, null, barrierType, false, null); - assert GraalOptions.LateMembars.getValue(address.getOptions()); + } + + @Override + public void simplify(SimplifierTool tool) { + if (lastLocationAccess != null && hasOnlyUsagesOfType(Memory)) { + replaceAtUsages(lastLocationAccess.asNode(), Memory); + assert hasNoUsages(); + graph().removeFixed(this); + } + } + + @Override + public void generate(NodeLIRBuilderTool gen) { + LIRKind readKind = gen.getLIRGeneratorTool().getLIRKind(getAccessStamp(NodeView.DEFAULT)); + gen.setResult(this, gen.getLIRGeneratorTool().getArithmetic().emitVolatileLoad(readKind, gen.operand(address), gen.state(this))); } @SuppressWarnings("try") diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/VolatileWriteNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/VolatileWriteNode.java new file mode 100644 index 00000000000..0e451d1c482 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/VolatileWriteNode.java @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, Red Hat Inc. 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + + +package org.graalvm.compiler.nodes.memory; + +import org.graalvm.compiler.core.common.LIRKind; +import org.graalvm.compiler.graph.Node; +import org.graalvm.compiler.graph.NodeClass; +import org.graalvm.compiler.graph.spi.CanonicalizerTool; +import org.graalvm.compiler.nodeinfo.NodeInfo; +import org.graalvm.compiler.nodes.NodeView; +import org.graalvm.compiler.nodes.ValueNode; +import org.graalvm.compiler.nodes.memory.address.AddressNode; +import org.graalvm.compiler.nodes.spi.Lowerable; +import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; +import jdk.internal.vm.compiler.word.LocationIdentity; + +@NodeInfo(nameTemplate = "VolatileWrite#{p#location/s}") +public class VolatileWriteNode extends WriteNode implements Lowerable { + public static final NodeClass TYPE = NodeClass.create(VolatileWriteNode.class); + + public VolatileWriteNode(AddressNode address, LocationIdentity location, ValueNode value, BarrierType barrierType) { + super(TYPE, address, location, value, barrierType); + } + + @Override + public void generate(NodeLIRBuilderTool gen) { + LIRKind writeKind = gen.getLIRGeneratorTool().getLIRKind(value().stamp(NodeView.DEFAULT)); + gen.getLIRGeneratorTool().getArithmetic().emitVolatileStore(writeKind, gen.operand(address), gen.operand(value()), gen.state(this)); + } + + @Override + public boolean canNullCheck() { + return false; + } + + @Override + public Node canonical(CanonicalizerTool tool) { + return this; + } + + @Override + public LocationIdentity getKilledLocationIdentity() { + return LocationIdentity.any(); + } + +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/WriteNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/WriteNode.java index 40f80e8efb6..19dd26de943 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/WriteNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/WriteNode.java @@ -44,16 +44,13 @@ import jdk.internal.vm.compiler.word.LocationIdentity; public class WriteNode extends AbstractWriteNode implements LIRLowerableAccess, Canonicalizable { public static final NodeClass TYPE = NodeClass.create(WriteNode.class); - private final boolean volatileAccess; - public WriteNode(AddressNode address, LocationIdentity location, ValueNode value, BarrierType barrierType, boolean volatileAccess) { + public WriteNode(AddressNode address, LocationIdentity location, ValueNode value, BarrierType barrierType) { super(TYPE, address, location, value, barrierType); - this.volatileAccess = volatileAccess; } protected WriteNode(NodeClass c, AddressNode address, LocationIdentity location, ValueNode value, BarrierType barrierType) { super(c, address, location, value, barrierType); - this.volatileAccess = false; } @Override @@ -63,20 +60,31 @@ public class WriteNode extends AbstractWriteNode implements LIRLowerableAccess, } @Override - public boolean canNullCheck() { - return !isVolatile(); + public Stamp getAccessStamp(NodeView view) { + return value().stamp(view); } @Override - public Stamp getAccessStamp(NodeView view) { - return value().stamp(view); + public boolean canNullCheck() { + return true; + } + + @Override + public boolean hasSideEffect() { + /* + * Writes to newly allocated objects don't have a visible side-effect to the interpreter + */ + if (getLocationIdentity().equals(LocationIdentity.INIT_LOCATION)) { + return false; + } + return super.hasSideEffect(); } @Override public Node canonical(CanonicalizerTool tool) { if (tool.canonicalizeReads() && hasExactlyOneUsage() && next() instanceof WriteNode) { WriteNode write = (WriteNode) next(); - if (write.lastLocationAccess == this && write.getAddress() == getAddress() && getAccessStamp(NodeView.DEFAULT).isCompatible(write.getAccessStamp(NodeView.DEFAULT)) && !isVolatile()) { + if (write.lastLocationAccess == this && write.getAddress() == getAddress() && getAccessStamp(NodeView.DEFAULT).isCompatible(write.getAccessStamp(NodeView.DEFAULT))) { write.setLastLocationAccess(getLastLocationAccess()); return write; } @@ -86,14 +94,7 @@ public class WriteNode extends AbstractWriteNode implements LIRLowerableAccess, @Override public LocationIdentity getKilledLocationIdentity() { - if (isVolatile()) { - return LocationIdentity.any(); - } return getLocationIdentity(); } - public boolean isVolatile() { - return volatileAccess; - } - } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/address/IndexAddressNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/address/IndexAddressNode.java index cea90676b5c..c08ad7b7ff2 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/address/IndexAddressNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/address/IndexAddressNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -29,7 +29,6 @@ import org.graalvm.compiler.nodeinfo.InputType; import org.graalvm.compiler.nodeinfo.NodeInfo; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import jdk.vm.ci.meta.JavaKind; @@ -85,8 +84,4 @@ public class IndexAddressNode extends AddressNode implements Lowerable { return elementKind; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/CoreProviders.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/CoreProviders.java index e9276ded520..cd5991b02dd 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/CoreProviders.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/CoreProviders.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, 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 @@ -26,6 +26,7 @@ package org.graalvm.compiler.nodes.spi; import org.graalvm.compiler.core.common.spi.ConstantFieldProvider; import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; +import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider; import jdk.vm.ci.meta.ConstantReflectionProvider; import jdk.vm.ci.meta.MetaAccessProvider; @@ -47,4 +48,6 @@ public interface CoreProviders { ForeignCallsProvider getForeignCalls(); PlatformConfigurationProvider getPlatformConfigurationProvider(); + + MetaAccessExtensionProvider getMetaAccessExtensionProvider(); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/CoreProvidersDelegate.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/CoreProvidersDelegate.java index 9e70e481916..f888b7c7d08 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/CoreProvidersDelegate.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/CoreProvidersDelegate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, 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 @@ -26,6 +26,7 @@ package org.graalvm.compiler.nodes.spi; import org.graalvm.compiler.core.common.spi.ConstantFieldProvider; import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; +import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider; import jdk.vm.ci.meta.ConstantReflectionProvider; import jdk.vm.ci.meta.MetaAccessProvider; @@ -38,6 +39,10 @@ public class CoreProvidersDelegate implements CoreProviders { this.providers = providers; } + public CoreProviders getProviders() { + return providers; + } + @Override public MetaAccessProvider getMetaAccess() { return providers.getMetaAccess(); @@ -77,4 +82,9 @@ public class CoreProvidersDelegate implements CoreProviders { public PlatformConfigurationProvider getPlatformConfigurationProvider() { return providers.getPlatformConfigurationProvider(); } + + @Override + public MetaAccessExtensionProvider getMetaAccessExtensionProvider() { + return providers.getMetaAccessExtensionProvider(); + } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/CoreProvidersImpl.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/CoreProvidersImpl.java index 638fbe40191..db64973c463 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/CoreProvidersImpl.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/CoreProvidersImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, 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 @@ -26,6 +26,7 @@ package org.graalvm.compiler.nodes.spi; import org.graalvm.compiler.core.common.spi.ConstantFieldProvider; import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; +import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider; import jdk.vm.ci.meta.ConstantReflectionProvider; import jdk.vm.ci.meta.MetaAccessProvider; @@ -39,9 +40,11 @@ public class CoreProvidersImpl implements CoreProviders { protected final StampProvider stampProvider; protected final ForeignCallsProvider foreignCalls; protected final PlatformConfigurationProvider platformConfigurationProvider; + protected final MetaAccessExtensionProvider metaAccessExtensionProvider; protected CoreProvidersImpl(MetaAccessProvider metaAccess, ConstantReflectionProvider constantReflection, ConstantFieldProvider constantFieldProvider, LoweringProvider lowerer, - Replacements replacements, StampProvider stampProvider, ForeignCallsProvider foreignCalls, PlatformConfigurationProvider platformConfigurationProvider) { + Replacements replacements, StampProvider stampProvider, ForeignCallsProvider foreignCalls, PlatformConfigurationProvider platformConfigurationProvider, + MetaAccessExtensionProvider metaAccessExtensionProvider) { this.metaAccess = metaAccess; this.constantReflection = constantReflection; this.constantFieldProvider = constantFieldProvider; @@ -50,6 +53,7 @@ public class CoreProvidersImpl implements CoreProviders { this.stampProvider = stampProvider; this.foreignCalls = foreignCalls; this.platformConfigurationProvider = platformConfigurationProvider; + this.metaAccessExtensionProvider = metaAccessExtensionProvider; } @Override @@ -91,4 +95,9 @@ public class CoreProvidersImpl implements CoreProviders { public PlatformConfigurationProvider getPlatformConfigurationProvider() { return platformConfigurationProvider; } + + @Override + public MetaAccessExtensionProvider getMetaAccessExtensionProvider() { + return metaAccessExtensionProvider; + } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/DelegatingReplacements.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/DelegatingReplacements.java index 8fc1e6df166..13f2bb22356 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/DelegatingReplacements.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/DelegatingReplacements.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -31,6 +31,7 @@ import org.graalvm.compiler.debug.DebugContext; import org.graalvm.compiler.graph.NodeSourcePosition; 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.nodes.graphbuilderconf.GraphBuilderPlugin; import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext; @@ -71,6 +72,16 @@ public class DelegatingReplacements implements Replacements { return delegate.getSnippet(method, recursiveEntry, args, trackNodeSourcePosition, replaceePosition, options); } + @Override + public SnippetParameterInfo getSnippetParameterInfo(ResolvedJavaMethod method) { + return delegate.getSnippetParameterInfo(method); + } + + @Override + public boolean isSnippet(ResolvedJavaMethod method) { + return delegate.isSnippet(method); + } + @Override public void registerSnippet(ResolvedJavaMethod method, ResolvedJavaMethod original, Object receiver, boolean trackNodeSourcePosition, OptionValues options) { delegate.registerSnippet(method, original, receiver, trackNodeSourcePosition, options); @@ -78,7 +89,7 @@ public class DelegatingReplacements implements Replacements { @Override public StructuredGraph getMethodSubstitution(MethodSubstitutionPlugin plugin, ResolvedJavaMethod original, IntrinsicContext.CompilationContext context, - StructuredGraph.AllowAssumptions allowAssumptions, Cancellable cancellable, OptionValues options) { + AllowAssumptions allowAssumptions, Cancellable cancellable, OptionValues options) { return delegate.getMethodSubstitution(plugin, original, context, allowAssumptions, cancellable, options); } @@ -93,13 +104,14 @@ public class DelegatingReplacements implements Replacements { } @Override - public StructuredGraph getSubstitution(ResolvedJavaMethod method, int invokeBci, boolean trackNodeSourcePosition, NodeSourcePosition replaceePosition, OptionValues options) { - return delegate.getSubstitution(method, invokeBci, trackNodeSourcePosition, replaceePosition, options); + public StructuredGraph getSubstitution(ResolvedJavaMethod method, int invokeBci, boolean trackNodeSourcePosition, NodeSourcePosition replaceePosition, AllowAssumptions allowAssumptions, + OptionValues options) { + return delegate.getSubstitution(method, invokeBci, trackNodeSourcePosition, replaceePosition, allowAssumptions, options); } @Override - public StructuredGraph getIntrinsicGraph(ResolvedJavaMethod method, CompilationIdentifier compilationId, DebugContext debug, Cancellable cancellable) { - return delegate.getIntrinsicGraph(method, compilationId, debug, cancellable); + public StructuredGraph getIntrinsicGraph(ResolvedJavaMethod method, CompilationIdentifier compilationId, DebugContext debug, AllowAssumptions allowAssumptions, Cancellable cancellable) { + return delegate.getIntrinsicGraph(method, compilationId, debug, allowAssumptions, cancellable); } @Override diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Lowerable.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Lowerable.java index 0bee87ec782..47ad016542a 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Lowerable.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Lowerable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -36,5 +36,7 @@ public interface Lowerable extends ValueNodeInterface { * Expand this node into lower level nodes expressing the same semantics. If the introduced * nodes are themselves lowerable, they should be recursively lowered as part of this call. */ - void lower(LoweringTool tool); + default void lower(LoweringTool tool) { + tool.getLowerer().lower(asNode(), tool); + } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/NodeLIRBuilderTool.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/NodeLIRBuilderTool.java index ad826edb18e..a4c27a3947b 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/NodeLIRBuilderTool.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/NodeLIRBuilderTool.java @@ -46,6 +46,7 @@ import org.graalvm.compiler.nodes.StructuredGraph; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.calc.ConditionalNode; import org.graalvm.compiler.nodes.cfg.Block; +import org.graalvm.compiler.nodes.extended.ForeignCall; import org.graalvm.compiler.nodes.extended.SwitchNode; import org.graalvm.compiler.options.OptionValues; @@ -62,6 +63,8 @@ public interface NodeLIRBuilderTool extends NodeValueMap { void emitInvoke(Invoke i); + void emitForeignCall(ForeignCall i); + // Handling of block-end nodes still needs to be unified in the LIRGenerator. void visitMerge(AbstractMergeNode i); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Replacements.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Replacements.java index ea71be8b539..d59fa4f026b 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Replacements.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Replacements.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -32,6 +32,7 @@ import org.graalvm.compiler.debug.DebugContext; import org.graalvm.compiler.graph.NodeSourcePosition; 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.nodes.graphbuilderconf.GraphBuilderPlugin; import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext; @@ -73,6 +74,16 @@ public interface Replacements { StructuredGraph getSnippet(ResolvedJavaMethod method, ResolvedJavaMethod recursiveEntry, Object[] args, boolean trackNodeSourcePosition, NodeSourcePosition replaceePosition, OptionValues options); + /** + * Get the snippet metadata required to inline the snippet. + */ + SnippetParameterInfo getSnippetParameterInfo(ResolvedJavaMethod method); + + /** + * Return true if the method is a {@link org.graalvm.compiler.api.replacements.Snippet}. + */ + boolean isSnippet(ResolvedJavaMethod method); + /** * Registers a method as snippet. */ @@ -92,7 +103,7 @@ public interface Replacements { * @return the method substitution graph, if any, that is derived from {@code method} */ StructuredGraph getMethodSubstitution(MethodSubstitutionPlugin plugin, ResolvedJavaMethod original, IntrinsicContext.CompilationContext context, - StructuredGraph.AllowAssumptions allowAssumptions, Cancellable cancellable, OptionValues options); + AllowAssumptions allowAssumptions, Cancellable cancellable, OptionValues options); /** * Registers a plugin as a substitution. @@ -112,10 +123,13 @@ public interface Replacements { * @param invokeBci the call site BCI if this request is made for inlining a substitute * otherwise {@code -1} * @param trackNodeSourcePosition + * @param replaceePosition + * @param allowAssumptions * @param options * @return the graph, if any, that is a substitution for {@code method} */ - StructuredGraph getSubstitution(ResolvedJavaMethod method, int invokeBci, boolean trackNodeSourcePosition, NodeSourcePosition replaceePosition, OptionValues options); + StructuredGraph getSubstitution(ResolvedJavaMethod method, int invokeBci, boolean trackNodeSourcePosition, NodeSourcePosition replaceePosition, AllowAssumptions allowAssumptions, + OptionValues options); /** * Gets a graph produced from the intrinsic for a given method that can be compiled and @@ -124,14 +138,15 @@ public interface Replacements { * @param method * @param compilationId * @param debug + * @param allowAssumptions * @param cancellable * @return an intrinsic graph that can be compiled and installed for {@code method} or null */ - StructuredGraph getIntrinsicGraph(ResolvedJavaMethod method, CompilationIdentifier compilationId, DebugContext debug, Cancellable cancellable); + StructuredGraph getIntrinsicGraph(ResolvedJavaMethod method, CompilationIdentifier compilationId, DebugContext debug, AllowAssumptions allowAssumptions, Cancellable cancellable); /** * Determines if there may be a - * {@linkplain #getSubstitution(ResolvedJavaMethod, int, boolean, NodeSourcePosition, OptionValues) + * {@linkplain #getSubstitution(ResolvedJavaMethod, int, boolean, NodeSourcePosition, AllowAssumptions, OptionValues) * substitution graph} for a given method. * * A call to {@link #getSubstitution} may still return {@code null} for {@code method} and diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/SnippetParameterInfo.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/SnippetParameterInfo.java new file mode 100644 index 00000000000..1009a089697 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/SnippetParameterInfo.java @@ -0,0 +1,153 @@ +/* + * Copyright (c) 2012, 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.nodes.spi; + +import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE; + +import org.graalvm.compiler.api.replacements.Snippet; + +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.Local; +import jdk.vm.ci.meta.LocalVariableTable; +import jdk.vm.ci.meta.ResolvedJavaMethod; + +/** + * Metadata required for processing of snippets. + */ +public class SnippetParameterInfo { + + public SnippetParameterInfo(ResolvedJavaMethod method) { + assert method.getAnnotation(Snippet.class) != null : method + " must be annotated with @" + Snippet.class.getSimpleName(); + int parameterCount = method.getSignature().getParameterCount(method.hasReceiver()); + if (parameterCount > Integer.SIZE) { + throw new UnsupportedOperationException("too many arguments"); + } + this.count = parameterCount; + int constant = 0; + int varargs = 0; + int nonNull = 0; + int offset = method.hasReceiver() ? 1 : 0; + for (int i = offset; i < count; i++) { + int bit = 1 << i; + if (method.getParameterAnnotation(Snippet.ConstantParameter.class, i - offset) != null) { + constant |= bit; + } + if (method.getParameterAnnotation(Snippet.VarargsParameter.class, i - offset) != null) { + varargs |= bit; + } + if (method.getParameterAnnotation(Snippet.NonNullParameter.class, i - offset) != null) { + nonNull |= bit; + } + + assert ((constant & bit) == 0) || ((varargs & bit) == 0) : "Parameter cannot be annotated with both @" + Snippet.ConstantParameter.class.getSimpleName() + " and @" + + Snippet.VarargsParameter.class.getSimpleName(); + } + if (method.hasReceiver()) { + // Receiver must be constant. + assert (constant & 1) == 0; + constant |= 1; + } + this.constantParametersBits = constant; + this.varargsParametersBits = varargs; + this.nonNullParametersBits = nonNull; + + if (IS_BUILDING_NATIVE_IMAGE) { + // Capture the names during image building in case the image wants them. + initNames(method, count); + } else { + // Retrieve the names only when assertions are turned on. + assert initNames(method, count); + } + } + + private final int count; + private final int constantParametersBits; + private final int varargsParametersBits; + private final int nonNullParametersBits; + + public int getParameterCount() { + return count; + } + + public boolean isConstantParameter(int paramIdx) { + return ((constantParametersBits >>> paramIdx) & 1) != 0; + } + + public boolean isVarargsParameter(int paramIdx) { + return ((varargsParametersBits >>> paramIdx) & 1) != 0; + } + + public boolean isNonNullParameter(int paramIdx) { + return ((nonNullParametersBits >>> paramIdx) & 1) != 0; + } + + public String getParameterName(int paramIdx) { + if (names != null) { + return names[paramIdx]; + } + return null; + } + + /** + * The parameter names, taken from the local variables table. Only used for assertion checking, + * so use only within an assert statement. + */ + String[] names; + + private boolean initNames(ResolvedJavaMethod method, int parameterCount) { + names = new String[parameterCount]; + int offset = 0; + if (method.hasReceiver()) { + names[0] = "this"; + offset = 1; + } + ResolvedJavaMethod.Parameter[] params = method.getParameters(); + if (params != null) { + for (int i = offset; i < names.length; i++) { + if (params[i - offset].isNamePresent()) { + names[i] = params[i - offset].getName(); + } + } + } else { + int slotIdx = 0; + LocalVariableTable localVariableTable = method.getLocalVariableTable(); + if (localVariableTable != null) { + for (int i = 0; i < names.length; i++) { + Local local = localVariableTable.getLocal(slotIdx, 0); + if (local != null) { + names[i] = local.getName(); + } + JavaKind kind = method.getSignature().getParameterKind(i); + slotIdx += kind.getSlotCount(); + } + } + } + return true; + } + + public void clearNames() { + names = null; + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/VirtualizerTool.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/VirtualizerTool.java index 3da6112a07a..f8c3ea01423 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/VirtualizerTool.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/VirtualizerTool.java @@ -26,10 +26,12 @@ package org.graalvm.compiler.nodes.spi; import java.util.List; +import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider; import org.graalvm.compiler.debug.DebugContext; import org.graalvm.compiler.debug.GraalError; import org.graalvm.compiler.graph.Node; import org.graalvm.compiler.nodes.ValueNode; +import org.graalvm.compiler.nodes.WithExceptionNode; import org.graalvm.compiler.nodes.java.MonitorIdNode; import org.graalvm.compiler.nodes.virtual.VirtualObjectNode; import org.graalvm.compiler.options.OptionValues; @@ -47,6 +49,11 @@ import jdk.vm.ci.meta.MetaAccessProvider; */ public interface VirtualizerTool { + /** + * Returns all available providers. + */ + CoreProviders getProviders(); + /** * @return the {@link MetaAccessProvider} associated with the current compilation. */ @@ -58,6 +65,8 @@ public interface VirtualizerTool { */ ConstantReflectionProvider getConstantReflection(); + MetaAccessExtensionProvider getMetaAccessExtensionProvider(); + /** * This method should be used to query the maximum size of virtualized objects before attempting * virtualization. @@ -95,7 +104,7 @@ public interface VirtualizerTool { * @param index the index to be set. * @param value the new value for the given index. * @param accessKind the kind of the store which might be different than - * {@link VirtualObjectNode#entryKind(int)}. + * {@link VirtualObjectNode#entryKind}. * @return true if the operation was permitted */ boolean setVirtualEntry(VirtualObjectNode virtualObject, int index, ValueNode value, JavaKind accessKind, long offset); @@ -119,7 +128,8 @@ public interface VirtualizerTool { // operations on the current node /** - * Deletes the current node and replaces it with the given virtualized object. + * Deletes the current node and replaces it with the given virtualized object. If the current + * node is a {@link WithExceptionNode}, kills the exception edge. * * @param virtualObject the virtualized object that should replace the current node. */ @@ -133,7 +143,8 @@ public interface VirtualizerTool { void replaceWithValue(ValueNode replacement); /** - * Deletes the current node. + * Deletes the current node. If the current node is a {@link WithExceptionNode}, kills the + * exception edge. */ void delete(); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/util/ConstantReflectionUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/util/ConstantReflectionUtil.java new file mode 100644 index 00000000000..2af49bdab05 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/util/ConstantReflectionUtil.java @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.nodes.util; + +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaConstant; + +/** + * Helper functions to access complex objects on the application heap via the + * {@link ConstantReflectionProvider}. + */ +public final class ConstantReflectionUtil { + private ConstantReflectionUtil() { + } + + public static byte[] loadByteArrayConstant(ConstantReflectionProvider crp, JavaConstant targetArg, int maxLength) { + int targetArgLength = Integer.min(maxLength, crp.readArrayLength(targetArg)); + byte[] targetByteArray = new byte[targetArgLength]; + for (int i = 0; i < targetArgLength; i++) { + targetByteArray[i] = (byte) crp.readArrayElement(targetArg, i).asInt(); + } + return targetByteArray; + } + + public static char[] loadCharArrayConstant(ConstantReflectionProvider crp, JavaConstant targetArg, int maxLength) { + int targetArgLength = Integer.min(maxLength, crp.readArrayLength(targetArg)); + char[] targetCharArray = new char[targetArgLength]; + for (int i = 0; i < targetArgLength; i++) { + targetCharArray[i] = (char) crp.readArrayElement(targetArg, i).asInt(); + } + return targetCharArray; + } + + public static int[] loadIntArrayConstant(ConstantReflectionProvider crp, JavaConstant targetArg, int maxLength) { + int targetArgLength = Integer.min(maxLength, crp.readArrayLength(targetArg)); + int[] targetCharArray = new int[targetArgLength]; + for (int i = 0; i < targetArgLength; i++) { + targetCharArray[i] = (char) crp.readArrayElement(targetArg, i).asInt(); + } + return targetCharArray; + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/util/GraphUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/util/GraphUtil.java index b2551c8173f..74d80f46c8c 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/util/GraphUtil.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/util/GraphUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -39,7 +39,6 @@ import jdk.internal.vm.compiler.collections.Equivalence; import jdk.internal.vm.compiler.collections.MapCursor; import org.graalvm.compiler.bytecode.Bytecode; import org.graalvm.compiler.code.SourceStackTraceBailoutException; -import org.graalvm.compiler.core.common.spi.ConstantFieldProvider; import org.graalvm.compiler.core.common.type.ObjectStamp; import org.graalvm.compiler.debug.DebugContext; import org.graalvm.compiler.graph.Graph; @@ -73,13 +72,15 @@ import org.graalvm.compiler.nodes.StructuredGraph; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.ValuePhiNode; import org.graalvm.compiler.nodes.ValueProxyNode; +import org.graalvm.compiler.nodes.WithExceptionNode; import org.graalvm.compiler.nodes.java.LoadIndexedNode; import org.graalvm.compiler.nodes.java.MethodCallTargetNode; import org.graalvm.compiler.nodes.java.MonitorIdNode; import org.graalvm.compiler.nodes.spi.ArrayLengthProvider; import org.graalvm.compiler.nodes.spi.ArrayLengthProvider.FindLengthMode; +import org.graalvm.compiler.nodes.spi.CoreProviders; +import org.graalvm.compiler.nodes.spi.CoreProvidersDelegate; import org.graalvm.compiler.nodes.spi.LimitedValueProxy; -import org.graalvm.compiler.nodes.spi.LoweringProvider; import org.graalvm.compiler.nodes.spi.ValueProxy; import org.graalvm.compiler.nodes.spi.VirtualizerTool; import org.graalvm.compiler.nodes.type.StampTool; @@ -96,7 +97,6 @@ import jdk.vm.ci.meta.Assumptions; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.ConstantReflectionProvider; import jdk.vm.ci.meta.JavaKind; -import jdk.vm.ci.meta.MetaAccessProvider; import jdk.vm.ci.meta.ResolvedJavaMethod; import jdk.vm.ci.meta.ResolvedJavaType; @@ -401,6 +401,14 @@ public class GraphUtil { fixed.replaceAtPredecessor(next); } + public static void unlinkAndKillExceptionEdge(WithExceptionNode withException) { + assert withException.next() != null && withException.predecessor() != null && withException.isAlive() : withException; + FixedNode next = withException.next(); + withException.setNext(null); + withException.replaceAtPredecessor(next); + withException.killExceptionEdge(); + } + public static void checkRedundantPhi(PhiNode phiNode) { if (phiNode.isDeleted() || phiNode.valueCount() == 1) { return; @@ -919,39 +927,16 @@ public class GraphUtil { }; } - private static final class DefaultSimplifierTool implements SimplifierTool { - private final MetaAccessProvider metaAccess; - private final ConstantReflectionProvider constantReflection; - private final ConstantFieldProvider constantFieldProvider; + private static final class DefaultSimplifierTool extends CoreProvidersDelegate implements SimplifierTool { private final boolean canonicalizeReads; private final Assumptions assumptions; private final OptionValues options; - private final LoweringProvider loweringProvider; - DefaultSimplifierTool(MetaAccessProvider metaAccess, ConstantReflectionProvider constantReflection, ConstantFieldProvider constantFieldProvider, boolean canonicalizeReads, - Assumptions assumptions, OptionValues options, LoweringProvider loweringProvider) { - this.metaAccess = metaAccess; - this.constantReflection = constantReflection; - this.constantFieldProvider = constantFieldProvider; + DefaultSimplifierTool(CoreProviders providers, boolean canonicalizeReads, Assumptions assumptions, OptionValues options) { + super(providers); this.canonicalizeReads = canonicalizeReads; this.assumptions = assumptions; this.options = options; - this.loweringProvider = loweringProvider; - } - - @Override - public MetaAccessProvider getMetaAccess() { - return metaAccess; - } - - @Override - public ConstantReflectionProvider getConstantReflection() { - return constantReflection; - } - - @Override - public ConstantFieldProvider getConstantFieldProvider() { - return constantFieldProvider; } @Override @@ -996,22 +981,16 @@ public class GraphUtil { @Override public Integer smallestCompareWidth() { - if (loweringProvider != null) { - return loweringProvider.smallestCompareWidth(); + if (getLowerer() != null) { + return getLowerer().smallestCompareWidth(); } else { return null; } } } - public static SimplifierTool getDefaultSimplifier(MetaAccessProvider metaAccess, ConstantReflectionProvider constantReflection, ConstantFieldProvider constantFieldProvider, - boolean canonicalizeReads, Assumptions assumptions, OptionValues options) { - return getDefaultSimplifier(metaAccess, constantReflection, constantFieldProvider, canonicalizeReads, assumptions, options, null); - } - - public static SimplifierTool getDefaultSimplifier(MetaAccessProvider metaAccess, ConstantReflectionProvider constantReflection, ConstantFieldProvider constantFieldProvider, - boolean canonicalizeReads, Assumptions assumptions, OptionValues options, LoweringProvider loweringProvider) { - return new DefaultSimplifierTool(metaAccess, constantReflection, constantFieldProvider, canonicalizeReads, assumptions, options, loweringProvider); + public static SimplifierTool getDefaultSimplifier(CoreProviders providers, boolean canonicalizeReads, Assumptions assumptions, OptionValues options) { + return new DefaultSimplifierTool(providers, canonicalizeReads, assumptions, options); } public static Constant foldIfConstantAndRemove(ValueNode node, ValueNode constant) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/EscapeObjectState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/EscapeObjectState.java index 434a2e7b0c2..bfd47aecafb 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/EscapeObjectState.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/EscapeObjectState.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020, 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 @@ -27,8 +27,12 @@ package org.graalvm.compiler.nodes.virtual; import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0; import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0; +import java.util.Iterator; + +import org.graalvm.compiler.graph.Node; import org.graalvm.compiler.graph.Node.ValueNumberable; import org.graalvm.compiler.graph.NodeClass; +import org.graalvm.compiler.graph.Position; import org.graalvm.compiler.nodeinfo.NodeInfo; import org.graalvm.compiler.nodes.VirtualState; @@ -59,4 +63,15 @@ public abstract class EscapeObjectState extends VirtualState implements ValueNum public void applyToVirtual(VirtualClosure closure) { closure.apply(this); } + + @Override + public void applyToNonVirtual(NodePositionClosure closure) { + Iterator iter = inputPositions().iterator(); + while (iter.hasNext()) { + Position pos = iter.next(); + if (pos.get(this) != null) { + closure.apply(this, pos); + } + } + } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualArrayNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualArrayNode.java index a8c021f5ad0..f9ad8715386 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualArrayNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualArrayNode.java @@ -26,6 +26,7 @@ package org.graalvm.compiler.nodes.virtual; import java.nio.ByteOrder; +import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider; import org.graalvm.compiler.core.common.type.PrimitiveStamp; import org.graalvm.compiler.core.common.type.Stamp; import org.graalvm.compiler.graph.NodeClass; @@ -36,12 +37,12 @@ import org.graalvm.compiler.nodes.FixedNode; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.spi.ArrayLengthProvider; import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; +import org.graalvm.compiler.nodes.spi.VirtualizerTool; import jdk.vm.ci.meta.ConstantReflectionProvider; import jdk.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.MetaAccessProvider; import jdk.vm.ci.meta.ResolvedJavaType; -import org.graalvm.compiler.nodes.spi.VirtualizerTool; @NodeInfo(nameTemplate = "VirtualArray({p#objectId}) {p#componentType/s}[{p#length}]") public class VirtualArrayNode extends VirtualObjectNode implements ArrayLengthProvider { @@ -122,9 +123,9 @@ public class VirtualArrayNode extends VirtualObjectNode implements ArrayLengthPr } @Override - public JavaKind entryKind(int index) { + public JavaKind entryKind(MetaAccessExtensionProvider metaAccessExtensionProvider, int index) { assert index >= 0 && index < length; - return componentType.getJavaKind(); + return metaAccessExtensionProvider.getStorageKind(componentType); } @Override diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualBoxingNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualBoxingNode.java index e42d8a35c8d..0ac4257107c 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualBoxingNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualBoxingNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -65,7 +65,7 @@ public class VirtualBoxingNode extends VirtualInstanceNode { assert entries.length == 1; assert locks == null; - BoxNode node = new BoxNode(entries[0], type(), boxingKind); + BoxNode node = BoxNode.create(entries[0], type(), boxingKind); node.setNodeSourcePosition(this.getNodeSourcePosition()); return node; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualInstanceNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualInstanceNode.java index d763925b025..31fec4776b1 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualInstanceNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualInstanceNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -24,6 +24,7 @@ package org.graalvm.compiler.nodes.virtual; +import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider; import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.nodeinfo.NodeInfo; import org.graalvm.compiler.nodeinfo.Verbosity; @@ -108,9 +109,9 @@ public class VirtualInstanceNode extends VirtualObjectNode { } @Override - public JavaKind entryKind(int index) { + public JavaKind entryKind(MetaAccessExtensionProvider metaAccessExtensionProvider, int index) { assert index >= 0 && index < fields.length; - return fields[index].getJavaKind(); + return metaAccessExtensionProvider.getStorageKind(fields[index].getType()); } @Override diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualObjectNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualObjectNode.java index be807ec1800..bb15c61c794 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualObjectNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/VirtualObjectNode.java @@ -27,6 +27,7 @@ package org.graalvm.compiler.nodes.virtual; import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0; import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0; +import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider; import org.graalvm.compiler.core.common.type.StampFactory; import org.graalvm.compiler.core.common.type.TypeReference; import org.graalvm.compiler.graph.IterableNodeType; @@ -37,11 +38,11 @@ import org.graalvm.compiler.nodes.FixedNode; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.spi.LIRLowerable; import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; +import org.graalvm.compiler.nodes.spi.VirtualizerTool; import jdk.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.MetaAccessProvider; import jdk.vm.ci.meta.ResolvedJavaType; -import org.graalvm.compiler.nodes.spi.VirtualizerTool; @NodeInfo(cycles = CYCLES_0, size = SIZE_0) public abstract class VirtualObjectNode extends ValueNode implements LIRLowerable, IterableNodeType { @@ -103,7 +104,7 @@ public abstract class VirtualObjectNode extends ValueNode implements LIRLowerabl /** * Returns the {@link JavaKind} of the entry at the given index. */ - public abstract JavaKind entryKind(int index); + public abstract JavaKind entryKind(MetaAccessExtensionProvider metaAccessExtensionProvider, int index); /** * Returns an exact duplicate of this virtual object node, which has not been added to the graph @@ -147,16 +148,16 @@ public abstract class VirtualObjectNode extends ValueNode implements LIRLowerabl public boolean canVirtualizeLargeByteArrayUnsafeRead(ValueNode entry, int index, JavaKind accessKind, VirtualizerTool tool) { return (tool.canVirtualizeLargeByteArrayUnsafeAccess() || accessKind == JavaKind.Byte) && !entry.isIllegalConstant() && entry.getStackKind() == accessKind.getStackKind() && - isVirtualByteArrayAccess(accessKind) && + isVirtualByteArrayAccess(tool.getMetaAccessExtensionProvider(), accessKind) && accessKind.getByteCount() == ((VirtualArrayNode) this).byteArrayEntryByteCount(index, tool); } - public boolean isVirtualByteArrayAccess(JavaKind accessKind) { - return accessKind.isPrimitive() && isVirtualByteArray(); + public boolean isVirtualByteArrayAccess(MetaAccessExtensionProvider metaAccessExtensionProvider, JavaKind accessKind) { + return accessKind.isPrimitive() && isVirtualByteArray(metaAccessExtensionProvider); } - public boolean isVirtualByteArray() { - return isVirtualArray() && entryCount() > 0 && entryKind(0) == JavaKind.Byte; + public boolean isVirtualByteArray(MetaAccessExtensionProvider metaAccessExtensionProvider) { + return isVirtualArray() && entryCount() > 0 && entryKind(metaAccessExtensionProvider, 0) == JavaKind.Byte; } private boolean isVirtualArray() { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionsParser.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionsParser.java index 56010061ec3..a99097abfe8 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionsParser.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionsParser.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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 @@ -211,7 +211,7 @@ public class OptionsParser { * * Ported from str_similar() in globals.cpp. */ - static float stringSimiliarity(String str1, String str2) { + public static float stringSimilarity(String str1, String str2) { int hit = 0; for (int i = 0; i < str1.length() - 1; ++i) { for (int j = 0; j < str2.length() - 1; ++j) { @@ -224,7 +224,7 @@ public class OptionsParser { return 2.0f * hit / (str1.length() + str2.length()); } - private static final float FUZZY_MATCH_THRESHOLD = 0.7F; + public static final float FUZZY_MATCH_THRESHOLD = 0.7F; /** * Returns the set of options that fuzzy match a given option name. @@ -249,7 +249,7 @@ public class OptionsParser { public static boolean collectFuzzyMatches(Iterable toSearch, String name, Collection matches) { boolean found = false; for (OptionDescriptor option : toSearch) { - float score = stringSimiliarity(option.getName(), name); + float score = stringSimilarity(option.getName(), name); if (score >= FUZZY_MATCH_THRESHOLD) { found = true; matches.add(option); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/CanonicalizerPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/CanonicalizerPhase.java index ba5784a0e46..2030d0da70a 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/CanonicalizerPhase.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/CanonicalizerPhase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -30,7 +30,6 @@ import static org.graalvm.compiler.phases.common.CanonicalizerPhase.Canonicalize import java.util.EnumSet; -import org.graalvm.compiler.core.common.spi.ConstantFieldProvider; import org.graalvm.compiler.core.common.type.Stamp; import org.graalvm.compiler.debug.CounterKey; import org.graalvm.compiler.debug.DebugCloseable; @@ -60,6 +59,7 @@ import org.graalvm.compiler.nodes.StructuredGraph; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.calc.FloatingNode; import org.graalvm.compiler.nodes.spi.CoreProviders; +import org.graalvm.compiler.nodes.spi.CoreProvidersDelegate; import org.graalvm.compiler.nodes.util.GraphUtil; import org.graalvm.compiler.options.OptionValues; import org.graalvm.compiler.phases.BasePhase; @@ -67,8 +67,6 @@ import org.graalvm.compiler.phases.Phase; import jdk.vm.ci.meta.Assumptions; import jdk.vm.ci.meta.Constant; -import jdk.vm.ci.meta.ConstantReflectionProvider; -import jdk.vm.ci.meta.MetaAccessProvider; public class CanonicalizerPhase extends BasePhase { @@ -335,7 +333,7 @@ public class CanonicalizerPhase extends BasePhase { if (constant != null && !(node instanceof ConstantNode)) { ConstantNode stampConstant = ConstantNode.forConstant(valueNode.stamp(NodeView.DEFAULT), constant, context.getMetaAccess(), graph); debug.log("Canonicalizer: constant stamp replaces %1s with %1s", valueNode, stampConstant); - valueNode.replaceAtUsages(InputType.Value, stampConstant); + valueNode.replaceAtUsages(stampConstant, InputType.Value); GraphUtil.tryKillUnused(valueNode); return true; } else if (improvedStamp) { @@ -517,13 +515,14 @@ public class CanonicalizerPhase extends BasePhase { return false; } - private final class Tool implements SimplifierTool, NodeView { + private final class Tool extends CoreProvidersDelegate implements SimplifierTool, NodeView { private final Assumptions assumptions; private final OptionValues options; private NodeView nodeView; Tool(Assumptions assumptions, OptionValues options) { + super(context); this.assumptions = assumptions; this.options = options; this.nodeView = getNodeView(); @@ -536,21 +535,6 @@ public class CanonicalizerPhase extends BasePhase { GraphUtil.killCFG(fixedBranch); } - @Override - public MetaAccessProvider getMetaAccess() { - return context.getMetaAccess(); - } - - @Override - public ConstantReflectionProvider getConstantReflection() { - return context.getConstantReflection(); - } - - @Override - public ConstantFieldProvider getConstantFieldProvider() { - return context.getConstantFieldProvider(); - } - @Override public void addToWorkList(Node node) { workList.add(node); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConditionalEliminationPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConditionalEliminationPhase.java index 0eaa88e6ab7..fc66d23cfab 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConditionalEliminationPhase.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConditionalEliminationPhase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -178,8 +178,7 @@ public class ConditionalEliminationPhase extends BasePhase { AbstractBeginNode beginNode = b.getBeginNode(); if (beginNode instanceof AbstractMergeNode && anchorBlock != b) { AbstractMergeNode mergeNode = (AbstractMergeNode) beginNode; - mergeNode.replaceAtUsages(InputType.Anchor, anchorBlock.getBeginNode()); - mergeNode.replaceAtUsages(InputType.Guard, anchorBlock.getBeginNode()); + mergeNode.replaceAtUsages(anchorBlock.getBeginNode(), InputType.Anchor, InputType.Guard); assert mergeNode.anchored().isEmpty(); } @@ -288,8 +287,7 @@ public class ConditionalEliminationPhase extends BasePhase { this.map = graph.createNodeMap(); this.pendingTests = new ArrayDeque<>(); this.conditions = new ArrayDeque<>(); - tool = GraphUtil.getDefaultSimplifier(context.getMetaAccess(), context.getConstantReflection(), context.getConstantFieldProvider(), false, graph.getAssumptions(), graph.getOptions(), - context.getLowerer()); + tool = GraphUtil.getDefaultSimplifier(context, false, graph.getAssumptions(), graph.getOptions()); mergeMaps = EconomicMap.create(Equivalence.IDENTITY); infoElementProvider = new InfoElementProvider() { @@ -431,7 +429,7 @@ public class ConditionalEliminationPhase extends BasePhase { tryProveGuardCondition(null, node.condition(), (guard, result, guardedValueStamp, newInput) -> { node.setCondition(LogicConstantNode.forBoolean(result, node.graph())); AbstractBeginNode survivingSuccessor = node.getSuccessor(result); - survivingSuccessor.replaceAtUsages(InputType.Guard, guard.asNode()); + survivingSuccessor.replaceAtUsages(guard.asNode(), InputType.Guard); // Don't kill the other branch immediately, see `processGuard`. counterIfsKilled.increment(debug); return true; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FixReadsPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FixReadsPhase.java index 797fe3ddd76..434cfcfa184 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FixReadsPhase.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FixReadsPhase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, 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 @@ -30,6 +30,7 @@ import jdk.internal.vm.compiler.collections.MapCursor; import org.graalvm.compiler.core.common.GraalOptions; import org.graalvm.compiler.core.common.cfg.BlockMap; import org.graalvm.compiler.core.common.spi.ConstantFieldProvider; +import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider; import org.graalvm.compiler.core.common.type.FloatStamp; import org.graalvm.compiler.core.common.type.Stamp; import org.graalvm.compiler.core.common.type.StampFactory; @@ -89,7 +90,7 @@ import jdk.vm.ci.meta.TriState; /** * This phase lowers {@link FloatingReadNode FloatingReadNodes} into corresponding fixed reads. */ -public class FixReadsPhase extends BasePhase { +public class FixReadsPhase extends BasePhase { private static final CounterKey counterStampsRegistered = DebugContext.counter("FixReads_StampsRegistered"); private static final CounterKey counterIfsKilled = DebugContext.counter("FixReads_KilledIfs"); @@ -177,6 +178,11 @@ public class FixReadsPhase extends BasePhase { return null; } + @Override + public MetaAccessExtensionProvider getMetaAccessExtensionProvider() { + return null; + } + @Override public boolean canonicalizeReads() { return false; @@ -408,7 +414,7 @@ public class FixReadsPhase extends BasePhase { ConstantNode stampConstant = ConstantNode.forConstant(newStamp, constant, metaAccess, graph); debug.log("RawConditionElimination: constant stamp replaces %1s with %1s", node, stampConstant); counterConstantReplacements.increment(debug); - node.replaceAtUsages(InputType.Value, stampConstant); + node.replaceAtUsages(stampConstant, InputType.Value); GraphUtil.tryKillUnused(node); return true; } @@ -602,7 +608,7 @@ public class FixReadsPhase extends BasePhase { } @Override - protected void run(StructuredGraph graph, LowTierContext context) { + protected void run(StructuredGraph graph, CoreProviders context) { schedulePhase.apply(graph); ScheduleResult schedule = graph.getLastSchedule(); FixReadsClosure fixReadsClosure = new FixReadsClosure(); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FloatingReadPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FloatingReadPhase.java index a501d1cf155..ac65b3598d9 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FloatingReadPhase.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FloatingReadPhase.java @@ -43,7 +43,6 @@ import org.graalvm.compiler.graph.Node; import org.graalvm.compiler.nodes.AbstractBeginNode; import org.graalvm.compiler.nodes.AbstractMergeNode; import org.graalvm.compiler.nodes.FixedNode; -import org.graalvm.compiler.nodes.InvokeWithExceptionNode; import org.graalvm.compiler.nodes.LoopBeginNode; import org.graalvm.compiler.nodes.LoopEndNode; import org.graalvm.compiler.nodes.LoopExitNode; @@ -53,6 +52,7 @@ import org.graalvm.compiler.nodes.ReturnNode; import org.graalvm.compiler.nodes.StartNode; import org.graalvm.compiler.nodes.StructuredGraph; import org.graalvm.compiler.nodes.ValueNodeUtil; +import org.graalvm.compiler.nodes.WithExceptionNode; import org.graalvm.compiler.nodes.calc.FloatingNode; import org.graalvm.compiler.nodes.cfg.Block; import org.graalvm.compiler.nodes.cfg.ControlFlowGraph; @@ -413,16 +413,16 @@ public class FloatingReadPhase extends Phase { @Override protected MemoryMapImpl afterSplit(AbstractBeginNode node, MemoryMapImpl oldState) { MemoryMapImpl result = new MemoryMapImpl(oldState); - if (node.predecessor() instanceof InvokeWithExceptionNode) { + if (node.predecessor() instanceof WithExceptionNode && node.predecessor() instanceof MemoryKill) { /* - * InvokeWithException cannot be the lastLocationAccess for a FloatingReadNode. - * Since it is both the invoke and a control flow split, the scheduler cannot - * schedule anything immediately after the invoke. It can only schedule in the - * normal or exceptional successor - and we have to tell the scheduler here which - * side it needs to choose by putting in the location identity on both successors. + * This WithExceptionNode cannot be the lastLocationAccess for a FloatingReadNode. + * Since it is both a memory kill and a control flow split, the scheduler cannot + * schedule anything immediately after the kill. It can only schedule in the normal + * or exceptional successor - and we have to tell the scheduler here which side it + * needs to choose by putting in the location identity on both successors. */ - InvokeWithExceptionNode invoke = (InvokeWithExceptionNode) node.predecessor(); - result.getMap().put(invoke.getKilledLocationIdentity(), (MemoryKill) node); + LocationIdentity killedLocationIdentity = node.predecessor() instanceof SingleMemoryKill ? ((SingleMemoryKill) node.predecessor()).getKilledLocationIdentity() : LocationIdentity.any(); + result.getMap().put(killedLocationIdentity, (MemoryKill) node); } return result; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FrameStateAssignmentPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FrameStateAssignmentPhase.java index db4391e80b7..a95ecfa7ac2 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FrameStateAssignmentPhase.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FrameStateAssignmentPhase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -38,6 +38,7 @@ import org.graalvm.compiler.nodes.LoopBeginNode; import org.graalvm.compiler.nodes.LoopExitNode; import org.graalvm.compiler.nodes.StateSplit; import org.graalvm.compiler.nodes.StructuredGraph; +import org.graalvm.compiler.nodes.StructuredGraph.FrameStateVerification; import org.graalvm.compiler.nodes.StructuredGraph.GuardsStage; import org.graalvm.compiler.nodes.util.GraphUtil; import org.graalvm.compiler.phases.Phase; @@ -126,6 +127,7 @@ public class FrameStateAssignmentPhase extends Phase { if (graph.getGuardsStage().areFrameStatesAtSideEffects()) { ReentrantNodeIterator.apply(new FrameStateAssignmentClosure(), graph.start(), null); graph.setGuardsStage(GuardsStage.AFTER_FSA); + graph.weakenFrameStateVerification(FrameStateVerification.NONE); graph.getNodes(FrameState.TYPE).filter(state -> state.hasNoUsages()).forEach(GraphUtil::killWithUnusedFloatingInputs); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/GuardLoweringPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/GuardLoweringPhase.java index 6e407b423f2..6de01b01f19 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/GuardLoweringPhase.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/GuardLoweringPhase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -37,11 +37,11 @@ import org.graalvm.compiler.nodes.StructuredGraph; import org.graalvm.compiler.nodes.StructuredGraph.GuardsStage; import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult; import org.graalvm.compiler.nodes.cfg.Block; +import org.graalvm.compiler.nodes.spi.CoreProviders; import org.graalvm.compiler.phases.BasePhase; import org.graalvm.compiler.phases.graph.ScheduledNodeIterator; import org.graalvm.compiler.phases.schedule.SchedulePhase; import org.graalvm.compiler.phases.schedule.SchedulePhase.SchedulingStrategy; -import org.graalvm.compiler.phases.tiers.MidTierContext; /** * This phase lowers {@link GuardNode GuardNodes} into corresponding control-flow structure and @@ -55,7 +55,7 @@ import org.graalvm.compiler.phases.tiers.MidTierContext; * null checks performed by access to the objects that need to be null checked. The second phase * does the actual control-flow expansion of the remaining {@link GuardNode GuardNodes}. */ -public class GuardLoweringPhase extends BasePhase { +public class GuardLoweringPhase extends BasePhase { private static class LowerGuards extends ScheduledNodeIterator { @@ -105,7 +105,7 @@ public class GuardLoweringPhase extends BasePhase { } @Override - protected void run(StructuredGraph graph, MidTierContext context) { + protected void run(StructuredGraph graph, CoreProviders context) { if (graph.getGuardsStage().allowsFloatingGuards()) { SchedulePhase schedulePhase = new SchedulePhase(SchedulingStrategy.EARLIEST_WITH_GUARD_ORDER); schedulePhase.apply(graph); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/InsertMembarsPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/InsertMembarsPhase.java deleted file mode 100644 index a4e5667225d..00000000000 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/InsertMembarsPhase.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2019, Red Hat Inc. 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. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - - -package org.graalvm.compiler.phases.common; - -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.extended.MembarNode; -import org.graalvm.compiler.nodes.memory.FixedAccessNode; -import org.graalvm.compiler.nodes.memory.ReadNode; -import org.graalvm.compiler.nodes.memory.VolatileReadNode; -import org.graalvm.compiler.nodes.memory.WriteNode; -import org.graalvm.compiler.phases.Phase; - -import static jdk.vm.ci.code.MemoryBarriers.JMM_POST_VOLATILE_READ; -import static jdk.vm.ci.code.MemoryBarriers.JMM_POST_VOLATILE_WRITE; -import static jdk.vm.ci.code.MemoryBarriers.JMM_PRE_VOLATILE_READ; -import static jdk.vm.ci.code.MemoryBarriers.JMM_PRE_VOLATILE_WRITE; - -public class InsertMembarsPhase extends Phase { - @Override - protected void run(StructuredGraph graph) { - for (FixedAccessNode access : graph.getNodes(FixedAccessNode.TYPE)) { - if (access instanceof VolatileReadNode) { - ReadNode read = (ReadNode) access; - MembarNode preMembar = graph.add(new MembarNode(JMM_PRE_VOLATILE_READ)); - graph.addBeforeFixed(read, preMembar); - MembarNode postMembar = graph.add(new MembarNode(JMM_POST_VOLATILE_READ)); - graph.addAfterFixed(read, postMembar); - } else if (access instanceof WriteNode && ((WriteNode) access).isVolatile()) { - WriteNode write = (WriteNode) access; - MembarNode preMembar = graph.add(new MembarNode(JMM_PRE_VOLATILE_WRITE)); - graph.addBeforeFixed(write, preMembar); - MembarNode postMembar = graph.add(new MembarNode(JMM_POST_VOLATILE_WRITE)); - graph.addAfterFixed(write, postMembar); - } - } - } - - @Override - public float codeSizeIncrease() { - return 3f; - } -} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LockEliminationPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LockEliminationPhase.java index 87736675761..5d93f45f515 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LockEliminationPhase.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LockEliminationPhase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -32,7 +32,6 @@ import org.graalvm.compiler.nodes.java.AccessMonitorNode; import org.graalvm.compiler.nodes.java.MonitorEnterNode; import org.graalvm.compiler.nodes.java.MonitorExitNode; import org.graalvm.compiler.nodes.java.MonitorIdNode; -import org.graalvm.compiler.nodes.java.RawMonitorEnterNode; import org.graalvm.compiler.nodes.util.GraphUtil; import org.graalvm.compiler.phases.Phase; @@ -42,7 +41,7 @@ public class LockEliminationPhase extends Phase { protected void run(StructuredGraph graph) { for (MonitorExitNode monitorExitNode : graph.getNodes(MonitorExitNode.TYPE)) { FixedNode next = monitorExitNode.next(); - if ((next instanceof MonitorEnterNode || next instanceof RawMonitorEnterNode)) { + if ((next instanceof MonitorEnterNode)) { // should never happen, osr monitor enters are always direct successors of the graph // start assert !(next instanceof OSRMonitorEnterNode); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoweringPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoweringPhase.java index 19331c9a86a..4c71b8584bc 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoweringPhase.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoweringPhase.java @@ -37,8 +37,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.graalvm.compiler.core.common.spi.ConstantFieldProvider; -import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; import org.graalvm.compiler.core.common.type.StampFactory; import org.graalvm.compiler.debug.DebugCloseable; import org.graalvm.compiler.debug.GraalError; @@ -73,21 +71,17 @@ import org.graalvm.compiler.nodes.memory.MemoryKill; import org.graalvm.compiler.nodes.memory.MultiMemoryKill; import org.graalvm.compiler.nodes.memory.SingleMemoryKill; import org.graalvm.compiler.nodes.spi.CoreProviders; +import org.graalvm.compiler.nodes.spi.CoreProvidersDelegate; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringProvider; import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.nodes.spi.Replacements; -import org.graalvm.compiler.nodes.spi.StampProvider; import org.graalvm.compiler.options.OptionValues; import org.graalvm.compiler.phases.BasePhase; import org.graalvm.compiler.phases.Phase; import org.graalvm.compiler.phases.schedule.SchedulePhase; import jdk.internal.vm.compiler.word.LocationIdentity; -import jdk.vm.ci.meta.ConstantReflectionProvider; import jdk.vm.ci.meta.DeoptimizationAction; import jdk.vm.ci.meta.DeoptimizationReason; -import jdk.vm.ci.meta.MetaAccessProvider; import jdk.vm.ci.meta.SpeculationLog; import jdk.vm.ci.meta.SpeculationLog.Speculation; @@ -128,16 +122,15 @@ public class LoweringPhase extends BasePhase { return false; } - final class LoweringToolImpl implements LoweringTool { + final class LoweringToolImpl extends CoreProvidersDelegate implements LoweringTool { - private final CoreProviders context; private final NodeBitMap activeGuards; private AnchoringNode guardAnchor; private FixedWithNextNode lastFixedNode; private NodeMap nodeMap; LoweringToolImpl(CoreProviders context, AnchoringNode guardAnchor, NodeBitMap activeGuards, FixedWithNextNode lastFixedNode, NodeMap nodeMap) { - this.context = context; + super(context); this.guardAnchor = guardAnchor; this.activeGuards = activeGuards; this.lastFixedNode = lastFixedNode; @@ -149,40 +142,6 @@ public class LoweringPhase extends BasePhase { return loweringStage; } - @Override - public CoreProviders getProviders() { - return context; - } - - @Override - public ConstantReflectionProvider getConstantReflection() { - return context.getConstantReflection(); - } - - @Override - public ConstantFieldProvider getConstantFieldProvider() { - return context.getConstantFieldProvider(); - } - - @Override - public MetaAccessProvider getMetaAccess() { - return context.getMetaAccess(); - } - - @Override - public LoweringProvider getLowerer() { - return context.getLowerer(); - } - - @Override - public Replacements getReplacements() { - return context.getReplacements(); - } - - public ForeignCallsProvider getForeignCalls() { - return context.getForeignCalls(); - } - @Override public AnchoringNode getCurrentGuardAnchor() { return guardAnchor; @@ -193,11 +152,6 @@ public class LoweringPhase extends BasePhase { return createGuard(before, condition, deoptReason, action, SpeculationLog.NO_SPECULATION, false, null); } - @Override - public StampProvider getStampProvider() { - return context.getStampProvider(); - } - @Override public GuardingNode createGuard(FixedNode before, LogicNode condition, DeoptimizationReason deoptReason, DeoptimizationAction action, Speculation speculation, boolean negated, NodeSourcePosition noDeoptSucccessorPosition) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/RemoveValueProxyPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/RemoveValueProxyPhase.java index b3faada37d2..7f965def4c3 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/RemoveValueProxyPhase.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/RemoveValueProxyPhase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -27,6 +27,7 @@ package org.graalvm.compiler.phases.common; import org.graalvm.compiler.nodes.FrameState; import org.graalvm.compiler.nodes.LoopExitNode; import org.graalvm.compiler.nodes.StructuredGraph; +import org.graalvm.compiler.nodes.StructuredGraph.FrameStateVerification; import org.graalvm.compiler.nodes.util.GraphUtil; import org.graalvm.compiler.phases.Phase; @@ -46,5 +47,6 @@ public class RemoveValueProxyPhase extends Phase { } } graph.setHasValueProxies(false); + graph.weakenFrameStateVerification(FrameStateVerification.ALL_EXCEPT_LOOP_EXIT); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/SnippetFrameStateAssignment.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/SnippetFrameStateAssignment.java new file mode 100644 index 00000000000..4826014f5a7 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/SnippetFrameStateAssignment.java @@ -0,0 +1,232 @@ +/* + * Copyright (c) 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.phases.common; + +import java.util.List; + +import jdk.internal.vm.compiler.collections.EconomicMap; +import jdk.internal.vm.compiler.collections.MapCursor; +import org.graalvm.compiler.api.replacements.Snippet; +import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.GraalError; +import org.graalvm.compiler.graph.Node; +import org.graalvm.compiler.graph.NodeMap; +import org.graalvm.compiler.nodes.AbstractBeginNode; +import org.graalvm.compiler.nodes.AbstractMergeNode; +import org.graalvm.compiler.nodes.FixedNode; +import org.graalvm.compiler.nodes.LoopBeginNode; +import org.graalvm.compiler.nodes.LoopEndNode; +import org.graalvm.compiler.nodes.LoopExitNode; +import org.graalvm.compiler.nodes.StartNode; +import org.graalvm.compiler.nodes.StateSplit; +import org.graalvm.compiler.nodes.StructuredGraph; +import org.graalvm.compiler.nodes.util.GraphUtil; +import org.graalvm.compiler.phases.graph.ReentrantNodeIterator.LoopInfo; +import org.graalvm.compiler.phases.graph.ReentrantNodeIterator; +import org.graalvm.compiler.phases.graph.ReentrantNodeIterator.NodeIteratorClosure; + +/** + * Utility class for snippet lowering. + * + * Certain nodes in Graal IR can be lowered to a (sub) graph of nodes by a process called snippet + * lowering. For details see {@linkplain Snippet}. + * + * For example, a snippet lowering can create a merge node without a frame state. Any deoptimization + * point dominated by this merge will be missing frame state information since we cannot decide + * which frame state to use for the deoptimization point. See {@link GraphUtil#mayRemoveSplit} for + * more details. The same applies for loop exit nodes. + * + * This utility determines which frame state can be assigned to each node in a snippet graph. + * + * During lowering a node is replaced with the snippet which means there are only 2 possible states + * that can be used inside the snippet graph: the before frame state of the snippet lowered node and + * the after state. Generally, if a side-effect is happening inside a snippet all code after that + * particular side-effect must not deopt to the before state but only to the after state. All code + * before the side-effect is allowed to use the before state + */ +public class SnippetFrameStateAssignment { + + /** + * Possible states to be used inside a snippet. + */ + public enum NodeStateAssignment { + /** + * The frame state before the snippet replacee. + */ + BEFORE_BCI, + /** + * The frame state after the snippet replacee. + */ + AFTER_BCI, + /** + * An invalid state setup (e.g. multiple subsequent effects inside a snippet)for a + * side-effecting node inside a snippet. + */ + INVALID + } + + /** + * The iterator below visits a compiler graph in reverse post order and, based on the + * side-effecting nodes, decides which state can be used after snippet lowering for a merge or + * loop exit node. + */ + public static class SnippetFrameStateAssignmentClosure extends NodeIteratorClosure { + + private final NodeMap stateMapping; + + public NodeMap getStateMapping() { + return stateMapping; + } + + /** + * Debugging flag to run the phase again on error to find specific invalid nodes. + */ + private static final boolean RUN_WITH_LOG_ON_ERROR = false; + + public boolean verify() { + MapCursor stateAssignments = stateMapping.getEntries(); + while (stateAssignments.advance()) { + Node nodeWithState = stateAssignments.getKey(); + NodeStateAssignment fsRequirements = stateAssignments.getValue(); + switch (fsRequirements) { + case INVALID: + if (RUN_WITH_LOG_ON_ERROR) { + ReentrantNodeIterator.apply(new SnippetFrameStateAssignmentClosure((StructuredGraph) nodeWithState.graph(), true), + ((StructuredGraph) nodeWithState.graph()).start(), NodeStateAssignment.BEFORE_BCI); + } + throw GraalError.shouldNotReachHere( + "Invalid snippet replacing a node before FS assignment with node " + nodeWithState + " for graph " + nodeWithState.graph() + " other assignments=" + + stateMapping); + default: + break; + } + } + return true; + } + + /** + * Flag to enable logging of invalid state assignments during processing. + */ + private final boolean logOnInvalid; + + public SnippetFrameStateAssignmentClosure(StructuredGraph graph) { + this(graph, false); + } + + public SnippetFrameStateAssignmentClosure(StructuredGraph graph, boolean logOnInvalid) { + stateMapping = new NodeMap<>(graph); + this.logOnInvalid = logOnInvalid; + } + + @Override + protected NodeStateAssignment processNode(FixedNode node, NodeStateAssignment stateAssignment) { + NodeStateAssignment nextStateAssignment = stateAssignment; + if (node instanceof LoopExitNode) { + stateMapping.put(node, stateAssignment); + } + if (node instanceof StateSplit && ((StateSplit) node).hasSideEffect() && !(node instanceof StartNode || node instanceof AbstractMergeNode)) { + if (stateAssignment == NodeStateAssignment.BEFORE_BCI) { + nextStateAssignment = NodeStateAssignment.AFTER_BCI; + } else { + if (logOnInvalid) { + node.getDebug().log(DebugContext.VERY_DETAILED_LEVEL, "Node %s creating invalid assignment", node); + } + nextStateAssignment = NodeStateAssignment.INVALID; + } + } + return nextStateAssignment; + } + + @Override + protected NodeStateAssignment merge(AbstractMergeNode merge, List states) { + /* + * The state at a merge is either the before or after state, but if multiple effects + * exist preceding a merge we must have a merged state, and this state can only differ + * in its return values. If such a snippet is encountered the subsequent logic will + * assign an invalid state to the merge. + */ + int beforeCount = 0; + int afterCount = 0; + int invalidCount = 0; + + for (int i = 0; i < states.size(); i++) { + if (states.get(i) == NodeStateAssignment.BEFORE_BCI) { + beforeCount++; + } else if (states.get(i) == NodeStateAssignment.AFTER_BCI) { + afterCount++; + } else { + invalidCount++; + } + } + if (invalidCount > 0) { + stateMapping.put(merge, NodeStateAssignment.INVALID); + return NodeStateAssignment.INVALID; + } else { + if (afterCount == 0) { + // only before states + assert beforeCount == states.size(); + stateMapping.put(merge, NodeStateAssignment.BEFORE_BCI); + return NodeStateAssignment.BEFORE_BCI; + } else { + // some before, and at least one after + assert afterCount > 0; + stateMapping.put(merge, NodeStateAssignment.AFTER_BCI); + return NodeStateAssignment.AFTER_BCI; + } + } + + } + + @Override + protected NodeStateAssignment afterSplit(AbstractBeginNode node, NodeStateAssignment oldState) { + return oldState; + } + + @Override + protected EconomicMap processLoop(LoopBeginNode loop, NodeStateAssignment initialState) { + LoopInfo loopInfo = ReentrantNodeIterator.processLoop(this, loop, initialState); + int afterCount = 0; + int invalidCount = 0; + for (LoopEndNode loopEnd : loop.loopEnds()) { + if (loopInfo.endStates.get(loopEnd) == NodeStateAssignment.INVALID) { + invalidCount++; + } else if (loopInfo.endStates.get(loopEnd) == NodeStateAssignment.AFTER_BCI) { + afterCount++; + } + } + if (invalidCount > 0) { + stateMapping.put(loop, NodeStateAssignment.INVALID); + } else { + if (afterCount > 0) { + stateMapping.put(loop, NodeStateAssignment.AFTER_BCI); + } else { + stateMapping.put(loop, NodeStateAssignment.BEFORE_BCI); + } + } + return loopInfo.exitStates; + } + + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/UseTrappingNullChecksPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/UseTrappingNullChecksPhase.java index 597e5b5d1cb..580b9cf3e01 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/UseTrappingNullChecksPhase.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/UseTrappingNullChecksPhase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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 @@ -277,7 +277,7 @@ public class UseTrappingNullChecksPhase extends BasePhase { * BeginNode as a guard input, so replace guard users of the Begin with the NullCheck and * then remove the Begin from the graph. */ - nonTrappingContinuation.replaceAtUsages(InputType.Guard, trappingNullCheck); + nonTrappingContinuation.replaceAtUsages(trappingNullCheck, InputType.Guard); if (nonTrappingContinuation instanceof BeginNode) { GraphUtil.unlinkFixedNode(nonTrappingContinuation); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/WriteBarrierAdditionPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/WriteBarrierAdditionPhase.java index 632ae0896c8..1efa055e2f7 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/WriteBarrierAdditionPhase.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/WriteBarrierAdditionPhase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -28,13 +28,13 @@ import org.graalvm.compiler.debug.DebugCloseable; import org.graalvm.compiler.nodes.StructuredGraph; import org.graalvm.compiler.nodes.gc.BarrierSet; import org.graalvm.compiler.nodes.memory.FixedAccessNode; +import org.graalvm.compiler.nodes.spi.CoreProviders; import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.tiers.MidTierContext; -public class WriteBarrierAdditionPhase extends BasePhase { +public class WriteBarrierAdditionPhase extends BasePhase { @SuppressWarnings("try") @Override - protected void run(StructuredGraph graph, MidTierContext context) { + protected void run(StructuredGraph graph, CoreProviders context) { BarrierSet barrierSet = context.getPlatformConfigurationProvider().getBarrierSet(); for (FixedAccessNode n : graph.getNodes().filter(FixedAccessNode.class)) { try (DebugCloseable scope = n.graph().withNodeSourcePosition(n)) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java index 4973e063626..7a60761eb56 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -26,6 +26,7 @@ package org.graalvm.compiler.phases.common.inlining; import static jdk.vm.ci.meta.DeoptimizationAction.InvalidateReprofile; import static jdk.vm.ci.meta.DeoptimizationReason.NullCheckException; +import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE; import static org.graalvm.compiler.core.common.GraalOptions.HotSpotPrintInlining; import java.util.ArrayDeque; @@ -427,7 +428,7 @@ public class InliningUtil extends ValueMergeUtil { EconomicMap duplicates; try (InliningLog.UpdateScope scope = graph.getInliningLog().openDefaultUpdateScope()) { duplicates = graph.addDuplicates(nodes, inlineGraph, inlineGraph.getNodeCount(), localReplacement); - if (scope != null) { + if (scope != null || graph.getDebug().hasCompilationListener()) { graph.getInliningLog().addDecision(invoke, true, phase, duplicates, inlineGraph.getInliningLog(), reason); } } @@ -466,7 +467,7 @@ public class InliningUtil extends ValueMergeUtil { // A partial intrinsic exit must be replaced with a call to // the intrinsified method. Invoke dup = (Invoke) duplicates.get(exit.asNode()); - dup.replaceBci(invoke.bci()); + dup.setBci(invoke.bci()); } if (unwindNode != null) { unwindNode = (UnwindNode) duplicates.get(unwindNode); @@ -518,8 +519,6 @@ public class InliningUtil extends ValueMergeUtil { StructuredGraph inlineGraph) { FixedNode invokeNode = invoke.asNode(); FrameState stateAfter = invoke.stateAfter(); - assert stateAfter == null || stateAfter.isAlive(); - invokeNode.replaceAtPredecessor(firstNode); if (invoke instanceof InvokeWithExceptionNode) { @@ -536,8 +535,9 @@ public class InliningUtil extends ValueMergeUtil { assert obj.usages().filter(x -> x instanceof GuardedNode && ((GuardedNode) x).getGuard() == obj).count() == 0 : "Must not have guards attached to an exception object node"; AbstractBeginNode replacementAnchor = AbstractBeginNode.prevBegin(unwindNode); assert replacementAnchor != null; - obj.replaceAtUsages(InputType.Anchor, replacementAnchor); - obj.replaceAtUsages(InputType.Value, unwindNode.exception()); + // guard case should never happen, see above + obj.replaceAtUsages(replacementAnchor, InputType.Anchor, InputType.Guard); + obj.replaceAtUsages(unwindNode.exception(), InputType.Value); Node n = obj.next(); obj.setNext(null); @@ -820,18 +820,28 @@ public class InliningUtil extends ValueMergeUtil { } } - // pop return kind from invoke's stateAfter and replace with this frameState's return - // value (top of stack) - assert !frameState.rethrowException() : frameState; - if (frameState.stackSize() > 0 && (alwaysDuplicateStateAfter || stateAfterReturn.stackAt(0) != frameState.stackAt(0))) { - // A non-void return value. - stateAfterReturn = stateAtReturn.duplicateModified(invokeReturnKind, invokeReturnKind, frameState.stackAt(0)); + /* + * Inlining util can be used to inline a replacee graph that has a different return kind + * than the oginal call, i.e., a non void return for a void method, in this case we simply + * use the state after discarding the return value + */ + boolean voidReturnMissmatch = frameState.stackSize() > 0 && stateAfterReturn.stackSize() == 0; + + if (voidReturnMissmatch) { + stateAfterReturn = stateAfterReturn.duplicateWithVirtualState(); } else { - // A void return value. - stateAfterReturn = stateAtReturn.duplicate(); + // pop return kind from invoke's stateAfter and replace with this frameState's return + // value (top of stack) + assert !frameState.rethrowException() : frameState; + if (frameState.stackSize() > 0 && (alwaysDuplicateStateAfter || stateAfterReturn.stackAt(0) != frameState.stackAt(0))) { + // A non-void return value. + stateAfterReturn = stateAtReturn.duplicateModified(invokeReturnKind, invokeReturnKind, frameState.stackAt(0)); + } else { + // A void return value. + stateAfterReturn = stateAtReturn.duplicate(); + } } assert stateAfterReturn.bci != BytecodeFrame.UNKNOWN_BCI; - // Return value does no longer need to be limited by the monitor exit. for (MonitorExitNode n : frameState.usages().filter(MonitorExitNode.class)) { n.clearEscapedValue(); @@ -856,7 +866,7 @@ public class InliningUtil extends ValueMergeUtil { // partial intrinsic, these calls are given frame states // that exclude the outer frame state denoting a position // in the intrinsic code. - assert inlinedMethod.getAnnotation( + assert IS_IN_NATIVE_IMAGE || inlinedMethod.getAnnotation( MethodSubstitution.class) != null : "expected an intrinsic when inlinee frame state matches method of call target but does not match the method of the inlinee graph: " + frameState; } else if (method.getName().equals(inlinedMethod.getName())) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/elem/InlineableGraph.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/elem/InlineableGraph.java index a70aff8250e..a96e2f97e43 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/elem/InlineableGraph.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/elem/InlineableGraph.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -38,7 +38,6 @@ import org.graalvm.compiler.nodes.Invoke; import org.graalvm.compiler.nodes.NodeView; import org.graalvm.compiler.nodes.ParameterNode; import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.phases.common.CanonicalizerPhase; import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase; @@ -69,7 +68,8 @@ public class InlineableGraph implements Inlineable { private FixedNodeRelativeFrequencyCache probabilites = new FixedNodeRelativeFrequencyCache(); public InlineableGraph(final ResolvedJavaMethod method, final Invoke invoke, final HighTierContext context, CanonicalizerPhase canonicalizer, boolean trackNodeSourcePosition) { - StructuredGraph original = context.getReplacements().getSubstitution(method, invoke.bci(), trackNodeSourcePosition, null, invoke.asNode().getOptions()); + StructuredGraph original = context.getReplacements().getSubstitution(method, invoke.bci(), trackNodeSourcePosition, null, + invoke.asNode().graph().allowAssumptions(), invoke.asNode().getOptions()); if (original == null) { original = parseBytecodes(method, context, canonicalizer, invoke.asNode().graph(), trackNodeSourcePosition); } else if (original.isFrozen()) { @@ -191,7 +191,7 @@ public class InlineableGraph implements Inlineable { @SuppressWarnings("try") private static StructuredGraph parseBytecodes(ResolvedJavaMethod method, HighTierContext context, CanonicalizerPhase canonicalizer, StructuredGraph caller, boolean trackNodeSourcePosition) { DebugContext debug = caller.getDebug(); - StructuredGraph newGraph = new StructuredGraph.Builder(caller.getOptions(), debug, AllowAssumptions.ifNonNull(caller.getAssumptions())).method(method).trackNodeSourcePosition( + StructuredGraph newGraph = new StructuredGraph.Builder(caller.getOptions(), debug, caller.allowAssumptions()).method(method).trackNodeSourcePosition( trackNodeSourcePosition).useProfilingInfo(caller.useProfilingInfo()).build(); try (DebugContext.Scope s = debug.scope("InlineGraph", newGraph)) { if (!caller.isUnsafeAccessTrackingEnabled()) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/GreedyInliningPolicy.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/GreedyInliningPolicy.java index 31e6c4d65e3..5186389af88 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/GreedyInliningPolicy.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/GreedyInliningPolicy.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -66,7 +66,7 @@ public class GreedyInliningPolicy extends AbstractInliningPolicy { @Override public Decision isWorthInlining(Replacements replacements, MethodInvocation invocation, InlineInfo calleeInfo, int inliningDepth, boolean fullyProcessed) { OptionValues options = calleeInfo.graph().getOptions(); - final boolean isTracing = TraceInlining.getValue(options); + final boolean isTracing = TraceInlining.getValue(options) || calleeInfo.graph().getDebug().hasCompilationListener(); final InlineInfo info = invocation.callee(); final double probability = invocation.probability(); final double relevance = invocation.relevance(); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/InlineEverythingPolicy.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/InlineEverythingPolicy.java index 18dbd2c121b..3398ded9c34 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/InlineEverythingPolicy.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/InlineEverythingPolicy.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -46,6 +46,7 @@ public class InlineEverythingPolicy implements InliningPolicy { @Override public Decision isWorthInlining(Replacements replacements, MethodInvocation invocation, InlineInfo calleeInfo, int inliningDepth, boolean fullyProcessed) { - return Decision.YES.withReason(GraalOptions.TraceInlining.getValue(calleeInfo.graph().getOptions()), "inline everything"); + boolean isTracing = GraalOptions.TraceInlining.getValue(calleeInfo.graph().getOptions()) || calleeInfo.graph().getDebug().hasCompilationListener(); + return Decision.YES.withReason(isTracing, "inline everything"); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/InlineMethodSubstitutionsPolicy.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/InlineMethodSubstitutionsPolicy.java index 97c3eeb8b72..bb32e5e698f 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/InlineMethodSubstitutionsPolicy.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/InlineMethodSubstitutionsPolicy.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -40,7 +40,7 @@ public final class InlineMethodSubstitutionsPolicy extends InlineEverythingPolic @Override public Decision isWorthInlining(Replacements replacements, MethodInvocation invocation, InlineInfo calleeInfo, int inliningDepth, boolean fullyProcessed) { - final boolean isTracing = GraalOptions.TraceInlining.getValue(calleeInfo.graph().getOptions()); + final boolean isTracing = GraalOptions.TraceInlining.getValue(calleeInfo.graph().getOptions()) || calleeInfo.graph().getDebug().hasCompilationListener(); CallTargetNode callTarget = invocation.callee().invoke().callTarget(); if (callTarget instanceof MethodCallTargetNode) { ResolvedJavaMethod calleeMethod = callTarget.targetMethod(); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/InliningPolicy.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/InliningPolicy.java index cc1202fd725..7e480530b12 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/InliningPolicy.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/policy/InliningPolicy.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -50,6 +50,17 @@ public interface InliningPolicy { return reason; } + /** + * This constructor avoids the need to box arguments when the message is a simple string. + */ + public Decision withReason(boolean isTracing, String newReason) { + if (isTracing) { + return new Decision(shouldInline, newReason); + } else { + return this; + } + } + public Decision withReason(boolean isTracing, String newReason, Object... args) { if (isTracing) { return new Decision(shouldInline, String.format(newReason, args)); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/InliningData.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/InliningData.java index 69194596c9b..45537e59ab6 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/InliningData.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/InliningData.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -146,7 +146,7 @@ public class InliningData { if (method == null) { return "the method is not resolved"; } else if (method.isNative() && !(Intrinsify.getValue(options) && - context.getReplacements().getSubstitution(method, invokeBci, rootGraph.trackNodeSourcePosition(), null, options) != null)) { + context.getReplacements().getSubstitution(method, invokeBci, rootGraph.trackNodeSourcePosition(), null, rootGraph.allowAssumptions(), options) != null)) { // We have conditional intrinsic, e.g., String.intern, which may not have inlineable // graph depending on the context. The getSubstitution test ensures the inlineable // graph is present. diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/BasePhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/BasePhase.java index e0c5e1d05e6..34ea356fc26 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/BasePhase.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/BasePhase.java @@ -31,6 +31,7 @@ import jdk.internal.vm.compiler.collections.EconomicMap; import org.graalvm.compiler.debug.CounterKey; import org.graalvm.compiler.debug.DebugCloseable; import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.DebugContext.CompilerPhaseScope; import org.graalvm.compiler.debug.DebugOptions; import org.graalvm.compiler.debug.MemUseTrackerKey; import org.graalvm.compiler.debug.MethodFilter; @@ -191,7 +192,11 @@ public abstract class BasePhase implements PhaseSizeContract { } DebugContext debug = graph.getDebug(); - try (DebugCloseable a = timer.start(debug); DebugContext.Scope s = debug.scope(getClass(), this); DebugCloseable c = memUseTracker.start(debug)) { + try (CompilerPhaseScope cps = getClass() != PhaseSuite.class ? debug.enterCompilerPhase(getName()) : null; + DebugCloseable a = timer.start(debug); + DebugContext.Scope s = debug.scope(getClass(), this); + DebugCloseable c = memUseTracker.start(debug);) { + int sizeBefore = 0; Mark before = null; OptionValues options = graph.getOptions(); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/SchedulePhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/SchedulePhase.java index e03e6533044..403ef8d5ee5 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/SchedulePhase.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/SchedulePhase.java @@ -64,6 +64,7 @@ import org.graalvm.compiler.nodes.IfNode; import org.graalvm.compiler.nodes.KillingBeginNode; import org.graalvm.compiler.nodes.LoopBeginNode; import org.graalvm.compiler.nodes.LoopExitNode; +import org.graalvm.compiler.nodes.MultiKillingBeginNode; import org.graalvm.compiler.nodes.PhiNode; import org.graalvm.compiler.nodes.ProxyNode; import org.graalvm.compiler.nodes.StartNode; @@ -359,9 +360,22 @@ public final class SchedulePhase extends Phase { lastBlock = currentBlock; } - if (lastBlock.getBeginNode() instanceof KillingBeginNode) { - LocationIdentity locationIdentity = ((KillingBeginNode) lastBlock.getBeginNode()).getKilledLocationIdentity(); - if ((locationIdentity.isAny() || locationIdentity.equals(location)) && lastBlock != earliestBlock) { + if (lastBlock != earliestBlock) { + boolean foundKill = false; + if (lastBlock.getBeginNode() instanceof KillingBeginNode) { + LocationIdentity locationIdentity = ((KillingBeginNode) lastBlock.getBeginNode()).getKilledLocationIdentity(); + if (locationIdentity.isAny() || locationIdentity.equals(location)) { + foundKill = true; + } + } else if (lastBlock.getBeginNode() instanceof MultiKillingBeginNode) { + for (LocationIdentity locationIdentity : ((MultiKillingBeginNode) lastBlock.getBeginNode()).getKilledLocationIdentities()) { + if (locationIdentity.isAny() || locationIdentity.equals(location)) { + foundKill = true; + break; + } + } + } + if (foundKill) { // The begin of this block kills the location, so we *have* to schedule the node // in the dominating block. lastBlock = lastBlock.getDominator(); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/GraphOrder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/GraphOrder.java index 09dd23f5f84..2a36c963fdd 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/GraphOrder.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/GraphOrder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -35,6 +35,7 @@ import org.graalvm.compiler.debug.GraalError; import org.graalvm.compiler.graph.GraalGraphError; import org.graalvm.compiler.graph.Node; import org.graalvm.compiler.graph.NodeBitMap; +import org.graalvm.compiler.graph.Position; import org.graalvm.compiler.nodes.AbstractEndNode; import org.graalvm.compiler.nodes.AbstractMergeNode; import org.graalvm.compiler.nodes.ConstantNode; @@ -51,8 +52,7 @@ import org.graalvm.compiler.nodes.StructuredGraph; import org.graalvm.compiler.nodes.StructuredGraph.GuardsStage; import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult; import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.VirtualState; -import org.graalvm.compiler.nodes.VirtualState.NodeClosure; +import org.graalvm.compiler.nodes.VirtualState.NodePositionClosure; import org.graalvm.compiler.nodes.cfg.Block; import org.graalvm.compiler.nodes.virtual.VirtualObjectNode; import org.graalvm.compiler.phases.graph.ReentrantBlockIterator; @@ -188,11 +188,16 @@ public final class GraphOrder { } if (pendingStateAfter != null && node instanceof FixedNode) { - pendingStateAfter.applyToNonVirtual(new NodeClosure() { + + pendingStateAfter.applyToNonVirtual(new NodePositionClosure() { + @Override - public void apply(Node usage, Node nonVirtualNode) { + public void apply(Node from, Position p) { + Node usage = from; + Node nonVirtualNode = p.get(from); assert currentState.isMarked(nonVirtualNode) || nonVirtualNode instanceof VirtualObjectNode || nonVirtualNode instanceof ConstantNode : nonVirtualNode + " not available at virtualstate " + usage + " before " + node + " in block " + block + " \n" + list; + } }); pendingStateAfter = null; @@ -228,9 +233,11 @@ public final class GraphOrder { for (Node input : node.inputs()) { if (input != stateAfter) { if (input instanceof FrameState) { - ((FrameState) input).applyToNonVirtual(new VirtualState.NodeClosure() { + ((FrameState) input).applyToNonVirtual(new NodePositionClosure() { + @Override - public void apply(Node usage, Node nonVirtual) { + public void apply(Node from, Position p) { + Node nonVirtual = p.get(from); assert currentState.isMarked(nonVirtual) : nonVirtual + " not available at " + node + " in block " + block + "\n" + list; } }); @@ -257,9 +264,11 @@ public final class GraphOrder { } } if (pendingStateAfter != null) { - pendingStateAfter.applyToNonVirtual(new NodeClosure() { + pendingStateAfter.applyToNonVirtual(new NodePositionClosure() { @Override - public void apply(Node usage, Node nonVirtualNode) { + public void apply(Node from, Position p) { + Node usage = from; + Node nonVirtualNode = p.get(from); assert currentState.isMarked(nonVirtualNode) || nonVirtualNode instanceof VirtualObjectNode || nonVirtualNode instanceof ConstantNode : nonVirtualNode + " not available at virtualstate " + usage + " at end of block " + block + " \n" + list; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/Providers.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/Providers.java index abf710f5e48..cdd9a46cd98 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/Providers.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/Providers.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -27,10 +27,11 @@ package org.graalvm.compiler.phases.util; import org.graalvm.compiler.core.common.spi.CodeGenProviders; import org.graalvm.compiler.core.common.spi.ConstantFieldProvider; import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; +import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider; import org.graalvm.compiler.nodes.spi.CoreProviders; import org.graalvm.compiler.nodes.spi.CoreProvidersImpl; -import org.graalvm.compiler.nodes.spi.PlatformConfigurationProvider; import org.graalvm.compiler.nodes.spi.LoweringProvider; +import org.graalvm.compiler.nodes.spi.PlatformConfigurationProvider; import org.graalvm.compiler.nodes.spi.Replacements; import org.graalvm.compiler.nodes.spi.StampProvider; @@ -46,19 +47,20 @@ public class Providers extends CoreProvidersImpl implements CodeGenProviders { private final CodeCacheProvider codeCache; public Providers(MetaAccessProvider metaAccess, CodeCacheProvider codeCache, ConstantReflectionProvider constantReflection, ConstantFieldProvider constantFieldProvider, - ForeignCallsProvider foreignCalls, LoweringProvider lowerer, Replacements replacements, StampProvider stampProvider, PlatformConfigurationProvider platformConfigurationProvider) { - super(metaAccess, constantReflection, constantFieldProvider, lowerer, replacements, stampProvider, foreignCalls, platformConfigurationProvider); + ForeignCallsProvider foreignCalls, LoweringProvider lowerer, Replacements replacements, StampProvider stampProvider, PlatformConfigurationProvider platformConfigurationProvider, + MetaAccessExtensionProvider metaAccessExtensionProvider) { + super(metaAccess, constantReflection, constantFieldProvider, lowerer, replacements, stampProvider, foreignCalls, platformConfigurationProvider, metaAccessExtensionProvider); this.codeCache = codeCache; } public Providers(Providers copyFrom) { this(copyFrom.getMetaAccess(), copyFrom.getCodeCache(), copyFrom.getConstantReflection(), copyFrom.getConstantFieldProvider(), copyFrom.getForeignCalls(), copyFrom.getLowerer(), - copyFrom.getReplacements(), copyFrom.getStampProvider(), copyFrom.getPlatformConfigurationProvider()); + copyFrom.getReplacements(), copyFrom.getStampProvider(), copyFrom.getPlatformConfigurationProvider(), copyFrom.getMetaAccessExtensionProvider()); } public Providers(CoreProviders copyFrom) { this(copyFrom.getMetaAccess(), null, copyFrom.getConstantReflection(), copyFrom.getConstantFieldProvider(), null, copyFrom.getLowerer(), copyFrom.getReplacements(), - copyFrom.getStampProvider(), copyFrom.getPlatformConfigurationProvider()); + copyFrom.getStampProvider(), copyFrom.getPlatformConfigurationProvider(), copyFrom.getMetaAccessExtensionProvider()); } @Override @@ -66,48 +68,20 @@ public class Providers extends CoreProvidersImpl implements CodeGenProviders { return codeCache; } - public Providers copyWith(MetaAccessProvider substitution) { - assert this.getClass() == Providers.class : "must override"; - return new Providers(substitution, codeCache, constantReflection, constantFieldProvider, foreignCalls, lowerer, replacements, stampProvider, platformConfigurationProvider); - } - - public Providers copyWith(CodeCacheProvider substitution) { - assert this.getClass() == Providers.class : "must override"; - return new Providers(metaAccess, substitution, constantReflection, constantFieldProvider, foreignCalls, lowerer, replacements, stampProvider, platformConfigurationProvider); - } - public Providers copyWith(ConstantReflectionProvider substitution) { - assert this.getClass() == Providers.class : "must override"; - return new Providers(metaAccess, codeCache, substitution, constantFieldProvider, foreignCalls, lowerer, replacements, stampProvider, platformConfigurationProvider); + assert this.getClass() == Providers.class : "must override in " + getClass(); + return new Providers(metaAccess, codeCache, substitution, constantFieldProvider, foreignCalls, lowerer, replacements, stampProvider, platformConfigurationProvider, + metaAccessExtensionProvider); } public Providers copyWith(ConstantFieldProvider substitution) { - assert this.getClass() == Providers.class : "must override"; - return new Providers(metaAccess, codeCache, constantReflection, substitution, foreignCalls, lowerer, replacements, stampProvider, platformConfigurationProvider); - } - - public Providers copyWith(ForeignCallsProvider substitution) { - assert this.getClass() == Providers.class : "must override"; - return new Providers(metaAccess, codeCache, constantReflection, constantFieldProvider, substitution, lowerer, replacements, stampProvider, platformConfigurationProvider); - } - - public Providers copyWith(LoweringProvider substitution) { - assert this.getClass() == Providers.class : "must override"; - return new Providers(metaAccess, codeCache, constantReflection, constantFieldProvider, foreignCalls, substitution, replacements, stampProvider, platformConfigurationProvider); + assert this.getClass() == Providers.class : "must override in " + getClass(); + return new Providers(metaAccess, codeCache, constantReflection, substitution, foreignCalls, lowerer, replacements, stampProvider, platformConfigurationProvider, metaAccessExtensionProvider); } public Providers copyWith(Replacements substitution) { assert this.getClass() == Providers.class : "must override in " + getClass(); - return new Providers(metaAccess, codeCache, constantReflection, constantFieldProvider, foreignCalls, lowerer, substitution, stampProvider, platformConfigurationProvider); - } - - public Providers copyWith(StampProvider substitution) { - assert this.getClass() == Providers.class : "must override"; - return new Providers(metaAccess, codeCache, constantReflection, constantFieldProvider, foreignCalls, lowerer, replacements, substitution, platformConfigurationProvider); - } - - public Providers copyWith(PlatformConfigurationProvider substitution) { - assert this.getClass() == Providers.class : "must override"; - return new Providers(metaAccess, codeCache, constantReflection, constantFieldProvider, foreignCalls, lowerer, replacements, stampProvider, substitution); + return new Providers(metaAccess, codeCache, constantReflection, constantFieldProvider, foreignCalls, lowerer, substitution, stampProvider, platformConfigurationProvider, + metaAccessExtensionProvider); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/BciBlockMappingDumpHandler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/BciBlockMappingDumpHandler.java new file mode 100644 index 00000000000..5a1dd87dd81 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/BciBlockMappingDumpHandler.java @@ -0,0 +1,420 @@ +/* + * Copyright (c) 2019, 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.printer; + +import java.io.IOException; +import java.util.ArrayDeque; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; + +import org.graalvm.compiler.bytecode.Bytecode; +import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.DebugDumpHandler; +import org.graalvm.compiler.debug.DebugOptions; +import org.graalvm.compiler.debug.DebugOptions.PrintGraphTarget; +import org.graalvm.compiler.debug.GraalError; +import org.graalvm.compiler.java.BciBlockMapping; +import org.graalvm.compiler.java.BciBlockMapping.BciBlock; +import org.graalvm.compiler.options.OptionValues; +import org.graalvm.graphio.GraphElements; +import org.graalvm.graphio.GraphOutput; +import org.graalvm.graphio.GraphOutput.Builder; +import org.graalvm.graphio.GraphStructure; +import org.graalvm.graphio.GraphTypes; + +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.Signature; + +public class BciBlockMappingDumpHandler implements DebugDumpHandler { + private static final BlockMappingElements ELEMENTS = new BlockMappingElements(); + private static final BlockMappingTypes TYPES = new BlockMappingTypes(); + private BlockMappingStructure structure; + private int nextId; + + @Override + public void dump(DebugContext debug, Object object, String format, Object... arguments) { + OptionValues options = debug.getOptions(); + if (object instanceof BciBlockMapping && DebugOptions.PrintGraph.getValue(options) != PrintGraphTarget.Disable) { + try { + if (structure == null) { + structure = new BlockMappingStructure(); + } + int id = nextId++; + Builder builder = GraphOutput.newBuilder(structure).elements(ELEMENTS).types(TYPES).protocolVersion(7, 0); + GraphOutput output = debug.buildOutput(builder); + Map properties = new HashMap<>(); + properties.put("hasJsrBytecodes", ((BciBlockMapping) object).hasJsrBytecodes); + // ideally this should collaborate with the graph printer to open/close groups + output.print((BciBlockMapping) object, properties, id, format, arguments); + output.close(); + } catch (IOException e) { + throw new RuntimeException("Failed to dump block mapping", e); + } + } + } + + static class BciBlockClass { + final BciBlock block; + + BciBlockClass(BciBlock block) { + this.block = block; + } + } + + static class BlockEdges { + final BciBlock block; + + BlockEdges(BciBlock block) { + this.block = block; + } + } + + enum EdgeType { + Successor, + JsrSuccessor, + RetSuccessor + } + + private static final BlockEdges NO_EDGES = new BlockEdges(null); + + static class BlockMappingStructure implements GraphStructure { + private Map artificialIds; + private int nextArtifcialId = 1_000_000; + + @Override + public BciBlockMapping graph(BciBlockMapping currentGraph, Object obj) { + return obj instanceof BciBlockMapping ? (BciBlockMapping) obj : null; + } + + @Override + public Collection nodes(BciBlockMapping graph) { + return collectBlocks(graph); + } + + private static Collection collectBlocks(BciBlockMapping graph) { + if (graph.getStartBlock() == null) { + return Collections.emptySet(); + } + HashSet blocks = new HashSet<>(); + ArrayDeque workStack = new ArrayDeque<>(); + workStack.push(graph.getStartBlock()); + while (!workStack.isEmpty()) { + BciBlock block = workStack.pop(); + if (blocks.contains(block)) { + continue; + } + blocks.add(block); + for (BciBlock successor : block.getSuccessors()) { + workStack.push(successor); + } + BciBlock jsrSuccessor = block.getJsrSuccessor(); + if (jsrSuccessor != null) { + workStack.push(jsrSuccessor); + } + BciBlock retSuccessor = block.getRetSuccessor(); + if (retSuccessor != null) { + workStack.push(retSuccessor); + } + } + return blocks; + } + + @Override + public int nodesCount(BciBlockMapping graph) { + return nodes(graph).size(); + } + + @Override + public int nodeId(BciBlock node) { + if (artificialIds != null) { + Integer artificial = artificialIds.get(node); + if (artificial != null) { + return artificial; + } + } + int id = node.getId(); + if (id < 0) { + if (artificialIds == null) { + artificialIds = new HashMap<>(); + } + id = artificialIds.computeIfAbsent(node, b -> nextArtifcialId++); + } + return id; + } + + @Override + public boolean nodeHasPredecessor(BciBlock node) { + return node.getPredecessorCount() > 0; + } + + @Override + public void nodeProperties(BciBlockMapping graph, BciBlock node, Map properties) { + node.getDebugProperties(properties); + } + + @Override + public BciBlock node(Object obj) { + return obj instanceof BciBlock ? (BciBlock) obj : null; + } + + @Override + public BciBlockClass nodeClass(Object obj) { + return obj instanceof BciBlockClass ? (BciBlockClass) obj : null; + } + + @Override + public BciBlockClass classForNode(BciBlock node) { + return new BciBlockClass(node); + } + + @Override + public String nameTemplate(BciBlockClass nodeClass) { + return "[{p#startBci}..{p#endBci}] ({p#assignedId})"; + } + + @Override + public Object nodeClassType(BciBlockClass nodeClass) { + return nodeClass.block.getClass(); + } + + @Override + public BlockEdges portInputs(BciBlockClass nodeClass) { + return NO_EDGES; + } + + @Override + public BlockEdges portOutputs(BciBlockClass nodeClass) { + return new BlockEdges(nodeClass.block); + } + + @Override + public int portSize(BlockEdges port) { + if (port.block == null) { + return 0; + } + return 1 + (port.block.getJsrSuccessor() != null ? 1 : 0) + (port.block.getRetSuccessor() != null ? 1 : 0); + } + + @Override + public boolean edgeDirect(BlockEdges port, int index) { + return index > 0; + } + + @Override + public String edgeName(BlockEdges port, int index) { + if (index == 0) { + return "successors"; + } else if (index == 1 && port.block.getJsrSuccessor() != null) { + return "jsr successor"; + } + GraalError.guarantee(index <= 2, Integer.toString(index)); + return "ret successor"; + } + + @Override + public Object edgeType(BlockEdges port, int index) { + if (index == 0) { + return EdgeType.Successor; + } else if (index == 1 && port.block.getJsrSuccessor() != null) { + return EdgeType.JsrSuccessor; + } + GraalError.guarantee(index <= 2, Integer.toString(index)); + return EdgeType.RetSuccessor; + } + + @Override + public Collection edgeNodes(BciBlockMapping graph, BciBlock node, BlockEdges port, int index) { + if (index == 0) { + return node.getSuccessors(); + } else if (index == 1 && port.block.getJsrSuccessor() != null) { + return Collections.singletonList(node.getJsrSuccessor()); + } + GraalError.guarantee(index <= 2, Integer.toString(index)); + return Collections.singletonList(node.getRetSuccessor()); + } + } + + static class BlockMappingElements implements GraphElements { + + @Override + public ResolvedJavaMethod method(Object object) { + if (object instanceof Bytecode) { + return ((Bytecode) object).getMethod(); + } else if (object instanceof ResolvedJavaMethod) { + return ((ResolvedJavaMethod) object); + } else { + return null; + } + } + + @Override + public byte[] methodCode(ResolvedJavaMethod method) { + return method.getCode(); + } + + @Override + public int methodModifiers(ResolvedJavaMethod method) { + return method.getModifiers(); + } + + @Override + public Signature methodSignature(ResolvedJavaMethod method) { + return method.getSignature(); + } + + @Override + public String methodName(ResolvedJavaMethod method) { + return method.getName(); + } + + @Override + public Object methodDeclaringClass(ResolvedJavaMethod method) { + return method.getDeclaringClass(); + } + + @Override + public Object field(Object object) { + return null; + } + + @Override + public Signature signature(Object object) { + if (object instanceof Signature) { + return (Signature) object; + } + return null; + } + + @Override + public Object nodeSourcePosition(Object object) { + return null; + } + + @Override + public StackTraceElement methodStackTraceElement(ResolvedJavaMethod method, int bci, Object pos) { + throw GraalError.shouldNotReachHere(); + } + + @Override + public int nodeSourcePositionBCI(Object pos) { + throw GraalError.shouldNotReachHere(); + } + + @Override + public Object nodeSourcePositionCaller(Object pos) { + throw GraalError.shouldNotReachHere(); + } + + @Override + public ResolvedJavaMethod nodeSourcePositionMethod(Object pos) { + throw GraalError.shouldNotReachHere(); + } + + @Override + public int signatureParameterCount(Signature signature) { + return signature.getParameterCount(false); + } + + @Override + public String signatureParameterTypeName(Signature signature, int index) { + return signature.getParameterType(index, null).getName(); + } + + @Override + public String signatureReturnTypeName(Signature signature) { + return signature.getReturnType(null).getName(); + } + + @Override + public Object fieldDeclaringClass(Object field) { + throw GraalError.shouldNotReachHere(); + } + + @Override + public String fieldName(Object field) { + throw GraalError.shouldNotReachHere(); + } + + @Override + public String fieldTypeName(Object field) { + throw GraalError.shouldNotReachHere(); + } + + @Override + public int fieldModifiers(Object field) { + throw GraalError.shouldNotReachHere(); + } + } + + static class BlockMappingTypes implements GraphTypes { + @Override + public Class enumClass(Object enumValue) { + if (enumValue instanceof Enum) { + return enumValue.getClass(); + } + return null; + } + + @Override + public int enumOrdinal(Object obj) { + if (obj instanceof Enum) { + return ((Enum) obj).ordinal(); + } + return -1; + } + + @SuppressWarnings("unchecked") + @Override + public String[] enumTypeValues(Object clazz) { + if (clazz instanceof Class) { + Class> enumClass = (Class>) clazz; + Enum[] constants = enumClass.getEnumConstants(); + if (constants != null) { + String[] names = new String[constants.length]; + for (int i = 0; i < constants.length; i++) { + names[i] = constants[i].name(); + } + return names; + } + } + return null; + } + + @Override + public String typeName(Object clazz) { + if (clazz instanceof Class) { + return ((Class) clazz).getName(); + } + if (clazz instanceof JavaType) { + return ((JavaType) clazz).toJavaName(); + } + return null; + } + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/BinaryGraphPrinter.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/BinaryGraphPrinter.java index 96a4643609f..9f5a587e179 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/BinaryGraphPrinter.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/BinaryGraphPrinter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -89,7 +89,7 @@ public class BinaryGraphPrinter implements public BinaryGraphPrinter(DebugContext ctx, SnippetReflectionProvider snippetReflection) throws IOException { // @formatter:off this.output = ctx.buildOutput(GraphOutput.newBuilder(this). - protocolVersion(6, 1). + protocolVersion(7, 0). blocks(this). elementsAndLocations(this, this). types(this) diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraalDebugHandlersFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraalDebugHandlersFactory.java index 4a7cb8eeb07..505a5942d81 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraalDebugHandlersFactory.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraalDebugHandlersFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -68,6 +68,9 @@ public class GraalDebugHandlersFactory implements DebugHandlersFactory { handlers.add(new CFGPrinterObserver()); } handlers.add(new NoDeadCodeVerifyHandler()); + if (DebugOptions.PrintBlockMapping.getValue(options)) { + handlers.add(new BciBlockMappingDumpHandler()); + } return handlers; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java index 9cca1544e19..294d64be5df 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -60,22 +60,20 @@ import sun.misc.Unsafe; public class AArch64GraphBuilderPlugins implements TargetGraphBuilderPlugins { @Override - public void register(Plugins plugins, Replacements replacements, Architecture arch, boolean explicitUnsafeNullChecks, boolean registerMathPlugins, + public void register(Plugins plugins, Replacements replacements, Architecture arch, boolean explicitUnsafeNullChecks, boolean registerForeignCallMath, boolean emitJDK9StringSubstitutions, boolean useFMAIntrinsics) { - register(plugins, replacements, explicitUnsafeNullChecks, registerMathPlugins, emitJDK9StringSubstitutions, useFMAIntrinsics); + register(plugins, replacements, explicitUnsafeNullChecks, registerForeignCallMath, emitJDK9StringSubstitutions, useFMAIntrinsics); } public static void register(Plugins plugins, Replacements replacements, boolean explicitUnsafeNullChecks, - boolean registerMathPlugins, boolean emitJDK9StringSubstitutions, boolean useFMAIntrinsics) { + boolean registerForeignCallMath, boolean emitJDK9StringSubstitutions, boolean useFMAIntrinsics) { InvocationPlugins invocationPlugins = plugins.getInvocationPlugins(); invocationPlugins.defer(new Runnable() { @Override public void run() { registerIntegerLongPlugins(invocationPlugins, JavaKind.Int, replacements); registerIntegerLongPlugins(invocationPlugins, JavaKind.Long, replacements); - if (registerMathPlugins) { - registerMathPlugins(invocationPlugins, useFMAIntrinsics); - } + registerMathPlugins(invocationPlugins, registerForeignCallMath, useFMAIntrinsics); if (emitJDK9StringSubstitutions) { registerStringLatin1Plugins(invocationPlugins, replacements); registerStringUTF16Plugins(invocationPlugins, replacements); @@ -126,21 +124,23 @@ public class AArch64GraphBuilderPlugins implements TargetGraphBuilderPlugins { }); } - private static void registerMathPlugins(InvocationPlugins plugins, boolean useFMAIntrinsics) { + private static void registerMathPlugins(InvocationPlugins plugins, boolean registerForeignCallMath, boolean useFMAIntrinsics) { Registration r = new Registration(plugins, Math.class); - registerUnaryMath(r, "sin", SIN); - registerUnaryMath(r, "cos", COS); - registerUnaryMath(r, "tan", TAN); - registerUnaryMath(r, "exp", EXP); - registerUnaryMath(r, "log", LOG); - registerUnaryMath(r, "log10", LOG10); - r.register2("pow", Double.TYPE, Double.TYPE, new InvocationPlugin() { - @Override - public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode x, ValueNode y) { - b.push(JavaKind.Double, b.append(BinaryMathIntrinsicNode.create(x, y, BinaryMathIntrinsicNode.BinaryOperation.POW))); - return true; - } - }); + if (registerForeignCallMath) { + registerUnaryMath(r, "sin", SIN); + registerUnaryMath(r, "cos", COS); + registerUnaryMath(r, "tan", TAN); + registerUnaryMath(r, "exp", EXP); + registerUnaryMath(r, "log", LOG); + registerUnaryMath(r, "log10", LOG10); + r.register2("pow", Double.TYPE, Double.TYPE, new InvocationPlugin() { + @Override + public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode x, ValueNode y) { + b.push(JavaKind.Double, b.append(BinaryMathIntrinsicNode.create(x, y, BinaryMathIntrinsicNode.BinaryOperation.POW))); + return true; + } + }); + } registerRound(r, "rint", RoundingMode.NEAREST); registerRound(r, "ceil", RoundingMode.UP); registerRound(r, "floor", RoundingMode.DOWN); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64ArrayIndexOf.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64ArrayIndexOf.java index c60d001c899..a320e442833 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64ArrayIndexOf.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64ArrayIndexOf.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -24,39 +24,39 @@ package org.graalvm.compiler.replacements.amd64; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; +import org.graalvm.compiler.core.common.spi.ForeignCallSignature; public class AMD64ArrayIndexOf { - public static final ForeignCallDescriptor STUB_INDEX_OF_TWO_CONSECUTIVE_BYTES = new ForeignCallDescriptor( + public static final ForeignCallSignature STUB_INDEX_OF_TWO_CONSECUTIVE_BYTES = new ForeignCallSignature( "indexOfTwoConsecutiveBytes", int.class, byte[].class, int.class, int.class, int.class); - public static final ForeignCallDescriptor STUB_INDEX_OF_TWO_CONSECUTIVE_CHARS = new ForeignCallDescriptor( + public static final ForeignCallSignature STUB_INDEX_OF_TWO_CONSECUTIVE_CHARS = new ForeignCallSignature( "indexOfTwoConsecutiveChars", int.class, char[].class, int.class, int.class, int.class); - public static final ForeignCallDescriptor STUB_INDEX_OF_TWO_CONSECUTIVE_CHARS_COMPACT = new ForeignCallDescriptor( + public static final ForeignCallSignature STUB_INDEX_OF_TWO_CONSECUTIVE_CHARS_COMPACT = new ForeignCallSignature( "indexOfTwoConsecutiveCharsCompact", int.class, byte[].class, int.class, int.class, int.class); - public static final ForeignCallDescriptor STUB_INDEX_OF_1_BYTE = new ForeignCallDescriptor( + public static final ForeignCallSignature STUB_INDEX_OF_1_BYTE = new ForeignCallSignature( "indexOf1Byte", int.class, byte[].class, int.class, int.class, byte.class); - public static final ForeignCallDescriptor STUB_INDEX_OF_2_BYTES = new ForeignCallDescriptor( + public static final ForeignCallSignature STUB_INDEX_OF_2_BYTES = new ForeignCallSignature( "indexOf2Bytes", int.class, byte[].class, int.class, int.class, byte.class, byte.class); - public static final ForeignCallDescriptor STUB_INDEX_OF_3_BYTES = new ForeignCallDescriptor( + public static final ForeignCallSignature STUB_INDEX_OF_3_BYTES = new ForeignCallSignature( "indexOf3Bytes", int.class, byte[].class, int.class, int.class, byte.class, byte.class, byte.class); - public static final ForeignCallDescriptor STUB_INDEX_OF_4_BYTES = new ForeignCallDescriptor( + public static final ForeignCallSignature STUB_INDEX_OF_4_BYTES = new ForeignCallSignature( "indexOf4Bytes", int.class, byte[].class, int.class, int.class, byte.class, byte.class, byte.class, byte.class); - public static final ForeignCallDescriptor STUB_INDEX_OF_1_CHAR = new ForeignCallDescriptor( + public static final ForeignCallSignature STUB_INDEX_OF_1_CHAR = new ForeignCallSignature( "indexOf1Char", int.class, char[].class, int.class, int.class, char.class); - public static final ForeignCallDescriptor STUB_INDEX_OF_2_CHARS = new ForeignCallDescriptor( + public static final ForeignCallSignature STUB_INDEX_OF_2_CHARS = new ForeignCallSignature( "indexOf2Chars", int.class, char[].class, int.class, int.class, char.class, char.class); - public static final ForeignCallDescriptor STUB_INDEX_OF_3_CHARS = new ForeignCallDescriptor( + public static final ForeignCallSignature STUB_INDEX_OF_3_CHARS = new ForeignCallSignature( "indexOf3Chars", int.class, char[].class, int.class, int.class, char.class, char.class, char.class); - public static final ForeignCallDescriptor STUB_INDEX_OF_4_CHARS = new ForeignCallDescriptor( + public static final ForeignCallSignature STUB_INDEX_OF_4_CHARS = new ForeignCallSignature( "indexOf4Chars", int.class, char[].class, int.class, int.class, char.class, char.class, char.class, char.class); - public static final ForeignCallDescriptor STUB_INDEX_OF_1_CHAR_COMPACT = new ForeignCallDescriptor( + public static final ForeignCallSignature STUB_INDEX_OF_1_CHAR_COMPACT = new ForeignCallSignature( "indexOf1CharCompact", int.class, byte[].class, int.class, int.class, char.class); - public static final ForeignCallDescriptor STUB_INDEX_OF_2_CHARS_COMPACT = new ForeignCallDescriptor( + public static final ForeignCallSignature STUB_INDEX_OF_2_CHARS_COMPACT = new ForeignCallSignature( "indexOf2CharsCompact", int.class, byte[].class, int.class, int.class, char.class, char.class); - public static final ForeignCallDescriptor STUB_INDEX_OF_3_CHARS_COMPACT = new ForeignCallDescriptor( + public static final ForeignCallSignature STUB_INDEX_OF_3_CHARS_COMPACT = new ForeignCallSignature( "indexOf3CharsCompact", int.class, byte[].class, int.class, int.class, char.class, char.class, char.class); - public static final ForeignCallDescriptor STUB_INDEX_OF_4_CHARS_COMPACT = new ForeignCallDescriptor( + public static final ForeignCallSignature STUB_INDEX_OF_4_CHARS_COMPACT = new ForeignCallSignature( "indexOf4CharsCompact", int.class, byte[].class, int.class, int.class, char.class, char.class, char.class, char.class); public static int indexOfTwoConsecutiveBytes(byte[] array, int arrayLength, int fromIndex, byte b1, byte b2) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64ArrayIndexOfDispatchNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64ArrayIndexOfDispatchNode.java index 3fabb623144..1907e90768e 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64ArrayIndexOfDispatchNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64ArrayIndexOfDispatchNode.java @@ -26,13 +26,20 @@ package org.graalvm.compiler.replacements.amd64; import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_512; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; +import java.nio.ByteOrder; + +import org.graalvm.compiler.core.common.GraalOptions; +import org.graalvm.compiler.core.common.spi.ForeignCallSignature; import org.graalvm.compiler.core.common.type.StampFactory; +import org.graalvm.compiler.graph.Node; import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.graph.NodeInputList; +import org.graalvm.compiler.graph.spi.Canonicalizable; +import org.graalvm.compiler.graph.spi.CanonicalizerTool; import org.graalvm.compiler.nodeinfo.InputType; import org.graalvm.compiler.nodeinfo.NodeCycles; import org.graalvm.compiler.nodeinfo.NodeInfo; +import org.graalvm.compiler.nodes.ConstantNode; import org.graalvm.compiler.nodes.DeoptimizingNode; import org.graalvm.compiler.nodes.FixedWithNextNode; import org.graalvm.compiler.nodes.FrameState; @@ -42,9 +49,10 @@ import org.graalvm.compiler.nodes.ValueNodeUtil; import org.graalvm.compiler.nodes.memory.MemoryAccess; import org.graalvm.compiler.nodes.memory.MemoryKill; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import jdk.internal.vm.compiler.word.LocationIdentity; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.JavaKind; /** @@ -52,11 +60,11 @@ import jdk.vm.ci.meta.JavaKind; * to a {@link AMD64ArrayIndexOfNode} or a specialized snippet. */ @NodeInfo(size = SIZE_512, cycles = NodeCycles.CYCLES_UNKNOWN) -public class AMD64ArrayIndexOfDispatchNode extends FixedWithNextNode implements Lowerable, MemoryAccess, DeoptimizingNode.DeoptBefore { +public class AMD64ArrayIndexOfDispatchNode extends FixedWithNextNode implements Canonicalizable, Lowerable, MemoryAccess, DeoptimizingNode.DeoptBefore { public static final NodeClass TYPE = NodeClass.create(AMD64ArrayIndexOfDispatchNode.class); - private final ForeignCallDescriptor stubCallDescriptor; + private final ForeignCallSignature stubCallDescriptor; private final JavaKind arrayKind; private final JavaKind valueKind; private final boolean findTwoConsecutive; @@ -69,7 +77,7 @@ public class AMD64ArrayIndexOfDispatchNode extends FixedWithNextNode implements @OptionalInput(InputType.Memory) private MemoryKill lastLocationAccess; @OptionalInput(InputType.State) protected FrameState stateBefore; - public AMD64ArrayIndexOfDispatchNode(@ConstantNodeParameter ForeignCallDescriptor stubCallDescriptor, @ConstantNodeParameter JavaKind arrayKind, @ConstantNodeParameter JavaKind valueKind, + public AMD64ArrayIndexOfDispatchNode(@ConstantNodeParameter ForeignCallSignature stubCallDescriptor, @ConstantNodeParameter JavaKind arrayKind, @ConstantNodeParameter JavaKind valueKind, @ConstantNodeParameter boolean findTwoConsecutive, ValueNode arrayPointer, ValueNode arrayLength, ValueNode fromIndex, ValueNode... searchValues) { super(TYPE, StampFactory.forKind(JavaKind.Int)); this.stubCallDescriptor = stubCallDescriptor; @@ -118,7 +126,7 @@ public class AMD64ArrayIndexOfDispatchNode extends FixedWithNextNode implements return stateBefore; } - public ForeignCallDescriptor getStubCallDescriptor() { + public ForeignCallSignature getStubCallDescriptor() { return stubCallDescriptor; } @@ -149,7 +157,7 @@ public class AMD64ArrayIndexOfDispatchNode extends FixedWithNextNode implements return ret; } - public AMD64ArrayIndexOfDispatchNode(@ConstantNodeParameter ForeignCallDescriptor stubCallDescriptor, @ConstantNodeParameter JavaKind arrayKind, @ConstantNodeParameter JavaKind valueKind, + public AMD64ArrayIndexOfDispatchNode(@ConstantNodeParameter ForeignCallSignature stubCallDescriptor, @ConstantNodeParameter JavaKind arrayKind, @ConstantNodeParameter JavaKind valueKind, ValueNode arrayPointer, ValueNode arrayLength, ValueNode fromIndex, ValueNode... searchValues) { this(stubCallDescriptor, arrayKind, valueKind, false, arrayPointer, arrayLength, fromIndex, searchValues); } @@ -160,8 +168,56 @@ public class AMD64ArrayIndexOfDispatchNode extends FixedWithNextNode implements } @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); + public Node canonical(CanonicalizerTool tool) { + if (!findTwoConsecutive && arrayPointer.isConstant() && ((ConstantNode) arrayPointer).getStableDimension() > 0 && fromIndex.isConstant()) { + ConstantReflectionProvider provider = tool.getConstantReflection(); + JavaConstant arrayConstant = arrayPointer.asJavaConstant(); + int length = provider.readArrayLength(arrayConstant); + int fromIndexConstant = fromIndex.asJavaConstant().asInt(); + + if (searchValues.size() == 1 && searchValues.get(0).isConstant()) { + int ch = searchValues.get(0).asJavaConstant().asInt(); + assert ch < Character.MIN_SUPPLEMENTARY_CODE_POINT; + if (arrayKind == JavaKind.Byte) { + // Java 9+ + if (valueKind == JavaKind.Byte && length < GraalOptions.StringIndexOfLimit.getValue(tool.getOptions())) { + for (int i = fromIndexConstant; i < length; i++) { + if ((provider.readArrayElement(arrayConstant, i).asInt() & 0xFF) == ch) { + return ConstantNode.forInt(i); + } + } + return ConstantNode.forInt(-1); + } else if (length < GraalOptions.StringIndexOfLimit.getValue(tool.getOptions()) * 2) { + assert valueKind == JavaKind.Char; + length >>= 1; + for (int i = fromIndexConstant; i < length; i++) { + int b0 = provider.readArrayElement(arrayConstant, i * 2).asInt() & 0xFF; + int b1 = provider.readArrayElement(arrayConstant, i * 2 + 1).asInt() & 0xFF; + char c; + if (ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN) { + c = (char) ((b0 << 8) | b1); + } else { + c = (char) (b0 | (b1 << 8)); + } + if (c == ch) { + return ConstantNode.forInt(i); + } + } + return ConstantNode.forInt(-1); + } + } else if (arrayKind == JavaKind.Char && length < GraalOptions.StringIndexOfLimit.getValue(tool.getOptions())) { + // Java 8 + assert valueKind == JavaKind.Char; + for (int i = fromIndexConstant; i < length; i++) { + if ((provider.readArrayElement(arrayConstant, i).asInt() & 0xFFFF) == ch) { + return ConstantNode.forInt(i); + } + } + return ConstantNode.forInt(-1); + } + } + } + return this; } @Override @@ -177,7 +233,7 @@ public class AMD64ArrayIndexOfDispatchNode extends FixedWithNextNode implements @NodeIntrinsic private static native int optimizedArrayIndexOf( - @ConstantNodeParameter ForeignCallDescriptor descriptor, + @ConstantNodeParameter ForeignCallSignature descriptor, @ConstantNodeParameter JavaKind arrayKind, @ConstantNodeParameter JavaKind valueKind, @ConstantNodeParameter boolean findTwoConsecutive, @@ -185,7 +241,7 @@ public class AMD64ArrayIndexOfDispatchNode extends FixedWithNextNode implements @NodeIntrinsic private static native int optimizedArrayIndexOf( - @ConstantNodeParameter ForeignCallDescriptor descriptor, + @ConstantNodeParameter ForeignCallSignature descriptor, @ConstantNodeParameter JavaKind arrayKind, @ConstantNodeParameter JavaKind valueKind, @ConstantNodeParameter boolean findTwoConsecutive, @@ -193,7 +249,7 @@ public class AMD64ArrayIndexOfDispatchNode extends FixedWithNextNode implements @NodeIntrinsic private static native int optimizedArrayIndexOf( - @ConstantNodeParameter ForeignCallDescriptor descriptor, + @ConstantNodeParameter ForeignCallSignature descriptor, @ConstantNodeParameter JavaKind arrayKind, @ConstantNodeParameter JavaKind valueKind, @ConstantNodeParameter boolean findTwoConsecutive, @@ -201,7 +257,7 @@ public class AMD64ArrayIndexOfDispatchNode extends FixedWithNextNode implements @NodeIntrinsic private static native int optimizedArrayIndexOf( - @ConstantNodeParameter ForeignCallDescriptor descriptor, + @ConstantNodeParameter ForeignCallSignature descriptor, @ConstantNodeParameter JavaKind arrayKind, @ConstantNodeParameter JavaKind valueKind, @ConstantNodeParameter boolean findTwoConsecutive, @@ -209,7 +265,7 @@ public class AMD64ArrayIndexOfDispatchNode extends FixedWithNextNode implements @NodeIntrinsic private static native int optimizedArrayIndexOf( - @ConstantNodeParameter ForeignCallDescriptor descriptor, + @ConstantNodeParameter ForeignCallSignature descriptor, @ConstantNodeParameter JavaKind arrayKind, @ConstantNodeParameter JavaKind valueKind, @ConstantNodeParameter boolean findTwoConsecutive, @@ -217,7 +273,7 @@ public class AMD64ArrayIndexOfDispatchNode extends FixedWithNextNode implements @NodeIntrinsic private static native int optimizedArrayIndexOf( - @ConstantNodeParameter ForeignCallDescriptor descriptor, + @ConstantNodeParameter ForeignCallSignature descriptor, @ConstantNodeParameter JavaKind arrayKind, @ConstantNodeParameter JavaKind valueKind, @ConstantNodeParameter boolean findTwoConsecutive, @@ -225,7 +281,7 @@ public class AMD64ArrayIndexOfDispatchNode extends FixedWithNextNode implements @NodeIntrinsic private static native int optimizedArrayIndexOf( - @ConstantNodeParameter ForeignCallDescriptor descriptor, + @ConstantNodeParameter ForeignCallSignature descriptor, @ConstantNodeParameter JavaKind arrayKind, @ConstantNodeParameter JavaKind valueKind, @ConstantNodeParameter boolean findTwoConsecutive, @@ -233,7 +289,7 @@ public class AMD64ArrayIndexOfDispatchNode extends FixedWithNextNode implements @NodeIntrinsic private static native int optimizedArrayIndexOf( - @ConstantNodeParameter ForeignCallDescriptor descriptor, + @ConstantNodeParameter ForeignCallSignature descriptor, @ConstantNodeParameter JavaKind arrayKind, @ConstantNodeParameter JavaKind valueKind, @ConstantNodeParameter boolean findTwoConsecutive, @@ -241,69 +297,69 @@ public class AMD64ArrayIndexOfDispatchNode extends FixedWithNextNode implements @NodeIntrinsic private static native int optimizedArrayIndexOf( - @ConstantNodeParameter ForeignCallDescriptor descriptor, + @ConstantNodeParameter ForeignCallSignature descriptor, @ConstantNodeParameter JavaKind arrayKind, @ConstantNodeParameter JavaKind valueKind, @ConstantNodeParameter boolean findTwoConsecutive, Object array, int arrayLength, int fromIndex, int searchValue); - public static int indexOf(@ConstantNodeParameter ForeignCallDescriptor descriptor, byte[] array, int arrayLength, int fromIndex, byte v1) { + public static int indexOf(@ConstantNodeParameter ForeignCallSignature descriptor, byte[] array, int arrayLength, int fromIndex, byte v1) { return optimizedArrayIndexOf(descriptor, JavaKind.Byte, JavaKind.Byte, false, array, arrayLength, fromIndex, v1); } - public static int indexOf(@ConstantNodeParameter ForeignCallDescriptor descriptor, byte[] array, int arrayLength, int fromIndex, byte v1, byte v2) { + public static int indexOf(@ConstantNodeParameter ForeignCallSignature descriptor, byte[] array, int arrayLength, int fromIndex, byte v1, byte v2) { return optimizedArrayIndexOf(descriptor, JavaKind.Byte, JavaKind.Byte, false, array, arrayLength, fromIndex, v1, v2); } - public static int indexOf(@ConstantNodeParameter ForeignCallDescriptor descriptor, byte[] array, int arrayLength, int fromIndex, byte v1, byte v2, byte v3) { + public static int indexOf(@ConstantNodeParameter ForeignCallSignature descriptor, byte[] array, int arrayLength, int fromIndex, byte v1, byte v2, byte v3) { return optimizedArrayIndexOf(descriptor, JavaKind.Byte, JavaKind.Byte, false, array, arrayLength, fromIndex, v1, v2, v3); } - public static int indexOf(@ConstantNodeParameter ForeignCallDescriptor descriptor, byte[] array, int arrayLength, int fromIndex, byte v1, byte v2, byte v3, byte v4) { + public static int indexOf(@ConstantNodeParameter ForeignCallSignature descriptor, byte[] array, int arrayLength, int fromIndex, byte v1, byte v2, byte v3, byte v4) { return optimizedArrayIndexOf(descriptor, JavaKind.Byte, JavaKind.Byte, false, array, arrayLength, fromIndex, v1, v2, v3, v4); } - public static int indexOf(@ConstantNodeParameter ForeignCallDescriptor descriptor, byte[] array, int arrayLength, int fromIndex, char v1) { + public static int indexOf(@ConstantNodeParameter ForeignCallSignature descriptor, byte[] array, int arrayLength, int fromIndex, char v1) { return optimizedArrayIndexOf(descriptor, JavaKind.Byte, JavaKind.Char, false, array, arrayLength, fromIndex, v1); } - public static int indexOf(@ConstantNodeParameter ForeignCallDescriptor descriptor, byte[] array, int arrayLength, int fromIndex, char v1, char v2) { + public static int indexOf(@ConstantNodeParameter ForeignCallSignature descriptor, byte[] array, int arrayLength, int fromIndex, char v1, char v2) { return optimizedArrayIndexOf(descriptor, JavaKind.Byte, JavaKind.Char, false, array, arrayLength, fromIndex, v1, v2); } - public static int indexOf(@ConstantNodeParameter ForeignCallDescriptor descriptor, byte[] array, int arrayLength, int fromIndex, char v1, char v2, char v3) { + public static int indexOf(@ConstantNodeParameter ForeignCallSignature descriptor, byte[] array, int arrayLength, int fromIndex, char v1, char v2, char v3) { return optimizedArrayIndexOf(descriptor, JavaKind.Byte, JavaKind.Char, false, array, arrayLength, fromIndex, v1, v2, v3); } - public static int indexOf(@ConstantNodeParameter ForeignCallDescriptor descriptor, byte[] array, int arrayLength, int fromIndex, char v1, char v2, char v3, char v4) { + public static int indexOf(@ConstantNodeParameter ForeignCallSignature descriptor, byte[] array, int arrayLength, int fromIndex, char v1, char v2, char v3, char v4) { return optimizedArrayIndexOf(descriptor, JavaKind.Byte, JavaKind.Char, false, array, arrayLength, fromIndex, v1, v2, v3, v4); } - public static int indexOf(@ConstantNodeParameter ForeignCallDescriptor descriptor, char[] array, int arrayLength, int fromIndex, char v1) { + public static int indexOf(@ConstantNodeParameter ForeignCallSignature descriptor, char[] array, int arrayLength, int fromIndex, char v1) { return optimizedArrayIndexOf(descriptor, JavaKind.Char, JavaKind.Char, false, array, arrayLength, fromIndex, v1); } - public static int indexOf(@ConstantNodeParameter ForeignCallDescriptor descriptor, char[] array, int arrayLength, int fromIndex, char v1, char v2) { + public static int indexOf(@ConstantNodeParameter ForeignCallSignature descriptor, char[] array, int arrayLength, int fromIndex, char v1, char v2) { return optimizedArrayIndexOf(descriptor, JavaKind.Char, JavaKind.Char, false, array, arrayLength, fromIndex, v1, v2); } - public static int indexOf(@ConstantNodeParameter ForeignCallDescriptor descriptor, char[] array, int arrayLength, int fromIndex, char v1, char v2, char v3) { + public static int indexOf(@ConstantNodeParameter ForeignCallSignature descriptor, char[] array, int arrayLength, int fromIndex, char v1, char v2, char v3) { return optimizedArrayIndexOf(descriptor, JavaKind.Char, JavaKind.Char, false, array, arrayLength, fromIndex, v1, v2, v3); } - public static int indexOf(@ConstantNodeParameter ForeignCallDescriptor descriptor, char[] array, int arrayLength, int fromIndex, char v1, char v2, char v3, char v4) { + public static int indexOf(@ConstantNodeParameter ForeignCallSignature descriptor, char[] array, int arrayLength, int fromIndex, char v1, char v2, char v3, char v4) { return optimizedArrayIndexOf(descriptor, JavaKind.Char, JavaKind.Char, false, array, arrayLength, fromIndex, v1, v2, v3, v4); } - public static int indexOf2ConsecutiveBytes(@ConstantNodeParameter ForeignCallDescriptor descriptor, byte[] array, int arrayLength, int fromIndex, int values) { + public static int indexOf2ConsecutiveBytes(@ConstantNodeParameter ForeignCallSignature descriptor, byte[] array, int arrayLength, int fromIndex, int values) { return optimizedArrayIndexOf(descriptor, JavaKind.Byte, JavaKind.Byte, true, array, arrayLength, fromIndex, values); } - public static int indexOf2ConsecutiveChars(@ConstantNodeParameter ForeignCallDescriptor descriptor, byte[] array, int arrayLength, int fromIndex, int values) { + public static int indexOf2ConsecutiveChars(@ConstantNodeParameter ForeignCallSignature descriptor, byte[] array, int arrayLength, int fromIndex, int values) { return optimizedArrayIndexOf(descriptor, JavaKind.Byte, JavaKind.Char, true, array, arrayLength, fromIndex, values); } - public static int indexOf2ConsecutiveChars(@ConstantNodeParameter ForeignCallDescriptor descriptor, char[] array, int arrayLength, int fromIndex, int values) { + public static int indexOf2ConsecutiveChars(@ConstantNodeParameter ForeignCallSignature descriptor, char[] array, int arrayLength, int fromIndex, int values) { return optimizedArrayIndexOf(descriptor, JavaKind.Char, JavaKind.Char, true, array, arrayLength, fromIndex, values); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java index d15a0fab26f..6f3c765a530 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -71,7 +71,7 @@ import sun.misc.Unsafe; public class AMD64GraphBuilderPlugins implements TargetGraphBuilderPlugins { @Override public void register(Plugins plugins, Replacements replacements, Architecture architecture, boolean explicitUnsafeNullChecks, - boolean registerMathPlugins, boolean emitJDK9StringSubstitutions, boolean useFMAIntrinsics) { + boolean registerForeignCallMath, boolean emitJDK9StringSubstitutions, boolean useFMAIntrinsics) { register(plugins, replacements, (AMD64) architecture, explicitUnsafeNullChecks, emitJDK9StringSubstitutions, useFMAIntrinsics); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringLatin1Substitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringLatin1Substitutions.java index ae69cad1f2c..13ff6fdd23b 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringLatin1Substitutions.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringLatin1Substitutions.java @@ -24,6 +24,11 @@ package org.graalvm.compiler.replacements.amd64; +import static org.graalvm.compiler.api.directives.GraalDirectives.LIKELY_PROBABILITY; +import static org.graalvm.compiler.api.directives.GraalDirectives.UNLIKELY_PROBABILITY; +import static org.graalvm.compiler.api.directives.GraalDirectives.SLOWPATH_PROBABILITY; +import static org.graalvm.compiler.api.directives.GraalDirectives.injectBranchProbability; + import org.graalvm.compiler.api.replacements.ClassSubstitution; import org.graalvm.compiler.api.replacements.Fold; import org.graalvm.compiler.api.replacements.Fold.InjectedParameter; @@ -101,14 +106,14 @@ public class AMD64StringLatin1Substitutions { @MethodSubstitution public static int indexOf(byte[] value, int ch, int origFromIndex) { int fromIndex = origFromIndex; - if (ch >>> 8 != 0) { + if (injectBranchProbability(UNLIKELY_PROBABILITY, ch >>> 8 != 0)) { // search value must be a byte value return -1; } int length = value.length; - if (fromIndex < 0) { + if (injectBranchProbability(UNLIKELY_PROBABILITY, fromIndex < 0)) { fromIndex = 0; - } else if (fromIndex >= length) { + } else if (injectBranchProbability(UNLIKELY_PROBABILITY, fromIndex >= length)) { // Note: fromIndex might be near -1>>>1. return -1; } @@ -118,35 +123,39 @@ public class AMD64StringLatin1Substitutions { @MethodSubstitution public static int indexOf(byte[] source, int sourceCount, byte[] target, int targetCount, int origFromIndex) { int fromIndex = origFromIndex; - if (fromIndex >= sourceCount) { + if (injectBranchProbability(UNLIKELY_PROBABILITY, fromIndex >= sourceCount)) { return (targetCount == 0 ? sourceCount : -1); } - if (fromIndex < 0) { + if (injectBranchProbability(UNLIKELY_PROBABILITY, fromIndex < 0)) { fromIndex = 0; } - if (targetCount == 0) { + if (injectBranchProbability(UNLIKELY_PROBABILITY, targetCount == 0)) { // The empty string is in every string. return fromIndex; } - if (sourceCount - fromIndex < targetCount) { + if (injectBranchProbability(UNLIKELY_PROBABILITY, sourceCount - fromIndex < targetCount)) { // The empty string contains nothing except the empty string. return -1; } - if (targetCount == 1) { + if (injectBranchProbability(UNLIKELY_PROBABILITY, targetCount == 1)) { return AMD64ArrayIndexOf.indexOf1Byte(source, sourceCount, fromIndex, target[0]); } else { int haystackLength = sourceCount - (targetCount - 2); int offset = fromIndex; - while (offset < haystackLength) { + while (injectBranchProbability(LIKELY_PROBABILITY, offset < haystackLength)) { int indexOfResult = AMD64ArrayIndexOf.indexOfTwoConsecutiveBytes(source, haystackLength, offset, target[0], target[1]); - if (indexOfResult < 0) { + if (injectBranchProbability(UNLIKELY_PROBABILITY, indexOfResult < 0)) { return -1; } offset = indexOfResult; - Pointer cmpSourcePointer = byteOffsetPointer(source, offset); - Pointer targetPointer = pointer(target); - if (targetCount == 2 || ArrayRegionEqualsNode.regionEquals(cmpSourcePointer, targetPointer, targetCount, JavaKind.Byte)) { + if (injectBranchProbability(UNLIKELY_PROBABILITY, targetCount == 2)) { return offset; + } else { + Pointer cmpSourcePointer = byteOffsetPointer(source, offset); + Pointer targetPointer = pointer(target); + if (injectBranchProbability(UNLIKELY_PROBABILITY, ArrayRegionEqualsNode.regionEquals(cmpSourcePointer, targetPointer, targetCount, JavaKind.Byte))) { + return offset; + } } offset++; } @@ -164,7 +173,11 @@ public class AMD64StringLatin1Substitutions { */ @MethodSubstitution public static void inflate(byte[] src, int srcIndex, char[] dest, int destIndex, int len) { - if (len < 0 || srcIndex < 0 || (srcIndex + len > src.length) || destIndex < 0 || (destIndex + len > dest.length)) { + if (injectBranchProbability(SLOWPATH_PROBABILITY, len < 0) || + injectBranchProbability(SLOWPATH_PROBABILITY, srcIndex < 0) || + injectBranchProbability(SLOWPATH_PROBABILITY, srcIndex + len > src.length) || + injectBranchProbability(SLOWPATH_PROBABILITY, destIndex < 0) || + injectBranchProbability(SLOWPATH_PROBABILITY, destIndex + len > dest.length)) { DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.BoundsCheckException); } @@ -188,7 +201,11 @@ public class AMD64StringLatin1Substitutions { */ @MethodSubstitution public static void inflate(byte[] src, int srcIndex, byte[] dest, int destIndex, int len) { - if (len < 0 || srcIndex < 0 || (srcIndex + len > src.length) || destIndex < 0 || (destIndex * 2 + len * 2 > dest.length)) { + if (injectBranchProbability(SLOWPATH_PROBABILITY, len < 0) || + injectBranchProbability(SLOWPATH_PROBABILITY, srcIndex < 0) || + injectBranchProbability(SLOWPATH_PROBABILITY, srcIndex + len > src.length) || + injectBranchProbability(SLOWPATH_PROBABILITY, destIndex < 0) || + injectBranchProbability(SLOWPATH_PROBABILITY, destIndex * 2 + len * 2 > dest.length)) { DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.BoundsCheckException); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringSubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringSubstitutions.java index 34151df7ecb..b11803aa762 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringSubstitutions.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringSubstitutions.java @@ -24,6 +24,10 @@ package org.graalvm.compiler.replacements.amd64; +import static org.graalvm.compiler.api.directives.GraalDirectives.LIKELY_PROBABILITY; +import static org.graalvm.compiler.api.directives.GraalDirectives.UNLIKELY_PROBABILITY; +import static org.graalvm.compiler.api.directives.GraalDirectives.injectBranchProbability; + import org.graalvm.compiler.api.replacements.ClassSubstitution; import org.graalvm.compiler.api.replacements.Fold; import org.graalvm.compiler.api.replacements.Fold.InjectedParameter; @@ -66,39 +70,39 @@ public class AMD64StringSubstitutions { @ConstantNodeParameter char[] target, int targetOffset, int targetCount, int origFromIndex) { int fromIndex = origFromIndex; - if (fromIndex >= sourceCount) { + if (injectBranchProbability(UNLIKELY_PROBABILITY, fromIndex >= sourceCount)) { return (targetCount == 0 ? sourceCount : -1); } - if (fromIndex < 0) { + if (injectBranchProbability(UNLIKELY_PROBABILITY, fromIndex < 0)) { fromIndex = 0; } - if (targetCount == 0) { + if (injectBranchProbability(UNLIKELY_PROBABILITY, targetCount == 0)) { // The empty string is in every string. return fromIndex; } int totalOffset = sourceOffset + fromIndex; - if (sourceCount - fromIndex < targetCount) { + if (injectBranchProbability(UNLIKELY_PROBABILITY, sourceCount - fromIndex < targetCount)) { // The empty string contains nothing except the empty string. return -1; } - if (targetCount == 1) { + if (injectBranchProbability(UNLIKELY_PROBABILITY, targetCount == 1)) { return AMD64ArrayIndexOf.indexOf1Char(source, sourceCount, totalOffset, target[targetOffset]); } else { int haystackLength = sourceCount - (targetCount - 2); - while (totalOffset < haystackLength) { + while (injectBranchProbability(LIKELY_PROBABILITY, totalOffset < haystackLength)) { int indexOfResult = AMD64ArrayIndexOf.indexOfTwoConsecutiveChars(source, haystackLength, totalOffset, target[targetOffset], target[targetOffset + 1]); - if (indexOfResult < 0) { + if (injectBranchProbability(UNLIKELY_PROBABILITY, indexOfResult < 0)) { return -1; } totalOffset = indexOfResult; - if (targetCount == 2) { + if (injectBranchProbability(UNLIKELY_PROBABILITY, targetCount == 2)) { return totalOffset; } else { Pointer cmpSourcePointer = Word.objectToTrackedPointer(source).add(charArrayBaseOffset(INJECTED)).add(totalOffset * charArrayIndexScale(INJECTED)); Pointer targetPointer = Word.objectToTrackedPointer(target).add(charArrayBaseOffset(INJECTED)).add(targetOffset * charArrayIndexScale(INJECTED)); - if (ArrayRegionEqualsNode.regionEquals(cmpSourcePointer, targetPointer, targetCount, JavaKind.Char)) { + if (injectBranchProbability(UNLIKELY_PROBABILITY, ArrayRegionEqualsNode.regionEquals(cmpSourcePointer, targetPointer, targetCount, JavaKind.Char))) { return totalOffset; } } @@ -113,15 +117,15 @@ public class AMD64StringSubstitutions { public static int indexOf(String source, int ch, int origFromIndex) { int fromIndex = origFromIndex; final int sourceCount = source.length(); - if (fromIndex >= sourceCount) { + if (injectBranchProbability(UNLIKELY_PROBABILITY, fromIndex >= sourceCount)) { // Note: fromIndex might be near -1>>>1. return -1; } - if (fromIndex < 0) { + if (injectBranchProbability(UNLIKELY_PROBABILITY, fromIndex < 0)) { fromIndex = 0; } - if (ch < Character.MIN_SUPPLEMENTARY_CODE_POINT) { + if (injectBranchProbability(LIKELY_PROBABILITY, ch < Character.MIN_SUPPLEMENTARY_CODE_POINT)) { char[] sourceArray = StringSubstitutions.getValue(source); return AMD64ArrayIndexOf.indexOf1Char(sourceArray, sourceCount, fromIndex, (char) ch); } else { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringUTF16Substitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringUTF16Substitutions.java index ec49c978c00..2644444183b 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringUTF16Substitutions.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringUTF16Substitutions.java @@ -28,6 +28,12 @@ import jdk.vm.ci.meta.DeoptimizationAction; import jdk.vm.ci.meta.DeoptimizationReason; import jdk.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.MetaAccessProvider; + +import static org.graalvm.compiler.api.directives.GraalDirectives.LIKELY_PROBABILITY; +import static org.graalvm.compiler.api.directives.GraalDirectives.UNLIKELY_PROBABILITY; +import static org.graalvm.compiler.api.directives.GraalDirectives.SLOWPATH_PROBABILITY; +import static org.graalvm.compiler.api.directives.GraalDirectives.injectBranchProbability; + import org.graalvm.compiler.api.replacements.ClassSubstitution; import org.graalvm.compiler.api.replacements.Fold; import org.graalvm.compiler.api.replacements.Fold.InjectedParameter; @@ -116,26 +122,30 @@ public class AMD64StringUTF16Substitutions { @MethodSubstitution public static int indexOfUnsafe(byte[] source, int sourceCount, byte[] target, int targetCount, int fromIndex) { - ReplacementsUtil.runtimeAssert(fromIndex >= 0, "StringUTF16.indexOfUnsafe invalid args: fromIndex negative"); - ReplacementsUtil.runtimeAssert(targetCount > 0, "StringUTF16.indexOfUnsafe invalid args: targetCount <= 0"); - ReplacementsUtil.runtimeAssert(targetCount <= length(target), "StringUTF16.indexOfUnsafe invalid args: targetCount > length(target)"); - ReplacementsUtil.runtimeAssert(sourceCount >= targetCount, "StringUTF16.indexOfUnsafe invalid args: sourceCount < targetCount"); + ReplacementsUtil.dynamicAssert(fromIndex >= 0, "StringUTF16.indexOfUnsafe invalid args: fromIndex negative"); + ReplacementsUtil.dynamicAssert(targetCount > 0, "StringUTF16.indexOfUnsafe invalid args: targetCount <= 0"); + ReplacementsUtil.dynamicAssert(targetCount <= length(target), "StringUTF16.indexOfUnsafe invalid args: targetCount > length(target)"); + ReplacementsUtil.dynamicAssert(sourceCount >= targetCount, "StringUTF16.indexOfUnsafe invalid args: sourceCount < targetCount"); if (targetCount == 1) { return AMD64ArrayIndexOf.indexOf1Char(source, sourceCount, fromIndex, StringUTF16Substitutions.getChar(target, 0)); } else { int haystackLength = sourceCount - (targetCount - 2); int offset = fromIndex; - while (offset < haystackLength) { + while (injectBranchProbability(LIKELY_PROBABILITY, offset < haystackLength)) { int indexOfResult = AMD64ArrayIndexOf.indexOfTwoConsecutiveChars(source, haystackLength, offset, StringUTF16Substitutions.getChar(target, 0), StringUTF16Substitutions.getChar(target, 1)); - if (indexOfResult < 0) { + if (injectBranchProbability(UNLIKELY_PROBABILITY, indexOfResult < 0)) { return -1; } offset = indexOfResult; - Pointer cmpSourcePointer = charOffsetPointer(source, offset); - Pointer targetPointer = pointer(target); - if (targetCount == 2 || ArrayRegionEqualsNode.regionEquals(cmpSourcePointer, targetPointer, targetCount, JavaKind.Char)) { + if (injectBranchProbability(UNLIKELY_PROBABILITY, targetCount == 2)) { return offset; + } else { + Pointer cmpSourcePointer = charOffsetPointer(source, offset); + Pointer targetPointer = pointer(target); + if (injectBranchProbability(UNLIKELY_PROBABILITY, ArrayRegionEqualsNode.regionEquals(cmpSourcePointer, targetPointer, targetCount, JavaKind.Char))) { + return offset; + } } offset++; } @@ -145,25 +155,29 @@ public class AMD64StringUTF16Substitutions { @MethodSubstitution public static int indexOfLatin1Unsafe(byte[] source, int sourceCount, byte[] target, int targetCount, int fromIndex) { - ReplacementsUtil.runtimeAssert(fromIndex >= 0, "StringUTF16.indexOfLatin1Unsafe invalid args: fromIndex negative"); - ReplacementsUtil.runtimeAssert(targetCount > 0, "StringUTF16.indexOfLatin1Unsafe invalid args: targetCount <= 0"); - ReplacementsUtil.runtimeAssert(targetCount <= target.length, "StringUTF16.indexOfLatin1Unsafe invalid args: targetCount > length(target)"); - ReplacementsUtil.runtimeAssert(sourceCount >= targetCount, "StringUTF16.indexOfLatin1Unsafe invalid args: sourceCount < targetCount"); + ReplacementsUtil.dynamicAssert(fromIndex >= 0, "StringUTF16.indexOfLatin1Unsafe invalid args: fromIndex negative"); + ReplacementsUtil.dynamicAssert(targetCount > 0, "StringUTF16.indexOfLatin1Unsafe invalid args: targetCount <= 0"); + ReplacementsUtil.dynamicAssert(targetCount <= target.length, "StringUTF16.indexOfLatin1Unsafe invalid args: targetCount > length(target)"); + ReplacementsUtil.dynamicAssert(sourceCount >= targetCount, "StringUTF16.indexOfLatin1Unsafe invalid args: sourceCount < targetCount"); if (targetCount == 1) { return AMD64ArrayIndexOf.indexOf1Char(source, sourceCount, fromIndex, (char) Byte.toUnsignedInt(target[0])); } else { int haystackLength = sourceCount - (targetCount - 2); int offset = fromIndex; - while (offset < haystackLength) { + while (injectBranchProbability(LIKELY_PROBABILITY, offset < haystackLength)) { int indexOfResult = AMD64ArrayIndexOf.indexOfTwoConsecutiveChars(source, haystackLength, offset, (char) Byte.toUnsignedInt(target[0]), (char) Byte.toUnsignedInt(target[1])); - if (indexOfResult < 0) { + if (injectBranchProbability(UNLIKELY_PROBABILITY, indexOfResult < 0)) { return -1; } offset = indexOfResult; - Pointer cmpSourcePointer = charOffsetPointer(source, offset); - Pointer targetPointer = pointer(target); - if (targetCount == 2 || ArrayRegionEqualsNode.regionEquals(cmpSourcePointer, targetPointer, targetCount, JavaKind.Char, JavaKind.Byte)) { + if (injectBranchProbability(UNLIKELY_PROBABILITY, targetCount == 2)) { return offset; + } else { + Pointer cmpSourcePointer = charOffsetPointer(source, offset); + Pointer targetPointer = pointer(target); + if (injectBranchProbability(UNLIKELY_PROBABILITY, ArrayRegionEqualsNode.regionEquals(cmpSourcePointer, targetPointer, targetCount, JavaKind.Char, JavaKind.Byte))) { + return offset; + } } offset++; } @@ -210,7 +224,11 @@ public class AMD64StringUTF16Substitutions { } private static void checkLimits(int srcLen, int srcIndex, int destLen, int destIndex, int len) { - if (len < 0 || srcIndex < 0 || (srcIndex + len > srcLen) || destIndex < 0 || (destIndex + len > destLen)) { + if (injectBranchProbability(SLOWPATH_PROBABILITY, len < 0) || + injectBranchProbability(SLOWPATH_PROBABILITY, srcIndex < 0) || + injectBranchProbability(SLOWPATH_PROBABILITY, srcIndex + len > srcLen) || + injectBranchProbability(SLOWPATH_PROBABILITY, destIndex < 0) || + injectBranchProbability(SLOWPATH_PROBABILITY, destIndex + len > destLen)) { DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.BoundsCheckException); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.jdk9.test/src/org/graalvm/compiler/replacements/jdk9/test/MethodHandleImplTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.jdk9.test/src/org/graalvm/compiler/replacements/jdk9/test/MethodHandleImplTest.java new file mode 100644 index 00000000000..c08a670bdd2 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.jdk9.test/src/org/graalvm/compiler/replacements/jdk9/test/MethodHandleImplTest.java @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.replacements.jdk9.test; + +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; + +import org.graalvm.compiler.replacements.test.MethodSubstitutionTest; +import org.junit.Test; + +public class MethodHandleImplTest extends MethodSubstitutionTest { + + static final MethodHandle squareHandle; + static { + try { + squareHandle = MethodHandles.lookup().findStatic(MethodHandleImplTest.class, "square", MethodType.methodType(int.class, int.class)); + } catch (NoSuchMethodException | IllegalAccessException e) { + throw new AssertionError(e); + } + } + + public static int square(int a) { + return a * a; + } + + public static int invokeSquare() { + try { + return (int) squareHandle.invokeExact(6); + } catch (Throwable e) { + throw new AssertionError(e); + } + } + + /** + * Test {@code MethodHandleImpl.isCompileConstant} by effect: If it is not intrinsified, + * {@code Invoke#Invokers.maybeCustomize(mh)} will appear in the graph. + */ + @Test + public void testIsCompileConstant() { + test("invokeSquare"); + testGraph("invokeSquare"); + } + +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.jdk9.test/src/org/graalvm/compiler/replacements/jdk9/test/VarHandleTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.jdk9.test/src/org/graalvm/compiler/replacements/jdk9/test/VarHandleTest.java index 037bd458f7f..5cfc6b273f8 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.jdk9.test/src/org/graalvm/compiler/replacements/jdk9/test/VarHandleTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.jdk9.test/src/org/graalvm/compiler/replacements/jdk9/test/VarHandleTest.java @@ -27,6 +27,7 @@ package org.graalvm.compiler.replacements.jdk9.test; import java.lang.invoke.MethodHandles; import java.lang.invoke.VarHandle; +import jdk.vm.ci.aarch64.AArch64; import org.graalvm.compiler.core.test.GraalCompilerTest; import org.graalvm.compiler.debug.GraalError; import org.graalvm.compiler.graph.Node; @@ -115,6 +116,18 @@ public class VarHandleTest extends GraalCompilerTest { Assert.assertEquals(expectedAnyKill, countAnyKill(graph)); } + private boolean volatileAccessLowered() { + return !(getTarget().arch instanceof AArch64); + } + + private int numberOfExpectedMembars() { + return volatileAccessLowered() ? 2 : 0; + } + + private int numberOfExpectedKills() { + return volatileAccessLowered() ? 2 : 1; + } + @Test public void testRead1() { testAccess("testRead1Snippet", 1, 0, 0, 0); @@ -122,7 +135,7 @@ public class VarHandleTest extends GraalCompilerTest { @Test public void testRead2() { - testAccess("testRead2Snippet", 1, 0, 2, 2); + testAccess("testRead2Snippet", 1, 0, numberOfExpectedMembars(), numberOfExpectedKills()); } @Test @@ -132,7 +145,7 @@ public class VarHandleTest extends GraalCompilerTest { @Test public void testRead4() { - testAccess("testRead4Snippet", 1, 0, 2, 2); + testAccess("testRead4Snippet", 1, 0, numberOfExpectedMembars(), numberOfExpectedKills()); } @Test @@ -142,7 +155,7 @@ public class VarHandleTest extends GraalCompilerTest { @Test public void testWrite2() { - testAccess("testWrite2Snippet", 0, 1, 2, 2); + testAccess("testWrite2Snippet", 0, 1, numberOfExpectedMembars(), numberOfExpectedKills()); } @Test @@ -152,7 +165,7 @@ public class VarHandleTest extends GraalCompilerTest { @Test public void testWrite4() { - testAccess("testWrite4Snippet", 0, 1, 2, 2); + testAccess("testWrite4Snippet", 0, 1, numberOfExpectedMembars(), numberOfExpectedKills()); } private static int countAnyKill(StructuredGraph graph) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/BitOpNodesTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/BitOpNodesTest.java index f7c132f622f..bb9afc99f44 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/BitOpNodesTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/BitOpNodesTest.java @@ -70,7 +70,7 @@ public class BitOpNodesTest extends GraalCompilerTest { } else { // Even though there are AArch64 intrinsics for bitCount, they do // not use BitCountNode. - return false; + return isSPARC(arch); } } @@ -83,7 +83,7 @@ public class BitOpNodesTest extends GraalCompilerTest { AMD64 amd64 = (AMD64) arch; return amd64.getFeatures().contains(AMD64.CPUFeature.LZCNT) && amd64.getFlags().contains(AMD64.Flag.UseCountLeadingZerosInstruction); } else { - return arch instanceof AArch64; + return isSPARC(arch) || arch instanceof AArch64; } } @@ -96,7 +96,7 @@ public class BitOpNodesTest extends GraalCompilerTest { AMD64 amd64 = (AMD64) arch; return amd64.getFeatures().contains(AMD64.CPUFeature.BMI1) && amd64.getFlags().contains(AMD64.Flag.UseCountTrailingZerosInstruction); } else { - return arch instanceof AArch64; + return isSPARC(arch) || arch instanceof AArch64; } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/MethodSubstitutionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/MethodSubstitutionTest.java index a00cd719756..85a2f785372 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/MethodSubstitutionTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/MethodSubstitutionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -133,7 +133,7 @@ public abstract class MethodSubstitutionTest extends GraalCompilerTest { StructuredGraph graph = testGraph(testMethodName); // Check to see if the resulting graph contains the expected node - StructuredGraph replacement = getReplacements().getSubstitution(realMethod, -1, false, null, graph.getOptions()); + StructuredGraph replacement = getReplacements().getSubstitution(realMethod, -1, false, null, graph.allowAssumptions(), graph.getOptions()); if (replacement == null && !optional) { assertInGraph(graph, intrinsicClass); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/PEGraphDecoderTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/PEGraphDecoderTest.java index 9e578967b82..d17ddf293d6 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/PEGraphDecoderTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/PEGraphDecoderTest.java @@ -138,7 +138,7 @@ public class PEGraphDecoderTest extends GraalCompilerTest { registerPlugins(graphBuilderConfig.getPlugins().getInvocationPlugins()); targetGraph = new StructuredGraph.Builder(getInitialOptions(), debug, AllowAssumptions.YES).method(testMethod).build(); CachingPEGraphDecoder decoder = new CachingPEGraphDecoder(getTarget().arch, targetGraph, getProviders(), graphBuilderConfig, OptimisticOptimizations.NONE, AllowAssumptions.YES, - null, null, new InlineInvokePlugin[]{new InlineAll()}, null, null, null, null, null, null, EconomicMap.create()); + null, null, new InlineInvokePlugin[]{new InlineAll()}, null, null, null, null, null, EconomicMap.create()); decoder.decode(testMethod, false, false); debug.dump(DebugContext.BASIC_LEVEL, targetGraph, "Target Graph"); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ReplacementsParseTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ReplacementsParseTest.java index 42226fcf14f..3d93f510df0 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ReplacementsParseTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ReplacementsParseTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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 @@ -34,10 +34,7 @@ import org.graalvm.compiler.api.replacements.ClassSubstitution; import org.graalvm.compiler.api.replacements.MethodSubstitution; import org.graalvm.compiler.api.replacements.SnippetReflectionProvider; import org.graalvm.compiler.bytecode.BytecodeProvider; -import org.graalvm.compiler.core.common.LIRKind; import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; import org.graalvm.compiler.core.common.type.Stamp; import org.graalvm.compiler.core.common.type.StampFactory; import org.graalvm.compiler.debug.DebugContext; @@ -203,6 +200,12 @@ public class ReplacementsParseTest extends ReplacementsTest { } } + static class TestForeignCallDescriptor extends ForeignCallDescriptor { + TestForeignCallDescriptor(boolean reexecutable, boolean canDeoptimize, boolean safepoint, String name, Class resultType, Class... argumentTypes) { + super(name, resultType, argumentTypes, reexecutable, new LocationIdentity[0], canDeoptimize, safepoint); + } + } + @ClassSubstitution(TestObject.class) static class TestObjectSubstitutions { @@ -308,7 +311,7 @@ public class ReplacementsParseTest extends ReplacementsTest { nonVoidIntrinsicWithCallStub(STUB_CALL, zLen); } - static final ForeignCallDescriptor STUB_CALL = new ForeignCallDescriptor("stubCall", void.class, int.class); + static final ForeignCallDescriptor STUB_CALL = new ForeignCallDescriptor("stubCall", void.class, new Class[]{int.class}, false, new LocationIdentity[0], false, false); @NodeIntrinsic(ForeignCallNode.class) private static native void nonVoidIntrinsicWithCallStub(@ConstantNodeParameter ForeignCallDescriptor descriptor, int zLen); @@ -650,48 +653,10 @@ public class ReplacementsParseTest extends ReplacementsTest { @SuppressWarnings("unchecked") @Override public T getInjectedArgument(Class type) { - if (type == ForeignCallsProvider.class) { - return (T) new ForeignCallsProvider() { - @Override - public LIRKind getValueKind(JavaKind javaKind) { - return null; - } - - @Override - public boolean isReexecutable(ForeignCallDescriptor descriptor) { - return false; - } - - @Override - public LocationIdentity[] getKilledLocations(ForeignCallDescriptor descriptor) { - return new LocationIdentity[0]; - } - - @Override - public boolean canDeoptimize(ForeignCallDescriptor descriptor) { - return false; - } - - @Override - public boolean isGuaranteedSafepoint(ForeignCallDescriptor descriptor) { - return false; - } - - @Override - public ForeignCallLinkage lookupForeignCall(ForeignCallDescriptor descriptor) { - return null; - } - - @Override - public boolean isAvailable(ForeignCallDescriptor descriptor) { - return true; - } - }; - } if (type == SnippetReflectionProvider.class) { return (T) getSnippetReflection(); } - return null; + throw new InternalError("missing injection " + type); } @Override diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/RootMethodSubstitutionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/RootMethodSubstitutionTest.java index eab2eacb096..c184dc5c787 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/RootMethodSubstitutionTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/RootMethodSubstitutionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, 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 @@ -34,8 +34,10 @@ import org.graalvm.compiler.core.common.GraalOptions; import org.graalvm.compiler.core.target.Backend; import org.graalvm.compiler.core.test.GraalCompilerTest; import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.DebugContext.Builder; 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.InvocationPlugin; import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; import org.graalvm.compiler.nodes.graphbuilderconf.MethodSubstitutionPlugin; @@ -52,7 +54,7 @@ import jdk.vm.ci.meta.ResolvedJavaType; /** * Exercise - * {@link org.graalvm.compiler.nodes.spi.Replacements#getIntrinsicGraph(ResolvedJavaMethod, CompilationIdentifier, DebugContext, Cancellable)} + * {@link org.graalvm.compiler.nodes.spi.Replacements#getIntrinsicGraph(ResolvedJavaMethod, CompilationIdentifier, DebugContext, AllowAssumptions, Cancellable)} * with regular method substitutions and encoded graphs. */ @RunWith(Parameterized.class) @@ -113,8 +115,8 @@ public class RootMethodSubstitutionTest extends GraalCompilerTest { private StructuredGraph getIntrinsicGraph(boolean useEncodedGraphs) { OptionValues options = new OptionValues(getDebugContext().getOptions(), GraalOptions.UseEncodedGraphs, useEncodedGraphs); - DebugContext debugContext = DebugContext.create(options, getDebugContext().getDescription(), getDebugHandlersFactories()); - return getReplacements().getIntrinsicGraph(method, CompilationIdentifier.INVALID_COMPILATION_ID, debugContext, null); + DebugContext debugContext = new Builder(options, getDebugHandlersFactories()).description(getDebugContext().getDescription()).build(); + return getReplacements().getIntrinsicGraph(method, CompilationIdentifier.INVALID_COMPILATION_ID, debugContext, AllowAssumptions.YES, null); } StructuredGraph expectedGraph; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StandardMethodSubstitutionsTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StandardMethodSubstitutionsTest.java index 7477c44ea0a..f149b5c847e 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StandardMethodSubstitutionsTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StandardMethodSubstitutionsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -140,7 +140,7 @@ public class StandardMethodSubstitutionsTest extends MethodSubstitutionTest { StructuredGraph graph = testGraph(testMethodName); // Check to see if the resulting graph contains the expected node - StructuredGraph replacement = getReplacements().getSubstitution(realJavaMethod, -1, false, null, graph.getOptions()); + StructuredGraph replacement = getReplacements().getSubstitution(realJavaMethod, -1, false, null, graph.allowAssumptions(), graph.getOptions()); if (replacement == null && !optional) { assertInGraph(graph, intrinsicClasses); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringCompareToTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringCompareToTest.java index e41ff60aaa2..bb08cd003d6 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringCompareToTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringCompareToTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -83,7 +83,7 @@ public class StringCompareToTest extends StringSubstitutionTestBase { StructuredGraph graph = testGraph(testMethod.getName()); // Check to see if the resulting graph contains the expected node - StructuredGraph replacement = getReplacements().getSubstitution(realMethod, -1, false, null, graph.getOptions()); + StructuredGraph replacement = getReplacements().getSubstitution(realMethod, -1, false, null, graph.allowAssumptions(), graph.getOptions()); if (replacement == null) { assertInGraph(graph, expectedNode); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringCompressInflateTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringCompressInflateTest.java index b01c8a424de..2f513e863f6 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringCompressInflateTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringCompressInflateTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -31,6 +31,7 @@ import java.io.UnsupportedEncodingException; import org.graalvm.compiler.core.common.CompilationIdentifier; import org.graalvm.compiler.nodes.StructuredGraph; +import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; import org.graalvm.compiler.replacements.amd64.AMD64StringLatin1InflateNode; import org.graalvm.compiler.replacements.amd64.AMD64StringLatin1Substitutions; import org.graalvm.compiler.replacements.amd64.AMD64StringUTF16CompressNode; @@ -115,7 +116,7 @@ public final class StringCompressInflateTest extends MethodSubstitutionTest { Class javaclass = Class.forName("java.lang.StringLatin1"); ResolvedJavaMethod caller = getResolvedJavaMethod(javaclass, "inflate", byte[].class, int.class, byte[].class, int.class, int.class); - StructuredGraph graph = getReplacements().getIntrinsicGraph(caller, CompilationIdentifier.INVALID_COMPILATION_ID, getDebugContext(), null); + StructuredGraph graph = getReplacements().getIntrinsicGraph(caller, CompilationIdentifier.INVALID_COMPILATION_ID, getDebugContext(), AllowAssumptions.YES, null); assertInGraph(graph, AMD64StringLatin1InflateNode.class); InstalledCode code = getCode(caller, graph); @@ -153,7 +154,7 @@ public final class StringCompressInflateTest extends MethodSubstitutionTest { Class javaclass = Class.forName("java.lang.StringLatin1"); ResolvedJavaMethod caller = getResolvedJavaMethod(javaclass, "inflate", byte[].class, int.class, char[].class, int.class, int.class); - StructuredGraph graph = getReplacements().getIntrinsicGraph(caller, CompilationIdentifier.INVALID_COMPILATION_ID, getDebugContext(), null); + StructuredGraph graph = getReplacements().getIntrinsicGraph(caller, CompilationIdentifier.INVALID_COMPILATION_ID, getDebugContext(), AllowAssumptions.YES, null); assertInGraph(graph, AMD64StringLatin1InflateNode.class); InstalledCode code = getCode(caller, graph); @@ -218,7 +219,7 @@ public final class StringCompressInflateTest extends MethodSubstitutionTest { Class javaclass = Class.forName("java.lang.StringUTF16"); ResolvedJavaMethod caller = getResolvedJavaMethod(javaclass, "compress", byte[].class, int.class, byte[].class, int.class, int.class); - StructuredGraph graph = getReplacements().getIntrinsicGraph(caller, CompilationIdentifier.INVALID_COMPILATION_ID, getDebugContext(), null); + StructuredGraph graph = getReplacements().getIntrinsicGraph(caller, CompilationIdentifier.INVALID_COMPILATION_ID, getDebugContext(), AllowAssumptions.YES, null); assertInGraph(graph, AMD64StringUTF16CompressNode.class); InstalledCode code = getCode(caller, graph); @@ -254,7 +255,7 @@ public final class StringCompressInflateTest extends MethodSubstitutionTest { Class javaclass = Class.forName("java.lang.StringUTF16"); ResolvedJavaMethod caller = getResolvedJavaMethod(javaclass, "compress", char[].class, int.class, byte[].class, int.class, int.class); - StructuredGraph graph = getReplacements().getIntrinsicGraph(caller, CompilationIdentifier.INVALID_COMPILATION_ID, getDebugContext(), null); + StructuredGraph graph = getReplacements().getIntrinsicGraph(caller, CompilationIdentifier.INVALID_COMPILATION_ID, getDebugContext(), AllowAssumptions.YES, null); assertInGraph(graph, AMD64StringUTF16CompressNode.class); InstalledCode code = getCode(caller, graph); @@ -300,7 +301,7 @@ public final class StringCompressInflateTest extends MethodSubstitutionTest { TestMethods(String testmname, Class javaclass, Class intrinsicClass, String javamname, Class... params) { javamethod = getResolvedJavaMethod(javaclass, javamname, params); testmethod = getResolvedJavaMethod(testmname); - testgraph = getReplacements().getIntrinsicGraph(javamethod, CompilationIdentifier.INVALID_COMPILATION_ID, getDebugContext(), null); + testgraph = getReplacements().getIntrinsicGraph(javamethod, CompilationIdentifier.INVALID_COMPILATION_ID, getDebugContext(), AllowAssumptions.YES, null); assertInGraph(testgraph, intrinsicClass); assert javamethod != null; @@ -313,7 +314,7 @@ public final class StringCompressInflateTest extends MethodSubstitutionTest { } StructuredGraph replacementGraph() { - return getReplacements().getSubstitution(javamethod, -1, false, null, getInitialOptions()); + return getReplacements().getSubstitution(javamethod, -1, false, null, testgraph.allowAssumptions(), getInitialOptions()); } StructuredGraph testMethodGraph() { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringIndexOfCharConstantBindingTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringIndexOfCharConstantBindingTest.java new file mode 100644 index 00000000000..abe9db976a0 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringIndexOfCharConstantBindingTest.java @@ -0,0 +1,106 @@ +/* + * Copyright (c) 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.replacements.test; + +import static org.junit.Assume.assumeTrue; + +import org.graalvm.compiler.api.test.Graal; +import org.graalvm.compiler.core.common.GraalOptions; +import org.graalvm.compiler.nodes.FixedNode; +import org.graalvm.compiler.nodes.ReturnNode; +import org.graalvm.compiler.nodes.StartNode; +import org.graalvm.compiler.nodes.StructuredGraph; +import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import org.graalvm.compiler.options.OptionValues; +import org.graalvm.compiler.replacements.ConstantBindingParameterPlugin; +import org.graalvm.compiler.runtime.RuntimeProvider; +import org.junit.Before; +import org.junit.Test; + +import jdk.vm.ci.amd64.AMD64; +import jdk.vm.ci.code.Architecture; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.meta.ResolvedJavaMethod; + +public class StringIndexOfCharConstantBindingTest extends StringIndexOfCharTest { + + @Before + public void checkAMD64() { + Architecture arch = Graal.getRequiredCapability(RuntimeProvider.class).getHostBackend().getTarget().arch; + assumeTrue("skipping AMD64 specific test", arch instanceof AMD64); + } + + Object[] constantArgs; + + public StringIndexOfCharConstantBindingTest(String sourceString, int constantChar, int fromIndex) { + super(sourceString, constantChar, fromIndex); + } + + @Override + protected GraphBuilderConfiguration editGraphBuilderConfiguration(GraphBuilderConfiguration conf) { + if (constantArgs != null) { + ConstantBindingParameterPlugin constantBinding = new ConstantBindingParameterPlugin(constantArgs, this.getMetaAccess(), this.getSnippetReflection()); + conf.getPlugins().appendParameterPlugin(constantBinding); + } + return super.editGraphBuilderConfiguration(conf); + } + + @Override + protected InstalledCode getCode(final ResolvedJavaMethod installedCodeOwner, StructuredGraph graph0, boolean ignoreForceCompile, boolean ignoreInstallAsDefault, OptionValues options) { + // Force recompile if constant binding should be done + return super.getCode(installedCodeOwner, graph0, + /* forceCompile */ true, /* installAsDefault */ false, options); + } + + @Override + protected void checkHighTierGraph(StructuredGraph graph) { + if (this.sourceString.length() < GraalOptions.StringIndexOfLimit.getValue(graph.getOptions()) && this.constantChar < Character.MIN_SUPPLEMENTARY_CODE_POINT) { + StartNode start = graph.start(); + FixedNode next = start.next(); + assertTrue(next instanceof ReturnNode); + ReturnNode returnNode = (ReturnNode) next; + assertTrue(returnNode.result().isConstant()); + } + } + + @Test + @Override + public void testStringIndexOfConstant() { + constantArgs = new Object[3]; + constantArgs[1] = this.sourceString; + constantArgs[2] = this.constantChar; + test("testStringIndexOf", this.sourceString, this.constantChar); + } + + @Test + @Override + public void testStringIndexOfConstantOffset() { + constantArgs = new Object[4]; + constantArgs[1] = this.sourceString; + constantArgs[2] = this.constantChar; + constantArgs[3] = this.fromIndex; + test("testStringIndexOfOffset", this.sourceString, this.constantChar, this.fromIndex); + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringIndexOfCharTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringIndexOfCharTest.java index 400a9a6a163..9295f7fd221 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringIndexOfCharTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringIndexOfCharTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -65,9 +65,9 @@ public class StringIndexOfCharTest extends GraalCompilerTest { return tests; } - private final String sourceString; - private final int constantChar; - private final int fromIndex; + protected final String sourceString; + protected final int constantChar; + protected final int fromIndex; public StringIndexOfCharTest(String sourceString, int constantChar, int fromIndex) { this.sourceString = sourceString; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringIndexOfTestBase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringIndexOfTestBase.java index 6b95e7d2212..9ad58633ca3 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringIndexOfTestBase.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringIndexOfTestBase.java @@ -24,8 +24,6 @@ package org.graalvm.compiler.replacements.test; -import static org.junit.Assume.assumeFalse; - import java.util.ArrayList; import java.util.Collection; @@ -34,8 +32,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import jdk.vm.ci.aarch64.AArch64; - @RunWith(value = Parameterized.class) public abstract class StringIndexOfTestBase extends GraalCompilerTest { @@ -128,7 +124,6 @@ public abstract class StringIndexOfTestBase extends GraalCompilerTest { @Test public void testStringBuilderIndexOfConstant() { - assumeFalse("Disabled on AArch64 due to issues on AArch64; see GR-13100 or JDK-8215792", getTarget().arch instanceof AArch64); /* * Put a copy of the target string in the space after the current string to detect cases * where we search too far. @@ -141,7 +136,6 @@ public abstract class StringIndexOfTestBase extends GraalCompilerTest { @Test public void testStringBuilderIndexOfConstantOffset() { - assumeFalse("Disabled on AArch64 due to issues on AArch64; see GR-13100 or JDK-8215792", getTarget().arch instanceof AArch64); /* * Put a copy of the target string in the space after the current string to detect cases * where we search too far. diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringSubstitutionTestBase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringSubstitutionTestBase.java index 13168068a78..3f1cd476ca7 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringSubstitutionTestBase.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringSubstitutionTestBase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -71,7 +71,7 @@ public class StringSubstitutionTestBase extends MethodSubstitutionTest { StructuredGraph graph = testGraph(testMethod.getName()); // Check to see if the resulting graph contains the expected node - StructuredGraph replacement = getReplacements().getSubstitution(realMethod, -1, false, null, graph.getOptions()); + StructuredGraph replacement = getReplacements().getSubstitution(realMethod, -1, false, null, graph.allowAssumptions(), graph.getOptions()); if (replacement == null) { assertInGraph(graph, expectedNode); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringSubstitutionsTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringSubstitutionsTest.java index 77b3d9cb68e..ca80392d86a 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringSubstitutionsTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringSubstitutionsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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 @@ -44,7 +44,7 @@ public class StringSubstitutionsTest extends MethodSubstitutionTest { StructuredGraph graph = testGraph(testMethodName); // Check to see if the resulting graph contains the expected node - StructuredGraph replacement = getReplacements().getSubstitution(realMethod, -1, false, null, graph.getOptions()); + StructuredGraph replacement = getReplacements().getSubstitution(realMethod, -1, false, null, graph.allowAssumptions(), graph.getOptions()); if (replacement == null && !optional) { assertInGraph(graph, intrinsicClass); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/WordTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/WordTest.java index c2b93c98fb6..84380026720 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/WordTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/WordTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/AllocationSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/AllocationSnippets.java index 275350cf43f..52ae0568cf4 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/AllocationSnippets.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/AllocationSnippets.java @@ -85,7 +85,7 @@ public abstract class AllocationSnippets implements Snippets { Word thread = getTLABInfo(); Word top = readTlabTop(thread); Word end = readTlabEnd(thread); - ReplacementsUtil.runtimeAssert(end.subtract(top).belowOrEqual(Integer.MAX_VALUE), "TLAB is too large"); + ReplacementsUtil.dynamicAssert(end.subtract(top).belowOrEqual(Integer.MAX_VALUE), "TLAB is too large"); // A negative array length will result in an array size larger than the largest possible // TLAB. Therefore, this case will always end up in the stub call. @@ -166,13 +166,13 @@ public abstract class AllocationSnippets implements Snippets { boolean manualUnroll, boolean supportsBulkZeroing, AllocationSnippetCounters snippetCounters) { - ReplacementsUtil.runtimeAssert(endOffset.and(0x7).equal(0), "unaligned object size"); + ReplacementsUtil.dynamicAssert(endOffset.and(0x7).equal(0), "unaligned object size"); UnsignedWord offset = WordFactory.unsigned(startOffset); if (offset.and(0x7).notEqual(0)) { memory.writeInt(offset, (int) value, LocationIdentity.init()); offset = offset.add(4); } - ReplacementsUtil.runtimeAssert(offset.and(0x7).equal(0), "unaligned offset"); + ReplacementsUtil.dynamicAssert(offset.and(0x7).equal(0), "unaligned offset"); UnsignedWord remainingSize = endOffset.subtract(offset); if (manualUnroll && remainingSize.unsignedDivide(8).belowOrEqual(MAX_UNROLLED_OBJECT_ZEROING_STORES)) { ReplacementsUtil.staticAssert(!isEndOffsetConstant, "size shouldn't be constant at instantiation time"); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/BoxingSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/BoxingSnippets.java index 748923da98b..fd562703366 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/BoxingSnippets.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/BoxingSnippets.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -24,7 +24,6 @@ package org.graalvm.compiler.replacements; -import static org.graalvm.compiler.core.common.GraalOptions.ImmutableCode; import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER; import java.util.EnumMap; @@ -33,12 +32,14 @@ import org.graalvm.compiler.api.replacements.Snippet; import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter; import org.graalvm.compiler.api.replacements.SnippetReflectionProvider; import org.graalvm.compiler.debug.DebugHandlersFactory; -import org.graalvm.compiler.nodes.ConstantNode; +import org.graalvm.compiler.debug.GraalError; +import org.graalvm.compiler.nodes.FieldLocationIdentity; +import org.graalvm.compiler.nodes.NamedLocationIdentity; import org.graalvm.compiler.nodes.PiNode; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.FloatingNode; +import org.graalvm.compiler.nodes.extended.AbstractBoxingNode; import org.graalvm.compiler.nodes.extended.BoxNode; import org.graalvm.compiler.nodes.extended.UnboxNode; +import org.graalvm.compiler.nodes.spi.CoreProviders; import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.options.OptionValues; import org.graalvm.compiler.phases.util.Providers; @@ -46,12 +47,11 @@ import org.graalvm.compiler.replacements.SnippetCounter.Group; import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates; import org.graalvm.compiler.replacements.SnippetTemplate.Arguments; import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo; +import jdk.internal.vm.compiler.word.LocationIdentity; import jdk.vm.ci.code.TargetDescription; -import jdk.vm.ci.meta.ConstantReflectionProvider; -import jdk.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.JavaKind; -import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaField; public class BoxingSnippets implements Snippets { @@ -151,34 +151,6 @@ public class BoxingSnippets implements Snippets { return value.shortValue(); } - public static FloatingNode canonicalizeBoxing(BoxNode box, MetaAccessProvider metaAccess, ConstantReflectionProvider constantReflection) { - ValueNode value = box.getValue(); - if (value.isConstant()) { - JavaConstant sourceConstant = value.asJavaConstant(); - if (sourceConstant.getJavaKind() != box.getBoxingKind() && sourceConstant.getJavaKind().isNumericInteger()) { - switch (box.getBoxingKind()) { - case Boolean: - sourceConstant = JavaConstant.forBoolean(sourceConstant.asLong() != 0L); - break; - case Byte: - sourceConstant = JavaConstant.forByte((byte) sourceConstant.asLong()); - break; - case Char: - sourceConstant = JavaConstant.forChar((char) sourceConstant.asLong()); - break; - case Short: - sourceConstant = JavaConstant.forShort((short) sourceConstant.asLong()); - break; - } - } - JavaConstant boxedConstant = constantReflection.boxPrimitive(sourceConstant); - if (boxedConstant != null && sourceConstant.getJavaKind() == box.getBoxingKind()) { - return ConstantNode.forConstant(boxedConstant, metaAccess, box.graph()); - } - } - return null; - } - public static class Templates extends AbstractTemplates { private final EnumMap boxSnippets = new EnumMap<>(JavaKind.class); @@ -191,28 +163,101 @@ public class BoxingSnippets implements Snippets { TargetDescription target) { super(options, factories, providers, snippetReflection, target); for (JavaKind kind : new JavaKind[]{JavaKind.Boolean, JavaKind.Byte, JavaKind.Char, JavaKind.Double, JavaKind.Float, JavaKind.Int, JavaKind.Long, JavaKind.Short}) { - boxSnippets.put(kind, snippet(BoxingSnippets.class, kind.getJavaName() + "ValueOf")); - unboxSnippets.put(kind, snippet(BoxingSnippets.class, kind.getJavaName() + "Value")); + LocationIdentity accessedLocation = null; + LocationIdentity cacheLocation = null; + switch (kind) { + case Byte: + case Short: + case Char: + case Int: + case Long: + accessedLocation = new FieldLocationIdentity(AbstractBoxingNode.getValueField(providers.getMetaAccess().lookupJavaType(kind.toBoxedJavaClass()))); + cacheLocation = getCacheLocation(providers, kind); + break; + case Boolean: + case Float: + case Double: + accessedLocation = new FieldLocationIdentity(AbstractBoxingNode.getValueField(providers.getMetaAccess().lookupJavaType(kind.toBoxedJavaClass()))); + break; + default: + throw GraalError.unimplemented(); + } + assert accessedLocation != null; + // Boxing may write to cache or init location + if (kind == JavaKind.Boolean) { + assert cacheLocation == null; + FieldLocationIdentity trueField = null; + FieldLocationIdentity falseField = null; + for (ResolvedJavaField field : providers.getMetaAccess().lookupJavaType(kind.toBoxedJavaClass()).getStaticFields()) { + if (field.getName().equals("TRUE")) { + trueField = new FieldLocationIdentity(field); + } else if (field.getName().equals("FALSE")) { + falseField = new FieldLocationIdentity(field); + } + } + // does no allocation + boxSnippets.put(kind, snippet(BoxingSnippets.class, kind.getJavaName() + "ValueOf", trueField, falseField)); + } else { + if (cacheLocation != null) { + boxSnippets.put(kind, snippet(BoxingSnippets.class, kind.getJavaName() + "ValueOf", LocationIdentity.INIT_LOCATION, accessedLocation, cacheLocation, + NamedLocationIdentity.getArrayLocation(JavaKind.Object))); + } else { + boxSnippets.put(kind, snippet(BoxingSnippets.class, kind.getJavaName() + "ValueOf", LocationIdentity.INIT_LOCATION, accessedLocation, + NamedLocationIdentity.getArrayLocation(JavaKind.Object))); + } + } + unboxSnippets.put(kind, snippet(BoxingSnippets.class, kind.getJavaName() + "Value", accessedLocation)); } Group group = factory.createSnippetCounterGroup("Boxing"); valueOfCounter = new SnippetCounter(group, "valueOf", "box intrinsification"); valueCounter = new SnippetCounter(group, "Value", "unbox intrinsification"); } - public void lower(BoxNode box, LoweringTool tool) { - FloatingNode canonical = canonicalizeBoxing(box, providers.getMetaAccess(), providers.getConstantReflection()); - // if in AOT mode, we don't want to embed boxed constants. - if (canonical != null && !ImmutableCode.getValue(box.getOptions())) { - box.graph().replaceFixedWithFloating(box, canonical); - } else { - Arguments args = new Arguments(boxSnippets.get(box.getBoxingKind()), box.graph().getGuardsStage(), tool.getLoweringStage()); - args.add("value", box.getValue()); - args.addConst("valueOfCounter", valueOfCounter); - - SnippetTemplate template = template(box, args); - box.getDebug().log("Lowering integerValueOf in %s: node=%s, template=%s, arguments=%s", box.graph(), box, template, args); - template.instantiate(providers.getMetaAccess(), box, DEFAULT_REPLACER, args); + private static LocationIdentity getCacheLocation(CoreProviders providers, JavaKind kind) { + LocationIdentity cacheLocation = null; + Class[] innerClasses = null; + try { + switch (kind) { + case Byte: + innerClasses = Byte.class.getDeclaredClasses(); + break; + case Short: + innerClasses = Short.class.getDeclaredClasses(); + break; + case Char: + innerClasses = Character.class.getDeclaredClasses(); + break; + case Int: + innerClasses = Integer.class.getDeclaredClasses(); + break; + case Long: + innerClasses = Long.class.getDeclaredClasses(); + break; + default: + break; + } + } catch (SecurityException e) { + throw GraalError.shouldNotReachHere(e); } + if (innerClasses != null && innerClasses.length > 0) { + try { + cacheLocation = new FieldLocationIdentity(providers.getMetaAccess().lookupJavaField(innerClasses[0].getDeclaredField("cache"))); + } catch (NoSuchFieldException | SecurityException e) { + throw GraalError.shouldNotReachHere(e); + } + } + + return cacheLocation; + } + + public void lower(BoxNode box, LoweringTool tool) { + Arguments args = new Arguments(boxSnippets.get(box.getBoxingKind()), box.graph().getGuardsStage(), tool.getLoweringStage()); + args.add("value", box.getValue()); + args.addConst("valueOfCounter", valueOfCounter); + + SnippetTemplate template = template(box, args); + box.getDebug().log("Lowering integerValueOf in %s: node=%s, template=%s, arguments=%s", box.graph(), box, template, args); + template.instantiate(providers.getMetaAccess(), box, DEFAULT_REPLACER, args); } public void lower(UnboxNode unbox, LoweringTool tool) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/CachingPEGraphDecoder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/CachingPEGraphDecoder.java index 41d22932362..7e34dd748ee 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/CachingPEGraphDecoder.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/CachingPEGraphDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -30,7 +30,9 @@ import static org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext.Compi import jdk.internal.vm.compiler.collections.EconomicMap; import org.graalvm.compiler.bytecode.BytecodeProvider; +import org.graalvm.compiler.debug.DebugCloseable; import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.TimerKey; import org.graalvm.compiler.graph.SourceLanguagePositionProvider; import org.graalvm.compiler.java.GraphBuilderPhase; import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase; @@ -67,14 +69,15 @@ public class CachingPEGraphDecoder extends PEGraphDecoder { private final AllowAssumptions allowAssumptions; private final EconomicMap graphCache; private final BasePhase postParsingPhase; + private static final TimerKey buildGraphTime = DebugContext.timer("TruffleBuildGraphTime"); public CachingPEGraphDecoder(Architecture architecture, StructuredGraph graph, Providers providers, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts, AllowAssumptions allowAssumptions, LoopExplosionPlugin loopExplosionPlugin, InvocationPlugins invocationPlugins, InlineInvokePlugin[] inlineInvokePlugins, ParameterPlugin parameterPlugin, - NodePlugin[] nodePlugins, ResolvedJavaMethod callInlinedMethod, ResolvedJavaMethod callInlinedAgnosticMethod, SourceLanguagePositionProvider sourceLanguagePositionProvider, + NodePlugin[] nodePlugins, ResolvedJavaMethod peRootForInlining, SourceLanguagePositionProvider sourceLanguagePositionProvider, BasePhase postParsingPhase, EconomicMap graphCache) { super(architecture, graph, providers, loopExplosionPlugin, - invocationPlugins, inlineInvokePlugins, parameterPlugin, nodePlugins, callInlinedMethod, callInlinedAgnosticMethod, sourceLanguagePositionProvider); + invocationPlugins, inlineInvokePlugins, parameterPlugin, nodePlugins, peRootForInlining, sourceLanguagePositionProvider); this.providers = providers; this.graphBuilderConfig = graphBuilderConfig; @@ -126,7 +129,7 @@ public class CachingPEGraphDecoder extends PEGraphDecoder { cancellable(graph.getCancellable()). build(); // @formatter:on - try (DebugContext.Scope scope = debug.scope("createGraph", graphToEncode)) { + try (DebugContext.Scope scope = debug.scope("buildGraph", graphToEncode); DebugCloseable a = buildGraphTime.start(debug)) { IntrinsicContext initialIntrinsicContext = intrinsicBytecodeProvider != null ? new IntrinsicContext(method, plugin.getSubstitute(providers.getMetaAccess()), intrinsicBytecodeProvider, INLINE_AFTER_PARSING) : null; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ConstantStringIndexOfSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ConstantStringIndexOfSnippets.java index 938dfb65da1..2ad11a2e5ee 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ConstantStringIndexOfSnippets.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ConstantStringIndexOfSnippets.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -24,6 +24,8 @@ package org.graalvm.compiler.replacements; +import static org.graalvm.compiler.nodes.util.ConstantReflectionUtil.loadByteArrayConstant; +import static org.graalvm.compiler.nodes.util.ConstantReflectionUtil.loadCharArrayConstant; import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER; import static org.graalvm.compiler.serviceprovider.GraalUnsafeAccess.getUnsafe; @@ -43,6 +45,7 @@ import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo; import org.graalvm.compiler.replacements.nodes.ExplodeLoopNode; import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.MetaAccessProvider; import sun.misc.Unsafe; @@ -70,7 +73,8 @@ public class ConstantStringIndexOfSnippets implements Snippets { args.add("targetOffset", stringIndexOf.getArgument(4)); args.add("targetCount", stringIndexOf.getArgument(5)); args.add("origFromIndex", stringIndexOf.getArgument(6)); - char[] targetCharArray = snippetReflection.asObject(char[].class, stringIndexOf.getArgument(3).asJavaConstant()); + JavaConstant targetArg = stringIndexOf.getArgument(3).asJavaConstant(); + char[] targetCharArray = loadCharArrayConstant(providers.getConstantReflection(), targetArg, Integer.MAX_VALUE); args.addConst("md2", md2(targetCharArray)); args.addConst("cache", computeCache(targetCharArray)); template(stringIndexOf, args).instantiate(providers.getMetaAccess(), stringIndexOf, DEFAULT_REPLACER, args); @@ -84,13 +88,15 @@ public class ConstantStringIndexOfSnippets implements Snippets { args.addConst("target", latin1IndexOf.getArgument(2)); args.add("targetCount", latin1IndexOf.getArgument(3)); args.add("origFromIndex", latin1IndexOf.getArgument(4)); - byte[] targetByteArray = snippetReflection.asObject(byte[].class, latin1IndexOf.getArgument(2).asJavaConstant()); + JavaConstant targetArg = latin1IndexOf.getArgument(2).asJavaConstant(); + byte[] targetByteArray = loadByteArrayConstant(providers.getConstantReflection(), targetArg, Integer.MAX_VALUE); args.addConst("md2", md2(targetByteArray)); args.addConst("cache", computeCache(targetByteArray)); template(latin1IndexOf, args).instantiate(providers.getMetaAccess(), latin1IndexOf, DEFAULT_REPLACER, args); } public void lowerUTF16(SnippetLowerableMemoryNode utf16IndexOf, LoweringTool tool) { + StructuredGraph graph = utf16IndexOf.graph(); Arguments args = new Arguments(utf16IndexOfConstant, graph.getGuardsStage(), tool.getLoweringStage()); args.add("source", utf16IndexOf.getArgument(0)); @@ -98,7 +104,8 @@ public class ConstantStringIndexOfSnippets implements Snippets { args.addConst("target", utf16IndexOf.getArgument(2)); args.add("targetCount", utf16IndexOf.getArgument(3)); args.add("origFromIndex", utf16IndexOf.getArgument(4)); - byte[] targetByteArray = snippetReflection.asObject(byte[].class, utf16IndexOf.getArgument(2).asJavaConstant()); + JavaConstant targetArg = utf16IndexOf.getArgument(2).asJavaConstant(); + byte[] targetByteArray = loadByteArrayConstant(providers.getConstantReflection(), targetArg, Integer.MAX_VALUE); args.addConst("md2", md2Utf16(tool.getMetaAccess(), targetByteArray)); args.addConst("cache", computeCacheUtf16(tool.getMetaAccess(), targetByteArray)); template(utf16IndexOf, args).instantiate(providers.getMetaAccess(), utf16IndexOf, DEFAULT_REPLACER, args); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java index 2f0fe446edb..b4c784ca4d2 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java @@ -44,11 +44,11 @@ import java.util.BitSet; import java.util.List; import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.api.replacements.Snippet; import org.graalvm.compiler.api.replacements.SnippetReflectionProvider; import org.graalvm.compiler.core.common.GraalOptions; import org.graalvm.compiler.core.common.LIRKind; import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; +import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider; import org.graalvm.compiler.core.common.type.AbstractPointerStamp; import org.graalvm.compiler.core.common.type.IntegerStamp; import org.graalvm.compiler.core.common.type.ObjectStamp; @@ -66,6 +66,7 @@ import org.graalvm.compiler.nodes.EndNode; import org.graalvm.compiler.nodes.FieldLocationIdentity; import org.graalvm.compiler.nodes.FixedNode; import org.graalvm.compiler.nodes.FixedWithNextNode; +import org.graalvm.compiler.nodes.FrameState; import org.graalvm.compiler.nodes.IfNode; import org.graalvm.compiler.nodes.LogicNode; import org.graalvm.compiler.nodes.MergeNode; @@ -78,6 +79,7 @@ import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.ValuePhiNode; import org.graalvm.compiler.nodes.calc.AddNode; import org.graalvm.compiler.nodes.calc.ConditionalNode; +import org.graalvm.compiler.nodes.calc.FloatingNode; import org.graalvm.compiler.nodes.calc.IntegerBelowNode; import org.graalvm.compiler.nodes.calc.IntegerConvertNode; import org.graalvm.compiler.nodes.calc.IntegerEqualsNode; @@ -123,7 +125,6 @@ import org.graalvm.compiler.nodes.java.MonitorEnterNode; import org.graalvm.compiler.nodes.java.MonitorIdNode; import org.graalvm.compiler.nodes.java.NewArrayNode; import org.graalvm.compiler.nodes.java.NewInstanceNode; -import org.graalvm.compiler.nodes.java.RawMonitorEnterNode; import org.graalvm.compiler.nodes.java.StoreFieldNode; import org.graalvm.compiler.nodes.java.StoreIndexedNode; import org.graalvm.compiler.nodes.java.UnsafeCompareAndExchangeNode; @@ -131,7 +132,9 @@ import org.graalvm.compiler.nodes.java.UnsafeCompareAndSwapNode; import org.graalvm.compiler.nodes.java.ValueCompareAndSwapNode; import org.graalvm.compiler.nodes.memory.OnHeapMemoryAccess.BarrierType; import org.graalvm.compiler.nodes.memory.ReadNode; +import org.graalvm.compiler.nodes.memory.SideEffectFreeWrite; import org.graalvm.compiler.nodes.memory.VolatileReadNode; +import org.graalvm.compiler.nodes.memory.VolatileWriteNode; import org.graalvm.compiler.nodes.memory.WriteNode; import org.graalvm.compiler.nodes.memory.address.AddressNode; import org.graalvm.compiler.nodes.memory.address.IndexAddressNode; @@ -140,6 +143,7 @@ import org.graalvm.compiler.nodes.spi.Lowerable; import org.graalvm.compiler.nodes.spi.LoweringProvider; import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.nodes.spi.PlatformConfigurationProvider; +import org.graalvm.compiler.nodes.spi.Replacements; import org.graalvm.compiler.nodes.type.StampTool; import org.graalvm.compiler.nodes.util.GraphUtil; import org.graalvm.compiler.nodes.virtual.AllocatedObjectNode; @@ -157,6 +161,7 @@ import jdk.internal.vm.compiler.word.LocationIdentity; import jdk.vm.ci.code.CodeUtil; import jdk.vm.ci.code.MemoryBarriers; import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.ConstantReflectionProvider; import jdk.vm.ci.meta.DeoptimizationAction; import jdk.vm.ci.meta.DeoptimizationReason; import jdk.vm.ci.meta.JavaConstant; @@ -176,17 +181,21 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider { protected final MetaAccessProvider metaAccess; protected final ForeignCallsProvider foreignCalls; protected final BarrierSet barrierSet; + protected final MetaAccessExtensionProvider metaAccessExtensionProvider; protected final TargetDescription target; private final boolean useCompressedOops; + protected Replacements replacements; private BoxingSnippets.Templates boxingSnippets; private ConstantStringIndexOfSnippets.Templates indexOfSnippets; - public DefaultJavaLoweringProvider(MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls, PlatformConfigurationProvider platformConfig, TargetDescription target, - boolean useCompressedOops) { + public DefaultJavaLoweringProvider(MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls, PlatformConfigurationProvider platformConfig, + MetaAccessExtensionProvider metaAccessExtensionProvider, + TargetDescription target, boolean useCompressedOops) { this.metaAccess = metaAccess; this.foreignCalls = foreignCalls; this.barrierSet = platformConfig.getBarrierSet(); + this.metaAccessExtensionProvider = metaAccessExtensionProvider; this.target = target; this.useCompressedOops = useCompressedOops; } @@ -194,6 +203,7 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider { public void initialize(OptionValues options, Iterable factories, SnippetCounter.Group.Factory factory, Providers providers, SnippetReflectionProvider snippetReflection) { boxingSnippets = new BoxingSnippets.Templates(options, factories, factory, providers, snippetReflection, target); indexOfSnippets = new ConstantStringIndexOfSnippets.Templates(options, factories, providers, snippetReflection, target); + replacements = providers.getReplacements(); providers.getReplacements().registerSnippetTemplateCache(new SnippetCounterNode.SnippetCounterSnippets.Templates(options, factories, providers, snippetReflection, target)); } @@ -209,6 +219,14 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider { return barrierSet; } + public MetaAccessExtensionProvider getMetaAccessExtensionProvider() { + return metaAccessExtensionProvider; + } + + public Replacements getReplacements() { + return replacements; + } + @Override @SuppressWarnings("try") public void lower(Node n, LoweringTool tool) { @@ -233,8 +251,6 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider { lowerLoadHubOrNullNode((LoadHubOrNullNode) n, tool); } else if (n instanceof LoadArrayComponentHubNode) { lowerLoadArrayComponentHubNode((LoadArrayComponentHubNode) n); - } else if (n instanceof MonitorEnterNode) { - lowerMonitorEnterNode((MonitorEnterNode) n, tool, graph); } else if (n instanceof UnsafeCompareAndSwapNode) { lowerCompareAndSwapNode((UnsafeCompareAndSwapNode) n); } else if (n instanceof UnsafeCompareAndExchangeNode) { @@ -256,9 +272,24 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider { } else if (n instanceof CommitAllocationNode) { lowerCommitAllocationNode((CommitAllocationNode) n, tool); } else if (n instanceof BoxNode) { - boxingSnippets.lower((BoxNode) n, tool); + if (tool.getLoweringStage() == LoweringTool.StandardLoweringStage.HIGH_TIER) { + /* + * We do not perform box canonicalization directly in the node since want + * virtualization of box nodes. Creating a boxed constant early on inhibits PEA + * so we do it after PEA. + */ + FloatingNode canonical = canonicalizeBoxing((BoxNode) n, metaAccess, tool.getConstantReflection()); + if (canonical != null) { + n.replaceAtUsages((ValueNode) ((BoxNode) n).getLastLocationAccess(), InputType.Memory); + graph.replaceFixedWithFloating((FixedWithNextNode) n, canonical); + } + } else if (tool.getLoweringStage() == LoweringTool.StandardLoweringStage.MID_TIER) { + boxingSnippets.lower((BoxNode) n, tool); + } } else if (n instanceof UnboxNode) { - boxingSnippets.lower((UnboxNode) n, tool); + if (tool.getLoweringStage() == LoweringTool.StandardLoweringStage.MID_TIER) { + boxingSnippets.lower((UnboxNode) n, tool); + } } else if (n instanceof VerifyHeapNode) { lowerVerifyHeap((VerifyHeapNode) n); } else if (n instanceof UnaryMathIntrinsicNode) { @@ -273,12 +304,44 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider { lowerUTF16IndexOf((StringUTF16IndexOfNode) n); } else if (n instanceof UnpackEndianHalfNode) { lowerSecondHalf((UnpackEndianHalfNode) n); + } else if (n instanceof VolatileReadNode) { + lowerVolatileRead(((VolatileReadNode) n), tool); + } else if (n instanceof VolatileWriteNode) { + lowerVolatileWrite(((VolatileWriteNode) n), tool); } else { throw GraalError.shouldNotReachHere("Node implementing Lowerable not handled: " + n); } } } + public static FloatingNode canonicalizeBoxing(BoxNode box, MetaAccessProvider metaAccess, ConstantReflectionProvider constantReflection) { + ValueNode value = box.getValue(); + if (value.isConstant() && !GraalOptions.ImmutableCode.getValue(box.getOptions())) { + JavaConstant sourceConstant = value.asJavaConstant(); + if (sourceConstant.getJavaKind() != box.getBoxingKind() && sourceConstant.getJavaKind().isNumericInteger()) { + switch (box.getBoxingKind()) { + case Boolean: + sourceConstant = JavaConstant.forBoolean(sourceConstant.asLong() != 0L); + break; + case Byte: + sourceConstant = JavaConstant.forByte((byte) sourceConstant.asLong()); + break; + case Char: + sourceConstant = JavaConstant.forChar((char) sourceConstant.asLong()); + break; + case Short: + sourceConstant = JavaConstant.forShort((short) sourceConstant.asLong()); + break; + } + } + JavaConstant boxedConstant = constantReflection.boxPrimitive(sourceConstant); + if (boxedConstant != null && sourceConstant.getJavaKind() == box.getBoxingKind()) { + return ConstantNode.forConstant(boxedConstant, metaAccess, box.graph()); + } + } + return null; + } + private void lowerSecondHalf(UnpackEndianHalfNode n) { ByteOrder byteOrder = target.arch.getByteOrder(); n.lower(byteOrder); @@ -341,7 +404,7 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider { } ResolvedJavaMethod method = math.graph().method(); if (method != null) { - if (method.getAnnotation(Snippet.class) != null) { + if (replacements.isSnippet(method)) { // In the context of SnippetStub, i.e., Graal-generated stubs, use the LIR // lowering to emit the stub assembly code instead of the Node lowering. return; @@ -353,7 +416,7 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider { } } StructuredGraph graph = math.graph(); - ForeignCallNode call = graph.add(new ForeignCallNode(foreignCalls, math.getOperation().foreignCallDescriptor, math.getX(), math.getY())); + ForeignCallNode call = graph.add(new ForeignCallNode(foreignCalls, math.getOperation().foreignCallSignature, math.getX(), math.getY())); graph.addAfterFixed(tool.lastFixedNode(), call); math.replaceAtUsages(call); } @@ -371,7 +434,7 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider { } } StructuredGraph graph = math.graph(); - ForeignCallNode call = math.graph().add(new ForeignCallNode(foreignCalls, math.getOperation().foreignCallDescriptor, math.getValue())); + ForeignCallNode call = math.graph().add(new ForeignCallNode(foreignCalls.getDescriptor(math.getOperation().foreignCallSignature), math.getValue())); graph.addAfterFixed(tool.lastFixedNode(), call); math.replaceAtUsages(call); } @@ -394,7 +457,9 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider { } } - public abstract JavaKind getStorageKind(ResolvedJavaField field); + public final JavaKind getStorageKind(ResolvedJavaField field) { + return metaAccessExtensionProvider.getStorageKind(field.getType()); + } protected void lowerLoadFieldNode(LoadFieldNode loadField, LoweringTool tool) { assert loadField.getStackKind() != JavaKind.Illegal; @@ -408,21 +473,15 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider { assert address != null : "Field that is loaded must not be eliminated: " + field.getDeclaringClass().toJavaName(true) + "." + field.getName(); ReadNode memoryRead = null; - if (loadField.isVolatile() && GraalOptions.LateMembars.getValue(graph.getOptions())) { - memoryRead = graph.add(new VolatileReadNode(address, fieldLocationIdentity(field), loadStamp, barrierSet.fieldLoadBarrierType(field, getStorageKind(field)))); + BarrierType barrierType = barrierSet.fieldLoadBarrierType(field, getStorageKind(field)); + if (loadField.isVolatile()) { + memoryRead = graph.add(new VolatileReadNode(address, fieldLocationIdentity(field), loadStamp, barrierType)); } else { - memoryRead = graph.add(new ReadNode(address, fieldLocationIdentity(field), loadStamp, barrierSet.fieldLoadBarrierType(field, getStorageKind(field)))); + memoryRead = graph.add(new ReadNode(address, fieldLocationIdentity(field), loadStamp, barrierType)); } ValueNode readValue = implicitLoadConvert(graph, getStorageKind(field), memoryRead); loadField.replaceAtUsages(readValue); graph.replaceFixed(loadField, memoryRead); - - if (loadField.isVolatile() && !GraalOptions.LateMembars.getValue(graph.getOptions())) { - MembarNode preMembar = graph.add(new MembarNode(JMM_PRE_VOLATILE_READ)); - graph.addBeforeFixed(memoryRead, preMembar); - MembarNode postMembar = graph.add(new MembarNode(JMM_POST_VOLATILE_READ)); - graph.addAfterFixed(memoryRead, postMembar); - } } protected void lowerStoreFieldNode(StoreFieldNode storeField, LoweringTool tool) { @@ -434,16 +493,15 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider { AddressNode address = createFieldAddress(graph, object, field); assert address != null; - WriteNode memoryWrite = graph.add(new WriteNode(address, fieldLocationIdentity(field), value, barrierSet.fieldStoreBarrierType(field, getStorageKind(field)), storeField.isVolatile())); + BarrierType barrierType = barrierSet.fieldStoreBarrierType(field, getStorageKind(field)); + WriteNode memoryWrite = null; + if (storeField.isVolatile()) { + memoryWrite = graph.add(new VolatileWriteNode(address, fieldLocationIdentity(field), value, barrierType)); + } else { + memoryWrite = graph.add(new WriteNode(address, fieldLocationIdentity(field), value, barrierType)); + } memoryWrite.setStateAfter(storeField.stateAfter()); graph.replaceFixedWithFixed(storeField, memoryWrite); - - if (storeField.isVolatile() && !GraalOptions.LateMembars.getValue(graph.getOptions())) { - MembarNode preMembar = graph.add(new MembarNode(JMM_PRE_VOLATILE_WRITE)); - graph.addBeforeFixed(memoryWrite, preMembar); - MembarNode postMembar = graph.add(new MembarNode(JMM_POST_VOLATILE_WRITE)); - graph.addAfterFixed(memoryWrite, postMembar); - } } public static final IntegerStamp POSITIVE_ARRAY_INDEX_STAMP = StampFactory.forInteger(32, 0, Integer.MAX_VALUE - 1); @@ -540,10 +598,10 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider { condition = LogicNode.or(graph.unique(IsNullNode.create(value)), typeTest, GraalDirectives.UNLIKELY_PROBABILITY); } } - + BarrierType barrierType = barrierSet.arrayStoreBarrierType(storageKind); AddressNode address = createArrayIndexAddress(graph, array, storageKind, storeIndexed.index(), boundsCheck); WriteNode memoryWrite = graph.add(new WriteNode(address, NamedLocationIdentity.getArrayLocation(storageKind), implicitStoreConvert(graph, storageKind, value), - barrierSet.arrayStoreBarrierType(storageKind), false)); + barrierType)); memoryWrite.setGuard(boundsCheck); if (condition != null) { tool.createGuard(storeIndexed, condition, DeoptimizationReason.ArrayStoreException, DeoptimizationAction.InvalidateReprofile); @@ -620,15 +678,6 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider { graph.replaceFixed(loadHub, hub); } - protected void lowerMonitorEnterNode(MonitorEnterNode monitorEnter, LoweringTool tool, StructuredGraph graph) { - ValueNode object = createNullCheckedValue(monitorEnter.object(), monitorEnter, tool); - ValueNode hub = graph.addOrUnique(LoadHubNode.create(object, tool.getStampProvider(), tool.getMetaAccess(), tool.getConstantReflection())); - RawMonitorEnterNode rawMonitorEnter = graph.add(new RawMonitorEnterNode(object, hub, monitorEnter.getMonitorId(), monitorEnter.isBiasable())); - rawMonitorEnter.setStateBefore(monitorEnter.stateBefore()); - rawMonitorEnter.setStateAfter(monitorEnter.stateAfter()); - graph.replaceFixedWithFixed(monitorEnter, rawMonitorEnter); - } - protected void lowerCompareAndSwapNode(UnsafeCompareAndSwapNode cas) { StructuredGraph graph = cas.graph(); JavaKind valueKind = cas.getValueKind(); @@ -716,7 +765,13 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider { JavaKind readKind = load.accessKind(); Stamp loadStamp = loadStamp(load.stamp(NodeView.DEFAULT), readKind, compressible); AddressNode address = createUnsafeAddress(graph, load.object(), load.offset()); - ReadNode memoryRead = graph.add(new ReadNode(address, load.getLocationIdentity(), loadStamp, barrierSet.readBarrierType(load))); + ReadNode memoryRead = null; + if (load.isVolatile()) { + memoryRead = new VolatileReadNode(address, load.getLocationIdentity(), loadStamp, barrierSet.readBarrierType(load)); + } else { + memoryRead = new ReadNode(address, load.getLocationIdentity(), loadStamp, barrierSet.readBarrierType(load)); + } + memoryRead = graph.add(memoryRead); if (guard == null) { // An unsafe read must not float otherwise it may float above // a test guaranteeing the read is safe. @@ -759,7 +814,13 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider { JavaKind valueKind = store.accessKind(); ValueNode value = implicitStoreConvert(graph, valueKind, store.value(), compressible); AddressNode address = createUnsafeAddress(graph, store.object(), store.offset()); - WriteNode write = graph.add(new WriteNode(address, store.getKilledLocationIdentity(), value, barrierSet.storeBarrierType(store), false)); + WriteNode write = null; + if (store.isVolatile()) { + write = new VolatileWriteNode(address, store.getLocationIdentity(), value, barrierSet.storeBarrierType(store)); + } else { + write = new WriteNode(address, store.getLocationIdentity(), value, barrierSet.storeBarrierType(store)); + } + write = graph.add(write); write.setStateAfter(store.stateAfter()); graph.replaceFixedWithFixed(store, write); } @@ -770,7 +831,7 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider { JavaKind valueKind = store.getKind(); ValueNode value = implicitStoreConvert(graph, valueKind, store.getValue(), false); AddressNode address = graph.addOrUniqueWithInputs(OffsetAddressNode.create(store.getAddress())); - WriteNode write = graph.add(new WriteNode(address, store.getKilledLocationIdentity(), value, BarrierType.NONE, false)); + WriteNode write = graph.add(new WriteNode(address, store.getKilledLocationIdentity(), value, BarrierType.NONE)); write.setStateAfter(store.stateAfter()); graph.replaceFixedWithFixed(store, write); } @@ -797,7 +858,12 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider { protected void lowerJavaWriteNode(JavaWriteNode write) { StructuredGraph graph = write.graph(); ValueNode value = implicitStoreConvert(graph, write.getWriteKind(), write.value(), write.isCompressible()); - WriteNode memoryWrite = graph.add(new WriteNode(write.getAddress(), write.getKilledLocationIdentity(), value, write.getBarrierType(), false)); + WriteNode memoryWrite = null; + if (write.hasSideEffect()) { + memoryWrite = graph.add(new WriteNode(write.getAddress(), write.getKilledLocationIdentity(), value, write.getBarrierType())); + } else { + memoryWrite = graph.add(new SideEffectFreeWrite(write.getAddress(), write.getKilledLocationIdentity(), value, write.getBarrierType())); + } memoryWrite.setStateAfter(write.stateAfter()); graph.replaceFixedWithFixed(write, memoryWrite); memoryWrite.setGuard(write.getGuard()); @@ -818,10 +884,10 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider { int entryCount = virtual.entryCount(); AbstractNewObjectNode newObject; if (virtual instanceof VirtualInstanceNode) { - newObject = graph.add(createNewInstanceFromVirtual(virtual)); + newObject = graph.add(new NewInstanceNode(virtual.type(), true)); } else { assert virtual instanceof VirtualArrayNode; - newObject = graph.add(createNewArrayFromVirtual(virtual, ConstantNode.forInt(entryCount, graph))); + newObject = graph.add(new NewArrayNode(((VirtualArrayNode) virtual).componentType(), ConstantNode.forInt(entryCount, graph), true)); } // The final STORE_STORE barrier will be emitted by finishAllocatedObjects newObject.clearEmitMemoryBarrier(); @@ -839,7 +905,7 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider { } else if (!(value.isConstant() && value.asConstant().isDefaultForKind())) { // Constant.illegal is always the defaultForKind, so it is skipped JavaKind valueKind = value.getStackKind(); - JavaKind storageKind = virtual.entryKind(i); + JavaKind storageKind = virtual.entryKind(tool.getProviders().getMetaAccessExtensionProvider(), i); // Truffle requires some leniency in terms of what can be put where: assert valueKind.getStackKind() == storageKind.getStackKind() || @@ -860,7 +926,7 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider { barrierType = barrierSet.arrayStoreBarrierType(storageKind); } if (address != null) { - WriteNode write = new WriteNode(address, LocationIdentity.init(), arrayImplicitStoreConvert(graph, storageKind, value, commit, virtual, valuePos), barrierType, false); + WriteNode write = new WriteNode(address, LocationIdentity.init(), arrayImplicitStoreConvert(graph, storageKind, value, commit, virtual, valuePos), barrierType); graph.addAfterFixed(newObject, graph.add(write)); } } @@ -881,7 +947,7 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider { assert value instanceof VirtualObjectNode; ValueNode allocValue = allocations[commit.getVirtualObjects().indexOf(value)]; if (!(allocValue.isConstant() && allocValue.asConstant().isDefaultForKind())) { - assert virtual.entryKind(i) == JavaKind.Object && allocValue.getStackKind() == JavaKind.Object; + assert virtual.entryKind(metaAccessExtensionProvider, i) == JavaKind.Object && allocValue.getStackKind() == JavaKind.Object; AddressNode address; BarrierType barrierType; if (virtual instanceof VirtualInstanceNode) { @@ -891,11 +957,11 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider { barrierType = barrierSet.fieldStoreBarrierType(field, getStorageKind(field)); } else { assert virtual instanceof VirtualArrayNode; - address = createArrayAddress(graph, newObject, virtual.entryKind(i), ConstantNode.forInt(i, graph)); - barrierType = barrierSet.arrayStoreBarrierType(virtual.entryKind(i)); + address = createArrayAddress(graph, newObject, virtual.entryKind(metaAccessExtensionProvider, i), ConstantNode.forInt(i, graph)); + barrierType = barrierSet.arrayStoreBarrierType(virtual.entryKind(metaAccessExtensionProvider, i)); } if (address != null) { - WriteNode write = new WriteNode(address, LocationIdentity.init(), implicitStoreConvert(graph, JavaKind.Object, allocValue), barrierType, false); + WriteNode write = new WriteNode(address, LocationIdentity.init(), implicitStoreConvert(graph, JavaKind.Object, allocValue), barrierType); graph.addBeforeFixed(commit, graph.add(write)); } } @@ -915,14 +981,6 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider { } - public NewInstanceNode createNewInstanceFromVirtual(VirtualObjectNode virtual) { - return new NewInstanceNode(virtual.type(), true); - } - - protected NewArrayNode createNewArrayFromVirtual(VirtualObjectNode virtual, ValueNode length) { - return new NewArrayNode(((VirtualArrayNode) virtual).componentType(), length, true); - } - public void finishAllocatedObjects(LoweringTool tool, FixedWithNextNode insertAfter, CommitAllocationNode commit, ValueNode[] allocations) { FixedWithNextNode insertionPoint = insertAfter; StructuredGraph graph = commit.graph(); @@ -943,6 +1001,7 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider { * actually be used. */ ArrayList enters = null; + FrameState stateBefore = SnippetTemplate.findLastFrameState(insertionPoint); for (int objIndex = 0; objIndex < commit.getVirtualObjects().size(); objIndex++) { List locks = commit.getLocks(objIndex); if (locks.size() > 1) { @@ -957,6 +1016,7 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider { lastDepth = monitorId.getLockDepth(); MonitorEnterNode enter = graph.add(new MonitorEnterNode(allocations[objIndex], monitorId)); graph.addAfterFixed(insertionPoint, enter); + enter.setStateAfter(stateBefore.duplicate()); insertionPoint = enter; if (enters == null) { enters = new ArrayList<>(); @@ -971,7 +1031,7 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider { addObject.replaceAtUsagesAndDelete(allocations[index]); } else { assert enters != null; - commit.replaceAtUsages(InputType.Memory, enters.get(enters.size() - 1)); + commit.replaceAtUsages(enters.get(enters.size() - 1), InputType.Memory); } } if (enters != null) { @@ -1083,7 +1143,7 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider { CommitAllocationNode commit, VirtualObjectNode virtual, int valuePos) { - if (!virtual.isVirtualByteArray()) { + if (!virtual.isVirtualByteArray(metaAccessExtensionProvider)) { return implicitStoreConvert(graph, entryKind, value); } // A virtual entry in a byte array can span multiple bytes. This shortens the entry to fit @@ -1205,4 +1265,32 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider { ValueNode ret = graph.unique(new RightShiftNode(scaledIndex, ConstantNode.forInt(shift, graph))); return IntegerConvertNode.convert(ret, StampFactory.forKind(JavaKind.Int), graph, NodeView.DEFAULT); } + + private static void lowerVolatileRead(VolatileReadNode n, LoweringTool tool) { + if (tool.getLoweringStage() != LoweringTool.StandardLoweringStage.LOW_TIER) { + return; + } + final StructuredGraph graph = n.graph(); + MembarNode preMembar = graph.add(new MembarNode(JMM_PRE_VOLATILE_READ)); + graph.addBeforeFixed(n, preMembar); + MembarNode postMembar = graph.add(new MembarNode(JMM_POST_VOLATILE_READ)); + graph.addAfterFixed(n, postMembar); + n.replaceAtUsages(postMembar, InputType.Memory); + ReadNode nonVolatileRead = graph.add(new ReadNode(n.getAddress(), n.getLocationIdentity(), n.getAccessStamp(NodeView.DEFAULT), n.getBarrierType())); + graph.replaceFixedWithFixed(n, nonVolatileRead); + } + + private static void lowerVolatileWrite(VolatileWriteNode n, LoweringTool tool) { + if (tool.getLoweringStage() != LoweringTool.StandardLoweringStage.LOW_TIER) { + return; + } + final StructuredGraph graph = n.graph(); + MembarNode preMembar = graph.add(new MembarNode(JMM_PRE_VOLATILE_WRITE)); + graph.addBeforeFixed(n, preMembar); + MembarNode postMembar = graph.add(new MembarNode(JMM_POST_VOLATILE_WRITE)); + graph.addAfterFixed(n, postMembar); + n.replaceAtUsages(postMembar, InputType.Memory); + WriteNode nonVolatileWrite = graph.add(new WriteNode(n.getAddress(), n.getLocationIdentity(), n.value(), n.getBarrierType())); + graph.replaceFixedWithFixed(n, nonVolatileWrite); + } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/GraphKit.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/GraphKit.java index 57732bf6eae..2328450ee6c 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/GraphKit.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/GraphKit.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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 @@ -34,6 +34,7 @@ import java.util.List; import org.graalvm.compiler.core.common.CompilationIdentifier; import org.graalvm.compiler.core.common.spi.ConstantFieldProvider; +import org.graalvm.compiler.core.common.type.Stamp; import org.graalvm.compiler.core.common.type.StampFactory; import org.graalvm.compiler.core.common.type.StampPair; import org.graalvm.compiler.debug.DebugCloseable; @@ -187,6 +188,15 @@ public class GraphKit implements GraphBuilderTool { return node; } + public Stamp wordStamp(ResolvedJavaType type) { + assert wordTypes != null && wordTypes.isWord(type); + return wordTypes.getWordStamp(type); + } + + public final JavaKind asKind(JavaType type) { + return wordTypes != null ? wordTypes.asKind(type) : type.getJavaKind(); + } + @Override public T append(T node) { T result = graph.addOrUniqueWithInputs(changeToWord(node)); @@ -307,10 +317,6 @@ public class GraphKit implements GraphBuilderTool { return new MethodCallTargetNode(invokeKind, targetMethod, args, returnStamp, null); } - protected final JavaKind asKind(JavaType type) { - return wordTypes != null ? wordTypes.asKind(type) : type.getJavaKind(); - } - /** * Determines if a given set of arguments is compatible with the signature of a given method. * @@ -374,9 +380,6 @@ public class GraphKit implements GraphBuilderTool { GraphBuilderPhase.Instance instance = createGraphBuilderInstance(providers, config, OptimisticOptimizations.NONE, initialReplacementContext); instance.apply(calleeGraph); } - - // Remove all frame states from inlinee - calleeGraph.clearAllStateAfter(); new DeadCodeEliminationPhase(Optionality.Required).apply(calleeGraph); InliningUtil.inline(invoke, calleeGraph, false, method, reason, phase); @@ -541,14 +544,7 @@ public class GraphKit implements GraphBuilderTool { } public InvokeWithExceptionNode startInvokeWithException(MethodCallTargetNode callTarget, FrameStateBuilder frameStateBuilder, int invokeBci, int exceptionEdgeBci) { - ExceptionObjectNode exceptionObject = add(new ExceptionObjectNode(getMetaAccess())); - if (frameStateBuilder != null) { - FrameStateBuilder exceptionState = frameStateBuilder.copy(); - exceptionState.clearStack(); - exceptionState.push(JavaKind.Object, exceptionObject); - exceptionState.setRethrowException(false); - exceptionObject.setStateAfter(exceptionState.create(exceptionEdgeBci, exceptionObject)); - } + ExceptionObjectNode exceptionObject = createExceptionObjectNode(frameStateBuilder, exceptionEdgeBci); InvokeWithExceptionNode invoke = append(new InvokeWithExceptionNode(callTarget, exceptionObject, invokeBci)); AbstractBeginNode noExceptionEdge = graph.add(KillingBeginNode.create(LocationIdentity.any())); invoke.setNext(noExceptionEdge); @@ -573,6 +569,18 @@ public class GraphKit implements GraphBuilderTool { return invoke; } + protected ExceptionObjectNode createExceptionObjectNode(FrameStateBuilder frameStateBuilder, int exceptionEdgeBci) { + ExceptionObjectNode exceptionObject = add(new ExceptionObjectNode(getMetaAccess())); + if (frameStateBuilder != null) { + FrameStateBuilder exceptionState = frameStateBuilder.copy(); + exceptionState.clearStack(); + exceptionState.push(JavaKind.Object, exceptionObject); + exceptionState.setRethrowException(false); + exceptionObject.setStateAfter(exceptionState.create(exceptionEdgeBci, exceptionObject)); + } + return exceptionObject; + } + private InvokeWithExceptionStructure saveLastInvokeWithExceptionNode() { InvokeWithExceptionStructure s = getTopStructure(InvokeWithExceptionStructure.class); switch (s.state) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntrinsicGraphBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntrinsicGraphBuilder.java index 84d02103174..f62c8bb376e 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntrinsicGraphBuilder.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntrinsicGraphBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -35,6 +35,7 @@ import org.graalvm.compiler.debug.DebugCloseable; import org.graalvm.compiler.debug.DebugContext; import org.graalvm.compiler.debug.GraalError; import org.graalvm.compiler.graph.NodeSourcePosition; +import org.graalvm.compiler.nodes.AbstractBeginNode; import org.graalvm.compiler.nodes.CallTargetNode; import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind; import org.graalvm.compiler.nodes.FixedNode; @@ -46,11 +47,14 @@ import org.graalvm.compiler.nodes.ReturnNode; import org.graalvm.compiler.nodes.StateSplit; import org.graalvm.compiler.nodes.StructuredGraph; import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; +import org.graalvm.compiler.nodes.UnwindNode; import org.graalvm.compiler.nodes.ValueNode; +import org.graalvm.compiler.nodes.WithExceptionNode; import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext; import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver; +import org.graalvm.compiler.nodes.java.ExceptionObjectNode; import org.graalvm.compiler.nodes.spi.CoreProviders; import org.graalvm.compiler.nodes.spi.Replacements; import org.graalvm.compiler.nodes.spi.StampProvider; @@ -81,6 +85,8 @@ public class IntrinsicGraphBuilder implements GraphBuilderContext, Receiver { protected ValueNode[] arguments; protected ValueNode returnValue; + private boolean unwindCreated; + public IntrinsicGraphBuilder(OptionValues options, DebugContext debug, CoreProviders providers, Bytecode code, int invokeBci) { this(options, debug, providers, code, invokeBci, AllowAssumptions.YES); } @@ -134,12 +140,38 @@ public class IntrinsicGraphBuilder implements GraphBuilderContext, Receiver { FixedWithNextNode fixedWithNextNode = (FixedWithNextNode) fixedNode; assert fixedWithNextNode.next() == null : "cannot append instruction to instruction which isn't end"; lastInstr = fixedWithNextNode; + + } else if (fixedNode instanceof WithExceptionNode) { + WithExceptionNode withExceptionNode = (WithExceptionNode) fixedNode; + AbstractBeginNode normalSuccessor = graph.add(withExceptionNode.createNextBegin()); + ExceptionObjectNode exceptionSuccessor = graph.add(new ExceptionObjectNode(getMetaAccess())); + setExceptionState(exceptionSuccessor); + exceptionSuccessor.setNext(graph.add(new UnwindNode(exceptionSuccessor))); + + if (unwindCreated) { + throw GraalError.shouldNotReachHere("Intrinsic graph can only have one node with an exception edge"); + } + unwindCreated = true; + + withExceptionNode.setNext(normalSuccessor); + withExceptionNode.setExceptionEdge(exceptionSuccessor); + lastInstr = normalSuccessor; + } else { lastInstr = null; } } } + /** + * Currently unimplemented here, but implemented in subclasses that need it. + * + * @param exceptionObject The node that needs an exception state. + */ + protected void setExceptionState(ExceptionObjectNode exceptionObject) { + throw GraalError.shouldNotReachHere("unsupported by this IntrinsicGraphBuilder"); + } + @Override public T append(T v) { if (v.graph() != null) { @@ -276,6 +308,7 @@ public class IntrinsicGraphBuilder implements GraphBuilderContext, Receiver { Receiver receiver = method.isStatic() ? null : this; if (plugin.execute(this, method, receiver, arguments)) { assert (returnValue != null) == (method.getSignature().getReturnKind() != JavaKind.Void) : method; + assert lastInstr != null : "ReturnNode must be linked into control flow"; append(new ReturnNode(returnValue)); return graph; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/MethodHandlePlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/MethodHandlePlugin.java index f164b5d763f..10e2c25fad0 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/MethodHandlePlugin.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/MethodHandlePlugin.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -34,6 +34,7 @@ import org.graalvm.compiler.nodes.InvokeNode; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin; +import org.graalvm.compiler.replacements.nodes.MacroNode.MacroParams; import org.graalvm.compiler.replacements.nodes.MethodHandleNode; import jdk.vm.ci.meta.JavaKind; @@ -77,7 +78,7 @@ public class MethodHandlePlugin implements NodePlugin { }; InvokeNode invoke = MethodHandleNode.tryResolveTargetInvoke(adder, methodHandleAccess, intrinsicMethod, method, b.bci(), invokeReturnStamp, args); if (invoke == null) { - MethodHandleNode methodHandleNode = new MethodHandleNode(intrinsicMethod, invokeKind, method, b.bci(), invokeReturnStamp, args); + MethodHandleNode methodHandleNode = new MethodHandleNode(intrinsicMethod, MacroParams.of(invokeKind, b.getMethod(), method, b.bci(), invokeReturnStamp, args)); if (invokeReturnStamp.getTrustedStamp().getStackKind() == JavaKind.Void) { b.add(methodHandleNode); } else { @@ -110,6 +111,24 @@ public class MethodHandlePlugin implements NodePlugin { } b.handleReplacedInvoke(invoke.getInvokeKind(), targetMethod, argumentsList.toArray(new ValueNode[argumentsList.size()]), inlineEverything); + + /* + * After handleReplacedInvoke, a return type according to the signature of + * targetMethod has been pushed. That can be different than the type expected by the + * method handle invoke. Since there cannot be any implicit type conversion, the + * only safe option actually is that the return type is not used at all. If there is + * any other expected return type, the bytecodes are wrong. The JavaDoc of + * MethodHandle.invokeBasic states that this "could crash the JVM", so bailing out + * of compilation seems like a good idea. + */ + JavaKind invokeReturnKind = invokeReturnStamp.getTrustedStamp().getStackKind(); + JavaKind targetMethodReturnKind = targetMethod.getSignature().getReturnKind().getStackKind(); + if (invokeReturnKind != targetMethodReturnKind) { + b.pop(targetMethodReturnKind); + if (invokeReturnKind != JavaKind.Void) { + throw b.bailout("Cannot do any type conversion when invoking method handle, so return value must remain popped"); + } + } } return true; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java index c19aa8f4bb9..61005f7a7ac 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -25,7 +25,11 @@ package org.graalvm.compiler.replacements; import static org.graalvm.compiler.debug.GraalError.unimplemented; +import static org.graalvm.compiler.nodeinfo.InputType.Anchor; +import static org.graalvm.compiler.nodeinfo.InputType.Guard; +import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0; import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED; +import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0; import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED; import java.net.URI; @@ -50,6 +54,7 @@ import org.graalvm.compiler.core.common.type.StampPair; import org.graalvm.compiler.debug.DebugCloseable; import org.graalvm.compiler.debug.DebugContext; import org.graalvm.compiler.debug.GraalError; +import org.graalvm.compiler.graph.IterableNodeType; import org.graalvm.compiler.graph.Node; import org.graalvm.compiler.graph.Node.NodeIntrinsic; import org.graalvm.compiler.graph.NodeClass; @@ -58,12 +63,14 @@ import org.graalvm.compiler.graph.SourceLanguagePosition; import org.graalvm.compiler.graph.SourceLanguagePositionProvider; import org.graalvm.compiler.graph.spi.Canonicalizable; import org.graalvm.compiler.java.GraphBuilderPhase; +import org.graalvm.compiler.nodeinfo.InputType; import org.graalvm.compiler.nodeinfo.NodeInfo; import org.graalvm.compiler.nodes.AbstractBeginNode; import org.graalvm.compiler.nodes.AbstractMergeNode; import org.graalvm.compiler.nodes.CallTargetNode; import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind; import org.graalvm.compiler.nodes.ControlSinkNode; +import org.graalvm.compiler.nodes.DeoptBciSupplier; import org.graalvm.compiler.nodes.DeoptimizeNode; import org.graalvm.compiler.nodes.EncodedGraph; import org.graalvm.compiler.nodes.FixedNode; @@ -82,7 +89,8 @@ import org.graalvm.compiler.nodes.StructuredGraph; import org.graalvm.compiler.nodes.UnwindNode; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.cfg.ControlFlowGraph; -import org.graalvm.compiler.nodes.extended.ForeignCallNode; +import org.graalvm.compiler.nodes.extended.AnchoringNode; +import org.graalvm.compiler.nodes.extended.GuardingNode; import org.graalvm.compiler.nodes.extended.IntegerSwitchNode; import org.graalvm.compiler.nodes.graphbuilderconf.GeneratedInvocationPlugin; import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; @@ -295,7 +303,7 @@ public abstract class PEGraphDecoder extends SimplifyingGraphDecoder { int count = 0; PEGraphDecoder.PEMethodScope scope = methodScope; while (scope != null) { - if (scope.method.equals(callInlinedMethod) || scope.method.equals(callInlinedAgnosticMethod)) { + if (scope.method.equals(peRootForInlining)) { count++; } scope = scope.caller; @@ -560,7 +568,7 @@ public abstract class PEGraphDecoder extends SimplifyingGraphDecoder { } } - @NodeInfo(cycles = CYCLES_IGNORED, size = SIZE_IGNORED) + @NodeInfo(cycles = CYCLES_IGNORED, size = SIZE_IGNORED, allowedUsageTypes = {InputType.Value, InputType.Guard, InputType.Anchor}) static class ExceptionPlaceholderNode extends ValueNode { public static final NodeClass TYPE = NodeClass.create(ExceptionPlaceholderNode.class); @@ -569,6 +577,18 @@ public abstract class PEGraphDecoder extends SimplifyingGraphDecoder { } } + @NodeInfo(allowedUsageTypes = {Anchor, Guard, InputType.Value}, cycles = CYCLES_0, size = SIZE_0) + static final class FixedAnchorNode extends FixedWithNextNode implements AnchoringNode, GuardingNode, IterableNodeType { + + public static final NodeClass TYPE = NodeClass.create(FixedAnchorNode.class); + @Input ValueNode value; + + protected FixedAnchorNode(ValueNode value) { + super(TYPE, value.stamp(NodeView.DEFAULT)); + this.value = value; + } + } + protected static class SpecialCallTargetCacheKey { private final InvokeKind invokeKind; private final ResolvedJavaMethod targetMethod; @@ -604,24 +624,22 @@ public abstract class PEGraphDecoder extends SimplifyingGraphDecoder { private final NodePlugin[] nodePlugins; private final EconomicMap specialCallTargetCache; private final EconomicMap invocationPluginCache; - private final ResolvedJavaMethod callInlinedMethod; - private final ResolvedJavaMethod callInlinedAgnosticMethod; + private final ResolvedJavaMethod peRootForInlining; protected final SourceLanguagePositionProvider sourceLanguagePositionProvider; public PEGraphDecoder(Architecture architecture, StructuredGraph graph, CoreProviders providers, LoopExplosionPlugin loopExplosionPlugin, InvocationPlugins invocationPlugins, InlineInvokePlugin[] inlineInvokePlugins, ParameterPlugin parameterPlugin, - NodePlugin[] nodePlugins, ResolvedJavaMethod callInlinedMethod, ResolvedJavaMethod callInlinedAgnosticMethod, SourceLanguagePositionProvider sourceLanguagePositionProvider) { + NodePlugin[] nodePlugins, ResolvedJavaMethod peRootForInlining, SourceLanguagePositionProvider sourceLanguagePositionProvider) { super(architecture, graph, providers, true); this.loopExplosionPlugin = loopExplosionPlugin; this.invocationPlugins = invocationPlugins; this.inlineInvokePlugins = inlineInvokePlugins; this.parameterPlugin = parameterPlugin; this.nodePlugins = nodePlugins; - this.callInlinedAgnosticMethod = callInlinedAgnosticMethod; this.specialCallTargetCache = EconomicMap.create(Equivalence.DEFAULT); this.invocationPluginCache = EconomicMap.create(Equivalence.DEFAULT); - this.callInlinedMethod = callInlinedMethod; + this.peRootForInlining = peRootForInlining; this.sourceLanguagePositionProvider = sourceLanguagePositionProvider; } @@ -637,6 +655,7 @@ public abstract class PEGraphDecoder extends SimplifyingGraphDecoder { public void decode(ResolvedJavaMethod method, boolean isSubstitution, boolean trackNodeSourcePosition) { try (DebugContext.Scope scope = debug.scope("PEGraphDecode", graph)) { EncodedGraph encodedGraph = lookupEncodedGraph(method, null, null, isSubstitution, trackNodeSourcePosition); + recordGraphElements(encodedGraph); PEMethodScope methodScope = new PEMethodScope(graph, null, null, encodedGraph, method, null, 0, loopExplosionPlugin, null); decode(createInitialLoopScope(methodScope, null)); cleanupGraph(methodScope); @@ -655,6 +674,32 @@ public abstract class PEGraphDecoder extends SimplifyingGraphDecoder { } } + private void recordGraphElements(EncodedGraph encodedGraph) { + List inlinedMethods = encodedGraph.getInlinedMethods(); + if (inlinedMethods != null) { + for (ResolvedJavaMethod other : inlinedMethods) { + graph.recordMethod(other); + } + } + Assumptions assumptions = graph.getAssumptions(); + Assumptions inlinedAssumptions = encodedGraph.getAssumptions(); + if (assumptions != null) { + if (inlinedAssumptions != null) { + assumptions.record(inlinedAssumptions); + } + } else { + assert inlinedAssumptions == null : String.format("cannot inline graph (%s) which makes assumptions into a graph (%s) that doesn't", encodedGraph, graph); + } + if (encodedGraph.getFields() != null) { + for (ResolvedJavaField field : encodedGraph.getFields()) { + graph.recordField(field); + } + } + if (encodedGraph.hasUnsafeAccess()) { + graph.markUnsafeAccess(); + } + } + @Override protected void cleanupGraph(MethodScope methodScope) { super.cleanupGraph(methodScope); @@ -677,12 +722,37 @@ public abstract class PEGraphDecoder extends SimplifyingGraphDecoder { assert frameState.isDeleted(); } } + /* + * Cleanup anchor nodes introduced for exception object anchors during inlining. When we + * inline through an invoke with exception and the caller has an exception handler attached + * this handler can use the exception object node as anchor or guard. During inlining the + * exception object node is replaced with its actual value produced in the callee, however + * this value is not necessarily a guarding or anchoring node. Thus, we introduce artificial + * fixed anchor nodes in the exceptional path in the callee the caller can use as anchor, + * guard or value input. After we are done we remove all anchors that are not needed any + * more, i.e., they do not have any guard or anchor usages. If they have guard or anchor + * usages we rewrite the anchor for exactly those nodes to a real value anchor node that can + * be optimized later. + * + * Optimizing the anchor early is not possible during partial evaluation, since we do not + * know if a node not yet decoded in the caller will reference the exception object + * replacement node in the callee as an anchor or guard. + */ + for (FixedAnchorNode anchor : graph.getNodes(FixedAnchorNode.TYPE).snapshot()) { + AbstractBeginNode newAnchor = AbstractBeginNode.prevBegin(anchor); + assert newAnchor != null : "Must find prev begin node"; + anchor.replaceAtUsages(newAnchor, InputType.Guard, InputType.Anchor); + // all other usages can really consume the value + anchor.replaceAtUsages(anchor.value); + assert anchor.hasNoUsages(); + GraphUtil.unlinkFixedNode(anchor); + anchor.safeDelete(); + } } @Override protected void checkLoopExplosionIteration(MethodScope s, LoopScope loopScope) { PEMethodScope methodScope = (PEMethodScope) s; - if (loopScope.loopIteration > Options.MaximumLoopExplosionCount.getValue(options)) { throw tooManyLoopExplosionIterations(methodScope, options); } @@ -697,7 +767,6 @@ public abstract class PEGraphDecoder extends SimplifyingGraphDecoder { @Override protected LoopScope handleInvoke(MethodScope s, LoopScope loopScope, InvokeData invokeData) { PEMethodScope methodScope = (PEMethodScope) s; - /* * Decode the call target, but do not add it to the graph yet. This avoids adding usages for * all the arguments, which are expensive to remove again when we can inline the method. @@ -708,12 +777,6 @@ public abstract class PEGraphDecoder extends SimplifyingGraphDecoder { MethodCallTargetNode methodCall = (MethodCallTargetNode) callTarget; if (methodCall.invokeKind().hasReceiver()) { invokeData.constantReceiver = methodCall.arguments().get(0).asJavaConstant(); - NodeSourcePosition invokePosition = invokeData.invoke.asNode().getNodeSourcePosition(); - if (invokeData.constantReceiver != null && invokePosition != null) { - // new NodeSourcePosition(invokeData.constantReceiver, - // invokePosition.getCaller(), invokePosition.getMethod(), - // invokePosition.getBCI()); - } } LoopScope inlineLoopScope = trySimplifyInvoke(methodScope, loopScope, invokeData, (MethodCallTargetNode) callTarget); if (inlineLoopScope != null) { @@ -819,6 +882,10 @@ public abstract class PEGraphDecoder extends SimplifyingGraphDecoder { if (graphBuilderContext.invokeConsumed) { /* Nothing to do. */ } else if (graphBuilderContext.lastInstr != null) { + if (graphBuilderContext.lastInstr instanceof DeoptBciSupplier && !BytecodeFrame.isPlaceholderBci(invokeData.invoke.bci()) && + BytecodeFrame.isPlaceholderBci(((DeoptBciSupplier) graphBuilderContext.lastInstr).bci())) { + ((DeoptBciSupplier) graphBuilderContext.lastInstr).setBci(invokeData.invoke.bci()); + } registerNode(loopScope, invokeData.invokeOrderId, graphBuilderContext.pushedNode, true, true); invoke.asNode().replaceAtUsages(graphBuilderContext.pushedNode); graphBuilderContext.lastInstr.setNext(nodeAfterInvoke(methodScope, loopScope, invokeData, AbstractBeginNode.prevBegin(graphBuilderContext.lastInstr))); @@ -935,33 +1002,8 @@ public abstract class PEGraphDecoder extends SimplifyingGraphDecoder { inlineLoopScope.createdNodes[firstArgumentNodeId + i] = arguments[i]; } - // Copy assumptions from inlinee to caller - Assumptions assumptions = graph.getAssumptions(); - Assumptions inlinedAssumptions = graphToInline.getAssumptions(); - if (assumptions != null) { - if (inlinedAssumptions != null) { - assumptions.record(inlinedAssumptions); - } - } else { - assert inlinedAssumptions == null : String.format("cannot inline graph (%s) which makes assumptions into a graph (%s) that doesn't", inlineMethod, graph); - } - // Copy inlined methods from inlinee to caller - List inlinedMethods = graphToInline.getInlinedMethods(); - if (inlinedMethods != null) { - for (ResolvedJavaMethod other : inlinedMethods) { - graph.recordMethod(other); - } - } - - if (graphToInline.getFields() != null) { - for (ResolvedJavaField field : graphToInline.getFields()) { - graph.recordField(field); - } - } - if (graphToInline.hasUnsafeAccess()) { - graph.markUnsafeAccess(); - } + recordGraphElements(graphToInline); /* * Do the actual inlining by returning the initial loop scope for the inlined method scope. @@ -1020,10 +1062,25 @@ public abstract class PEGraphDecoder extends SimplifyingGraphDecoder { exceptionValue = InliningUtil.mergeValueProducers(unwindMergeNode, getMatchingNodes(returnAndUnwindNodes, returnNodeCount > 0, UnwindNode.class, unwindNodeCount), null, unwindNode -> unwindNode.exception()); unwindMergeNode.setNext(unwindReplacement); - ensureExceptionStateDecoded(inlineScope); unwindMergeNode.setStateAfter(inlineScope.exceptionState.duplicateModified(JavaKind.Object, JavaKind.Object, exceptionValue)); } + if (invoke instanceof InvokeWithExceptionNode) { + /* + * Exceptionobject nodes are begin nodes, i.e., they can be used as guards/anchors + * thus we need to ensure nodes decoded later have a correct guarding/anchoring node + * in place, i.e., the exception value must be a node that can be used like the + * original node as value, guard and anchor. + * + * The node unwindReplacement is a stub, its not yet processed thus we insert our + * artificial anchor before it. + */ + assert unwindReplacement != exceptionValue : "Unschedulable unwind replacement"; + FixedAnchorNode anchor = graph.add(new FixedAnchorNode(exceptionValue)); + graph.addBeforeFixed(unwindReplacement, anchor); + exceptionValue = anchor; + assert anchor.predecessor() != null; + } } assert invoke.next() == null; @@ -1059,6 +1116,8 @@ public abstract class PEGraphDecoder extends SimplifyingGraphDecoder { } deleteInvoke(invoke); + assert exceptionValue == null || exceptionValue instanceof FixedAnchorNode && exceptionValue.predecessor() != null; + for (InlineInvokePlugin plugin : inlineInvokePlugins) { plugin.notifyAfterInline(inlineMethod); } @@ -1153,20 +1212,6 @@ public abstract class PEGraphDecoder extends SimplifyingGraphDecoder { protected abstract EncodedGraph lookupEncodedGraph(ResolvedJavaMethod method, MethodSubstitutionPlugin plugin, BytecodeProvider intrinsicBytecodeProvider, boolean isSubstitution, boolean trackNodeSourcePosition); - @Override - protected void handleFixedNode(MethodScope s, LoopScope loopScope, int nodeOrderId, FixedNode node) { - PEMethodScope methodScope = (PEMethodScope) s; - - if (node instanceof ForeignCallNode) { - ForeignCallNode foreignCall = (ForeignCallNode) node; - if (foreignCall.getBci() == BytecodeFrame.UNKNOWN_BCI && methodScope.invokeData != null) { - foreignCall.setBci(methodScope.invokeData.invoke.bci()); - } - } - - super.handleFixedNode(methodScope, loopScope, nodeOrderId, node); - } - @SuppressWarnings("try") @Override protected Node canonicalizeFixedNode(MethodScope s, Node node) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ReplacementsImpl.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ReplacementsImpl.java index 4071f2121aa..1fb3e568770 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ReplacementsImpl.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ReplacementsImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -25,8 +25,8 @@ package org.graalvm.compiler.replacements; import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE; +import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE; import static org.graalvm.compiler.core.common.GraalOptions.UseSnippetGraphCache; -import static org.graalvm.compiler.debug.DebugContext.DEFAULT_LOG_STREAM; import static org.graalvm.compiler.debug.DebugOptions.DebugStubsAndSnippets; import static org.graalvm.compiler.java.BytecodeParserOptions.InlineDuringParsing; import static org.graalvm.compiler.java.BytecodeParserOptions.InlineIntrinsicsDuringParsing; @@ -36,8 +36,6 @@ import static org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext.Compi import static org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.ROOT_COMPILATION; import static org.graalvm.compiler.phases.common.DeadCodeEliminationPhase.Optionality.Required; -import java.util.Collections; -import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicInteger; @@ -56,6 +54,7 @@ import org.graalvm.compiler.core.common.CompilationIdentifier; import org.graalvm.compiler.core.common.GraalOptions; import org.graalvm.compiler.debug.DebugCloseable; import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.DebugContext.Builder; import org.graalvm.compiler.debug.DebugContext.Description; import org.graalvm.compiler.debug.DebugHandlersFactory; import org.graalvm.compiler.debug.GraalError; @@ -71,6 +70,7 @@ import org.graalvm.compiler.nodes.Cancellable; import org.graalvm.compiler.nodes.Invoke; import org.graalvm.compiler.nodes.StateSplit; import org.graalvm.compiler.nodes.StructuredGraph; +import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.graphbuilderconf.GeneratedInvocationPlugin; import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; @@ -83,6 +83,7 @@ import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; import org.graalvm.compiler.nodes.graphbuilderconf.MethodSubstitutionPlugin; import org.graalvm.compiler.nodes.java.MethodCallTargetNode; import org.graalvm.compiler.nodes.spi.Replacements; +import org.graalvm.compiler.nodes.spi.SnippetParameterInfo; import org.graalvm.compiler.options.OptionValues; import org.graalvm.compiler.phases.OptimisticOptimizations; import org.graalvm.compiler.phases.common.CanonicalizerPhase; @@ -136,11 +137,13 @@ public class ReplacementsImpl implements Replacements, InlineInvokePlugin { @Override public Class getIntrinsifyingPlugin(ResolvedJavaMethod method) { - if (method.getAnnotation(Node.NodeIntrinsic.class) != null || method.getAnnotation(Fold.class) != null) { - return GeneratedInvocationPlugin.class; - } - if (method.getAnnotation(Word.Operation.class) != null) { - return WordOperationPlugin.class; + if (!IS_IN_NATIVE_IMAGE) { + if (method.getAnnotation(Node.NodeIntrinsic.class) != null || method.getAnnotation(Fold.class) != null) { + return GeneratedInvocationPlugin.class; + } + if (method.getAnnotation(Word.Operation.class) != null) { + return WordOperationPlugin.class; + } } return null; } @@ -221,8 +224,7 @@ public class ReplacementsImpl implements Replacements, InlineInvokePlugin { if (DebugStubsAndSnippets.getValue(options)) { DebugContext outer = DebugContext.forCurrentThread(); Description description = new Description(method, idPrefix + nextDebugContextId.incrementAndGet()); - List factories = debugHandlersFactory == null ? Collections.emptyList() : Collections.singletonList(debugHandlersFactory); - return DebugContext.create(options, description, outer.getGlobalMetrics(), DEFAULT_LOG_STREAM, factories); + return new Builder(options, debugHandlersFactory).globalMetrics(outer.getGlobalMetrics()).description(description).build(); } return DebugContext.disabled(options); } @@ -256,6 +258,16 @@ public class ReplacementsImpl implements Replacements, InlineInvokePlugin { return graph; } + @Override + public SnippetParameterInfo getSnippetParameterInfo(ResolvedJavaMethod method) { + return new SnippetParameterInfo(method); + } + + @Override + public boolean isSnippet(ResolvedJavaMethod method) { + return method.getAnnotation(Snippet.class) != null; + } + @Override public void registerSnippet(ResolvedJavaMethod method, ResolvedJavaMethod original, Object receiver, boolean trackNodeSourcePosition, OptionValues options) { // No initialization needed as snippet graphs are created on demand in getSnippet @@ -263,7 +275,7 @@ public class ReplacementsImpl implements Replacements, InlineInvokePlugin { @Override public StructuredGraph getMethodSubstitution(MethodSubstitutionPlugin plugin, ResolvedJavaMethod original, IntrinsicContext.CompilationContext context, - StructuredGraph.AllowAssumptions allowAssumptions, Cancellable cancellable, OptionValues options) { + AllowAssumptions allowAssumptions, Cancellable cancellable, OptionValues options) { // Method substitutions are parsed by the BytecodeParser. return null; } @@ -298,7 +310,8 @@ public class ReplacementsImpl implements Replacements, InlineInvokePlugin { } @Override - public StructuredGraph getSubstitution(ResolvedJavaMethod method, int invokeBci, boolean trackNodeSourcePosition, NodeSourcePosition replaceePosition, OptionValues options) { + public StructuredGraph getSubstitution(ResolvedJavaMethod method, int invokeBci, boolean trackNodeSourcePosition, NodeSourcePosition replaceePosition, + AllowAssumptions allowAssumptions, OptionValues options) { StructuredGraph result; InvocationPlugin plugin = graphBuilderPlugins.getInvocationPlugins().lookupInvocation(method); if (plugin != null && (!plugin.inlineOnly() || invokeBci >= 0)) { @@ -323,7 +336,7 @@ public class ReplacementsImpl implements Replacements, InlineInvokePlugin { } else { Bytecode code = new ResolvedJavaMethodBytecode(method); try (DebugContext debug = openDebugContext("Substitution_", method, options)) { - result = new IntrinsicGraphBuilder(options, debug, providers, code, invokeBci).buildGraph(plugin); + result = new IntrinsicGraphBuilder(options, debug, providers, code, invokeBci, allowAssumptions).buildGraph(plugin); } } } else { @@ -334,14 +347,14 @@ public class ReplacementsImpl implements Replacements, InlineInvokePlugin { @SuppressWarnings("try") @Override - public StructuredGraph getIntrinsicGraph(ResolvedJavaMethod method, CompilationIdentifier compilationId, DebugContext debug, Cancellable cancellable) { + public StructuredGraph getIntrinsicGraph(ResolvedJavaMethod method, CompilationIdentifier compilationId, DebugContext debug, AllowAssumptions allowAssumptions, Cancellable cancellable) { MethodSubstitutionPlugin msPlugin = getMethodSubstitution(method); if (msPlugin != null) { ResolvedJavaMethod substMethod = msPlugin.getSubstitute(providers.getMetaAccess()); assert !substMethod.equals(method); BytecodeProvider bytecodeProvider = msPlugin.getBytecodeProvider(); // @formatter:off - StructuredGraph graph = new StructuredGraph.Builder(debug.getOptions(), debug, StructuredGraph.AllowAssumptions.YES). + StructuredGraph graph = new StructuredGraph.Builder(debug.getOptions(), debug, allowAssumptions). method(substMethod). compilationId(compilationId). recordInlinedMethods(bytecodeProvider.shouldRecordMethodDependencies()). @@ -504,6 +517,9 @@ public class ReplacementsImpl implements Replacements, InlineInvokePlugin { @Override public boolean isDeferredInvoke(StateSplit stateSplit) { + if (IS_IN_NATIVE_IMAGE) { + throw GraalError.shouldNotReachHere("unused in libgraal"); + } if (stateSplit instanceof Invoke) { Invoke invoke = (Invoke) stateSplit; ResolvedJavaMethod method = invoke.callTarget().targetMethod(); @@ -528,7 +544,7 @@ public class ReplacementsImpl implements Replacements, InlineInvokePlugin { // @formatter:off // Replacements cannot have optimistic assumptions since they have // to be valid for the entire run of the VM. - final StructuredGraph graph = new StructuredGraph.Builder(debug.getOptions(), debug). + final StructuredGraph graph = new StructuredGraph.Builder(debug.getOptions(), debug, AllowAssumptions.NO). method(methodToParse). trackNodeSourcePosition(trackNodeSourcePosition). callerContext(replaceePosition). @@ -550,8 +566,12 @@ public class ReplacementsImpl implements Replacements, InlineInvokePlugin { } IntrinsicContext initialIntrinsicContext = null; - Snippet snippetAnnotation = method.getAnnotation(Snippet.class); - MethodSubstitution methodAnnotation = method.getAnnotation(MethodSubstitution.class); + Snippet snippetAnnotation = null; + MethodSubstitution methodAnnotation = null; + if (!IS_IN_NATIVE_IMAGE) { + snippetAnnotation = method.getAnnotation(Snippet.class); + methodAnnotation = method.getAnnotation(MethodSubstitution.class); + } if (methodAnnotation == null && snippetAnnotation == null) { // Post-parse inlined intrinsic initialIntrinsicContext = new EncodedIntrinsicContext(substitutedMethod, method, bytecodeProvider, context, false); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ReplacementsUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ReplacementsUtil.java index 0af2c3987bc..274250725b5 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ReplacementsUtil.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ReplacementsUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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 @@ -24,14 +24,14 @@ package org.graalvm.compiler.replacements; -import jdk.vm.ci.meta.JavaKind; -import jdk.vm.ci.meta.MetaAccessProvider; - import org.graalvm.compiler.api.replacements.Fold; import org.graalvm.compiler.api.replacements.Fold.InjectedParameter; import org.graalvm.compiler.debug.Assertions; import org.graalvm.compiler.replacements.nodes.AssertionNode; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.MetaAccessProvider; + // JaCoCo Exclude public final class ReplacementsUtil { private ReplacementsUtil() { @@ -47,19 +47,13 @@ public final class ReplacementsUtil { */ public static void staticAssert(boolean condition, String message) { if (REPLACEMENTS_ASSERTIONS_ENABLED) { - AssertionNode.assertion(true, condition, message); + AssertionNode.staticAssert(condition, message); } } public static void staticAssert(boolean condition, String message, Object arg1) { if (REPLACEMENTS_ASSERTIONS_ENABLED) { - AssertionNode.assertion(true, condition, message, arg1, ""); - } - } - - public static void staticAssert(boolean condition, String message, Object arg1, Object arg2) { - if (REPLACEMENTS_ASSERTIONS_ENABLED) { - AssertionNode.assertion(true, condition, message, arg1, arg2); + AssertionNode.staticAssert(condition, message, arg1, ""); } } @@ -67,9 +61,9 @@ public final class ReplacementsUtil { * Asserts that condition evaluates to true at runtime. This is intended to be used within * snippets or stubs, and will lead to a VM error if it fails. */ - public static void runtimeAssert(boolean condition, String message) { + public static void dynamicAssert(boolean condition, String message) { if (REPLACEMENTS_ASSERTIONS_ENABLED) { - AssertionNode.assertion(false, condition, message); + AssertionNode.dynamicAssert(condition, message); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java index e17758b4c13..6fe5e7b5d56 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java @@ -26,7 +26,6 @@ package org.graalvm.compiler.replacements; import static java.util.FormattableFlags.ALTERNATE; import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE; -import static org.graalvm.compiler.debug.DebugContext.DEFAULT_LOG_STREAM; import static org.graalvm.compiler.debug.DebugContext.applyFormattingFlagsAndWidth; import static org.graalvm.compiler.debug.DebugOptions.DebugStubsAndSnippets; import static org.graalvm.compiler.graph.iterators.NodePredicates.isNotA; @@ -53,11 +52,11 @@ import java.util.function.Predicate; import jdk.internal.vm.compiler.collections.EconomicMap; import jdk.internal.vm.compiler.collections.EconomicSet; import jdk.internal.vm.compiler.collections.Equivalence; +import jdk.internal.vm.compiler.collections.MapCursor; import jdk.internal.vm.compiler.collections.UnmodifiableEconomicMap; import org.graalvm.compiler.api.replacements.Fold; import org.graalvm.compiler.api.replacements.Snippet; import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter; -import org.graalvm.compiler.api.replacements.Snippet.NonNullParameter; import org.graalvm.compiler.api.replacements.Snippet.VarargsParameter; import org.graalvm.compiler.api.replacements.SnippetReflectionProvider; import org.graalvm.compiler.core.common.GraalOptions; @@ -69,6 +68,7 @@ import org.graalvm.compiler.debug.Assertions; import org.graalvm.compiler.debug.CounterKey; import org.graalvm.compiler.debug.DebugCloseable; import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.DebugContext.Builder; import org.graalvm.compiler.debug.DebugContext.Description; import org.graalvm.compiler.debug.DebugHandlersFactory; import org.graalvm.compiler.debug.GraalError; @@ -77,6 +77,7 @@ import org.graalvm.compiler.graph.Graph.Mark; import org.graalvm.compiler.graph.Node; import org.graalvm.compiler.graph.Node.NodeIntrinsic; import org.graalvm.compiler.graph.NodeClass; +import org.graalvm.compiler.graph.NodeMap; import org.graalvm.compiler.graph.NodeSourcePosition; import org.graalvm.compiler.graph.Position; import org.graalvm.compiler.loop.LoopEx; @@ -86,14 +87,20 @@ import org.graalvm.compiler.nodeinfo.InputType; import org.graalvm.compiler.nodeinfo.NodeInfo; import org.graalvm.compiler.nodes.AbstractBeginNode; import org.graalvm.compiler.nodes.AbstractMergeNode; +import org.graalvm.compiler.nodes.BeginNode; import org.graalvm.compiler.nodes.ConstantNode; import org.graalvm.compiler.nodes.ControlSinkNode; +import org.graalvm.compiler.nodes.DeoptBciSupplier; import org.graalvm.compiler.nodes.DeoptimizingNode; +import org.graalvm.compiler.nodes.DeoptimizingNode.DeoptBefore; +import org.graalvm.compiler.nodes.EndNode; import org.graalvm.compiler.nodes.FixedNode; import org.graalvm.compiler.nodes.FixedWithNextNode; import org.graalvm.compiler.nodes.FrameState; import org.graalvm.compiler.nodes.InliningLog; +import org.graalvm.compiler.nodes.LogicNode; import org.graalvm.compiler.nodes.LoopBeginNode; +import org.graalvm.compiler.nodes.LoopExitNode; import org.graalvm.compiler.nodes.MergeNode; import org.graalvm.compiler.nodes.NodeView; import org.graalvm.compiler.nodes.ParameterNode; @@ -105,9 +112,17 @@ import org.graalvm.compiler.nodes.StartNode; import org.graalvm.compiler.nodes.StateSplit; import org.graalvm.compiler.nodes.StructuredGraph; import org.graalvm.compiler.nodes.StructuredGraph.GuardsStage; +import org.graalvm.compiler.nodes.UnreachableControlSinkNode; +import org.graalvm.compiler.nodes.UnwindNode; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.ValueNodeUtil; +import org.graalvm.compiler.nodes.ValuePhiNode; +import org.graalvm.compiler.nodes.VirtualState.NodePositionClosure; +import org.graalvm.compiler.nodes.WithExceptionNode; import org.graalvm.compiler.nodes.calc.FloatingNode; +import org.graalvm.compiler.nodes.extended.AbstractBoxingNode; +import org.graalvm.compiler.nodes.java.AbstractNewObjectNode; +import org.graalvm.compiler.nodes.java.ExceptionObjectNode; import org.graalvm.compiler.nodes.java.LoadIndexedNode; import org.graalvm.compiler.nodes.java.MethodCallTargetNode; import org.graalvm.compiler.nodes.java.StoreIndexedNode; @@ -123,21 +138,32 @@ import org.graalvm.compiler.nodes.spi.ArrayLengthProvider; import org.graalvm.compiler.nodes.spi.CoreProviders; import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.nodes.spi.MemoryEdgeProxy; +import org.graalvm.compiler.nodes.spi.SnippetParameterInfo; import org.graalvm.compiler.nodes.util.GraphUtil; import org.graalvm.compiler.options.Option; import org.graalvm.compiler.options.OptionKey; import org.graalvm.compiler.options.OptionValues; +import org.graalvm.compiler.phases.PhaseSuite; import org.graalvm.compiler.phases.common.CanonicalizerPhase; import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase; import org.graalvm.compiler.phases.common.FloatingReadPhase; import org.graalvm.compiler.phases.common.FloatingReadPhase.MemoryMapImpl; import org.graalvm.compiler.phases.common.GuardLoweringPhase; +import org.graalvm.compiler.phases.common.IncrementalCanonicalizerPhase; +import org.graalvm.compiler.phases.common.IterativeConditionalEliminationPhase; import org.graalvm.compiler.phases.common.LoweringPhase; import org.graalvm.compiler.phases.common.RemoveValueProxyPhase; +import org.graalvm.compiler.phases.common.SnippetFrameStateAssignment; +import org.graalvm.compiler.phases.common.SnippetFrameStateAssignment.NodeStateAssignment; +import org.graalvm.compiler.phases.common.SnippetFrameStateAssignment.SnippetFrameStateAssignmentClosure; +import org.graalvm.compiler.phases.common.WriteBarrierAdditionPhase; import org.graalvm.compiler.phases.common.inlining.InliningUtil; +import org.graalvm.compiler.phases.graph.ReentrantNodeIterator; +import org.graalvm.compiler.phases.schedule.SchedulePhase.SchedulingStrategy; import org.graalvm.compiler.phases.util.Providers; import org.graalvm.compiler.replacements.nodes.ExplodeLoopNode; import org.graalvm.compiler.replacements.nodes.LoadSnippetVarargParameterNode; +import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase; import org.graalvm.util.CollectionsUtil; import jdk.internal.vm.compiler.word.LocationIdentity; import jdk.internal.vm.compiler.word.WordBase; @@ -148,10 +174,8 @@ import jdk.vm.ci.meta.ConstantReflectionProvider; import jdk.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.Local; -import jdk.vm.ci.meta.LocalVariableTable; import jdk.vm.ci.meta.MetaAccessProvider; import jdk.vm.ci.meta.ResolvedJavaMethod; -import jdk.vm.ci.meta.ResolvedJavaMethod.Parameter; import jdk.vm.ci.meta.ResolvedJavaType; import jdk.vm.ci.meta.Signature; @@ -190,77 +214,6 @@ public class SnippetTemplate { return method.hasReceiver(); } - /** - * Lazily constructed parts of {@link SnippetInfo}. - */ - static class Lazy { - Lazy(ResolvedJavaMethod method) { - int count = method.getSignature().getParameterCount(hasReceiver(method)); - constantParameters = new boolean[count]; - varargsParameters = new boolean[count]; - nonNullParameters = new boolean[count]; - int offset = hasReceiver(method) ? 1 : 0; - for (int i = offset; i < count; i++) { - constantParameters[i] = method.getParameterAnnotation(ConstantParameter.class, i - offset) != null; - varargsParameters[i] = method.getParameterAnnotation(VarargsParameter.class, i - offset) != null; - nonNullParameters[i] = method.getParameterAnnotation(NonNullParameter.class, i - offset) != null; - - assert !constantParameters[i - offset] || !varargsParameters[i - offset] : "Parameter cannot be annotated with both @" + ConstantParameter.class.getSimpleName() + " and @" + - VarargsParameter.class.getSimpleName(); - } - if (method.hasReceiver()) { - // Receiver must be constant. - assert !constantParameters[0]; - constantParameters[0] = true; - } - - // Retrieve the names only when assertions are turned on. Parameter annotations are - // unsupported in the native image. - assert IS_IN_NATIVE_IMAGE || initNames(method, count); - } - - final boolean[] constantParameters; - final boolean[] varargsParameters; - final boolean[] nonNullParameters; - - /** - * The parameter names, taken from the local variables table. Only used for assertion - * checking, so use only within an assert statement. - */ - String[] names; - - private boolean initNames(ResolvedJavaMethod method, int parameterCount) { - names = new String[parameterCount]; - int offset = 0; - if (method.hasReceiver()) { - names[0] = "this"; - offset = 1; - } - Parameter[] params = method.getParameters(); - if (params != null) { - for (int i = offset; i < names.length; i++) { - if (params[i - offset].isNamePresent()) { - names[i] = params[i - offset].getName(); - } - } - } else { - int slotIdx = 0; - LocalVariableTable localVariableTable = method.getLocalVariableTable(); - if (localVariableTable != null) { - for (int i = 0; i < names.length; i++) { - Local local = localVariableTable.getLocal(slotIdx, 0); - if (local != null) { - names[i] = local.getName(); - } - JavaKind kind = method.getSignature().getParameterKind(i); - slotIdx += kind.getSlotCount(); - } - } - } - return true; - } - } - /** * Times instantiations of all templates derived from this snippet. */ @@ -271,7 +224,7 @@ public class SnippetTemplate { */ private final CounterKey instantiationCounter; - protected abstract Lazy lazy(); + protected abstract SnippetParameterInfo info(); protected SnippetInfo(ResolvedJavaMethod method, ResolvedJavaMethod original, LocationIdentity[] privateLocations, Object receiver) { this.method = method; @@ -287,27 +240,23 @@ public class SnippetTemplate { } public int getParameterCount() { - return lazy().constantParameters.length; + return info().getParameterCount(); } public boolean isConstantParameter(int paramIdx) { - return lazy().constantParameters[paramIdx]; + return info().isConstantParameter(paramIdx); } public boolean isVarargsParameter(int paramIdx) { - return lazy().varargsParameters[paramIdx]; + return info().isVarargsParameter(paramIdx); } public boolean isNonNullParameter(int paramIdx) { - return lazy().nonNullParameters[paramIdx]; + return info().isNonNullParameter(paramIdx); } public String getParameterName(int paramIdx) { - String[] names = lazy().names; - if (names != null) { - return names[paramIdx]; - } - return null; + return info().getParameterName(paramIdx); } @Override @@ -317,32 +266,32 @@ public class SnippetTemplate { } protected static class LazySnippetInfo extends SnippetInfo { - protected final AtomicReference lazy = new AtomicReference<>(null); + protected final AtomicReference lazy = new AtomicReference<>(null); protected LazySnippetInfo(ResolvedJavaMethod method, ResolvedJavaMethod original, LocationIdentity[] privateLocations, Object receiver) { super(method, original, privateLocations, receiver); } @Override - protected Lazy lazy() { + protected SnippetParameterInfo info() { if (lazy.get() == null) { - lazy.compareAndSet(null, new Lazy(method)); + lazy.compareAndSet(null, new SnippetParameterInfo(method)); } return lazy.get(); } } protected static class EagerSnippetInfo extends SnippetInfo { - protected final Lazy lazy; + protected final SnippetParameterInfo snippetParameterInfo; - protected EagerSnippetInfo(ResolvedJavaMethod method, ResolvedJavaMethod original, LocationIdentity[] privateLocations, Object receiver) { + protected EagerSnippetInfo(ResolvedJavaMethod method, ResolvedJavaMethod original, LocationIdentity[] privateLocations, Object receiver, SnippetParameterInfo snippetParameterInfo) { super(method, original, privateLocations, receiver); - lazy = new Lazy(method); + this.snippetParameterInfo = snippetParameterInfo; } @Override - protected Lazy lazy() { - return lazy; + protected SnippetParameterInfo info() { + return snippetParameterInfo; } } @@ -675,15 +624,16 @@ public class SnippetTemplate { * {@link Snippet} and returns a {@link SnippetInfo} value describing it. There must be * exactly one snippet method in {@code declaringClass} with a given name. */ - protected SnippetInfo snippet(Class declaringClass, String methodName, ResolvedJavaMethod original, Object receiver, LocationIdentity... initialPrivateLocations) { + protected SnippetInfo snippet(Class declaringClass, String methodName, ResolvedJavaMethod original, Object receiver, + LocationIdentity... initialPrivateLocations) { assert methodName != null; ResolvedJavaMethod javaMethod = findMethod(providers.getMetaAccess(), declaringClass, methodName); assert javaMethod != null : "did not find @" + Snippet.class.getSimpleName() + " method in " + declaringClass + " named " + methodName; - assert javaMethod.getAnnotation(Snippet.class) != null : javaMethod + " must be annotated with @" + Snippet.class.getSimpleName(); providers.getReplacements().registerSnippet(javaMethod, original, receiver, GraalOptions.TrackNodeSourcePosition.getValue(options), options); LocationIdentity[] privateLocations = GraalOptions.SnippetCounters.getValue(options) ? SnippetCounterNode.addSnippetCounters(initialPrivateLocations) : initialPrivateLocations; - if (GraalOptions.EagerSnippets.getValue(options)) { - return new EagerSnippetInfo(javaMethod, original, privateLocations, receiver); + if (IS_IN_NATIVE_IMAGE || GraalOptions.EagerSnippets.getValue(options)) { + SnippetParameterInfo snippetParameterInfo = providers.getReplacements().getSnippetParameterInfo(javaMethod); + return new EagerSnippetInfo(javaMethod, original, privateLocations, receiver, snippetParameterInfo); } else { return new LazySnippetInfo(javaMethod, original, privateLocations, receiver); } @@ -694,7 +644,7 @@ public class SnippetTemplate { private DebugContext openDebugContext(DebugContext outer, Arguments args) { if (DebugStubsAndSnippets.getValue(options)) { Description description = new Description(args.cacheKey.method, "SnippetTemplate_" + nextSnippetTemplateId.incrementAndGet()); - return DebugContext.create(options, description, outer.getGlobalMetrics(), DEFAULT_LOG_STREAM, factories); + return new Builder(options, factories).globalMetrics(outer.getGlobalMetrics()).description(description).build(); } return DebugContext.disabled(options); } @@ -712,7 +662,7 @@ public class SnippetTemplate { try (DebugCloseable a = SnippetTemplateCreationTime.start(debug); DebugContext.Scope s = debug.scope("SnippetSpecialization", args.info.method)) { SnippetTemplates.increment(debug); OptionValues snippetOptions = new OptionValues(options, GraalOptions.TraceInlining, GraalOptions.TraceInliningForStubsAndSnippets.getValue(options)); - template = new SnippetTemplate(snippetOptions, debug, providers, snippetReflection, args, graph.trackNodeSourcePosition(), replacee); + template = new SnippetTemplate(snippetOptions, debug, providers, snippetReflection, args, graph.trackNodeSourcePosition(), replacee, createMidTierPhases()); if (Options.UseSnippetTemplateCache.getValue(snippetOptions) && args.cacheable) { templates.put(args.cacheKey, template); } @@ -723,6 +673,15 @@ public class SnippetTemplate { } return template; } + + /** + * Additional mid-tier optimization phases to run on the snippet graph during + * {@link #template} creation. These phases are only run for snippets lowered in the + * low-tier lowering. + */ + protected PhaseSuite createMidTierPhases() { + return null; + } } private static final class LRUCache extends LinkedHashMap { @@ -763,7 +722,7 @@ public class SnippetTemplate { */ @SuppressWarnings("try") protected SnippetTemplate(OptionValues options, DebugContext debug, final Providers providers, SnippetReflectionProvider snippetReflection, Arguments args, boolean trackNodeSourcePosition, - Node replacee) { + Node replacee, PhaseSuite midTierPhases) { this.snippetReflection = snippetReflection; this.info = args.info; @@ -778,11 +737,13 @@ public class SnippetTemplate { // Copy snippet graph, replacing constant parameters with given arguments final StructuredGraph snippetCopy = new StructuredGraph.Builder(options, debug).name(snippetGraph.name).method(snippetGraph.method()).trackNodeSourcePosition( snippetGraph.trackNodeSourcePosition()).setIsSubstitution(true).build(); + snippetCopy.setGuardsStage(snippetGraph.getGuardsStage()); assert !GraalOptions.TrackNodeSourcePosition.getValue(options) || snippetCopy.trackNodeSourcePosition(); try (DebugContext.Scope scope = debug.scope("SpecializeSnippet", snippetCopy)) { if (!snippetGraph.isUnsafeAccessTrackingEnabled()) { snippetCopy.disableUnsafeAccessTracking(); } + assert snippetCopy.isSubstitution(); EconomicMap nodeReplacements = EconomicMap.create(Equivalence.IDENTITY); nodeReplacements.put(snippetGraph.start(), snippetCopy.start()); @@ -885,22 +846,129 @@ public class SnippetTemplate { explodeLoops(snippetCopy, providers); - GuardsStage guardsStage = args.cacheKey.guardsStage; - // Perform lowering on the snippet - if (!guardsStage.allowsFloatingGuards()) { - new GuardLoweringPhase().apply(snippetCopy, null); + List unwindNodes = snippetCopy.getNodes().filter(UnwindNode.class).snapshot(); + if (unwindNodes.size() == 0) { + unwindPath = null; + } else if (unwindNodes.size() > 1) { + throw GraalError.shouldNotReachHere("Graph has more than one UnwindNode"); + } else { + UnwindNode unwindNode = unwindNodes.get(0); + GraalError.guarantee(unwindNode.predecessor() instanceof ExceptionObjectNode, "Currently only a single direct exception unwind path is supported in snippets"); + ExceptionObjectNode exceptionObjectNode = (ExceptionObjectNode) unwindNode.predecessor(); + + /* + * Replace the path to the UnwindNode with a stub to avoid any optimizations or + * lowerings to modify it. Also removes the FrameState of the ExceptionObjectNode. + */ + unwindPath = snippetCopy.add(new BeginNode()); + exceptionObjectNode.replaceAtPredecessor(unwindPath); + GraphUtil.killCFG(exceptionObjectNode); + unwindPath.setNext(snippetCopy.add(new UnreachableControlSinkNode())); } - snippetCopy.setGuardsStage(guardsStage); - try (DebugContext.Scope s = debug.scope("LoweringSnippetTemplate", snippetCopy)) { - new LoweringPhase(CanonicalizerPhase.create(), args.cacheKey.loweringStage).apply(snippetCopy, providers); + + CanonicalizerPhase canonicalizer; + if (GraalOptions.ImmutableCode.getValue(snippetCopy.getOptions())) { + canonicalizer = CanonicalizerPhase.createWithoutReadCanonicalization(); + } else { + canonicalizer = CanonicalizerPhase.create(); + } + + /*- + * Mirror the behavior of normal compilations here (without aggressive optimizations + * but with the most important phases) + * + * (1) Run some important high-tier optimizations + * (2) Perform high-tier lowering + * (3) If lowering stage is != high tier --> Run important mid tier phases --> guard lowering + * (4) perform mid-tier lowering + * (5) If lowering stage is != mid tier --> Run important mid tier phases after lowering --> write barrier addition + * (6) perform low-tier lowering + * (7) Run final phases --> dead code elimination + * + */ + // (1) + GuardsStage guardsStage = args.cacheKey.guardsStage; + boolean needsPEA = false; + boolean needsCE = false; + LoweringTool.LoweringStage loweringStage = args.cacheKey.loweringStage; + for (Node n : snippetCopy.getNodes()) { + if (n instanceof AbstractNewObjectNode || n instanceof AbstractBoxingNode) { + needsPEA = true; + break; + } else if (n instanceof LogicNode) { + needsCE = true; + } + } + if (needsPEA) { + /* + * Certain snippets do not have real side-effects if they do allocations, i.e., they + * only access the init_location, therefore we might require a late schedule to get + * that. However, snippets are small so the compile time cost for this can be + * ignored. + * + * An example of a snippet doing allocation are the boxing snippets since they only + * write to newly allocated memory which is not yet visible to the interpreter until + * the entire allocation escapes. See LocationIdentity#INIT_LOCATION and + * WriteNode#hasSideEffect for details. + */ + new PartialEscapePhase(true, true, canonicalizer, null, options, SchedulingStrategy.LATEST).apply(snippetCopy, providers); + } + if (needsCE) { + new IterativeConditionalEliminationPhase(canonicalizer, false).apply(snippetCopy, providers); + } + // (2) + try (DebugContext.Scope s = debug.scope("LoweringSnippetTemplate_HIGH_TIER", snippetCopy)) { + new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.HIGH_TIER).apply(snippetCopy, providers); } catch (Throwable e) { throw debug.handle(e); } + if (loweringStage != LoweringTool.StandardLoweringStage.HIGH_TIER) { + // (3) + assert !guardsStage.allowsFloatingGuards() : guardsStage; + // only create memory map nodes if we need the memory graph + new IncrementalCanonicalizerPhase<>(canonicalizer, new FloatingReadPhase(true, true)).apply(snippetCopy, providers); + new GuardLoweringPhase().apply(snippetCopy, providers); + new IncrementalCanonicalizerPhase<>(canonicalizer, new RemoveValueProxyPhase()).apply(snippetCopy, providers); + // (4) + try (DebugContext.Scope s = debug.scope("LoweringSnippetTemplate_MID_TIER", snippetCopy)) { + new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.MID_TIER).apply(snippetCopy, providers); + snippetCopy.setGuardsStage(GuardsStage.AFTER_FSA); + snippetCopy.disableFrameStateVerification(); + } catch (Throwable e) { + throw debug.handle(e); + } + if (loweringStage != LoweringTool.StandardLoweringStage.MID_TIER) { + // (5) + if (midTierPhases != null) { + midTierPhases.apply(snippetCopy, providers); + } + new WriteBarrierAdditionPhase().apply(snippetCopy, providers); + try (DebugContext.Scope s = debug.scope("LoweringSnippetTemplate_LOW_TIER", snippetCopy)) { + // (6) + new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.LOW_TIER).apply(snippetCopy, providers); + } catch (Throwable e) { + throw debug.handle(e); + } + // (7) + new DeadCodeEliminationPhase(Required).apply(snippetCopy); + } + } + assert checkAllVarargPlaceholdersAreDeleted(parameterCount, placeholders); ArrayList curSideEffectNodes = new ArrayList<>(); ArrayList curDeoptNodes = new ArrayList<>(); ArrayList curPlaceholderStampedNodes = new ArrayList<>(); + + boolean containsMerge = false; + boolean containsLoopExit = false; + for (Node node : snippetCopy.getNodes()) { + if (node instanceof AbstractMergeNode) { + containsMerge = true; + } + if (node instanceof LoopExitNode) { + containsLoopExit = true; + } if (node instanceof ValueNode) { ValueNode valueNode = (ValueNode) node; if (valueNode.stamp(NodeView.DEFAULT) == PlaceholderStamp.singleton()) { @@ -925,30 +993,17 @@ public class SnippetTemplate { } } } - - new DeadCodeEliminationPhase(Required).apply(snippetCopy); - - assert checkAllVarargPlaceholdersAreDeleted(parameterCount, placeholders); - - if (((StructuredGraph) replacee.graph()).isAfterFloatingReadPhase()) { - new FloatingReadPhase(true, true).apply(snippetCopy); - } - - if (!guardsStage.requiresValueProxies()) { - new RemoveValueProxyPhase().apply(snippetCopy); - } - - MemoryAnchorNode anchor = snippetCopy.add(new MemoryAnchorNode(info.privateLocations)); - snippetCopy.start().replaceAtUsages(InputType.Memory, anchor); - this.snippet = snippetCopy; - StartNode entryPointNode = snippet.start(); + MemoryAnchorNode anchor = snippetCopy.add(new MemoryAnchorNode(info.privateLocations)); + snippetCopy.start().replaceAtUsages(anchor, InputType.Memory); + debug.dump(DebugContext.VERY_DETAILED_LEVEL, snippetCopy, "After adding memory anchor %s", anchor); if (anchor.hasNoUsages()) { anchor.safeDelete(); this.memoryAnchor = null; } else { - // Find out if all the return memory maps point to the anchor (i.e., there's no kill + // Find out if all the return memory maps point to the anchor (i.e., there's no + // kill // anywhere) boolean needsMemoryMaps = false; for (ReturnNode retNode : snippet.getNodes(ReturnNode.TYPE)) { @@ -987,7 +1042,6 @@ public class SnippetTemplate { } } debug.dump(DebugContext.INFO_LEVEL, snippet, "SnippetTemplate after fixing memory anchoring"); - List returnNodes = snippet.getNodes(ReturnNode.TYPE).snapshot(); if (returnNodes.isEmpty()) { this.returnNode = null; @@ -1002,7 +1056,7 @@ public class SnippetTemplate { memMaps.add(memoryMapNode); } } - + containsMerge = true; ValueNode returnValue = InliningUtil.mergeReturns(merge, returnNodes); this.returnNode = snippet.add(new ReturnNode(returnValue)); if (!memMaps.isEmpty()) { @@ -1018,6 +1072,17 @@ public class SnippetTemplate { } merge.setNext(this.returnNode); } + debug.dump(DebugContext.INFO_LEVEL, snippet, "After fixing returns"); + + boolean needsMergeStateMap = !guardsStage.areFrameStatesAtDeopts() && (containsMerge || containsLoopExit); + + if (needsMergeStateMap) { + frameStateAssignment = new SnippetFrameStateAssignmentClosure(snippetCopy); + ReentrantNodeIterator.apply(frameStateAssignment, snippetCopy.start(), SnippetFrameStateAssignment.NodeStateAssignment.BEFORE_BCI); + assert frameStateAssignment.verify() : info; + } else { + frameStateAssignment = null; + } assert verifyIntrinsicsProcessed(snippetCopy); @@ -1044,6 +1109,9 @@ public class SnippetTemplate { } private static boolean verifyIntrinsicsProcessed(StructuredGraph snippetCopy) { + if (IS_IN_NATIVE_IMAGE) { + return true; + } for (MethodCallTargetNode target : snippetCopy.getNodes(MethodCallTargetNode.TYPE)) { ResolvedJavaMethod targetMethod = target.targetMethod(); if (targetMethod != null) { @@ -1143,6 +1211,12 @@ public class SnippetTemplate { */ private final ReturnNode returnNode; + /** + * The node that will be replaced with the exception handler of the replacee node, or null if + * the snippet does not have an exception handler path. + */ + private final FixedWithNextNode unwindPath; + /** * The memory anchor (if any) of the snippet. */ @@ -1160,6 +1234,13 @@ public class SnippetTemplate { */ private final ArrayList deoptNodes; + /** + * Mapping of merge and loop exit nodes to frame state info determining if a merge/loop exit + * node is required to have a framestate after the lowering, and if so which state + * (before,after). + */ + private SnippetFrameStateAssignment.SnippetFrameStateAssignmentClosure frameStateAssignment; + /** * Nodes that have a stamp originating from a {@link Placeholder}. */ @@ -1292,7 +1373,6 @@ public class SnippetTemplate { // check if some node in snippet graph also kills the same location LocationIdentity locationIdentity = ((SingleMemoryKill) replacee).getKilledLocationIdentity(); if (locationIdentity.isAny()) { - assert !(memoryMap.getLastLocationAccess(any()) instanceof MemoryAnchorNode) : replacee + " kills ANY_LOCATION, but snippet does not"; // if the replacee kills ANY_LOCATION, the snippet can kill arbitrary locations return true; } @@ -1488,6 +1568,7 @@ public class SnippetTemplate { try (DebugCloseable a = args.info.instantiationTimer.start(debug)) { args.info.instantiationCounter.increment(debug); // Inline the snippet nodes, replacing parameters with the given args in the process + final FixedNode replaceeGraphPredecessor = (FixedNode) replacee.predecessor(); StartNode entryPointNode = snippet.start(); FixedNode firstCFGNode = entryPointNode.next(); StructuredGraph replaceeGraph = replacee.graph(); @@ -1499,7 +1580,23 @@ public class SnippetTemplate { FixedNode firstCFGNodeDuplicate = (FixedNode) duplicates.get(firstCFGNode); replacee.replaceAtPredecessor(firstCFGNodeDuplicate); - rewireFrameStates(replacee, duplicates); + if (replacee.graph().getGuardsStage().areFrameStatesAtSideEffects()) { + boolean replaceeHasSideEffect = replacee instanceof StateSplit && ((StateSplit) replacee).hasSideEffect(); + boolean replacementHasSideEffect = !sideEffectNodes.isEmpty(); + + /* + * Following cases are allowed: Either the replacee and replacement don't have + * side-effects or the replacee has and the replacement hasn't (lowered to something + * without a side-effect which is fine regarding correctness) or both have + * side-effects, under which conditions also merges should have states. + */ + + if (replacementHasSideEffect) { + GraalError.guarantee(replaceeHasSideEffect, "Lowering node %s without side-effect to snippet %s with sideeffects=%s", replacee, info, this.sideEffectNodes); + } + } + + rewireFrameStates(replacee, duplicates, replaceeGraphPredecessor); updateStamps(replacee, duplicates); @@ -1522,10 +1619,28 @@ public class SnippetTemplate { FixedWithNextNode fwn = (FixedWithNextNode) replacee; next = fwn.next(); fwn.setNext(null); + } else if (replacee instanceof WithExceptionNode) { + WithExceptionNode withExceptionNode = (WithExceptionNode) replacee; + next = withExceptionNode.next(); + withExceptionNode.setNext(null); } returnDuplicate.replaceAndDelete(next); } } + if (unwindPath != null) { + GraalError.guarantee(!replacee.graph().isAfterFloatingReadPhase(), "Using a snippet with an UnwindNode after floating reads would require support for the memory graph"); + GraalError.guarantee(replacee instanceof WithExceptionNode, "Snippet has an UnwindNode, but replacee is not a node with an exception handler"); + + FixedWithNextNode unwindPathDuplicate = (FixedWithNextNode) duplicates.get(unwindPath); + WithExceptionNode withExceptionNode = (WithExceptionNode) replacee; + AbstractBeginNode exceptionEdge = withExceptionNode.exceptionEdge(); + withExceptionNode.setExceptionEdge(null); + unwindPathDuplicate.replaceAtPredecessor(exceptionEdge); + GraphUtil.killCFG(unwindPathDuplicate); + + } else { + GraalError.guarantee(!(replacee instanceof WithExceptionNode), "Snippet does not have an UnwindNode, but replacee is a node with an exception handler"); + } if (killReplacee) { // Remove the replacee from its graph @@ -1624,12 +1739,17 @@ public class SnippetTemplate { FixedNode firstCFGNodeDuplicate = (FixedNode) duplicates.get(firstCFGNode); replaceeGraph.addAfterFixed(lastFixedNode, firstCFGNodeDuplicate); - // floating nodes are not state-splits not need to re-wire frame states + /* + * floating nodes that are not state-splits do not need to re-wire frame states, however + * snippets might contain merges for which we want proper frame states + */ assert !(replacee instanceof StateSplit); updateStamps(replacee, duplicates); rewireMemoryGraph(replacee, duplicates); + rewireFrameStates(replacee, duplicates, lastFixedNode); + // Replace all usages of the replacee with the value returned by the snippet ReturnNode returnDuplicate = (ReturnNode) duplicates.get(returnNode); ValueNode returnValue = returnDuplicate.result(); @@ -1694,66 +1814,216 @@ public class SnippetTemplate { } } - protected void rewireFrameStates(ValueNode replacee, UnmodifiableEconomicMap duplicates) { - if (replacee.graph().getGuardsStage().areFrameStatesAtSideEffects() && replacee instanceof StateSplit) { + protected void rewireFrameStates(ValueNode replacee, UnmodifiableEconomicMap duplicates, FixedNode replaceeGraphCFGPredecessor) { + if (replacee.graph().getGuardsStage().areFrameStatesAtSideEffects() && requiresFrameStateProcessingBeforeFSA(replacee)) { + rewireFrameStatesBeforeFSA(replacee, duplicates, replaceeGraphCFGPredecessor); + } else if (replacee.graph().getGuardsStage().areFrameStatesAtDeopts() && replacee instanceof DeoptimizingNode) { + rewireFrameStatesAfterFSA(replacee, duplicates); + } + } + + private boolean requiresFrameStateProcessingBeforeFSA(ValueNode replacee) { + return replacee instanceof StateSplit || frameStateAssignment != null; + } + + private void rewireFrameStatesBeforeFSA(ValueNode replacee, UnmodifiableEconomicMap duplicates, FixedNode replaceeGraphCFGPredecessor) { + if (replacee instanceof StateSplit && ((StateSplit) replacee).hasSideEffect() && ((StateSplit) replacee).stateAfter() != null) { + /* + * We have a side-effecting node that is lowered to a snippet that also contains + * side-effecting nodes. Either of 2 cases applies: either there is a frame state merge + * assignment meaning there are merges in the snippet that require states, then those + * will be assigned based on a reverse post order iteration of the snippet examining + * effects and trying to find a proper state, or no merges are in the graph, i.e., there + * is no complex control flow so every side-effecting node in the snippet can have the + * state after of the original node with the correct values replaced (i.e. the replacee + * itself in the snippet) + */ for (StateSplit sideEffectNode : sideEffectNodes) { assert ((StateSplit) replacee).hasSideEffect(); Node sideEffectDup = duplicates.get(sideEffectNode.asNode()); - ((StateSplit) sideEffectDup).setStateAfter(((StateSplit) replacee).stateAfter()); - } - } else if (replacee.graph().getGuardsStage().areFrameStatesAtDeopts() && replacee instanceof DeoptimizingNode) { - DeoptimizingNode replaceeDeopt = (DeoptimizingNode) replacee; + assert sideEffectDup != null : sideEffectNode; + FrameState stateAfter = ((StateSplit) replacee).stateAfter(); + assert stateAfter != null : "Replacee " + replacee + " has no state after"; - FrameState stateBefore = null; - FrameState stateDuring = null; - FrameState stateAfter = null; - if (replaceeDeopt.canDeoptimize()) { - if (replaceeDeopt instanceof DeoptimizingNode.DeoptBefore) { - stateBefore = ((DeoptimizingNode.DeoptBefore) replaceeDeopt).stateBefore(); - } - if (replaceeDeopt instanceof DeoptimizingNode.DeoptDuring) { - stateDuring = ((DeoptimizingNode.DeoptDuring) replaceeDeopt).stateDuring(); - } - if (replaceeDeopt instanceof DeoptimizingNode.DeoptAfter) { - stateAfter = ((DeoptimizingNode.DeoptAfter) replaceeDeopt).stateAfter(); - } - } - - for (DeoptimizingNode deoptNode : deoptNodes) { - DeoptimizingNode deoptDup = (DeoptimizingNode) duplicates.get(deoptNode.asNode()); - if (deoptDup.canDeoptimize()) { - if (deoptDup instanceof DeoptimizingNode.DeoptBefore) { - ((DeoptimizingNode.DeoptBefore) deoptDup).setStateBefore(stateBefore); + if (sideEffectDup instanceof DeoptBciSupplier) { + if (replacee instanceof DeoptBciSupplier) { + ((DeoptBciSupplier) sideEffectDup).setBci(((DeoptBciSupplier) replacee).bci()); } - if (deoptDup instanceof DeoptimizingNode.DeoptDuring) { - // compute a state "during" for a DeoptDuring inside the snippet depending - // on what kind of states we had on the node we are replacing. - // If the original node had a state "during" already, we just use that, - // otherwise we need to find a strategy to compute a state during based on - // some other state (before or after). - DeoptimizingNode.DeoptDuring deoptDupDuring = (DeoptimizingNode.DeoptDuring) deoptDup; - if (stateDuring != null) { - deoptDupDuring.setStateDuring(stateDuring); - } else if (stateAfter != null) { - deoptDupDuring.computeStateDuring(stateAfter); - } else if (stateBefore != null) { - assert !deoptDupDuring.hasSideEffect() : "can't use stateBefore as stateDuring for state split " + deoptDupDuring; - deoptDupDuring.setStateDuring(stateBefore); + } + if (stateAfter.values().contains(replacee)) { + FrameState duplicated = stateAfter.duplicate(); + ValueNode valueInReplacement = (ValueNode) duplicates.get(returnNode.result()); + if (valueInReplacement instanceof ValuePhiNode) { + valueInReplacement = (ValueNode) sideEffectDup; + } + ValueNode replacement = valueInReplacement; + duplicated.applyToNonVirtual(new NodePositionClosure() { + @Override + public void apply(Node from, Position p) { + if (p.get(from) == replacee) { + p.set(from, replacement); + } } - } - if (deoptDup instanceof DeoptimizingNode.DeoptAfter) { - DeoptimizingNode.DeoptAfter deoptDupAfter = (DeoptimizingNode.DeoptAfter) deoptDup; - if (stateAfter != null) { - deoptDupAfter.setStateAfter(stateAfter); - } else { - assert !deoptDupAfter.hasSideEffect() : "can't use stateBefore as stateAfter for state split " + deoptDupAfter; - deoptDupAfter.setStateAfter(stateBefore); - } - - } + }); + ((StateSplit) sideEffectDup).setStateAfter(duplicated); + } else { + ((StateSplit) sideEffectDup).setStateAfter(((StateSplit) replacee).stateAfter()); } } } + if (frameStateAssignment != null) { + assignNecessaryFrameStates(replacee, duplicates, replaceeGraphCFGPredecessor); + } + } + + private void assignNecessaryFrameStates(ValueNode replacee, UnmodifiableEconomicMap duplicates, FixedNode replaceeGraphCFGPredecessor) { + FrameState stateAfter = null; + if (replacee instanceof StateSplit && ((StateSplit) replacee).hasSideEffect()) { + stateAfter = ((StateSplit) replacee).stateAfter(); + assert stateAfter != null : "Statesplit with side-effect needs a framestate " + replacee; + } else { + /* + * We dont have a state split as a replacee, thus we take the prev state as the state + * after for the node in the snippet. + */ + stateAfter = findLastFrameState(replaceeGraphCFGPredecessor); + } + NodeMap assignedStateMappings = frameStateAssignment.getStateMapping(); + MapCursor stateAssignments = assignedStateMappings.getEntries(); + while (stateAssignments.advance()) { + Node nodeRequiringState = stateAssignments.getKey(); + NodeStateAssignment assignment = stateAssignments.getValue(); + switch (assignment) { + case AFTER_BCI: + FrameState newState = stateAfter.duplicate(); + if (stateAfter.values().contains(replacee)) { + ValueNode valueInReplacement = (ValueNode) duplicates.get(returnNode.result()); + newState.applyToNonVirtual(new NodePositionClosure() { + @Override + public void apply(Node from, Position p) { + if (p.get(from) == replacee) { + p.set(from, valueInReplacement); + } + } + }); + } + ((StateSplit) duplicates.get(nodeRequiringState)).setStateAfter(newState); + break; + case BEFORE_BCI: + FrameState stateBeforeSnippet = findLastFrameState(replaceeGraphCFGPredecessor); + ((StateSplit) duplicates.get(nodeRequiringState)).setStateAfter(stateBeforeSnippet.duplicate()); + break; + case INVALID: + /* + * We cannot assign a proper frame state for this snippet's node since there are + * effects which cannot be represented by a single state at the node + */ + throw GraalError.shouldNotReachHere("Invalid snippet replacing a node before frame state assignment with node " + nodeRequiringState + " for replacee " + replacee); + default: + throw GraalError.shouldNotReachHere("Unknown StateAssigment:" + assignment); + } + replacee.graph().getDebug().dump(DebugContext.VERY_DETAILED_LEVEL, + replacee.graph(), "After duplicating after state for node %s in snippet", duplicates.get(nodeRequiringState)); + } + } + + private void rewireFrameStatesAfterFSA(ValueNode replacee, UnmodifiableEconomicMap duplicates) { + DeoptimizingNode replaceeDeopt = (DeoptimizingNode) replacee; + FrameState stateBefore = null; + FrameState stateDuring = null; + FrameState stateAfter = null; + if (replaceeDeopt.canDeoptimize()) { + if (replaceeDeopt instanceof DeoptimizingNode.DeoptBefore) { + stateBefore = ((DeoptimizingNode.DeoptBefore) replaceeDeopt).stateBefore(); + } + if (replaceeDeopt instanceof DeoptimizingNode.DeoptDuring) { + stateDuring = ((DeoptimizingNode.DeoptDuring) replaceeDeopt).stateDuring(); + } + if (replaceeDeopt instanceof DeoptimizingNode.DeoptAfter) { + stateAfter = ((DeoptimizingNode.DeoptAfter) replaceeDeopt).stateAfter(); + } + } + + for (DeoptimizingNode deoptNode : deoptNodes) { + DeoptimizingNode deoptDup = (DeoptimizingNode) duplicates.get(deoptNode.asNode()); + if (deoptDup.canDeoptimize()) { + if (deoptDup instanceof DeoptimizingNode.DeoptBefore) { + ((DeoptimizingNode.DeoptBefore) deoptDup).setStateBefore(stateBefore); + } + if (deoptDup instanceof DeoptimizingNode.DeoptDuring) { + // compute a state "during" for a DeoptDuring inside the snippet depending + // on what kind of states we had on the node we are replacing. + // If the original node had a state "during" already, we just use that, + // otherwise we need to find a strategy to compute a state during based on + // some other state (before or after). + DeoptimizingNode.DeoptDuring deoptDupDuring = (DeoptimizingNode.DeoptDuring) deoptDup; + if (stateDuring != null) { + deoptDupDuring.setStateDuring(stateDuring); + } else if (stateAfter != null) { + deoptDupDuring.computeStateDuring(stateAfter); + } else if (stateBefore != null) { + assert ((DeoptBefore) replaceeDeopt).canUseAsStateDuring() || !deoptDupDuring.hasSideEffect() : "can't use stateBefore as stateDuring for state split " + deoptDupDuring; + deoptDupDuring.setStateDuring(stateBefore); + } + } + if (deoptDup instanceof DeoptimizingNode.DeoptAfter) { + DeoptimizingNode.DeoptAfter deoptDupAfter = (DeoptimizingNode.DeoptAfter) deoptDup; + if (stateAfter != null) { + deoptDupAfter.setStateAfter(stateAfter); + } else { + assert !deoptDupAfter.hasSideEffect() : "can't use stateBefore as stateAfter for state split " + deoptDupAfter; + deoptDupAfter.setStateAfter(stateBefore); + } + + } + } + } + } + + public static FrameState findLastFrameState(FixedNode start) { + FrameState state = findLastFrameState(start, false); + assert state != null : "Must find a prev state (this can be transitively broken) for node " + start + " " + findLastFrameState(start, true); + return state; + } + + public static FrameState findLastFrameState(FixedNode start, boolean log) { + assert start != null; + FixedNode lastFixedNode = null; + FixedNode currentStart = start; + while (true) { + for (FixedNode fixed : GraphUtil.predecessorIterable(currentStart)) { + if (fixed instanceof StateSplit) { + StateSplit stateSplit = (StateSplit) fixed; + assert !stateSplit.hasSideEffect() || stateSplit.stateAfter() != null : "Found state split with side-effect without framestate=" + stateSplit; + if (stateSplit.stateAfter() != null) { + return stateSplit.stateAfter(); + } + } + lastFixedNode = fixed; + } + if (lastFixedNode instanceof LoopBeginNode) { + currentStart = ((LoopBeginNode) lastFixedNode).forwardEnd(); + continue; + } + if (log) { + NodeSourcePosition p = lastFixedNode.getNodeSourcePosition(); + DebugContext debug = start.getDebug(); + debug.log(DebugContext.VERY_DETAILED_LEVEL, "Last fixed node %s\n with source position -> %s", lastFixedNode, + p == null ? "null" : p.toString()); + if (lastFixedNode instanceof MergeNode) { + MergeNode merge = (MergeNode) lastFixedNode; + debug.log(DebugContext.VERY_DETAILED_LEVEL, "Last fixed node is a merge with predecessors:"); + for (EndNode end : merge.forwardEnds()) { + for (FixedNode fixed : GraphUtil.predecessorIterable(end)) { + NodeSourcePosition sp = fixed.getNodeSourcePosition(); + debug.log(DebugContext.VERY_DETAILED_LEVEL, "%s:source position%s", fixed, sp != null ? sp.toString() : "null"); + } + } + } + } + break; + } + return null; } @Override diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java index d8824f433d9..a83bc715375 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java @@ -98,6 +98,7 @@ import org.graalvm.compiler.nodes.extended.MembarNode; import org.graalvm.compiler.nodes.extended.OpaqueNode; import org.graalvm.compiler.nodes.extended.RawLoadNode; import org.graalvm.compiler.nodes.extended.RawStoreNode; +import org.graalvm.compiler.nodes.extended.RawVolatileLoadNode; import org.graalvm.compiler.nodes.extended.UnboxNode; import org.graalvm.compiler.nodes.extended.UnsafeMemoryLoadNode; import org.graalvm.compiler.nodes.extended.UnsafeMemoryStoreNode; @@ -108,7 +109,6 @@ import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; import org.graalvm.compiler.nodes.java.ClassIsAssignableFromNode; import org.graalvm.compiler.nodes.java.DynamicNewArrayNode; -import org.graalvm.compiler.nodes.java.DynamicNewInstanceNode; import org.graalvm.compiler.nodes.java.InstanceOfDynamicNode; import org.graalvm.compiler.nodes.java.LoadFieldNode; import org.graalvm.compiler.nodes.java.RegisterFinalizerNode; @@ -118,8 +118,10 @@ import org.graalvm.compiler.nodes.memory.OnHeapMemoryAccess.BarrierType; import org.graalvm.compiler.nodes.memory.address.IndexAddressNode; import org.graalvm.compiler.nodes.spi.Replacements; import org.graalvm.compiler.nodes.type.StampTool; +import org.graalvm.compiler.nodes.util.ConstantReflectionUtil; import org.graalvm.compiler.nodes.util.GraphUtil; import org.graalvm.compiler.nodes.virtual.EnsureVirtualizedNode; +import org.graalvm.compiler.replacements.nodes.MacroNode.MacroParams; import org.graalvm.compiler.replacements.nodes.ProfileBooleanNode; import org.graalvm.compiler.replacements.nodes.ReverseBytesNode; import org.graalvm.compiler.replacements.nodes.VirtualizableInvokeMacroNode; @@ -180,7 +182,7 @@ public class StandardGraphBuilderPlugins { registerBoxingPlugins(plugins); registerJMHBlackholePlugins(plugins, replacements); registerJFRThrowablePlugins(plugins, replacements); - registerMethodHandleImplPlugins(plugins, snippetReflection, replacements); + registerMethodHandleImplPlugins(plugins, replacements); registerJcovCollectPlugins(plugins, replacements); } @@ -369,7 +371,7 @@ public class StandardGraphBuilderPlugins { } } - private static UnsafeCompareAndSwapPluginsRegistrar unsafeCompareAndSwapPluginsRegistrar = new UnsafeCompareAndSwapPluginsRegistrar(); + private static final UnsafeCompareAndSwapPluginsRegistrar unsafeCompareAndSwapPluginsRegistrar = new UnsafeCompareAndSwapPluginsRegistrar(); private static class UnsafeCompareAndExchangePluginsRegistrar extends UnsafeCompareAndUpdatePluginsRegistrar { @Override @@ -387,7 +389,7 @@ public class StandardGraphBuilderPlugins { } } - private static UnsafeCompareAndExchangePluginsRegistrar unsafeCompareAndExchangePluginsRegistrar = new UnsafeCompareAndExchangePluginsRegistrar(); + private static final UnsafeCompareAndExchangePluginsRegistrar unsafeCompareAndExchangePluginsRegistrar = new UnsafeCompareAndExchangePluginsRegistrar(); public static void registerPlatformSpecificUnsafePlugins(InvocationPlugins plugins, Replacements replacements, boolean explicitUnsafeNullChecks, JavaKind[] supportedCasKinds) { registerPlatformSpecificUnsafePlugins(supportedCasKinds, new Registration(plugins, Unsafe.class), true, explicitUnsafeNullChecks); @@ -449,18 +451,6 @@ public class StandardGraphBuilderPlugins { r.register2("getAddress", Receiver.class, long.class, new UnsafeGetPlugin(JavaKind.Long, explicitUnsafeNullChecks)); r.register3("putAddress", Receiver.class, long.class, long.class, new UnsafePutPlugin(JavaKind.Long, explicitUnsafeNullChecks)); - r.register2("allocateInstance", Receiver.class, Class.class, new InvocationPlugin() { - - @Override - public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver unsafe, ValueNode clazz) { - // Emits a null-check for the otherwise unused receiver - unsafe.get(); - b.addPush(JavaKind.Object, new DynamicNewInstanceNode(b.nullCheckedValue(clazz, DeoptimizationAction.None), true)); - return true; - } - - }); - r.register1("loadFence", Receiver.class, new UnsafeFencePlugin(LOAD_LOAD | LOAD_STORE)); r.register1("storeFence", Receiver.class, new UnsafeFencePlugin(STORE_STORE | LOAD_STORE)); r.register1("fullFence", Receiver.class, new UnsafeFencePlugin(LOAD_LOAD | STORE_STORE | LOAD_STORE | STORE_LOAD)); @@ -730,8 +720,7 @@ public class StandardGraphBuilderPlugins { public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, InvocationPlugin.Receiver receiver, ValueNode source, ValueNode sourceOffset, ValueNode sourceCount, ValueNode target, ValueNode targetOffset, ValueNode targetCount, ValueNode origFromIndex) { if (target.isConstant()) { - b.addPush(JavaKind.Int, new StringIndexOfNode(b.getInvokeKind(), targetMethod, b.bci(), b.getInvokeReturnStamp(b.getAssumptions()), source, sourceOffset, sourceCount, - target, targetOffset, targetCount, origFromIndex)); + b.addPush(JavaKind.Int, new StringIndexOfNode(MacroParams.of(b, targetMethod, source, sourceOffset, sourceCount, target, targetOffset, targetCount, origFromIndex))); return true; } return false; @@ -748,8 +737,7 @@ public class StandardGraphBuilderPlugins { public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, InvocationPlugin.Receiver receiver, ValueNode source, ValueNode sourceCount, ValueNode target, ValueNode targetCount, ValueNode origFromIndex) { if (target.isConstant()) { - b.addPush(JavaKind.Int, new StringLatin1IndexOfNode(b.getInvokeKind(), targetMethod, b.bci(), b.getInvokeReturnStamp(b.getAssumptions()), - source, sourceCount, target, targetCount, origFromIndex)); + b.addPush(JavaKind.Int, new StringLatin1IndexOfNode(MacroParams.of(b, targetMethod, source, sourceCount, target, targetCount, origFromIndex))); return true; } return false; @@ -766,8 +754,7 @@ public class StandardGraphBuilderPlugins { public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, InvocationPlugin.Receiver receiver, ValueNode source, ValueNode sourceCount, ValueNode target, ValueNode targetCount, ValueNode origFromIndex) { if (target.isConstant()) { - b.addPush(JavaKind.Int, new StringUTF16IndexOfNode(b.getInvokeKind(), targetMethod, b.bci(), b.getInvokeReturnStamp(b.getAssumptions()), - source, sourceCount, target, targetCount, origFromIndex)); + b.addPush(JavaKind.Int, new StringUTF16IndexOfNode(MacroParams.of(b, targetMethod, source, sourceCount, target, targetCount, origFromIndex))); return true; } return false; @@ -829,10 +816,12 @@ public class StandardGraphBuilderPlugins { * the current definition is the normal empty method with a single return bytecode. * The finalizer registration will instead be performed by the BytecodeParser. */ - if (targetMethod.getCodeSize() == 1) { + if (targetMethod.canBeInlined() && targetMethod.getCodeSize() == 1) { ValueNode object = receiver.get(); if (RegisterFinalizerNode.mayHaveFinalizer(object, b.getAssumptions())) { - b.add(new RegisterFinalizerNode(object)); + RegisterFinalizerNode regFin = new RegisterFinalizerNode(object); + b.add(regFin); + b.setStateAfter(regFin); } return true; } @@ -934,7 +923,7 @@ public class StandardGraphBuilderPlugins { } } ResolvedJavaType resultType = b.getMetaAccess().lookupJavaType(kind.toBoxedJavaClass()); - b.addPush(JavaKind.Object, new BoxNode(value, resultType, kind)); + b.addPush(JavaKind.Object, BoxNode.create(value, resultType, kind)); return true; } @@ -1123,14 +1112,22 @@ public class StandardGraphBuilderPlugins { } // Emits a null-check for the otherwise unused receiver unsafe.get(); - if (accessKind.emitBarriers) { + boolean isVolatile = accessKind == AccessKind.VOLATILE; + boolean emitBarriers = accessKind.emitBarriers && !isVolatile; + if (emitBarriers) { b.add(new MembarNode(accessKind.preReadBarriers)); } // Raw accesses can be turned into floatable field accesses, the membars preserve the // access mode. In the case of opaque access, and only for opaque, the location of the // wrapping membars can be refined to the field location. - createUnsafeAccess(object, b, (obj, loc) -> new RawLoadNode(obj, offset, unsafeAccessKind, loc)); - if (accessKind.emitBarriers) { + UnsafeNodeConstructor unsafeNodeConstructor = null; + if (isVolatile) { + unsafeNodeConstructor = (obj, loc) -> new RawVolatileLoadNode(obj, offset, unsafeAccessKind, loc); + } else { + unsafeNodeConstructor = (obj, loc) -> new RawLoadNode(obj, offset, unsafeAccessKind, loc); + } + createUnsafeAccess(object, b, unsafeNodeConstructor); + if (emitBarriers) { b.add(new MembarNode(accessKind.postReadBarriers)); } return true; @@ -1169,15 +1166,17 @@ public class StandardGraphBuilderPlugins { } // Emits a null-check for the otherwise unused receiver unsafe.get(); - if (accessKind.emitBarriers) { + boolean isVolatile = accessKind == AccessKind.VOLATILE; + boolean emitBarriers = accessKind.emitBarriers && !isVolatile; + if (emitBarriers) { b.add(new MembarNode(accessKind.preWriteBarriers)); } ValueNode maskedValue = b.maskSubWordValue(value, unsafeAccessKind); // Raw accesses can be turned into floatable field accesses, the membars preserve the // access mode. In the case of opaque access, and only for opaque, the location of the // wrapping membars can be refined to the field location. - createUnsafeAccess(object, b, (obj, loc) -> new RawStoreNode(obj, offset, maskedValue, unsafeAccessKind, loc)); - if (accessKind.emitBarriers) { + createUnsafeAccess(object, b, (obj, loc) -> new RawStoreNode(obj, offset, maskedValue, unsafeAccessKind, loc, true, isVolatile)); + if (emitBarriers) { b.add(new MembarNode(accessKind.postWriteBarriers)); } return true; @@ -1388,7 +1387,7 @@ public class StandardGraphBuilderPlugins { r.register2("traceThrowable", Throwable.class, String.class, new InvocationPlugin() { @Override public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode throwable, ValueNode message) { - b.add(new VirtualizableInvokeMacroNode(b.getInvokeKind(), targetMethod, b.bci(), b.getInvokeReturnStamp(b.getAssumptions()), throwable, message)); + b.add(new VirtualizableInvokeMacroNode(MacroParams.of(b, targetMethod, throwable, message))); return true; } @@ -1399,7 +1398,7 @@ public class StandardGraphBuilderPlugins { }); } - private static void registerMethodHandleImplPlugins(InvocationPlugins plugins, SnippetReflectionProvider snippetReflection, Replacements replacements) { + private static void registerMethodHandleImplPlugins(InvocationPlugins plugins, Replacements replacements) { Registration r = new Registration(plugins, "java.lang.invoke.MethodHandleImpl", replacements); // In later JDKs this no longer exists and the usage is replace by Class.cast which is // already an intrinsic @@ -1429,7 +1428,7 @@ public class StandardGraphBuilderPlugins { } if (counters.isConstant()) { ValueNode newResult = result; - int[] ctrs = snippetReflection.asObject(int[].class, (JavaConstant) counters.asConstant()); + int[] ctrs = ConstantReflectionUtil.loadIntArrayConstant(b.getConstantReflection(), (JavaConstant) counters.asConstant(), 2); if (ctrs != null && ctrs.length == 2) { int falseCount = ctrs[0]; int trueCount = ctrs[1]; @@ -1454,10 +1453,24 @@ public class StandardGraphBuilderPlugins { return true; } b.addPush(JavaKind.Boolean, - new ProfileBooleanNode(snippetReflection, b.getInvokeKind(), targetMethod, b.bci(), b.getInvokeReturnStamp(b.getAssumptions()), result, counters)); + new ProfileBooleanNode(b.getConstantReflection(), MacroParams.of(b, targetMethod, result, counters))); return true; } }); + if (JavaVersionUtil.JAVA_SPEC >= 9) { + r.register1("isCompileConstant", Object.class, new InvocationPlugin() { + @Override + public boolean inlineOnly() { + return true; + } + + @Override + public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode obj) { + b.addPush(JavaKind.Boolean, ConstantNode.forBoolean(obj.isConstant())); + return true; + } + }); + } } /** diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StringIndexOfNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StringIndexOfNode.java index b3c978b024e..b5125b44491 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StringIndexOfNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StringIndexOfNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -27,24 +27,25 @@ package org.graalvm.compiler.replacements; import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_256; import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64; -import org.graalvm.compiler.core.common.type.StampPair; import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind; -import org.graalvm.compiler.nodes.ValueNode; +import org.graalvm.compiler.nodes.spi.Lowerable; import org.graalvm.compiler.nodes.spi.LoweringTool; +import org.graalvm.compiler.replacements.nodes.MacroNode; import org.graalvm.compiler.replacements.nodes.MacroStateSplitNode; -import jdk.vm.ci.meta.ResolvedJavaMethod; - @NodeInfo(size = SIZE_64, cycles = CYCLES_256) public class StringIndexOfNode extends MacroStateSplitNode { public static final NodeClass TYPE = NodeClass.create(StringIndexOfNode.class); - public StringIndexOfNode(InvokeKind invokeKind, ResolvedJavaMethod targetMethod, int bci, StampPair returnStamp, ValueNode... arguments) { - super(TYPE, invokeKind, targetMethod, bci, returnStamp, arguments); + public StringIndexOfNode(MacroParams p) { + super(TYPE, p); } + /** + * Even though this implementation is the same as {@link Lowerable#lower}, it is required + * because we would actually inherit {@link MacroNode#lower} which we do not want. + */ @Override public void lower(LoweringTool tool) { tool.getLowerer().lower(this, tool); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StringLatin1IndexOfNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StringLatin1IndexOfNode.java index 8247b602545..5a4cb7caf4f 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StringLatin1IndexOfNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StringLatin1IndexOfNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -24,26 +24,28 @@ package org.graalvm.compiler.replacements; -import jdk.vm.ci.meta.ResolvedJavaMethod; -import org.graalvm.compiler.core.common.type.StampPair; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.replacements.nodes.MacroStateSplitNode; - import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_256; import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64; +import org.graalvm.compiler.graph.NodeClass; +import org.graalvm.compiler.nodeinfo.NodeInfo; +import org.graalvm.compiler.nodes.spi.Lowerable; +import org.graalvm.compiler.nodes.spi.LoweringTool; +import org.graalvm.compiler.replacements.nodes.MacroNode; +import org.graalvm.compiler.replacements.nodes.MacroStateSplitNode; + @NodeInfo(size = SIZE_64, cycles = CYCLES_256) public class StringLatin1IndexOfNode extends MacroStateSplitNode { public static final NodeClass TYPE = NodeClass.create(StringLatin1IndexOfNode.class); - public StringLatin1IndexOfNode(InvokeKind invokeKind, ResolvedJavaMethod targetMethod, int bci, StampPair returnStamp, ValueNode... arguments) { - super(TYPE, invokeKind, targetMethod, bci, returnStamp, arguments); + public StringLatin1IndexOfNode(MacroParams p) { + super(TYPE, p); } + /** + * Even though this implementation is the same as {@link Lowerable#lower}, it is required + * because we would actually inherit {@link MacroNode#lower} which we do not want. + */ @Override public void lower(LoweringTool tool) { tool.getLowerer().lower(this, tool); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StringUTF16IndexOfNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StringUTF16IndexOfNode.java index 18265dba8d8..af3ab9077c2 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StringUTF16IndexOfNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StringUTF16IndexOfNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -24,26 +24,28 @@ package org.graalvm.compiler.replacements; -import jdk.vm.ci.meta.ResolvedJavaMethod; -import org.graalvm.compiler.core.common.type.StampPair; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.replacements.nodes.MacroStateSplitNode; - import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_256; import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64; +import org.graalvm.compiler.graph.NodeClass; +import org.graalvm.compiler.nodeinfo.NodeInfo; +import org.graalvm.compiler.nodes.spi.Lowerable; +import org.graalvm.compiler.nodes.spi.LoweringTool; +import org.graalvm.compiler.replacements.nodes.MacroNode; +import org.graalvm.compiler.replacements.nodes.MacroStateSplitNode; + @NodeInfo(size = SIZE_64, cycles = CYCLES_256) public class StringUTF16IndexOfNode extends MacroStateSplitNode { public static final NodeClass TYPE = NodeClass.create(StringUTF16IndexOfNode.class); - public StringUTF16IndexOfNode(InvokeKind invokeKind, ResolvedJavaMethod targetMethod, int bci, StampPair returnStamp, ValueNode... arguments) { - super(TYPE, invokeKind, targetMethod, bci, returnStamp, arguments); + public StringUTF16IndexOfNode(MacroParams p) { + super(TYPE, p); } + /** + * Even though this implementation is the same as {@link Lowerable#lower}, it is required + * because we would actually inherit {@link MacroNode#lower} which we do not want. + */ @Override public void lower(LoweringTool tool) { tool.getLowerer().lower(this, tool); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StringUTF16Substitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StringUTF16Substitutions.java index 378c3d69af3..7d3258569bb 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StringUTF16Substitutions.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StringUTF16Substitutions.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -40,7 +40,7 @@ public class StringUTF16Substitutions { @MethodSubstitution public static char getChar(byte[] value, int i) { - ReplacementsUtil.runtimeAssert((i << 1) + 1 < value.length, "Trusted caller missed bounds check"); + ReplacementsUtil.dynamicAssert((i << 1) + 1 < value.length, "Trusted caller missed bounds check"); return getCharDirect(value, i << 1); } @@ -51,7 +51,7 @@ public class StringUTF16Substitutions { @MethodSubstitution public static void putChar(byte[] value, int i, int c) { - ReplacementsUtil.runtimeAssert((i << 1) + 1 < value.length, "Trusted caller missed bounds check"); + ReplacementsUtil.dynamicAssert((i << 1) + 1 < value.length, "Trusted caller missed bounds check"); putCharDirect(value, i << 1, c); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/TargetGraphBuilderPlugins.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/TargetGraphBuilderPlugins.java index be5cf64e4ba..dbe1d0dec24 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/TargetGraphBuilderPlugins.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/TargetGraphBuilderPlugins.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, 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 @@ -30,6 +30,6 @@ import org.graalvm.compiler.nodes.spi.Replacements; import jdk.vm.ci.code.Architecture; public interface TargetGraphBuilderPlugins { - void register(Plugins plugins, Replacements replacements, Architecture arch, boolean explicitUnsafeNullChecks, boolean registerMathPlugins, boolean emitJDK9StringSubstitutions, + void register(Plugins plugins, Replacements replacements, Architecture arch, boolean explicitUnsafeNullChecks, boolean registerForeignCallMath, boolean emitJDK9StringSubstitutions, boolean useFMAIntrinsics); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopy.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopy.java new file mode 100644 index 00000000000..fc9e78e5e96 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopy.java @@ -0,0 +1,226 @@ +/* + * Copyright (c) 2013, 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.replacements.arraycopy; + +import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.graph.NodeInputList; +import org.graalvm.compiler.nodes.ConstantNode; +import org.graalvm.compiler.nodes.DeoptimizingNode; +import org.graalvm.compiler.nodes.FrameState; +import org.graalvm.compiler.nodes.NodeView; +import org.graalvm.compiler.nodes.ValueNode; +import org.graalvm.compiler.nodes.java.LoadIndexedNode; +import org.graalvm.compiler.nodes.memory.MemoryAccess; +import org.graalvm.compiler.nodes.memory.SingleMemoryKill; +import org.graalvm.compiler.nodes.spi.Lowerable; +import org.graalvm.compiler.nodes.spi.Virtualizable; +import org.graalvm.compiler.nodes.spi.VirtualizerTool; +import org.graalvm.compiler.nodes.type.StampTool; +import org.graalvm.compiler.nodes.virtual.VirtualArrayNode; +import org.graalvm.compiler.nodes.virtual.VirtualObjectNode; + +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.ResolvedJavaType; + +/** + * Interface for all nodes that implement the {@link System#arraycopy} operation. Provides + * implementations for most operations concerning arraycopy. + */ +public interface ArrayCopy extends Virtualizable, SingleMemoryKill, MemoryAccess, Lowerable, DeoptimizingNode.DeoptDuring { + + int SRC_ARG = 0; + int SRC_POS_ARG = 1; + int DEST_ARG = 2; + int DEST_POS_ARG = 3; + int LENGTH_ARG = 4; + + NodeInputList args(); + + default ValueNode getSource() { + return args().get(SRC_ARG); + } + + default ValueNode getSourcePosition() { + return args().get(SRC_POS_ARG); + } + + default ValueNode getDestination() { + return args().get(DEST_ARG); + } + + default ValueNode getDestinationPosition() { + return args().get(DEST_POS_ARG); + } + + default ValueNode getLength() { + return args().get(LENGTH_ARG); + } + + int getBci(); + + JavaKind getElementKind(); + + default boolean checkBounds(int position, int length, VirtualObjectNode virtualObject) { + assert length >= 0; + return position >= 0 && position <= virtualObject.entryCount() - length; + } + + default boolean checkEntryTypes(int srcPos, int length, VirtualObjectNode src, ResolvedJavaType destComponentType, VirtualizerTool tool) { + if (destComponentType.getJavaKind() == JavaKind.Object && !destComponentType.isJavaLangObject()) { + for (int i = 0; i < length; i++) { + ValueNode entry = tool.getEntry(src, srcPos + i); + ResolvedJavaType type = StampTool.typeOrNull(entry); + if (type == null || !destComponentType.isAssignableFrom(type)) { + return false; + } + } + } + return true; + } + + /* + * Returns true if this copy doesn't require store checks. Trivially true for primitive arrays. + */ + default boolean isExact() { + ResolvedJavaType srcType = StampTool.typeOrNull(getSource().stamp(NodeView.DEFAULT)); + ResolvedJavaType destType = StampTool.typeOrNull(getDestination().stamp(NodeView.DEFAULT)); + if (srcType == null || !srcType.isArray() || destType == null || !destType.isArray()) { + return false; + } + if ((srcType.getComponentType().getJavaKind().isPrimitive() && destType.getComponentType().equals(srcType.getComponentType())) || getSource() == getDestination()) { + return true; + } + + if (StampTool.isExactType(getDestination().stamp(NodeView.DEFAULT))) { + if (destType != null && destType.isAssignableFrom(srcType)) { + return true; + } + } + return false; + } + + @Override + default void virtualize(VirtualizerTool tool) { + ValueNode sourcePosition = tool.getAlias(getSourcePosition()); + ValueNode destinationPosition = tool.getAlias(getDestinationPosition()); + ValueNode replacedLength = tool.getAlias(getLength()); + + if (sourcePosition.isConstant() && destinationPosition.isConstant() && replacedLength.isConstant()) { + int srcPosInt = sourcePosition.asJavaConstant().asInt(); + int destPosInt = destinationPosition.asJavaConstant().asInt(); + int len = replacedLength.asJavaConstant().asInt(); + ValueNode destAlias = tool.getAlias(getDestination()); + + if (destAlias instanceof VirtualArrayNode) { + VirtualArrayNode destVirtual = (VirtualArrayNode) destAlias; + if (len < 0 || !checkBounds(destPosInt, len, destVirtual)) { + return; + } + ValueNode srcAlias = tool.getAlias(getSource()); + + if (srcAlias instanceof VirtualObjectNode) { + if (!(srcAlias instanceof VirtualArrayNode)) { + return; + } + VirtualArrayNode srcVirtual = (VirtualArrayNode) srcAlias; + if (destVirtual.componentType().getJavaKind() != srcVirtual.componentType().getJavaKind()) { + return; + } + if (!checkBounds(srcPosInt, len, srcVirtual)) { + return; + } + if (!checkEntryTypes(srcPosInt, len, srcVirtual, destVirtual.type().getComponentType(), tool)) { + return; + } + if (srcVirtual == destVirtual && srcPosInt < destPosInt) { + // must copy backwards to avoid losing elements + for (int i = len - 1; i >= 0; i--) { + tool.setVirtualEntry(destVirtual, destPosInt + i, tool.getEntry(srcVirtual, srcPosInt + i)); + } + } else { + for (int i = 0; i < len; i++) { + tool.setVirtualEntry(destVirtual, destPosInt + i, tool.getEntry(srcVirtual, srcPosInt + i)); + } + } + tool.delete(); + DebugContext debug = this.asNode().getDebug(); + if (debug.isLogEnabled()) { + debug.log("virtualized arraycopy(%s, %d, %s, %d, %d)", getSource(), srcPosInt, getDestination(), destPosInt, len); + } + } else { + ResolvedJavaType sourceType = StampTool.typeOrNull(srcAlias); + if (sourceType == null || !sourceType.isArray()) { + return; + } + ResolvedJavaType sourceComponentType = sourceType.getComponentType(); + ResolvedJavaType destComponentType = destVirtual.type().getComponentType(); + if (!sourceComponentType.equals(destComponentType)) { + return; + } + for (int i = 0; i < len; i++) { + LoadIndexedNode load = new LoadIndexedNode(this.asNode().graph().getAssumptions(), srcAlias, ConstantNode.forInt(i + srcPosInt, this.asNode().graph()), null, + destComponentType.getJavaKind()); + load.setNodeSourcePosition(this.asNode().getNodeSourcePosition()); + tool.addNode(load); + tool.setVirtualEntry(destVirtual, destPosInt + i, load); + } + tool.delete(); + } + } + } + } + + @Override + default boolean canDeoptimize() { + return true; + } + + @Override + default boolean hasSideEffect() { + return !getKilledLocationIdentity().isInit(); + } + + @Override + default void computeStateDuring(FrameState currentStateAfter) { + FrameState newStateDuring = currentStateAfter.duplicateModifiedDuringCall(getBci(), asNode().getStackKind()); + setStateDuring(newStateDuring); + } + + static JavaKind selectComponentKind(ArrayCopy arraycopy) { + ResolvedJavaType srcType = StampTool.typeOrNull(arraycopy.getSource().stamp(NodeView.DEFAULT)); + ResolvedJavaType destType = StampTool.typeOrNull(arraycopy.getDestination().stamp(NodeView.DEFAULT)); + + if (srcType == null || !srcType.isArray() || destType == null || !destType.isArray()) { + return null; + } + if (!destType.getComponentType().isAssignableFrom(srcType.getComponentType())) { + return null; + } + if (!arraycopy.isExact()) { + return null; + } + return srcType.getComponentType().getJavaKind(); + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyCallNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyCallNode.java index 1638aeb31c0..61782da8d2d 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyCallNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyCallNode.java @@ -29,6 +29,8 @@ import static org.graalvm.compiler.nodeinfo.InputType.Memory; import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN; import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN; +import java.util.Arrays; + import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; import org.graalvm.compiler.core.common.type.Stamp; import org.graalvm.compiler.core.common.type.StampFactory; @@ -49,7 +51,6 @@ import org.graalvm.compiler.nodes.calc.AddNode; import org.graalvm.compiler.nodes.calc.IntegerConvertNode; import org.graalvm.compiler.nodes.calc.LeftShiftNode; import org.graalvm.compiler.nodes.extended.ForeignCallNode; -import org.graalvm.compiler.nodes.memory.AbstractMemoryCheckpoint; import org.graalvm.compiler.nodes.memory.MemoryAccess; import org.graalvm.compiler.nodes.memory.MemoryKill; import org.graalvm.compiler.nodes.memory.SingleMemoryKill; @@ -66,7 +67,7 @@ import jdk.vm.ci.meta.MetaAccessProvider; import jdk.vm.ci.meta.PrimitiveConstant; @NodeInfo(allowedUsageTypes = {Memory}, cycles = CYCLES_UNKNOWN, size = SIZE_UNKNOWN) -public final class ArrayCopyCallNode extends AbstractMemoryCheckpoint implements Lowerable, SingleMemoryKill, MemoryAccess, Canonicalizable { +public final class ArrayCopyCallNode extends FixedWithNextNode implements Lowerable, SingleMemoryKill, MemoryAccess, Canonicalizable { public static final NodeClass TYPE = NodeClass.create(ArrayCopyCallNode.class); @Input protected ValueNode src; @@ -79,6 +80,7 @@ public final class ArrayCopyCallNode extends AbstractMemoryCheckpoint implements private final JavaKind elementKind; private final LocationIdentity locationIdentity; + private final LocationIdentity killedLocationIdentity; private final ArrayCopyForeignCalls foreignCalls; private final JavaKind wordJavaKind; private final int heapWordSize; @@ -93,13 +95,27 @@ public final class ArrayCopyCallNode extends AbstractMemoryCheckpoint implements public ArrayCopyCallNode(@InjectedNodeParameter ArrayCopyForeignCalls foreignCalls, @InjectedNodeParameter WordTypes wordTypes, ValueNode src, ValueNode srcPos, ValueNode dest, ValueNode destPos, ValueNode length, JavaKind elementKind, boolean aligned, boolean disjoint, boolean uninitialized, int heapWordSize) { - this(foreignCalls, wordTypes, src, srcPos, dest, destPos, length, elementKind, null, aligned, disjoint, uninitialized, heapWordSize); + this(foreignCalls, wordTypes, src, srcPos, dest, destPos, length, elementKind, (LocationIdentity) null, null, aligned, disjoint, uninitialized, heapWordSize); + } + + public ArrayCopyCallNode(@InjectedNodeParameter ArrayCopyForeignCalls foreignCalls, @InjectedNodeParameter WordTypes wordTypes, + ValueNode src, ValueNode srcPos, ValueNode dest, ValueNode destPos, + ValueNode length, JavaKind copyKind, JavaKind srcKind, JavaKind destKind, boolean aligned, boolean disjoint, boolean uninitialized, int heapWordSize) { + this(foreignCalls, wordTypes, src, srcPos, dest, destPos, length, copyKind, NamedLocationIdentity.getArrayLocation(srcKind), NamedLocationIdentity.getArrayLocation(destKind), aligned, + disjoint, uninitialized, heapWordSize); } protected ArrayCopyCallNode(@InjectedNodeParameter ArrayCopyForeignCalls foreignCalls, @InjectedNodeParameter WordTypes wordTypes, ValueNode src, ValueNode srcPos, ValueNode dest, ValueNode destPos, ValueNode length, JavaKind elementKind, - LocationIdentity locationIdentity, boolean aligned, boolean disjoint, boolean uninitialized, int heapWordSize) { + LocationIdentity killedLocationIdentity, boolean aligned, boolean disjoint, boolean uninitialized, int heapWordSize) { + this(foreignCalls, wordTypes, src, srcPos, dest, destPos, length, elementKind, null, killedLocationIdentity, aligned, disjoint, uninitialized, heapWordSize); + } + + protected ArrayCopyCallNode(@InjectedNodeParameter ArrayCopyForeignCalls foreignCalls, @InjectedNodeParameter WordTypes wordTypes, + ValueNode src, ValueNode srcPos, ValueNode dest, + ValueNode destPos, ValueNode length, JavaKind elementKind, + LocationIdentity locationIdentity, LocationIdentity killedLocationIdentity, boolean aligned, boolean disjoint, boolean uninitialized, int heapWordSize) { super(TYPE, StampFactory.forVoid()); assert elementKind != null; this.src = src; @@ -109,6 +125,7 @@ public final class ArrayCopyCallNode extends AbstractMemoryCheckpoint implements this.length = length; this.elementKind = elementKind; this.locationIdentity = (locationIdentity != null ? locationIdentity : NamedLocationIdentity.getArrayLocation(elementKind)); + this.killedLocationIdentity = (killedLocationIdentity != null ? killedLocationIdentity : this.locationIdentity); this.aligned = aligned; this.disjoint = disjoint; this.uninitialized = uninitialized; @@ -116,6 +133,7 @@ public final class ArrayCopyCallNode extends AbstractMemoryCheckpoint implements this.wordJavaKind = wordTypes.getWordKind(); this.heapWordSize = heapWordSize; + assert !getKilledLocationIdentity().equals(LocationIdentity.any()) || this.elementKind.isObject(); } public ValueNode getSource() { @@ -157,8 +175,9 @@ public final class ArrayCopyCallNode extends AbstractMemoryCheckpoint implements public void lower(LoweringTool tool) { if (graph().getGuardsStage().areFrameStatesAtDeopts()) { updateAlignedDisjoint(tool.getMetaAccess()); - ForeignCallDescriptor desc = foreignCalls.lookupArraycopyDescriptor(elementKind, isAligned(), isDisjoint(), isUninitialized(), - locationIdentity.equals(LocationIdentity.any())); + ForeignCallDescriptor desc = foreignCalls.lookupArraycopyDescriptor(elementKind, isAligned(), isDisjoint(), isUninitialized(), killedLocationIdentity); + assert desc != null : "no descriptor for arraycopy " + elementKind + ", aligned " + isAligned() + ", disjoint " + isDisjoint() + ", uninit " + isUninitialized() + ", killing " + + killedLocationIdentity; StructuredGraph graph = graph(); ValueNode srcAddr = computeBase(tool, getSource(), getSourcePosition()); ValueNode destAddr = computeBase(tool, getDestination(), getDestinationPosition()); @@ -166,8 +185,10 @@ public final class ArrayCopyCallNode extends AbstractMemoryCheckpoint implements if (len.stamp(NodeView.DEFAULT).getStackKind() != JavaKind.Long) { len = IntegerConvertNode.convert(len, StampFactory.forKind(JavaKind.Long), graph(), NodeView.DEFAULT); } - ForeignCallNode call = graph.add(new ForeignCallNode(foreignCalls, desc, srcAddr, destAddr, len)); - call.setStateAfter(stateAfter()); + ForeignCallNode call = graph.add(new ForeignCallNode(desc, srcAddr, destAddr, len)); + LocationIdentity[] callKills = call.getKilledLocationIdentities(); + assert callKills.length == 1 && callKills[0].equals(getKilledLocationIdentity()) : String.format("%s: copy of %s from %s should kill %s, unexpected kills: %s", call, elementKind, + getLocationIdentity(), getKilledLocationIdentity(), Arrays.toString(callKills)); graph.replaceFixedWithFixed(this, call); } } @@ -190,33 +211,53 @@ public final class ArrayCopyCallNode extends AbstractMemoryCheckpoint implements @Override public LocationIdentity getKilledLocationIdentity() { - return getLocationIdentity(); + return killedLocationIdentity; } @NodeIntrinsic(hasSideEffect = true) private static native void arraycopy(Object src, int srcPos, Object dest, int destPos, int length, @ConstantNodeParameter JavaKind elementKind, @ConstantNodeParameter boolean aligned, @ConstantNodeParameter boolean disjoint, @ConstantNodeParameter boolean uninitialized, @ConstantNodeParameter int heapWordSize); + @NodeIntrinsic(hasSideEffect = true) + private static native void arraycopy(Object src, int srcPos, Object dest, int destPos, int length, @ConstantNodeParameter JavaKind copyKind, @ConstantNodeParameter JavaKind srcKind, + @ConstantNodeParameter JavaKind destKind, @ConstantNodeParameter boolean aligned, @ConstantNodeParameter boolean disjoint, @ConstantNodeParameter boolean uninitialized, + @ConstantNodeParameter int heapWordSize); + @NodeIntrinsic(hasSideEffect = true) private static native void arraycopy(Object src, int srcPos, Object dest, int destPos, int length, @ConstantNodeParameter JavaKind elementKind, - @ConstantNodeParameter LocationIdentity locationIdentity, @ConstantNodeParameter boolean aligned, @ConstantNodeParameter boolean disjoint, - @ConstantNodeParameter boolean uninitialized, @ConstantNodeParameter int heapWordSize); + @ConstantNodeParameter LocationIdentity killedLocationIdentity, @ConstantNodeParameter boolean aligned, + @ConstantNodeParameter boolean disjoint, @ConstantNodeParameter boolean uninitialized, @ConstantNodeParameter int heapWordSize); public static void arraycopyObjectKillsAny(Object src, int srcPos, Object dest, int destPos, int length, @ConstantNodeParameter int heapWordSize) { arraycopy(src, srcPos, dest, destPos, length, JavaKind.Object, LocationIdentity.any(), false, false, false, heapWordSize); } - public static void arraycopy(Object src, int srcPos, Object dest, int destPos, int length, @ConstantNodeParameter JavaKind elementKind, @ConstantNodeParameter LocationIdentity locationIdentity, + public static void arraycopy(Object src, int srcPos, Object dest, int destPos, int length, @ConstantNodeParameter JavaKind elementKind, + @ConstantNodeParameter LocationIdentity killedLocationIdentity, @ConstantNodeParameter int heapWordSize) { - arraycopy(src, srcPos, dest, destPos, length, elementKind, locationIdentity, false, false, false, heapWordSize); + arraycopy(src, srcPos, dest, destPos, length, elementKind, killedLocationIdentity, false, false, false, heapWordSize); } public static void disjointArraycopy(Object src, int srcPos, Object dest, int destPos, int length, @ConstantNodeParameter JavaKind elementKind, @ConstantNodeParameter int heapWordSize) { arraycopy(src, srcPos, dest, destPos, length, elementKind, false, true, false, heapWordSize); } - public static void disjointArraycopyKillsAny(Object src, int srcPos, Object dest, int destPos, int length, @ConstantNodeParameter JavaKind elementKind, @ConstantNodeParameter int heapWordSize) { - arraycopy(src, srcPos, dest, destPos, length, elementKind, LocationIdentity.any(), false, true, false, heapWordSize); + public static void disjointArraycopy(Object src, int srcPos, Object dest, int destPos, int length, @ConstantNodeParameter JavaKind elementKind, + @ConstantNodeParameter LocationIdentity killedLocationIdentity, @ConstantNodeParameter int heapWordSize) { + arraycopy(src, srcPos, dest, destPos, length, elementKind, killedLocationIdentity, false, true, false, heapWordSize); + } + + /** + * Type punned copy of {@code length} elements of kind {@code copyKind} from an array with + * {@code srcKind} elements to an array with {@code destKind} elements. + */ + public static void disjointArraycopyDifferentKinds(Object src, int srcPos, Object dest, int destPos, int length, @ConstantNodeParameter JavaKind copyKind, @ConstantNodeParameter JavaKind srcKind, + @ConstantNodeParameter JavaKind destKind, @ConstantNodeParameter int heapWordSize) { + arraycopy(src, srcPos, dest, destPos, length, copyKind, srcKind, destKind, false, true, false, heapWordSize); + } + + public static void disjointArraycopyKillsInit(Object src, int srcPos, Object dest, int destPos, int length, @ConstantNodeParameter JavaKind elementKind, @ConstantNodeParameter int heapWordSize) { + arraycopy(src, srcPos, dest, destPos, length, elementKind, LocationIdentity.init(), false, true, false, heapWordSize); } public static void disjointUninitializedArraycopy(Object src, int srcPos, Object dest, int destPos, int length, @ConstantNodeParameter JavaKind elementKind, @@ -263,7 +304,7 @@ public final class ArrayCopyCallNode extends AbstractMemoryCheckpoint implements public Node canonical(CanonicalizerTool tool) { if (getLength().isConstant() && getLength().asConstant().isDefaultForKind()) { if (lastLocationAccess != null) { - replaceAtUsages(InputType.Memory, lastLocationAccess.asNode()); + replaceAtUsages(lastLocationAccess.asNode(), InputType.Memory); } return null; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyForeignCalls.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyForeignCalls.java index 60352b2e1bc..89285f7f8b1 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyForeignCalls.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyForeignCalls.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -24,18 +24,8 @@ package org.graalvm.compiler.replacements.arraycopy; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; -import org.graalvm.compiler.word.Word; -import jdk.vm.ci.meta.JavaKind; +public interface ArrayCopyForeignCalls extends ForeignCallsProvider, ArrayCopyLookup { -public interface ArrayCopyForeignCalls extends ForeignCallsProvider { - - ForeignCallDescriptor UNSAFE_ARRAYCOPY = new ForeignCallDescriptor("unsafe_arraycopy", void.class, Word.class, Word.class, Word.class); - ForeignCallDescriptor GENERIC_ARRAYCOPY = new ForeignCallDescriptor("generic_arraycopy", int.class, Word.class, int.class, Word.class, int.class, int.class); - - ForeignCallDescriptor lookupCheckcastArraycopyDescriptor(boolean uninit); - - ForeignCallDescriptor lookupArraycopyDescriptor(JavaKind kind, boolean aligned, boolean disjoint, boolean uninit, boolean killAny); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyLookup.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyLookup.java new file mode 100644 index 00000000000..68c535246a5 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyLookup.java @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2018, 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.replacements.arraycopy; + +import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; +import org.graalvm.compiler.core.common.spi.ForeignCallSignature; +import org.graalvm.compiler.word.Word; +import jdk.internal.vm.compiler.word.LocationIdentity; + +import jdk.vm.ci.meta.JavaKind; + +public interface ArrayCopyLookup { + + ForeignCallSignature UNSAFE_ARRAYCOPY = new ForeignCallSignature("unsafe_arraycopy", void.class, Word.class, Word.class, Word.class); + ForeignCallSignature GENERIC_ARRAYCOPY = new ForeignCallSignature("generic_arraycopy", int.class, Word.class, int.class, Word.class, int.class, int.class); + + ForeignCallDescriptor lookupCheckcastArraycopyDescriptor(boolean uninit); + + ForeignCallDescriptor lookupArraycopyDescriptor(JavaKind kind, boolean aligned, boolean disjoint, boolean uninit, LocationIdentity killedLocation); +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyNode.java index b2c7b0e5947..dde511c4dd7 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyNode.java @@ -31,7 +31,6 @@ import org.graalvm.compiler.nodeinfo.NodeInfo; import org.graalvm.compiler.nodes.NamedLocationIdentity; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.replacements.nodes.BasicArrayCopyNode; import jdk.internal.vm.compiler.word.LocationIdentity; @@ -50,16 +49,20 @@ public final class ArrayCopyNode extends BasicArrayCopyNode implements Lowerable super(TYPE, src, srcPos, dst, dstPos, length, null, bci); this.forceAnyLocation = forceAnyLocation; if (!forceAnyLocation) { - elementKind = ArrayCopySnippets.Templates.selectComponentKind(this); + elementKind = ArrayCopy.selectComponentKind(this); } else { assert elementKind == null; } } + public ArrayCopyNode(ArrayCopy arraycopy) { + this(arraycopy.getBci(), arraycopy.getSource(), arraycopy.getSourcePosition(), arraycopy.getDestination(), arraycopy.getDestinationPosition(), arraycopy.getLength()); + } + @Override public LocationIdentity getKilledLocationIdentity() { if (!forceAnyLocation && elementKind == null) { - elementKind = ArrayCopySnippets.Templates.selectComponentKind(this); + elementKind = ArrayCopy.selectComponentKind(this); } if (elementKind != null) { return NamedLocationIdentity.getArrayLocation(elementKind); @@ -67,11 +70,6 @@ public final class ArrayCopyNode extends BasicArrayCopyNode implements Lowerable return any(); } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - public boolean killsAnyLocation() { return forceAnyLocation; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java index 7fbb354d05f..6924a8299ed 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java @@ -26,9 +26,6 @@ package org.graalvm.compiler.replacements.arraycopy; import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE; import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.FREQUENT_PROBABILITY; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY; import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY; import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.DEOPT_PROBABILITY; import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability; @@ -50,12 +47,7 @@ import org.graalvm.compiler.nodes.InvokeNode; import org.graalvm.compiler.nodes.InvokeWithExceptionNode; import org.graalvm.compiler.nodes.NamedLocationIdentity; import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.PiNode; -import org.graalvm.compiler.nodes.SnippetAnchorNode; import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.extended.GuardedUnsafeLoadNode; -import org.graalvm.compiler.nodes.extended.GuardingNode; -import org.graalvm.compiler.nodes.extended.RawStoreNode; import org.graalvm.compiler.nodes.java.ArrayLengthNode; import org.graalvm.compiler.nodes.spi.LoweringTool; import org.graalvm.compiler.nodes.type.StampTool; @@ -72,10 +64,7 @@ import org.graalvm.compiler.replacements.SnippetTemplate.Arguments; import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo; import org.graalvm.compiler.replacements.Snippets; import org.graalvm.compiler.replacements.nodes.BasicArrayCopyNode; -import org.graalvm.compiler.word.Word; import jdk.internal.vm.compiler.word.LocationIdentity; -import jdk.internal.vm.compiler.word.Pointer; - import jdk.vm.ci.code.TargetDescription; import jdk.vm.ci.meta.DeoptimizationAction; import jdk.vm.ci.meta.DeoptimizationReason; @@ -100,16 +89,16 @@ public abstract class ArrayCopySnippets implements Snippets { /** Marker value for the {@link InjectedParameter} injected parameter. */ static final MetaAccessProvider INJECTED_META_ACCESS = null; - public abstract Pointer loadHub(Object nonNullSrc); + public abstract boolean hubsEqual(Object nonNullSrc, Object nonNullDest); - public abstract Pointer getDestElemClass(Pointer destKlass); - - public abstract Word getSuperCheckOffset(Pointer destElemKlass); - - public abstract int getReadLayoutHelper(Pointer srcHub); + public abstract boolean layoutHelpersEqual(Object nonNullSrc, Object nonNullDest); protected abstract int heapWordSize(); + protected boolean useOriginalArraycopy() { + return true; + } + @SuppressWarnings("unused") @Snippet public void arraycopyExactSnippet(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter ArrayCopyTypeCheck arrayTypeCheck, @@ -182,53 +171,21 @@ public abstract class ArrayCopySnippets implements Snippets { @Snippet(allowPartialIntrinsicArgumentMismatch = true) public void exactArraycopyWithSlowPathWork(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter JavaKind elementKind, @ConstantParameter LocationIdentity arrayLocation, @ConstantParameter Counters counters) { - int scale = ReplacementsUtil.arrayIndexScale(INJECTED_META_ACCESS, elementKind); - int arrayBaseOffset = ReplacementsUtil.getArrayBaseOffset(INJECTED_META_ACCESS, elementKind); - long sourceOffset = arrayBaseOffset + (long) srcPos * scale; - long destOffset = arrayBaseOffset + (long) destPos * scale; - - GuardingNode anchor = SnippetAnchorNode.anchor(); - if (probability(NOT_FREQUENT_PROBABILITY, src == dest && srcPos < destPos)) { - // bad aliased case so we need to copy the array from back to front - for (int position = length - 1; position >= 0; position--) { - Object value = GuardedUnsafeLoadNode.guardedLoad(src, sourceOffset + ((long) position) * scale, elementKind, arrayLocation, anchor); - RawStoreNode.storeObject(dest, destOffset + ((long) position) * scale, value, elementKind, arrayLocation, true); - } - } else { - for (int position = 0; position < length; position++) { - Object value = GuardedUnsafeLoadNode.guardedLoad(src, sourceOffset + ((long) position) * scale, elementKind, arrayLocation, anchor); - RawStoreNode.storeObject(dest, destOffset + ((long) position) * scale, value, elementKind, arrayLocation, true); - } - } + doExactArraycopyWithSlowPathWork(src, srcPos, dest, destPos, length, elementKind, arrayLocation, counters, INJECTED_META_ACCESS); } - @SuppressWarnings("unused") + protected abstract void doExactArraycopyWithSlowPathWork(Object src, int srcPos, Object dest, int destPos, int length, JavaKind elementKind, LocationIdentity arrayLocation, Counters counters, + MetaAccessProvider metaAccess); + @Snippet(allowPartialIntrinsicArgumentMismatch = true) public void checkcastArraycopyWithSlowPathWork(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter JavaKind elementKind, @ConstantParameter LocationIdentity arrayLocation, @ConstantParameter Counters counters) { - if (probability(FREQUENT_PROBABILITY, length > 0)) { - Object nonNullSrc = PiNode.asNonNullObject(src); - Object nonNullDest = PiNode.asNonNullObject(dest); - Pointer srcKlass = loadHub(nonNullSrc); - Pointer destKlass = loadHub(nonNullDest); - if (probability(LIKELY_PROBABILITY, srcKlass == destKlass) || probability(LIKELY_PROBABILITY, nonNullDest.getClass() == Object[].class)) { - // no storecheck required. - counters.objectCheckcastSameTypeCounter.inc(); - counters.objectCheckcastSameTypeCopiedCounter.add(length); - ArrayCopyCallNode.arraycopyObjectKillsAny(nonNullSrc, srcPos, nonNullDest, destPos, length, heapWordSize()); - } else { - Pointer destElemKlass = getDestElemClass(destKlass); - Word superCheckOffset = getSuperCheckOffset(destElemKlass); - - counters.objectCheckcastDifferentTypeCounter.inc(); - counters.objectCheckcastDifferentTypeCopiedCounter.add(length); - - System.arraycopy(nonNullSrc, srcPos, nonNullDest, destPos, length); - } - } + doCheckcastArraycopyWithSlowPathWork(src, srcPos, dest, destPos, length, elementKind, arrayLocation, counters); } + protected abstract void doCheckcastArraycopyWithSlowPathWork(Object src, int srcPos, Object dest, int destPos, int length, JavaKind elementKind, LocationIdentity arrayLocation, Counters counters); + @SuppressWarnings("unused") @Snippet(allowPartialIntrinsicArgumentMismatch = true) public void genericArraycopyWithSlowPathWork(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter JavaKind elementKind, @@ -261,23 +218,23 @@ public abstract class ArrayCopySnippets implements Snippets { private static void checkLimits(Object src, int srcPos, Object dest, int destPos, int length, Counters counters) { if (probability(DEOPT_PROBABILITY, srcPos < 0)) { counters.checkAIOOBECounter.inc(); - DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint); + DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.BoundsCheckException); } if (probability(DEOPT_PROBABILITY, destPos < 0)) { counters.checkAIOOBECounter.inc(); - DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint); + DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.BoundsCheckException); } if (probability(DEOPT_PROBABILITY, length < 0)) { counters.checkAIOOBECounter.inc(); - DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint); + DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.BoundsCheckException); } if (probability(DEOPT_PROBABILITY, srcPos > ArrayLengthNode.arrayLength(src) - length)) { counters.checkAIOOBECounter.inc(); - DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint); + DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.BoundsCheckException); } if (probability(DEOPT_PROBABILITY, destPos > ArrayLengthNode.arrayLength(dest) - length)) { counters.checkAIOOBECounter.inc(); - DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint); + DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.BoundsCheckException); } counters.checkSuccessCounter.inc(); } @@ -286,15 +243,11 @@ public abstract class ArrayCopySnippets implements Snippets { if (arrayTypeCheck == ArrayCopyTypeCheck.NO_ARRAY_TYPE_CHECK) { // nothing to do } else if (arrayTypeCheck == ArrayCopyTypeCheck.HUB_BASED_ARRAY_TYPE_CHECK) { - Pointer srcHub = loadHub(nonNullSrc); - Pointer destHub = loadHub(nonNullDest); - if (probability(DEOPT_PROBABILITY, srcHub != destHub)) { + if (probability(DEOPT_PROBABILITY, !hubsEqual(nonNullSrc, nonNullDest))) { DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint); } } else if (arrayTypeCheck == ArrayCopyTypeCheck.LAYOUT_HELPER_BASED_ARRAY_TYPE_CHECK) { - Pointer srcHub = loadHub(nonNullSrc); - Pointer destHub = loadHub(nonNullDest); - if (probability(DEOPT_PROBABILITY, getReadLayoutHelper(srcHub) != getReadLayoutHelper(destHub))) { + if (probability(DEOPT_PROBABILITY, !layoutHelpersEqual(nonNullSrc, nonNullDest))) { DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint); } } else { @@ -302,26 +255,26 @@ public abstract class ArrayCopySnippets implements Snippets { } } - static class Counters { - final SnippetCounter checkSuccessCounter; - final SnippetCounter checkAIOOBECounter; + protected static class Counters { + public final SnippetCounter checkSuccessCounter; + public final SnippetCounter checkAIOOBECounter; - final SnippetCounter zeroLengthStaticCounter; - final SnippetIntegerHistogram lengthHistogram; + public final SnippetCounter zeroLengthStaticCounter; + public final SnippetIntegerHistogram lengthHistogram; - final SnippetCounter systemArraycopyCounter; - final SnippetCounter systemArraycopyCopiedCounter; + public final SnippetCounter systemArraycopyCounter; + public final SnippetCounter systemArraycopyCopiedCounter; - final SnippetCounter genericArraycopyDifferentTypeCopiedCounter; - final SnippetCounter genericArraycopyDifferentTypeCounter; + public final SnippetCounter genericArraycopyDifferentTypeCopiedCounter; + public final SnippetCounter genericArraycopyDifferentTypeCounter; - final SnippetCounter objectCheckcastSameTypeCopiedCounter; - final SnippetCounter objectCheckcastSameTypeCounter; - final SnippetCounter objectCheckcastDifferentTypeCopiedCounter; - final SnippetCounter objectCheckcastDifferentTypeCounter; + public final SnippetCounter objectCheckcastSameTypeCopiedCounter; + public final SnippetCounter objectCheckcastSameTypeCounter; + public final SnippetCounter objectCheckcastDifferentTypeCopiedCounter; + public final SnippetCounter objectCheckcastDifferentTypeCounter; - final EnumMap arraycopyCallCounters = new EnumMap<>(JavaKind.class); - final EnumMap arraycopyCallCopiedCounters = new EnumMap<>(JavaKind.class); + public final EnumMap arraycopyCallCounters = new EnumMap<>(JavaKind.class); + public final EnumMap arraycopyCallCopiedCounters = new EnumMap<>(JavaKind.class); Counters(SnippetCounter.Group.Factory factory) { final Group checkCounters = factory.createSnippetCounterGroup("System.arraycopy checkInputs"); @@ -373,6 +326,7 @@ public abstract class ArrayCopySnippets implements Snippets { private final SnippetInfo genericArraycopyWithSlowPathWork; private final SnippetInfo exactArraycopyWithSlowPathWork; + private final boolean useOriginalArraycopy; private ResolvedJavaMethod originalArraycopy; private final Counters counters; @@ -381,6 +335,7 @@ public abstract class ArrayCopySnippets implements Snippets { super(options, factories, providers, snippetReflection, target); this.counters = new Counters(factory); + useOriginalArraycopy = receiver.useOriginalArraycopy(); arraycopyGenericSnippet = snippet(receiver, "arraycopyGenericSnippet"); arraycopyExactSnippet = snippet(receiver, "arraycopyExactSnippet"); arraycopyExactStubCallSnippet = snippet(receiver, "arraycopyExactStubCallSnippet"); @@ -401,7 +356,7 @@ public abstract class ArrayCopySnippets implements Snippets { } public void lower(ArrayCopyNode arraycopy, boolean mayExpandThisArraycopy, LoweringTool tool) { - JavaKind elementKind = selectComponentKind(arraycopy); + JavaKind elementKind = ArrayCopy.selectComponentKind(arraycopy); SnippetInfo snippetInfo; ArrayCopyTypeCheck arrayTypeCheck; @@ -536,22 +491,6 @@ public abstract class ArrayCopySnippets implements Snippets { return type == null || type.isJavaLangObject() || type.isArray(); } - public static JavaKind selectComponentKind(BasicArrayCopyNode arraycopy) { - ResolvedJavaType srcType = StampTool.typeOrNull(arraycopy.getSource().stamp(NodeView.DEFAULT)); - ResolvedJavaType destType = StampTool.typeOrNull(arraycopy.getDestination().stamp(NodeView.DEFAULT)); - - if (srcType == null || !srcType.isArray() || destType == null || !destType.isArray()) { - return null; - } - if (!destType.getComponentType().isAssignableFrom(srcType.getComponentType())) { - return null; - } - if (!arraycopy.isExact()) { - return null; - } - return srcType.getComponentType().getJavaKind(); - } - /** * Instantiate the snippet template and fix up the FrameState of any Invokes of * System.arraycopy and propagate the captured bci in the ArrayCopySlowPathNode. @@ -573,7 +512,7 @@ public abstract class ArrayCopySnippets implements Snippets { throw new GraalError("unexpected invoke %s in snippet", call.targetMethod()); } // Here we need to fix the bci of the invoke - invoke.replaceBci(arraycopy.getBci()); + invoke.setBci(arraycopy.getBci()); invoke.setStateDuring(null); invoke.setStateAfter(null); if (arraycopy.stateDuring() != null) { @@ -587,7 +526,8 @@ public abstract class ArrayCopySnippets implements Snippets { } else if (originalNode instanceof ArrayCopyWithDelayedLoweringNode) { ArrayCopyWithDelayedLoweringNode slowPath = (ArrayCopyWithDelayedLoweringNode) replacements.get(originalNode); assert arraycopy.stateAfter() != null : arraycopy; - assert slowPath.stateAfter() == arraycopy.stateAfter(); + assert slowPath.stateAfter() == arraycopy.stateAfter() : "States do not match for slowpath=" + slowPath + " and array copy=" + arraycopy + " slowPathState=" + + slowPath.stateAfter() + " and arraycopyState=" + arraycopy.stateAfter(); slowPath.setBci(arraycopy.getBci()); } } @@ -595,6 +535,9 @@ public abstract class ArrayCopySnippets implements Snippets { } private ResolvedJavaMethod originalArraycopy() throws GraalError { + if (!useOriginalArraycopy) { + return null; + } if (originalArraycopy == null) { try { originalArraycopy = findMethod(providers.getMetaAccess(), System.class, "arraycopy"); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/CheckcastArrayCopyCallNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/CheckcastArrayCopyCallNode.java index 5dacaaa2f0d..8b15f16716e 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/CheckcastArrayCopyCallNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/CheckcastArrayCopyCallNode.java @@ -139,7 +139,7 @@ public final class CheckcastArrayCopyCallNode extends AbstractMemoryCheckpoint i if (len.stamp(NodeView.DEFAULT).getStackKind() != wordKind) { len = IntegerConvertNode.convert(len, StampFactory.forKind(wordKind), graph(), NodeView.DEFAULT); } - ForeignCallNode call = graph.add(new ForeignCallNode(foreignCalls, desc, srcAddr, destAddr, len, superCheckOffset, destElemKlass)); + ForeignCallNode call = graph.add(new ForeignCallNode(desc, srcAddr, destAddr, len, superCheckOffset, destElemKlass)); call.setStateAfter(stateAfter()); graph.replaceFixedWithFixed(this, call); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/gc/G1WriteBarrierSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/gc/G1WriteBarrierSnippets.java index 1fd7a72f974..0c9e6671400 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/gc/G1WriteBarrierSnippets.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/gc/G1WriteBarrierSnippets.java @@ -396,7 +396,7 @@ public abstract class G1WriteBarrierSnippets extends WriteBarrierSnippets implem Word parentWord = Word.objectToTrackedPointer(parent); Word childWord = Word.objectToTrackedPointer(child); boolean success = validateOop(validateObjectCallDescriptor(), parentWord, childWord); - AssertionNode.assertion(false, success, "Verification ERROR, Parent: %p Child: %p\n", parentWord.rawValue(), childWord.rawValue()); + AssertionNode.dynamicAssert(success, "Verification ERROR, Parent: %p Child: %p\n", parentWord.rawValue(), childWord.rawValue()); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/gc/SerialWriteBarrierSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/gc/SerialWriteBarrierSnippets.java index 124e23357db..f64edf30cf3 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/gc/SerialWriteBarrierSnippets.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/gc/SerialWriteBarrierSnippets.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -94,7 +94,7 @@ public abstract class SerialWriteBarrierSnippets extends WriteBarrierSnippets im Word base = cardTableAddress().add(ptr.unsignedShiftRight(cardTableShift())); if (verifyOnly) { byte cardValue = base.readByte(0, GC_CARD_LOCATION); - AssertionNode.assertion(false, cardValue == dirtyCardValue(), "card must be dirty"); + AssertionNode.dynamicAssert(cardValue == dirtyCardValue(), "card must be dirty"); } else { base.writeByte(0, dirtyCardValue(), GC_CARD_LOCATION); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/gc/WriteBarrierSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/gc/WriteBarrierSnippets.java index 4732d05b8d2..01e596ef562 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/gc/WriteBarrierSnippets.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/gc/WriteBarrierSnippets.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -39,7 +39,7 @@ public abstract class WriteBarrierSnippets { protected static void verifyNotArray(Object object) { if (object != null) { // Manually build the null check and cast because we're in snippet that's lowered late. - AssertionNode.assertion(false, !PiNode.piCastNonNull(object, SnippetAnchorNode.anchor()).getClass().isArray(), "imprecise card mark used with array"); + AssertionNode.dynamicAssert(!PiNode.piCastNonNull(object, SnippetAnchorNode.anchor()).getClass().isArray(), "imprecise card mark used with array"); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ArrayEqualsNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ArrayEqualsNode.java index e8bbd3318f0..9d22df49fd8 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ArrayEqualsNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ArrayEqualsNode.java @@ -62,7 +62,7 @@ import jdk.vm.ci.meta.Value; /** * Compares two arrays with the same length. */ -@NodeInfo(cycles = NodeCycles.CYCLES_UNKNOWN, size = NodeSize.SIZE_128) +@NodeInfo(cycles = NodeCycles.CYCLES_UNKNOWN, size = NodeSize.SIZE_128, allowedUsageTypes = {Memory}) public final class ArrayEqualsNode extends FixedWithNextNode implements LIRLowerable, Canonicalizable, Virtualizable, MemoryAccess { public static final NodeClass TYPE = NodeClass.create(ArrayEqualsNode.class); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/AssertionNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/AssertionNode.java index 4dab97a3cc8..d1d7e27d9f6 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/AssertionNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/AssertionNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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 @@ -52,15 +52,29 @@ public final class AssertionNode extends FixedWithNextNode implements Lowerable, public static final NodeClass TYPE = NodeClass.create(AssertionNode.class); @Input ValueNode condition; + @Input ValueNode l1; + @Input ValueNode l2; protected final boolean compileTimeAssertion; protected final String message; - public AssertionNode(boolean compileTimeAssertion, ValueNode condition, String message, Object arg1, Object arg2) { + protected AssertionNode(@ConstantNodeParameter boolean compileTimeAssertion, ValueNode condition, @ConstantNodeParameter String message, @ConstantNodeParameter Object msgArg1, + @ConstantNodeParameter Object msgArg2, + ValueNode l1, ValueNode l2) { super(TYPE, StampFactory.forVoid()); this.condition = condition; this.compileTimeAssertion = compileTimeAssertion; - this.message = message + arg1 + arg2; + this.message = message + msgArg1 + msgArg2; + this.l1 = l1; + this.l2 = l2; + } + + public ValueNode getL1() { + return l1; + } + + public ValueNode getL2() { + return l2; } public ValueNode condition() { @@ -107,19 +121,27 @@ public final class AssertionNode extends FixedWithNextNode implements Lowerable, throw new GraalError("%s: failed compile-time assertion: %s", this, message); } } else { - throw new GraalError("%s: failed compile-time assertion (value %s): %s", this, condition, message); + throw new GraalError("%s: failed compile-time assertion (value %s): %s. Condition must be constant.", this, condition, message); } } @NodeIntrinsic - public static native void assertion(@ConstantNodeParameter boolean compileTimeAssertion, boolean condition, @ConstantNodeParameter String message, @ConstantNodeParameter Object arg1, - @ConstantNodeParameter Object arg2); + public static native void assertion(@ConstantNodeParameter boolean compileTimeAssertion, boolean condition, @ConstantNodeParameter String message, @ConstantNodeParameter Object msgArg1, + @ConstantNodeParameter Object msgArg2, long arg1, long arg2); - public static void assertion(@ConstantNodeParameter boolean compileTimeAssertion, boolean condition, @ConstantNodeParameter String message) { - assertion(compileTimeAssertion, condition, message, "", ""); + public static void staticAssert(boolean condition, String message) { + assertion(true, condition, message, "", "", 0L, 0L); } - public static void assertion(@ConstantNodeParameter boolean compileTimeAssertion, boolean condition, @ConstantNodeParameter String message, @ConstantNodeParameter Object arg1) { - assertion(compileTimeAssertion, condition, message, arg1, ""); + public static void staticAssert(boolean condition, String message, Object msgArg1, Object msgArg2) { + assertion(true, condition, message, msgArg1, msgArg2, 0L, 0L); + } + + public static void dynamicAssert(boolean condition, String message) { + assertion(false, condition, message, "", "", 0L, 0L); + } + + public static void dynamicAssert(boolean condition, String message, long arg1, long arg2) { + assertion(false, condition, message, "", "", arg1, arg2); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java index 2674ffc316a..51e9dd805d7 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java @@ -30,46 +30,26 @@ import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64; import static jdk.internal.vm.compiler.word.LocationIdentity.any; import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.debug.DebugContext; import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.graph.NodeInputList; import org.graalvm.compiler.nodeinfo.NodeCycles; import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.DeoptimizingNode; import org.graalvm.compiler.nodes.FrameState; import org.graalvm.compiler.nodes.NamedLocationIdentity; -import org.graalvm.compiler.nodes.NodeView; import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.java.LoadIndexedNode; import org.graalvm.compiler.nodes.memory.AbstractMemoryCheckpoint; -import org.graalvm.compiler.nodes.memory.MemoryAccess; import org.graalvm.compiler.nodes.memory.MemoryKill; -import org.graalvm.compiler.nodes.memory.SingleMemoryKill; -import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.nodes.spi.Virtualizable; -import org.graalvm.compiler.nodes.spi.VirtualizerTool; -import org.graalvm.compiler.nodes.type.StampTool; -import org.graalvm.compiler.nodes.virtual.VirtualArrayNode; -import org.graalvm.compiler.nodes.virtual.VirtualObjectNode; +import org.graalvm.compiler.replacements.arraycopy.ArrayCopy; import jdk.internal.vm.compiler.word.LocationIdentity; import jdk.vm.ci.code.BytecodeFrame; import jdk.vm.ci.meta.JavaKind; -import jdk.vm.ci.meta.ResolvedJavaType; @NodeInfo(cycles = NodeCycles.CYCLES_UNKNOWN, size = SIZE_64) -public class BasicArrayCopyNode extends AbstractMemoryCheckpoint implements Virtualizable, SingleMemoryKill, MemoryAccess, Lowerable, DeoptimizingNode.DeoptDuring { +public class BasicArrayCopyNode extends AbstractMemoryCheckpoint implements ArrayCopy { public static final NodeClass TYPE = NodeClass.create(BasicArrayCopyNode.class); - static final int SRC_ARG = 0; - static final int SRC_POS_ARG = 1; - static final int DEST_ARG = 2; - static final int DEST_POS_ARG = 3; - static final int LENGTH_ARG = 4; - @Input NodeInputList args; @OptionalInput(State) FrameState stateDuring; @@ -91,30 +71,17 @@ public class BasicArrayCopyNode extends AbstractMemoryCheckpoint implements Virt this(type, src, srcPos, dest, destPos, length, elementKind, BytecodeFrame.INVALID_FRAMESTATE_BCI); } - public ValueNode getSource() { - return args.get(SRC_ARG); - } - - public ValueNode getSourcePosition() { - return args.get(SRC_POS_ARG); - } - - public ValueNode getDestination() { - return args.get(DEST_ARG); - } - - public ValueNode getDestinationPosition() { - return args.get(DEST_POS_ARG); - } - - public ValueNode getLength() { - return args.get(LENGTH_ARG); + @Override + public NodeInputList args() { + return args; } + @Override public int getBci() { return bci; } + @Override public JavaKind getElementKind() { return elementKind; } @@ -143,118 +110,6 @@ public class BasicArrayCopyNode extends AbstractMemoryCheckpoint implements Virt lastLocationAccess = lla; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - - private static boolean checkBounds(int position, int length, VirtualObjectNode virtualObject) { - assert length >= 0; - return position >= 0 && position <= virtualObject.entryCount() - length; - } - - private static boolean checkEntryTypes(int srcPos, int length, VirtualObjectNode src, ResolvedJavaType destComponentType, VirtualizerTool tool) { - if (destComponentType.getJavaKind() == JavaKind.Object && !destComponentType.isJavaLangObject()) { - for (int i = 0; i < length; i++) { - ValueNode entry = tool.getEntry(src, srcPos + i); - ResolvedJavaType type = StampTool.typeOrNull(entry); - if (type == null || !destComponentType.isAssignableFrom(type)) { - return false; - } - } - } - return true; - } - - /* - * Returns true if this copy doesn't require store checks. Trivially true for primitive arrays. - */ - public boolean isExact() { - ResolvedJavaType srcType = StampTool.typeOrNull(getSource().stamp(NodeView.DEFAULT)); - ResolvedJavaType destType = StampTool.typeOrNull(getDestination().stamp(NodeView.DEFAULT)); - if (srcType == null || !srcType.isArray() || destType == null || !destType.isArray()) { - return false; - } - if ((srcType.getComponentType().getJavaKind().isPrimitive() && destType.getComponentType().equals(srcType.getComponentType())) || getSource() == getDestination()) { - return true; - } - - if (StampTool.isExactType(getDestination().stamp(NodeView.DEFAULT))) { - if (destType != null && destType.isAssignableFrom(srcType)) { - return true; - } - } - return false; - } - - @Override - public void virtualize(VirtualizerTool tool) { - ValueNode sourcePosition = tool.getAlias(getSourcePosition()); - ValueNode destinationPosition = tool.getAlias(getDestinationPosition()); - ValueNode replacedLength = tool.getAlias(getLength()); - - if (sourcePosition.isConstant() && destinationPosition.isConstant() && replacedLength.isConstant()) { - int srcPosInt = sourcePosition.asJavaConstant().asInt(); - int destPosInt = destinationPosition.asJavaConstant().asInt(); - int len = replacedLength.asJavaConstant().asInt(); - ValueNode destAlias = tool.getAlias(getDestination()); - - if (destAlias instanceof VirtualArrayNode) { - VirtualArrayNode destVirtual = (VirtualArrayNode) destAlias; - if (len < 0 || !checkBounds(destPosInt, len, destVirtual)) { - return; - } - ValueNode srcAlias = tool.getAlias(getSource()); - - if (srcAlias instanceof VirtualObjectNode) { - if (!(srcAlias instanceof VirtualArrayNode)) { - return; - } - VirtualArrayNode srcVirtual = (VirtualArrayNode) srcAlias; - if (destVirtual.componentType().getJavaKind() != srcVirtual.componentType().getJavaKind()) { - return; - } - if (!checkBounds(srcPosInt, len, srcVirtual)) { - return; - } - if (!checkEntryTypes(srcPosInt, len, srcVirtual, destVirtual.type().getComponentType(), tool)) { - return; - } - for (int i = 0; i < len; i++) { - tool.setVirtualEntry(destVirtual, destPosInt + i, tool.getEntry(srcVirtual, srcPosInt + i)); - } - tool.delete(); - DebugContext debug = getDebug(); - if (debug.isLogEnabled()) { - debug.log("virtualized arraycopy(%s, %d, %s, %d, %d)", getSource(), srcPosInt, getDestination(), destPosInt, len); - } - } else { - ResolvedJavaType sourceType = StampTool.typeOrNull(srcAlias); - if (sourceType == null || !sourceType.isArray()) { - return; - } - ResolvedJavaType sourceComponentType = sourceType.getComponentType(); - ResolvedJavaType destComponentType = destVirtual.type().getComponentType(); - if (!sourceComponentType.equals(destComponentType)) { - return; - } - for (int i = 0; i < len; i++) { - LoadIndexedNode load = new LoadIndexedNode(graph().getAssumptions(), srcAlias, ConstantNode.forInt(i + srcPosInt, graph()), null, destComponentType.getJavaKind()); - load.setNodeSourcePosition(getNodeSourcePosition()); - tool.addNode(load); - tool.setVirtualEntry(destVirtual, destPosInt + i, load); - } - tool.delete(); - } - } - } - } - - @Override - public boolean canDeoptimize() { - return true; - } - @Override public FrameState stateDuring() { return stateDuring; @@ -265,11 +120,4 @@ public class BasicArrayCopyNode extends AbstractMemoryCheckpoint implements Virt updateUsages(this.stateDuring, stateDuring); this.stateDuring = stateDuring; } - - @Override - public void computeStateDuring(FrameState currentStateAfter) { - FrameState newStateDuring = currentStateAfter.duplicateModifiedDuringCall(getBci(), asNode().getStackKind()); - setStateDuring(newStateDuring); - } - } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicObjectCloneNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicObjectCloneNode.java index 59213e6674c..917b52c40fd 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicObjectCloneNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicObjectCloneNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -26,44 +26,18 @@ package org.graalvm.compiler.replacements.nodes; import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8; -import java.util.Collections; - -import org.graalvm.compiler.core.common.type.ObjectStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.core.common.type.StampPair; import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.nodeinfo.NodeCycles; import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.NodeView; import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.java.LoadFieldNode; -import org.graalvm.compiler.nodes.java.LoadIndexedNode; -import org.graalvm.compiler.nodes.java.MonitorIdNode; -import org.graalvm.compiler.nodes.spi.ArrayLengthProvider; -import org.graalvm.compiler.nodes.spi.VirtualizableAllocation; -import org.graalvm.compiler.nodes.spi.VirtualizerTool; -import org.graalvm.compiler.nodes.util.GraphUtil; -import org.graalvm.compiler.nodes.virtual.VirtualArrayNode; -import org.graalvm.compiler.nodes.virtual.VirtualInstanceNode; -import org.graalvm.compiler.nodes.virtual.VirtualObjectNode; - -import jdk.vm.ci.meta.Assumptions; -import jdk.vm.ci.meta.ConstantReflectionProvider; -import jdk.vm.ci.meta.JavaKind; -import jdk.vm.ci.meta.ResolvedJavaField; -import jdk.vm.ci.meta.ResolvedJavaMethod; -import jdk.vm.ci.meta.ResolvedJavaType; @NodeInfo(cycles = NodeCycles.CYCLES_UNKNOWN, size = SIZE_8) -public abstract class BasicObjectCloneNode extends MacroStateSplitNode implements VirtualizableAllocation, ArrayLengthProvider { +public abstract class BasicObjectCloneNode extends MacroStateSplitNode implements ObjectClone { public static final NodeClass TYPE = NodeClass.create(BasicObjectCloneNode.class); - public BasicObjectCloneNode(NodeClass c, InvokeKind invokeKind, ResolvedJavaMethod targetMethod, int bci, StampPair returnStamp, ValueNode... arguments) { - super(c, invokeKind, targetMethod, bci, returnStamp, arguments); + public BasicObjectCloneNode(NodeClass c, MacroParams p) { + super(c, p); updateStamp(computeStamp(getObject())); } @@ -72,112 +46,8 @@ public abstract class BasicObjectCloneNode extends MacroStateSplitNode implement return updateStamp(stamp.improveWith(computeStamp(getObject()))); } - protected Stamp computeStamp(ValueNode object) { - Stamp objectStamp = object.stamp(NodeView.DEFAULT); - if (objectStamp instanceof ObjectStamp) { - objectStamp = objectStamp.join(StampFactory.objectNonNull()); - } - return objectStamp; - } - + @Override public ValueNode getObject() { return arguments.get(0); } - - /* - * Looks at the given stamp and determines if it is an exact type (or can be assumed to be an - * exact type) and if it is a cloneable type. - * - * If yes, then the exact type is returned, otherwise it returns null. - */ - public ResolvedJavaType getConcreteType(Stamp forStamp) { - if (!(forStamp instanceof ObjectStamp)) { - return null; - } - ObjectStamp objectStamp = (ObjectStamp) forStamp; - if (objectStamp.type() == null) { - return null; - } else if (objectStamp.isExactType()) { - return objectStamp.type().isCloneableWithAllocation() ? objectStamp.type() : null; - } else if (objectStamp.type().isArray()) { - return objectStamp.type(); - } - return null; - } - - protected LoadFieldNode genLoadFieldNode(Assumptions assumptions, ValueNode originalAlias, ResolvedJavaField field) { - return LoadFieldNode.create(assumptions, originalAlias, field); - } - - protected LoadIndexedNode genLoadIndexedNode(Assumptions assumptions, ValueNode originalAlias, ValueNode index, JavaKind elementKind) { - return new LoadIndexedNode(assumptions, originalAlias, index, null, elementKind); - } - - @Override - public void virtualize(VirtualizerTool tool) { - ValueNode originalAlias = tool.getAlias(getObject()); - if (originalAlias instanceof VirtualObjectNode) { - VirtualObjectNode originalVirtual = (VirtualObjectNode) originalAlias; - if (originalVirtual.type().isCloneableWithAllocation()) { - ValueNode[] newEntryState = new ValueNode[originalVirtual.entryCount()]; - for (int i = 0; i < newEntryState.length; i++) { - newEntryState[i] = tool.getEntry(originalVirtual, i); - } - VirtualObjectNode newVirtual = originalVirtual.duplicate(); - tool.createVirtualObject(newVirtual, newEntryState, Collections. emptyList(), false); - tool.replaceWithVirtual(newVirtual); - } - } else { - ResolvedJavaType type = getConcreteType(originalAlias.stamp(NodeView.DEFAULT)); - if (type == null) { - return; - } - if (!type.isArray()) { - VirtualInstanceNode newVirtual = createVirtualInstanceNode(type, true); - ResolvedJavaField[] fields = newVirtual.getFields(); - - ValueNode[] state = new ValueNode[fields.length]; - for (int i = 0; i < fields.length; i++) { - LoadFieldNode load = genLoadFieldNode(graph().getAssumptions(), originalAlias, fields[i]); - state[i] = load; - tool.addNode(load); - } - tool.createVirtualObject(newVirtual, state, Collections. emptyList(), false); - tool.replaceWithVirtual(newVirtual); - } else { - ValueNode length = findLength(FindLengthMode.SEARCH_ONLY, tool.getConstantReflection()); - if (length == null) { - return; - } - ValueNode lengthAlias = tool.getAlias(length); - if (!lengthAlias.isConstant()) { - return; - } - int constantLength = lengthAlias.asJavaConstant().asInt(); - if (constantLength >= 0 && constantLength <= tool.getMaximumEntryCount()) { - ValueNode[] state = new ValueNode[constantLength]; - ResolvedJavaType componentType = type.getComponentType(); - for (int i = 0; i < constantLength; i++) { - ConstantNode index = ConstantNode.forInt(i); - LoadIndexedNode load = genLoadIndexedNode(graph().getAssumptions(), originalAlias, index, componentType.getJavaKind()); - state[i] = load; - tool.addNode(index); - tool.addNode(load); - } - VirtualObjectNode virtualObject = new VirtualArrayNode(componentType, constantLength); - tool.createVirtualObject(virtualObject, state, Collections. emptyList(), false); - tool.replaceWithVirtual(virtualObject); - } - } - } - } - - protected VirtualInstanceNode createVirtualInstanceNode(ResolvedJavaType type, boolean hasIdentity) { - return new VirtualInstanceNode(type, hasIdentity); - } - - @Override - public ValueNode findLength(FindLengthMode mode, ConstantReflectionProvider constantReflection) { - return GraphUtil.arrayLength(getObject(), mode, constantReflection); - } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BinaryMathIntrinsicNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BinaryMathIntrinsicNode.java index bcf6cefd8c9..8e03df79431 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BinaryMathIntrinsicNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BinaryMathIntrinsicNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -27,8 +27,7 @@ package org.graalvm.compiler.replacements.nodes; import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN; import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1; -import jdk.vm.ci.meta.Value; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; +import org.graalvm.compiler.core.common.spi.ForeignCallSignature; import org.graalvm.compiler.core.common.type.FloatStamp; import org.graalvm.compiler.core.common.type.PrimitiveStamp; import org.graalvm.compiler.core.common.type.Stamp; @@ -47,10 +46,10 @@ import org.graalvm.compiler.nodes.calc.MulNode; import org.graalvm.compiler.nodes.calc.SqrtNode; import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; +import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; import jdk.vm.ci.meta.JavaKind; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; +import jdk.vm.ci.meta.Value; @NodeInfo(nameTemplate = "MathIntrinsic#{p#operation/s}", cycles = CYCLES_UNKNOWN, size = SIZE_1) public final class BinaryMathIntrinsicNode extends BinaryNode implements ArithmeticLIRLowerable, Lowerable { @@ -59,12 +58,12 @@ public final class BinaryMathIntrinsicNode extends BinaryNode implements Arithme protected final BinaryOperation operation; public enum BinaryOperation { - POW(new ForeignCallDescriptor("arithmeticPow", double.class, double.class, double.class)); + POW(new ForeignCallSignature("arithmeticPow", double.class, double.class, double.class)); - public final ForeignCallDescriptor foreignCallDescriptor; + public final ForeignCallSignature foreignCallSignature; - BinaryOperation(ForeignCallDescriptor foreignCallDescriptor) { - this.foreignCallDescriptor = foreignCallDescriptor; + BinaryOperation(ForeignCallSignature foreignCallSignature) { + this.foreignCallSignature = foreignCallSignature; } } @@ -100,11 +99,6 @@ public final class BinaryMathIntrinsicNode extends BinaryNode implements Arithme this.operation = op; } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @Override public void generate(NodeLIRBuilderTool nodeValueMap, ArithmeticLIRGeneratorTool gen) { // We can only reach here in the math stubs diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/FusedMultiplyAddNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/FusedMultiplyAddNode.java index 2a81c184c52..fb352817d2a 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/FusedMultiplyAddNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/FusedMultiplyAddNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, 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 @@ -29,6 +29,7 @@ import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1; import org.graalvm.compiler.core.common.type.FloatStamp; import org.graalvm.compiler.core.common.type.Stamp; +import org.graalvm.compiler.core.common.type.StampFactory; import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.graph.spi.CanonicalizerTool; import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool; @@ -49,11 +50,11 @@ public final class FusedMultiplyAddNode extends TernaryNode implements Arithmeti public static final NodeClass TYPE = NodeClass.create(FusedMultiplyAddNode.class); - public FusedMultiplyAddNode(ValueNode a, ValueNode b, ValueNode c) { - super(TYPE, computeStamp(a.stamp(NodeView.DEFAULT), b.stamp(NodeView.DEFAULT), c.stamp(NodeView.DEFAULT)), a, b, c); - assert a.getStackKind().isNumericFloat(); - assert b.getStackKind().isNumericFloat(); - assert c.getStackKind().isNumericFloat(); + public FusedMultiplyAddNode(ValueNode x, ValueNode y, ValueNode z) { + super(TYPE, computeStamp(x.stamp(NodeView.DEFAULT), y.stamp(NodeView.DEFAULT), z.stamp(NodeView.DEFAULT)), x, y, z); + assert x.getStackKind().isNumericFloat(); + assert y.getStackKind().isNumericFloat(); + assert z.getStackKind().isNumericFloat(); } @Override @@ -62,25 +63,52 @@ public final class FusedMultiplyAddNode extends TernaryNode implements Arithmeti } private static Stamp computeStamp(Stamp stampX, Stamp stampY, Stamp stampZ) { - Stamp m = FloatStamp.OPS.getMul().foldStamp(stampX, stampY); - return FloatStamp.OPS.getAdd().foldStamp(m, stampZ); + if (stampX.isEmpty()) { + return stampX; + } + if (stampY.isEmpty()) { + return stampY; + } + if (stampZ.isEmpty()) { + return stampZ; + } + JavaConstant constantX = ((FloatStamp) stampX).asConstant(); + JavaConstant constantY = ((FloatStamp) stampY).asConstant(); + JavaConstant constantZ = ((FloatStamp) stampZ).asConstant(); + if (constantX != null && constantY != null && constantZ != null) { + if (stampX.getStackKind() == JavaKind.Float) { + float result = GraalServices.fma(constantX.asFloat(), constantY.asFloat(), constantZ.asFloat()); + if (Float.isNaN(result)) { + return StampFactory.forFloat(JavaKind.Float, Double.NaN, Double.NaN, false); + } else { + return StampFactory.forFloat(JavaKind.Float, result, result, true); + } + } else { + double result = GraalServices.fma(constantX.asDouble(), constantY.asDouble(), constantZ.asDouble()); + assert stampX.getStackKind() == JavaKind.Double; + if (Double.isNaN(result)) { + return StampFactory.forFloat(JavaKind.Double, Double.NaN, Double.NaN, false); + } else { + return StampFactory.forFloat(JavaKind.Double, result, result, true); + } + } + } + + return stampX.unrestricted(); } @Override - public ValueNode canonical(CanonicalizerTool tool, ValueNode a, ValueNode b, ValueNode c) { - if (a.isConstant() && b.isConstant() && c.isConstant()) { - JavaConstant ca = a.asJavaConstant(); - JavaConstant cb = b.asJavaConstant(); - JavaConstant cc = c.asJavaConstant(); - - ValueNode res; - if (a.getStackKind() == JavaKind.Float) { - res = ConstantNode.forFloat(GraalServices.fma(ca.asFloat(), cb.asFloat(), cc.asFloat())); + public ValueNode canonical(CanonicalizerTool tool, ValueNode forX, ValueNode forY, ValueNode forZ) { + if (forX.isConstant() && forY.isConstant() && forZ.isConstant()) { + JavaConstant constantX = forX.asJavaConstant(); + JavaConstant constantY = forY.asJavaConstant(); + JavaConstant constantZ = forZ.asJavaConstant(); + if (forX.getStackKind() == JavaKind.Float) { + return ConstantNode.forFloat(GraalServices.fma(constantX.asFloat(), constantY.asFloat(), constantZ.asFloat())); } else { - assert a.getStackKind() == JavaKind.Double; - res = ConstantNode.forDouble(GraalServices.fma(ca.asDouble(), cb.asDouble(), cc.asDouble())); + assert forX.getStackKind() == JavaKind.Double; + return ConstantNode.forDouble(GraalServices.fma(constantX.asDouble(), constantY.asDouble(), constantZ.asDouble())); } - return res; } return this; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java index b587b43e2ed..d522a32db85 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -25,12 +25,10 @@ package org.graalvm.compiler.replacements.nodes; import static jdk.vm.ci.code.BytecodeFrame.isPlaceholderBci; -import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE; import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN; import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN; import org.graalvm.compiler.api.replacements.MethodSubstitution; -import org.graalvm.compiler.api.replacements.Snippet; import org.graalvm.compiler.core.common.type.StampPair; import org.graalvm.compiler.debug.DebugCloseable; import org.graalvm.compiler.debug.DebugContext; @@ -48,6 +46,7 @@ import org.graalvm.compiler.nodes.InvokeNode; import org.graalvm.compiler.nodes.StructuredGraph; import org.graalvm.compiler.nodes.StructuredGraph.GuardsStage; import org.graalvm.compiler.nodes.ValueNode; +import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; import org.graalvm.compiler.nodes.java.MethodCallTargetNode; import org.graalvm.compiler.nodes.spi.CoreProviders; import org.graalvm.compiler.nodes.spi.Lowerable; @@ -89,19 +88,71 @@ public abstract class MacroNode extends FixedWithNextNode implements Lowerable, @Input protected NodeInputList arguments; protected final int bci; + protected final ResolvedJavaMethod callerMethod; protected final ResolvedJavaMethod targetMethod; protected final InvokeKind invokeKind; protected final StampPair returnStamp; - protected MacroNode(NodeClass c, InvokeKind invokeKind, ResolvedJavaMethod targetMethod, int bci, StampPair returnStamp, ValueNode... arguments) { - super(c, returnStamp != null ? returnStamp.getTrustedStamp() : null); - assertArgumentCount(targetMethod, arguments); - this.arguments = new NodeInputList<>(this, arguments); - this.bci = bci; - this.targetMethod = targetMethod; - this.returnStamp = returnStamp; - this.invokeKind = invokeKind; - assert !isPlaceholderBci(bci); + /** + * Encapsulates the parameters for constructing a {@link MacroNode} that are the same for all + * leaf constructor call sites. Collecting the parameters in an object simplifies passing the + * parameters through the many chained constructor calls. + */ + public static class MacroParams { + public final InvokeKind invokeKind; + public final ResolvedJavaMethod callerMethod; + public final ResolvedJavaMethod targetMethod; + public final int bci; + public final StampPair returnStamp; + public final ValueNode[] arguments; + + public MacroParams(InvokeKind invokeKind, + ResolvedJavaMethod callerMethod, + ResolvedJavaMethod targetMethod, + int bci, + StampPair returnStamp, + ValueNode... arguments) { + this.invokeKind = invokeKind; + this.callerMethod = callerMethod; + this.targetMethod = targetMethod; + this.bci = bci; + this.returnStamp = returnStamp; + this.arguments = arguments; + } + + public static MacroParams of(GraphBuilderContext b, ResolvedJavaMethod targetMethod, ValueNode... arguments) { + return new MacroParams(b.getInvokeKind(), b.getMethod(), targetMethod, b.bci(), b.getInvokeReturnStamp(b.getAssumptions()), arguments); + } + + public static MacroParams of(GraphBuilderContext b, InvokeKind invokeKind, ResolvedJavaMethod targetMethod, ValueNode... arguments) { + return new MacroParams(invokeKind, b.getMethod(), targetMethod, b.bci(), b.getInvokeReturnStamp(b.getAssumptions()), arguments); + } + + public static MacroParams of(InvokeKind invokeKind, + ResolvedJavaMethod callerMethod, + ResolvedJavaMethod targetMethod, + int bci, + StampPair returnStamp, + ValueNode... arguments) { + return new MacroParams(invokeKind, callerMethod, targetMethod, bci, returnStamp, arguments); + } + } + + protected MacroNode(NodeClass c, MacroParams p) { + super(c, p.returnStamp != null ? p.returnStamp.getTrustedStamp() : null); + assertArgumentCount(p.targetMethod, p.arguments); + this.arguments = new NodeInputList<>(this, p.arguments); + this.bci = p.bci; + this.callerMethod = p.callerMethod; + this.targetMethod = p.targetMethod; + this.returnStamp = p.returnStamp; + this.invokeKind = p.invokeKind; + assert !isPlaceholderBci(p.bci); + } + + @Override + public ResolvedJavaMethod getContextMethod() { + return callerMethod; } protected void assertArgumentCount(ResolvedJavaMethod method, ValueNode... args) { @@ -125,11 +176,20 @@ public abstract class MacroNode extends FixedWithNextNode implements Lowerable, return bci; } + @Override + public void setBci(int bci) { + // nothing to do here, macro nodes get bci during construction + } + @Override public ResolvedJavaMethod getTargetMethod() { return targetMethod; } + public InvokeKind getInvokeKind() { + return invokeKind; + } + protected FrameState stateAfter() { return null; } @@ -204,17 +264,6 @@ public abstract class MacroNode extends FixedWithNextNode implements Lowerable, } if (invoke.stateAfter() == null) { - ResolvedJavaMethod method = graph().method(); - if (!IS_IN_NATIVE_IMAGE) { - if (method.getAnnotation(MethodSubstitution.class) != null || method.getAnnotation(Snippet.class) != null) { - // One cause for this is that a MacroNode is created for a method that - // no longer needs a MacroNode. For example, Class.getComponentType() - // only needs a MacroNode prior to JDK9 as it was given a non-native - // implementation in JDK9. - throw new GraalError("%s macro created for call to %s in %s must be lowerable to a snippet or intrinsic graph. " + - "Maybe a macro node is not needed for this method in the current JDK?", getClass().getSimpleName(), targetMethod.format("%h.%n(%p)"), graph()); - } - } throw new GraalError("%s: cannot lower to invoke without state: %s", graph(), this); } invoke.lower(tool); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroStateSplitNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroStateSplitNode.java index ea7fba35d07..57283df6e1f 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroStateSplitNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroStateSplitNode.java @@ -24,25 +24,21 @@ package org.graalvm.compiler.replacements.nodes; -import org.graalvm.compiler.core.common.type.StampPair; import org.graalvm.compiler.debug.GraalError; import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.nodeinfo.InputType; import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind; import org.graalvm.compiler.nodes.FrameState; import org.graalvm.compiler.nodes.Invoke; import org.graalvm.compiler.nodes.InvokeNode; import org.graalvm.compiler.nodes.StateSplit; import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.java.MethodCallTargetNode; import org.graalvm.compiler.nodes.memory.MemoryKill; import org.graalvm.compiler.nodes.memory.SingleMemoryKill; import jdk.internal.vm.compiler.word.LocationIdentity; import jdk.vm.ci.code.BytecodeFrame; -import jdk.vm.ci.meta.ResolvedJavaMethod; /** * This is an extension of {@link MacroNode} that is a {@link StateSplit} and a {@link MemoryKill}. @@ -53,8 +49,8 @@ public abstract class MacroStateSplitNode extends MacroNode implements StateSpli public static final NodeClass TYPE = NodeClass.create(MacroStateSplitNode.class); @OptionalInput(InputType.State) protected FrameState stateAfter; - protected MacroStateSplitNode(NodeClass c, InvokeKind invokeKind, ResolvedJavaMethod targetMethod, int bci, StampPair returnStamp, ValueNode... arguments) { - super(c, invokeKind, targetMethod, bci, returnStamp, arguments); + protected MacroStateSplitNode(NodeClass c, MacroParams p) { + super(c, p); } @Override diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MethodHandleNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MethodHandleNode.java index 544008d1f64..134a7e53739 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MethodHandleNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MethodHandleNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -81,8 +81,8 @@ public final class MethodHandleNode extends MacroStateSplitNode implements Simpl protected final IntrinsicMethod intrinsicMethod; - public MethodHandleNode(IntrinsicMethod intrinsicMethod, InvokeKind invokeKind, ResolvedJavaMethod targetMethod, int bci, StampPair returnStamp, ValueNode... arguments) { - super(TYPE, invokeKind, targetMethod, bci, returnStamp, arguments); + public MethodHandleNode(IntrinsicMethod intrinsicMethod, MacroParams p) { + super(TYPE, p); this.intrinsicMethod = intrinsicMethod; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ObjectClone.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ObjectClone.java new file mode 100644 index 00000000000..1741d661a99 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ObjectClone.java @@ -0,0 +1,159 @@ +/* + * Copyright (c) 2013, 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.replacements.nodes; + +import java.util.Collections; + +import org.graalvm.compiler.core.common.type.ObjectStamp; +import org.graalvm.compiler.core.common.type.Stamp; +import org.graalvm.compiler.core.common.type.StampFactory; +import org.graalvm.compiler.nodes.ConstantNode; +import org.graalvm.compiler.nodes.NodeView; +import org.graalvm.compiler.nodes.StateSplit; +import org.graalvm.compiler.nodes.ValueNode; +import org.graalvm.compiler.nodes.java.LoadFieldNode; +import org.graalvm.compiler.nodes.java.LoadIndexedNode; +import org.graalvm.compiler.nodes.java.MonitorIdNode; +import org.graalvm.compiler.nodes.spi.ArrayLengthProvider; +import org.graalvm.compiler.nodes.spi.VirtualizableAllocation; +import org.graalvm.compiler.nodes.spi.VirtualizerTool; +import org.graalvm.compiler.nodes.util.GraphUtil; +import org.graalvm.compiler.nodes.virtual.VirtualArrayNode; +import org.graalvm.compiler.nodes.virtual.VirtualInstanceNode; +import org.graalvm.compiler.nodes.virtual.VirtualObjectNode; + +import jdk.vm.ci.meta.Assumptions; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.ResolvedJavaType; + +public interface ObjectClone extends StateSplit, VirtualizableAllocation, ArrayLengthProvider { + + ValueNode getObject(); + + int bci(); + + default Stamp computeStamp(ValueNode object) { + Stamp objectStamp = object.stamp(NodeView.DEFAULT); + if (objectStamp instanceof ObjectStamp) { + objectStamp = objectStamp.join(StampFactory.objectNonNull()); + } + return objectStamp; + } + + /* + * Looks at the given stamp and determines if it is an exact type (or can be assumed to be an + * exact type) and if it is a cloneable type. + * + * If yes, then the exact type is returned, otherwise it returns null. + */ + default ResolvedJavaType getConcreteType(Stamp forStamp) { + if (!(forStamp instanceof ObjectStamp)) { + return null; + } + ObjectStamp objectStamp = (ObjectStamp) forStamp; + if (objectStamp.type() == null) { + return null; + } else if (objectStamp.isExactType()) { + return objectStamp.type().isCloneableWithAllocation() ? objectStamp.type() : null; + } else if (objectStamp.type().isArray()) { + return objectStamp.type(); + } + return null; + } + + default LoadFieldNode genLoadFieldNode(Assumptions assumptions, ValueNode originalAlias, ResolvedJavaField field) { + return LoadFieldNode.create(assumptions, originalAlias, field); + } + + default LoadIndexedNode genLoadIndexedNode(Assumptions assumptions, ValueNode originalAlias, ValueNode index, JavaKind elementKind) { + return new LoadIndexedNode(assumptions, originalAlias, index, null, elementKind); + } + + @Override + default void virtualize(VirtualizerTool tool) { + ValueNode originalAlias = tool.getAlias(getObject()); + if (originalAlias instanceof VirtualObjectNode) { + VirtualObjectNode originalVirtual = (VirtualObjectNode) originalAlias; + if (originalVirtual.type().isCloneableWithAllocation()) { + ValueNode[] newEntryState = new ValueNode[originalVirtual.entryCount()]; + for (int i = 0; i < newEntryState.length; i++) { + newEntryState[i] = tool.getEntry(originalVirtual, i); + } + VirtualObjectNode newVirtual = originalVirtual.duplicate(); + tool.createVirtualObject(newVirtual, newEntryState, Collections. emptyList(), false); + tool.replaceWithVirtual(newVirtual); + } + } else { + ResolvedJavaType type = getConcreteType(originalAlias.stamp(NodeView.DEFAULT)); + if (type == null) { + return; + } + if (!type.isArray()) { + VirtualInstanceNode newVirtual = new VirtualInstanceNode(type, true); + ResolvedJavaField[] fields = newVirtual.getFields(); + + ValueNode[] state = new ValueNode[fields.length]; + for (int i = 0; i < fields.length; i++) { + LoadFieldNode load = genLoadFieldNode(asNode().graph().getAssumptions(), originalAlias, fields[i]); + state[i] = load; + tool.addNode(load); + } + tool.createVirtualObject(newVirtual, state, Collections. emptyList(), false); + tool.replaceWithVirtual(newVirtual); + } else { + ValueNode length = findLength(FindLengthMode.SEARCH_ONLY, tool.getConstantReflection()); + if (length == null) { + return; + } + ValueNode lengthAlias = tool.getAlias(length); + if (!lengthAlias.isConstant()) { + return; + } + int constantLength = lengthAlias.asJavaConstant().asInt(); + if (constantLength >= 0 && constantLength <= tool.getMaximumEntryCount()) { + ValueNode[] state = new ValueNode[constantLength]; + ResolvedJavaType componentType = type.getComponentType(); + for (int i = 0; i < constantLength; i++) { + ConstantNode index = ConstantNode.forInt(i); + LoadIndexedNode load = genLoadIndexedNode(asNode().graph().getAssumptions(), originalAlias, index, componentType.getJavaKind()); + state[i] = load; + tool.addNode(index); + tool.addNode(load); + } + VirtualObjectNode virtualObject = new VirtualArrayNode(componentType, constantLength); + tool.createVirtualObject(virtualObject, state, Collections. emptyList(), false); + tool.replaceWithVirtual(virtualObject); + } + } + } + } + + @Override + default ValueNode findLength(FindLengthMode mode, ConstantReflectionProvider constantReflection) { + return GraphUtil.arrayLength(getObject(), mode, constantReflection); + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ProfileBooleanNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ProfileBooleanNode.java index f7bbeff4495..665e2359281 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ProfileBooleanNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ProfileBooleanNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -26,14 +26,12 @@ package org.graalvm.compiler.replacements.nodes; import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN; import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN; +import static org.graalvm.compiler.nodes.util.ConstantReflectionUtil.loadIntArrayConstant; -import org.graalvm.compiler.api.replacements.SnippetReflectionProvider; -import org.graalvm.compiler.core.common.type.StampPair; import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.graph.spi.Simplifiable; import org.graalvm.compiler.graph.spi.SimplifierTool; import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.CallTargetNode; import org.graalvm.compiler.nodes.ConstantNode; import org.graalvm.compiler.nodes.FixedGuardNode; import org.graalvm.compiler.nodes.LogicConstantNode; @@ -42,20 +40,19 @@ import org.graalvm.compiler.nodes.NodeView; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.calc.IntegerEqualsNode; +import jdk.vm.ci.meta.ConstantReflectionProvider; import jdk.vm.ci.meta.DeoptimizationAction; import jdk.vm.ci.meta.DeoptimizationReason; import jdk.vm.ci.meta.JavaConstant; -import jdk.vm.ci.meta.ResolvedJavaMethod; @NodeInfo(cycles = CYCLES_UNKNOWN, size = SIZE_UNKNOWN) public class ProfileBooleanNode extends MacroStateSplitNode implements Simplifiable { public static final NodeClass TYPE = NodeClass.create(ProfileBooleanNode.class); - private final SnippetReflectionProvider snippetReflection; + private final ConstantReflectionProvider constantProvider; - public ProfileBooleanNode(SnippetReflectionProvider snippetReflection, CallTargetNode.InvokeKind invokeKind, ResolvedJavaMethod targetMethod, int bci, StampPair returnStamp, - ValueNode... arguments) { - super(TYPE, invokeKind, targetMethod, bci, returnStamp, arguments); - this.snippetReflection = snippetReflection; + public ProfileBooleanNode(ConstantReflectionProvider constantProvider, MacroParams p) { + super(TYPE, p); + this.constantProvider = constantProvider; } ValueNode getResult() { @@ -77,7 +74,7 @@ public class ProfileBooleanNode extends MacroStateSplitNode implements Simplifia ValueNode counters = getCounters(); if (counters.isConstant()) { ValueNode newResult = result; - int[] counts = snippetReflection.asObject(int[].class, (JavaConstant) counters.asConstant()); + int[] counts = loadIntArrayConstant(constantProvider, (JavaConstant) counters.asConstant(), 2); if (counts != null && counts.length == 2) { int falseCount = counts[0]; int trueCount = counts[1]; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/PureFunctionMacroNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/PureFunctionMacroNode.java index 8f96760bf5b..e728b5c5f9f 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/PureFunctionMacroNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/PureFunctionMacroNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -24,19 +24,16 @@ package org.graalvm.compiler.replacements.nodes; -import org.graalvm.compiler.core.common.type.StampPair; import org.graalvm.compiler.graph.Node; import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.graph.spi.Canonicalizable; import org.graalvm.compiler.graph.spi.CanonicalizerTool; import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind; import org.graalvm.compiler.nodes.ConstantNode; import org.graalvm.compiler.nodes.ValueNode; import jdk.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.MetaAccessProvider; -import jdk.vm.ci.meta.ResolvedJavaMethod; /** * This node class can be used to create {@link MacroNode}s for simple pure functions like @@ -47,8 +44,8 @@ public abstract class PureFunctionMacroNode extends MacroStateSplitNode implemen public static final NodeClass TYPE = NodeClass.create(PureFunctionMacroNode.class); - public PureFunctionMacroNode(NodeClass c, InvokeKind invokeKind, ResolvedJavaMethod targetMethod, int bci, StampPair returnStamp, ValueNode... arguments) { - super(c, invokeKind, targetMethod, bci, returnStamp, arguments); + public PureFunctionMacroNode(NodeClass c, MacroParams p) { + super(c, p); } /** diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ReflectionGetCallerClassNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ReflectionGetCallerClassNode.java similarity index 78% rename from src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ReflectionGetCallerClassNode.java rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ReflectionGetCallerClassNode.java index cab3afb52db..4c44999b164 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ReflectionGetCallerClassNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ReflectionGetCallerClassNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -22,37 +22,32 @@ */ -package org.graalvm.compiler.hotspot.replacements; +package org.graalvm.compiler.replacements.nodes; -import org.graalvm.compiler.core.common.type.StampPair; import org.graalvm.compiler.debug.GraalError; import org.graalvm.compiler.graph.Node; import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.graph.spi.Canonicalizable; import org.graalvm.compiler.graph.spi.CanonicalizerTool; import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind; import org.graalvm.compiler.nodes.ConstantNode; import org.graalvm.compiler.nodes.FrameState; import org.graalvm.compiler.nodes.InvokeNode; -import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.spi.Lowerable; import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.replacements.nodes.MacroStateSplitNode; -import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod; -import jdk.vm.ci.hotspot.HotSpotResolvedObjectType; import jdk.vm.ci.meta.ConstantReflectionProvider; import jdk.vm.ci.meta.MetaAccessProvider; import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; @NodeInfo -public final class ReflectionGetCallerClassNode extends MacroStateSplitNode implements Canonicalizable, Lowerable { +public abstract class ReflectionGetCallerClassNode extends MacroStateSplitNode implements Canonicalizable, Lowerable { public static final NodeClass TYPE = NodeClass.create(ReflectionGetCallerClassNode.class); - public ReflectionGetCallerClassNode(InvokeKind invokeKind, ResolvedJavaMethod targetMethod, int bci, StampPair returnStamp, ValueNode... arguments) { - super(TYPE, invokeKind, targetMethod, bci, returnStamp, arguments); + protected ReflectionGetCallerClassNode(NodeClass c, MacroParams p) { + super(c, p); } @Override @@ -92,20 +87,20 @@ public final class ReflectionGetCallerClassNode extends MacroStateSplitNode impl // NOTE: Start the loop at depth 1 because the current frame state does // not include the Reflection.getCallerClass() frame. for (int n = 1; state != null; state = state.outerFrameState(), n++) { - HotSpotResolvedJavaMethod method = (HotSpotResolvedJavaMethod) state.getMethod(); + ResolvedJavaMethod method = state.getMethod(); switch (n) { case 0: throw GraalError.shouldNotReachHere("current frame state does not include the Reflection.getCallerClass frame"); case 1: // Frame 0 and 1 must be caller sensitive (see JVM_GetCallerClass). - if (!method.isCallerSensitive()) { + if (!isCallerSensitive(method)) { return null; // bail-out; let JVM_GetCallerClass do the work } break; default: - if (!method.ignoredBySecurityStackWalk()) { + if (!ignoredBySecurityStackWalk(method)) { // We have reached the desired frame; return the holder class. - HotSpotResolvedObjectType callerClass = method.getDeclaringClass(); + ResolvedJavaType callerClass = method.getDeclaringClass(); return ConstantNode.forConstant(constantReflection.asJavaClass(callerClass), metaAccess); } break; @@ -114,4 +109,7 @@ public final class ReflectionGetCallerClassNode extends MacroStateSplitNode impl return null; // bail-out; let JVM_GetCallerClass do the work } + protected abstract boolean isCallerSensitive(ResolvedJavaMethod method); + + protected abstract boolean ignoredBySecurityStackWalk(ResolvedJavaMethod method); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/UnaryMathIntrinsicNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/UnaryMathIntrinsicNode.java index fb3fa3c7b2e..b0d843d0e83 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/UnaryMathIntrinsicNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/UnaryMathIntrinsicNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -27,8 +27,7 @@ package org.graalvm.compiler.replacements.nodes; import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64; import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1; -import jdk.vm.ci.meta.Value; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; +import org.graalvm.compiler.core.common.spi.ForeignCallSignature; import org.graalvm.compiler.core.common.type.FloatStamp; import org.graalvm.compiler.core.common.type.PrimitiveStamp; import org.graalvm.compiler.core.common.type.Stamp; @@ -44,10 +43,10 @@ import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.calc.UnaryNode; import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable; import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; +import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; import jdk.vm.ci.meta.JavaKind; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; +import jdk.vm.ci.meta.Value; @NodeInfo(nameTemplate = "MathIntrinsic#{p#operation/s}", cycles = CYCLES_64, size = SIZE_1) public final class UnaryMathIntrinsicNode extends UnaryNode implements ArithmeticLIRLowerable, Lowerable { @@ -56,17 +55,17 @@ public final class UnaryMathIntrinsicNode extends UnaryNode implements Arithmeti protected final UnaryOperation operation; public enum UnaryOperation { - LOG(new ForeignCallDescriptor("arithmeticLog", double.class, double.class)), - LOG10(new ForeignCallDescriptor("arithmeticLog10", double.class, double.class)), - SIN(new ForeignCallDescriptor("arithmeticSin", double.class, double.class)), - COS(new ForeignCallDescriptor("arithmeticCos", double.class, double.class)), - TAN(new ForeignCallDescriptor("arithmeticTan", double.class, double.class)), - EXP(new ForeignCallDescriptor("arithmeticExp", double.class, double.class)); + LOG(new ForeignCallSignature("arithmeticLog", double.class, double.class)), + LOG10(new ForeignCallSignature("arithmeticLog10", double.class, double.class)), + SIN(new ForeignCallSignature("arithmeticSin", double.class, double.class)), + COS(new ForeignCallSignature("arithmeticCos", double.class, double.class)), + TAN(new ForeignCallSignature("arithmeticTan", double.class, double.class)), + EXP(new ForeignCallSignature("arithmeticExp", double.class, double.class)); - public final ForeignCallDescriptor foreignCallDescriptor; + public final ForeignCallSignature foreignCallSignature; - UnaryOperation(ForeignCallDescriptor foreignCallDescriptor) { - this.foreignCallDescriptor = foreignCallDescriptor; + UnaryOperation(ForeignCallSignature foreignCallSignature) { + this.foreignCallSignature = foreignCallSignature; } public double compute(double value) { @@ -156,11 +155,6 @@ public final class UnaryMathIntrinsicNode extends UnaryNode implements Arithmeti return getOperation().computeStamp(valueStamp); } - @Override - public void lower(LoweringTool tool) { - tool.getLowerer().lower(this, tool); - } - @Override public void generate(NodeLIRBuilderTool nodeValueMap, ArithmeticLIRGeneratorTool gen) { // We can only reach here in the math stubs diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/VirtualizableInvokeMacroNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/VirtualizableInvokeMacroNode.java index f2acc44f321..28c7fc689f0 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/VirtualizableInvokeMacroNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/VirtualizableInvokeMacroNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -24,17 +24,13 @@ package org.graalvm.compiler.replacements.nodes; -import org.graalvm.compiler.core.common.type.StampPair; import org.graalvm.compiler.graph.NodeClass; import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.spi.Virtualizable; import org.graalvm.compiler.nodes.spi.VirtualizerTool; import org.graalvm.compiler.nodes.virtual.VirtualObjectNode; -import jdk.vm.ci.meta.ResolvedJavaMethod; - /** * A helper class to allow elimination of byte code instrumentation that could interfere with escape * analysis. @@ -44,8 +40,8 @@ public class VirtualizableInvokeMacroNode extends MacroStateSplitNode implements public static final NodeClass TYPE = NodeClass.create(VirtualizableInvokeMacroNode.class); - public VirtualizableInvokeMacroNode(InvokeKind invokeKind, ResolvedJavaMethod targetMethod, int bci, StampPair returnStamp, ValueNode... arguments) { - super(TYPE, invokeKind, targetMethod, bci, returnStamp, arguments); + public VirtualizableInvokeMacroNode(MacroParams p) { + super(TYPE, p); } @Override diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/GraalServices.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/GraalServices.java index 55212e844ff..6af678339fe 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/GraalServices.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/GraalServices.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -554,4 +554,8 @@ public final class GraalServices { public static VirtualObject createVirtualObject(ResolvedJavaType type, int id, boolean isAutoBox) { return VirtualObject.get(type, id, isAutoBox); } + + public static int getJavaUpdateVersion() { + return Runtime.version().update(); + } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/IsolateUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/IsolateUtil.java new file mode 100644 index 00000000000..7f1ccff82e0 --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/IsolateUtil.java @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package org.graalvm.compiler.serviceprovider; + +/** + * Utility methods that provide access to isolate details. + */ +public final class IsolateUtil { + + /** + * Gets the address of the current isolate or 0 if this not an isolate-aware runtime. + */ + public static long getIsolateAddress() { + // Substituted by + // com.oracle.svm.graal.Target_org_graalvm_compiler_serviceprovider_IsolateUtil + return 0; + } + + /** + * Gets an identifier for the current isolate or 0 if this not an isolate-aware runtime. The + * returned value is guaranteed to be unique for the first {@code 2^64 - 1} isolates in the + * process. + */ + public static long getIsolateID() { + // Substituted by + // com.oracle.svm.graal.Target_org_graalvm_compiler_serviceprovider_IsolateUtil + return 0; + } + + /** + * Gets a string identifying the current isolate. + * + * If this is not an isolate-aware runtime, an empty string is returned. + * + * If {@code withAddress == true}, then + * {@code String.format("%d@%x", getIsolateID(), getIsolateAddress())} is returned. + * + * Otherwise, {@code String.valueOf(getIsolateID())} is returned. + */ + public static String getIsolateID(boolean withAddress) { + long isolateAddress = getIsolateAddress(); + if (isolateAddress == 0) { + return ""; + } + if (withAddress) { + return String.format("%d@%x", getIsolateID(), isolateAddress); + } + return String.valueOf(getIsolateID()); + } + + private IsolateUtil() { + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/GraalTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/GraalTest.java index 1d2e3afd58d..86d4c4e9149 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/GraalTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/GraalTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, 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 @@ -24,7 +24,6 @@ package org.graalvm.compiler.test; -import static org.graalvm.compiler.debug.DebugContext.DEFAULT_LOG_STREAM; import static org.graalvm.compiler.debug.DebugContext.NO_DESCRIPTION; import java.io.IOException; @@ -46,6 +45,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; import org.graalvm.compiler.debug.DebugContext; +import org.graalvm.compiler.debug.DebugContext.Builder; import org.graalvm.compiler.debug.DebugDumpHandler; import org.graalvm.compiler.debug.DebugHandlersFactory; import org.graalvm.compiler.debug.GlobalMetrics; @@ -61,6 +61,7 @@ import org.junit.rules.DisableOnDebug; import org.junit.rules.TestRule; import org.junit.rules.Timeout; +import jdk.vm.ci.code.Architecture; import jdk.vm.ci.meta.ResolvedJavaMethod; import sun.misc.Unsafe; @@ -100,10 +101,26 @@ public class GraalTest { } protected Method getMethod(Class clazz, String methodName, Class... parameterTypes) { - try { - return clazz.getMethod(methodName, parameterTypes); - } catch (NoSuchMethodException | SecurityException e) { - throw new RuntimeException("method not found: " + methodName + "" + Arrays.toString(parameterTypes)); + Method found = null; + for (Method m : clazz.getMethods()) { + if (m.getName().equals(methodName) && Arrays.equals(m.getParameterTypes(), parameterTypes)) { + Assert.assertNull(found); + found = m; + } + } + if (found == null) { + /* Now look for non-public methods (but this does not look in superclasses). */ + for (Method m : clazz.getDeclaredMethods()) { + if (m.getName().equals(methodName) && Arrays.equals(m.getParameterTypes(), parameterTypes)) { + Assert.assertNull(found); + found = m; + } + } + } + if (found != null) { + return found; + } else { + throw new RuntimeException("method not found: " + methodName + " " + Arrays.toString(parameterTypes)); } } @@ -248,6 +265,19 @@ public class GraalTest { } } + /** + * Check for SPARC architecture by name. The instance of JVMCI's SPARC class can't be used with + * JDK 15 because SPARC port was removed: + * + * @see "https://bugs.openjdk.java.net/browse/JDK-8241787" + * + * @param arch is current CPU architecture {@link Architecture} + * @return true if current CPU architecture is SPARC + */ + public static boolean isSPARC(Architecture arch) { + return arch.getName().equals("SPARC"); + } + /** * Gets the value used by {@link #assertDeepEquals(Object, Object)} and * {@link #assertDeepEquals(String, Object, Object)} for the maximum delta between two doubles @@ -440,7 +470,7 @@ public class GraalTest { } else { descr = new DebugContext.Description(method, id == null ? method.getName() : id); } - DebugContext debug = DebugContext.create(options, descr, globalMetrics, DEFAULT_LOG_STREAM, getDebugHandlersFactories()); + DebugContext debug = new Builder(options, getDebugHandlersFactories()).globalMetrics(globalMetrics).description(descr).build(); cached.add(debug); return debug; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/nodes/MaterializedObjectState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/nodes/MaterializedObjectState.java index 219e9adaefb..a62d9614c6f 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/nodes/MaterializedObjectState.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/nodes/MaterializedObjectState.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020, 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 @@ -54,8 +54,4 @@ public final class MaterializedObjectState extends EscapeObjectState implements return graph().addWithoutUnique(new MaterializedObjectState(object(), materializedValue)); } - @Override - public void applyToNonVirtual(NodeClosure closure) { - closure.apply(this, materializedValue); - } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/nodes/VirtualObjectState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/nodes/VirtualObjectState.java index 4f159e0af69..1fd424d13ec 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/nodes/VirtualObjectState.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/nodes/VirtualObjectState.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2020, 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 @@ -64,12 +64,4 @@ public final class VirtualObjectState extends EscapeObjectState implements Node. return graph().addWithoutUnique(new VirtualObjectState(object(), values)); } - @Override - public void applyToNonVirtual(NodeClosure closure) { - for (ValueNode value : values) { - if (value != null) { - closure.apply(this, value); - } - } - } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EffectsPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EffectsPhase.java index 37c41aaee2c..43f212c9b5b 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EffectsPhase.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EffectsPhase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -41,6 +41,7 @@ import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase; import org.graalvm.compiler.phases.common.util.EconomicSetNodeEventListener; import org.graalvm.compiler.phases.graph.ReentrantBlockIterator; import org.graalvm.compiler.phases.schedule.SchedulePhase; +import org.graalvm.compiler.phases.schedule.SchedulePhase.SchedulingStrategy; public abstract class EffectsPhase extends BasePhase { @@ -56,17 +57,23 @@ public abstract class EffectsPhase extends private final int maxIterations; protected final CanonicalizerPhase canonicalizer; private final boolean unscheduled; + private final SchedulePhase.SchedulingStrategy strategy; protected EffectsPhase(int maxIterations, CanonicalizerPhase canonicalizer) { - this(maxIterations, canonicalizer, false); + this(maxIterations, canonicalizer, false, SchedulingStrategy.EARLIEST); } - protected EffectsPhase(int maxIterations, CanonicalizerPhase canonicalizer, boolean unscheduled) { + protected EffectsPhase(int maxIterations, CanonicalizerPhase canonicalizer, boolean unscheduled, SchedulingStrategy strategy) { + this.strategy = strategy; this.maxIterations = maxIterations; this.canonicalizer = canonicalizer; this.unscheduled = unscheduled; } + protected EffectsPhase(int maxIterations, CanonicalizerPhase canonicalizer, boolean unscheduled) { + this(maxIterations, canonicalizer, unscheduled, unscheduled ? null : SchedulingStrategy.EARLIEST); + } + @Override protected void run(StructuredGraph graph, CoreProvidersT context) { runAnalysis(graph, context); @@ -74,6 +81,7 @@ public abstract class EffectsPhase extends @SuppressWarnings("try") public boolean runAnalysis(StructuredGraph graph, CoreProvidersT context) { + assert unscheduled || strategy != null; boolean changed = false; CompilationAlarm compilationAlarm = CompilationAlarm.current(); DebugContext debug = graph.getDebug(); @@ -85,7 +93,7 @@ public abstract class EffectsPhase extends schedule = null; cfg = ControlFlowGraph.compute(graph, true, true, false, false); } else { - new SchedulePhase(SchedulePhase.SchedulingStrategy.EARLIEST).apply(graph, false); + new SchedulePhase(strategy).apply(graph, false); schedule = graph.getLastSchedule(); cfg = schedule.getCFG(); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/GraphEffectList.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/GraphEffectList.java index 95dae15c5b5..0d294e6236c 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/GraphEffectList.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/GraphEffectList.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -29,6 +29,8 @@ import java.util.ArrayList; import org.graalvm.compiler.debug.DebugCloseable; import org.graalvm.compiler.debug.DebugContext; import org.graalvm.compiler.graph.Node; +import org.graalvm.compiler.nodes.AbstractBeginNode; +import org.graalvm.compiler.nodes.BeginNode; import org.graalvm.compiler.nodes.ControlSinkNode; import org.graalvm.compiler.nodes.FixedNode; import org.graalvm.compiler.nodes.FixedWithNextNode; @@ -39,8 +41,10 @@ import org.graalvm.compiler.nodes.PhiNode; import org.graalvm.compiler.nodes.PiNode; import org.graalvm.compiler.nodes.StructuredGraph; import org.graalvm.compiler.nodes.ValueNode; +import org.graalvm.compiler.nodes.WithExceptionNode; import org.graalvm.compiler.nodes.debug.DynamicCounterNode; import org.graalvm.compiler.nodes.debug.WeakCounterNode; +import org.graalvm.compiler.nodes.memory.MemoryKill; import org.graalvm.compiler.nodes.util.GraphUtil; import org.graalvm.compiler.nodes.virtual.EscapeObjectState; import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase; @@ -173,11 +177,28 @@ public final class GraphEffectList extends EffectList { * @param node The fixed node that should be deleted. */ public void deleteNode(Node node) { - add("delete fixed node", (graph, obsoleteNodes) -> { - if (node instanceof FixedWithNextNode) { - GraphUtil.unlinkFixedNode((FixedWithNextNode) node); + add("delete fixed node", new Effect() { + @Override + public void apply(StructuredGraph graph, ArrayList obsoleteNodes) { + if (node instanceof FixedWithNextNode) { + GraphUtil.unlinkFixedNode((FixedWithNextNode) node); + } else if (node instanceof WithExceptionNode && node.isAlive()) { + WithExceptionNode withExceptionNode = (WithExceptionNode) node; + AbstractBeginNode next = withExceptionNode.next(); + GraphUtil.unlinkAndKillExceptionEdge(withExceptionNode); + if (next.hasNoUsages() && next instanceof MemoryKill) { + // This is a killing begin which is no longer needed. + graph.replaceFixedWithFixed(next, graph.add(new BeginNode())); + } + obsoleteNodes.add(withExceptionNode); + } + obsoleteNodes.add(node); + } + + @Override + public boolean isCfgKill() { + return node instanceof WithExceptionNode; } - obsoleteNodes.add(node); }); } @@ -185,7 +206,9 @@ public final class GraphEffectList extends EffectList { add("kill if branch", new Effect() { @Override public void apply(StructuredGraph graph, ArrayList obsoleteNodes) { - graph.removeSplitPropagate(ifNode, ifNode.getSuccessor(constantCondition)); + if (ifNode.isAlive()) { + graph.removeSplitPropagate(ifNode, ifNode.getSuccessor(constantCondition)); + } } @Override @@ -196,7 +219,7 @@ public final class GraphEffectList extends EffectList { } public void replaceWithSink(FixedWithNextNode node, ControlSinkNode sink) { - add("kill if branch", new Effect() { + add("replace with sink", new Effect() { @SuppressWarnings("try") @Override public void apply(StructuredGraph graph, ArrayList obsoleteNodes) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/ObjectState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/ObjectState.java index 7db3f9478b6..3b553e240d6 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/ObjectState.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/ObjectState.java @@ -27,6 +27,7 @@ package org.graalvm.compiler.virtual.phases.ea; import java.util.Arrays; import java.util.List; +import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider; import org.graalvm.compiler.debug.CounterKey; import org.graalvm.compiler.debug.DebugContext; import org.graalvm.compiler.nodes.ValueNode; @@ -134,7 +135,7 @@ public class ObjectState { return j - valuePos; } - public EscapeObjectState createEscapeObjectState(DebugContext debug, VirtualObjectNode virtual) { + public EscapeObjectState createEscapeObjectState(DebugContext debug, MetaAccessExtensionProvider metaAccessExtensionProvider, VirtualObjectNode virtual) { GET_ESCAPED_OBJECT_STATE.increment(debug); if (cachedState == null) { CREATE_ESCAPED_OBJECT_STATE.increment(debug); @@ -147,7 +148,7 @@ public class ObjectState { */ ValueNode[] newEntries = entries.clone(); for (int i = 0; i < newEntries.length; i++) { - if (newEntries[i].asJavaConstant() == JavaConstant.defaultForKind(virtual.entryKind(i).getStackKind())) { + if (newEntries[i].asJavaConstant() == JavaConstant.defaultForKind(virtual.entryKind(metaAccessExtensionProvider, i).getStackKind())) { newEntries[i] = null; } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PEReadEliminationClosure.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PEReadEliminationClosure.java index 3daddbff400..bac5e1cf2fe 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PEReadEliminationClosure.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PEReadEliminationClosure.java @@ -37,7 +37,6 @@ import jdk.internal.vm.compiler.collections.Equivalence; import jdk.internal.vm.compiler.collections.MapCursor; import jdk.internal.vm.compiler.collections.Pair; import org.graalvm.compiler.core.common.cfg.Loop; -import org.graalvm.compiler.core.common.spi.ConstantFieldProvider; import org.graalvm.compiler.graph.Node; import org.graalvm.compiler.nodes.AbstractBeginNode; import org.graalvm.compiler.nodes.FieldLocationIdentity; @@ -63,8 +62,7 @@ import org.graalvm.compiler.nodes.java.StoreFieldNode; import org.graalvm.compiler.nodes.java.StoreIndexedNode; import org.graalvm.compiler.nodes.memory.MultiMemoryKill; import org.graalvm.compiler.nodes.memory.SingleMemoryKill; -import org.graalvm.compiler.nodes.spi.PlatformConfigurationProvider; -import org.graalvm.compiler.nodes.spi.LoweringProvider; +import org.graalvm.compiler.nodes.spi.CoreProviders; import org.graalvm.compiler.nodes.type.StampTool; import org.graalvm.compiler.nodes.util.GraphUtil; import org.graalvm.compiler.nodes.virtual.VirtualArrayNode; @@ -72,10 +70,8 @@ import org.graalvm.compiler.options.OptionValues; import org.graalvm.compiler.virtual.phases.ea.PEReadEliminationBlockState.ReadCacheEntry; import jdk.internal.vm.compiler.word.LocationIdentity; -import jdk.vm.ci.meta.ConstantReflectionProvider; import jdk.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.JavaKind; -import jdk.vm.ci.meta.MetaAccessProvider; import jdk.vm.ci.meta.ResolvedJavaType; public final class PEReadEliminationClosure extends PartialEscapeClosure { @@ -89,9 +85,8 @@ public final class PEReadEliminationClosure extends PartialEscapeClosure> extends EffectsClosure { @@ -130,19 +125,21 @@ public abstract class PartialEscapeClosure { + private final class CollectVirtualObjectsClosure2 extends VirtualState.NodePositionClosure { private final EconomicSet virtual; private final GraphEffectList effects; private final BlockT state; - private CollectVirtualObjectsClosure(EconomicSet virtual, GraphEffectList effects, BlockT state) { + private CollectVirtualObjectsClosure2(EconomicSet virtual, GraphEffectList effects, BlockT state) { this.virtual = virtual; this.effects = effects; this.state = state; } @Override - public void apply(Node usage, ValueNode value) { + public void apply(Node from, Position p) { + ValueNode value = (ValueNode) p.get(from); + Node usage = from; if (value instanceof VirtualObjectNode) { VirtualObjectNode object = (VirtualObjectNode) value; if (object.getObjectId() != -1 && state.getObjectStateOptional(object) != null) { @@ -157,6 +154,7 @@ public abstract class PartialEscapeClosure { - public Final(ScheduleResult schedule, MetaAccessProvider metaAccess, ConstantReflectionProvider constantReflection, ConstantFieldProvider constantFieldProvider, - LoweringProvider loweringProvider, PlatformConfigurationProvider platformConfigurationProvider) { - super(schedule, metaAccess, constantReflection, constantFieldProvider, loweringProvider, platformConfigurationProvider); + public Final(ScheduleResult schedule, CoreProviders providers) { + super(schedule, providers); } @Override @@ -181,17 +178,11 @@ public abstract class PartialEscapeClosure virtual = EconomicSet.create(Equivalence.IDENTITY_WITH_SYSTEM_HASHCODE); - frameState.applyToNonVirtual(new CollectVirtualObjectsClosure(virtual, effects, state)); + frameState.applyToNonVirtual(new CollectVirtualObjectsClosure2(virtual, effects, state)); collectLockedVirtualObjects(state, virtual); collectReferencedVirtualObjects(state, virtual); addVirtualMappings(frameState, virtual, state, effects); @@ -391,7 +382,7 @@ public abstract class PartialEscapeClosure virtual, BlockT state, GraphEffectList effects) { for (VirtualObjectNode obj : virtual) { - effects.addVirtualMapping(frameState, state.getObjectState(obj).createEscapeObjectState(debug, obj)); + effects.addVirtualMapping(frameState, state.getObjectState(obj).createEscapeObjectState(debug, tool.getMetaAccessExtensionProvider(), obj)); } } @@ -875,7 +866,7 @@ public abstract class PartialEscapeClosure { @@ -67,6 +68,13 @@ public class PartialEscapePhase extends EffectsPhase { this.cleanupPhase = cleanupPhase; } + public PartialEscapePhase(boolean iterative, boolean readElimination, CanonicalizerPhase canonicalizer, BasePhase cleanupPhase, OptionValues options, + SchedulePhase.SchedulingStrategy strategy) { + super(iterative ? EscapeAnalysisIterations.getValue(options) : 1, canonicalizer, false, strategy); + this.readElimination = readElimination; + this.cleanupPhase = cleanupPhase; + } + @Override protected void postIteration(StructuredGraph graph, CoreProviders context, EconomicSet changedNodes) { super.postIteration(graph, context, changedNodes); @@ -91,11 +99,9 @@ public class PartialEscapePhase extends EffectsPhase { } assert schedule != null; if (readElimination) { - return new PEReadEliminationClosure(schedule, context.getMetaAccess(), context.getConstantReflection(), context.getConstantFieldProvider(), context.getLowerer(), - context.getPlatformConfigurationProvider()); + return new PEReadEliminationClosure(schedule, context); } else { - return new PartialEscapeClosure.Final(schedule, context.getMetaAccess(), context.getConstantReflection(), context.getConstantFieldProvider(), context.getLowerer(), - context.getPlatformConfigurationProvider()); + return new PartialEscapeClosure.Final(schedule, context); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/ReadEliminationClosure.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/ReadEliminationClosure.java index 378b8f53519..9c553e3bb60 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/ReadEliminationClosure.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/ReadEliminationClosure.java @@ -153,49 +153,54 @@ public class ReadEliminationClosure extends EffectsClosure closure; private final Assumptions assumptions; private final OptionValues options; private final DebugContext debug; - private final LoweringProvider loweringProvider; private ConstantNode illegalConstant; - VirtualizerToolImpl(MetaAccessProvider metaAccess, ConstantReflectionProvider constantReflection, ConstantFieldProvider constantFieldProvider, - PlatformConfigurationProvider platformConfigurationProvider, PartialEscapeClosure closure, Assumptions assumptions, OptionValues options, DebugContext debug, - LoweringProvider loweringProvider) { - this.metaAccess = metaAccess; - this.constantReflection = constantReflection; - this.constantFieldProvider = constantFieldProvider; - this.platformConfigurationProvider = platformConfigurationProvider; + VirtualizerToolImpl(CoreProviders providers, PartialEscapeClosure closure, Assumptions assumptions, OptionValues options, DebugContext debug) { + super(providers); this.closure = closure; this.assumptions = assumptions; this.options = options; this.debug = debug; - this.loweringProvider = loweringProvider; } private boolean deleted; @@ -100,11 +86,6 @@ class VirtualizerToolImpl implements VirtualizerTool, CanonicalizerTool { return debug; } - @Override - public ConstantFieldProvider getConstantFieldProvider() { - return constantFieldProvider; - } - public void reset(PartialEscapeBlockState newState, ValueNode newCurrent, FixedNode newPosition, GraphEffectList newEffects) { deleted = false; state = newState; @@ -131,7 +112,7 @@ class VirtualizerToolImpl implements VirtualizerTool, CanonicalizerTool { public boolean setVirtualEntry(VirtualObjectNode virtual, int index, ValueNode value, JavaKind theAccessKind, long offset) { ObjectState obj = state.getObjectState(virtual); assert obj.isVirtual() : "not virtual: " + obj; - JavaKind entryKind = virtual.entryKind(index); + JavaKind entryKind = virtual.entryKind(this.getMetaAccessExtensionProvider(), index); JavaKind accessKind = theAccessKind != null ? theAccessKind : entryKind; ValueNode newValue = closure.getAliasAndResolve(state, value); getDebug().log(DebugContext.DETAILED_LEVEL, "Setting entry %d in virtual object %s %s results in %s", index, virtual.getObjectId(), virtual, state.getObjectState(virtual.getObjectId())); @@ -182,7 +163,7 @@ class VirtualizerToolImpl implements VirtualizerTool, CanonicalizerTool { if (entryKind == JavaKind.Int) { if (accessKind.needsTwoSlots()) { // Storing double word value two int slots - assert virtual.entryKind(index + 1) == JavaKind.Int; + assert virtual.entryKind(getMetaAccessExtensionProvider(), index + 1) == JavaKind.Int; state.setEntry(virtual.getObjectId(), index + 1, getIllegalConstant()); } else if (oldValue.getStackKind() == JavaKind.Double || oldValue.getStackKind() == JavaKind.Long) { // Splitting double word constant by storing over it with an int @@ -224,7 +205,7 @@ class VirtualizerToolImpl implements VirtualizerTool, CanonicalizerTool { } private boolean canVirtualizeLargeByteArrayUnsafeWrite(VirtualObjectNode virtual, JavaKind accessKind, long offset) { - return canVirtualizeLargeByteArrayUnsafeAccess() && virtual.isVirtualByteArrayAccess(accessKind) && + return canVirtualizeLargeByteArrayUnsafeAccess() && virtual.isVirtualByteArrayAccess(this.getMetaAccessExtensionProvider(), accessKind) && /* * Require aligned writes. Some architectures do not support recovering * writes to unaligned offsets. Since most use cases for this optimization @@ -361,20 +342,10 @@ class VirtualizerToolImpl implements VirtualizerTool, CanonicalizerTool { return state.removeLock(id); } - @Override - public MetaAccessProvider getMetaAccess() { - return metaAccess; - } - - @Override - public ConstantReflectionProvider getConstantReflection() { - return constantReflection; - } - @Override public boolean canVirtualizeLargeByteArrayUnsafeAccess() { - if (platformConfigurationProvider != null) { - return platformConfigurationProvider.canVirtualizeLargeByteArrayAccess(); + if (getPlatformConfigurationProvider() != null) { + return getPlatformConfigurationProvider().canVirtualizeLargeByteArrayAccess(); } return false; } @@ -396,8 +367,8 @@ class VirtualizerToolImpl implements VirtualizerTool, CanonicalizerTool { @Override public Integer smallestCompareWidth() { - if (loweringProvider != null) { - return loweringProvider.smallestCompareWidth(); + if (getLowerer() != null) { + return getLowerer().smallestCompareWidth(); } else { return null; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/Word.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/Word.java index b1d52476c9e..46b98f95b1b 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/Word.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/Word.java @@ -104,6 +104,7 @@ public abstract class Word implements SignedWord, UnsignedWord, Pointer { READ_BARRIERED, READ_HEAP, WRITE_POINTER, + WRITE_POINTER_SIDE_EFFECT_FREE, WRITE_OBJECT, WRITE_BARRIERED, CAS_POINTER, diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/WordOperationPlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/WordOperationPlugin.java index 6572df15b56..6f88f558761 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/WordOperationPlugin.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/WordOperationPlugin.java @@ -335,7 +335,8 @@ public class WordOperationPlugin implements NodePlugin, TypePlugin, InlineInvoke case WRITE_POINTER: case WRITE_OBJECT: case WRITE_BARRIERED: - case INITIALIZE: { + case INITIALIZE: + case WRITE_POINTER_SIDE_EFFECT_FREE: { assert args.length == 3 || args.length == 4; JavaKind writeKind = wordTypes.asKind(wordMethod.getSignature().getParameterType(wordMethod.isStatic() ? 2 : 1, wordMethod.getDeclaringClass())); AddressNode address = makeAddress(b, args[0], args[1]); @@ -464,11 +465,12 @@ public class WordOperationPlugin implements NodePlugin, TypePlugin, InlineInvoke } protected void writeOp(GraphBuilderContext b, JavaKind writeKind, AddressNode address, LocationIdentity location, ValueNode value, Opcode op) { - assert op == Opcode.WRITE_POINTER || op == Opcode.WRITE_OBJECT || op == Opcode.WRITE_BARRIERED || op == Opcode.INITIALIZE; + assert op == Opcode.WRITE_POINTER || op == Opcode.WRITE_POINTER_SIDE_EFFECT_FREE || op == Opcode.WRITE_OBJECT || op == Opcode.WRITE_BARRIERED || op == Opcode.INITIALIZE; final BarrierType barrier = (op == Opcode.WRITE_BARRIERED ? BarrierType.UNKNOWN : BarrierType.NONE); final boolean compressible = (op == Opcode.WRITE_OBJECT || op == Opcode.WRITE_BARRIERED); assert op != Opcode.INITIALIZE || location.isInit() : "must use init location for initializing"; - b.add(new JavaWriteNode(writeKind, address, location, value, barrier, compressible)); + final boolean hasSideEffect = (op != Opcode.WRITE_POINTER_SIDE_EFFECT_FREE); + b.add(new JavaWriteNode(writeKind, address, location, value, barrier, compressible, hasSideEffect)); } protected AbstractCompareAndSwapNode casOp(JavaKind writeKind, JavaKind returnKind, AddressNode address, LocationIdentity location, ValueNode expectedValue, ValueNode newValue) { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/WordTypes.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/WordTypes.java index edfd436b9ef..b1b770141de 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/WordTypes.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/WordTypes.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -26,8 +26,12 @@ package org.graalvm.compiler.word; import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE; +import org.graalvm.compiler.core.common.Fields; +import org.graalvm.compiler.core.common.type.AbstractObjectStamp; import org.graalvm.compiler.core.common.type.Stamp; import org.graalvm.compiler.core.common.type.StampFactory; +import org.graalvm.compiler.graph.Node; +import org.graalvm.compiler.nodes.StructuredGraph; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.type.StampTool; import org.graalvm.compiler.word.Word.Operation; @@ -163,4 +167,37 @@ public class WordTypes { public ResolvedJavaType getWordImplType() { return wordImplType; } + + /** + * Verify that the given graph does not reference word types in their object representation. We + * cannot only check the stamps of the nodes but also stamp field of nodes as those can cause + * optimizations to create wrong code later on (for example a pi stamp of instanceof stamp). + */ + public boolean ensureGraphContainsNoWordTypeReferences(StructuredGraph graph) { + for (Node n : graph.getNodes()) { + if (n instanceof ValueNode) { + assert !isWord((ValueNode) n) : "Node " + n + " is a word type and not rewritten after graph building, this is invalid."; + Fields f = n.getNodeClass().getData(); + for (int i = 0; i < f.getCount(); i++) { + Object fieldValue = f.get(n, i); + if (fieldValue instanceof AbstractObjectStamp) { + AbstractObjectStamp os = (AbstractObjectStamp) fieldValue; + assert !isWord(os.type()) : "Stamp Field " + f.getName(i) + " of node " + n + " is a word type and not rewritten after graph building, this is invalid"; + } + // else if (fieldValue instanceof ResolvedJavaType) + /* + * Naturally, we would also like to verify ResolvedJavaType fields, however, we + * unfortunately cannot have this invariant right now. It is invalidated by + * arrays since the component type can be a word type. We would like to model + * word-type-arrays as "primitive long arrays". However, we cannot since for + * HotSpot we represent metaspace pointers as word types and for arrays of + * metaspace pointers we need to preserve the meta space stamps until the + * backend. + */ + } + } + } + return true; + } + } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphOutput.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphOutput.java index 3c2c38f56de..29946795ecf 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphOutput.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphOutput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -31,6 +31,7 @@ import java.net.URISyntaxException; import java.nio.ByteBuffer; import java.nio.channels.WritableByteChannel; import java.util.Collections; +import java.util.HashMap; import java.util.Map; /** @@ -43,6 +44,14 @@ import java.util.Map; public final class GraphOutput implements Closeable, WritableByteChannel { private final GraphProtocol printer; + /** + * Name of stream attribute to identify the VM execution, allows to join different GraphOutput + * streams. The value should be the same for all related {@link GraphOutput}s. + * + * @since 20.2.0 + */ + public static final String ATTR_VM_ID = "vm.uuid"; + private GraphOutput(GraphProtocol p) { this.printer = p; } @@ -140,35 +149,82 @@ public final class GraphOutput implements Closeable, WritableByteChannel { * @param the type of the methods */ public static final class Builder { + private static final int DEFAULT_MAJOR_VERSION = 7; + private static final int DEFAULT_MINOR_VERSION = 0; + private final GraphStructure structure; private ElementsAndLocations elementsAndLocations; private GraphTypes types = DefaultGraphTypes.DEFAULT; private GraphBlocks blocks = DefaultGraphBlocks.empty(); - private int major = 4; + + /** + * The major version. Negative values mean automatically assigned version, implied by + * Builder functions. + */ + private int major = 0; private int minor = 0; + private boolean explicitVersionSet; private boolean embeddedGraphOutput; + private Map properties; Builder(GraphStructure structure) { this.structure = structure; } /** - * Chooses which version of the protocol to use. The default version is 4.0 + * Chooses which version of the protocol to use. The default version is 7.0 * (when the {@link GraphOutput} & co. classes were introduced). The default can be changed * to other known versions manually by calling this method. + *

    + * Note: the the default version is 7.0 since version 20.2. Previous versions used default + * version 4.0 * - * @param majorVersion by default 4, newer version may be known + * @param majorVersion by default 7, newer version may be known * @param minorVersion usually 0 * @return this builder * @since 0.28 */ public Builder protocolVersion(int majorVersion, int minorVersion) { + assert majorVersion >= 1 : "Major must be positive"; + assert minorVersion >= 0 : "Minor must not be negative"; + + if (!(explicitVersionSet || + (majorVersion == 0) || + (majorVersion > major) || + ((majorVersion == major) && (minorVersion >= minor)))) { + throw new IllegalArgumentException("Cannot downgrade from minimum required version " + (-major) + "." + minor); + } this.major = majorVersion; this.minor = minorVersion; + explicitVersionSet = true; return this; } + /** + * Asserts a specific version of the protocol. If not specified explicitly, upgrades the + * protocol version. + * + * @param reqMajor The required major version + * @param reqMinor the required minor version + */ + private void requireVersion(int reqMajor, int reqMinor) { + assert reqMajor >= 1 : "Major must be positive"; + assert reqMinor >= 0 : "Minor must not be negative"; + if (explicitVersionSet) { + if (major < reqMajor || (major == reqMajor && minor < reqMinor)) { + throw new IllegalStateException("Feature unsupported in version " + major + "." + minor); + } + } else { + if (major < reqMajor) { + major = reqMajor; + minor = reqMinor; + } else if (major == reqMajor) { + minor = Math.max(minor, reqMinor); + } + } + } + /** * Sets {@link GraphOutput} as embedded. The embedded {@link GraphOutput} shares * {@link WritableByteChannel channel} with another already open non parent @@ -234,6 +290,24 @@ public final class GraphOutput implements Closeable, WritableByteChannel { return (Builder) this; } + /** + * Attaches metadata to the dump. The method may be called more times, subsequent calls will + * overwrite previous values of matching keys. + * + * @param name key name + * @param value value for the key + * @return this builder + * @since 20.1.0 + */ + public Builder attr(String name, Object value) { + requireVersion(7, 0); + if (properties == null) { + properties = new HashMap<>(5); + } + properties.put(name, value); + return this; + } + /** * Creates new {@link GraphOutput} to output to provided channel. The output will use * interfaces currently associated with this builder. @@ -267,13 +341,22 @@ public final class GraphOutput implements Closeable, WritableByteChannel { } private GraphOutput buildImpl(ElementsAndLocations e, WritableByteChannel channel) throws IOException { + int m = major; + int n = minor; + if (m == 0) { + m = DEFAULT_MAJOR_VERSION; + n = DEFAULT_MINOR_VERSION; + } // @formatter:off ProtocolImpl p = new ProtocolImpl<>( - major, minor, embeddedGraphOutput, structure, types, blocks, + m, n, embeddedGraphOutput, structure, types, blocks, e == null ? null : e.elements, e == null ? null : e.locations, channel ); // @formatter:on + if (properties != null) { + p.startDocument(properties); + } return new GraphOutput<>(p); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphProtocol.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphProtocol.java index 5d5755fa4c9..8df6e8de4a0 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphProtocol.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphProtocol.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -48,6 +48,7 @@ abstract class GraphProtocol documentProperties) throws IOException { + if (versionMajor < 7) { + throw new IllegalStateException("Dump properties unsupported in format v." + versionMajor); + } + printing = true; + try { + writeByte(BEGIN_DOCUMENT); + writeProperties(null, documentProperties); + } finally { + printing = false; + } + } + public final void beginGroup(Graph noGraph, String name, String shortName, ResolvedJavaMethod method, int bci, Map properties) throws IOException { printing = true; try { diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ArrayAllocationBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ArrayAllocationBenchmark.java index 03bb45d8e37..acfdc33836e 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ArrayAllocationBenchmark.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ArrayAllocationBenchmark.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, 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 @@ -29,7 +29,6 @@ import org.openjdk.jmh.annotations.Param; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Threads; -import org.openjdk.jmh.annotations.Warmup; /** * Benchmarks cost of ArrayList. @@ -38,13 +37,12 @@ public class ArrayAllocationBenchmark extends BenchmarkBase { @State(Scope.Benchmark) public static class ThreadState { - @Param({"128", "256", "512", "1024", "2048", "4096", "8192", "16384", "32768", "65536", "131072"}) int size; + @Param({"128", "1024", "65536"}) int size; byte[] result; } @Benchmark - @Threads(8) - @Warmup(iterations = 10) + @Threads(Threads.MAX) public void arrayAllocate(ThreadState state) { state.result = new byte[state.size]; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ArrayDuplicationBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ArrayDuplicationBenchmark.java index 15b47ca89e8..613eb12bd63 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ArrayDuplicationBenchmark.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ArrayDuplicationBenchmark.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -125,4 +125,9 @@ public class ArrayDuplicationBenchmark extends BenchmarkBase { return (Object[]) cache.clone(); } + @Benchmark + public void checkcastArrayCopy() { + System.arraycopy(testObjectArray[0], 0, testStringArray[0], 0, testObjectArray[0].length); + } + } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ArrayListBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ArrayListBenchmark.java index 6a479b20077..8aac1ff02bc 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ArrayListBenchmark.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ArrayListBenchmark.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, 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 @@ -31,7 +31,6 @@ import org.openjdk.jmh.annotations.Level; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.Setup; import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.Warmup; /** * Benchmarks cost of ArrayList. @@ -46,7 +45,6 @@ public class ArrayListBenchmark extends BenchmarkBase { } @Benchmark - @Warmup(iterations = 20) public void addBoxedAndClear(ThreadState state) { for (int i = 0; i < N; ++i) { state.list.add(i); @@ -55,7 +53,6 @@ public class ArrayListBenchmark extends BenchmarkBase { } @Benchmark - @Warmup(iterations = 20) public void addNullAndClear(ThreadState state) { for (int i = 0; i < N; ++i) { state.list.add(null); @@ -75,7 +72,6 @@ public class ArrayListBenchmark extends BenchmarkBase { } @Benchmark - @Warmup(iterations = 20) public void addNull(ClearedThreadState state) { for (int i = 0; i < N; ++i) { state.list.add(null); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/BenchmarkBase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/BenchmarkBase.java index 1a89594fdbd..179465d30e2 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/BenchmarkBase.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/BenchmarkBase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -31,14 +31,15 @@ import org.openjdk.jmh.annotations.Warmup; /** * Base class for JMH benchmarks. */ -@Warmup(iterations = BenchmarkBase.Defaults.WARMUP_ITERATIONS) -@Measurement(iterations = BenchmarkBase.Defaults.MEASUREMENT_ITERATIONS) +@Warmup(iterations = BenchmarkBase.Defaults.WARMUP_ITERATIONS, time = BenchmarkBase.Defaults.ITERATIONS_DURATION) +@Measurement(iterations = BenchmarkBase.Defaults.MEASUREMENT_ITERATIONS, time = BenchmarkBase.Defaults.ITERATIONS_DURATION) @Fork(BenchmarkBase.Defaults.FORKS) public class BenchmarkBase { public static class Defaults { public static final int MEASUREMENT_ITERATIONS = 5; public static final int WARMUP_ITERATIONS = 5; - public static final int FORKS = 1; + public static final int ITERATIONS_DURATION = 5; + public static final int FORKS = 3; } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/BigIntegerBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/BigIntegerBenchmark.java index b6bf4e38c0f..e72992390b9 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/BigIntegerBenchmark.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/BigIntegerBenchmark.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -30,7 +30,6 @@ import java.util.Random; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.Warmup; /* * Benchmarks cost of BigInteger intrinsics: @@ -55,7 +54,6 @@ public class BigIntegerBenchmark extends BenchmarkBase { } @Benchmark - @Warmup(iterations = 5) public void bigIntMul(ThreadState state) { BigInteger[] data = state.data; for (int i = 1; i < data.length; i++) { @@ -65,7 +63,6 @@ public class BigIntegerBenchmark extends BenchmarkBase { } @Benchmark - @Warmup(iterations = 5) public void bigIntMulAdd(ThreadState state) { BigInteger[] data = state.data; for (int i = 0; i < data.length; i++) { @@ -77,7 +74,6 @@ public class BigIntegerBenchmark extends BenchmarkBase { } @Benchmark - @Warmup(iterations = 5) public void bigIntMontgomeryMul(ThreadState state) { BigInteger[] data = state.data; BigInteger exp = BigInteger.valueOf(2); @@ -94,7 +90,6 @@ public class BigIntegerBenchmark extends BenchmarkBase { } @Benchmark - @Warmup(iterations = 5) public void bigIntMontgomerySqr(ThreadState state) { BigInteger[] data = state.data; BigInteger exp = BigInteger.valueOf(2); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/BoxingBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/BoxingBenchmark.java index 5fdba963007..3c668ce90cb 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/BoxingBenchmark.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/BoxingBenchmark.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, 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 @@ -27,7 +27,6 @@ package micro.benchmarks; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.Warmup; /** * Benchmarks cost of ArrayList. @@ -40,14 +39,12 @@ public class BoxingBenchmark extends BenchmarkBase { } @Benchmark - @Warmup(iterations = 20) public Integer addBoxed(ThreadState state) { return Integer.valueOf(state.value); } @SuppressWarnings("unused") @Benchmark - @Warmup(iterations = 20) public int doNothing(ThreadState state) { return 42; } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ConcurrentHashBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ConcurrentHashBenchmark.java new file mode 100644 index 00000000000..f84b36124ce --- /dev/null +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ConcurrentHashBenchmark.java @@ -0,0 +1,159 @@ +/* + * Copyright (c) 2020, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +package micro.benchmarks; + +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.TimeUnit; +import java.util.function.Supplier; + +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; + +@State(Scope.Benchmark) +public class ConcurrentHashBenchmark extends BenchmarkBase { + + private static final int MULTIPLIER = 10; + private static final int SIZE = 100000; + private static final int PARALLELISM = 4; + private static final Integer[] KEYS = new Integer[SIZE]; + private static final String[] STRKEYS = new String[SIZE]; + + private ConcurrentHashMap prefilledMap; + private ConcurrentHashMap prefilledStringMap; + + @Setup(Level.Trial) + public void setupInts() { + this.prefilledMap = new ConcurrentHashMap<>(); + for (int i = 0; i < SIZE; i++) { + KEYS[i] = Integer.valueOf(i); + Integer key = KEYS[i]; + this.prefilledMap.put(key, key); + } + } + + @Setup(Level.Trial) + public void setupStrings() { + this.prefilledStringMap = new ConcurrentHashMap<>(); + for (int i = 0; i < SIZE; i++) { + STRKEYS[i] = String.valueOf(i); + String key = STRKEYS[i]; + this.prefilledStringMap.put(key, key); + } + } + + private int keySum() { + int sum = 0; + for (int i = 0; i < SIZE * MULTIPLIER; i++) { + Integer key = KEYS[i % SIZE]; + sum += prefilledMap.get(key); + } + return sum; + } + + private int inParallel(Supplier action) { + final int[] results = new int[PARALLELISM]; + Thread[] threads = new Thread[PARALLELISM]; + for (int i = 0; i < PARALLELISM; i++) { + final int index = i; + threads[i] = new Thread() { + @Override + public void run() { + results[index] = action.get(); + } + }; + } + for (int i = 0; i < PARALLELISM; i++) { + threads[i].start(); + } + int result = 0; + for (int i = 0; i < PARALLELISM; i++) { + try { + threads[i].join(); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + result += results[i]; + } + return result; + } + + @OutputTimeUnit(TimeUnit.SECONDS) + @Benchmark + public int sequentialGet() { + return keySum(); + } + + @OutputTimeUnit(TimeUnit.SECONDS) + @Benchmark + public int parallelGet() { + return inParallel(new Supplier() { + @Override + public Integer get() { + return keySum(); + } + }); + } + + private int keyHash() { + int hash = 0; + for (int i = 0; i < SIZE * MULTIPLIER; i++) { + String key = STRKEYS[i % SIZE]; + hash ^= prefilledStringMap.get(key).hashCode(); + } + return hash; + } + + @OutputTimeUnit(TimeUnit.SECONDS) + @Benchmark + public int sequentialStringGet() { + return keyHash(); + } + + @OutputTimeUnit(TimeUnit.SECONDS) + @Benchmark + public int parallelStringGet() { + return inParallel(new Supplier() { + @Override + public Integer get() { + return keyHash(); + } + }); + } + + @OutputTimeUnit(TimeUnit.SECONDS) + @Benchmark + public int sequentialPut() { + final ConcurrentHashMap map = new ConcurrentHashMap<>(); + for (int i = 0; i < SIZE; i++) { + Integer key = KEYS[i]; + map.put(key, key); + } + return map.get(SIZE / 2); + } +} diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ConcurrentSkipListBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ConcurrentSkipListBenchmark.java index f7b38dd7fe6..b5e6ce8ad0c 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ConcurrentSkipListBenchmark.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/ConcurrentSkipListBenchmark.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, 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 @@ -29,7 +29,6 @@ import java.util.concurrent.ConcurrentSkipListMap; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.Warmup; /** * Benchmarks cost of ArrayList. @@ -44,7 +43,6 @@ public class ConcurrentSkipListBenchmark extends BenchmarkBase { } @Benchmark - @Warmup(iterations = 20) public void addBoxed(ThreadState state) { for (int i = 0; i < N; ++i) { state.list.put(i, i); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/GroupAllocationBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/GroupAllocationBenchmark.java index 4ed14e3e302..d9b4d8cf0a3 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/GroupAllocationBenchmark.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/GroupAllocationBenchmark.java @@ -25,10 +25,8 @@ package micro.benchmarks; import org.openjdk.jmh.annotations.Benchmark; -import org.openjdk.jmh.annotations.Measurement; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.Warmup; import org.openjdk.jmh.infra.Blackhole; /** @@ -64,22 +62,16 @@ public class GroupAllocationBenchmark extends BenchmarkBase { } @Benchmark - @Warmup(iterations = 5) - @Measurement(iterations = 5) public void groupAllocate3(Blackhole bh) { bh.consume(new Node(new Node(bh, bh), new Node(bh, bh))); } @Benchmark - @Warmup(iterations = 5) - @Measurement(iterations = 5) public void groupAllocate2(Blackhole bh) { bh.consume(new Node(new Node(bh, bh), null)); } @Benchmark - @Warmup(iterations = 5) - @Measurement(iterations = 5) public void groupAllocate1(Blackhole bh) { bh.consume(new Node(null, null)); } @@ -98,8 +90,6 @@ public class GroupAllocationBenchmark extends BenchmarkBase { // object(145)=Buf$ByteArray[int begin=116,int end=324,byte[] bytes=294] @Benchmark - @Warmup(iterations = 5) - @Measurement(iterations = 5) public void bufDecode(Blackhole bh, BenchState state) { Object a = new BufByteArray(state.bytes); Object b = new BufByteArray(state.bytes); @@ -142,8 +132,6 @@ public class GroupAllocationBenchmark extends BenchmarkBase { } @Benchmark - @Warmup(iterations = 5) - @Measurement(iterations = 5) public void rangeTxnLevelImpl(Blackhole bh, BenchState state) { TxnLevelImpl o = new TxnLevelImpl(state.a, state.b, state.c); bh.consume(o); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/GuardedIntrinsicBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/GuardedIntrinsicBenchmark.java index 1ba5a7f98ea..4ab1324c112 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/GuardedIntrinsicBenchmark.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/GuardedIntrinsicBenchmark.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -29,7 +29,6 @@ import org.openjdk.jmh.annotations.Level; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.Setup; import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.Warmup; /** * Benchmarks cost of guarded intrinsics at indirect call sites. @@ -74,7 +73,6 @@ public class GuardedIntrinsicBenchmark extends BenchmarkBase { } @Benchmark - @Warmup(iterations = 10) public int overrideHashCode(OverrideHashcode state) { return state.getNextHashCode(); } @@ -95,7 +93,6 @@ public class GuardedIntrinsicBenchmark extends BenchmarkBase { } @Benchmark - @Warmup(iterations = 10) public int inheritHashCode(InheritHashcode state) { return state.getNextHashCode(); } @@ -116,7 +113,6 @@ public class GuardedIntrinsicBenchmark extends BenchmarkBase { } @Benchmark - @Warmup(iterations = 10) public int mixedHashCode(MixedHashcode state) { return state.getNextHashCode(); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/HashBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/HashBenchmark.java index 4ef1617fee9..b5bdd518085 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/HashBenchmark.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/HashBenchmark.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, 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 @@ -27,7 +27,6 @@ package micro.benchmarks; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.Warmup; /** * Benchmarks cost of hashing a character array. @@ -40,7 +39,6 @@ public class HashBenchmark extends BenchmarkBase { } @Benchmark - @Warmup(iterations = 20) public int hash(ThreadState state) { int value = 0; char[] array = state.characters; diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/MathFunctionBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/MathFunctionBenchmark.java index fec13af0eff..3b8c18551fd 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/MathFunctionBenchmark.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/MathFunctionBenchmark.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -29,7 +29,6 @@ import java.util.Random; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.Warmup; import org.openjdk.jmh.infra.Blackhole; /** @@ -54,7 +53,6 @@ public class MathFunctionBenchmark extends BenchmarkBase { } @Benchmark - @Warmup(iterations = 5) public void mathLog(ThreadState state) { double[] data = state.data; for (int i = 0; i < data.length; i++) { @@ -64,7 +62,6 @@ public class MathFunctionBenchmark extends BenchmarkBase { } @Benchmark - @Warmup(iterations = 5) public void mathLog10(ThreadState state) { double[] data = state.data; for (int i = 0; i < data.length; i++) { @@ -74,7 +71,6 @@ public class MathFunctionBenchmark extends BenchmarkBase { } @Benchmark - @Warmup(iterations = 5) public void mathSin(ThreadState state) { double[] data = state.data; for (int i = 0; i < data.length; i++) { @@ -84,7 +80,6 @@ public class MathFunctionBenchmark extends BenchmarkBase { } @Benchmark - @Warmup(iterations = 5) public void mathCos(ThreadState state) { double[] data = state.data; for (int i = 0; i < data.length; i++) { @@ -94,7 +89,6 @@ public class MathFunctionBenchmark extends BenchmarkBase { } @Benchmark - @Warmup(iterations = 5) public void mathTan(ThreadState state) { double[] data = state.data; for (int i = 0; i < data.length; i++) { @@ -104,13 +98,11 @@ public class MathFunctionBenchmark extends BenchmarkBase { } @Benchmark - @Warmup(iterations = 1) public void mathSqrt(ThreadState state, Blackhole blackhole) { blackhole.consume(Math.sqrt(state.k)); } @Benchmark - @Warmup(iterations = 1) public void strictMathSqrt(ThreadState state, Blackhole blackhole) { blackhole.consume(StrictMath.sqrt(state.k)); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/SimpleSyncBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/SimpleSyncBenchmark.java index 64838497a16..435cd645dc6 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/SimpleSyncBenchmark.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/SimpleSyncBenchmark.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -27,7 +27,6 @@ package micro.benchmarks; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.Warmup; /** * Benchmarks cost of non-contended synchronization. @@ -63,21 +62,18 @@ public class SimpleSyncBenchmark extends BenchmarkBase { } @Benchmark - @Warmup(iterations = 20) public void setAgeCond(ThreadState state) { Person person = state.person; person.setAgeIfNonZero(state.newAge); } @Benchmark - @Warmup(iterations = 20) public int getAge(ThreadState state) { Person person = state.person; return person.getAge(); } @Benchmark - @Warmup(iterations = 20) public int getAndIncAge(ThreadState state) { Person person = state.person; int oldAge = person.getAge(); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/StringBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/StringBenchmark.java index 70d74e42a9f..98fdec4553d 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/StringBenchmark.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.micro.benchmarks/src/micro/benchmarks/StringBenchmark.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, 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 @@ -30,7 +30,6 @@ import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.OutputTimeUnit; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.Warmup; /** * Benchmarks cost of {@link String#indexOf(int)} and {@link String#indexOf(String)}. @@ -69,67 +68,61 @@ public class StringBenchmark extends BenchmarkBase { } @Benchmark - @Warmup(iterations = 5) public int indexOfChar(BenchState state) { return state.lorem.indexOf(state.ch1); } @Benchmark - @Warmup(iterations = 5) + public int indexOfConstantChar(BenchState state) { + return state.smallLorem.indexOf(' '); + } + + @Benchmark public int indexOfSingleCharString(BenchState state) { return state.lorem.indexOf(state.ch1string); } @Benchmark - @Warmup(iterations = 5) public int indexOfSingleCharStringLong(BenchState state) { return state.longString.indexOf('x'); } @Benchmark - @Warmup(iterations = 5) public int indexOfCharNotFound(BenchState state) { return state.lorem.indexOf(state.ch2); } @Benchmark - @Warmup(iterations = 5) public int indexOfString(BenchState state) { return state.lorem.indexOf(state.s1); } @Benchmark - @Warmup(iterations = 5) public int indexOfStringNotFound(BenchState state) { return state.lorem.indexOf(state.s2); } @Benchmark - @Warmup(iterations = 5) public int compareTo(BenchState state) { return state.lorem.compareTo(state.loremLastChar); } @Benchmark - @Warmup(iterations = 5) public String compressSmallString(BenchState state) { return new String(state.smallCharArray); } @Benchmark - @Warmup(iterations = 5) public String compressLargeString(BenchState state) { return new String(state.largeCharArray); } @Benchmark - @Warmup(iterations = 5) public char[] inflateSmallString(BenchState state) { return state.smallLorem.toCharArray(); } @Benchmark - @Warmup(iterations = 5) public char[] inflateLargeString(BenchState state) { return state.largeLorem.toCharArray(); }