Mercurial > hg > truffle
changeset 12469:2a833e0d4e0a
gave HSAIL its own Replacements implementation (HSAILHotSpotReplacementsImpl)
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackendFactory.java Thu Oct 17 11:46:58 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackendFactory.java Thu Oct 17 11:48:31 2013 +0200 @@ -56,7 +56,7 @@ HotSpotConstantReflectionProvider constantReflection = new HotSpotConstantReflectionProvider(runtime); Value[] nativeABICallerSaveRegisters = createNativeABICallerSaveRegisters(runtime.getConfig(), codeCache.getRegisterConfig()); HotSpotForeignCallsProvider foreignCalls = new AMD64HotSpotForeignCallsProvider(runtime, metaAccess, codeCache, nativeABICallerSaveRegisters); - HotSpotHostLoweringProvider lowerer = new AMD64HotSpotLoweringProvider(runtime, metaAccess, foreignCalls); + HotSpotLoweringProvider lowerer = new AMD64HotSpotLoweringProvider(runtime, metaAccess, foreignCalls); // Replacements cannot have speculative optimizations since they have // to be valid for the entire run of the VM. Assumptions assumptions = new Assumptions(false);
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java Thu Oct 17 11:46:58 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java Thu Oct 17 11:48:31 2013 +0200 @@ -78,7 +78,11 @@ } public String getPartialCodeString() { - return (codeBuffer == null ? "" : new String(codeBuffer.copyData(0, codeBuffer.position()))); + if (codeBuffer == null) { + return ""; + } + byte[] data = codeBuffer.copyData(0, codeBuffer.position()); + return (data == null ? "" : new String(data)); } class HotSpotFrameContext implements FrameContext {
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackendFactory.java Thu Oct 17 11:46:58 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackendFactory.java Thu Oct 17 11:48:31 2013 +0200 @@ -29,6 +29,7 @@ import com.oracle.graal.hotspot.meta.*; import com.oracle.graal.hsail.*; import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.phases.util.*; @ServiceProvider(HotSpotBackendFactory.class) public class HSAILHotSpotBackendFactory implements HotSpotBackendFactory { @@ -42,7 +43,11 @@ ConstantReflectionProvider constantReflection = host.getConstantReflection(); HotSpotForeignCallsProvider foreignCalls = new HSAILHotSpotForeignCallsProvider(host.getForeignCalls()); LoweringProvider lowerer = new HSAILHotSpotLoweringProvider(host.getLowerer()); - Replacements replacements = host.getReplacements(); + // Replacements cannot have speculative optimizations since they have + // to be valid for the entire run of the VM. + Assumptions assumptions = new Assumptions(false); + Providers p = new Providers(metaAccess, codeCache, constantReflection, foreignCalls, lowerer, null); + Replacements replacements = new HSAILHotSpotReplacementsImpl(p, assumptions); HotSpotDisassemblerProvider disassembler = host.getDisassembler(); HotSpotSuitesProvider suites = host.getSuites(); HotSpotRegisters registers = new HotSpotRegisters(Register.None, Register.None, Register.None);
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotForeignCallsProvider.java Thu Oct 17 11:46:58 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotForeignCallsProvider.java Thu Oct 17 11:48:31 2013 +0200 @@ -49,7 +49,7 @@ } public ForeignCallLinkage lookupForeignCall(ForeignCallDescriptor descriptor) { - return host.lookupForeignCall(descriptor); + throw GraalInternalError.unimplemented(); } public Value[] getNativeABICallerSaveRegisters() {
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotLoweringProvider.java Thu Oct 17 11:46:58 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotLoweringProvider.java Thu Oct 17 11:48:31 2013 +0200 @@ -22,18 +22,21 @@ */ package com.oracle.graal.hotspot.hsail; +import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; +import com.oracle.graal.hotspot.*; +import com.oracle.graal.hotspot.meta.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.calc.*; import com.oracle.graal.nodes.extended.*; import com.oracle.graal.nodes.spi.*; -public class HSAILHotSpotLoweringProvider implements LoweringProvider { +public class HSAILHotSpotLoweringProvider implements HotSpotLoweringProvider { - private LoweringProvider hostLowerer; + private LoweringProvider host; - public HSAILHotSpotLoweringProvider(LoweringProvider hostLowerer) { - this.hostLowerer = hostLowerer; + public HSAILHotSpotLoweringProvider(LoweringProvider host) { + this.host = host; } public void lower(Node n, LoweringTool tool) { @@ -41,11 +44,18 @@ // TODO return; } else { - hostLowerer.lower(n, tool); + host.lower(n, tool); } } public ValueNode reconstructArrayIndex(LocationNode location) { - return hostLowerer.reconstructArrayIndex(location); + throw GraalInternalError.unimplemented(); + } + + public void initialize(HotSpotProviders providers, HotSpotVMConfig config) { + } + + public int getScalingFactor(Kind elementKind) { + throw GraalInternalError.unimplemented(); } }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotReplacementsImpl.java Thu Oct 17 11:48:31 2013 +0200 @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * 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 com.oracle.graal.hotspot.hsail; + +import java.lang.reflect.*; + +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; +import com.oracle.graal.nodes.*; +import com.oracle.graal.phases.util.*; +import com.oracle.graal.replacements.*; + +/** + * Filters the substitutions and snippets supported by HSAIL. + */ +public class HSAILHotSpotReplacementsImpl extends ReplacementsImpl { + + public HSAILHotSpotReplacementsImpl(Providers providers, Assumptions assumptions) { + super(providers, assumptions); + } + + @Override + protected ResolvedJavaMethod registerMethodSubstitution(Member originalMethod, Method substituteMethod) { + // TODO decide here what methods substitutions are supported + return null; + } + + @Override + public Class<? extends FixedWithNextNode> getMacroSubstitution(ResolvedJavaMethod method) { + // TODO decide here what macro substitutions are supported + return null; + } + + @Override + public StructuredGraph getSnippet(ResolvedJavaMethod method) { + // TODO must work in cooperation with HSAILHotSpotLoweringProvider + return null; + } +}
--- a/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotBackendFactory.java Thu Oct 17 11:46:58 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotBackendFactory.java Thu Oct 17 11:48:31 2013 +0200 @@ -40,7 +40,7 @@ PTXHotSpotCodeCacheProvider codeCache = new PTXHotSpotCodeCacheProvider(runtime, createTarget()); ConstantReflectionProvider constantReflection = host.getConstantReflection(); HotSpotForeignCallsProvider foreignCalls = new PTXHotSpotForeignCallsProvider(); - HotSpotHostLoweringProvider lowerer = new PTXHotSpotLoweringProvider(runtime, metaAccess, foreignCalls); + HotSpotLoweringProvider lowerer = new PTXHotSpotLoweringProvider(host.getLowerer()); Replacements replacements = host.getReplacements(); HotSpotDisassemblerProvider disassembler = host.getDisassembler(); HotSpotSuitesProvider suites = host.getSuites();
--- a/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotForeignCallsProvider.java Thu Oct 17 11:46:58 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotForeignCallsProvider.java Thu Oct 17 11:48:31 2013 +0200 @@ -51,6 +51,5 @@ } public void initialize(HotSpotProviders providers, HotSpotVMConfig config) { - throw GraalInternalError.unimplemented(); } }
--- a/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotLoweringProvider.java Thu Oct 17 11:46:58 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotLoweringProvider.java Thu Oct 17 11:48:31 2013 +0200 @@ -22,18 +22,21 @@ */ package com.oracle.graal.hotspot.ptx; -import com.oracle.graal.api.code.*; import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; import com.oracle.graal.hotspot.*; import com.oracle.graal.hotspot.meta.*; +import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.calc.*; +import com.oracle.graal.nodes.extended.*; import com.oracle.graal.nodes.spi.*; -public class PTXHotSpotLoweringProvider extends HotSpotHostLoweringProvider { +public class PTXHotSpotLoweringProvider implements HotSpotLoweringProvider { - public PTXHotSpotLoweringProvider(HotSpotGraalRuntime runtime, MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls) { - super(runtime, metaAccess, foreignCalls); + private final LoweringProvider host; + + public PTXHotSpotLoweringProvider(LoweringProvider host) { + this.host = host; } @Override @@ -46,7 +49,18 @@ // So, there is no need to lower the operation. return; } else { - super.lower(n, tool); + host.lower(n, tool); } } + + public ValueNode reconstructArrayIndex(LocationNode location) { + throw GraalInternalError.unimplemented(); + } + + public void initialize(HotSpotProviders providers, HotSpotVMConfig config) { + } + + public int getScalingFactor(Kind elementKind) { + throw GraalInternalError.unimplemented(); + } }
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackendFactory.java Thu Oct 17 11:46:58 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackendFactory.java Thu Oct 17 11:48:31 2013 +0200 @@ -54,7 +54,7 @@ HotSpotConstantReflectionProvider constantReflection = new HotSpotConstantReflectionProvider(runtime); Value[] nativeABICallerSaveRegisters = createNativeABICallerSaveRegisters(runtime.getConfig(), codeCache.getRegisterConfig()); HotSpotForeignCallsProvider foreignCalls = new SPARCHotSpotForeignCallsProvider(runtime, metaAccess, codeCache, nativeABICallerSaveRegisters); - HotSpotHostLoweringProvider lowerer = new SPARCHotSpotLoweringProvider(runtime, metaAccess, foreignCalls); + HotSpotLoweringProvider lowerer = new SPARCHotSpotLoweringProvider(runtime, metaAccess, foreignCalls); // Replacements cannot have speculative optimizations since they have // to be valid for the entire run of the VM. Assumptions assumptions = new Assumptions(false);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java Thu Oct 17 11:46:58 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java Thu Oct 17 11:48:31 2013 +0200 @@ -202,7 +202,7 @@ initializedForeignCalls.add(foreignCalls); foreignCalls.initialize(providers, config); } - HotSpotHostLoweringProvider lowerer = (HotSpotHostLoweringProvider) providers.getLowerer(); + HotSpotLoweringProvider lowerer = (HotSpotLoweringProvider) providers.getLowerer(); if (!initializedLowerers.contains(lowerer)) { initializedLowerers.add(lowerer); initializeLowerer(providers, lowerer); @@ -210,7 +210,7 @@ } } - private void initializeLowerer(HotSpotProviders providers, HotSpotHostLoweringProvider lowerer) { + private void initializeLowerer(HotSpotProviders providers, HotSpotLoweringProvider lowerer) { final Replacements replacements = providers.getReplacements(); ServiceLoader<ReplacementsProvider> sl = ServiceLoader.loadInstalled(ReplacementsProvider.class); TargetDescription target = providers.getCodeCache().getTarget();
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotHostLoweringProvider.java Thu Oct 17 11:46:58 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotHostLoweringProvider.java Thu Oct 17 11:48:31 2013 +0200 @@ -57,7 +57,7 @@ /** * HotSpot implementation of {@link LoweringProvider}. */ -public class HotSpotHostLoweringProvider implements LoweringProvider { +public class HotSpotHostLoweringProvider implements HotSpotLoweringProvider { protected final HotSpotGraalRuntime runtime; protected final MetaAccessProvider metaAccess;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotLoweringProvider.java Thu Oct 17 11:48:31 2013 +0200 @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * 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 com.oracle.graal.hotspot.meta; + +import com.oracle.graal.api.meta.*; +import com.oracle.graal.hotspot.*; +import com.oracle.graal.nodes.spi.*; + +/** + * HotSpot extension of {@link LoweringProvider}. + */ +public interface HotSpotLoweringProvider extends LoweringProvider { + + void initialize(HotSpotProviders providers, HotSpotVMConfig config); + + int getScalingFactor(Kind elementKind); +}
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/NewObjectSnippets.java Thu Oct 17 11:46:58 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/NewObjectSnippets.java Thu Oct 17 11:48:31 2013 +0200 @@ -332,7 +332,7 @@ Kind elementKind = elementType.getKind(); ConstantNode hub = ConstantNode.forConstant(arrayType.klass(), providers.getMetaAccess(), graph); final int headerSize = HotSpotGraalRuntime.getArrayBaseOffset(elementKind); - HotSpotHostLoweringProvider lowerer = (HotSpotHostLoweringProvider) providers.getLowerer(); + HotSpotLoweringProvider lowerer = (HotSpotLoweringProvider) providers.getLowerer(); int log2ElementSize = CodeUtil.log2(lowerer.getScalingFactor(elementKind)); Arguments args = new Arguments(allocateArray, graph.getGuardsStage());