Mercurial > hg > graal-compiler
changeset 8190:87cb93643a47
Move platform specific assumptions from AllocatorTest to a separate project.
author | Roland Schatz <roland.schatz@oracle.com> |
---|---|
date | Mon, 11 Mar 2013 10:13:42 +0100 |
parents | a848153df742 |
children | 0e583eb213f1 |
files | graal/com.oracle.graal.compiler.amd64.test/src/com/oracle/graal/compiler/amd64/test/AMD64AllocatorTest.java graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/backend/AllocatorTest.java mx/projects |
diffstat | 3 files changed, 69 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.compiler.amd64.test/src/com/oracle/graal/compiler/amd64/test/AMD64AllocatorTest.java Mon Mar 11 10:13:42 2013 +0100 @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package com.oracle.graal.compiler.amd64.test; + +import org.junit.*; + +import com.oracle.graal.compiler.test.backend.*; + +public class AMD64AllocatorTest extends AllocatorTest { + + @Test + public void test1() { + test("test1snippet", 2, 1, 0); + } + + public static long test1snippet(long x) { + return x + 5; + } + + @Ignore + @Test + public void test2() { + test("test2snippet", 2, 0, 0); + } + + public static long test2snippet(long x) { + return x * 5; + } + + @Ignore + @Test + public void test3() { + test("test3snippet", 4, 1, 0); + } + + public static long test3snippet(long x) { + return x / 3 + x % 3; + } + +}
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/backend/AllocatorTest.java Sun Mar 10 23:05:39 2013 +0100 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/backend/AllocatorTest.java Mon Mar 11 10:13:42 2013 +0100 @@ -41,36 +41,7 @@ public class AllocatorTest extends GraalCompilerTest { - @Test - public void test1() { - test("test1snippet", 2, 1, 0); - } - - public static long test1snippet(long x) { - return x + 5; - } - - @Ignore - @Test - public void test2() { - test("test2snippet", 2, 0, 0); - } - - public static long test2snippet(long x) { - return x * 5; - } - - @Ignore - @Test - public void test3() { - test("test3snippet", 4, 1, 0); - } - - public static long test3snippet(long x) { - return x / 3 + x % 3; - } - - private void test(String snippet, final int expectedRegisters, final int expectedRegRegMoves, final int expectedSpillMoves) { + protected void test(String snippet, final int expectedRegisters, final int expectedRegRegMoves, final int expectedSpillMoves) { final StructuredGraph graph = parse(snippet); Debug.scope("AllocatorTest", new Object[]{graph, graph.method(), backend.target}, new Runnable() { @@ -91,7 +62,7 @@ }); } - class RegisterStats { + private class RegisterStats { public final LIR lir; public HashSet<Register> registers = new HashSet<>();
--- a/mx/projects Sun Mar 10 23:05:39 2013 +0100 +++ b/mx/projects Mon Mar 11 10:13:42 2013 +0100 @@ -238,6 +238,13 @@ project@com.oracle.graal.compiler.amd64@checkstyle=com.oracle.graal.graph project@com.oracle.graal.compiler.amd64@javaCompliance=1.7 +# graal.compiler.amd64.test +project@com.oracle.graal.compiler.amd64.test@subDir=graal +project@com.oracle.graal.compiler.amd64.test@sourceDirs=src +project@com.oracle.graal.compiler.amd64.test@dependencies=com.oracle.graal.compiler.test +project@com.oracle.graal.compiler.amd64.test@checkstyle=com.oracle.graal.graph +project@com.oracle.graal.compiler.amd64.test@javaCompliance=1.7 + # graal.compiler.ptx project@com.oracle.graal.compiler.ptx@subDir=graal project@com.oracle.graal.compiler.ptx@sourceDirs=src