Mercurial > hg > truffle
annotate graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java @ 8935:81ef56feff1b
Move write barriers' addition to a separate stage after lowering
author | Christos Kotselidis <christos.kotselidis@oracle.com> |
---|---|
date | Tue, 09 Apr 2013 09:45:35 +0200 |
parents | ce5750014c3d |
children | 689f2b71251c |
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.*; |
8935
81ef56feff1b
Move write barriers' addition to a separate stage after lowering
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
8637
diff
changeset
|
48 import com.oracle.graal.hotspot.phases.WriteBarrierAdditionPhase; |
3733
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
49 |
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
50 /** |
6578 | 51 * Base class for Graal compiler unit tests. |
52 * <p> | |
53 * 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
|
54 * <ol> |
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
55 * <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
|
56 * <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
|
57 * <li>Apply a transformation to the graph.</li> |
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
58 * <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
|
59 * </ol> |
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
60 * <p> |
6578 | 61 * 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
|
62 * <p> |
7530
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7321
diff
changeset
|
63 * 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
|
64 * {@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
|
65 * result against that produced by a Graal compiled version of the method. |
6578 | 66 * <p> |
67 * 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
|
68 */ |
7717
cf94bd18eb47
lift GraalCompilerTest.getMethod to a common base class
Roland Schatz <roland.schatz@oracle.com>
parents:
7530
diff
changeset
|
69 public abstract class GraalCompilerTest extends GraalTest { |
3733
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
70 |
5718
10341299528c
renamings: ExtendedRiRuntime -> GraalCodeCacheProvider, CiLoweringTool -> LoweringTool, RiGraphCache -> GraphCache
Doug Simon <doug.simon@oracle.com>
parents:
5657
diff
changeset
|
71 protected final GraalCodeCacheProvider runtime; |
8636
ac4dbfecec8f
passed a Replacements object to inlining utility methods that need one instead of the GraalRuntime API
Doug Simon <doug.simon@oracle.com>
parents:
8598
diff
changeset
|
72 protected final Replacements replacements; |
7836
a202f72872a4
Remove usage of left-over fields in GraalCompiler.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
7835
diff
changeset
|
73 protected final Backend backend; |
3733
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
74 |
5565
0083a59ced84
Renaming GraphTest => GraalCompilerTest.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
5546
diff
changeset
|
75 public GraalCompilerTest() { |
6334
f8ba3bb81f6f
Renamed com.oracle.graal.tests project to com.oracle.graal.compiler.test
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
6329
diff
changeset
|
76 this.runtime = Graal.getRequiredCapability(GraalCodeCacheProvider.class); |
8636
ac4dbfecec8f
passed a Replacements object to inlining utility methods that need one instead of the GraalRuntime API
Doug Simon <doug.simon@oracle.com>
parents:
8598
diff
changeset
|
77 this.replacements = Graal.getRequiredCapability(Replacements.class); |
7836
a202f72872a4
Remove usage of left-over fields in GraalCompiler.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
7835
diff
changeset
|
78 this.backend = Graal.getRequiredCapability(Backend.class); |
3733
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
79 } |
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
80 |
8598
5a3703970e3f
share debug environment across multiple tests
Doug Simon <doug.simon@oracle.com>
parents:
8349
diff
changeset
|
81 @BeforeClass |
5a3703970e3f
share debug environment across multiple tests
Doug Simon <doug.simon@oracle.com>
parents:
8349
diff
changeset
|
82 public static void initializeDebgging() { |
5a3703970e3f
share debug environment across multiple tests
Doug Simon <doug.simon@oracle.com>
parents:
8349
diff
changeset
|
83 DebugEnvironment.initialize(System.out); |
5a3703970e3f
share debug environment across multiple tests
Doug Simon <doug.simon@oracle.com>
parents:
8349
diff
changeset
|
84 } |
5a3703970e3f
share debug environment across multiple tests
Doug Simon <doug.simon@oracle.com>
parents:
8349
diff
changeset
|
85 |
3733
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
86 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
|
87 String expectedString = getCanonicalGraphString(expected); |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
88 String actualString = getCanonicalGraphString(graph); |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
89 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
|
90 |
3733
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
91 if (expected.getNodeCount() != graph.getNodeCount()) { |
4363
7462c3600c3a
Draft changes to the graph plotting.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
4265
diff
changeset
|
92 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
|
93 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
|
94 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
|
95 } |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
96 if (!expectedString.equals(actualString)) { |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
97 Debug.dump(expected, "mismatching graphs - expected"); |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
98 Debug.dump(graph, "mismatching graphs - actual"); |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
99 Assert.fail(mismatchString); |
3733
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
100 } |
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
101 } |
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
102 |
5657
d71eb56d6bb0
new stamp inference in CanonicalizerPhase, IntegerStamp.mask
Lukas Stadler <lukas.stadler@jku.at>
parents:
5650
diff
changeset
|
103 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
|
104 String graphString = getCanonicalGraphString(graph); |
d71eb56d6bb0
new stamp inference in CanonicalizerPhase, IntegerStamp.mask
Lukas Stadler <lukas.stadler@jku.at>
parents:
5650
diff
changeset
|
105 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
|
106 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
|
107 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
|
108 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
|
109 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
|
110 } |
d71eb56d6bb0
new stamp inference in CanonicalizerPhase, IntegerStamp.mask
Lukas Stadler <lukas.stadler@jku.at>
parents:
5650
diff
changeset
|
111 |
d71eb56d6bb0
new stamp inference in CanonicalizerPhase, IntegerStamp.mask
Lukas Stadler <lukas.stadler@jku.at>
parents:
5650
diff
changeset
|
112 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
|
113 SchedulePhase schedule = new SchedulePhase(); |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
114 schedule.apply(graph); |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
115 |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
116 NodeMap<Integer> canonicalId = graph.createNodeMap(); |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
117 int nextId = 0; |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
118 |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
119 StringBuilder result = new StringBuilder(); |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
120 for (Block block : schedule.getCFG().getBlocks()) { |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
121 result.append("Block " + block + " "); |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
122 if (block == schedule.getCFG().getStartBlock()) { |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
123 result.append("* "); |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
124 } |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
125 result.append("-> "); |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
126 for (Block succ : block.getSuccessors()) { |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
127 result.append(succ + " "); |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
128 } |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
129 result.append("\n"); |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
130 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
|
131 int id; |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
132 if (canonicalId.get(node) != null) { |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
133 id = canonicalId.get(node); |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
134 } else { |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
135 id = nextId++; |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
136 canonicalId.set(node, id); |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
137 } |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
138 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
|
139 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
|
140 } |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
141 } |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
142 return result.toString(); |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
143 } |
0364a2a874b8
changes towards a canonical representation of comparisons:
Lukas Stadler <lukas.stadler@jku.at>
parents:
5360
diff
changeset
|
144 |
5718
10341299528c
renamings: ExtendedRiRuntime -> GraalCodeCacheProvider, CiLoweringTool -> LoweringTool, RiGraphCache -> GraphCache
Doug Simon <doug.simon@oracle.com>
parents:
5657
diff
changeset
|
145 protected GraalCodeCacheProvider runtime() { |
3733
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
146 return runtime; |
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
147 } |
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
148 |
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
149 /** |
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
150 * 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
|
151 * |
3733
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
152 * @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
|
153 */ |
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
154 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
|
155 return parse(getMethod(methodName)); |
897b7d18bebc
added RiCompiledMethod.execute and the required VM infrastructure
Lukas Stadler <lukas.stadler@jku.at>
parents:
4410
diff
changeset
|
156 } |
897b7d18bebc
added RiCompiledMethod.execute and the required VM infrastructure
Lukas Stadler <lukas.stadler@jku.at>
parents:
4410
diff
changeset
|
157 |
5433
d7b5cc23945e
refactored tests to share support for dump-aware compilation
Doug Simon <doug.simon@oracle.com>
parents:
5425
diff
changeset
|
158 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
|
159 |
7260
169bbc849ee9
moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents:
7154
diff
changeset
|
160 /** |
169bbc849ee9
moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents:
7154
diff
changeset
|
161 * 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
|
162 * 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
|
163 */ |
5599
592dfff9d410
modified GraalCompilerTest so that subclasses can override the assertEquals test
Doug Simon <doug.simon@oracle.com>
parents:
5571
diff
changeset
|
164 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
|
165 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
|
166 Assert.assertTrue(expected != null); |
169bbc849ee9
moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents:
7154
diff
changeset
|
167 Assert.assertTrue(actual != null); |
169bbc849ee9
moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents:
7154
diff
changeset
|
168 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
|
169 if (expected instanceof int[]) { |
169bbc849ee9
moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents:
7154
diff
changeset
|
170 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
|
171 } 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
|
172 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
|
173 } 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
|
174 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
|
175 } 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
|
176 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
|
177 } 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
|
178 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
|
179 } 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
|
180 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
|
181 } 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
|
182 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
|
183 } 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
|
184 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
|
185 } else { |
169bbc849ee9
moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents:
7154
diff
changeset
|
186 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
|
187 } |
169bbc849ee9
moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents:
7154
diff
changeset
|
188 } else { |
169bbc849ee9
moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents:
7154
diff
changeset
|
189 Assert.assertEquals(expected, actual); |
169bbc849ee9
moved deep array equality comparison into base test class
Doug Simon <doug.simon@oracle.com>
parents:
7154
diff
changeset
|
190 } |
5599
592dfff9d410
modified GraalCompilerTest so that subclasses can override the assertEquals test
Doug Simon <doug.simon@oracle.com>
parents:
5571
diff
changeset
|
191 } |
592dfff9d410
modified GraalCompilerTest so that subclasses can override the assertEquals test
Doug Simon <doug.simon@oracle.com>
parents:
5571
diff
changeset
|
192 |
6370
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
193 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
|
194 final Throwable[] errors = new Throwable[n]; |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
195 Thread[] threads = new Thread[n]; |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
196 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
|
197 final int idx = i; |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
198 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
|
199 |
6370
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
200 @Override |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
201 public void run() { |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
202 try { |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
203 test(name, args); |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
204 } catch (Throwable e) { |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
205 errors[idx] = e; |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
206 } |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
207 } |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
208 }; |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
209 threads[i] = t; |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
210 t.start(); |
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 int failed = 0; |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
213 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
|
214 try { |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
215 threads[i].join(); |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
216 } catch (InterruptedException e) { |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
217 errors[i] = e; |
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 if (errors[i] != null) { |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
220 errors[i].printStackTrace(); |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
221 failed++; |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
222 } |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
223 } |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
224 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
|
225 } |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
226 |
6431
2e376f8ea4e2
added snippet for lowering NewMultiArrayNodes
Doug Simon <doug.simon@oracle.com>
parents:
6370
diff
changeset
|
227 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
|
228 return method.invoke(receiver, args); |
2e376f8ea4e2
added snippet for lowering NewMultiArrayNodes
Doug Simon <doug.simon@oracle.com>
parents:
6370
diff
changeset
|
229 } |
2e376f8ea4e2
added snippet for lowering NewMultiArrayNodes
Doug Simon <doug.simon@oracle.com>
parents:
6370
diff
changeset
|
230 |
8232
ab374f69e4e8
JTTTest gets the expeted result only once
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8217
diff
changeset
|
231 protected static class Result { |
7530
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7321
diff
changeset
|
232 |
6447
d7bcbdf4749c
minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents:
6431
diff
changeset
|
233 final Object returnValue; |
d7bcbdf4749c
minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents:
6431
diff
changeset
|
234 final Throwable exception; |
7530
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7321
diff
changeset
|
235 |
6447
d7bcbdf4749c
minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents:
6431
diff
changeset
|
236 public Result(Object returnValue, Throwable exception) { |
d7bcbdf4749c
minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents:
6431
diff
changeset
|
237 this.returnValue = returnValue; |
d7bcbdf4749c
minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents:
6431
diff
changeset
|
238 this.exception = exception; |
d7bcbdf4749c
minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents:
6431
diff
changeset
|
239 } |
d7bcbdf4749c
minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents:
6431
diff
changeset
|
240 } |
d7bcbdf4749c
minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents:
6431
diff
changeset
|
241 |
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
|
242 /** |
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 * 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
|
244 */ |
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 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
|
246 } |
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
|
247 |
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 /** |
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
|
249 * 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
|
250 */ |
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
|
251 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
|
252 } |
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
|
253 |
6447
d7bcbdf4749c
minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents:
6431
diff
changeset
|
254 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
|
255 before(); |
5557
2e2a77f091f2
re-enabled disassembler output to C1Visualizer after code installation
Doug Simon <doug.simon@oracle.com>
parents:
5546
diff
changeset
|
256 try { |
7530
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7321
diff
changeset
|
257 // 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
|
258 // be compiled is fully resolved |
6447
d7bcbdf4749c
minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents:
6431
diff
changeset
|
259 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
|
260 } catch (InvocationTargetException e) { |
6447
d7bcbdf4749c
minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents:
6431
diff
changeset
|
261 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
|
262 } catch (Exception e) { |
2e2a77f091f2
re-enabled disassembler output to C1Visualizer after code installation
Doug Simon <doug.simon@oracle.com>
parents:
5546
diff
changeset
|
263 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
|
264 } 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
|
265 after(); |
5557
2e2a77f091f2
re-enabled disassembler output to C1Visualizer after code installation
Doug Simon <doug.simon@oracle.com>
parents:
5546
diff
changeset
|
266 } |
6447
d7bcbdf4749c
minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents:
6431
diff
changeset
|
267 } |
6370
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
268 |
6447
d7bcbdf4749c
minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents:
6431
diff
changeset
|
269 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
|
270 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
|
271 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
|
272 |
8233
9484e7602276
GraalCompilerTest should assert that parameters passed to executeActual have the right type.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8232
diff
changeset
|
273 ResolvedJavaMethod javaMethod = runtime.lookupJavaMethod(method); |
9484e7602276
GraalCompilerTest should assert that parameters passed to executeActual have the right type.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8232
diff
changeset
|
274 checkArgs(javaMethod, executeArgs); |
9484e7602276
GraalCompilerTest should assert that parameters passed to executeActual have the right type.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8232
diff
changeset
|
275 |
9484e7602276
GraalCompilerTest should assert that parameters passed to executeActual have the right type.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8232
diff
changeset
|
276 InstalledCode compiledMethod = getCode(javaMethod, parse(method)); |
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
|
277 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
|
278 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
|
279 } 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
|
280 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
|
281 } 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
|
282 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
|
283 } |
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
|
284 } |
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
|
285 |
8233
9484e7602276
GraalCompilerTest should assert that parameters passed to executeActual have the right type.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8232
diff
changeset
|
286 protected void checkArgs(ResolvedJavaMethod method, Object[] args) { |
9484e7602276
GraalCompilerTest should assert that parameters passed to executeActual have the right type.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8232
diff
changeset
|
287 JavaType[] sig = MetaUtil.signatureToTypes(method); |
9484e7602276
GraalCompilerTest should assert that parameters passed to executeActual have the right type.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8232
diff
changeset
|
288 Assert.assertEquals(sig.length, args.length); |
9484e7602276
GraalCompilerTest should assert that parameters passed to executeActual have the right type.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8232
diff
changeset
|
289 for (int i = 0; i < args.length; i++) { |
9484e7602276
GraalCompilerTest should assert that parameters passed to executeActual have the right type.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8232
diff
changeset
|
290 JavaType javaType = sig[i]; |
9484e7602276
GraalCompilerTest should assert that parameters passed to executeActual have the right type.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8232
diff
changeset
|
291 Kind kind = javaType.getKind(); |
9484e7602276
GraalCompilerTest should assert that parameters passed to executeActual have the right type.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8232
diff
changeset
|
292 Object arg = args[i]; |
9484e7602276
GraalCompilerTest should assert that parameters passed to executeActual have the right type.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8232
diff
changeset
|
293 if (kind == Kind.Object) { |
9484e7602276
GraalCompilerTest should assert that parameters passed to executeActual have the right type.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8232
diff
changeset
|
294 if (arg != null && javaType instanceof ResolvedJavaType) { |
9484e7602276
GraalCompilerTest should assert that parameters passed to executeActual have the right type.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8232
diff
changeset
|
295 ResolvedJavaType resolvedJavaType = (ResolvedJavaType) javaType; |
9484e7602276
GraalCompilerTest should assert that parameters passed to executeActual have the right type.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8232
diff
changeset
|
296 Assert.assertTrue(resolvedJavaType + " from " + runtime.lookupJavaType(arg.getClass()), resolvedJavaType.isAssignableFrom(runtime.lookupJavaType(arg.getClass()))); |
9484e7602276
GraalCompilerTest should assert that parameters passed to executeActual have the right type.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8232
diff
changeset
|
297 } |
9484e7602276
GraalCompilerTest should assert that parameters passed to executeActual have the right type.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8232
diff
changeset
|
298 } else { |
9484e7602276
GraalCompilerTest should assert that parameters passed to executeActual have the right type.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8232
diff
changeset
|
299 Assert.assertNotNull(arg); |
9484e7602276
GraalCompilerTest should assert that parameters passed to executeActual have the right type.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8232
diff
changeset
|
300 Assert.assertEquals(kind.toBoxedJavaClass(), arg.getClass()); |
9484e7602276
GraalCompilerTest should assert that parameters passed to executeActual have the right type.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8232
diff
changeset
|
301 } |
9484e7602276
GraalCompilerTest should assert that parameters passed to executeActual have the right type.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8232
diff
changeset
|
302 } |
9484e7602276
GraalCompilerTest should assert that parameters passed to executeActual have the right type.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8232
diff
changeset
|
303 } |
9484e7602276
GraalCompilerTest should assert that parameters passed to executeActual have the right type.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8232
diff
changeset
|
304 |
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
|
305 /** |
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
|
306 * 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
|
307 * |
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
|
308 * @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
|
309 */ |
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
|
310 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
|
311 Object[] executeArgs; |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
312 if (receiver == null) { |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
313 executeArgs = args; |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
314 } else { |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
315 executeArgs = new Object[args.length + 1]; |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
316 executeArgs[0] = receiver; |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
317 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
|
318 executeArgs[i + 1] = args[i]; |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
319 } |
703a6ab8ca82
added support for multi-threaded compiler tests
Doug Simon <doug.simon@oracle.com>
parents:
6334
diff
changeset
|
320 } |
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
|
321 return executeArgs; |
6447
d7bcbdf4749c
minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents:
6431
diff
changeset
|
322 } |
d7bcbdf4749c
minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents:
6431
diff
changeset
|
323 |
d7bcbdf4749c
minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents:
6431
diff
changeset
|
324 protected void test(String name, Object... args) { |
d7bcbdf4749c
minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents:
6431
diff
changeset
|
325 Method method = getMethod(name); |
d7bcbdf4749c
minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents:
6431
diff
changeset
|
326 Object receiver = Modifier.isStatic(method.getModifiers()) ? null : this; |
d7bcbdf4749c
minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents:
6431
diff
changeset
|
327 |
8232
ab374f69e4e8
JTTTest gets the expeted result only once
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8217
diff
changeset
|
328 test(method, receiver, args); |
ab374f69e4e8
JTTTest gets the expeted result only once
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8217
diff
changeset
|
329 } |
ab374f69e4e8
JTTTest gets the expeted result only once
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8217
diff
changeset
|
330 |
ab374f69e4e8
JTTTest gets the expeted result only once
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8217
diff
changeset
|
331 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
|
332 Result expect = executeExpected(method, receiver, args); |
d7bcbdf4749c
minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents:
6431
diff
changeset
|
333 if (runtime == null) { |
d7bcbdf4749c
minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents:
6431
diff
changeset
|
334 return; |
d7bcbdf4749c
minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents:
6431
diff
changeset
|
335 } |
8232
ab374f69e4e8
JTTTest gets the expeted result only once
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8217
diff
changeset
|
336 test(method, expect, receiver, args); |
ab374f69e4e8
JTTTest gets the expeted result only once
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8217
diff
changeset
|
337 } |
ab374f69e4e8
JTTTest gets the expeted result only once
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8217
diff
changeset
|
338 |
ab374f69e4e8
JTTTest gets the expeted result only once
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8217
diff
changeset
|
339 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
|
340 Result actual = executeActual(method, receiver, args); |
d7bcbdf4749c
minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents:
6431
diff
changeset
|
341 |
d7bcbdf4749c
minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents:
6431
diff
changeset
|
342 if (expect.exception != null) { |
d7bcbdf4749c
minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents:
6431
diff
changeset
|
343 Assert.assertTrue("expected " + expect.exception, actual.exception != null); |
d7bcbdf4749c
minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents:
6431
diff
changeset
|
344 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
|
345 } else { |
8232
ab374f69e4e8
JTTTest gets the expeted result only once
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8217
diff
changeset
|
346 if (actual.exception != null) { |
ab374f69e4e8
JTTTest gets the expeted result only once
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8217
diff
changeset
|
347 actual.exception.printStackTrace(); |
ab374f69e4e8
JTTTest gets the expeted result only once
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
8217
diff
changeset
|
348 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
|
349 } |
6447
d7bcbdf4749c
minor restructuring of GraalCompilerTest
Doug Simon <doug.simon@oracle.com>
parents:
6431
diff
changeset
|
350 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
|
351 } |
2e2a77f091f2
re-enabled disassembler output to C1Visualizer after code installation
Doug Simon <doug.simon@oracle.com>
parents:
5546
diff
changeset
|
352 } |
2e2a77f091f2
re-enabled disassembler output to C1Visualizer after code installation
Doug Simon <doug.simon@oracle.com>
parents:
5546
diff
changeset
|
353 |
5650
8d420cfd2a6f
added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents:
5599
diff
changeset
|
354 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
|
355 |
8d420cfd2a6f
added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents:
5599
diff
changeset
|
356 /** |
8d420cfd2a6f
added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents:
5599
diff
changeset
|
357 * 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
|
358 */ |
8d420cfd2a6f
added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents:
5599
diff
changeset
|
359 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
|
360 return getCode(method, graph, false); |
8d420cfd2a6f
added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents:
5599
diff
changeset
|
361 } |
8d420cfd2a6f
added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents:
5599
diff
changeset
|
362 |
8d420cfd2a6f
added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents:
5599
diff
changeset
|
363 /** |
5780
64257cbef60c
removed compile method from GraalCodeCacheProvider interface
Doug Simon <doug.simon@oracle.com>
parents:
5720
diff
changeset
|
364 * 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
|
365 * |
5780
64257cbef60c
removed compile method from GraalCodeCacheProvider interface
Doug Simon <doug.simon@oracle.com>
parents:
5720
diff
changeset
|
366 * @param method the method being compiled |
64257cbef60c
removed compile method from GraalCodeCacheProvider interface
Doug Simon <doug.simon@oracle.com>
parents:
5720
diff
changeset
|
367 * @param graph the graph being compiled |
64257cbef60c
removed compile method from GraalCodeCacheProvider interface
Doug Simon <doug.simon@oracle.com>
parents:
5720
diff
changeset
|
368 * @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
|
369 */ |
64257cbef60c
removed compile method from GraalCodeCacheProvider interface
Doug Simon <doug.simon@oracle.com>
parents:
5720
diff
changeset
|
370 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
|
371 } |
64257cbef60c
removed compile method from GraalCodeCacheProvider interface
Doug Simon <doug.simon@oracle.com>
parents:
5720
diff
changeset
|
372 |
64257cbef60c
removed compile method from GraalCodeCacheProvider interface
Doug Simon <doug.simon@oracle.com>
parents:
5720
diff
changeset
|
373 /** |
5650
8d420cfd2a6f
added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents:
5599
diff
changeset
|
374 * 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
|
375 * |
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7321
diff
changeset
|
376 * @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
|
377 * key) pair |
5650
8d420cfd2a6f
added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents:
5599
diff
changeset
|
378 */ |
8d420cfd2a6f
added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents:
5599
diff
changeset
|
379 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
|
380 if (!forceCompile) { |
8d420cfd2a6f
added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents:
5599
diff
changeset
|
381 InstalledCode cached = cache.get(method); |
7028
0353b031235a
added tests for instanceof with array types
Doug Simon <doug.simon@oracle.com>
parents:
6676
diff
changeset
|
382 if (cached != null) { |
0353b031235a
added tests for instanceof with array types
Doug Simon <doug.simon@oracle.com>
parents:
6676
diff
changeset
|
383 if (cached.isValid()) { |
0353b031235a
added tests for instanceof with array types
Doug Simon <doug.simon@oracle.com>
parents:
6676
diff
changeset
|
384 return cached; |
0353b031235a
added tests for instanceof with array types
Doug Simon <doug.simon@oracle.com>
parents:
6676
diff
changeset
|
385 } |
0353b031235a
added tests for instanceof with array types
Doug Simon <doug.simon@oracle.com>
parents:
6676
diff
changeset
|
386 |
5650
8d420cfd2a6f
added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents:
5599
diff
changeset
|
387 } |
8d420cfd2a6f
added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents:
5599
diff
changeset
|
388 } |
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
|
389 |
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
|
390 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
|
391 |
8177
c78d5f33efaa
fixed debug scope for test compilations so that -G:+PrintCFG works again
Doug Simon <doug.simon@oracle.com>
parents:
7894
diff
changeset
|
392 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
|
393 |
5538
e18ba36bfebc
Renamed RiConstant => Constant.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
5537
diff
changeset
|
394 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
|
395 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
|
396 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
|
397 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
|
398 } |
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
|
399 long start = System.currentTimeMillis(); |
5780
64257cbef60c
removed compile method from GraalCodeCacheProvider interface
Doug Simon <doug.simon@oracle.com>
parents:
5720
diff
changeset
|
400 PhasePlan phasePlan = new PhasePlan(); |
64257cbef60c
removed compile method from GraalCodeCacheProvider interface
Doug Simon <doug.simon@oracle.com>
parents:
5720
diff
changeset
|
401 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
|
402 phasePlan.addPhase(PhasePosition.AFTER_PARSING, graphBuilderPhase); |
8935
81ef56feff1b
Move write barriers' addition to a separate stage after lowering
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
8637
diff
changeset
|
403 phasePlan.addPhase(PhasePosition.LOW_LEVEL, new WriteBarrierAdditionPhase()); |
5780
64257cbef60c
removed compile method from GraalCodeCacheProvider interface
Doug Simon <doug.simon@oracle.com>
parents:
5720
diff
changeset
|
404 editPhasePlan(method, graph, phasePlan); |
8935
81ef56feff1b
Move write barriers' addition to a separate stage after lowering
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
8637
diff
changeset
|
405 CompilationResult compResult = GraalCompiler.compileMethod(runtime(), replacements, backend, runtime().getTarget(), method, graph, null, phasePlan, OptimisticOptimizations.ALL, |
81ef56feff1b
Move write barriers' addition to a separate stage after lowering
Christos Kotselidis <christos.kotselidis@oracle.com>
parents:
8637
diff
changeset
|
406 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
|
407 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
|
408 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
|
409 } |
5780
64257cbef60c
removed compile method from GraalCodeCacheProvider interface
Doug Simon <doug.simon@oracle.com>
parents:
5720
diff
changeset
|
410 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
|
411 } |
d7b5cc23945e
refactored tests to share support for dump-aware compilation
Doug Simon <doug.simon@oracle.com>
parents:
5425
diff
changeset
|
412 }); |
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
|
413 |
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
|
414 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
|
415 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
|
416 } |
5650
8d420cfd2a6f
added unit tests for the Word type
Doug Simon <doug.simon@oracle.com>
parents:
5599
diff
changeset
|
417 return installedCode; |
5433
d7b5cc23945e
refactored tests to share support for dump-aware compilation
Doug Simon <doug.simon@oracle.com>
parents:
5425
diff
changeset
|
418 } |
d7b5cc23945e
refactored tests to share support for dump-aware compilation
Doug Simon <doug.simon@oracle.com>
parents:
5425
diff
changeset
|
419 |
5780
64257cbef60c
removed compile method from GraalCodeCacheProvider interface
Doug Simon <doug.simon@oracle.com>
parents:
5720
diff
changeset
|
420 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
|
421 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
|
422 |
5360
6cc970203f30
moved creation of a RiCodeInfo to the runtime side of the CRI
Doug Simon <doug.simon@oracle.com>
parents:
5122
diff
changeset
|
423 @Override |
5538
e18ba36bfebc
Renamed RiConstant => Constant.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
5537
diff
changeset
|
424 public InstalledCode call() throws Exception { |
8349
8d6ea1915d42
merged CodeInfo into InstalledCode (GRAAL-156)
Doug Simon <doug.simon@oracle.com>
parents:
8233
diff
changeset
|
425 InstalledCode installedCode = runtime.addMethod(method, compResult); |
8d6ea1915d42
merged CodeInfo into InstalledCode (GRAAL-156)
Doug Simon <doug.simon@oracle.com>
parents:
8233
diff
changeset
|
426 if (Debug.isDumpEnabled()) { |
8d6ea1915d42
merged CodeInfo into InstalledCode (GRAAL-156)
Doug Simon <doug.simon@oracle.com>
parents:
8233
diff
changeset
|
427 Debug.dump(new Object[]{compResult, installedCode}, "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
|
428 } |
8349
8d6ea1915d42
merged CodeInfo into InstalledCode (GRAAL-156)
Doug Simon <doug.simon@oracle.com>
parents:
8233
diff
changeset
|
429 |
8d6ea1915d42
merged CodeInfo into InstalledCode (GRAAL-156)
Doug Simon <doug.simon@oracle.com>
parents:
8233
diff
changeset
|
430 return installedCode; |
5360
6cc970203f30
moved creation of a RiCodeInfo to the runtime side of the CRI
Doug Simon <doug.simon@oracle.com>
parents:
5122
diff
changeset
|
431 } |
6cc970203f30
moved creation of a RiCodeInfo to the runtime side of the CRI
Doug Simon <doug.simon@oracle.com>
parents:
5122
diff
changeset
|
432 }); |
6cc970203f30
moved creation of a RiCodeInfo to the runtime side of the CRI
Doug Simon <doug.simon@oracle.com>
parents:
5122
diff
changeset
|
433 } |
6cc970203f30
moved creation of a RiCodeInfo to the runtime side of the CRI
Doug Simon <doug.simon@oracle.com>
parents:
5122
diff
changeset
|
434 |
4340
5caca26cb1b9
small fix (missing changes)
Lukas Stadler <lukas.stadler@jku.at>
parents:
4315
diff
changeset
|
435 /** |
5caca26cb1b9
small fix (missing changes)
Lukas Stadler <lukas.stadler@jku.at>
parents:
4315
diff
changeset
|
436 * 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
|
437 * |
4340
5caca26cb1b9
small fix (missing changes)
Lukas Stadler <lukas.stadler@jku.at>
parents:
4315
diff
changeset
|
438 * @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
|
439 */ |
5caca26cb1b9
small fix (missing changes)
Lukas Stadler <lukas.stadler@jku.at>
parents:
4315
diff
changeset
|
440 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
|
441 return parseProfiled(getMethod(methodName)); |
3733
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
442 } |
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
443 |
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
444 /** |
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
445 * Parses a Java method to produce a graph. |
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
446 */ |
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
447 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
|
448 ResolvedJavaMethod javaMethod = runtime.lookupJavaMethod(m); |
5719
429accae15aa
moved some methods from CodeUtil to MetaUtil
Doug Simon <doug.simon@oracle.com>
parents:
5718
diff
changeset
|
449 StructuredGraph graph = new StructuredGraph(javaMethod); |
7894
fed868d1aefd
simplify GraphBuilderConfiguration and add omitAllExceptionEdges
Lukas Stadler <lukas.stadler@jku.at>
parents:
7837
diff
changeset
|
450 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
|
451 return graph; |
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
452 } |
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
453 |
4340
5caca26cb1b9
small fix (missing changes)
Lukas Stadler <lukas.stadler@jku.at>
parents:
4315
diff
changeset
|
454 /** |
5caca26cb1b9
small fix (missing changes)
Lukas Stadler <lukas.stadler@jku.at>
parents:
4315
diff
changeset
|
455 * Parses a Java method to produce a graph. |
5caca26cb1b9
small fix (missing changes)
Lukas Stadler <lukas.stadler@jku.at>
parents:
4315
diff
changeset
|
456 */ |
5caca26cb1b9
small fix (missing changes)
Lukas Stadler <lukas.stadler@jku.at>
parents:
4315
diff
changeset
|
457 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
|
458 ResolvedJavaMethod javaMethod = runtime.lookupJavaMethod(m); |
5719
429accae15aa
moved some methods from CodeUtil to MetaUtil
Doug Simon <doug.simon@oracle.com>
parents:
5718
diff
changeset
|
459 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
|
460 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
|
461 return graph; |
5caca26cb1b9
small fix (missing changes)
Lukas Stadler <lukas.stadler@jku.at>
parents:
4315
diff
changeset
|
462 } |
5caca26cb1b9
small fix (missing changes)
Lukas Stadler <lukas.stadler@jku.at>
parents:
4315
diff
changeset
|
463 |
4204
4df4499e0289
Fixed unit tests.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
4203
diff
changeset
|
464 protected PhasePlan getDefaultPhasePlan() { |
4df4499e0289
Fixed unit tests.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
4203
diff
changeset
|
465 PhasePlan plan = new PhasePlan(); |
7894
fed868d1aefd
simplify GraphBuilderConfiguration and add omitAllExceptionEdges
Lukas Stadler <lukas.stadler@jku.at>
parents:
7837
diff
changeset
|
466 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
|
467 return plan; |
4df4499e0289
Fixed unit tests.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
4203
diff
changeset
|
468 } |
3733
e233f5660da4
Added Java files from Maxine project.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
diff
changeset
|
469 } |