# HG changeset patch # User Josef Eisl # Date 1417026479 -3600 # Node ID 88a0c46687d91c9804debba84f8737ed67bf943f # Parent c91f49e8d5acee904ea63863abf8911306b5243a Rename AllocatorTest.test to testAllocation to avoid confusion with GraalCompilerTest.test. diff -r c91f49e8d5ac -r 88a0c46687d9 graal/com.oracle.graal.compiler.amd64.test/src/com/oracle/graal/compiler/amd64/test/AMD64AllocatorTest.java --- a/graal/com.oracle.graal.compiler.amd64.test/src/com/oracle/graal/compiler/amd64/test/AMD64AllocatorTest.java Wed Nov 26 19:12:49 2014 +0100 +++ b/graal/com.oracle.graal.compiler.amd64.test/src/com/oracle/graal/compiler/amd64/test/AMD64AllocatorTest.java Wed Nov 26 19:27:59 2014 +0100 @@ -38,7 +38,7 @@ @Test public void test1() { - test("test1snippet", 3, 1, 0); + testAllocation("test1snippet", 3, 1, 0); } public static long test1snippet(long x) { @@ -47,7 +47,7 @@ @Test public void test2() { - test("test2snippet", 3, 0, 0); + testAllocation("test2snippet", 3, 0, 0); } public static long test2snippet(long x) { @@ -57,7 +57,7 @@ @Ignore @Test public void test3() { - test("test3snippet", 4, 1, 0); + testAllocation("test3snippet", 4, 1, 0); } public static long test3snippet(long x) { diff -r c91f49e8d5ac -r 88a0c46687d9 graal/com.oracle.graal.compiler.sparc.test/src/com/oracle/graal/compiler/sparc/test/SPARCAllocatorTest.java --- a/graal/com.oracle.graal.compiler.sparc.test/src/com/oracle/graal/compiler/sparc/test/SPARCAllocatorTest.java Wed Nov 26 19:12:49 2014 +0100 +++ b/graal/com.oracle.graal.compiler.sparc.test/src/com/oracle/graal/compiler/sparc/test/SPARCAllocatorTest.java Wed Nov 26 19:27:59 2014 +0100 @@ -38,7 +38,7 @@ @Test public void test1() { - test("test1snippet", 1, 0, 0); + testAllocation("test1snippet", 1, 0, 0); } public static long test1snippet(long x) { @@ -47,7 +47,7 @@ @Test public void test2() { - test("test2snippet", 2, 1, 0); + testAllocation("test2snippet", 2, 1, 0); } public static long test2snippet(long x) { @@ -56,7 +56,7 @@ @Test public void test3() { - test("test3snippet", 3, 1, 0); + testAllocation("test3snippet", 3, 1, 0); } public static long test3snippet(long x) { diff -r c91f49e8d5ac -r 88a0c46687d9 graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/backend/AllocatorTest.java --- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/backend/AllocatorTest.java Wed Nov 26 19:12:49 2014 +0100 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/backend/AllocatorTest.java Wed Nov 26 19:27:59 2014 +0100 @@ -37,7 +37,7 @@ public class AllocatorTest extends BackendTest { - protected void test(String snippet, final int expectedRegisters, final int expectedRegRegMoves, final int expectedSpillMoves) { + protected void testAllocation(String snippet, final int expectedRegisters, final int expectedRegRegMoves, final int expectedSpillMoves) { final StructuredGraph graph = parseEager(snippet); try (Scope s = Debug.scope("AllocatorTest", graph, graph.method(), getCodeCache())) { final RegisterStats stats = new RegisterStats(getLIRGenerationResult(graph).getLIR());