Mercurial > hg > truffle
changeset 15340:3994ff31091d
Merge.
| author | Christian Humer <christian.humer@gmail.com> |
|---|---|
| date | Wed, 23 Apr 2014 20:49:59 +0200 |
| parents | 265c47be2308 (current diff) 5e544920ad9f (diff) |
| children | 5b29e4b54f2e |
| files | graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/LIRGenLowerable.java graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/LIRGenResLowerable.java graal/com.oracle.graal.test/src/com/oracle/graal/test/GraalLongUnitTest.java graal/com.oracle.graal.test/src/com/oracle/graal/test/LongTest.java test/baseline_whitelist.txt |
| diffstat | 144 files changed, 1045 insertions(+), 820 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java Wed Apr 23 20:49:59 2014 +0200 @@ -50,7 +50,7 @@ public class BaselineBytecodeParser extends AbstractBytecodeParser<Value, BaselineFrameStateBuilder> implements BytecodeParserTool { private Backend backend; - protected LIRGenerator gen; + protected LIRGeneratorTool gen; private LIRGenerationResult lirGenRes; private BytecodeLIRBuilder lirBuilder; @SuppressWarnings("unused") private BciBlock[] loopHeaders;
--- a/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64MemoryPeephole.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64MemoryPeephole.java Wed Apr 23 20:49:59 2014 +0200 @@ -77,7 +77,7 @@ } protected Kind getMemoryKind(Access access) { - return (Kind) gen.getLIRGenerator().getPlatformKind(access.asNode().stamp()); + return (Kind) gen.getLIRGeneratorTool().getPlatformKind(access.asNode().stamp()); } protected AMD64AddressValue makeAddress(Access access) { @@ -94,7 +94,7 @@ } } ensureEvaluated(other); - return gen.getLIRGenerator().emitBinaryMemory(op, getMemoryKind(access), gen.getLIRGeneratorTool().asAllocatable(gen.operand(other)), makeAddress(access), getState(access)); + return gen.getLIRGeneratorTool().emitBinaryMemory(op, getMemoryKind(access), gen.getLIRGeneratorTool().asAllocatable(gen.operand(other)), makeAddress(access), getState(access)); } /** @@ -128,7 +128,7 @@ AMD64AddressValue address = makeAddress(access); LIRFrameState state = getState(access); evaluateDeferred(); - return gen.getLIRGenerator().emitConvert2MemoryOp(kind, op, address, state); + return gen.getLIRGeneratorTool().emitConvert2MemoryOp(kind, op, address, state); } @Override @@ -252,7 +252,7 @@ @Override public Value emitReinterpretMemory(Stamp stamp, Access access) { - PlatformKind to = gen.getLIRGenerator().getPlatformKind(stamp); + PlatformKind to = gen.getLIRGeneratorTool().getPlatformKind(stamp); Kind from = getMemoryKind(access); assert to != from : "should have been eliminated"; @@ -370,7 +370,7 @@ memoryKind = Kind.Char; } evaluateDeferred(); - return gen.getLIRGenerator().emitZeroExtendMemory(memoryKind, toBits, makeAddress(access), getState(access)); + return gen.getLIRGeneratorTool().emitZeroExtendMemory(memoryKind, toBits, makeAddress(access), getState(access)); } public boolean emitIfMemory(IfNode x, Access access) { @@ -463,7 +463,7 @@ } } ensureEvaluated(other); - gen.getLIRGenerator().emitCompareMemoryConOp(kind, makeAddress(access), constant, getState(access)); + gen.getLIRGeneratorTool().emitCompareMemoryConOp(kind, makeAddress(access), constant, getState(access)); mirrored = uncast(right) == access; } else { if (kind == Kind.Object) { @@ -473,7 +473,7 @@ } evaluateDeferred(); - gen.getLIRGenerator().emitCompareRegMemoryOp(kind, gen.operand(other), makeAddress(access), getState(access)); + gen.getLIRGeneratorTool().emitCompareRegMemoryOp(kind, gen.operand(other), makeAddress(access), getState(access)); mirrored = uncast(left) == access; }
--- a/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64NodeLIRBuilder.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64NodeLIRBuilder.java Wed Apr 23 20:49:59 2014 +0200 @@ -36,7 +36,7 @@ public abstract class AMD64NodeLIRBuilder extends NodeLIRBuilder { - public AMD64NodeLIRBuilder(StructuredGraph graph, LIRGenerator gen) { + public AMD64NodeLIRBuilder(StructuredGraph graph, LIRGeneratorTool gen) { super(graph, gen); } @@ -108,7 +108,7 @@ } @Override - public AMD64LIRGenerator getLIRGenerator() { + public AMD64LIRGenerator getLIRGeneratorTool() { return (AMD64LIRGenerator) gen; } }
--- a/graal/com.oracle.graal.compiler.hsail/src/com/oracle/graal/compiler/hsail/HSAILNodeLIRBuilder.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.compiler.hsail/src/com/oracle/graal/compiler/hsail/HSAILNodeLIRBuilder.java Wed Apr 23 20:49:59 2014 +0200 @@ -37,7 +37,7 @@ */ public abstract class HSAILNodeLIRBuilder extends NodeLIRBuilder { - public HSAILNodeLIRBuilder(StructuredGraph graph, LIRGenerator lirGen) { + public HSAILNodeLIRBuilder(StructuredGraph graph, LIRGeneratorTool lirGen) { super(graph, lirGen); }
--- a/graal/com.oracle.graal.compiler.ptx/src/com/oracle/graal/compiler/ptx/PTXNodeLIRBuilder.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.compiler.ptx/src/com/oracle/graal/compiler/ptx/PTXNodeLIRBuilder.java Wed Apr 23 20:49:59 2014 +0200 @@ -56,7 +56,7 @@ } } - public PTXNodeLIRBuilder(StructuredGraph graph, LIRGenerator lirGen) { + public PTXNodeLIRBuilder(StructuredGraph graph, LIRGeneratorTool lirGen) { super(graph, lirGen); }
--- a/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCNodeLIRBuilder.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCNodeLIRBuilder.java Wed Apr 23 20:49:59 2014 +0200 @@ -37,7 +37,7 @@ */ public abstract class SPARCNodeLIRBuilder extends NodeLIRBuilder { - public SPARCNodeLIRBuilder(StructuredGraph graph, LIRGenerator lirGen) { + public SPARCNodeLIRBuilder(StructuredGraph graph, LIRGeneratorTool lirGen) { super(graph, lirGen); }
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/CheckGraalInvariants.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/CheckGraalInvariants.java Wed Apr 23 20:49:59 2014 +0200 @@ -52,7 +52,7 @@ */ public class CheckGraalInvariants extends GraalTest { - @LongTest + @Test public void test() { RuntimeProvider rt = Graal.getRequiredCapability(RuntimeProvider.class); Providers providers = rt.getHostBackend().getProviders();
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/InfopointReasonTest.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/InfopointReasonTest.java Wed Apr 23 20:49:59 2014 +0200 @@ -39,7 +39,6 @@ import com.oracle.graal.nodes.*; import com.oracle.graal.phases.*; import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.test.*; /** * Test that infopoints in {@link CompilationResult}s have correctly assigned reasons. @@ -72,7 +71,7 @@ } } - @LongTest + @Test public void lineInfopoints() { final Method method = getMethod("testMethod"); final StructuredGraph graph = parseDebug(method);
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/deopt/CompiledMethodTest.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/deopt/CompiledMethodTest.java Wed Apr 23 20:49:59 2014 +0200 @@ -32,7 +32,6 @@ import com.oracle.graal.nodes.*; import com.oracle.graal.phases.common.*; import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.test.*; /** * In the following tests, the usages of local variable "a" are replaced with the integer constant @@ -51,7 +50,7 @@ return f1 + " " + arg1 + " " + arg2 + " " + arg3; } - @LongTest + @Test public void test1() { Method method = getMethod("testMethod"); final StructuredGraph graph = parse(method); @@ -74,7 +73,7 @@ } } - @LongTest + @Test public void test3() { Method method = getMethod("testMethod"); final StructuredGraph graph = parse(method); @@ -88,7 +87,7 @@ } } - @LongTest + @Test public void test4() { Method method = getMethod("testMethodVirtual"); final StructuredGraph graph = parse(method);
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/inlining/InliningTest.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/inlining/InliningTest.java Wed Apr 23 20:49:59 2014 +0200 @@ -38,7 +38,6 @@ import com.oracle.graal.phases.*; import com.oracle.graal.phases.common.*; import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.test.*; public class InliningTest extends GraalCompilerTest { @@ -73,7 +72,7 @@ assertInlined(getGraph("invokeMethodOnFieldSnippet", false)); } - @LongTest + @Test public void testStaticBindableInliningIP() { assertManyMethodInfopoints(assertInlined(getGraph("invokeConstructorSnippet", true))); assertManyMethodInfopoints(assertInlined(getGraph("invokeFinalMethodSnippet", true))); @@ -82,7 +81,7 @@ } @Ignore("would need read elimination/EA before inlining") - @LongTest + @Test public void testDependentStaticBindableInliningIP() { assertManyMethodInfopoints(assertInlined(getGraph("invokeMethodOnFinalFieldSnippet", true))); assertManyMethodInfopoints(assertInlined(getGraph("invokeMethodOnFieldSnippet", true))); @@ -180,7 +179,7 @@ assertNotInlined(getGraph("invokeOverriddenInterfaceMethodSnippet", false)); } - @LongTest + @Test public void testClassHierarchyAnalysisIP() { assertManyMethodInfopoints(assertInlined(getGraph("invokeLeafClassMethodSnippet", true))); assertManyMethodInfopoints(assertInlined(getGraph("invokeConcreteMethodSnippet", true)));
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Wed Apr 23 20:49:59 2014 +0200 @@ -35,7 +35,6 @@ import com.oracle.graal.api.meta.ProfilingInfo.TriState; import com.oracle.graal.compiler.alloc.*; import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.compiler.gen.*; import com.oracle.graal.compiler.target.*; import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.Scope; @@ -45,6 +44,7 @@ import com.oracle.graal.lir.gen.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.cfg.*; +import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.util.*; import com.oracle.graal.options.*; import com.oracle.graal.phases.*; @@ -208,7 +208,7 @@ } } - private static void emitBlock(NodeLIRBuilder nodeLirGen, LIRGenerationResult lirGenRes, Block b, StructuredGraph graph, BlockMap<List<ScheduledNode>> blockMap) { + private static void emitBlock(NodeLIRBuilderTool nodeLirGen, LIRGenerationResult lirGenRes, Block b, StructuredGraph graph, BlockMap<List<ScheduledNode>> blockMap) { if (lirGenRes.getLIR().getLIRforBlock(b) == null) { for (Block pred : b.getPredecessors()) { if (!b.isLoopHeader() || !pred.isLoopEnd()) { @@ -246,8 +246,8 @@ try (Scope ds = Debug.scope("BackEnd", lir)) { FrameMap frameMap = backend.newFrameMap(registerConfig); LIRGenerationResult lirGenRes = backend.newLIRGenerationResult(lir, frameMap, stub); - LIRGenerator lirGen = backend.newLIRGenerator(cc, lirGenRes); - NodeLIRBuilder nodeLirGen = backend.newNodeLIRGenerator(graph, lirGen); + LIRGeneratorTool lirGen = backend.newLIRGenerator(cc, lirGenRes); + NodeLIRBuilderTool nodeLirGen = backend.newNodeLIRBuilder(graph, lirGen); try (Scope s = Debug.scope("LIRGen", lirGen)) { for (Block b : linearScanOrder) {
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/BytecodeLIRBuilder.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/BytecodeLIRBuilder.java Wed Apr 23 20:49:59 2014 +0200 @@ -27,10 +27,10 @@ import com.oracle.graal.lir.gen.*; public class BytecodeLIRBuilder { - protected final LIRGenerator gen; + protected final LIRGeneratorTool gen; protected final BytecodeParserTool parser; - public BytecodeLIRBuilder(LIRGenerator gen, BytecodeParserTool parser) { + public BytecodeLIRBuilder(LIRGeneratorTool gen, BytecodeParserTool parser) { this.gen = gen; this.parser = parser; }
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/NodeLIRBuilder.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/NodeLIRBuilder.java Wed Apr 23 20:49:59 2014 +0200 @@ -35,14 +35,14 @@ import com.oracle.graal.compiler.common.calc.*; import com.oracle.graal.compiler.common.cfg.*; import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.compiler.target.*; import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.Scope; import com.oracle.graal.graph.*; import com.oracle.graal.lir.*; import com.oracle.graal.lir.StandardOp.JumpOp; import com.oracle.graal.lir.gen.*; -import com.oracle.graal.lir.gen.LIRGenerator.*; +import com.oracle.graal.lir.gen.LIRGenerator.LoadConstant; +import com.oracle.graal.lir.gen.LIRGenerator.Options; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.calc.*; import com.oracle.graal.nodes.cfg.*; @@ -58,12 +58,12 @@ private final NodeMap<Value> nodeOperands; private final DebugInfoBuilder debugInfoBuilder; - protected final LIRGenerator gen; + protected final LIRGeneratorTool gen; private ValueNode currentInstruction; private ValueNode lastInstructionPrinted; // Debugging only - public NodeLIRBuilder(StructuredGraph graph, LIRGenerator gen) { + public NodeLIRBuilder(StructuredGraph graph, LIRGeneratorTool gen) { this.gen = gen; this.nodeOperands = graph.createNodeMap(); this.debugInfoBuilder = createDebugInfoBuilder(nodeOperands); @@ -171,7 +171,7 @@ } public final void append(LIRInstruction op) { - if (gen.printIRWithLIR && !TTY.isSuppressed()) { + if (Options.PrintIRWithLIR.getValue() && !TTY.isSuppressed()) { if (currentInstruction != null && lastInstructionPrinted != currentInstruction) { lastInstructionPrinted = currentInstruction; InstructionPrinter ip = new InstructionPrinter(TTY.out()); @@ -195,7 +195,7 @@ int instructionsFolded = 0; for (int i = 0; i < nodes.size(); i++) { Node instr = nodes.get(i); - if (gen.traceLevel >= 3) { + if (Options.TraceLIRGeneratorLevel.getValue() >= 3) { TTY.println("LIRGen for " + instr); } if (instructionsFolded > 0) { @@ -393,7 +393,7 @@ protected abstract boolean peephole(ValueNode valueNode); private void doRoot(ValueNode instr) { - if (gen.traceLevel >= 2) { + if (Options.TraceLIRGeneratorLevel.getValue() >= 2) { TTY.println("Emitting LIR for instruction " + instr); } currentInstruction = instr; @@ -407,11 +407,7 @@ if (Debug.isLogEnabled() && node.stamp() instanceof IllegalStamp) { Debug.log("This node has invalid type, we are emitting dead code(?): %s", node); } - if (node instanceof LIRGenLowerable) { - ((LIRGenLowerable) node).generate(this); - } else if (node instanceof LIRGenResLowerable) { - ((LIRGenResLowerable) node).generate(this, gen.getResult()); - } else if (node instanceof LIRLowerable) { + if (node instanceof LIRLowerable) { ((LIRLowerable) node).generate(this); } else if (node instanceof ArithmeticLIRLowerable) { ((ArithmeticLIRLowerable) node).generate(this, gen); @@ -460,7 +456,7 @@ } private void moveToPhi(MergeNode merge, AbstractEndNode pred) { - if (gen.traceLevel >= 1) { + if (Options.TraceLIRGeneratorLevel.getValue() >= 1) { TTY.println("MOVE TO PHI from " + pred + " to " + merge); } PhiResolver resolver = new PhiResolver(gen); @@ -725,11 +721,7 @@ } @Override - public LIRGenerator getLIRGeneratorTool() { - return gen; - } - - public LIRGenerator getLIRGenerator() { + public LIRGeneratorTool getLIRGeneratorTool() { return gen; } }
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/PhiResolver.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/PhiResolver.java Wed Apr 23 20:49:59 2014 +0200 @@ -34,18 +34,18 @@ /** * Converts {@link ValuePhiNode} instructions into moves. - * + * * Resolves cycles: - * + * * <pre> - * + * * r1 := r2 becomes temp := r1 * r2 := r1 r1 := r2 * r2 := temp * </pre> - * + * * and orders moves: - * + * * <pre> * r2 := r3 becomes r1 := r2 * r1 := r2 r2 := r3 @@ -104,7 +104,7 @@ } } - private final LIRGenerator gen; + private final LIRGeneratorTool gen; /** * The operand loop header phi for the operand currently being process in {@link #dispose()}. @@ -121,7 +121,7 @@ */ private final HashMap<Value, PhiResolverNode> operandToNodeMap = new HashMap<>(); - public PhiResolver(LIRGenerator gen) { + public PhiResolver(LIRGeneratorTool gen) { this.gen = gen; temp = ILLEGAL; }
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/Backend.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/Backend.java Wed Apr 23 20:49:59 2014 +0200 @@ -32,6 +32,7 @@ import com.oracle.graal.lir.asm.*; import com.oracle.graal.lir.gen.*; import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.spi.*; import com.oracle.graal.phases.tiers.*; import com.oracle.graal.phases.util.*; @@ -72,17 +73,17 @@ */ public abstract FrameMap newFrameMap(RegisterConfig registerConfig); - public abstract LIRGenerator newLIRGenerator(CallingConvention cc, LIRGenerationResult lirGenRes); + public abstract LIRGeneratorTool newLIRGenerator(CallingConvention cc, LIRGenerationResult lirGenRes); public abstract LIRGenerationResult newLIRGenerationResult(LIR lir, FrameMap frameMap, Object stub); - public abstract NodeLIRBuilder newNodeLIRGenerator(StructuredGraph graph, LIRGenerator lirGen); + public abstract NodeLIRBuilderTool newNodeLIRBuilder(StructuredGraph graph, LIRGeneratorTool lirGen); /** * @param gen the LIRGenerator the BytecodeLIRBuilder should use * @param parser the bytecode parser the BytecodeLIRBuilder should use */ - public BytecodeLIRBuilder newBytecodeLIRBuilder(LIRGenerator gen, BytecodeParserTool parser) { + public BytecodeLIRBuilder newBytecodeLIRBuilder(LIRGeneratorTool gen, BytecodeParserTool parser) { throw GraalInternalError.unimplemented("Baseline compilation is not available for this Backend!"); }
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/LIRGenLowerable.java Wed Apr 23 20:49:32 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2011, 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.target; - -import com.oracle.graal.compiler.gen.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodes.spi.*; - -/** - * An alternative to {@link LIRLowerable} for lowering that is tightly coupled to - * {@link LIRGenerator} and {@link LIRInstruction}. - */ -public interface LIRGenLowerable { - - void generate(NodeLIRBuilder generator); -}
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/LIRGenResLowerable.java Wed Apr 23 20:49:32 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2011, 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.target; - -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodes.spi.*; - -/** - * An alternative to {@link LIRLowerable} for lowering that is tightly coupled to - * {@link LIRGenerationResult} and {@link LIRInstruction}. - */ -public interface LIRGenResLowerable { - - void generate(NodeLIRBuilderTool generator, LIRGenerationResult genRes); -}
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Node.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Node.java Wed Apr 23 20:49:59 2014 +0200 @@ -676,7 +676,7 @@ NodeClassIterator iter = usage.inputs().iterator(); while (iter.hasNext()) { Position pos = iter.nextPosition(); - if (pos.getInputType(usage) == type) { + if (pos.getInputType(usage) == type && pos.get(usage) == this) { pos.set(usage, other); } }
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java Wed Apr 23 20:49:59 2014 +0200 @@ -48,6 +48,7 @@ import com.oracle.graal.lir.asm.*; import com.oracle.graal.lir.gen.*; import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.spi.*; /** * HotSpot AMD64 specific backend. @@ -71,7 +72,7 @@ } @Override - public LIRGenerator newLIRGenerator(CallingConvention cc, LIRGenerationResult lirGenRes) { + public LIRGeneratorTool newLIRGenerator(CallingConvention cc, LIRGenerationResult lirGenRes) { return new AMD64HotSpotLIRGenerator(getProviders(), getRuntime().getConfig(), cc, lirGenRes); } @@ -81,12 +82,12 @@ } @Override - public NodeLIRBuilder newNodeLIRGenerator(StructuredGraph graph, LIRGenerator lirGen) { + public NodeLIRBuilderTool newNodeLIRBuilder(StructuredGraph graph, LIRGeneratorTool lirGen) { return new AMD64HotSpotNodeLIRBuilder(graph, lirGen); } @Override - public BytecodeLIRBuilder newBytecodeLIRBuilder(LIRGenerator gen, BytecodeParserTool parser) { + public BytecodeLIRBuilder newBytecodeLIRBuilder(LIRGeneratorTool gen, BytecodeParserTool parser) { return new AMD64HotSpotBytecodeLIRBuilder(gen, parser); }
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBytecodeLIRBuilder.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBytecodeLIRBuilder.java Wed Apr 23 20:49:59 2014 +0200 @@ -33,7 +33,7 @@ public class AMD64HotSpotBytecodeLIRBuilder extends BytecodeLIRBuilder { - public AMD64HotSpotBytecodeLIRBuilder(LIRGenerator gen, BytecodeParserTool parser) { + public AMD64HotSpotBytecodeLIRBuilder(LIRGeneratorTool gen, BytecodeParserTool parser) { super(gen, parser); }
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotMemoryPeephole.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotMemoryPeephole.java Wed Apr 23 20:49:59 2014 +0200 @@ -85,7 +85,7 @@ @Override protected Kind getMemoryKind(Access access) { - PlatformKind kind = gen.getLIRGenerator().getPlatformKind(access.asNode().stamp()); + PlatformKind kind = gen.getLIRGeneratorTool().getPlatformKind(access.asNode().stamp()); if (kind == NarrowOopStamp.NarrowOop) { return Kind.Int; } else {
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java Wed Apr 23 20:49:59 2014 +0200 @@ -52,7 +52,7 @@ */ public class AMD64HotSpotNodeLIRBuilder extends AMD64NodeLIRBuilder implements HotSpotNodeLIRBuilder { - public AMD64HotSpotNodeLIRBuilder(StructuredGraph graph, LIRGenerator gen) { + public AMD64HotSpotNodeLIRBuilder(StructuredGraph graph, LIRGeneratorTool gen) { super(graph, gen); memoryPeephole = new AMD64HotSpotMemoryPeephole(this); assert gen instanceof AMD64HotSpotLIRGenerator;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64RawNativeCallNode.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64RawNativeCallNode.java Wed Apr 23 20:49:59 2014 +0200 @@ -27,12 +27,11 @@ import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.amd64.*; import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.compiler.gen.*; -import com.oracle.graal.compiler.target.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.spi.*; -public class AMD64RawNativeCallNode extends FixedWithNextNode implements LIRGenLowerable { +public class AMD64RawNativeCallNode extends FixedWithNextNode implements LIRLowerable { private final Constant functionPointer; @Input private final NodeInputList<ValueNode> args; @@ -44,7 +43,7 @@ } @Override - public void generate(NodeLIRBuilder generator) { + public void generate(NodeLIRBuilderTool generator) { AMD64NodeLIRBuilder gen = (AMD64NodeLIRBuilder) generator; Value[] parameter = new Value[args.count()]; JavaType[] parameterTypes = new JavaType[args.count()]; @@ -55,7 +54,7 @@ ResolvedJavaType returnType = stamp().javaType(gen.getLIRGeneratorTool().getMetaAccess()); CallingConvention cc = generator.getLIRGeneratorTool().getCodeCache().getRegisterConfig().getCallingConvention(Type.NativeCall, returnType, parameterTypes, generator.getLIRGeneratorTool().target(), false); - ((AMD64LIRGenerator) gen.getLIRGeneratorTool()).emitCCall(functionPointer.asLong(), cc, parameter, countFloatingTypeArguments(args)); + gen.getLIRGeneratorTool().emitCCall(functionPointer.asLong(), cc, parameter, countFloatingTypeArguments(args)); if (this.getKind() != Kind.Void) { generator.setResult(this, gen.getLIRGeneratorTool().emitMove(cc.getReturn())); }
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java Wed Apr 23 20:49:59 2014 +0200 @@ -49,7 +49,6 @@ import com.oracle.graal.compiler.common.*; import com.oracle.graal.compiler.common.cfg.*; import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.compiler.gen.*; import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.Scope; import com.oracle.graal.gpu.*; @@ -70,6 +69,7 @@ import com.oracle.graal.nodes.calc.*; import com.oracle.graal.nodes.extended.*; import com.oracle.graal.nodes.java.*; +import com.oracle.graal.nodes.spi.*; import com.oracle.graal.options.*; import com.oracle.graal.phases.*; import com.oracle.graal.phases.tiers.*; @@ -376,7 +376,7 @@ } @Override - public LIRGenerator newLIRGenerator(CallingConvention cc, LIRGenerationResult lirGenRes) { + public LIRGeneratorTool newLIRGenerator(CallingConvention cc, LIRGenerationResult lirGenRes) { return new HSAILHotSpotLIRGenerator(getProviders(), getRuntime().getConfig(), cc, lirGenRes); } @@ -386,7 +386,7 @@ } @Override - public NodeLIRBuilder newNodeLIRGenerator(StructuredGraph graph, LIRGenerator lirGen) { + public NodeLIRBuilderTool newNodeLIRBuilder(StructuredGraph graph, LIRGeneratorTool lirGen) { return new HSAILHotSpotNodeLIRBuilder(graph, lirGen); }
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotNodeLIRBuilder.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotNodeLIRBuilder.java Wed Apr 23 20:49:59 2014 +0200 @@ -44,7 +44,7 @@ */ public class HSAILHotSpotNodeLIRBuilder extends HSAILNodeLIRBuilder implements HotSpotNodeLIRBuilder { - public HSAILHotSpotNodeLIRBuilder(StructuredGraph graph, LIRGenerator lirGen) { + public HSAILHotSpotNodeLIRBuilder(StructuredGraph graph, LIRGeneratorTool lirGen) { super(graph, lirGen); }
--- a/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotBackend.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotBackend.java Wed Apr 23 20:49:59 2014 +0200 @@ -38,7 +38,6 @@ import com.oracle.graal.asm.ptx.*; import com.oracle.graal.compiler.common.*; import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.compiler.gen.*; import com.oracle.graal.debug.*; import com.oracle.graal.debug.Debug.Scope; import com.oracle.graal.gpu.*; @@ -55,6 +54,7 @@ import com.oracle.graal.lir.ptx.PTXControlFlow.PTXPredicatedLIRInstruction; import com.oracle.graal.lir.ptx.PTXMemOp.LoadReturnAddrOp; import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.spi.*; import com.oracle.graal.phases.*; import com.oracle.graal.phases.common.*; import com.oracle.graal.phases.tiers.*; @@ -356,12 +356,12 @@ } @Override - public LIRGenerator newLIRGenerator(CallingConvention cc, LIRGenerationResult lirGenRes) { + public LIRGeneratorTool newLIRGenerator(CallingConvention cc, LIRGenerationResult lirGenRes) { return new PTXHotSpotLIRGenerator(getProviders(), getRuntime().getConfig(), cc, lirGenRes); } @Override - public NodeLIRBuilder newNodeLIRGenerator(StructuredGraph graph, LIRGenerator lirGen) { + public NodeLIRBuilderTool newNodeLIRBuilder(StructuredGraph graph, LIRGeneratorTool lirGen) { return new PTXHotSpotNodeLIRBuilder(graph, lirGen); }
--- a/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotNodeLIRBuilder.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotNodeLIRBuilder.java Wed Apr 23 20:49:59 2014 +0200 @@ -35,7 +35,7 @@ */ public class PTXHotSpotNodeLIRBuilder extends PTXNodeLIRBuilder implements HotSpotNodeLIRBuilder { - protected PTXHotSpotNodeLIRBuilder(StructuredGraph graph, LIRGenerator lirGen) { + protected PTXHotSpotNodeLIRBuilder(StructuredGraph graph, LIRGeneratorTool lirGen) { super(graph, lirGen); }
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java Wed Apr 23 20:49:59 2014 +0200 @@ -44,7 +44,6 @@ import com.oracle.graal.asm.sparc.SPARCMacroAssembler.RestoreWindow; import com.oracle.graal.asm.sparc.SPARCMacroAssembler.Setx; import com.oracle.graal.compiler.common.*; -import com.oracle.graal.compiler.gen.*; import com.oracle.graal.hotspot.*; import com.oracle.graal.hotspot.meta.HotSpotCodeCacheProvider.MarkId; import com.oracle.graal.hotspot.meta.*; @@ -55,6 +54,7 @@ import com.oracle.graal.lir.gen.*; import com.oracle.graal.lir.sparc.*; import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.spi.*; /** * HotSpot SPARC specific backend. @@ -78,12 +78,12 @@ } @Override - public LIRGenerator newLIRGenerator(CallingConvention cc, LIRGenerationResult lirGenRes) { + public LIRGeneratorTool newLIRGenerator(CallingConvention cc, LIRGenerationResult lirGenRes) { return new SPARCHotSpotLIRGenerator(getProviders(), getRuntime().getConfig(), cc, lirGenRes); } @Override - public NodeLIRBuilder newNodeLIRGenerator(StructuredGraph graph, LIRGenerator lirGen) { + public NodeLIRBuilderTool newNodeLIRBuilder(StructuredGraph graph, LIRGeneratorTool lirGen) { return new SPARCHotSpotNodeLIRBuilder(graph, lirGen); }
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotNodeLIRBuilder.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotNodeLIRBuilder.java Wed Apr 23 20:49:59 2014 +0200 @@ -43,7 +43,7 @@ public class SPARCHotSpotNodeLIRBuilder extends SPARCNodeLIRBuilder implements HotSpotNodeLIRBuilder { - public SPARCHotSpotNodeLIRBuilder(StructuredGraph graph, LIRGenerator lirGen) { + public SPARCHotSpotNodeLIRBuilder(StructuredGraph graph, LIRGeneratorTool lirGen) { super(graph, lirGen); assert gen instanceof SPARCHotSpotLIRGenerator; assert getDebugInfoBuilder() instanceof HotSpotDebugInfoBuilder;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotSafepointOp.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotSafepointOp.java Wed Apr 23 20:49:59 2014 +0200 @@ -36,6 +36,8 @@ import com.oracle.graal.lir.gen.*; import com.oracle.graal.lir.sparc.*; +import edu.umd.cs.findbugs.annotations.*; + /** * Emits a safepoint poll. */ @@ -43,7 +45,7 @@ public class SPARCHotSpotSafepointOp extends SPARCLIRInstruction { @State protected LIRFrameState state; - @Temp({OperandFlag.REG}) private AllocatableValue temp; + @SuppressFBWarnings(value = "BC_IMPOSSIBLE_CAST", justification = "changed by the register allocator") @Temp({OperandFlag.REG}) private AllocatableValue temp; private final HotSpotVMConfig config;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/AllocaNode.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/AllocaNode.java Wed Apr 23 20:49:59 2014 +0200 @@ -27,9 +27,7 @@ import com.oracle.graal.api.code.*; import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.compiler.target.*; import com.oracle.graal.hotspot.*; -import com.oracle.graal.lir.gen.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; @@ -37,7 +35,7 @@ * Reserves a block of memory in the stack frame of a method. The block is reserved in the frame for * the entire execution of the associated method. */ -public final class AllocaNode extends FixedWithNextNode implements LIRGenResLowerable { +public final class AllocaNode extends FixedWithNextNode implements LIRLowerable { /** * The number of slots in block. @@ -58,8 +56,8 @@ } @Override - public void generate(NodeLIRBuilderTool gen, LIRGenerationResult res) { - StackSlot array = res.getFrameMap().allocateStackSlots(slots, objects, null); + public void generate(NodeLIRBuilderTool gen) { + StackSlot array = gen.getLIRGeneratorTool().getResult().getFrameMap().allocateStackSlots(slots, objects, null); Value result = gen.getLIRGeneratorTool().emitAddress(array); gen.setResult(this, result); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/BeginLockScopeNode.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/BeginLockScopeNode.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,12 +24,11 @@ import com.oracle.graal.api.code.*; import com.oracle.graal.api.meta.*; -import com.oracle.graal.compiler.gen.*; -import com.oracle.graal.compiler.target.*; import com.oracle.graal.graph.*; import com.oracle.graal.hotspot.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.extended.*; +import com.oracle.graal.nodes.spi.*; import com.oracle.graal.word.*; /** @@ -39,7 +38,7 @@ * check on the object. */ @NodeInfo(allowedUsageTypes = {InputType.Memory}) -public final class BeginLockScopeNode extends AbstractMemoryCheckpoint implements LIRGenLowerable, MonitorEnter, MemoryCheckpoint.Single { +public final class BeginLockScopeNode extends AbstractMemoryCheckpoint implements LIRLowerable, MonitorEnter, MemoryCheckpoint.Single { private int lockDepth; @@ -59,7 +58,7 @@ } @Override - public void generate(NodeLIRBuilder gen) { + public void generate(NodeLIRBuilderTool gen) { assert lockDepth != -1; HotSpotLIRGenerator hsGen = (HotSpotLIRGenerator) gen.getLIRGeneratorTool(); StackSlot slot = hsGen.getLockSlot(lockDepth);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CStringNode.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CStringNode.java Wed Apr 23 20:49:59 2014 +0200 @@ -23,8 +23,6 @@ package com.oracle.graal.hotspot.nodes; import com.oracle.graal.api.meta.*; -import com.oracle.graal.compiler.gen.*; -import com.oracle.graal.compiler.target.*; import com.oracle.graal.nodes.calc.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.word.*; @@ -32,7 +30,7 @@ /** * Converts a compile-time constant Java string into a C string installed with the generated code. */ -public final class CStringNode extends FloatingNode implements LIRGenLowerable { +public final class CStringNode extends FloatingNode implements LIRLowerable { private final String string; @@ -41,7 +39,7 @@ this.string = string; } - public void generate(NodeLIRBuilder gen) { + public void generate(NodeLIRBuilderTool gen) { gen.setResult(this, emitCString(gen, string)); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DimensionsNode.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DimensionsNode.java Wed Apr 23 20:49:59 2014 +0200 @@ -28,7 +28,6 @@ import com.oracle.graal.api.code.*; import com.oracle.graal.api.meta.*; -import com.oracle.graal.compiler.target.*; import com.oracle.graal.lir.gen.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; @@ -38,7 +37,7 @@ * Intrinsic for allocating an on-stack array of integers to hold the dimensions of a multianewarray * instruction. */ -public final class DimensionsNode extends FixedWithNextNode implements LIRGenResLowerable { +public final class DimensionsNode extends FixedWithNextNode implements LIRLowerable { private final int rank; @@ -48,12 +47,13 @@ } @Override - public void generate(NodeLIRBuilderTool gen, LIRGenerationResult res) { + public void generate(NodeLIRBuilderTool gen) { + LIRGeneratorTool lirGen = gen.getLIRGeneratorTool(); int size = rank * 4; - int wordSize = gen.getLIRGeneratorTool().target().wordSize; + int wordSize = lirGen.target().wordSize; int slots = roundUp(size, wordSize) / wordSize; - StackSlot array = res.getFrameMap().allocateStackSlots(slots, new BitSet(0), null); - Value result = gen.getLIRGeneratorTool().emitAddress(array); + StackSlot array = lirGen.getResult().getFrameMap().allocateStackSlots(slots, new BitSet(0), null); + Value result = lirGen.emitAddress(array); gen.setResult(this, result); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DirectCompareAndSwapNode.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DirectCompareAndSwapNode.java Wed Apr 23 20:49:59 2014 +0200 @@ -23,13 +23,12 @@ package com.oracle.graal.hotspot.nodes; import com.oracle.graal.api.meta.*; -import com.oracle.graal.compiler.gen.*; -import com.oracle.graal.compiler.target.*; import com.oracle.graal.graph.*; import com.oracle.graal.hotspot.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.extended.*; import com.oracle.graal.nodes.java.*; +import com.oracle.graal.nodes.spi.*; import com.oracle.graal.word.*; /** @@ -39,7 +38,7 @@ * expected value or the compared against value instead of a boolean. */ @NodeInfo(allowedUsageTypes = {InputType.Memory}) -public class DirectCompareAndSwapNode extends FixedWithNextNode implements LIRGenLowerable, MemoryCheckpoint.Single { +public class DirectCompareAndSwapNode extends FixedWithNextNode implements LIRLowerable, MemoryCheckpoint.Single { @Input private ValueNode object; @Input private ValueNode offset; @@ -79,7 +78,7 @@ } @Override - public void generate(NodeLIRBuilder gen) { + public void generate(NodeLIRBuilderTool gen) { ((HotSpotNodeLIRBuilder) gen).visitDirectCompareAndSwap(this); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/MonitorCounterNode.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/MonitorCounterNode.java Wed Apr 23 20:49:59 2014 +0200 @@ -26,8 +26,6 @@ import com.oracle.graal.api.code.*; import com.oracle.graal.api.meta.*; -import com.oracle.graal.compiler.target.*; -import com.oracle.graal.lir.gen.*; import com.oracle.graal.nodes.calc.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.word.*; @@ -35,16 +33,16 @@ /** * Node that is used to maintain a stack based counter of how many locks are currently held. */ -public final class MonitorCounterNode extends FloatingNode implements LIRGenResLowerable { +public final class MonitorCounterNode extends FloatingNode implements LIRLowerable { private MonitorCounterNode() { super(null); } @Override - public void generate(NodeLIRBuilderTool gen, LIRGenerationResult res) { + public void generate(NodeLIRBuilderTool gen) { assert graph().getNodes().filter(MonitorCounterNode.class).count() == 1 : "monitor counters not canonicalized to single instance"; - StackSlot counter = res.getFrameMap().allocateStackSlots(1, new BitSet(0), null); + StackSlot counter = gen.getLIRGeneratorTool().getResult().getFrameMap().allocateStackSlots(1, new BitSet(0), null); Value result = gen.getLIRGeneratorTool().emitAddress(counter); gen.setResult(this, result); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewArrayStubCall.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewArrayStubCall.java Wed Apr 23 20:49:59 2014 +0200 @@ -25,18 +25,17 @@ import com.oracle.graal.api.code.*; import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.compiler.gen.*; -import com.oracle.graal.compiler.target.*; import com.oracle.graal.hotspot.meta.*; import com.oracle.graal.hotspot.stubs.*; import com.oracle.graal.lir.*; import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.spi.*; import com.oracle.graal.word.*; /** * A call to the {@link NewArrayStub}. */ -public class NewArrayStubCall extends DeoptimizingStubCall implements LIRGenLowerable { +public class NewArrayStubCall extends DeoptimizingStubCall implements LIRLowerable { private static final Stamp defaultStamp = StampFactory.objectNonNull(); @@ -61,9 +60,9 @@ } @Override - public void generate(NodeLIRBuilder gen) { + public void generate(NodeLIRBuilderTool gen) { ForeignCallLinkage linkage = gen.getLIRGeneratorTool().getForeignCalls().lookupForeignCall(NEW_ARRAY); - Variable result = gen.getLIRGenerator().emitForeignCall(linkage, gen.state(this), gen.operand(hub), gen.operand(length)); + Variable result = gen.getLIRGeneratorTool().emitForeignCall(linkage, gen.state(this), gen.operand(hub), gen.operand(length)); gen.setResult(this, result); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/PrefetchAllocateNode.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/PrefetchAllocateNode.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,13 +24,12 @@ package com.oracle.graal.hotspot.nodes; import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.compiler.gen.*; -import com.oracle.graal.compiler.target.*; import com.oracle.graal.hotspot.*; import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.spi.*; import com.oracle.graal.word.*; -public class PrefetchAllocateNode extends FixedWithNextNode implements LIRGenLowerable { +public class PrefetchAllocateNode extends FixedWithNextNode implements LIRLowerable { @Input private ValueNode distance; @Input private ValueNode address; @@ -42,7 +41,7 @@ } @Override - public void generate(NodeLIRBuilder gen) { + public void generate(NodeLIRBuilderTool gen) { ((HotSpotNodeLIRBuilder) gen).emitPrefetchAllocate(address, distance); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/TailcallNode.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/TailcallNode.java Wed Apr 23 20:49:59 2014 +0200 @@ -29,7 +29,6 @@ import com.oracle.graal.api.code.*; import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.compiler.target.*; import com.oracle.graal.graph.*; import com.oracle.graal.hotspot.*; import com.oracle.graal.java.*; @@ -41,7 +40,7 @@ * Performs a tail call to the specified target compiled method, with the parameter taken from the * supplied FrameState. */ -public class TailcallNode extends FixedWithNextNode implements LIRGenResLowerable { +public class TailcallNode extends FixedWithNextNode implements LIRLowerable { @Input(InputType.State) private FrameState frameState; @Input private ValueNode target; @@ -58,20 +57,21 @@ this.frameState = frameState; } - public void generate(NodeLIRBuilderTool gen, LIRGenerationResult res) { + public void generate(NodeLIRBuilderTool gen) { HotSpotVMConfig config = runtime().getConfig(); + LIRGeneratorTool lirGen = gen.getLIRGeneratorTool(); ResolvedJavaMethod method = frameState.method(); boolean isStatic = method.isStatic(); JavaType[] signature = MetaUtil.signatureToTypes(method.getSignature(), isStatic ? null : method.getDeclaringClass()); - CallingConvention cc = res.getFrameMap().registerConfig.getCallingConvention(CallingConvention.Type.JavaCall, null, signature, gen.getLIRGeneratorTool().target(), false); + CallingConvention cc = lirGen.getResult().getFrameMap().registerConfig.getCallingConvention(CallingConvention.Type.JavaCall, null, signature, lirGen.target(), false); List<ValueNode> parameters = new ArrayList<>(); for (int i = 0, slot = 0; i < cc.getArgumentCount(); i++, slot += HIRFrameStateBuilder.stackSlots(frameState.localAt(slot).getKind())) { parameters.add(frameState.localAt(slot)); } Value[] args = gen.visitInvokeArguments(cc, parameters); - Value address = gen.getLIRGeneratorTool().emitAddress(gen.operand(target), config.nmethodEntryOffset, Value.ILLEGAL, 0); - Value entry = gen.getLIRGeneratorTool().emitLoad(Kind.Long, address, null); + Value address = lirGen.emitAddress(gen.operand(target), config.nmethodEntryOffset, Value.ILLEGAL, 0); + Value entry = lirGen.emitLoad(Kind.Long, address, null); HotSpotLIRGenerator hsgen = (HotSpotLIRGenerator) gen; hsgen.emitTailcall(args, entry); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NPE_07.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NPE_07.java Wed Apr 23 20:49:59 2014 +0200 @@ -23,8 +23,9 @@ package com.oracle.graal.jtt.except; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -61,12 +62,12 @@ } } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_Two02.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_Two02.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.except; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -49,17 +50,17 @@ } } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 3); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_Two03.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_Two03.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.except; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -56,17 +57,17 @@ } } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_InNested.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_InNested.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ */ package com.oracle.graal.jtt.except; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; public class Throw_InNested extends JTTTest { @@ -48,12 +49,12 @@ return i; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_Synchronized01.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_Synchronized01.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ */ package com.oracle.graal.jtt.except; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; public class Throw_Synchronized01 extends JTTTest { @@ -38,12 +39,12 @@ throw new Exception(); } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_Synchronized02.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_Synchronized02.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ */ package com.oracle.graal.jtt.except; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; public class Throw_Synchronized02 extends JTTTest { @@ -36,12 +37,12 @@ throw new Exception(); } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_Synchronized03.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_Synchronized03.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ */ package com.oracle.graal.jtt.except; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; public class Throw_Synchronized03 extends JTTTest { @@ -41,12 +42,12 @@ throw new Exception(); } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_allocate01.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_allocate01.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.hotpath; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -37,27 +38,27 @@ return sum; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", 3); } - @LongTest + @Test public void run4() throws Throwable { runTest("test", 80); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_field04.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_field04.java Wed Apr 23 20:49:59 2014 +0200 @@ -23,8 +23,9 @@ // Checkstyle: stop package com.oracle.graal.jtt.hotpath; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -55,12 +56,12 @@ return (int) (b + c + s + i + l + f + d); } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 40); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1000); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_invoke01.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_invoke01.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ package com.oracle.graal.jtt.hotpath; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -104,12 +105,12 @@ } } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 40); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 80); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_life.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_life.java Wed Apr 23 20:49:59 2014 +0200 @@ -25,8 +25,9 @@ import java.util.*; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -106,7 +107,7 @@ } } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 5); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_nest02.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_nest02.java Wed Apr 23 20:49:59 2014 +0200 @@ -23,8 +23,9 @@ // Checkstyle: stop package com.oracle.graal.jtt.hotpath; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -48,7 +49,7 @@ return sum; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 15); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotspot/Test6196102.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotspot/Test6196102.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.hotspot; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /** * @bug 6196102 @@ -46,7 +47,7 @@ return "ok"; } - @LongTest + @Test public void run0() throws Throwable { runTest("test"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotspot/Test6850611.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotspot/Test6850611.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.hotspot; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; //@formatter:off @@ -50,7 +51,7 @@ return 95; } - @LongTest + @Test public void run0() throws Throwable { runTest("test"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/EnumMap02.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/EnumMap02.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ import java.util.*; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -45,17 +46,17 @@ C } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/System_setOut.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/System_setOut.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ import java.io.*; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -58,7 +59,7 @@ out.println(test(10000)); } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 10000); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/UnsafeAccess01.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/UnsafeAccess01.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,10 +24,11 @@ import java.lang.reflect.*; +import org.junit.*; + import sun.misc.*; import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -55,7 +56,7 @@ } } - @LongTest + @Test public void run0() throws Throwable { runTest("test"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/ClassLoader_loadClass01.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/ClassLoader_loadClass01.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ import java.net.*; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -43,22 +44,22 @@ return null; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", 5); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_Literal01.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_Literal01.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ */ package com.oracle.graal.jtt.lang; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; public final class Class_Literal01 extends JTTTest { @@ -45,27 +46,27 @@ return null; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", 3); } - @LongTest + @Test public void run4() throws Throwable { runTest("test", 4); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_asSubclass01.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_asSubclass01.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ */ package com.oracle.graal.jtt.lang; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; public final class Class_asSubclass01 extends JTTTest { @@ -53,27 +54,27 @@ return i; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", 3); } - @LongTest + @Test public void run4() throws Throwable { runTest("test", 4); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_cast01.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_cast01.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ */ package com.oracle.graal.jtt.lang; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; public final class Class_cast01 extends JTTTest { @@ -57,27 +58,27 @@ return i; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 3); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", 2); } - @LongTest + @Test public void run4() throws Throwable { runTest("test", 4); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName01.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName01.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ */ package com.oracle.graal.jtt.lang; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; public final class Class_forName01 extends JTTTest { @@ -45,27 +46,27 @@ return null; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", 3); } - @LongTest + @Test public void run4() throws Throwable { runTest("test", 4); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName02.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName02.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ */ package com.oracle.graal.jtt.lang; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; public final class Class_forName02 extends JTTTest { @@ -51,27 +52,27 @@ return null; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", 3); } - @LongTest + @Test public void run4() throws Throwable { runTest("test", 4); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName03.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName03.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ import java.net.*; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -56,32 +57,32 @@ return null; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", 3); } - @LongTest + @Test public void run4() throws Throwable { runTest("test", 4); } - @LongTest + @Test public void run5() throws Throwable { runTest("test", 5); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName04.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName04.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.lang; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -48,32 +49,32 @@ return null; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", 3); } - @LongTest + @Test public void run4() throws Throwable { runTest("test", 4); } - @LongTest + @Test public void run5() throws Throwable { runTest("test", 5); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName05.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName05.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ import java.net.*; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -41,17 +42,17 @@ return null; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 5); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getInterfaces01.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getInterfaces01.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.lang; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -81,27 +82,27 @@ } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", 3); } - @LongTest + @Test public void run4() throws Throwable { runTest("test", 4); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_getClass01.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_getClass01.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ */ package com.oracle.graal.jtt.lang; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; public final class Object_getClass01 extends JTTTest { @@ -49,27 +50,27 @@ return null; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", 3); } - @LongTest + @Test public void run4() throws Throwable { runTest("test", 4); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_toString01.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_toString01.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ */ package com.oracle.graal.jtt.lang; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; public class Object_toString01 extends JTTTest { @@ -47,17 +48,17 @@ return string; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/String_intern02.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/String_intern02.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.lang; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -33,17 +34,17 @@ return ("id" + i).intern() == ("id" + i).intern(); } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/String_intern03.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/String_intern03.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.lang; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -33,17 +34,17 @@ return ("id" + i).intern().equals("id" + i); } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopParseLong.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopParseLong.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.loop; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; public class LoopParseLong extends JTTTest { @@ -98,7 +99,7 @@ return negative ? result : -result; } - @LongTest + @Test public void run0() throws Throwable { runTest("testShortened", "7", 10); runTest("testShortened", "-100", 10);
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopSwitch01.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopSwitch01.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.loop; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -58,7 +59,7 @@ return "" + ('a' + count); } - @LongTest + @Test public void run0() throws Throwable { runTest("test"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigObjectParams02.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigObjectParams02.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.micro; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -33,7 +34,7 @@ return p0 + p1 + p2 + p3 + p4 + p5 + p6 + p7 + p8 + p9; } - @LongTest + @Test 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 Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/Matrix01.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.micro; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -155,32 +156,32 @@ ((Matrix[]) array)[val % array.length] = new Matrix(number); } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", 3); } - @LongTest + @Test public void run4() throws Throwable { runTest("test", 4); } - @LongTest + @Test public void run5() throws Throwable { runTest("test", 5); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/ReferenceMap01.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/ReferenceMap01.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.micro; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -57,7 +58,7 @@ return Integer.valueOf(foo(new String[]{"asdf"})); } - @LongTest + @Test public void run0() throws Throwable { runTest("test"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/StrangeFrames.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/StrangeFrames.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.micro; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -58,7 +59,7 @@ Object c = b; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Conditional01.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Conditional01.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ import java.util.*; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -117,22 +118,22 @@ return c2 ? 1 : 0; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 10); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 20); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", 40); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NCE_FlowSensitive05.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NCE_FlowSensitive05.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ import java.io.*; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -44,7 +45,7 @@ return (String) arg; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", (Object) null); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_InstanceOf02.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_InstanceOf02.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.optimize; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* * Tests value numbering of instanceof operations. @@ -76,17 +77,17 @@ return false; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_getField01.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_getField01.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.reflect; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -37,22 +38,22 @@ return Class_getField01.class.getField(input).getName(); } - @LongTest + @Test public void run0() throws Throwable { runTest("test", "test"); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", "field"); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", "field2"); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", "field3"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_getField02.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_getField02.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.reflect; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -42,27 +43,27 @@ public String field4; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", "test"); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", "field"); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", "field2"); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", "field3"); } - @LongTest + @Test public void run4() throws Throwable { runTest("test", "field4"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_getMethod01.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_getMethod01.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.reflect; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -39,17 +40,17 @@ field = args[0]; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", "test"); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", "main"); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", "xx"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_getMethod02.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_getMethod02.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.reflect; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -52,37 +53,37 @@ field = args[0]; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", 3); } - @LongTest + @Test public void run4() throws Throwable { runTest("test", 4); } - @LongTest + @Test public void run5() throws Throwable { runTest("test", 5); } - @LongTest + @Test public void run6() throws Throwable { runTest("test", 6); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_newInstance03.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_newInstance03.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ */ package com.oracle.graal.jtt.reflect; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; public class Class_newInstance03 extends JTTTest { @@ -45,27 +46,27 @@ return false; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", 3); } - @LongTest + @Test public void run4() throws Throwable { runTest("test", 4); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_get01.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_get01.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.reflect; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -59,47 +60,47 @@ return false; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", 3); } - @LongTest + @Test public void run4() throws Throwable { runTest("test", 4); } - @LongTest + @Test public void run5() throws Throwable { runTest("test", 5); } - @LongTest + @Test public void run6() throws Throwable { runTest("test", 6); } - @LongTest + @Test public void run7() throws Throwable { runTest("test", 7); } - @LongTest + @Test public void run8() throws Throwable { runTest("test", 8); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_get02.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_get02.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.reflect; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -61,47 +62,47 @@ return false; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", 3); } - @LongTest + @Test public void run4() throws Throwable { runTest("test", 4); } - @LongTest + @Test public void run5() throws Throwable { runTest("test", 5); } - @LongTest + @Test public void run6() throws Throwable { runTest("test", 6); } - @LongTest + @Test public void run7() throws Throwable { runTest("test", 7); } - @LongTest + @Test public void run8() throws Throwable { runTest("test", 8); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_get03.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_get03.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ import java.lang.reflect.*; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -87,47 +88,47 @@ return false; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", 3); } - @LongTest + @Test public void run4() throws Throwable { runTest("test", 4); } - @LongTest + @Test public void run5() throws Throwable { runTest("test", 5); } - @LongTest + @Test public void run6() throws Throwable { runTest("test", 6); } - @LongTest + @Test public void run7() throws Throwable { runTest("test", 7); } - @LongTest + @Test public void run8() throws Throwable { runTest("test", 8); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_get04.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_get04.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.reflect; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -61,47 +62,47 @@ return false; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", 3); } - @LongTest + @Test public void run4() throws Throwable { runTest("test", 4); } - @LongTest + @Test public void run5() throws Throwable { runTest("test", 5); } - @LongTest + @Test public void run6() throws Throwable { runTest("test", 6); } - @LongTest + @Test public void run7() throws Throwable { runTest("test", 7); } - @LongTest + @Test public void run8() throws Throwable { runTest("test", 8); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_getType01.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_getType01.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.reflect; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -59,47 +60,47 @@ return false; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", 3); } - @LongTest + @Test public void run4() throws Throwable { runTest("test", 4); } - @LongTest + @Test public void run5() throws Throwable { runTest("test", 5); } - @LongTest + @Test public void run6() throws Throwable { runTest("test", 6); } - @LongTest + @Test public void run7() throws Throwable { runTest("test", 7); } - @LongTest + @Test public void run8() throws Throwable { runTest("test", 8); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_set01.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_set01.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.reflect; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -67,47 +68,47 @@ return false; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", 3); } - @LongTest + @Test public void run4() throws Throwable { runTest("test", 4); } - @LongTest + @Test public void run5() throws Throwable { runTest("test", 5); } - @LongTest + @Test public void run6() throws Throwable { runTest("test", 6); } - @LongTest + @Test public void run7() throws Throwable { runTest("test", 7); } - @LongTest + @Test public void run8() throws Throwable { runTest("test", 8); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_set02.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_set02.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.reflect; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -69,47 +70,47 @@ return false; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", 3); } - @LongTest + @Test public void run4() throws Throwable { runTest("test", 4); } - @LongTest + @Test public void run5() throws Throwable { runTest("test", 5); } - @LongTest + @Test public void run6() throws Throwable { runTest("test", 6); } - @LongTest + @Test public void run7() throws Throwable { runTest("test", 7); } - @LongTest + @Test public void run8() throws Throwable { runTest("test", 8); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_set03.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_set03.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.reflect; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -69,47 +70,47 @@ return false; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", 3); } - @LongTest + @Test public void run4() throws Throwable { runTest("test", 4); } - @LongTest + @Test public void run5() throws Throwable { runTest("test", 5); } - @LongTest + @Test public void run6() throws Throwable { runTest("test", 6); } - @LongTest + @Test public void run7() throws Throwable { runTest("test", 7); } - @LongTest + @Test public void run8() throws Throwable { runTest("test", 8); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Invoke_except01.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Invoke_except01.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ import java.lang.reflect.*; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -56,27 +57,27 @@ return arg.length; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", 3); } - @LongTest + @Test public void run4() throws Throwable { runTest("test", 4); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Invoke_main01.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Invoke_main01.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ import java.lang.reflect.*; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -44,12 +45,12 @@ field = args[0]; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", "test1"); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", "test2"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Invoke_main03.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Invoke_main03.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ import java.lang.reflect.*; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -48,12 +49,12 @@ field = args[0]; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", "test1"); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", "test2"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Method_getParameterTypes01.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Method_getParameterTypes01.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.reflect; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -51,22 +52,22 @@ public void method3(int arg1, Object arg2) { } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", 3); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Method_getReturnType01.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Method_getReturnType01.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.reflect; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -51,22 +52,22 @@ public void method3() { } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", 3); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Monitor_contended01.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Monitor_contended01.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ */ package com.oracle.graal.jtt.threads; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; public final class Monitor_contended01 extends JTTTest implements Runnable { @@ -71,7 +72,7 @@ } } - @LongTest(timeout = 20000) + @Test(timeout = 20000) public void run0() throws Throwable { runTest("test"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Monitor_notowner01.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Monitor_notowner01.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ */ package com.oracle.graal.jtt.threads; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; public class Monitor_notowner01 extends JTTTest { @@ -62,7 +63,7 @@ } } - @LongTest(timeout = 20000) + @Test(timeout = 20000) public void run0() throws Throwable { runTest("test"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait01.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait01.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ */ package com.oracle.graal.jtt.threads; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; public class Object_wait01 extends JTTTest implements Runnable { @@ -57,22 +58,22 @@ } } - @LongTest(timeout = 20000) + @Test(timeout = 20000) public void run0() throws Throwable { runTest("test", 0); } - @LongTest(timeout = 20000) + @Test(timeout = 20000) public void run1() throws Throwable { runTest("test", 1); } - @LongTest(timeout = 20000) + @Test(timeout = 20000) public void run2() throws Throwable { runTest("test", 3); } - @LongTest(timeout = 20000) + @Test(timeout = 20000) public void run3() throws Throwable { runTest("test", 15); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait02.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait02.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ */ package com.oracle.graal.jtt.threads; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; public class Object_wait02 extends JTTTest implements Runnable { @@ -57,17 +58,17 @@ } } - @LongTest(timeout = 20000) + @Test(timeout = 20000) public void run0() throws Throwable { runTest("test", 0); } - @LongTest(timeout = 20000) + @Test(timeout = 20000) public void run1() throws Throwable { runTest("test", 1); } - @LongTest(timeout = 20000) + @Test(timeout = 20000) public void run2() throws Throwable { runTest("test", 2); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait03.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait03.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ */ package com.oracle.graal.jtt.threads; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; public class Object_wait03 extends JTTTest implements Runnable { @@ -63,17 +64,17 @@ } } - @LongTest(timeout = 20000) + @Test(timeout = 20000) public void run0() throws Throwable { runTest("test", 0); } - @LongTest(timeout = 20000) + @Test(timeout = 20000) public void run1() throws Throwable { runTest("test", 1); } - @LongTest(timeout = 20000) + @Test(timeout = 20000) public void run2() throws Throwable { runTest("test", 2); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait04.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait04.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ */ package com.oracle.graal.jtt.threads; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; public class Object_wait04 extends JTTTest implements Runnable { @@ -67,32 +68,32 @@ } } - @LongTest(timeout = 20000) + @Test(timeout = 20000) public void run0() throws Throwable { runTest("test", 0); } - @LongTest(timeout = 20000) + @Test(timeout = 20000) public void run1() throws Throwable { runTest("test", 1); } - @LongTest(timeout = 20000) + @Test(timeout = 20000) public void run2() throws Throwable { runTest("test", 2); } - @LongTest(timeout = 20000) + @Test(timeout = 20000) public void run3() throws Throwable { runTest("test", 3); } - @LongTest(timeout = 20000) + @Test(timeout = 20000) public void run4() throws Throwable { runTest("test", 4); } - @LongTest(timeout = 20000) + @Test(timeout = 20000) public void run5() throws Throwable { runTest("test", 5); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/ThreadLocal03.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/ThreadLocal03.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.threads; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -59,22 +60,22 @@ } } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", 3); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_getState02.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_getState02.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ */ package com.oracle.graal.jtt.threads; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; public final class Thread_getState02 extends JTTTest { @@ -33,7 +34,7 @@ return new Thread().getState() == Thread.State.NEW; } - @LongTest + @Test public void run0() throws Throwable { runTest("test"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_isInterrupted02.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_isInterrupted02.java Wed Apr 23 20:49:59 2014 +0200 @@ -26,8 +26,9 @@ package com.oracle.graal.jtt.threads; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; //Test all, mainly monitors public class Thread_isInterrupted02 extends JTTTest { @@ -85,12 +86,12 @@ } } - @LongTest(timeout = 20000) + @Test(timeout = 20000) public void run0() throws Throwable { runTest("test", 0, 0); } - @LongTest(timeout = 20000) + @Test(timeout = 20000) public void run1() throws Throwable { runTest("test", 1, 500); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_isInterrupted03.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_isInterrupted03.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.threads; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -68,7 +69,7 @@ } } - @LongTest(timeout = 20000) + @Test(timeout = 20000) public void run0() throws Throwable { runTest("test"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_isInterrupted04.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_isInterrupted04.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.threads; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -66,7 +67,7 @@ } - @LongTest(timeout = 20000) + @Test(timeout = 20000) public void run0() throws Throwable { runTest("test"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_isInterrupted05.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_isInterrupted05.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.jtt.threads; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; /* */ @@ -66,7 +67,7 @@ } } - @LongTest(timeout = 20000) + @Test(timeout = 20000) public void run0() throws Throwable { runTest("test"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_join01.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_join01.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ */ package com.oracle.graal.jtt.threads; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; public class Thread_join01 extends JTTTest implements Runnable { @@ -43,7 +44,7 @@ cont = false; } - @LongTest(timeout = 20000) + @Test(timeout = 20000) public void run0() throws Throwable { runTest("test"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_join02.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_join02.java Wed Apr 23 20:49:59 2014 +0200 @@ -27,8 +27,9 @@ */ package com.oracle.graal.jtt.threads; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; public class Thread_join02 extends JTTTest implements Runnable { @@ -50,7 +51,7 @@ cont = false; } - @LongTest(timeout = 20000) + @Test(timeout = 20000) public void run0() throws Throwable { runTest("test"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_join03.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_join03.java Wed Apr 23 20:49:59 2014 +0200 @@ -27,8 +27,9 @@ */ package com.oracle.graal.jtt.threads; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; public class Thread_join03 extends JTTTest implements Runnable { @@ -47,7 +48,7 @@ cont = false; } - @LongTest(timeout = 20000) + @Test(timeout = 20000) public void run0() throws Throwable { runTest("test"); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_new01.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_new01.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ */ package com.oracle.graal.jtt.threads; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; public final class Thread_new01 extends JTTTest { @@ -45,27 +46,27 @@ return false; } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", 3); } - @LongTest + @Test public void run4() throws Throwable { runTest("test", 4); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_new02.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_new02.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ */ package com.oracle.graal.jtt.threads; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; public class Thread_new02 extends JTTTest implements Runnable { @@ -51,27 +52,27 @@ // do nothing. } - @LongTest + @Test public void run0() throws Throwable { runTest("test", 0); } - @LongTest + @Test public void run1() throws Throwable { runTest("test", 1); } - @LongTest + @Test public void run2() throws Throwable { runTest("test", 2); } - @LongTest + @Test public void run3() throws Throwable { runTest("test", 3); } - @LongTest + @Test public void run4() throws Throwable { runTest("test", 4); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_sleep01.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_sleep01.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,9 @@ */ package com.oracle.graal.jtt.threads; +import org.junit.*; + import com.oracle.graal.jtt.*; -import com.oracle.graal.test.*; public final class Thread_sleep01 extends JTTTest { @@ -35,17 +36,17 @@ return System.currentTimeMillis() - before >= i; } - @LongTest(timeout = 20000) + @Test(timeout = 20000) public void run0() throws Throwable { runTest("test", 10); } - @LongTest(timeout = 20000) + @Test(timeout = 20000) public void run1() throws Throwable { runTest("test", 20); } - @LongTest(timeout = 20000) + @Test(timeout = 20000) public void run2() throws Throwable { runTest("test", 100); }
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerator.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerator.java Wed Apr 23 20:49:59 2014 +0200 @@ -48,7 +48,7 @@ /** * This class traverses the HIR instructions and generates LIR instructions from them. */ -public abstract class LIRGenerator implements ArithmeticLIRGenerator, LIRGeneratorTool, PlatformKindTool { +public abstract class LIRGenerator implements LIRGeneratorTool, PlatformKindTool { public static class Options { // @formatter:off @@ -62,9 +62,7 @@ private final CodeGenProviders providers; private final CallingConvention cc; - protected AbstractBlock<?> currentBlock; - public final int traceLevel; - public final boolean printIRWithLIR; + private AbstractBlock<?> currentBlock; /** * Handle for an operation that loads a constant into a variable. The operation starts in the @@ -173,8 +171,6 @@ this.res = res; this.providers = providers; this.cc = cc; - this.traceLevel = Options.TraceLIRGeneratorLevel.getValue(); - this.printIRWithLIR = Options.PrintIRWithLIR.getValue(); } /** @@ -272,7 +268,7 @@ } public void append(LIRInstruction op) { - if (printIRWithLIR && !TTY.isSuppressed()) { + if (Options.PrintIRWithLIR.getValue() && !TTY.isSuppressed()) { TTY.println(op.toStringWithIdPrefix()); TTY.println(); } @@ -289,7 +285,7 @@ } public final void doBlockStart(AbstractBlock<?> block) { - if (printIRWithLIR) { + if (Options.PrintIRWithLIR.getValue()) { TTY.print(block.toString()); } @@ -301,20 +297,20 @@ append(new LabelOp(new Label(block.getId()), block.isAligned())); - if (traceLevel >= 1) { + if (Options.TraceLIRGeneratorLevel.getValue() >= 1) { TTY.println("BEGIN Generating LIR for block B" + block.getId()); } } public final void doBlockEnd(AbstractBlock<?> block) { - if (traceLevel >= 1) { + if (Options.TraceLIRGeneratorLevel.getValue() >= 1) { TTY.println("END Generating LIR for block B" + block.getId()); } currentBlock = null; - if (printIRWithLIR) { + if (Options.PrintIRWithLIR.getValue()) { TTY.println(); } }
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGeneratorTool.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGeneratorTool.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,13 +22,21 @@ */ package com.oracle.graal.lir.gen; +import java.util.*; + import com.oracle.graal.api.code.*; import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.common.*; +import com.oracle.graal.compiler.common.calc.*; +import com.oracle.graal.compiler.common.cfg.*; +import com.oracle.graal.compiler.common.spi.*; import com.oracle.graal.lir.*; +import com.oracle.graal.lir.gen.LIRGenerator.*; public interface LIRGeneratorTool extends ArithmeticLIRGenerator { + CodeGenProviders getProviders(); + TargetDescription target(); MetaAccessProvider getMetaAccess(); @@ -37,6 +45,20 @@ ForeignCallsProvider getForeignCalls(); + AbstractBlock<?> getCurrentBlock(); + + LIRGenerationResult getResult(); + + boolean hasBlockEnd(AbstractBlock<?> block); + + void doBlockStart(AbstractBlock<?> block); + + void doBlockEnd(AbstractBlock<?> block); + + Map<Constant, LoadConstant> getConstantLoads(); + + void setConstantLoads(Map<Constant, LoadConstant> constantLoads); + Value emitLoad(PlatformKind kind, Value address, LIRFrameState state); void emitStore(PlatformKind kind, Value address, Value input, LIRFrameState state); @@ -65,7 +87,7 @@ void emitDeoptimize(Value actionAndReason, Value failedSpeculation, LIRFrameState state); - Value emitForeignCall(ForeignCallLinkage linkage, LIRFrameState state, Value... args); + Variable emitForeignCall(ForeignCallLinkage linkage, LIRFrameState state, Value... args); /** * Checks whether the supplied constant can be used without loading it into a register for most @@ -81,9 +103,9 @@ RegisterAttributes attributes(Register register); - AllocatableValue newVariable(PlatformKind kind); + Variable newVariable(PlatformKind kind); - AllocatableValue emitMove(Value input); + Variable emitMove(Value input); void emitMove(AllocatableValue dst, Value src); @@ -116,4 +138,62 @@ * correct location. */ void emitReturn(Value input); + + AllocatableValue asAllocatable(Value value); + + Variable load(Value value); + + Value loadNonConst(Value value); + + /** + * Returns true if the redundant move elimination optimization should be done after register + * allocation. + */ + boolean canEliminateRedundantMoves(); + + /** + * Determines if only oop maps are required for the code generated from the LIR. + */ + boolean needOnlyOopMaps(); + + /** + * Gets the ABI specific operand used to return a value of a given kind from a method. + * + * @param kind the kind of value being returned + * @return the operand representing the ABI defined location used return a value of kind + * {@code kind} + */ + AllocatableValue resultOperandFor(Kind kind); + + void append(LIRInstruction op); + + void emitJump(LabelRef label); + + void emitCompareBranch(PlatformKind cmpKind, Value left, Value right, Condition cond, boolean unorderedIsTrue, LabelRef trueDestination, LabelRef falseDestination, + double trueDestinationProbability); + + void emitOverflowCheckBranch(LabelRef overflow, LabelRef noOverflow, double overflowProbability); + + void emitIntegerTestBranch(Value left, Value right, LabelRef trueDestination, LabelRef falseDestination, double trueSuccessorProbability); + + Variable emitConditionalMove(PlatformKind cmpKind, Value leftVal, Value right, Condition cond, boolean unorderedIsTrue, Value trueValue, Value falseValue); + + Variable emitIntegerTestMove(Value leftVal, Value right, Value trueValue, Value falseValue); + + void emitStrategySwitch(Constant[] keyConstants, double[] keyProbabilities, LabelRef[] keyTargets, LabelRef defaultTarget, Variable value); + + void emitStrategySwitch(SwitchStrategy strategy, Variable key, LabelRef[] keyTargets, LabelRef defaultTarget); + + CallingConvention getCallingConvention(); + + void emitBitCount(Variable result, Value operand); + + void emitBitScanForward(Variable result, Value operand); + + void emitBitScanReverse(Variable result, Value operand); + + void emitByteSwap(Variable result, Value operand); + + void emitArrayEquals(Kind kind, Variable result, Value array1, Value array2, Value length); + }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedWithNextNode.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedWithNextNode.java Wed Apr 23 20:49:59 2014 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2014, 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 @@ -44,4 +44,9 @@ public FixedWithNextNode(Stamp stamp) { super(stamp); } + + @Override + public FixedWithNextNode asNode() { + return this; + } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FrameState.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FrameState.java Wed Apr 23 20:49:59 2014 +0200 @@ -220,6 +220,19 @@ * correctly in slot encoding: a long or double will be followed by a null slot. */ public FrameState duplicateModified(int newBci, boolean newRethrowException, Kind popKind, ValueNode... pushedValues) { + return duplicateModified(newBci, method, newRethrowException, popKind, pushedValues); + } + + /** + * Creates a copy of this frame state with one stack element of type popKind popped from the + * stack and the values in pushedValues pushed on the stack. The pushedValues will be formatted + * correctly in slot encoding: a long or double will be followed by a null slot. + */ + public FrameState duplicateModified(Kind popKind, ValueNode... pushedValues) { + return duplicateModified(bci, method, rethrowException, popKind, pushedValues); + } + + private FrameState duplicateModified(int newBci, ResolvedJavaMethod newMethod, boolean newRethrowException, Kind popKind, ValueNode... pushedValues) { ArrayList<ValueNode> copy = new ArrayList<>(values.subList(0, localsSize + stackSize)); if (popKind != Kind.Void) { if (stackAt(stackSize() - 1) == null) { @@ -238,7 +251,7 @@ int newStackSize = copy.size() - localsSize; copy.addAll(values.subList(localsSize + stackSize, values.size())); - FrameState other = graph().add(new FrameState(method, newBci, copy, localsSize, newStackSize, newRethrowException, false, monitorIds, virtualObjectMappings)); + FrameState other = graph().add(new FrameState(newMethod, newBci, copy, localsSize, newStackSize, newRethrowException, false, monitorIds, virtualObjectMappings)); other.setOuterFrameState(outerFrameState()); return other; }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatingNode.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatingNode.java Wed Apr 23 20:49:59 2014 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 @@ -31,4 +31,9 @@ public FloatingNode(Stamp stamp) { super(stamp); } + + @Override + public FloatingNode asNode() { + return this; + } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AddLocationNode.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AddLocationNode.java Wed Apr 23 20:49:59 2014 +0200 @@ -38,8 +38,8 @@ @NodeInfo(nameTemplate = "AddLoc {p#locationIdentity/s}") public final class AddLocationNode extends LocationNode implements Canonicalizable { - @Input private ValueNode x; - @Input private ValueNode y; + @Input(InputType.Association) private ValueNode x; + @Input(InputType.Association) private ValueNode y; protected LocationNode getX() { return (LocationNode) x;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ValueAnchorNode.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ValueAnchorNode.java Wed Apr 23 20:49:59 2014 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 @@ -34,7 +34,7 @@ * The ValueAnchor instruction keeps non-CFG (floating) nodes above a certain point in the graph. */ @NodeInfo(allowedUsageTypes = {InputType.Anchor, InputType.Guard}) -public final class ValueAnchorNode extends FixedWithNextNode implements LIRLowerable, Simplifiable, Virtualizable, GuardingNode { +public final class ValueAnchorNode extends FixedWithNextNode implements LIRLowerable, Simplifiable, Virtualizable, AnchoringNode, GuardingNode { @Input(InputType.Guard) private ValueNode anchored;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/NodeLIRBuilderTool.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/NodeLIRBuilderTool.java Wed Apr 23 20:49:59 2014 +0200 @@ -26,10 +26,12 @@ import com.oracle.graal.api.code.*; import com.oracle.graal.api.meta.*; +import com.oracle.graal.compiler.common.cfg.*; import com.oracle.graal.lir.*; import com.oracle.graal.lir.gen.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.calc.*; +import com.oracle.graal.nodes.cfg.*; import com.oracle.graal.nodes.extended.*; public interface NodeLIRBuilderTool extends NodeMappableLIRBuilder { @@ -69,4 +71,14 @@ Value[] visitInvokeArguments(CallingConvention cc, Collection<ValueNode> arguments); MemoryArithmeticLIRLowerer getMemoryLowerer(); + + Variable newVariable(Kind kind); + + void emitArrayEquals(Kind kind, Variable result, Value array1, Value array2, Value length); + + void emitBitCount(Variable result, Value operand); + + void emitBitScanForward(Variable result, Value operand); + + void doBlock(Block block, StructuredGraph graph, BlockMap<List<ScheduledNode>> blockMap); }
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java Wed Apr 23 20:49:59 2014 +0200 @@ -1316,8 +1316,6 @@ assert inlineGraph.getGuardsStage().ordinal() >= graph.getGuardsStage().ordinal(); assert !invokeNode.graph().isAfterFloatingReadPhase() : "inline isn't handled correctly after floating reads phase"; - Kind returnKind = invokeNode.getKind(); - FrameState stateAfter = invoke.stateAfter(); assert stateAfter == null || stateAfter.isAlive(); if (receiverNullCheck && !((MethodCallTargetNode) invoke.callTarget()).isStatic()) { @@ -1401,38 +1399,8 @@ } if (stateAfter != null) { - FrameState outerFrameState = null; + processFrameStates(invoke, inlineGraph, duplicates, stateAtExceptionEdge); int callerLockDepth = stateAfter.nestedLockDepth(); - for (FrameState original : inlineGraph.getNodes(FrameState.class)) { - FrameState frameState = (FrameState) duplicates.get(original); - if (frameState != null && frameState.isAlive()) { - assert frameState.bci != BytecodeFrame.BEFORE_BCI : frameState; - if (frameState.bci == BytecodeFrame.AFTER_BCI) { - frameState.replaceAndDelete(returnKind == Kind.Void ? stateAfter : stateAfter.duplicateModified(stateAfter.bci, stateAfter.rethrowException(), returnKind, - frameState.stackAt(0))); - } else if (frameState.bci == BytecodeFrame.AFTER_EXCEPTION_BCI || (frameState.bci == BytecodeFrame.UNWIND_BCI && !frameState.method().isSynchronized())) { - if (stateAtExceptionEdge != null) { - frameState.replaceAndDelete(stateAtExceptionEdge); - } else { - handleMissingAfterExceptionFrameState(frameState); - } - } else if (frameState.bci == BytecodeFrame.UNWIND_BCI) { - handleMissingAfterExceptionFrameState(frameState); - } else { - // only handle the outermost frame states - if (frameState.outerFrameState() == null) { - assert frameState.bci == BytecodeFrame.INVALID_FRAMESTATE_BCI || frameState.method().equals(inlineGraph.method()); - assert frameState.bci != BytecodeFrame.AFTER_EXCEPTION_BCI && frameState.bci != BytecodeFrame.BEFORE_BCI && frameState.bci != BytecodeFrame.AFTER_EXCEPTION_BCI && - frameState.bci != BytecodeFrame.UNWIND_BCI : frameState.bci; - if (outerFrameState == null) { - outerFrameState = stateAfter.duplicateModified(invoke.bci(), stateAfter.rethrowException(), invokeNode.getKind()); - outerFrameState.setDuringCall(true); - } - frameState.setOuterFrameState(outerFrameState); - } - } - } - } if (callerLockDepth != 0) { for (MonitorIdNode original : inlineGraph.getNodes(MonitorIdNode.class)) { MonitorIdNode monitor = (MonitorIdNode) duplicates.get(original); @@ -1470,6 +1438,57 @@ return duplicates; } + protected static void processFrameStates(Invoke invoke, StructuredGraph inlineGraph, Map<Node, Node> duplicates, FrameState stateAtExceptionEdge) { + FrameState stateAfter = invoke.stateAfter(); + FrameState outerFrameState = null; + Kind invokeReturnKind = invoke.asNode().getKind(); + for (FrameState original : inlineGraph.getNodes(FrameState.class)) { + FrameState frameState = (FrameState) duplicates.get(original); + if (frameState != null && frameState.isAlive()) { + assert frameState.bci != BytecodeFrame.BEFORE_BCI : frameState; + if (frameState.bci == BytecodeFrame.AFTER_BCI) { + /* + * pop return kind from invoke's stateAfter and replace with this frameState's + * return value (top of stack) + */ + Node otherFrameState = stateAfter; + if (invokeReturnKind != Kind.Void && frameState.stackSize() > 0) { + otherFrameState = stateAfter.duplicateModified(invokeReturnKind, frameState.stackAt(0)); + } + frameState.replaceAndDelete(otherFrameState); + } else if (frameState.bci == BytecodeFrame.AFTER_EXCEPTION_BCI || (frameState.bci == BytecodeFrame.UNWIND_BCI && !frameState.method().isSynchronized())) { + if (stateAtExceptionEdge != null) { + /* + * pop exception object from invoke's stateAfter and replace with this + * frameState's exception object (top of stack) + */ + Node newFrameState = stateAtExceptionEdge; + if (frameState.stackSize() > 0 && stateAtExceptionEdge.stackAt(0) != frameState.stackAt(0)) { + newFrameState = stateAtExceptionEdge.duplicateModified(Kind.Object, frameState.stackAt(0)); + } + frameState.replaceAndDelete(newFrameState); + } else { + handleMissingAfterExceptionFrameState(frameState); + } + } else if (frameState.bci == BytecodeFrame.UNWIND_BCI) { + handleMissingAfterExceptionFrameState(frameState); + } else { + // only handle the outermost frame states + if (frameState.outerFrameState() == null) { + assert frameState.bci == BytecodeFrame.INVALID_FRAMESTATE_BCI || frameState.method().equals(inlineGraph.method()); + assert frameState.bci != BytecodeFrame.AFTER_EXCEPTION_BCI && frameState.bci != BytecodeFrame.BEFORE_BCI && frameState.bci != BytecodeFrame.AFTER_EXCEPTION_BCI && + frameState.bci != BytecodeFrame.UNWIND_BCI : frameState.bci; + if (outerFrameState == null) { + outerFrameState = stateAfter.duplicateModified(invoke.bci(), stateAfter.rethrowException(), invoke.asNode().getKind()); + outerFrameState.setDuringCall(true); + } + frameState.setOuterFrameState(outerFrameState); + } + } + } + } + } + protected static void handleMissingAfterExceptionFrameState(FrameState nonReplacableFrameState) { Graph graph = nonReplacableFrameState.graph(); NodeWorkList workList = graph.createNodeWorkList(); @@ -1494,7 +1513,10 @@ GraphUtil.killCFG(end); } } else { - DeoptimizeNode deoptimizeNode = graph.add(new DeoptimizeNode(DeoptimizationAction.InvalidateRecompile, DeoptimizationReason.NotCompiledExceptionHandler)); + FixedNode deoptimizeNode = graph.add(new DeoptimizeNode(DeoptimizationAction.InvalidateRecompile, DeoptimizationReason.NotCompiledExceptionHandler)); + if (fixedStateSplit instanceof BeginNode) { + deoptimizeNode = BeginNode.begin(deoptimizeNode); + } fixedStateSplit.replaceAtPredecessor(deoptimizeNode); GraphUtil.killCFG(fixedStateSplit); }
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/CheckCastTest.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/CheckCastTest.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,10 +22,11 @@ */ package com.oracle.graal.replacements.test; +import org.junit.*; + import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.java.*; -import com.oracle.graal.test.*; /** * Tests the implementation of checkcast, allowing profiling information to be manually specified. @@ -41,7 +42,7 @@ } } - @LongTest + @Test public void test1() { test("asNumber", profile(), 111); test("asNumber", profile(Integer.class), 111); @@ -51,7 +52,7 @@ test("asNumberExt", profile(Long.class, Short.class), 111); } - @LongTest + @Test public void test2() { test("asString", profile(), "111"); test("asString", profile(String.class), "111"); @@ -67,27 +68,27 @@ test("asStringExt", profile(String.class), "111"); } - @LongTest + @Test public void test3() { test("asNumber", profile(), "111"); } - @LongTest + @Test public void test4() { test("asString", profile(String.class), 111); } - @LongTest + @Test public void test5() { test("asNumberExt", profile(), "111"); } - @LongTest + @Test public void test6() { test("asStringExt", profile(String.class), 111); } - @LongTest + @Test public void test7() { Throwable throwable = new Exception(); test("asThrowable", profile(), throwable); @@ -95,12 +96,12 @@ test("asThrowable", profile(Exception.class, Error.class), throwable); } - @LongTest + @Test public void test8() { test("arrayStore", new Object[100], "111"); } - @LongTest + @Test public void test801() { test("arrayFill", new Object[100], "111"); } @@ -197,7 +198,7 @@ return (Cloneable) o; } - @LongTest + @Test public void test9() { Object o = new Depth13(); test("asDepth12", profile(), o); @@ -205,7 +206,7 @@ test("asDepth12", profile(Depth13.class, Depth14.class), o); } - @LongTest + @Test public void test10() { Object o = new Depth13[3][]; test("asDepth12Arr", o);
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/InstanceOfDynamicTest.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/InstanceOfDynamicTest.java Wed Apr 23 20:49:59 2014 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.replacements.test; +import org.junit.*; + import com.oracle.graal.compiler.test.*; import com.oracle.graal.nodes.java.*; -import com.oracle.graal.test.*; /** * Tests for {@link InstanceOfDynamicNode}. @@ -35,7 +36,7 @@ return value; } - @LongTest + @Test public void test100() { final Object nul = null; test("isStringDynamic", nul); @@ -43,7 +44,7 @@ test("isStringDynamic", Object.class); } - @LongTest + @Test public void test101() { final Object nul = null; test("isStringIntDynamic", nul); @@ -51,7 +52,7 @@ test("isStringIntDynamic", Object.class); } - @LongTest + @Test public void test103() { test("isInstanceDynamic", String.class, null); test("isInstanceDynamic", String.class, "object"); @@ -61,7 +62,7 @@ test("isInstanceDynamic", int.class, Object.class); } - @LongTest + @Test public void test104() { test("isInstanceIntDynamic", String.class, null); test("isInstanceIntDynamic", String.class, "object");
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/InstanceOfTest.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/InstanceOfTest.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,6 +24,8 @@ 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; @@ -34,7 +36,6 @@ import com.oracle.graal.replacements.test.CheckCastTest.Depth12; import com.oracle.graal.replacements.test.CheckCastTest.Depth13; import com.oracle.graal.replacements.test.CheckCastTest.Depth14; -import com.oracle.graal.test.*; /** * Tests the implementation of instanceof, allowing profiling information to be manually specified. @@ -54,7 +55,7 @@ } } - @LongTest + @Test public void test1() { test("isString", profile(), "object"); test("isString", profile(String.class), "object"); @@ -63,7 +64,7 @@ test("isString", profile(String.class), Object.class); } - @LongTest + @Test public void test2() { test("isStringInt", profile(), "object"); test("isStringInt", profile(String.class), "object"); @@ -72,7 +73,7 @@ test("isStringInt", profile(String.class), Object.class); } - @LongTest + @Test public void test201() { test("isStringIntComplex", profile(), "object"); test("isStringIntComplex", profile(String.class), "object"); @@ -81,7 +82,7 @@ test("isStringIntComplex", profile(String.class), Object.class); } - @LongTest + @Test public void test3() { Throwable throwable = new Exception(); test("isThrowable", profile(), throwable); @@ -93,7 +94,7 @@ test("isThrowable", profile(Exception.class, Error.class), Object.class); } - @LongTest + @Test public void test301() { onlyFirstIsException(new Exception(), new Error()); test("onlyFirstIsException", profile(), new Exception(), new Error()); @@ -102,7 +103,7 @@ test("onlyFirstIsException", profile(), new Error(), new Error()); } - @LongTest + @Test public void test4() { Throwable throwable = new Exception(); test("isThrowableInt", profile(), throwable); @@ -114,7 +115,7 @@ test("isThrowableInt", profile(Exception.class, Error.class), Object.class); } - @LongTest + @Test public void test5() { Map<?, ?> map = new HashMap<>(); test("isMap", profile(), map); @@ -127,7 +128,7 @@ test("isMap", profile(String.class, HashMap.class), Object.class); } - @LongTest + @Test public void test6() { Map<?, ?> map = new HashMap<>(); test("isMapInt", profile(), map); @@ -139,7 +140,7 @@ test("isMapInt", profile(TreeMap.class, HashMap.class), Object.class); } - @LongTest + @Test public void test7() { Object o = new Depth13(); test("isDepth12", profile(), o); @@ -153,7 +154,7 @@ test("isDepth12", profile(String.class, HashMap.class), o); } - @LongTest + @Test public void test8() { Object o = new Depth13(); test("isDepth12Int", profile(), o); @@ -259,7 +260,7 @@ } } - @LongTest + @Test public void test9() { MyCall callAt63 = new MyCall(63); MyMark markAt63 = new MyMark(63); @@ -276,7 +277,7 @@ return s1.offset - s2.offset; } - @LongTest + @Test public void test10() { Mark[] noMarks = {}; Call callAt63 = new Call(null, 63, 5, true, null); @@ -301,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}. */ - @LongTest + @Test public void testRemoveIntermediateMaterialization() { List<String> list = Arrays.asList("1", "2", "3", "4"); test("removeIntermediateMaterialization", profile(), list, "2", "yes", "no"); @@ -356,7 +357,7 @@ return o instanceof D[]; } - @LongTest + @Test public void testArray() { Object aArray = new A[10]; test("isArrayOfA", aArray);
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/NewArrayTest.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/NewArrayTest.java Wed Apr 23 20:49:59 2014 +0200 @@ -25,7 +25,6 @@ import org.junit.*; import com.oracle.graal.compiler.test.*; -import com.oracle.graal.test.*; /** * Tests the implementation of {@code [A]NEWARRAY}. @@ -58,7 +57,7 @@ } } - @LongTest + @Test 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.replacements.test/src/com/oracle/graal/replacements/test/NewInstanceTest.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/NewInstanceTest.java Wed Apr 23 20:49:59 2014 +0200 @@ -27,7 +27,6 @@ import org.junit.*; import com.oracle.graal.compiler.test.*; -import com.oracle.graal.test.*; /** * Tests the implementation of {@code NEW}. @@ -57,12 +56,12 @@ } } - @LongTest + @Test public void test1() { test("newObject"); } - @LongTest + @Test public void test2() { test("newObjectTwice"); } @@ -71,37 +70,37 @@ return new Object(); } - @LongTest + @Test public void test3() { test("newObjectLoop", 100); } - @LongTest + @Test public void test4() { test("newBigObject"); } - @LongTest + @Test public void test5() { test("newSomeObject"); } - @LongTest + @Test public void test6() { test("newEmptyString"); } - @LongTest + @Test public void test7() { test("newString", "value"); } - @LongTest + @Test public void test8() { test("newHashMap", 31); } - @LongTest + @Test public void test9() { test("newRegression", true); }
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/NewMultiArrayTest.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/NewMultiArrayTest.java Wed Apr 23 20:49:59 2014 +0200 @@ -25,12 +25,13 @@ 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.nodes.*; import com.oracle.graal.nodes.java.*; -import com.oracle.graal.test.*; /** * Tests the lowering of the MULTIANEWARRAY instruction. @@ -86,7 +87,7 @@ Class<?> bottomClass; int[] dimensions; - @LongTest + @Test 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; @@ -117,7 +118,7 @@ return new Object[10][9][8]; } - @LongTest + @Test public void test2() { test("newMultiArrayException"); }
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/WordTest.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/WordTest.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,6 +24,8 @@ import java.lang.reflect.*; +import org.junit.*; + import com.oracle.graal.api.code.*; import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.test.*; @@ -31,7 +33,6 @@ import com.oracle.graal.replacements.*; import com.oracle.graal.replacements.ReplacementsImpl.FrameStateProcessing; import com.oracle.graal.replacements.Snippet.SnippetInliningPolicy; -import com.oracle.graal.test.*; import com.oracle.graal.word.*; /** @@ -53,7 +54,7 @@ return installer.makeGraph(resolvedMethod, null, resolvedMethod, inliningPolicy.get(), FrameStateProcessing.CollapseFrameForSingleSideEffect); } - @LongTest + @Test 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}; @@ -65,7 +66,7 @@ } } - @LongTest + @Test public void testArithmetic() { 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}; @@ -102,7 +103,7 @@ } } - @LongTest + @Test public void testCompare() { 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) {
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ArrayEqualsNode.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ArrayEqualsNode.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,8 +24,6 @@ import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.compiler.gen.*; -import com.oracle.graal.compiler.target.*; import com.oracle.graal.graph.*; import com.oracle.graal.graph.spi.*; import com.oracle.graal.lir.*; @@ -36,7 +34,7 @@ /** * Compares two arrays with the same length. */ -public class ArrayEqualsNode extends FixedWithNextNode implements LIRGenLowerable, Canonicalizable, Virtualizable { +public class ArrayEqualsNode extends FixedWithNextNode implements LIRLowerable, Canonicalizable, Virtualizable { /** {@link Kind} of the arrays to compare. */ private final Kind kind; @@ -131,7 +129,7 @@ public static native boolean equals(double[] array1, double[] array2, int length); @Override - public void generate(NodeLIRBuilder gen) { + public void generate(NodeLIRBuilderTool gen) { Variable result = gen.newVariable(Kind.Int); gen.emitArrayEquals(kind, result, gen.operand(array1), gen.operand(array2), gen.operand(length)); gen.setResult(this, result);
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BitCountNode.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BitCountNode.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,15 +24,14 @@ import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.compiler.gen.*; -import com.oracle.graal.compiler.target.*; import com.oracle.graal.graph.*; import com.oracle.graal.graph.spi.*; import com.oracle.graal.lir.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.calc.*; +import com.oracle.graal.nodes.spi.*; -public class BitCountNode extends FloatingNode implements LIRGenLowerable, Canonicalizable { +public class BitCountNode extends FloatingNode implements LIRLowerable, Canonicalizable { @Input private ValueNode value; @@ -65,7 +64,7 @@ } @Override - public void generate(NodeLIRBuilder gen) { + public void generate(NodeLIRBuilderTool gen) { Variable result = gen.newVariable(Kind.Int); gen.emitBitCount(result, gen.operand(value)); gen.setResult(this, result);
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BitScanForwardNode.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BitScanForwardNode.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,15 +24,14 @@ import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.compiler.gen.*; -import com.oracle.graal.compiler.target.*; import com.oracle.graal.graph.*; import com.oracle.graal.graph.spi.*; import com.oracle.graal.lir.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.calc.*; +import com.oracle.graal.nodes.spi.*; -public class BitScanForwardNode extends FloatingNode implements LIRGenLowerable, Canonicalizable { +public class BitScanForwardNode extends FloatingNode implements LIRLowerable, Canonicalizable { @Input private ValueNode value; @@ -72,7 +71,7 @@ } @Override - public void generate(NodeLIRBuilder gen) { + public void generate(NodeLIRBuilderTool gen) { Variable result = gen.newVariable(Kind.Int); gen.emitBitScanForward(result, gen.operand(value)); gen.setResult(this, result);
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BitScanReverseNode.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BitScanReverseNode.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,15 +24,14 @@ import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.compiler.gen.*; -import com.oracle.graal.compiler.target.*; import com.oracle.graal.graph.*; import com.oracle.graal.graph.spi.*; import com.oracle.graal.lir.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.calc.*; +import com.oracle.graal.nodes.spi.*; -public class BitScanReverseNode extends FloatingNode implements LIRGenLowerable, Canonicalizable { +public class BitScanReverseNode extends FloatingNode implements LIRLowerable, Canonicalizable { @Input private ValueNode value; @@ -79,7 +78,7 @@ } @Override - public void generate(NodeLIRBuilder gen) { + public void generate(NodeLIRBuilderTool gen) { Variable result = gen.newVariable(Kind.Int); gen.getLIRGeneratorTool().emitBitScanReverse(result, gen.operand(value)); gen.setResult(this, result);
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ReverseBytesNode.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ReverseBytesNode.java Wed Apr 23 20:49:59 2014 +0200 @@ -24,15 +24,14 @@ import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.compiler.gen.*; -import com.oracle.graal.compiler.target.*; import com.oracle.graal.graph.*; import com.oracle.graal.graph.spi.*; import com.oracle.graal.lir.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.calc.*; +import com.oracle.graal.nodes.spi.*; -public class ReverseBytesNode extends FloatingNode implements LIRGenLowerable, Canonicalizable { +public class ReverseBytesNode extends FloatingNode implements LIRLowerable, Canonicalizable { @Input private ValueNode value; @@ -66,9 +65,9 @@ } @Override - public void generate(NodeLIRBuilder gen) { + public void generate(NodeLIRBuilderTool gen) { Variable result = gen.newVariable(value.getKind()); - gen.getLIRGenerator().emitByteSwap(result, gen.operand(value)); + gen.getLIRGeneratorTool().emitByteSwap(result, gen.operand(value)); gen.setResult(this, result); } }
--- a/graal/com.oracle.graal.test/src/com/oracle/graal/test/GraalLongUnitTest.java Wed Apr 23 20:49:32 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,44 +0,0 @@ -/* - * 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 Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.test/src/com/oracle/graal/test/GraalTest.java Wed Apr 23 20:49:59 2014 +0200 @@ -26,14 +26,12 @@ import java.util.*; 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) {
--- a/graal/com.oracle.graal.test/src/com/oracle/graal/test/LongTest.java Wed Apr 23 20:49:32 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -/* - * 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/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/frame/ForceMaterializeNode.java Wed Apr 23 20:49:32 2014 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/frame/ForceMaterializeNode.java Wed Apr 23 20:49:59 2014 +0200 @@ -23,11 +23,10 @@ package com.oracle.graal.truffle.nodes.frame; import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.compiler.gen.*; -import com.oracle.graal.compiler.target.*; import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.spi.*; -public class ForceMaterializeNode extends FixedWithNextNode implements LIRGenLowerable { +public class ForceMaterializeNode extends FixedWithNextNode implements LIRLowerable { @Input private ValueNode object; @@ -36,7 +35,7 @@ this.object = object; } - public void generate(NodeLIRBuilder generator) { + public void generate(NodeLIRBuilderTool generator) { // nothing to do }
--- a/mx/mx_graal.py Wed Apr 23 20:49:32 2014 +0200 +++ b/mx/mx_graal.py Wed Apr 23 20:49:59 2014 +0200 @@ -35,6 +35,7 @@ import sanitycheck import itertools import json, textwrap +import fnmatch # This works because when mx loads this file, it makes sure __file__ gets an absolute path _graal_home = dirname(dirname(__file__)) @@ -861,7 +862,7 @@ projectscp = mx.classpath(projs) if whitelist: - classes = list(set(classes) & set(whitelist)) + classes = [c for c in classes if any((glob.match(c) for glob in whitelist))] if len(classes) != 0: f_testfile = open(testfile, 'w') @@ -905,10 +906,8 @@ _unittestHelpSuffix = """ Unittest options: - --short-only run short testcases only - --long-only run long testcases only - --baseline-whitelist run only testcases which are known to - work with the baseline compiler + --whitelist run only testcases which are included + in the given whitelist To avoid conflicts with VM options '--' can be used as delimiter. @@ -945,10 +944,7 @@ formatter_class=RawDescriptionHelpFormatter, epilog=_unittestHelpSuffix, ) - group = parser.add_mutually_exclusive_group() - group.add_argument('--short-only', action='store_true', help='run short testcases only') - group.add_argument('--long-only', action='store_true', help='run long testcases only') - parser.add_argument('--baseline-whitelist', action='store_true', help='run baseline testcases only') + parser.add_argument('--whitelist', help='run testcases specified in whitelist only', metavar='<path>') ut_args = [] delimiter = False @@ -968,33 +964,19 @@ parsed_args, args = parser.parse_known_args(ut_args) whitelist = None - if parsed_args.baseline_whitelist: - baseline_whitelist_file = 'test/baseline_whitelist.txt' + if parsed_args.whitelist: try: - with open(join(_graal_home, baseline_whitelist_file)) as fp: - whitelist = [l.rstrip() for l in fp.readlines()] + with open(join(_graal_home, parsed_args.whitelist)) as fp: + whitelist = [re.compile(fnmatch.translate(l.rstrip())) for l in fp.readlines() if not l.startswith('#')] except IOError: - mx.log('warning: could not read baseline whitelist: ' + baseline_whitelist_file) + mx.log('warning: could not read whitelist: ' + parsed_args.whitelist) - if parsed_args.long_only: - annotations = ['@LongTest', '@Parameters'] - elif parsed_args.short_only: - annotations = ['@Test'] - else: - annotations = ['@Test', '@LongTest', '@Parameters'] - - _unittest(args, annotations, whitelist=whitelist) + _unittest(args, ['@Test', '@Parameters'], whitelist=whitelist) def shortunittest(args): - """alias for 'unittest --short-only'{0}""" - - args.insert(0, '--short-only') - unittest(args) + """alias for 'unittest --whitelist test/whitelist_shortunittest.txt'{0}""" -def longunittest(args): - """alias for 'unittest --long-only'{0}""" - - args.insert(0, '--long-only') + args = ['--whitelist', 'test/whitelist_shortunittest.txt'] + args unittest(args) def buildvms(args): @@ -1104,6 +1086,11 @@ unittest([]) tasks.append(t.stop()) + with VM('server', 'product'): # hosted mode + t = Task('UnitTests-BaselineCompiler:hosted-product') + unittest(['--whitelist', 'test/whitelist_baseline.txt', '-G:+UseBaselineCompiler']) + tasks.append(t.stop()) + for vmbuild in ['fastdebug', 'product']: for test in sanitycheck.getDacapos(level=sanitycheck.SanityCheckLevel.Gate, gateBuildLevel=vmbuild) + sanitycheck.getScalaDacapos(level=sanitycheck.SanityCheckLevel.Gate, gateBuildLevel=vmbuild): t = Task(str(test) + ':' + vmbuild) @@ -1723,14 +1710,14 @@ """make truffle.jar""" # Test with the built classes - _unittest(["com.oracle.truffle.api.test", "com.oracle.truffle.api.dsl.test"], ['@Test', '@LongTest', '@Parameters']) + _unittest(["com.oracle.truffle.api.test", "com.oracle.truffle.api.dsl.test"], ['@Test', '@Parameters']) # We use the DSL processor as the starting point for the classpath - this # therefore includes the DSL processor, the DSL and the API. packagejar(mx.classpath("com.oracle.truffle.dsl.processor").split(os.pathsep), "truffle.jar", None, "com.oracle.truffle.dsl.processor.TruffleProcessor") # Test with the JAR - _unittest(["com.oracle.truffle.api.test", "com.oracle.truffle.api.dsl.test"], ['@Test', '@LongTest', '@Parameters'], "truffle.jar:") + _unittest(["com.oracle.truffle.api.test", "com.oracle.truffle.api.dsl.test"], ['@Test', '@Parameters'], "truffle.jar:") def isGraalEnabled(vm): @@ -1953,7 +1940,6 @@ 'gate' : [gate, '[-options]'], 'bench' : [bench, '[-resultfile file] [all(default)|dacapo|specjvm2008|bootstrap]'], 'unittest' : [unittest, '[unittest options] [--] [VM options] [filters...]', _unittestHelpSuffix], - 'longunittest' : [longunittest, '[unittest options] [--] [VM options] [filters...]', _unittestHelpSuffix], 'makejmhdeps' : [makejmhdeps, ''], 'shortunittest' : [shortunittest, '[unittest options] [--] [VM options] [filters...]', _unittestHelpSuffix], 'jacocoreport' : [jacocoreport, '[output directory]'],
--- a/test/baseline_whitelist.txt Wed Apr 23 20:49:32 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -com.oracle.graal.jtt.loop.Loop03 -com.oracle.graal.jtt.loop.Loop04 -com.oracle.graal.jtt.loop.Loop08 -com.oracle.graal.jtt.loop.Loop11 -com.oracle.graal.jtt.bytecode.BC_iadd -com.oracle.graal.jtt.bytecode.BC_iadd2 -com.oracle.graal.jtt.bytecode.BC_iadd3 -com.oracle.graal.jtt.bytecode.BC_ifeq_2 -com.oracle.graal.jtt.bytecode.BC_ifeq_3 -com.oracle.graal.jtt.bytecode.BC_ifeq -com.oracle.graal.jtt.bytecode.BC_aload_3 -com.oracle.graal.jtt.bytecode.BC_aload_2 -com.oracle.graal.jtt.bytecode.BC_aload_1 -com.oracle.graal.jtt.bytecode.BC_aload_0 -com.oracle.graal.jtt.bytecode.BC_areturn -com.oracle.graal.jtt.bytecode.BC_freturn -com.oracle.graal.jtt.bytecode.BC_iconst -com.oracle.graal.jtt.bytecode.BC_ireturn -com.oracle.graal.jtt.bytecode.BC_lreturn
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/whitelist_baseline.txt Wed Apr 23 20:49:59 2014 +0200 @@ -0,0 +1,19 @@ +# com.oracle.graal.jtt.loop.Loop03 +# com.oracle.graal.jtt.loop.Loop04 +# com.oracle.graal.jtt.loop.Loop08 +# com.oracle.graal.jtt.loop.Loop11 +com.oracle.graal.jtt.bytecode.BC_iadd +com.oracle.graal.jtt.bytecode.BC_iadd2 +com.oracle.graal.jtt.bytecode.BC_iadd3 +com.oracle.graal.jtt.bytecode.BC_ifeq_2 +com.oracle.graal.jtt.bytecode.BC_ifeq_3 +com.oracle.graal.jtt.bytecode.BC_ifeq +com.oracle.graal.jtt.bytecode.BC_aload_3 +com.oracle.graal.jtt.bytecode.BC_aload_2 +com.oracle.graal.jtt.bytecode.BC_aload_1 +com.oracle.graal.jtt.bytecode.BC_aload_0 +com.oracle.graal.jtt.bytecode.BC_areturn +com.oracle.graal.jtt.bytecode.BC_freturn +com.oracle.graal.jtt.bytecode.BC_iconst +com.oracle.graal.jtt.bytecode.BC_ireturn +com.oracle.graal.jtt.bytecode.BC_lreturn
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/whitelist_shortunittest.txt Wed Apr 23 20:49:59 2014 +0200 @@ -0,0 +1,214 @@ +com.oracle.graal.jtt.bytecode.BC_aaload_1 +com.oracle.graal.jtt.bytecode.BC_aaload +com.oracle.graal.jtt.bytecode.BC_aastore +com.oracle.graal.jtt.bytecode.BC_aload_0 +com.oracle.graal.jtt.bytecode.BC_aload_1 +com.oracle.graal.jtt.bytecode.BC_aload_2 +com.oracle.graal.jtt.bytecode.BC_aload_3 +com.oracle.graal.jtt.bytecode.BC_anewarray +com.oracle.graal.jtt.bytecode.BC_areturn +com.oracle.graal.jtt.bytecode.BC_arraylength +com.oracle.graal.jtt.bytecode.BC_athrow +com.oracle.graal.jtt.bytecode.BC_baload +com.oracle.graal.jtt.bytecode.BC_bastore +com.oracle.graal.jtt.bytecode.BC_caload +com.oracle.graal.jtt.bytecode.BC_castore +com.oracle.graal.jtt.bytecode.BC_checkcast01 +com.oracle.graal.jtt.bytecode.BC_checkcast02 +com.oracle.graal.jtt.bytecode.BC_d2f +com.oracle.graal.jtt.bytecode.BC_d2i01 +com.oracle.graal.jtt.bytecode.BC_d2i02 +com.oracle.graal.jtt.bytecode.BC_d2l01 +com.oracle.graal.jtt.bytecode.BC_d2l02 +com.oracle.graal.jtt.bytecode.BC_d2l03 +com.oracle.graal.jtt.bytecode.BC_dadd +com.oracle.graal.jtt.bytecode.BC_daload +com.oracle.graal.jtt.bytecode.BC_dastore +com.oracle.graal.jtt.bytecode.BC_dcmp01 +com.oracle.graal.jtt.bytecode.BC_dcmp02 +com.oracle.graal.jtt.bytecode.BC_dcmp03 +com.oracle.graal.jtt.bytecode.BC_dcmp04 +com.oracle.graal.jtt.bytecode.BC_dcmp05 +com.oracle.graal.jtt.bytecode.BC_dcmp06 +com.oracle.graal.jtt.bytecode.BC_dcmp07 +com.oracle.graal.jtt.bytecode.BC_dcmp08 +com.oracle.graal.jtt.bytecode.BC_dcmp09 +com.oracle.graal.jtt.bytecode.BC_dcmp10 +com.oracle.graal.jtt.bytecode.BC_ddiv +com.oracle.graal.jtt.bytecode.BC_dmul +com.oracle.graal.jtt.bytecode.BC_dneg2 +com.oracle.graal.jtt.bytecode.BC_dneg +com.oracle.graal.jtt.bytecode.BC_drem +com.oracle.graal.jtt.bytecode.BC_dreturn +com.oracle.graal.jtt.bytecode.BC_dsub2 +com.oracle.graal.jtt.bytecode.BC_dsub +com.oracle.graal.jtt.bytecode.BC_f2d +com.oracle.graal.jtt.bytecode.BC_f2i01 +com.oracle.graal.jtt.bytecode.BC_f2i02 +com.oracle.graal.jtt.bytecode.BC_f2l01 +com.oracle.graal.jtt.bytecode.BC_f2l02 +com.oracle.graal.jtt.bytecode.BC_fadd +com.oracle.graal.jtt.bytecode.BC_faload +com.oracle.graal.jtt.bytecode.BC_fastore +com.oracle.graal.jtt.bytecode.BC_fcmp01 +com.oracle.graal.jtt.bytecode.BC_fcmp02 +com.oracle.graal.jtt.bytecode.BC_fcmp03 +com.oracle.graal.jtt.bytecode.BC_fcmp04 +com.oracle.graal.jtt.bytecode.BC_fcmp05 +com.oracle.graal.jtt.bytecode.BC_fcmp06 +com.oracle.graal.jtt.bytecode.BC_fcmp07 +com.oracle.graal.jtt.bytecode.BC_fcmp08 +com.oracle.graal.jtt.bytecode.BC_fcmp09 +com.oracle.graal.jtt.bytecode.BC_fcmp10 +com.oracle.graal.jtt.bytecode.BC_fdiv +com.oracle.graal.jtt.bytecode.BC_fload_2 +com.oracle.graal.jtt.bytecode.BC_fload +com.oracle.graal.jtt.bytecode.BC_fmul +com.oracle.graal.jtt.bytecode.BC_fneg +com.oracle.graal.jtt.bytecode.BC_frem +com.oracle.graal.jtt.bytecode.BC_freturn +com.oracle.graal.jtt.bytecode.BC_fsub +com.oracle.graal.jtt.bytecode.BC_getfield_b +com.oracle.graal.jtt.bytecode.BC_getfield_c +com.oracle.graal.jtt.bytecode.BC_getfield_d +com.oracle.graal.jtt.bytecode.BC_getfield_f +com.oracle.graal.jtt.bytecode.BC_getfield_i +com.oracle.graal.jtt.bytecode.BC_getfield +com.oracle.graal.jtt.bytecode.BC_getfield_l +com.oracle.graal.jtt.bytecode.BC_getfield_o +com.oracle.graal.jtt.bytecode.BC_getfield_s +com.oracle.graal.jtt.bytecode.BC_getfield_z +com.oracle.graal.jtt.bytecode.BC_getstatic_b +com.oracle.graal.jtt.bytecode.BC_getstatic_c +com.oracle.graal.jtt.bytecode.BC_getstatic_d +com.oracle.graal.jtt.bytecode.BC_getstatic_f +com.oracle.graal.jtt.bytecode.BC_getstatic_i +com.oracle.graal.jtt.bytecode.BC_getstatic_l +com.oracle.graal.jtt.bytecode.BC_getstatic_s +com.oracle.graal.jtt.bytecode.BC_getstatic_z +com.oracle.graal.jtt.bytecode.BC_i2b +com.oracle.graal.jtt.bytecode.BC_i2c +com.oracle.graal.jtt.bytecode.BC_i2d +com.oracle.graal.jtt.bytecode.BC_i2f +com.oracle.graal.jtt.bytecode.BC_i2l +com.oracle.graal.jtt.bytecode.BC_i2s +com.oracle.graal.jtt.bytecode.BC_iadd2 +com.oracle.graal.jtt.bytecode.BC_iadd3 +com.oracle.graal.jtt.bytecode.BC_iadd +com.oracle.graal.jtt.bytecode.BC_iaload +com.oracle.graal.jtt.bytecode.BC_iand +com.oracle.graal.jtt.bytecode.BC_iastore +com.oracle.graal.jtt.bytecode.BC_iconst +com.oracle.graal.jtt.bytecode.BC_idiv2 +com.oracle.graal.jtt.bytecode.BC_idiv +com.oracle.graal.jtt.bytecode.BC_ifeq_2 +com.oracle.graal.jtt.bytecode.BC_ifeq_3 +com.oracle.graal.jtt.bytecode.BC_ifeq +com.oracle.graal.jtt.bytecode.BC_ifge_2 +com.oracle.graal.jtt.bytecode.BC_ifge_3 +com.oracle.graal.jtt.bytecode.BC_ifge +com.oracle.graal.jtt.bytecode.BC_ifgt +com.oracle.graal.jtt.bytecode.BC_ificmplt1 +com.oracle.graal.jtt.bytecode.BC_ificmplt2 +com.oracle.graal.jtt.bytecode.BC_ificmpne1 +com.oracle.graal.jtt.bytecode.BC_ificmpne2 +com.oracle.graal.jtt.bytecode.BC_ifle +com.oracle.graal.jtt.bytecode.BC_iflt +com.oracle.graal.jtt.bytecode.BC_ifne +com.oracle.graal.jtt.bytecode.BC_ifnonnull_2 +com.oracle.graal.jtt.bytecode.BC_ifnonnull_3 +com.oracle.graal.jtt.bytecode.BC_ifnonnull +com.oracle.graal.jtt.bytecode.BC_ifnull_2 +com.oracle.graal.jtt.bytecode.BC_ifnull_3 +com.oracle.graal.jtt.bytecode.BC_ifnull +com.oracle.graal.jtt.bytecode.BC_iinc_1 +com.oracle.graal.jtt.bytecode.BC_iinc_2 +com.oracle.graal.jtt.bytecode.BC_iinc_3 +com.oracle.graal.jtt.bytecode.BC_iinc_4 +com.oracle.graal.jtt.bytecode.BC_iload_0_1 +com.oracle.graal.jtt.bytecode.BC_iload_0_2 +com.oracle.graal.jtt.bytecode.BC_iload_0 +com.oracle.graal.jtt.bytecode.BC_iload_1_1 +com.oracle.graal.jtt.bytecode.BC_iload_1 +com.oracle.graal.jtt.bytecode.BC_iload_2 +com.oracle.graal.jtt.bytecode.BC_iload_3 +com.oracle.graal.jtt.bytecode.BC_imul +com.oracle.graal.jtt.bytecode.BC_ineg +com.oracle.graal.jtt.bytecode.BC_instanceof +com.oracle.graal.jtt.bytecode.BC_invokeinterface +com.oracle.graal.jtt.bytecode.BC_invokespecial2 +com.oracle.graal.jtt.bytecode.BC_invokespecial +com.oracle.graal.jtt.bytecode.BC_invokestatic +com.oracle.graal.jtt.bytecode.BC_invokevirtual +com.oracle.graal.jtt.bytecode.BC_ior +com.oracle.graal.jtt.bytecode.BC_irem2 +com.oracle.graal.jtt.bytecode.BC_irem3 +com.oracle.graal.jtt.bytecode.BC_irem +com.oracle.graal.jtt.bytecode.BC_ireturn +com.oracle.graal.jtt.bytecode.BC_ishl +com.oracle.graal.jtt.bytecode.BC_ishr +com.oracle.graal.jtt.bytecode.BC_isub +com.oracle.graal.jtt.bytecode.BC_iushr +com.oracle.graal.jtt.bytecode.BC_ixor +com.oracle.graal.jtt.bytecode.BC_l2d +com.oracle.graal.jtt.bytecode.BC_l2f +com.oracle.graal.jtt.bytecode.BC_l2i_2 +com.oracle.graal.jtt.bytecode.BC_l2i +com.oracle.graal.jtt.bytecode.BC_ladd2 +com.oracle.graal.jtt.bytecode.BC_ladd +com.oracle.graal.jtt.bytecode.BC_laload +com.oracle.graal.jtt.bytecode.BC_land +com.oracle.graal.jtt.bytecode.BC_lastore +com.oracle.graal.jtt.bytecode.BC_lcmp +com.oracle.graal.jtt.bytecode.BC_ldc_01 +com.oracle.graal.jtt.bytecode.BC_ldc_02 +com.oracle.graal.jtt.bytecode.BC_ldc_03 +com.oracle.graal.jtt.bytecode.BC_ldc_04 +com.oracle.graal.jtt.bytecode.BC_ldc_05 +com.oracle.graal.jtt.bytecode.BC_ldc_06 +com.oracle.graal.jtt.bytecode.BC_ldiv2 +com.oracle.graal.jtt.bytecode.BC_ldiv3 +com.oracle.graal.jtt.bytecode.BC_ldiv +com.oracle.graal.jtt.bytecode.BC_lload_01 +com.oracle.graal.jtt.bytecode.BC_lload_0 +com.oracle.graal.jtt.bytecode.BC_lload_1 +com.oracle.graal.jtt.bytecode.BC_lload_2 +com.oracle.graal.jtt.bytecode.BC_lload_3 +com.oracle.graal.jtt.bytecode.BC_lmul +com.oracle.graal.jtt.bytecode.BC_lneg +com.oracle.graal.jtt.bytecode.BC_lookupswitch01 +com.oracle.graal.jtt.bytecode.BC_lookupswitch02 +com.oracle.graal.jtt.bytecode.BC_lookupswitch03 +com.oracle.graal.jtt.bytecode.BC_lookupswitch04 +com.oracle.graal.jtt.bytecode.BC_lookupswitch05 +com.oracle.graal.jtt.bytecode.BC_lor +com.oracle.graal.jtt.bytecode.BC_lrem2 +com.oracle.graal.jtt.bytecode.BC_lrem +com.oracle.graal.jtt.bytecode.BC_lreturn +com.oracle.graal.jtt.bytecode.BC_lshl +com.oracle.graal.jtt.bytecode.BC_lshr02 +com.oracle.graal.jtt.bytecode.BC_lshr +com.oracle.graal.jtt.bytecode.BC_lsub +com.oracle.graal.jtt.bytecode.BC_lushr +com.oracle.graal.jtt.bytecode.BC_lxor +com.oracle.graal.jtt.bytecode.BC_monitorenter02 +com.oracle.graal.jtt.bytecode.BC_monitorenter +com.oracle.graal.jtt.bytecode.BC_multianewarray01 +com.oracle.graal.jtt.bytecode.BC_multianewarray02 +com.oracle.graal.jtt.bytecode.BC_multianewarray03 +com.oracle.graal.jtt.bytecode.BC_multianewarray04 +com.oracle.graal.jtt.bytecode.BC_newarray +com.oracle.graal.jtt.bytecode.BC_new +com.oracle.graal.jtt.bytecode.BC_putfield_01 +com.oracle.graal.jtt.bytecode.BC_putfield_02 +com.oracle.graal.jtt.bytecode.BC_putfield_03 +com.oracle.graal.jtt.bytecode.BC_putfield_04 +com.oracle.graal.jtt.bytecode.BC_putstatic +com.oracle.graal.jtt.bytecode.BC_saload +com.oracle.graal.jtt.bytecode.BC_sastore +com.oracle.graal.jtt.bytecode.BC_tableswitch2 +com.oracle.graal.jtt.bytecode.BC_tableswitch3 +com.oracle.graal.jtt.bytecode.BC_tableswitch4 +com.oracle.graal.jtt.bytecode.BC_tableswitch +com.oracle.graal.jtt.bytecode.BC_wide01 +com.oracle.graal.jtt.bytecode.BC_wide02