Mercurial > hg > truffle

annotate graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java @ 8232:ab374f69e4e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
JTTTest gets the expeted result only once
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 13 Mar 2013 17:06:30 +0100
parents dce9cefed571
children 9484e7602276
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
1 /*
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
2 * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
4 *
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
5 * This code is free software; you can redistribute it and/or modify it
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
6 * under the terms of the GNU General Public License version 2 only, as
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
7 * published by the Free Software Foundation.
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
8 *
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
9 * This code is distributed in the hope that it will be useful, but WITHOUT
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
12 * version 2 for more details (a copy is included in the LICENSE file that
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
13 * accompanied this code).
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
14 *
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
15 * You should have received a copy of the GNU General Public License version
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
16 * 2 along with this work; if not, write to the Free Software Foundation,
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
18 *
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
20 * or visit www.oracle.com if you need additional information or have any
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
21 * questions.
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
22 */
6334
f8ba3bb81f6f Renamed com.oracle.graal.tests project to com.oracle.graal.compiler.test
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 6329
diff changeset
23 package com.oracle.graal.compiler.test;
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
24
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
25 import java.lang.reflect.*;
5650
8d420cfd2a6f added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents: 5599
diff changeset
26 import java.util.*;
5360
6cc970203f30 moved creation of a RiCodeInfo to the runtime side of the CRI
Doug Simon <doug.simon@oracle.com>
parents: 5122
diff changeset
27 import java.util.concurrent.*;
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
28
7260
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
29 import org.junit.*;
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
30
5510
426c605c9d3c Move cri.ci to api.code.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 5507
diff changeset
31 import com.oracle.graal.api.code.*;
5507
dc71b06d09f8 Moving classes from cri.ri to api.meta.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 5499
diff changeset
32 import com.oracle.graal.api.meta.*;
6540
31aa76ffd3bb Rename project graal.api to graal.api.runtime
Christian Wimmer <christian.wimmer@oracle.com>
parents: 6539
diff changeset
33 import com.oracle.graal.api.runtime.*;
5114
dad1ac9dba7d finished first implementation of disabling runtime feedback selectively based on deoptimization history
Christian Haeubl <christian.haeubl@oracle.com>
parents: 5109
diff changeset
34 import com.oracle.graal.compiler.*;
7836
a202f72872a4 Remove usage of left-over fields in GraalCompiler.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 7835
diff changeset
35 import com.oracle.graal.compiler.target.*;
5060
4ed4295ce15f Update import statements.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 5059
diff changeset
36 import com.oracle.graal.debug.*;
5425
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
37 import com.oracle.graal.graph.*;
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
38 import com.oracle.graal.graph.Node.Verbosity;
5060
4ed4295ce15f Update import statements.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 5059
diff changeset
39 import com.oracle.graal.java.*;
4ed4295ce15f Update import statements.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 5059
diff changeset
40 import com.oracle.graal.nodes.*;
6529
2e96dc4eb8e2 renamed package: com.oracle.graal.lir.cfg -> com.oracle.graal.nodes.cfg
Doug Simon <doug.simon@oracle.com>
parents: 6526
diff changeset
41 import com.oracle.graal.nodes.cfg.*;
5720
46ad94a0574a moved everything from com.oracle.graal.nodes.cri into com.oracle.graal.nodes.spi
Doug Simon <doug.simon@oracle.com>
parents: 5719
diff changeset
42 import com.oracle.graal.nodes.spi.*;
6525
2c913b643422 rename packages in graal.phases to match project name
Doug Simon <doug.simon@oracle.com>
parents: 6447
diff changeset
43 import com.oracle.graal.phases.*;
6543
ec196bfc458b Minor fixes after cleanup
Christian Wimmer <christian.wimmer@oracle.com>
parents: 6540
diff changeset
44 import com.oracle.graal.phases.PhasePlan.PhasePosition;
6525
2c913b643422 rename packages in graal.phases to match project name
Doug Simon <doug.simon@oracle.com>
parents: 6447
diff changeset
45 import com.oracle.graal.phases.schedule.*;
7318
323ece2b012b Refactor debug environment creation.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 7282
diff changeset
46 import com.oracle.graal.printer.*;
7717
cf94bd18eb47 lift GraalCompilerTest.getMethod to a common base class
Roland Schatz <roland.schatz@oracle.com>
parents: 7530
diff changeset
47 import com.oracle.graal.test.*;
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
48
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
49 /**
6578
1112609bb5dc updated javadoc
Doug Simon <doug.simon@oracle.com>
parents: 6543
diff changeset
50 * Base class for Graal compiler unit tests.
1112609bb5dc updated javadoc
Doug Simon <doug.simon@oracle.com>
parents: 6543
diff changeset
51 * <p>
1112609bb5dc updated javadoc
Doug Simon <doug.simon@oracle.com>
parents: 6543
diff changeset
52 * White box tests for Graal compiler transformations use this pattern:
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
53 * <ol>
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
54 * <li>Create a graph by {@linkplain #parse(String) parsing} a method.</li>
5360
6cc970203f30 moved creation of a RiCodeInfo to the runtime side of the CRI
Doug Simon <doug.simon@oracle.com>
parents: 5122
diff changeset
55 * <li>Manually modify the graph (e.g. replace a parameter node with a constant).</li>
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
56 * <li>Apply a transformation to the graph.</li>
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
57 * <li>Assert that the transformed graph is equal to an expected graph.</li>
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
58 * </ol>
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
59 * <p>
6578
1112609bb5dc updated javadoc
Doug Simon <doug.simon@oracle.com>
parents: 6543
diff changeset
60 * See {@link InvokeHintsTest} as an example of a white box test.
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
61 * <p>
7530
5e3d1a68664e applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents: 7321
diff changeset
62 * Black box tests use the {@link #test(String, Object...)} or
5e3d1a68664e applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents: 7321
diff changeset
63 * {@link #testN(int, String, Object...)} to execute some method in the interpreter and compare its
5e3d1a68664e applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents: 7321
diff changeset
64 * result against that produced by a Graal compiled version of the method.
6578
1112609bb5dc updated javadoc
Doug Simon <doug.simon@oracle.com>
parents: 6543
diff changeset
65 * <p>
1112609bb5dc updated javadoc
Doug Simon <doug.simon@oracle.com>
parents: 6543
diff changeset
66 * These tests will be run by the {@code mx unittest} command.
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
67 */
7717
cf94bd18eb47 lift GraalCompilerTest.getMethod to a common base class
Roland Schatz <roland.schatz@oracle.com>
parents: 7530
diff changeset
68 public abstract class GraalCompilerTest extends GraalTest {
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
69
5718
10341299528c renamings: ExtendedRiRuntime -> GraalCodeCacheProvider, CiLoweringTool -> LoweringTool, RiGraphCache -> GraphCache
Doug Simon <doug.simon@oracle.com>
parents: 5657
diff changeset
70 protected final GraalCodeCacheProvider runtime;
7836
a202f72872a4 Remove usage of left-over fields in GraalCompiler.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 7835
diff changeset
71 protected final Backend backend;
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
72
5565
0083a59ced84 Renaming GraphTest => GraalCompilerTest.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 5546
diff changeset
73 public GraalCompilerTest() {
7318
323ece2b012b Refactor debug environment creation.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 7282
diff changeset
74 DebugEnvironment.initialize(System.out);
6334
f8ba3bb81f6f Renamed com.oracle.graal.tests project to com.oracle.graal.compiler.test
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 6329
diff changeset
75 this.runtime = Graal.getRequiredCapability(GraalCodeCacheProvider.class);
7836
a202f72872a4 Remove usage of left-over fields in GraalCompiler.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 7835
diff changeset
76 this.backend = Graal.getRequiredCapability(Backend.class);
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
77 }
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
78
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
79 protected void assertEquals(StructuredGraph expected, StructuredGraph graph) {
5425
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
80 String expectedString = getCanonicalGraphString(expected);
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
81 String actualString = getCanonicalGraphString(graph);
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
82 String mismatchString = "mismatch in graphs:\n========= expected =========\n" + expectedString + "\n\n========= actual =========\n" + actualString;
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
83
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
84 if (expected.getNodeCount() != graph.getNodeCount()) {
4363
7462c3600c3a Draft changes to the graph plotting.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 4265
diff changeset
85 Debug.dump(expected, "Node count not matching - expected");
7462c3600c3a Draft changes to the graph plotting.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 4265
diff changeset
86 Debug.dump(graph, "Node count not matching - actual");
5425
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
87 Assert.fail("Graphs do not have the same number of nodes: " + expected.getNodeCount() + " vs. " + graph.getNodeCount() + "\n" + mismatchString);
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
88 }
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
89 if (!expectedString.equals(actualString)) {
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
90 Debug.dump(expected, "mismatching graphs - expected");
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
91 Debug.dump(graph, "mismatching graphs - actual");
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
92 Assert.fail(mismatchString);
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
93 }
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
94 }
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
95
5657
d71eb56d6bb0 new stamp inference in CanonicalizerPhase, IntegerStamp.mask
Lukas Stadler <lukas.stadler@jku.at>
parents: 5650
diff changeset
96 protected void assertConstantReturn(StructuredGraph graph, int value) {
d71eb56d6bb0 new stamp inference in CanonicalizerPhase, IntegerStamp.mask
Lukas Stadler <lukas.stadler@jku.at>
parents: 5650
diff changeset
97 String graphString = getCanonicalGraphString(graph);
d71eb56d6bb0 new stamp inference in CanonicalizerPhase, IntegerStamp.mask
Lukas Stadler <lukas.stadler@jku.at>
parents: 5650
diff changeset
98 Assert.assertEquals("unexpected number of ReturnNodes: " + graphString, graph.getNodes(ReturnNode.class).count(), 1);
d71eb56d6bb0 new stamp inference in CanonicalizerPhase, IntegerStamp.mask
Lukas Stadler <lukas.stadler@jku.at>
parents: 5650
diff changeset
99 ValueNode result = graph.getNodes(ReturnNode.class).first().result();
d71eb56d6bb0 new stamp inference in CanonicalizerPhase, IntegerStamp.mask
Lukas Stadler <lukas.stadler@jku.at>
parents: 5650
diff changeset
100 Assert.assertTrue("unexpected ReturnNode result node: " + graphString, result.isConstant());
6329
92bc58dc5b5e More clean up and documentation in api.code and api.meta.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 5780
diff changeset
101 Assert.assertEquals("unexpected ReturnNode result kind: " + graphString, result.asConstant().getKind(), Kind.Int);
5657
d71eb56d6bb0 new stamp inference in CanonicalizerPhase, IntegerStamp.mask
Lukas Stadler <lukas.stadler@jku.at>
parents: 5650
diff changeset
102 Assert.assertEquals("unexpected ReturnNode result: " + graphString, result.asConstant().asInt(), value);
d71eb56d6bb0 new stamp inference in CanonicalizerPhase, IntegerStamp.mask
Lukas Stadler <lukas.stadler@jku.at>
parents: 5650
diff changeset
103 }
d71eb56d6bb0 new stamp inference in CanonicalizerPhase, IntegerStamp.mask
Lukas Stadler <lukas.stadler@jku.at>
parents: 5650
diff changeset
104
d71eb56d6bb0 new stamp inference in CanonicalizerPhase, IntegerStamp.mask
Lukas Stadler <lukas.stadler@jku.at>
parents: 5650
diff changeset
105 protected static String getCanonicalGraphString(StructuredGraph graph) {
5425
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
106 SchedulePhase schedule = new SchedulePhase();
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
107 schedule.apply(graph);
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
108
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
109 NodeMap<Integer> canonicalId = graph.createNodeMap();
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
110 int nextId = 0;
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
111
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
112 StringBuilder result = new StringBuilder();
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
113 for (Block block : schedule.getCFG().getBlocks()) {
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
114 result.append("Block " + block + " ");
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
115 if (block == schedule.getCFG().getStartBlock()) {
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
116 result.append("* ");
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
117 }
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
118 result.append("-> ");
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
119 for (Block succ : block.getSuccessors()) {
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
120 result.append(succ + " ");
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
121 }
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
122 result.append("\n");
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
123 for (Node node : schedule.getBlockToNodesMap().get(block)) {
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
124 int id;
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
125 if (canonicalId.get(node) != null) {
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
126 id = canonicalId.get(node);
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
127 } else {
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
128 id = nextId++;
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
129 canonicalId.set(node, id);
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
130 }
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
131 String name = node instanceof ConstantNode ? node.toString(Verbosity.Name) : node.getClass().getSimpleName();
7123
b914b9b4c578 graal.graph refactorings
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 7028
diff changeset
132 result.append(" " + id + "|" + name + " (" + node.usages().count() + ")\n");
5425
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
133 }
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
134 }
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
135 return result.toString();
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
136 }
0364a2a874b8 changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents: 5360
diff changeset
137
5718
10341299528c renamings: ExtendedRiRuntime -> GraalCodeCacheProvider, CiLoweringTool -> LoweringTool, RiGraphCache -> GraphCache
Doug Simon <doug.simon@oracle.com>
parents: 5657
diff changeset
138 protected GraalCodeCacheProvider runtime() {
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
139 return runtime;
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
140 }
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
141
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
142 /**
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
143 * Parses a Java method to produce a graph.
7530
5e3d1a68664e applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents: 7321
diff changeset
144 *
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
145 * @param methodName the name of the method in {@code this.getClass()} to be parsed
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
146 */
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
147 protected StructuredGraph parse(String methodName) {
4993
897b7d18bebc added RiCompiledMethod.execute and the required VM infrastructure
Lukas Stadler <lukas.stadler@jku.at>
parents: 4410
diff changeset
148 return parse(getMethod(methodName));
897b7d18bebc added RiCompiledMethod.execute and the required VM infrastructure
Lukas Stadler <lukas.stadler@jku.at>
parents: 4410
diff changeset
149 }
897b7d18bebc added RiCompiledMethod.execute and the required VM infrastructure
Lukas Stadler <lukas.stadler@jku.at>
parents: 4410
diff changeset
150
5433
d7b5cc23945e refactored tests to share support for dump-aware compilation
Doug Simon <doug.simon@oracle.com>
parents: 5425
diff changeset
151 private static int compilationId = 0;
d7b5cc23945e refactored tests to share support for dump-aware compilation
Doug Simon <doug.simon@oracle.com>
parents: 5425
diff changeset
152
7260
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
153 /**
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
154 * Compares two given objects for {@linkplain Assert#assertEquals(Object, Object) equality}.
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
155 * Does a deep copy equality comparison if {@code expected} is an array.
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
156 */
5599
592dfff9d410 modified GraalCompilerTest so that subclasses can override the assertEquals test
Doug Simon <doug.simon@oracle.com>
parents: 5571
diff changeset
157 protected void assertEquals(Object expected, Object actual) {
7260
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
158 if (expected != null && expected.getClass().isArray()) {
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
159 Assert.assertTrue(expected != null);
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
160 Assert.assertTrue(actual != null);
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
161 Assert.assertEquals(expected.getClass(), actual.getClass());
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
162 if (expected instanceof int[]) {
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
163 Assert.assertArrayEquals((int[]) expected, (int[]) actual);
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
164 } else if (expected instanceof byte[]) {
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
165 Assert.assertArrayEquals((byte[]) expected, (byte[]) actual);
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
166 } else if (expected instanceof char[]) {
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
167 Assert.assertArrayEquals((char[]) expected, (char[]) actual);
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
168 } else if (expected instanceof short[]) {
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
169 Assert.assertArrayEquals((short[]) expected, (short[]) actual);
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
170 } else if (expected instanceof float[]) {
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
171 Assert.assertArrayEquals((float[]) expected, (float[]) actual, 0.0f);
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
172 } else if (expected instanceof long[]) {
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
173 Assert.assertArrayEquals((long[]) expected, (long[]) actual);
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
174 } else if (expected instanceof double[]) {
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
175 Assert.assertArrayEquals((double[]) expected, (double[]) actual, 0.0d);
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
176 } else if (expected instanceof Object[]) {
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
177 Assert.assertArrayEquals((Object[]) expected, (Object[]) actual);
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
178 } else {
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
179 Assert.fail("non-array value encountered: " + expected);
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
180 }
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
181 } else {
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
182 Assert.assertEquals(expected, actual);
169bbc849ee9 moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents: 7154
diff changeset
183 }
5599
592dfff9d410 modified GraalCompilerTest so that subclasses can override the assertEquals test
Doug Simon <doug.simon@oracle.com>
parents: 5571
diff changeset
184 }
592dfff9d410 modified GraalCompilerTest so that subclasses can override the assertEquals test
Doug Simon <doug.simon@oracle.com>
parents: 5571
diff changeset
185
6370
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
186 protected void testN(int n, final String name, final Object... args) {
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
187 final Throwable[] errors = new Throwable[n];
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
188 Thread[] threads = new Thread[n];
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
189 for (int i = 0; i < n; i++) {
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
190 final int idx = i;
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
191 Thread t = new Thread(i + ":" + name) {
7530
5e3d1a68664e applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents: 7321
diff changeset
192
6370
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
193 @Override
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
194 public void run() {
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
195 try {
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
196 test(name, args);
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
197 } catch (Throwable e) {
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
198 errors[idx] = e;
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
199 }
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
200 }
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
201 };
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
202 threads[i] = t;
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
203 t.start();
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
204 }
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
205 int failed = 0;
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
206 for (int i = 0; i < n; i++) {
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
207 try {
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
208 threads[i].join();
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
209 } catch (InterruptedException e) {
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
210 errors[i] = e;
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
211 }
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
212 if (errors[i] != null) {
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
213 errors[i].printStackTrace();
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
214 failed++;
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
215 }
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
216 }
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
217 Assert.assertTrue(failed + " of " + n + " failed", failed == 0);
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
218 }
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
219
6431
2e376f8ea4e2 added snippet for lowering NewMultiArrayNodes
Doug Simon <doug.simon@oracle.com>
parents: 6370
diff changeset
220 protected Object referenceInvoke(Method method, Object receiver, Object... args) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {
2e376f8ea4e2 added snippet for lowering NewMultiArrayNodes
Doug Simon <doug.simon@oracle.com>
parents: 6370
diff changeset
221 return method.invoke(receiver, args);
2e376f8ea4e2 added snippet for lowering NewMultiArrayNodes
Doug Simon <doug.simon@oracle.com>
parents: 6370
diff changeset
222 }
2e376f8ea4e2 added snippet for lowering NewMultiArrayNodes
Doug Simon <doug.simon@oracle.com>
parents: 6370
diff changeset
223
8232
ab374f69e4e8 JTTTest gets the expeted result only once
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 8217
diff changeset
224 protected static class Result {
7530
5e3d1a68664e applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents: 7321
diff changeset
225
6447
d7bcbdf4749c minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents: 6431
diff changeset
226 final Object returnValue;
d7bcbdf4749c minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents: 6431
diff changeset
227 final Throwable exception;
7530
5e3d1a68664e applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents: 7321
diff changeset
228
6447
d7bcbdf4749c minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents: 6431
diff changeset
229 public Result(Object returnValue, Throwable exception) {
d7bcbdf4749c minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents: 6431
diff changeset
230 this.returnValue = returnValue;
d7bcbdf4749c minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents: 6431
diff changeset
231 this.exception = exception;
d7bcbdf4749c minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents: 6431
diff changeset
232 }
d7bcbdf4749c minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents: 6431
diff changeset
233 }
d7bcbdf4749c minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents: 6431
diff changeset
234
7282
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
235 /**
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
236 * Called before a test is executed.
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
237 */
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
238 protected void before() {
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
239 }
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
240
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
241 /**
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
242 * Called after a test is executed.
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
243 */
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
244 protected void after() {
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
245 }
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
246
6447
d7bcbdf4749c minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents: 6431
diff changeset
247 protected Result executeExpected(Method method, Object receiver, Object... args) {
7282
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
248 before();
5557
2e2a77f091f2 re-enabled disassembler output to C1Visualizer after code installation
Doug Simon <doug.simon@oracle.com>
parents: 5546
diff changeset
249 try {
7530
5e3d1a68664e applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents: 7321
diff changeset
250 // This gives us both the expected return value as well as ensuring that the method to
5e3d1a68664e applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents: 7321
diff changeset
251 // be compiled is fully resolved
6447
d7bcbdf4749c minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents: 6431
diff changeset
252 return new Result(referenceInvoke(method, receiver, args), null);
5557
2e2a77f091f2 re-enabled disassembler output to C1Visualizer after code installation
Doug Simon <doug.simon@oracle.com>
parents: 5546
diff changeset
253 } catch (InvocationTargetException e) {
6447
d7bcbdf4749c minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents: 6431
diff changeset
254 return new Result(null, e.getTargetException());
5557
2e2a77f091f2 re-enabled disassembler output to C1Visualizer after code installation
Doug Simon <doug.simon@oracle.com>
parents: 5546
diff changeset
255 } catch (Exception e) {
2e2a77f091f2 re-enabled disassembler output to C1Visualizer after code installation
Doug Simon <doug.simon@oracle.com>
parents: 5546
diff changeset
256 throw new RuntimeException(e);
7282
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
257 } finally {
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
258 after();
5557
2e2a77f091f2 re-enabled disassembler output to C1Visualizer after code installation
Doug Simon <doug.simon@oracle.com>
parents: 5546
diff changeset
259 }
6447
d7bcbdf4749c minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents: 6431
diff changeset
260 }
6370
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
261
6447
d7bcbdf4749c minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents: 6431
diff changeset
262 protected Result executeActual(Method method, Object receiver, Object... args) {
7282
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
263 before();
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
264 Object[] executeArgs = argsWithReceiver(receiver, args);
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
265
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
266 InstalledCode compiledMethod = getCode(runtime.lookupJavaMethod(method), parse(method));
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
267 try {
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
268 return new Result(compiledMethod.executeVarargs(executeArgs), null);
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
269 } catch (Throwable e) {
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
270 return new Result(null, e);
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
271 } finally {
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
272 after();
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
273 }
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
274 }
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
275
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
276 /**
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
277 * Prepends a non-null receiver argument to a given list or args.
7530
5e3d1a68664e applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents: 7321
diff changeset
278 *
7282
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
279 * @param receiver the receiver argument to prepend if it is non-null
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
280 */
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
281 protected Object[] argsWithReceiver(Object receiver, Object... args) {
6370
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
282 Object[] executeArgs;
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
283 if (receiver == null) {
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
284 executeArgs = args;
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
285 } else {
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
286 executeArgs = new Object[args.length + 1];
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
287 executeArgs[0] = receiver;
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
288 for (int i = 0; i < args.length; i++) {
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
289 executeArgs[i + 1] = args[i];
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
290 }
703a6ab8ca82 added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents: 6334
diff changeset
291 }
7282
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
292 return executeArgs;
6447
d7bcbdf4749c minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents: 6431
diff changeset
293 }
d7bcbdf4749c minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents: 6431
diff changeset
294
d7bcbdf4749c minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents: 6431
diff changeset
295 protected void test(String name, Object... args) {
d7bcbdf4749c minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents: 6431
diff changeset
296 Method method = getMethod(name);
d7bcbdf4749c minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents: 6431
diff changeset
297 Object receiver = Modifier.isStatic(method.getModifiers()) ? null : this;
d7bcbdf4749c minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents: 6431
diff changeset
298
8232
ab374f69e4e8 JTTTest gets the expeted result only once
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 8217
diff changeset
299 test(method, receiver, args);
ab374f69e4e8 JTTTest gets the expeted result only once
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 8217
diff changeset
300 }
ab374f69e4e8 JTTTest gets the expeted result only once
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 8217
diff changeset
301
ab374f69e4e8 JTTTest gets the expeted result only once
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 8217
diff changeset
302 protected void test(Method method, Object receiver, Object... args) {
6447
d7bcbdf4749c minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents: 6431
diff changeset
303 Result expect = executeExpected(method, receiver, args);
d7bcbdf4749c minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents: 6431
diff changeset
304 if (runtime == null) {
d7bcbdf4749c minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents: 6431
diff changeset
305 return;
d7bcbdf4749c minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents: 6431
diff changeset
306 }
8232
ab374f69e4e8 JTTTest gets the expeted result only once
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 8217
diff changeset
307 test(method, expect, receiver, args);
ab374f69e4e8 JTTTest gets the expeted result only once
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 8217
diff changeset
308 }
ab374f69e4e8 JTTTest gets the expeted result only once
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 8217
diff changeset
309
ab374f69e4e8 JTTTest gets the expeted result only once
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 8217
diff changeset
310 protected void test(Method method, Result expect, Object receiver, Object... args) {
6447
d7bcbdf4749c minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents: 6431
diff changeset
311 Result actual = executeActual(method, receiver, args);
d7bcbdf4749c minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents: 6431
diff changeset
312
d7bcbdf4749c minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents: 6431
diff changeset
313 if (expect.exception != null) {
d7bcbdf4749c minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents: 6431
diff changeset
314 Assert.assertTrue("expected " + expect.exception, actual.exception != null);
d7bcbdf4749c minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents: 6431
diff changeset
315 Assert.assertEquals(expect.exception.getClass(), actual.exception.getClass());
5557
2e2a77f091f2 re-enabled disassembler output to C1Visualizer after code installation
Doug Simon <doug.simon@oracle.com>
parents: 5546
diff changeset
316 } else {
8232
ab374f69e4e8 JTTTest gets the expeted result only once
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 8217
diff changeset
317 if (actual.exception != null) {
ab374f69e4e8 JTTTest gets the expeted result only once
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 8217
diff changeset
318 actual.exception.printStackTrace();
ab374f69e4e8 JTTTest gets the expeted result only once
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 8217
diff changeset
319 Assert.fail("expected " + expect.returnValue + " but got an exception");
ab374f69e4e8 JTTTest gets the expeted result only once
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 8217
diff changeset
320 }
6447
d7bcbdf4749c minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents: 6431
diff changeset
321 assertEquals(expect.returnValue, actual.returnValue);
5557
2e2a77f091f2 re-enabled disassembler output to C1Visualizer after code installation
Doug Simon <doug.simon@oracle.com>
parents: 5546
diff changeset
322 }
2e2a77f091f2 re-enabled disassembler output to C1Visualizer after code installation
Doug Simon <doug.simon@oracle.com>
parents: 5546
diff changeset
323 }
2e2a77f091f2 re-enabled disassembler output to C1Visualizer after code installation
Doug Simon <doug.simon@oracle.com>
parents: 5546
diff changeset
324
5650
8d420cfd2a6f added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents: 5599
diff changeset
325 private Map<ResolvedJavaMethod, InstalledCode> cache = new HashMap<>();
8d420cfd2a6f added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents: 5599
diff changeset
326
8d420cfd2a6f added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents: 5599
diff changeset
327 /**
8d420cfd2a6f added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents: 5599
diff changeset
328 * Gets installed code for a given method and graph, compiling it first if necessary.
8d420cfd2a6f added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents: 5599
diff changeset
329 */
8d420cfd2a6f added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents: 5599
diff changeset
330 protected InstalledCode getCode(final ResolvedJavaMethod method, final StructuredGraph graph) {
8d420cfd2a6f added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents: 5599
diff changeset
331 return getCode(method, graph, false);
8d420cfd2a6f added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents: 5599
diff changeset
332 }
8d420cfd2a6f added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents: 5599
diff changeset
333
8d420cfd2a6f added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents: 5599
diff changeset
334 /**
5780
64257cbef60c removed compile method from GraalCodeCacheProvider interface
Doug Simon <doug.simon@oracle.com>
parents: 5720
diff changeset
335 * Can be overridden to modify the compilation phases applied for a test.
7530
5e3d1a68664e applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents: 7321
diff changeset
336 *
5780
64257cbef60c removed compile method from GraalCodeCacheProvider interface
Doug Simon <doug.simon@oracle.com>
parents: 5720
diff changeset
337 * @param method the method being compiled
64257cbef60c removed compile method from GraalCodeCacheProvider interface
Doug Simon <doug.simon@oracle.com>
parents: 5720
diff changeset
338 * @param graph the graph being compiled
64257cbef60c removed compile method from GraalCodeCacheProvider interface
Doug Simon <doug.simon@oracle.com>
parents: 5720
diff changeset
339 * @param phasePlan the phase plan to be edited
64257cbef60c removed compile method from GraalCodeCacheProvider interface
Doug Simon <doug.simon@oracle.com>
parents: 5720
diff changeset
340 */
64257cbef60c removed compile method from GraalCodeCacheProvider interface
Doug Simon <doug.simon@oracle.com>
parents: 5720
diff changeset
341 protected void editPhasePlan(ResolvedJavaMethod method, StructuredGraph graph, PhasePlan phasePlan) {
64257cbef60c removed compile method from GraalCodeCacheProvider interface
Doug Simon <doug.simon@oracle.com>
parents: 5720
diff changeset
342 }
64257cbef60c removed compile method from GraalCodeCacheProvider interface
Doug Simon <doug.simon@oracle.com>
parents: 5720
diff changeset
343
64257cbef60c removed compile method from GraalCodeCacheProvider interface
Doug Simon <doug.simon@oracle.com>
parents: 5720
diff changeset
344 /**
5650
8d420cfd2a6f added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents: 5599
diff changeset
345 * Gets installed code for a given method and graph, compiling it first if necessary.
7530
5e3d1a68664e applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents: 7321
diff changeset
346 *
5e3d1a68664e applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents: 7321
diff changeset
347 * @param forceCompile specifies whether to ignore any previous code cached for the (method,
5e3d1a68664e applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents: 7321
diff changeset
348 * key) pair
5650
8d420cfd2a6f added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents: 5599
diff changeset
349 */
8d420cfd2a6f added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents: 5599
diff changeset
350 protected InstalledCode getCode(final ResolvedJavaMethod method, final StructuredGraph graph, boolean forceCompile) {
8d420cfd2a6f added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents: 5599
diff changeset
351 if (!forceCompile) {
8d420cfd2a6f added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents: 5599
diff changeset
352 InstalledCode cached = cache.get(method);
7028
0353b031235a added tests for instanceof with array types
Doug Simon <doug.simon@oracle.com>
parents: 6676
diff changeset
353 if (cached != null) {
0353b031235a added tests for instanceof with array types
Doug Simon <doug.simon@oracle.com>
parents: 6676
diff changeset
354 if (cached.isValid()) {
0353b031235a added tests for instanceof with array types
Doug Simon <doug.simon@oracle.com>
parents: 6676
diff changeset
355 return cached;
0353b031235a added tests for instanceof with array types
Doug Simon <doug.simon@oracle.com>
parents: 6676
diff changeset
356 }
0353b031235a added tests for instanceof with array types
Doug Simon <doug.simon@oracle.com>
parents: 6676
diff changeset
357
5650
8d420cfd2a6f added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents: 5599
diff changeset
358 }
8d420cfd2a6f added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents: 5599
diff changeset
359 }
7154
5d0bb7d52783 changes to support Graal co-existing with the other HotSpot compiler(s) and being used for explicit compilation requests and code installation via the Graal API
Doug Simon <doug.simon@oracle.com>
parents: 7123
diff changeset
360
5d0bb7d52783 changes to support Graal co-existing with the other HotSpot compiler(s) and being used for explicit compilation requests and code installation via the Graal API
Doug Simon <doug.simon@oracle.com>
parents: 7123
diff changeset
361 final int id = compilationId++;
5d0bb7d52783 changes to support Graal co-existing with the other HotSpot compiler(s) and being used for explicit compilation requests and code installation via the Graal API
Doug Simon <doug.simon@oracle.com>
parents: 7123
diff changeset
362
8177
c78d5f33efaa fixed debug scope for test compilations so that -G:+PrintCFG works again
Doug Simon <doug.simon@oracle.com>
parents: 7894
diff changeset
363 InstalledCode installedCode = Debug.scope("Compiling", new Object[]{runtime, new DebugDumpScope(String.valueOf(id), true)}, new Callable<InstalledCode>() {
7530
5e3d1a68664e applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents: 7321
diff changeset
364
5538
e18ba36bfebc Renamed RiConstant => Constant.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 5537
diff changeset
365 public InstalledCode call() throws Exception {
7154
5d0bb7d52783 changes to support Graal co-existing with the other HotSpot compiler(s) and being used for explicit compilation requests and code installation via the Graal API
Doug Simon <doug.simon@oracle.com>
parents: 7123
diff changeset
366 final boolean printCompilation = GraalOptions.PrintCompilation && !TTY.isSuppressed();
5d0bb7d52783 changes to support Graal co-existing with the other HotSpot compiler(s) and being used for explicit compilation requests and code installation via the Graal API
Doug Simon <doug.simon@oracle.com>
parents: 7123
diff changeset
367 if (printCompilation) {
5d0bb7d52783 changes to support Graal co-existing with the other HotSpot compiler(s) and being used for explicit compilation requests and code installation via the Graal API
Doug Simon <doug.simon@oracle.com>
parents: 7123
diff changeset
368 TTY.println(String.format("@%-6d Graal %-70s %-45s %-50s ...", id, method.getDeclaringClass().getName(), method.getName(), method.getSignature()));
5d0bb7d52783 changes to support Graal co-existing with the other HotSpot compiler(s) and being used for explicit compilation requests and code installation via the Graal API
Doug Simon <doug.simon@oracle.com>
parents: 7123
diff changeset
369 }
5d0bb7d52783 changes to support Graal co-existing with the other HotSpot compiler(s) and being used for explicit compilation requests and code installation via the Graal API
Doug Simon <doug.simon@oracle.com>
parents: 7123
diff changeset
370 long start = System.currentTimeMillis();
5780
64257cbef60c removed compile method from GraalCodeCacheProvider interface
Doug Simon <doug.simon@oracle.com>
parents: 5720
diff changeset
371 PhasePlan phasePlan = new PhasePlan();
64257cbef60c removed compile method from GraalCodeCacheProvider interface
Doug Simon <doug.simon@oracle.com>
parents: 5720
diff changeset
372 GraphBuilderPhase graphBuilderPhase = new GraphBuilderPhase(runtime, GraphBuilderConfiguration.getDefault(), OptimisticOptimizations.ALL);
64257cbef60c removed compile method from GraalCodeCacheProvider interface
Doug Simon <doug.simon@oracle.com>
parents: 5720
diff changeset
373 phasePlan.addPhase(PhasePosition.AFTER_PARSING, graphBuilderPhase);
64257cbef60c removed compile method from GraalCodeCacheProvider interface
Doug Simon <doug.simon@oracle.com>
parents: 5720
diff changeset
374 editPhasePlan(method, graph, phasePlan);
8217
dce9cefed571 Draft speculation log.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 8182
diff changeset
375 CompilationResult compResult = GraalCompiler.compileMethod(runtime(), backend, runtime().getTarget(), method, graph, null, phasePlan, OptimisticOptimizations.ALL,
dce9cefed571 Draft speculation log.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 8182
diff changeset
376 new SpeculationLog());
7154
5d0bb7d52783 changes to support Graal co-existing with the other HotSpot compiler(s) and being used for explicit compilation requests and code installation via the Graal API
Doug Simon <doug.simon@oracle.com>
parents: 7123
diff changeset
377 if (printCompilation) {
5d0bb7d52783 changes to support Graal co-existing with the other HotSpot compiler(s) and being used for explicit compilation requests and code installation via the Graal API
Doug Simon <doug.simon@oracle.com>
parents: 7123
diff changeset
378 TTY.println(String.format("@%-6d Graal %-70s %-45s %-50s | %4dms %5dB", id, "", "", "", System.currentTimeMillis() - start, compResult.getTargetCodeSize()));
5d0bb7d52783 changes to support Graal co-existing with the other HotSpot compiler(s) and being used for explicit compilation requests and code installation via the Graal API
Doug Simon <doug.simon@oracle.com>
parents: 7123
diff changeset
379 }
5780
64257cbef60c removed compile method from GraalCodeCacheProvider interface
Doug Simon <doug.simon@oracle.com>
parents: 5720
diff changeset
380 return addMethod(method, compResult);
5433
d7b5cc23945e refactored tests to share support for dump-aware compilation
Doug Simon <doug.simon@oracle.com>
parents: 5425
diff changeset
381 }
d7b5cc23945e refactored tests to share support for dump-aware compilation
Doug Simon <doug.simon@oracle.com>
parents: 5425
diff changeset
382 });
7154
5d0bb7d52783 changes to support Graal co-existing with the other HotSpot compiler(s) and being used for explicit compilation requests and code installation via the Graal API
Doug Simon <doug.simon@oracle.com>
parents: 7123
diff changeset
383
7282
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
384 if (!forceCompile) {
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
385 cache.put(method, installedCode);
390448a6b535 converted the JTT tests to use the GraalCompilerTest framework which offers more control over what is compiled and executed
Doug Simon <doug.simon@oracle.com>
parents: 7260
diff changeset
386 }
5650
8d420cfd2a6f added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents: 5599
diff changeset
387 return installedCode;
5433
d7b5cc23945e refactored tests to share support for dump-aware compilation
Doug Simon <doug.simon@oracle.com>
parents: 5425
diff changeset
388 }
d7b5cc23945e refactored tests to share support for dump-aware compilation
Doug Simon <doug.simon@oracle.com>
parents: 5425
diff changeset
389
5780
64257cbef60c removed compile method from GraalCodeCacheProvider interface
Doug Simon <doug.simon@oracle.com>
parents: 5720
diff changeset
390 protected InstalledCode addMethod(final ResolvedJavaMethod method, final CompilationResult compResult) {
8153
466de7e331ef Fix Graal compiler test base class.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 7894
diff changeset
391 return Debug.scope("CodeInstall", new Object[]{runtime, method}, new Callable<InstalledCode>() {
7530
5e3d1a68664e applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents: 7321
diff changeset
392
5360
6cc970203f30 moved creation of a RiCodeInfo to the runtime side of the CRI
Doug Simon <doug.simon@oracle.com>
parents: 5122
diff changeset
393 @Override
5538
e18ba36bfebc Renamed RiConstant => Constant.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 5537
diff changeset
394 public InstalledCode call() throws Exception {
5537
80371cc2256d Renaming RiCompiledMethod => InstalledCode.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 5533
diff changeset
395 final CodeInfo[] info = Debug.isDumpEnabled() ? new CodeInfo[1] : null;
5780
64257cbef60c removed compile method from GraalCodeCacheProvider interface
Doug Simon <doug.simon@oracle.com>
parents: 5720
diff changeset
396 InstalledCode installedMethod = runtime.addMethod(method, compResult, info);
5360
6cc970203f30 moved creation of a RiCodeInfo to the runtime side of the CRI
Doug Simon <doug.simon@oracle.com>
parents: 5122
diff changeset
397 if (info != null) {
7530
5e3d1a68664e applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents: 7321
diff changeset
398 Debug.dump(new Object[]{compResult, info[0]}, "After code installation");
5360
6cc970203f30 moved creation of a RiCodeInfo to the runtime side of the CRI
Doug Simon <doug.simon@oracle.com>
parents: 5122
diff changeset
399 }
6cc970203f30 moved creation of a RiCodeInfo to the runtime side of the CRI
Doug Simon <doug.simon@oracle.com>
parents: 5122
diff changeset
400 return installedMethod;
6cc970203f30 moved creation of a RiCodeInfo to the runtime side of the CRI
Doug Simon <doug.simon@oracle.com>
parents: 5122
diff changeset
401 }
6cc970203f30 moved creation of a RiCodeInfo to the runtime side of the CRI
Doug Simon <doug.simon@oracle.com>
parents: 5122
diff changeset
402 });
6cc970203f30 moved creation of a RiCodeInfo to the runtime side of the CRI
Doug Simon <doug.simon@oracle.com>
parents: 5122
diff changeset
403 }
6cc970203f30 moved creation of a RiCodeInfo to the runtime side of the CRI
Doug Simon <doug.simon@oracle.com>
parents: 5122
diff changeset
404
4340
5caca26cb1b9 small fix (missing changes)
Lukas Stadler <lukas.stadler@jku.at>
parents: 4315
diff changeset
405 /**
5caca26cb1b9 small fix (missing changes)
Lukas Stadler <lukas.stadler@jku.at>
parents: 4315
diff changeset
406 * Parses a Java method to produce a graph.
7530
5e3d1a68664e applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents: 7321
diff changeset
407 *
4340
5caca26cb1b9 small fix (missing changes)
Lukas Stadler <lukas.stadler@jku.at>
parents: 4315
diff changeset
408 * @param methodName the name of the method in {@code this.getClass()} to be parsed
5caca26cb1b9 small fix (missing changes)
Lukas Stadler <lukas.stadler@jku.at>
parents: 4315
diff changeset
409 */
5caca26cb1b9 small fix (missing changes)
Lukas Stadler <lukas.stadler@jku.at>
parents: 4315
diff changeset
410 protected StructuredGraph parseProfiled(String methodName) {
4993
897b7d18bebc added RiCompiledMethod.execute and the required VM infrastructure
Lukas Stadler <lukas.stadler@jku.at>
parents: 4410
diff changeset
411 return parseProfiled(getMethod(methodName));
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
412 }
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
413
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
414 /**
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
415 * Parses a Java method to produce a graph.
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
416 */
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
417 protected StructuredGraph parse(Method m) {
6539
2463eb24b644 Cleanup of Graal API: Rename methods so that it follows the getXxx naming convention and so that they are similar to the names of the java.lang.reflect classes. Remove unused methods.
Christian Wimmer <christian.wimmer@oracle.com>
parents: 6529
diff changeset
418 ResolvedJavaMethod javaMethod = runtime.lookupJavaMethod(m);
5719
429accae15aa moved some methods from CodeUtil to MetaUtil
Doug Simon <doug.simon@oracle.com>
parents: 5718
diff changeset
419 StructuredGraph graph = new StructuredGraph(javaMethod);
7894
fed868d1aefd simplify GraphBuilderConfiguration and add omitAllExceptionEdges
Lukas Stadler <lukas.stadler@jku.at>
parents: 7837
diff changeset
420 new GraphBuilderPhase(runtime, GraphBuilderConfiguration.getEagerDefault(), OptimisticOptimizations.ALL).apply(graph);
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
421 return graph;
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
422 }
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
423
4340
5caca26cb1b9 small fix (missing changes)
Lukas Stadler <lukas.stadler@jku.at>
parents: 4315
diff changeset
424 /**
5caca26cb1b9 small fix (missing changes)
Lukas Stadler <lukas.stadler@jku.at>
parents: 4315
diff changeset
425 * Parses a Java method to produce a graph.
5caca26cb1b9 small fix (missing changes)
Lukas Stadler <lukas.stadler@jku.at>
parents: 4315
diff changeset
426 */
5caca26cb1b9 small fix (missing changes)
Lukas Stadler <lukas.stadler@jku.at>
parents: 4315
diff changeset
427 protected StructuredGraph parseProfiled(Method m) {
6539
2463eb24b644 Cleanup of Graal API: Rename methods so that it follows the getXxx naming convention and so that they are similar to the names of the java.lang.reflect classes. Remove unused methods.
Christian Wimmer <christian.wimmer@oracle.com>
parents: 6529
diff changeset
428 ResolvedJavaMethod javaMethod = runtime.lookupJavaMethod(m);
5719
429accae15aa moved some methods from CodeUtil to MetaUtil
Doug Simon <doug.simon@oracle.com>
parents: 5718
diff changeset
429 StructuredGraph graph = new StructuredGraph(javaMethod);
5114
dad1ac9dba7d finished first implementation of disabling runtime feedback selectively based on deoptimization history
Christian Haeubl <christian.haeubl@oracle.com>
parents: 5109
diff changeset
430 new GraphBuilderPhase(runtime, GraphBuilderConfiguration.getDefault(), OptimisticOptimizations.ALL).apply(graph);
4340
5caca26cb1b9 small fix (missing changes)
Lukas Stadler <lukas.stadler@jku.at>
parents: 4315
diff changeset
431 return graph;
5caca26cb1b9 small fix (missing changes)
Lukas Stadler <lukas.stadler@jku.at>
parents: 4315
diff changeset
432 }
5caca26cb1b9 small fix (missing changes)
Lukas Stadler <lukas.stadler@jku.at>
parents: 4315
diff changeset
433
4204
4df4499e0289 Fixed unit tests.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 4203
diff changeset
434 protected PhasePlan getDefaultPhasePlan() {
4df4499e0289 Fixed unit tests.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 4203
diff changeset
435 PhasePlan plan = new PhasePlan();
7894
fed868d1aefd simplify GraphBuilderConfiguration and add omitAllExceptionEdges
Lukas Stadler <lukas.stadler@jku.at>
parents: 7837
diff changeset
436 plan.addPhase(PhasePosition.AFTER_PARSING, new GraphBuilderPhase(runtime, GraphBuilderConfiguration.getEagerDefault(), OptimisticOptimizations.ALL));
4204
4df4499e0289 Fixed unit tests.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 4203
diff changeset
437 return plan;
4df4499e0289 Fixed unit tests.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 4203
diff changeset
438 }
3733
e233f5660da4 Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff changeset
439 }