src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/AheadOfTimeCompilationTest.java
Index
Unified diffs
Context diffs
Sdiffs
Patch
New
Old
Previous File
Next File
*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/AheadOfTimeCompilationTest.java Mon Mar 20 17:38:18 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/AheadOfTimeCompilationTest.java Mon Mar 20 17:38:18 2017
*** 20,62 ****
--- 20,52 ----
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package org.graalvm.compiler.hotspot.test;
import static org.graalvm.compiler.core.GraalCompiler.compileGraph;
import static org.graalvm.compiler.core.common.GraalOptions.ImmutableCode;
import static org.graalvm.compiler.nodes.ConstantNode.getConstantNodes;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.graalvm.compiler.api.test.Graal;
import org.graalvm.compiler.code.CompilationResult;
import org.graalvm.compiler.core.common.type.Stamp;
import org.graalvm.compiler.core.test.GraalCompilerTest;
import org.graalvm.compiler.graph.iterators.NodeIterable;
import org.graalvm.compiler.hotspot.nodes.type.KlassPointerStamp;
import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory;
import org.graalvm.compiler.lir.phases.LIRSuites;
import org.graalvm.compiler.nodes.ConstantNode;
import org.graalvm.compiler.nodes.PiNode;
import org.graalvm.compiler.nodes.StructuredGraph;
import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
import org.graalvm.compiler.nodes.memory.FloatingReadNode;
import org.graalvm.compiler.nodes.memory.ReadNode;
! import org.graalvm.compiler.options.OptionValues;
! import org.graalvm.compiler.options.OptionValue.OverrideScope;
! import org.graalvm.compiler.phases.OptimisticOptimizations;
! import org.graalvm.compiler.phases.tiers.Suites;
! import org.graalvm.compiler.phases.tiers.SuitesProvider;
import org.graalvm.compiler.runtime.RuntimeProvider;
! import org.junit.Assert;
! import org.junit.Assume;
! import org.junit.Before;
! import org.junit.Test;
+ import jdk.vm.ci.aarch64.AArch64;
import jdk.vm.ci.hotspot.HotSpotResolvedObjectType;
import jdk.vm.ci.meta.JavaConstant;
import jdk.vm.ci.meta.JavaKind;
import jdk.vm.ci.meta.ResolvedJavaMethod;
/**
* use
*
* <pre>
*** 72,97 ****
--- 62,91 ----
public static Object getStaticFinalObject() {
return AheadOfTimeCompilationTest.STATICFINALOBJECT;
}
+ @Before
+ public void setUp() {
+ // Ignore on SPARC
+ Assume.assumeFalse("skipping on AArch64", getTarget().arch instanceof AArch64);
+ }
+
@Test
public void testStaticFinalObjectAOT() {
StructuredGraph result = compile("getStaticFinalObject", true);
assertDeepEquals(1, getConstantNodes(result).count());
Stamp constantStamp = getConstantNodes(result).first().stamp();
Assert.assertTrue(constantStamp.toString(), constantStamp instanceof KlassPointerStamp);
- assertDeepEquals(2, result.getNodes().filter(FloatingReadNode.class).count());
assertDeepEquals(0, result.getNodes().filter(ReadNode.class).count());
}
@Test
public void testStaticFinalObject() {
StructuredGraph result = compile("getStaticFinalObject", false);
assertDeepEquals(1, getConstantNodes(result).count());
assertDeepEquals(JavaKind.Object, getConstantNodes(result).first().getStackKind());
assertDeepEquals(0, result.getNodes().filter(FloatingReadNode.class).count());
assertDeepEquals(0, result.getNodes().filter(ReadNode.class).count());
}
public static Class<AheadOfTimeCompilationTest> getClassObject() {
return AheadOfTimeCompilationTest.class;
*** 104,115 ****
--- 98,108 ----
NodeIterable<ConstantNode> filter = getConstantNodes(result);
assertDeepEquals(1, filter.count());
HotSpotResolvedObjectType type = (HotSpotResolvedObjectType) getMetaAccess().lookupJavaType(AheadOfTimeCompilationTest.class);
assertDeepEquals(type.klass(), filter.first().asConstant());
- assertDeepEquals(1, result.getNodes().filter(FloatingReadNode.class).count());
assertDeepEquals(0, result.getNodes().filter(ReadNode.class).count());
}
@Test
public void testClassObject() {
StructuredGraph result = compile("getClassObject", false);
*** 117,127 ****
--- 110,119 ----
NodeIterable<ConstantNode> filter = getConstantNodes(result);
assertDeepEquals(1, filter.count());
JavaConstant c = filter.first().asJavaConstant();
Assert.assertEquals(getSnippetReflection().asObject(Class.class, c), AheadOfTimeCompilationTest.class);
assertDeepEquals(0, result.getNodes().filter(FloatingReadNode.class).count());
assertDeepEquals(0, result.getNodes().filter(ReadNode.class).count());
}
public static Class<Integer> getPrimitiveClassObject() {
return int.class;
*** 133,155 ****
--- 125,145 ----
NodeIterable<ConstantNode> filter = getConstantNodes(result);
assertDeepEquals(1, filter.count());
Stamp constantStamp = filter.first().stamp();
Assert.assertTrue(constantStamp instanceof KlassPointerStamp);
- assertDeepEquals(2, result.getNodes().filter(FloatingReadNode.class).count());
assertDeepEquals(0, result.getNodes().filter(ReadNode.class).count());
}
@Test
public void testPrimitiveClassObject() {
StructuredGraph result = compile("getPrimitiveClassObject", false);
NodeIterable<ConstantNode> filter = getConstantNodes(result);
assertDeepEquals(1, filter.count());
JavaConstant c = filter.first().asJavaConstant();
Assert.assertEquals(getSnippetReflection().asObject(Class.class, c), Integer.TYPE);
assertDeepEquals(0, result.getNodes().filter(FloatingReadNode.class).count());
assertDeepEquals(0, result.getNodes().filter(ReadNode.class).count());
}
public static String getStringObject() {
return AheadOfTimeCompilationTest.STATICFINALSTRING;
*** 180,200 ****
--- 170,191 ----
public static Boolean getBoxedBoolean() {
return Boolean.valueOf(true);
}
@Ignore("ImmutableCode override may not work reliably in non-hosted mode")
@Test
public void testBoxedBooleanAOT() {
StructuredGraph result = compile("getBoxedBoolean", true);
! assertDeepEquals(2, result.getNodes().filter(FloatingReadNode.class).count());
! assertDeepEquals(1, result.getNodes(PiNode.TYPE).count());
! assertDeepEquals(0, result.getNodes().filter(FloatingReadNode.class).count());
! assertDeepEquals(0, result.getNodes(PiNode.TYPE).count());
assertDeepEquals(1, getConstantNodes(result).count());
ConstantNode constant = getConstantNodes(result).first();
! assertDeepEquals(JavaKind.Long, constant.getStackKind());
assertDeepEquals(((HotSpotResolvedObjectType) getMetaAccess().lookupJavaType(Boolean.class)).klass(), constant.asConstant());
! assertDeepEquals(JavaKind.Object, constant.getStackKind());
+
+ JavaConstant c = constant.asJavaConstant();
+ Assert.assertEquals(getSnippetReflection().asObject(Boolean.class, c), Boolean.TRUE);
}
@Test
public void testBoxedBoolean() {
StructuredGraph result = compile("getBoxedBoolean", false);
*** 208,226 ****
--- 199,209 ----
Assert.assertEquals(getSnippetReflection().asObject(Boolean.class, c), Boolean.TRUE);
}
@SuppressWarnings("try")
private StructuredGraph compile(String test, boolean compileAOT) {
try (OverrideScope s = OptionValue.override(ImmutableCode, compileAOT)) {
! StructuredGraph graph = parseEager(test, AllowAssumptions.YES);
! ResolvedJavaMethod method = graph.method();
// create suites everytime, as we modify options for the compiler
SuitesProvider suitesProvider = Graal.getRequiredCapability(RuntimeProvider.class).getHostBackend().getSuites();
final Suites suitesLocal = suitesProvider.getDefaultSuites();
final LIRSuites lirSuitesLocal = suitesProvider.getDefaultLIRSuites();
final CompilationResult compResult = compileGraph(graph, method, getProviders(), getBackend(), getDefaultGraphBuilderSuite(), OptimisticOptimizations.ALL, graph.getProfilingInfo(),
suitesLocal, lirSuitesLocal, new CompilationResult(), CompilationResultBuilderFactory.Default);
addMethod(method, compResult);
+ OptionValues options = new OptionValues(getInitialOptions(), ImmutableCode, compileAOT);
! StructuredGraph graph = parseEager(test, AllowAssumptions.YES, options);
! compile(graph.method(), graph);
return graph;
}
}
}
src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/AheadOfTimeCompilationTest.java
Index
Unified diffs
Context diffs
Sdiffs
Patch
New
Old
Previous File
Next File