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

equal deleted inserted replaced

-:13588c901957
+:9cf78a70fa4f
 package org.graalvm.compiler.hotspot.amd64;
 import static jdk.vm.ci.common.InitTimer.timer;
-import static org.graalvm.compiler.serviceprovider.JavaVersionUtil.JAVA_SPECIFICATION_VERSION;
 import java.util.ArrayList;
 import java.util.List;
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
 import org.graalvm.compiler.bytecode.BytecodeProvider;
 import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
 import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
 import org.graalvm.compiler.hotspot.HotSpotBackend;
 import org.graalvm.compiler.hotspot.HotSpotBackendFactory;
 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.HotSpotGCProvider;
 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.HotSpotProviders;
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.phases.common.AddressLoweringPhase;
 import org.graalvm.compiler.phases.tiers.CompilerConfiguration;
 import org.graalvm.compiler.phases.util.Providers;
 import org.graalvm.compiler.replacements.amd64.AMD64GraphBuilderPlugins;
-import org.graalvm.compiler.replacements.classfile.ClassfileBytecodeProvider;
+import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.compiler.serviceprovider.ServiceProvider;
 import org.graalvm.compiler.word.WordTypes;
 import jdk.vm.ci.amd64.AMD64;
 import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.hotspot.HotSpotMetaAccessProvider;
 import jdk.vm.ci.meta.Value;
 import jdk.vm.ci.runtime.JVMCIBackend;
 @ServiceProvider(HotSpotBackendFactory.class)
-public class AMD64HotSpotBackendFactory implements HotSpotBackendFactory {
+public class AMD64HotSpotBackendFactory extends HotSpotBackendFactory {
 @Override
 public String getName() {
 return "community";
 }
 Value[] nativeABICallerSaveRegisters;
 HotSpotMetaAccessProvider metaAccess = (HotSpotMetaAccessProvider) jvmci.getMetaAccess();
 HotSpotConstantReflectionProvider constantReflection = (HotSpotConstantReflectionProvider) jvmci.getConstantReflection();
 ConstantFieldProvider constantFieldProvider = new HotSpotGraalConstantFieldProvider(config, metaAccess);
 HotSpotLoweringProvider lowerer;
+HotSpotStampProvider stampProvider;
+HotSpotGCProvider gc;
 HotSpotSnippetReflectionProvider snippetReflection;
 HotSpotReplacementsImpl replacements;
 HotSpotSuitesProvider suites;
 HotSpotWordTypes wordTypes;
 Plugins plugins;
 }
 try (InitTimer rt = timer("create NativeABICallerSaveRegisters")) {
 nativeABICallerSaveRegisters = createNativeABICallerSaveRegisters(config, codeCache.getRegisterConfig());
 }
 try (InitTimer rt = timer("create WordTypes")) {
-wordTypes = new HotSpotWordTypes(metaAccess, target.wordJavaKind);
+wordTypes = createWordTypes(metaAccess, target);
 }
 try (InitTimer rt = timer("create ForeignCalls provider")) {
 foreignCalls = createForeignCalls(jvmciRuntime, graalRuntime, metaAccess, codeCache, wordTypes, nativeABICallerSaveRegisters);
 }
 try (InitTimer rt = timer("create Lowerer provider")) {
 lowerer = createLowerer(graalRuntime, metaAccess, foreignCalls, registers, constantReflection, target);
 }
-HotSpotStampProvider stampProvider = new HotSpotStampProvider();
+try (InitTimer rt = timer("create stamp provider")) {
-Providers p = new Providers(metaAccess, codeCache, constantReflection, constantFieldProvider, foreignCalls, lowerer, null, stampProvider);
+stampProvider = createStampProvider();
+}
+try (InitTimer rt = timer("create GC provider")) {
+gc = createGCProvider(config);
+}
+Providers p = new Providers(metaAccess, codeCache, constantReflection, constantFieldProvider, foreignCalls, lowerer, null, stampProvider, gc);
 try (InitTimer rt = timer("create SnippetReflection provider")) {
 snippetReflection = createSnippetReflection(graalRuntime, constantReflection, wordTypes);
 }
 try (InitTimer rt = timer("create Bytecode provider")) {
-bytecodeProvider = new ClassfileBytecodeProvider(metaAccess, snippetReflection);
+bytecodeProvider = createBytecodeProvider(metaAccess, snippetReflection);
 }
 try (InitTimer rt = timer("create Replacements provider")) {
-replacements = createReplacements(p, snippetReflection, bytecodeProvider);
+replacements = createReplacements(target, p, snippetReflection, bytecodeProvider);
 }
 try (InitTimer rt = timer("create GraphBuilderPhase plugins")) {
-plugins = createGraphBuilderPlugins(compilerConfiguration, config, target, constantReflection, foreignCalls, metaAccess, snippetReflection, replacements, wordTypes, options);
+plugins = createGraphBuilderPlugins(graalRuntime, compilerConfiguration, config, target, constantReflection, foreignCalls, metaAccess, snippetReflection, replacements, wordTypes,
+options);
 replacements.setGraphBuilderPlugins(plugins);
 }
 try (InitTimer rt = timer("create Suites provider")) {
 suites = createSuites(config, graalRuntime, compilerConfiguration, plugins, registers, replacements, options);
 }
 providers = new HotSpotProviders(metaAccess, codeCache, constantReflection, constantFieldProvider, foreignCalls, lowerer, replacements, suites, registers,
-snippetReflection, wordTypes,
+snippetReflection, wordTypes, plugins, gc);
-plugins);
 replacements.setProviders(providers);
 }
 try (InitTimer rt = timer("instantiate backend")) {
 return createBackend(config, graalRuntime, providers);
 }
 }
