Mercurial > hg > truffle
changeset 8347:63f909f4ba3a
Merge.
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Mon, 18 Mar 2013 20:04:50 +0100 |
| parents | d91353f81320 (current diff) 4e7a668054ea (diff) |
| children | 65ba93f118d4 98b90a7bb764 |
| files | |
| diffstat | 93 files changed, 548 insertions(+), 430 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Mon Mar 18 20:04:39 2013 +0100 +++ b/.hgignore Mon Mar 18 20:04:50 2013 +0100 @@ -61,6 +61,8 @@ .DS_Store javadoc/ .idea/ +^cscope.out +^tags syntax: glob *.bgv core.*
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MonitorGraphTest.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MonitorGraphTest.java Mon Mar 18 20:04:50 2013 +0100 @@ -54,7 +54,7 @@ return 1; } - @Test(expected = AssertionError.class) + @Test public void test1() { test("test1Snippet"); }
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/deopt/CompiledMethodTest.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/deopt/CompiledMethodTest.java Mon Mar 18 20:04:50 2013 +0100 @@ -35,6 +35,7 @@ import com.oracle.graal.nodes.*; import com.oracle.graal.phases.*; import com.oracle.graal.phases.common.*; +import com.oracle.graal.test.*; /** * In the following tests, the usages of local variable "a" are replaced with the integer constant @@ -53,7 +54,7 @@ return f1 + " " + arg1 + " " + arg2 + " " + arg3; } - @Test + @LongTest public void test1() { Method method = getMethod("testMethod"); final StructuredGraph graph = parse(method); @@ -79,7 +80,7 @@ } } - @Test + @LongTest public void test3() { Method method = getMethod("testMethod"); final StructuredGraph graph = parse(method); @@ -93,7 +94,7 @@ } } - @Test + @LongTest public void test4() { Method method = getMethod("testMethodVirtual"); final StructuredGraph graph = parse(method); @@ -108,7 +109,7 @@ } } - @Test + @LongTest public void test2() throws NoSuchMethodException, SecurityException { Method method = CompilableObjectImpl.class.getDeclaredMethod("executeHelper", ObjectCompiler.class, String.class); ResolvedJavaMethod javaMethod = runtime.lookupJavaMethod(method);
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Mon Mar 18 20:04:50 2013 +0100 @@ -1568,9 +1568,8 @@ ValueNode x = returnKind == Kind.Void ? null : frameState.pop(returnKind); assert frameState.stackSize() == 0; - // TODO (gdub) remove this when FloatingRead can handle this case if (Modifier.isSynchronized(method.getModifiers())) { - append(currentGraph.add(new ValueAnchorNode(x))); + append(currentGraph.add(new ValueAnchorNode(true, x))); assert !frameState.rethrowException(); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NPE_07.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NPE_07.java Mon Mar 18 20:04:50 2013 +0100 @@ -23,12 +23,11 @@ package com.oracle.graal.jtt.except; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ - public class Catch_NPE_07 extends JTTTest { @SuppressWarnings("serial") @@ -62,12 +61,12 @@ } } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_Two02.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_Two02.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.except; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -49,17 +49,17 @@ } } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 3); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_Two03.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_Two03.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.except; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -56,17 +56,17 @@ } } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_InNested.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_InNested.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ */ package com.oracle.graal.jtt.except; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; public class Throw_InNested extends JTTTest { @@ -48,12 +48,12 @@ return i; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_Synchronized01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_Synchronized01.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ */ package com.oracle.graal.jtt.except; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; public class Throw_Synchronized01 extends JTTTest { @@ -38,12 +38,12 @@ throw new Exception(); } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_Synchronized02.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_Synchronized02.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ */ package com.oracle.graal.jtt.except; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; public class Throw_Synchronized02 extends JTTTest { @@ -36,12 +36,12 @@ throw new Exception(); } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_Synchronized03.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_Synchronized03.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ */ package com.oracle.graal.jtt.except; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; public class Throw_Synchronized03 extends JTTTest { @@ -41,12 +41,12 @@ throw new Exception(); } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_allocate01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_allocate01.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.hotpath; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -37,27 +37,27 @@ return sum; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 3); } - @Test + @LongTest public void run4() throws Throwable { runTest("test", 80); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_field04.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_field04.java Mon Mar 18 20:04:50 2013 +0100 @@ -23,8 +23,8 @@ // Checkstyle: stop package com.oracle.graal.jtt.hotpath; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -55,12 +55,12 @@ return (int) (b + c + s + i + l + f + d); } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 40); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1000); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_invoke01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_invoke01.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ package com.oracle.graal.jtt.hotpath; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -104,12 +104,12 @@ } } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 40); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 80); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_life.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_life.java Mon Mar 18 20:04:50 2013 +0100 @@ -25,8 +25,8 @@ import java.util.*; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -107,7 +107,7 @@ } } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 5); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_nest02.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_nest02.java Mon Mar 18 20:04:50 2013 +0100 @@ -23,8 +23,8 @@ // Checkstyle: stop package com.oracle.graal.jtt.hotpath; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -48,7 +48,7 @@ return sum; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 15); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotspot/Test6196102.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotspot/Test6196102.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,11 +22,11 @@ */ package com.oracle.graal.jtt.hotspot; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /** - * @test + * @LongTest * @bug 6196102 * @summary Integer seems to be greater than Integer.MAX_VALUE * @@ -48,7 +48,7 @@ return "ok"; } - @Test + @LongTest public void run0() throws Throwable { runTest("test"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotspot/Test6850611.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotspot/Test6850611.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.hotspot; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; //@formatter:off @@ -50,7 +50,7 @@ return 95; } - @Test + @LongTest public void run0() throws Throwable { runTest("test"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/EnumMap02.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/EnumMap02.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ import java.util.*; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -43,17 +43,17 @@ A, B, C } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/System_setOut.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/System_setOut.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ import java.io.*; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -56,7 +56,7 @@ System.out.println(test(10000)); } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 10000); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/UnsafeAccess01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/UnsafeAccess01.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ import java.lang.reflect.*; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; import sun.misc.*; @@ -55,7 +55,7 @@ } } - @Test + @LongTest public void run0() throws Throwable { runTest("test"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/ClassLoader_loadClass01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/ClassLoader_loadClass01.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ import java.net.*; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -43,22 +43,22 @@ return null; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 5); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_Literal01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_Literal01.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ */ package com.oracle.graal.jtt.lang; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; public final class Class_Literal01 extends JTTTest { @@ -45,27 +45,27 @@ return null; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 3); } - @Test + @LongTest public void run4() throws Throwable { runTest("test", 4); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_asSubclass01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_asSubclass01.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ */ package com.oracle.graal.jtt.lang; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; public final class Class_asSubclass01 extends JTTTest { @@ -53,27 +53,27 @@ return i; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 3); } - @Test + @LongTest public void run4() throws Throwable { runTest("test", 4); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_cast01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_cast01.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ */ package com.oracle.graal.jtt.lang; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; public final class Class_cast01 extends JTTTest { @@ -57,27 +57,27 @@ return i; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 3); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 2); } - @Test + @LongTest public void run4() throws Throwable { runTest("test", 4); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName01.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ */ package com.oracle.graal.jtt.lang; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; public final class Class_forName01 extends JTTTest { @@ -45,27 +45,27 @@ return null; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 3); } - @Test + @LongTest public void run4() throws Throwable { runTest("test", 4); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName02.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName02.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ */ package com.oracle.graal.jtt.lang; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; public final class Class_forName02 extends JTTTest { @@ -51,27 +51,27 @@ return null; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 3); } - @Test + @LongTest public void run4() throws Throwable { runTest("test", 4); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName03.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName03.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ import java.net.*; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -56,32 +56,32 @@ return null; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 3); } - @Test + @LongTest public void run4() throws Throwable { runTest("test", 4); } - @Test + @LongTest public void run5() throws Throwable { runTest("test", 5); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName04.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName04.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.lang; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -48,32 +48,32 @@ return null; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 3); } - @Test + @LongTest public void run4() throws Throwable { runTest("test", 4); } - @Test + @LongTest public void run5() throws Throwable { runTest("test", 5); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName05.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName05.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ import java.net.*; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -41,17 +41,17 @@ return null; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 5); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getInterfaces01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getInterfaces01.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,12 +22,11 @@ */ package com.oracle.graal.jtt.lang; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ - public final class Class_getInterfaces01 extends JTTTest { public static String test(int i) { @@ -82,27 +81,27 @@ } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 3); } - @Test + @LongTest public void run4() throws Throwable { runTest("test", 4); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_getClass01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_getClass01.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ */ package com.oracle.graal.jtt.lang; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; public final class Object_getClass01 extends JTTTest { @@ -49,27 +49,27 @@ return null; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 3); } - @Test + @LongTest public void run4() throws Throwable { runTest("test", 4); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_toString01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_toString01.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ */ package com.oracle.graal.jtt.lang; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; public class Object_toString01 extends JTTTest { @@ -47,17 +47,17 @@ return string; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/String_intern02.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/String_intern02.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.lang; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -33,17 +33,17 @@ return ("id" + i).intern() == ("id" + i).intern(); } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/String_intern03.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/String_intern03.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.lang; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -33,17 +33,17 @@ return ("id" + i).intern().equals("id" + i); } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopParseLong.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopParseLong.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.loop; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; public class LoopParseLong extends JTTTest { @@ -79,7 +79,7 @@ return negative ? result : -result; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", "7", 10); runTest("test", "-100", 10);
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopSwitch01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopSwitch01.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.loop; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -58,7 +58,7 @@ return "" + ('a' + count); } - @Test + @LongTest public void run0() throws Throwable { runTest("test"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigObjectParams02.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigObjectParams02.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.micro; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -33,7 +33,7 @@ return p0 + p1 + p2 + p3 + p4 + p5 + p6 + p7 + p8 + p9; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/Matrix01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/Matrix01.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.micro; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -155,32 +155,32 @@ ((Matrix[]) array)[val % array.length] = new Matrix(number); } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 3); } - @Test + @LongTest public void run4() throws Throwable { runTest("test", 4); } - @Test + @LongTest public void run5() throws Throwable { runTest("test", 5); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/ReferenceMap01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/ReferenceMap01.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.micro; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -57,7 +57,7 @@ return Integer.valueOf(foo(new String[]{"asdf"})); } - @Test + @LongTest public void run0() throws Throwable { runTest("test"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/StrangeFrames.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/StrangeFrames.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.micro; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -58,7 +58,7 @@ Object c = b; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Conditional01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Conditional01.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ import java.util.*; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -117,22 +117,22 @@ return c2 ? 1 : 0; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 10); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 20); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 40); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NCE_FlowSensitive05.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NCE_FlowSensitive05.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.optimize; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -40,7 +40,7 @@ return (String) arg; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", (Object) null); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_InstanceOf02.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_InstanceOf02.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.optimize; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* * Tests value numbering of instanceof operations. @@ -76,17 +76,17 @@ return false; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_getField01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_getField01.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.reflect; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -37,22 +37,22 @@ return Class_getField01.class.getField(input).getName(); } - @Test + @LongTest public void run0() throws Throwable { runTest("test", "test"); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", "field"); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", "field2"); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", "field3"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_getField02.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_getField02.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.reflect; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -42,27 +42,27 @@ public String field4; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", "test"); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", "field"); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", "field2"); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", "field3"); } - @Test + @LongTest public void run4() throws Throwable { runTest("test", "field4"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_getMethod01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_getMethod01.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.reflect; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -39,17 +39,17 @@ field = args[0]; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", "test"); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", "main"); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", "xx"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_getMethod02.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_getMethod02.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.reflect; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -52,37 +52,37 @@ field = args[0]; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 3); } - @Test + @LongTest public void run4() throws Throwable { runTest("test", 4); } - @Test + @LongTest public void run5() throws Throwable { runTest("test", 5); } - @Test + @LongTest public void run6() throws Throwable { runTest("test", 6); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_newInstance03.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_newInstance03.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ */ package com.oracle.graal.jtt.reflect; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; public class Class_newInstance03 extends JTTTest { @@ -45,27 +45,27 @@ return false; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 3); } - @Test + @LongTest public void run4() throws Throwable { runTest("test", 4); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_get01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_get01.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.reflect; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -59,47 +59,47 @@ return false; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 3); } - @Test + @LongTest public void run4() throws Throwable { runTest("test", 4); } - @Test + @LongTest public void run5() throws Throwable { runTest("test", 5); } - @Test + @LongTest public void run6() throws Throwable { runTest("test", 6); } - @Test + @LongTest public void run7() throws Throwable { runTest("test", 7); } - @Test + @LongTest public void run8() throws Throwable { runTest("test", 8); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_get02.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_get02.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.reflect; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -61,47 +61,47 @@ return false; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 3); } - @Test + @LongTest public void run4() throws Throwable { runTest("test", 4); } - @Test + @LongTest public void run5() throws Throwable { runTest("test", 5); } - @Test + @LongTest public void run6() throws Throwable { runTest("test", 6); } - @Test + @LongTest public void run7() throws Throwable { runTest("test", 7); } - @Test + @LongTest public void run8() throws Throwable { runTest("test", 8); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_get03.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_get03.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ import java.lang.reflect.*; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -89,47 +89,47 @@ return false; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 3); } - @Test + @LongTest public void run4() throws Throwable { runTest("test", 4); } - @Test + @LongTest public void run5() throws Throwable { runTest("test", 5); } - @Test + @LongTest public void run6() throws Throwable { runTest("test", 6); } - @Test + @LongTest public void run7() throws Throwable { runTest("test", 7); } - @Test + @LongTest public void run8() throws Throwable { runTest("test", 8); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_get04.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_get04.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.reflect; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -61,47 +61,47 @@ return false; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 3); } - @Test + @LongTest public void run4() throws Throwable { runTest("test", 4); } - @Test + @LongTest public void run5() throws Throwable { runTest("test", 5); } - @Test + @LongTest public void run6() throws Throwable { runTest("test", 6); } - @Test + @LongTest public void run7() throws Throwable { runTest("test", 7); } - @Test + @LongTest public void run8() throws Throwable { runTest("test", 8); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_getType01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_getType01.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.reflect; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -59,47 +59,47 @@ return false; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 3); } - @Test + @LongTest public void run4() throws Throwable { runTest("test", 4); } - @Test + @LongTest public void run5() throws Throwable { runTest("test", 5); } - @Test + @LongTest public void run6() throws Throwable { runTest("test", 6); } - @Test + @LongTest public void run7() throws Throwable { runTest("test", 7); } - @Test + @LongTest public void run8() throws Throwable { runTest("test", 8); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_set01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_set01.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.reflect; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -67,47 +67,47 @@ return false; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 3); } - @Test + @LongTest public void run4() throws Throwable { runTest("test", 4); } - @Test + @LongTest public void run5() throws Throwable { runTest("test", 5); } - @Test + @LongTest public void run6() throws Throwable { runTest("test", 6); } - @Test + @LongTest public void run7() throws Throwable { runTest("test", 7); } - @Test + @LongTest public void run8() throws Throwable { runTest("test", 8); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_set02.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_set02.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.reflect; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -69,47 +69,47 @@ return false; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 3); } - @Test + @LongTest public void run4() throws Throwable { runTest("test", 4); } - @Test + @LongTest public void run5() throws Throwable { runTest("test", 5); } - @Test + @LongTest public void run6() throws Throwable { runTest("test", 6); } - @Test + @LongTest public void run7() throws Throwable { runTest("test", 7); } - @Test + @LongTest public void run8() throws Throwable { runTest("test", 8); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_set03.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_set03.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.reflect; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -69,47 +69,47 @@ return false; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 3); } - @Test + @LongTest public void run4() throws Throwable { runTest("test", 4); } - @Test + @LongTest public void run5() throws Throwable { runTest("test", 5); } - @Test + @LongTest public void run6() throws Throwable { runTest("test", 6); } - @Test + @LongTest public void run7() throws Throwable { runTest("test", 7); } - @Test + @LongTest public void run8() throws Throwable { runTest("test", 8); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Invoke_except01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Invoke_except01.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ import java.lang.reflect.*; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -56,27 +56,27 @@ return arg.length; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 3); } - @Test + @LongTest public void run4() throws Throwable { runTest("test", 4); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Invoke_main01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Invoke_main01.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ import java.lang.reflect.*; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -44,12 +44,12 @@ field = args[0]; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", "test1"); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", "test2"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Invoke_main03.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Invoke_main03.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ import java.lang.reflect.*; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -48,12 +48,12 @@ field = args[0]; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", "test1"); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", "test2"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Method_getParameterTypes01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Method_getParameterTypes01.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.reflect; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -51,22 +51,22 @@ public void method3(int arg1, Object arg2) { } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 3); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Method_getReturnType01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Method_getReturnType01.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.reflect; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -51,22 +51,22 @@ public void method3() { } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 3); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Monitor_contended01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Monitor_contended01.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ */ package com.oracle.graal.jtt.threads; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; public final class Monitor_contended01 extends JTTTest implements Runnable { @@ -71,7 +71,7 @@ } } - @Test + @LongTest public void run0() throws Throwable { runTest("test"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Monitor_notowner01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Monitor_notowner01.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ */ package com.oracle.graal.jtt.threads; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; public class Monitor_notowner01 extends JTTTest { @@ -62,7 +62,7 @@ } } - @Test + @LongTest public void run0() throws Throwable { runTest("test"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait01.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ */ package com.oracle.graal.jtt.threads; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; public class Object_wait01 extends JTTTest implements Runnable { @@ -57,22 +57,22 @@ } } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 3); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 15); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait02.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait02.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ */ package com.oracle.graal.jtt.threads; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; public class Object_wait02 extends JTTTest implements Runnable { @@ -57,17 +57,17 @@ } } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait03.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait03.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ */ package com.oracle.graal.jtt.threads; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; public class Object_wait03 extends JTTTest implements Runnable { @@ -63,17 +63,17 @@ } } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait04.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait04.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ */ package com.oracle.graal.jtt.threads; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; public class Object_wait04 extends JTTTest implements Runnable { @@ -67,32 +67,32 @@ } } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 3); } - @Test + @LongTest public void run4() throws Throwable { runTest("test", 4); } - @Test + @LongTest public void run5() throws Throwable { runTest("test", 5); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/ThreadLocal03.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/ThreadLocal03.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.threads; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -59,22 +59,22 @@ } } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 3); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_getState02.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_getState02.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ */ package com.oracle.graal.jtt.threads; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; public final class Thread_getState02 extends JTTTest { @@ -33,7 +33,7 @@ return new Thread().getState() == Thread.State.NEW; } - @Test + @LongTest public void run0() throws Throwable { runTest("test"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_isInterrupted02.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_isInterrupted02.java Mon Mar 18 20:04:50 2013 +0100 @@ -26,8 +26,8 @@ package com.oracle.graal.jtt.threads; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; //Test all, mainly monitors public class Thread_isInterrupted02 extends JTTTest { @@ -85,12 +85,12 @@ } } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0, 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1, 500); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_isInterrupted03.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_isInterrupted03.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.threads; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -68,7 +68,7 @@ } } - @Test + @LongTest public void run0() throws Throwable { runTest("test"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_isInterrupted04.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_isInterrupted04.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.threads; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -66,7 +66,7 @@ } - @Test + @LongTest public void run0() throws Throwable { runTest("test"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_isInterrupted05.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_isInterrupted05.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.threads; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; /* */ @@ -66,7 +66,7 @@ } } - @Test + @LongTest public void run0() throws Throwable { runTest("test"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_join01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_join01.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ */ package com.oracle.graal.jtt.threads; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; public class Thread_join01 extends JTTTest implements Runnable { @@ -43,7 +43,7 @@ cont = false; } - @Test + @LongTest public void run0() throws Throwable { runTest("test"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_join02.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_join02.java Mon Mar 18 20:04:50 2013 +0100 @@ -27,8 +27,8 @@ */ package com.oracle.graal.jtt.threads; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; public class Thread_join02 extends JTTTest implements Runnable { @@ -50,7 +50,7 @@ cont = false; } - @Test + @LongTest public void run0() throws Throwable { runTest("test"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_join03.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_join03.java Mon Mar 18 20:04:50 2013 +0100 @@ -27,8 +27,8 @@ */ package com.oracle.graal.jtt.threads; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; public class Thread_join03 extends JTTTest implements Runnable { @@ -47,7 +47,7 @@ cont = false; } - @Test + @LongTest public void run0() throws Throwable { runTest("test"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_new01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_new01.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ */ package com.oracle.graal.jtt.threads; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; public final class Thread_new01 extends JTTTest { @@ -45,27 +45,27 @@ return false; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 3); } - @Test + @LongTest public void run4() throws Throwable { runTest("test", 4); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_new02.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_new02.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ */ package com.oracle.graal.jtt.threads; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; public class Thread_new02 extends JTTTest implements Runnable { @@ -51,27 +51,27 @@ // do nothing. } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 0); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 1); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 2); } - @Test + @LongTest public void run3() throws Throwable { runTest("test", 3); } - @Test + @LongTest public void run4() throws Throwable { runTest("test", 4); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_sleep01.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_sleep01.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,8 +24,8 @@ */ package com.oracle.graal.jtt.threads; +import com.oracle.graal.test.*; import com.oracle.graal.jtt.*; -import org.junit.*; public final class Thread_sleep01 extends JTTTest { @@ -35,17 +35,17 @@ return System.currentTimeMillis() - before >= i; } - @Test + @LongTest public void run0() throws Throwable { runTest("test", 10); } - @Test + @LongTest public void run1() throws Throwable { runTest("test", 20); } - @Test + @LongTest public void run2() throws Throwable { runTest("test", 100); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ValueAnchorNode.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ValueAnchorNode.java Mon Mar 18 20:04:50 2013 +0100 @@ -28,7 +28,6 @@ import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.java.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*; @@ -38,9 +37,16 @@ public final class ValueAnchorNode extends FixedWithNextNode implements Canonicalizable, LIRLowerable, Node.IterableNodeType, Virtualizable { public ValueAnchorNode(ValueNode... values) { + this(false, values); + } + + public ValueAnchorNode(boolean permanent, ValueNode... values) { super(StampFactory.dependency(), values); + this.permanent = permanent; } + private final boolean permanent; + @Override public void generate(LIRGeneratorTool gen) { // Nothing to emit, since this node is used for structural purposes only. @@ -54,6 +60,9 @@ @Override public ValueNode canonical(CanonicalizerTool tool) { + if (permanent) { + return this; + } if (this.predecessor() instanceof ValueAnchorNode) { ValueAnchorNode previousAnchor = (ValueAnchorNode) this.predecessor(); if (previousAnchor.usages().isEmpty()) { // avoid creating cycles @@ -88,12 +97,8 @@ @Override public void virtualize(VirtualizerTool tool) { - // don't process this node if it is anchoring the return value - if (next() instanceof MonitorExitNode) { - MonitorExitNode monitorExit = (MonitorExitNode) next(); - if (monitorExit.stateAfter() != null && monitorExit.stateAfter().bci == FrameState.AFTER_BCI && monitorExit.next() instanceof ReturnNode) { - return; - } + if (permanent) { + return; } for (ValueNode node : dependencies().nonNull().and(isNotA(BeginNode.class))) { State state = tool.getObjectState(node);
--- a/graal/com.oracle.graal.snippets.test/src/com/oracle/graal/snippets/CheckCastTest.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.snippets.test/src/com/oracle/graal/snippets/CheckCastTest.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,9 +22,9 @@ */ package com.oracle.graal.snippets; -import org.junit.*; import com.oracle.graal.api.meta.*; +import com.oracle.graal.test.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.java.*; @@ -42,7 +42,7 @@ } } - @Test + @LongTest public void test1() { test("asNumber", profile(), 111); test("asNumber", profile(Integer.class), 111); @@ -52,7 +52,7 @@ test("asNumberExt", profile(Long.class, Short.class), 111); } - @Test + @LongTest public void test2() { test("asString", profile(), "111"); test("asString", profile(String.class), "111"); @@ -68,27 +68,27 @@ test("asStringExt", profile(String.class), "111"); } - @Test + @LongTest public void test3() { test("asNumber", profile(), "111"); } - @Test + @LongTest public void test4() { test("asString", profile(String.class), 111); } - @Test + @LongTest public void test5() { test("asNumberExt", profile(), "111"); } - @Test + @LongTest public void test6() { test("asStringExt", profile(String.class), 111); } - @Test + @LongTest public void test7() { Throwable throwable = new Exception(); test("asThrowable", profile(), throwable); @@ -96,12 +96,12 @@ test("asThrowable", profile(Exception.class, Error.class), throwable); } - @Test + @LongTest public void test8() { test("arrayStore", new Object[100], "111"); } - @Test + @LongTest public void test8_1() { test("arrayFill", new Object[100], "111"); } @@ -198,7 +198,7 @@ return (Cloneable) o; } - @Test + @LongTest public void test9() { Object o = new Depth13(); test("asDepth12", profile(), o); @@ -206,7 +206,7 @@ test("asDepth12", profile(Depth13.class, Depth14.class), o); } - @Test + @LongTest public void test10() { Object o = new Depth13[3][]; test("asDepth12Arr", o);
--- a/graal/com.oracle.graal.snippets.test/src/com/oracle/graal/snippets/InstanceOfDynamicTest.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.snippets.test/src/com/oracle/graal/snippets/InstanceOfDynamicTest.java Mon Mar 18 20:04:50 2013 +0100 @@ -22,8 +22,7 @@ */ package com.oracle.graal.snippets; -import org.junit.*; - +import com.oracle.graal.test.*; import com.oracle.graal.compiler.test.*; import com.oracle.graal.nodes.java.*; @@ -36,7 +35,7 @@ return value; } - @Test + @LongTest public void test100() { final Object nul = null; test("isStringDynamic", nul); @@ -44,7 +43,7 @@ test("isStringDynamic", Object.class); } - @Test + @LongTest public void test101() { final Object nul = null; test("isStringIntDynamic", nul); @@ -52,7 +51,7 @@ test("isStringIntDynamic", Object.class); } - @Test + @LongTest public void test103() { test("isInstanceDynamic", String.class, null); test("isInstanceDynamic", String.class, "object"); @@ -62,7 +61,7 @@ test("isInstanceDynamic", int.class, Object.class); } - @Test + @LongTest public void test104() { test("isInstanceIntDynamic", String.class, null); test("isInstanceIntDynamic", String.class, "object");
--- a/graal/com.oracle.graal.snippets.test/src/com/oracle/graal/snippets/InstanceOfTest.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.snippets.test/src/com/oracle/graal/snippets/InstanceOfTest.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,12 +24,12 @@ import java.util.*; -import org.junit.*; import com.oracle.graal.api.code.CompilationResult.Call; import com.oracle.graal.api.code.CompilationResult.Mark; import com.oracle.graal.api.code.CompilationResult.Site; import com.oracle.graal.api.meta.*; +import com.oracle.graal.test.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.java.*; import com.oracle.graal.phases.*; @@ -57,7 +57,7 @@ } } - @Test + @LongTest public void test1() { test("isString", profile(), "object"); test("isString", profile(String.class), "object"); @@ -66,7 +66,7 @@ test("isString", profile(String.class), Object.class); } - @Test + @LongTest public void test2() { test("isStringInt", profile(), "object"); test("isStringInt", profile(String.class), "object"); @@ -75,7 +75,7 @@ test("isStringInt", profile(String.class), Object.class); } - @Test + @LongTest public void test2_1() { test("isStringIntComplex", profile(), "object"); test("isStringIntComplex", profile(String.class), "object"); @@ -84,7 +84,7 @@ test("isStringIntComplex", profile(String.class), Object.class); } - @Test + @LongTest public void test3() { Throwable throwable = new Exception(); test("isThrowable", profile(), throwable); @@ -96,7 +96,7 @@ test("isThrowable", profile(Exception.class, Error.class), Object.class); } - @Test + @LongTest public void test3_1() { onlyFirstIsException(new Exception(), new Error()); test("onlyFirstIsException", profile(), new Exception(), new Error()); @@ -105,7 +105,7 @@ test("onlyFirstIsException", profile(), new Error(), new Error()); } - @Test + @LongTest public void test4() { Throwable throwable = new Exception(); test("isThrowableInt", profile(), throwable); @@ -117,7 +117,7 @@ test("isThrowableInt", profile(Exception.class, Error.class), Object.class); } - @Test + @LongTest public void test5() { Map map = new HashMap<>(); test("isMap", profile(), map); @@ -129,7 +129,7 @@ test("isMap", profile(TreeMap.class, HashMap.class), Object.class); } - @Test + @LongTest public void test6() { Map map = new HashMap<>(); test("isMapInt", profile(), map); @@ -141,7 +141,7 @@ test("isMapInt", profile(TreeMap.class, HashMap.class), Object.class); } - @Test + @LongTest public void test7() { Object o = new Depth13(); test("isDepth12", profile(), o); @@ -154,7 +154,7 @@ test("isDepth12", profile(Depth13.class, Depth14.class), o); } - @Test + @LongTest public void test8() { Object o = new Depth13(); test("isDepth12Int", profile(), o); @@ -260,7 +260,7 @@ } } - @Test + @LongTest public void test9() { MyCall callAt63 = new MyCall(63); MyMark markAt63 = new MyMark(63); @@ -277,7 +277,7 @@ return s1.offset - s2.offset; } - @Test + @LongTest public void test10() { Mark[] noMarks = {}; Call callAt63 = new Call(null, 63, 5, true, null); @@ -302,7 +302,7 @@ * The test exists in this source file as the transformation was originally motivated by the * need to remove use of special JumpNodes in the {@code InstanceOfSnippets}. */ - @Test + @LongTest public void test_removeIntermediateMaterialization() { List<String> list = Arrays.asList("1", "2", "3", "4"); test("removeIntermediateMaterialization", profile(), list, "2", "yes", "no"); @@ -357,7 +357,7 @@ return o instanceof D[]; } - @Test + @LongTest public void testArray() { Object aArray = new A[10]; test("isArrayOfA", aArray);
--- a/graal/com.oracle.graal.snippets.test/src/com/oracle/graal/snippets/NewArrayTest.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.snippets.test/src/com/oracle/graal/snippets/NewArrayTest.java Mon Mar 18 20:04:50 2013 +0100 @@ -25,6 +25,7 @@ import org.junit.*; import com.oracle.graal.compiler.test.*; +import com.oracle.graal.test.*; /** * Tests the implementation of {@code [A]NEWARRAY}. @@ -57,7 +58,7 @@ } } - @Test + @LongTest public void test1() { for (String type : new String[]{"Byte", "Char", "Short", "Int", "Float", "Long", "Double", "String"}) { test("new" + type + "Array7");
--- a/graal/com.oracle.graal.snippets.test/src/com/oracle/graal/snippets/NewInstanceTest.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.snippets.test/src/com/oracle/graal/snippets/NewInstanceTest.java Mon Mar 18 20:04:50 2013 +0100 @@ -27,6 +27,7 @@ import org.junit.*; import com.oracle.graal.compiler.test.*; +import com.oracle.graal.test.*; /** * Tests the implementation of {@code NEW}. @@ -56,12 +57,12 @@ } } - @Test + @LongTest public void test1() { test("newObject"); } - @Test + @LongTest public void test2() { test("newObjectTwice"); } @@ -70,37 +71,37 @@ return new Object(); } - @Test + @LongTest public void test3() { test("newObjectLoop", 100); } - @Test + @LongTest public void test4() { test("newBigObject"); } - @Test + @LongTest public void test5() { test("newSomeObject"); } - @Test + @LongTest public void test6() { test("newEmptyString"); } - @Test + @LongTest public void test7() { test("newString", "value"); } - @Test + @LongTest public void test8() { test("newHashMap", 31); } - @Test + @LongTest public void test9() { test("newRegression", true); }
--- a/graal/com.oracle.graal.snippets.test/src/com/oracle/graal/snippets/NewMultiArrayTest.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.snippets.test/src/com/oracle/graal/snippets/NewMultiArrayTest.java Mon Mar 18 20:04:50 2013 +0100 @@ -25,11 +25,10 @@ import java.lang.reflect.*; import java.util.*; -import org.junit.*; - import com.oracle.graal.api.code.*; import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.test.*; +import com.oracle.graal.test.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.java.*; @@ -87,7 +86,7 @@ Class bottomClass; int[] dimensions; - @Test + @LongTest public void test1() { for (Class clazz : new Class[]{byte.class, char.class, short.class, int.class, float.class, long.class, double.class, String.class}) { bottomClass = clazz; @@ -118,7 +117,7 @@ return new Object[10][9][8]; } - @Test + @LongTest public void test2() { test("newMultiArrayException"); }
--- a/graal/com.oracle.graal.snippets.test/src/com/oracle/graal/snippets/WordTest.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.snippets.test/src/com/oracle/graal/snippets/WordTest.java Mon Mar 18 20:04:50 2013 +0100 @@ -24,12 +24,11 @@ import java.lang.reflect.*; -import org.junit.*; - import com.oracle.graal.api.code.*; import com.oracle.graal.api.meta.*; import com.oracle.graal.api.runtime.*; import com.oracle.graal.compiler.test.*; +import com.oracle.graal.test.*; import com.oracle.graal.nodes.*; import com.oracle.graal.snippets.Snippet.SnippetInliningPolicy; import com.oracle.graal.word.*; @@ -54,7 +53,7 @@ return installer.makeGraph(resolvedMethod, inliningPolicy.get()); } - @Test + @LongTest public void construction() { long[] words = new long[]{Long.MIN_VALUE, Long.MIN_VALUE + 1, -1L, 0L, 1L, Long.MAX_VALUE - 1, Long.MAX_VALUE, Integer.MAX_VALUE - 1L, Integer.MAX_VALUE, Integer.MAX_VALUE + 1L, Integer.MIN_VALUE - 1L, Integer.MIN_VALUE, Integer.MIN_VALUE + 1L}; @@ -66,7 +65,7 @@ } } - @Test + @LongTest public void test_arithmetic() { long[] words = new long[]{Long.MIN_VALUE, Long.MIN_VALUE + 1, -1L, 0L, 1L, Long.MAX_VALUE - 1, Long.MAX_VALUE, Integer.MAX_VALUE - 1L, Integer.MAX_VALUE, Integer.MAX_VALUE + 1L, Integer.MIN_VALUE - 1L, Integer.MIN_VALUE, Integer.MIN_VALUE + 1L}; @@ -103,7 +102,7 @@ } } - @Test + @LongTest public void test_compare() { long[] words = new long[]{Long.MIN_VALUE, Long.MIN_VALUE + 1, -1L, 0L, 1L, Long.MAX_VALUE - 1, Long.MAX_VALUE}; for (long word1 : words) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.test/src/com/oracle/graal/test/GraalLongUnitTest.java Mon Mar 18 20:04:50 2013 +0100 @@ -0,0 +1,44 @@ +/* + * 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.test; + +import java.util.*; + +import org.junit.*; +import org.junit.runners.*; +import org.junit.runners.model.*; + +public class GraalLongUnitTest extends BlockJUnit4ClassRunner { + + public GraalLongUnitTest(Class<?> klass) throws InitializationError { + super(klass); + } + + @Override + protected List<FrameworkMethod> computeTestMethods() { + List<FrameworkMethod> methods = new ArrayList<>(5); + methods.addAll(getTestClass().getAnnotatedMethods(Test.class)); + methods.addAll(getTestClass().getAnnotatedMethods(LongTest.class)); + return methods; + } +}
--- a/graal/com.oracle.graal.test/src/com/oracle/graal/test/GraalTest.java Mon Mar 18 20:04:39 2013 +0100 +++ b/graal/com.oracle.graal.test/src/com/oracle/graal/test/GraalTest.java Mon Mar 18 20:04:50 2013 +0100 @@ -25,12 +25,14 @@ import java.lang.reflect.*; import org.junit.*; +import org.junit.runner.*; /** * Base class for Graal tests. * <p> * This contains common utility methods that are used in multiple test projects. */ +@RunWith(GraalLongUnitTest.class) public class GraalTest { protected Method getMethod(String methodName) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.test/src/com/oracle/graal/test/LongTest.java Mon Mar 18 20:04:50 2013 +0100 @@ -0,0 +1,43 @@ +/* + * 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.test; + +import java.lang.annotation.*; + +/* copy of org.junit.Test */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.METHOD}) +public @interface LongTest { + + static final class None extends Throwable { + + private static final long serialVersionUID = 1L; + + private None() { + } + } + + Class<? extends Throwable> expected() default None.class; + + long timeout() default 0L; +}
--- a/mx/commands.py Mon Mar 18 20:04:39 2013 +0100 +++ b/mx/commands.py Mon Mar 18 20:04:50 2013 +0100 @@ -719,7 +719,7 @@ matches = lambda line : len([a for a in annotations if line == a or line.startswith(a + '(')]) != 0 return p.find_classes_with_matching_source_line(pkgRoot, matches, includeInnerClasses) -def _run_tests(args, harness): +def _run_tests(args, harness, annotations): pos = [a for a in args if a[0] != '-' and a[0] != '@' ] neg = [a[1:] for a in args if a[0] == '-'] vmArgs = [a[1:] for a in args if a[0] == '@'] @@ -730,29 +730,52 @@ return True return False + classes = [] for p in mx.projects(): - classes = _find_classes_with_annotations(p, None, ['@Test']) + classes += _find_classes_with_annotations(p, None, annotations) if len(pos) != 0: classes = [c for c in classes if containsAny(c, pos)] if len(neg) != 0: classes = [c for c in classes if not containsAny(c, neg)] - if len(classes) != 0: - mx.log('running tests in ' + p.name) - harness(p, vmArgs, classes) + projectscp = mx.classpath([pcp.name for pcp in mx.projects()]) + + if len(classes) != 0: + harness(projectscp, vmArgs, classes) + +def _unittest(args, annotations): + def harness(projectscp, vmArgs, classes): + prefixArgs = ['-XX:-BootstrapGraal', '-esa', '-ea'] + vm(prefixArgs + vmArgs + ['-cp', projectscp, 'org.junit.runner.JUnitCore'] + classes) + _run_tests(args, harness, annotations) def unittest(args): - """run the JUnit tests + """run the JUnit tests (all testcases) If filters are supplied, only tests whose fully qualified name include a filter as a substring are run. Negative filters are those with a '-' prefix. VM args should have a @ prefix.""" - def harness(p, vmArgs, classes): - prefixArgs = ['-XX:-BootstrapGraal', '-esa', '-ea'] - vm(prefixArgs + vmArgs + ['-cp', mx.classpath(p.name), 'org.junit.runner.JUnitCore'] + classes) - _run_tests(args, harness) + _unittest(args, ['@Test', '@LongTest']) + +def shortunittest(args): + """run the JUnit tests (short testcases only) + + If filters are supplied, only tests whose fully qualified name + include a filter as a substring are run. Negative filters are + those with a '-' prefix. VM args should have a @ prefix.""" + + _unittest(args, ['@Test']) + +def longunittest(args): + """run the JUnit tests (long testcases only) + + If filters are supplied, only tests whose fully qualified name + include a filter as a substring are run. Negative filters are + those with a '-' prefix. VM args should have a @ prefix.""" + + _unittest(args, ['@LongTest']) def buildvms(args): """build one or more VMs in various configurations""" @@ -872,7 +895,7 @@ t = Task('BootstrapWithRegisterPressure:product') vm(['-G:RegisterPressure=rbx,r11,r14,xmm3,xmm11,xmm14', '-esa', '-version']) tasks.append(t.stop()) - + originalVm = _vm _vm = 'server' # hosted mode t = Task('UnitTests:hosted-product') @@ -1193,6 +1216,8 @@ 'gv' : [gv, ''], 'bench' : [bench, '[-resultfile file] [all(default)|dacapo|specjvm2008|bootstrap]'], 'unittest' : [unittest, '[filters...]'], + 'longunittest' : [longunittest, '[filters...]'], + 'shortunittest' : [shortunittest, '[filters...]'], 'jacocoreport' : [jacocoreport, '[output directory]'], 'site' : [site, '[-options]'], 'vm': [vm, '[-options] class [args...]'],
--- a/src/cpu/x86/vm/templateInterpreter_x86.hpp Mon Mar 18 20:04:39 2013 +0100 +++ b/src/cpu/x86/vm/templateInterpreter_x86.hpp Mon Mar 18 20:04:50 2013 +0100 @@ -34,7 +34,7 @@ // Run with +PrintInterpreter to get the VM to print out the size. // Max size with JVMTI #ifdef AMD64 - const static int InterpreterCodeSize = 200 * 1024; + const static int InterpreterCodeSize = 220 * 1024; #else const static int InterpreterCodeSize = 168 * 1024; #endif // AMD64