--- old/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java 2016-05-04 09:43:22.000000000 -1000 +++ /dev/null 2016-05-04 09:43:22.000000000 -1000 @@ -1,212 +0,0 @@ -/* - * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. - * 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.vm.ci.hotspot.amd64; - -import static jdk.vm.ci.inittimer.InitTimer.timer; - -import java.util.EnumSet; - -import jdk.vm.ci.amd64.AMD64; -import jdk.vm.ci.code.Architecture; -import jdk.vm.ci.code.RegisterConfig; -import jdk.vm.ci.code.TargetDescription; -import jdk.vm.ci.code.stack.StackIntrospection; -import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider; -import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider; -import jdk.vm.ci.hotspot.HotSpotJVMCIBackendFactory; -import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider; -import jdk.vm.ci.hotspot.HotSpotMetaAccessProvider; -import jdk.vm.ci.hotspot.HotSpotStackIntrospection; -import jdk.vm.ci.hotspot.HotSpotVMConfig; -import jdk.vm.ci.inittimer.InitTimer; -import jdk.vm.ci.meta.ConstantReflectionProvider; -import jdk.vm.ci.runtime.JVMCIBackend; - -public class AMD64HotSpotJVMCIBackendFactory implements HotSpotJVMCIBackendFactory { - - protected EnumSet computeFeatures(HotSpotVMConfig config) { - // Configure the feature set using the HotSpot flag settings. - EnumSet features = EnumSet.noneOf(AMD64.CPUFeature.class); - if ((config.vmVersionFeatures & config.amd643DNOWPREFETCH) != 0) { - features.add(AMD64.CPUFeature.AMD_3DNOW_PREFETCH); - } - assert config.useSSE >= 2 : "minimum config for x64"; - features.add(AMD64.CPUFeature.SSE); - features.add(AMD64.CPUFeature.SSE2); - if ((config.vmVersionFeatures & config.amd64SSE3) != 0) { - features.add(AMD64.CPUFeature.SSE3); - } - if ((config.vmVersionFeatures & config.amd64SSSE3) != 0) { - features.add(AMD64.CPUFeature.SSSE3); - } - if ((config.vmVersionFeatures & config.amd64SSE4A) != 0) { - features.add(AMD64.CPUFeature.SSE4A); - } - if ((config.vmVersionFeatures & config.amd64SSE41) != 0) { - features.add(AMD64.CPUFeature.SSE4_1); - } - if ((config.vmVersionFeatures & config.amd64SSE42) != 0) { - features.add(AMD64.CPUFeature.SSE4_2); - } - if ((config.vmVersionFeatures & config.amd64POPCNT) != 0) { - features.add(AMD64.CPUFeature.POPCNT); - } - if ((config.vmVersionFeatures & config.amd64LZCNT) != 0) { - features.add(AMD64.CPUFeature.LZCNT); - } - if ((config.vmVersionFeatures & config.amd64ERMS) != 0) { - features.add(AMD64.CPUFeature.ERMS); - } - if ((config.vmVersionFeatures & config.amd64AVX) != 0) { - features.add(AMD64.CPUFeature.AVX); - } - if ((config.vmVersionFeatures & config.amd64AVX2) != 0) { - features.add(AMD64.CPUFeature.AVX2); - } - if ((config.vmVersionFeatures & config.amd64AES) != 0) { - features.add(AMD64.CPUFeature.AES); - } - if ((config.vmVersionFeatures & config.amd643DNOWPREFETCH) != 0) { - features.add(AMD64.CPUFeature.AMD_3DNOW_PREFETCH); - } - if ((config.vmVersionFeatures & config.amd64BMI1) != 0) { - features.add(AMD64.CPUFeature.BMI1); - } - if ((config.vmVersionFeatures & config.amd64BMI2) != 0) { - features.add(AMD64.CPUFeature.BMI2); - } - if ((config.vmVersionFeatures & config.amd64RTM) != 0) { - features.add(AMD64.CPUFeature.RTM); - } - if ((config.vmVersionFeatures & config.amd64ADX) != 0) { - features.add(AMD64.CPUFeature.ADX); - } - if ((config.vmVersionFeatures & config.amd64AVX512F) != 0) { - features.add(AMD64.CPUFeature.AVX512F); - } - if ((config.vmVersionFeatures & config.amd64AVX512DQ) != 0) { - features.add(AMD64.CPUFeature.AVX512DQ); - } - if ((config.vmVersionFeatures & config.amd64AVX512PF) != 0) { - features.add(AMD64.CPUFeature.AVX512PF); - } - if ((config.vmVersionFeatures & config.amd64AVX512ER) != 0) { - features.add(AMD64.CPUFeature.AVX512ER); - } - if ((config.vmVersionFeatures & config.amd64AVX512CD) != 0) { - features.add(AMD64.CPUFeature.AVX512CD); - } - if ((config.vmVersionFeatures & config.amd64AVX512BW) != 0) { - features.add(AMD64.CPUFeature.AVX512BW); - } - if ((config.vmVersionFeatures & config.amd64AVX512VL) != 0) { - features.add(AMD64.CPUFeature.AVX512VL); - } - if ((config.vmVersionFeatures & config.amd64SHA) != 0) { - features.add(AMD64.CPUFeature.SHA); - } - return features; - } - - protected EnumSet computeFlags(HotSpotVMConfig config) { - EnumSet flags = EnumSet.noneOf(AMD64.Flag.class); - if (config.useCountLeadingZerosInstruction) { - flags.add(AMD64.Flag.UseCountLeadingZerosInstruction); - } - if (config.useCountTrailingZerosInstruction) { - flags.add(AMD64.Flag.UseCountTrailingZerosInstruction); - } - return flags; - } - - protected TargetDescription createTarget(HotSpotVMConfig config) { - final int stackFrameAlignment = 16; - final int implicitNullCheckLimit = 4096; - final boolean inlineObjects = true; - Architecture arch = new AMD64(computeFeatures(config), computeFlags(config)); - return new TargetDescription(arch, true, stackFrameAlignment, implicitNullCheckLimit, inlineObjects); - } - - protected HotSpotConstantReflectionProvider createConstantReflection(HotSpotJVMCIRuntimeProvider runtime) { - return new HotSpotConstantReflectionProvider(runtime); - } - - protected RegisterConfig createRegisterConfig(HotSpotJVMCIRuntimeProvider runtime, TargetDescription target) { - return new AMD64HotSpotRegisterConfig(target.arch, runtime.getConfig()); - } - - protected HotSpotCodeCacheProvider createCodeCache(HotSpotJVMCIRuntimeProvider runtime, TargetDescription target, RegisterConfig regConfig) { - return new HotSpotCodeCacheProvider(runtime, runtime.getConfig(), target, regConfig); - } - - protected HotSpotMetaAccessProvider createMetaAccess(HotSpotJVMCIRuntimeProvider runtime) { - return new HotSpotMetaAccessProvider(runtime); - } - - @Override - public String getArchitecture() { - return "AMD64"; - } - - @Override - public String toString() { - return "JVMCIBackend:" + getArchitecture(); - } - - @SuppressWarnings("try") - public JVMCIBackend createJVMCIBackend(HotSpotJVMCIRuntimeProvider runtime, JVMCIBackend host) { - - assert host == null; - TargetDescription target = createTarget(runtime.getConfig()); - - RegisterConfig regConfig; - HotSpotCodeCacheProvider codeCache; - ConstantReflectionProvider constantReflection; - HotSpotMetaAccessProvider metaAccess; - StackIntrospection stackIntrospection; - try (InitTimer t = timer("create providers")) { - try (InitTimer rt = timer("create MetaAccess provider")) { - metaAccess = createMetaAccess(runtime); - } - try (InitTimer rt = timer("create RegisterConfig")) { - regConfig = createRegisterConfig(runtime, target); - } - try (InitTimer rt = timer("create CodeCache provider")) { - codeCache = createCodeCache(runtime, target, regConfig); - } - try (InitTimer rt = timer("create ConstantReflection provider")) { - constantReflection = createConstantReflection(runtime); - } - try (InitTimer rt = timer("create StackIntrospection provider")) { - stackIntrospection = new HotSpotStackIntrospection(runtime); - } - } - try (InitTimer rt = timer("instantiate backend")) { - return createBackend(metaAccess, codeCache, constantReflection, stackIntrospection); - } - } - - protected JVMCIBackend createBackend(HotSpotMetaAccessProvider metaAccess, HotSpotCodeCacheProvider codeCache, ConstantReflectionProvider constantReflection, StackIntrospection stackIntrospection) { - return new JVMCIBackend(metaAccess, codeCache, constantReflection, stackIntrospection); - } -} --- /dev/null 2016-05-04 09:43:22.000000000 -1000 +++ new/src/jdk.vm.ci.hotspot/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java 2016-05-04 09:43:21.000000000 -1000 @@ -0,0 +1,212 @@ +/* + * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. + * 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.vm.ci.hotspot.amd64; + +import static jdk.vm.ci.inittimer.InitTimer.timer; + +import java.util.EnumSet; + +import jdk.vm.ci.amd64.AMD64; +import jdk.vm.ci.code.Architecture; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.code.stack.StackIntrospection; +import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider; +import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider; +import jdk.vm.ci.hotspot.HotSpotJVMCIBackendFactory; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider; +import jdk.vm.ci.hotspot.HotSpotMetaAccessProvider; +import jdk.vm.ci.hotspot.HotSpotStackIntrospection; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.inittimer.InitTimer; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.runtime.JVMCIBackend; + +public class AMD64HotSpotJVMCIBackendFactory implements HotSpotJVMCIBackendFactory { + + protected EnumSet computeFeatures(HotSpotVMConfig config) { + // Configure the feature set using the HotSpot flag settings. + EnumSet features = EnumSet.noneOf(AMD64.CPUFeature.class); + if ((config.vmVersionFeatures & config.amd643DNOWPREFETCH) != 0) { + features.add(AMD64.CPUFeature.AMD_3DNOW_PREFETCH); + } + assert config.useSSE >= 2 : "minimum config for x64"; + features.add(AMD64.CPUFeature.SSE); + features.add(AMD64.CPUFeature.SSE2); + if ((config.vmVersionFeatures & config.amd64SSE3) != 0) { + features.add(AMD64.CPUFeature.SSE3); + } + if ((config.vmVersionFeatures & config.amd64SSSE3) != 0) { + features.add(AMD64.CPUFeature.SSSE3); + } + if ((config.vmVersionFeatures & config.amd64SSE4A) != 0) { + features.add(AMD64.CPUFeature.SSE4A); + } + if ((config.vmVersionFeatures & config.amd64SSE41) != 0) { + features.add(AMD64.CPUFeature.SSE4_1); + } + if ((config.vmVersionFeatures & config.amd64SSE42) != 0) { + features.add(AMD64.CPUFeature.SSE4_2); + } + if ((config.vmVersionFeatures & config.amd64POPCNT) != 0) { + features.add(AMD64.CPUFeature.POPCNT); + } + if ((config.vmVersionFeatures & config.amd64LZCNT) != 0) { + features.add(AMD64.CPUFeature.LZCNT); + } + if ((config.vmVersionFeatures & config.amd64ERMS) != 0) { + features.add(AMD64.CPUFeature.ERMS); + } + if ((config.vmVersionFeatures & config.amd64AVX) != 0) { + features.add(AMD64.CPUFeature.AVX); + } + if ((config.vmVersionFeatures & config.amd64AVX2) != 0) { + features.add(AMD64.CPUFeature.AVX2); + } + if ((config.vmVersionFeatures & config.amd64AES) != 0) { + features.add(AMD64.CPUFeature.AES); + } + if ((config.vmVersionFeatures & config.amd643DNOWPREFETCH) != 0) { + features.add(AMD64.CPUFeature.AMD_3DNOW_PREFETCH); + } + if ((config.vmVersionFeatures & config.amd64BMI1) != 0) { + features.add(AMD64.CPUFeature.BMI1); + } + if ((config.vmVersionFeatures & config.amd64BMI2) != 0) { + features.add(AMD64.CPUFeature.BMI2); + } + if ((config.vmVersionFeatures & config.amd64RTM) != 0) { + features.add(AMD64.CPUFeature.RTM); + } + if ((config.vmVersionFeatures & config.amd64ADX) != 0) { + features.add(AMD64.CPUFeature.ADX); + } + if ((config.vmVersionFeatures & config.amd64AVX512F) != 0) { + features.add(AMD64.CPUFeature.AVX512F); + } + if ((config.vmVersionFeatures & config.amd64AVX512DQ) != 0) { + features.add(AMD64.CPUFeature.AVX512DQ); + } + if ((config.vmVersionFeatures & config.amd64AVX512PF) != 0) { + features.add(AMD64.CPUFeature.AVX512PF); + } + if ((config.vmVersionFeatures & config.amd64AVX512ER) != 0) { + features.add(AMD64.CPUFeature.AVX512ER); + } + if ((config.vmVersionFeatures & config.amd64AVX512CD) != 0) { + features.add(AMD64.CPUFeature.AVX512CD); + } + if ((config.vmVersionFeatures & config.amd64AVX512BW) != 0) { + features.add(AMD64.CPUFeature.AVX512BW); + } + if ((config.vmVersionFeatures & config.amd64AVX512VL) != 0) { + features.add(AMD64.CPUFeature.AVX512VL); + } + if ((config.vmVersionFeatures & config.amd64SHA) != 0) { + features.add(AMD64.CPUFeature.SHA); + } + return features; + } + + protected EnumSet computeFlags(HotSpotVMConfig config) { + EnumSet flags = EnumSet.noneOf(AMD64.Flag.class); + if (config.useCountLeadingZerosInstruction) { + flags.add(AMD64.Flag.UseCountLeadingZerosInstruction); + } + if (config.useCountTrailingZerosInstruction) { + flags.add(AMD64.Flag.UseCountTrailingZerosInstruction); + } + return flags; + } + + protected TargetDescription createTarget(HotSpotVMConfig config) { + final int stackFrameAlignment = 16; + final int implicitNullCheckLimit = 4096; + final boolean inlineObjects = true; + Architecture arch = new AMD64(computeFeatures(config), computeFlags(config)); + return new TargetDescription(arch, true, stackFrameAlignment, implicitNullCheckLimit, inlineObjects); + } + + protected HotSpotConstantReflectionProvider createConstantReflection(HotSpotJVMCIRuntimeProvider runtime) { + return new HotSpotConstantReflectionProvider(runtime); + } + + protected RegisterConfig createRegisterConfig(HotSpotJVMCIRuntimeProvider runtime, TargetDescription target) { + return new AMD64HotSpotRegisterConfig(target.arch, runtime.getConfig()); + } + + protected HotSpotCodeCacheProvider createCodeCache(HotSpotJVMCIRuntimeProvider runtime, TargetDescription target, RegisterConfig regConfig) { + return new HotSpotCodeCacheProvider(runtime, runtime.getConfig(), target, regConfig); + } + + protected HotSpotMetaAccessProvider createMetaAccess(HotSpotJVMCIRuntimeProvider runtime) { + return new HotSpotMetaAccessProvider(runtime); + } + + @Override + public String getArchitecture() { + return "AMD64"; + } + + @Override + public String toString() { + return "JVMCIBackend:" + getArchitecture(); + } + + @SuppressWarnings("try") + public JVMCIBackend createJVMCIBackend(HotSpotJVMCIRuntimeProvider runtime, JVMCIBackend host) { + + assert host == null; + TargetDescription target = createTarget(runtime.getConfig()); + + RegisterConfig regConfig; + HotSpotCodeCacheProvider codeCache; + ConstantReflectionProvider constantReflection; + HotSpotMetaAccessProvider metaAccess; + StackIntrospection stackIntrospection; + try (InitTimer t = timer("create providers")) { + try (InitTimer rt = timer("create MetaAccess provider")) { + metaAccess = createMetaAccess(runtime); + } + try (InitTimer rt = timer("create RegisterConfig")) { + regConfig = createRegisterConfig(runtime, target); + } + try (InitTimer rt = timer("create CodeCache provider")) { + codeCache = createCodeCache(runtime, target, regConfig); + } + try (InitTimer rt = timer("create ConstantReflection provider")) { + constantReflection = createConstantReflection(runtime); + } + try (InitTimer rt = timer("create StackIntrospection provider")) { + stackIntrospection = new HotSpotStackIntrospection(runtime); + } + } + try (InitTimer rt = timer("instantiate backend")) { + return createBackend(metaAccess, codeCache, constantReflection, stackIntrospection); + } + } + + protected JVMCIBackend createBackend(HotSpotMetaAccessProvider metaAccess, HotSpotCodeCacheProvider codeCache, ConstantReflectionProvider constantReflection, StackIntrospection stackIntrospection) { + return new JVMCIBackend(metaAccess, codeCache, constantReflection, stackIntrospection); + } +}