-protected Plugins createGraphBuilderPlugins(CompilerConfiguration compilerConfiguration, GraalHotSpotVMConfig config, TargetDescription target,
+protected Plugins createGraphBuilderPlugins(HotSpotGraalRuntimeProvider graalRuntime,
-HotSpotConstantReflectionProvider constantReflection, HotSpotHostForeignCallsProvider foreignCalls, HotSpotMetaAccessProvider metaAccess,
+CompilerConfiguration compilerConfiguration,
-HotSpotSnippetReflectionProvider snippetReflection, HotSpotReplacementsImpl replacements, HotSpotWordTypes wordTypes, OptionValues options) {
+GraalHotSpotVMConfig config,
-Plugins plugins = HotSpotGraphBuilderPlugins.create(compilerConfiguration, config, wordTypes, metaAccess, constantReflection, snippetReflection, foreignCalls, replacements, options);
+TargetDescription target,
-AMD64GraphBuilderPlugins.register(plugins, replacements.getDefaultReplacementBytecodeProvider(), (AMD64) target.arch, false, JAVA_SPECIFICATION_VERSION >= 9, config.useFMAIntrinsics);
+HotSpotConstantReflectionProvider constantReflection,
+HotSpotHostForeignCallsProvider foreignCalls,
+HotSpotMetaAccessProvider metaAccess,
+HotSpotSnippetReflectionProvider snippetReflection,
+HotSpotReplacementsImpl replacements,
+HotSpotWordTypes wordTypes,
+OptionValues options) {
+Plugins plugins = HotSpotGraphBuilderPlugins.create(
+graalRuntime,
+compilerConfiguration,
+config,
+wordTypes,
+metaAccess,
+constantReflection,
+snippetReflection,
+foreignCalls,
+replacements,
+options);
+AMD64GraphBuilderPlugins.register(plugins, replacements.getDefaultReplacementBytecodeProvider(), (AMD64) target.arch, false, JavaVersionUtil.JAVA_SPEC >= 9, config.useFMAIntrinsics);
 return plugins;
 }
 protected AMD64HotSpotBackend createBackend(GraalHotSpotVMConfig config, HotSpotGraalRuntimeProvider runtime, HotSpotProviders providers) {
 return new AMD64HotSpotBackend(config, runtime, providers);
 }
 protected HotSpotRegistersProvider createRegisters() {
 return new HotSpotRegisters(AMD64.r15, AMD64.r12, AMD64.rsp);
-}
-protected HotSpotReplacementsImpl createReplacements(Providers p, SnippetReflectionProvider snippetReflection, BytecodeProvider bytecodeProvider) {
-return new HotSpotReplacementsImpl(p, snippetReflection, bytecodeProvider, p.getCodeCache().getTarget());
 }
 protected AMD64HotSpotForeignCallsProvider createForeignCalls(HotSpotJVMCIRuntime jvmciRuntime, HotSpotGraalRuntimeProvider runtime, HotSpotMetaAccessProvider metaAccess,
 HotSpotCodeCacheProvider codeCache, WordTypes wordTypes, Value[] nativeABICallerSaveRegisters) {
 return new AMD64HotSpotForeignCallsProvider(jvmciRuntime, runtime, metaAccess, codeCache, wordTypes, nativeABICallerSaveRegisters);
 */
 protected HotSpotSuitesProvider createSuites(GraalHotSpotVMConfig config, HotSpotGraalRuntimeProvider runtime, CompilerConfiguration compilerConfiguration, Plugins plugins,
 HotSpotRegistersProvider registers, Replacements replacements, OptionValues options) {
 return new AddressLoweringHotSpotSuitesProvider(new AMD64HotSpotSuitesCreator(compilerConfiguration, plugins), config, runtime,
 new AddressLoweringPhase(new AMD64HotSpotAddressLowering(config, registers.getHeapBaseRegister(), options)));
-}
-protected HotSpotSnippetReflectionProvider createSnippetReflection(HotSpotGraalRuntimeProvider runtime, HotSpotConstantReflectionProvider constantReflection, WordTypes wordTypes) {
-return new HotSpotSnippetReflectionProvider(runtime, constantReflection, wordTypes);
 }
 protected HotSpotLoweringProvider createLowerer(HotSpotGraalRuntimeProvider runtime, HotSpotMetaAccessProvider metaAccess, HotSpotForeignCallsProvider foreignCalls,
 HotSpotRegistersProvider registers, HotSpotConstantReflectionProvider constantReflection, TargetDescription target) {
 return new AMD64HotSpotLoweringProvider(runtime, metaAccess, foreignCalls, registers, constantReflection, target);

branch	datagramsocketimpl-branch
changeset 58678	9cf78a70fa4f
parent 54914	9feb4852536f
child 58679	9c3209ff7550