# HG changeset patch # User Gilles Duboscq # Date 1347045804 -7200 # Node ID a9b8d664dddd43dd2858623eea47f189b89396f3 # Parent e8b878817579ceaedac63f3e55c255827bd2e92c Put LoopUnswitchTest in the right package diff -r e8b878817579 -r a9b8d664dddd graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/LoopUnswitchTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/LoopUnswitchTest.java Fri Sep 07 21:23:24 2012 +0200 @@ -0,0 +1,91 @@ +/* + * 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.test; + +import org.junit.*; + +import com.oracle.graal.compiler.phases.*; +import com.oracle.graal.compiler.test.*; +import com.oracle.graal.debug.*; +import com.oracle.graal.graph.*; +import com.oracle.graal.nodes.*; + +public class LoopUnswitchTest extends GraalCompilerTest { + + @SuppressWarnings("all") + public static int referenceSnippet1(int a) { + int sum = 0; + if (a > 2) { + for (int i = 0; i < 1000; i++) { + sum += 2; + } + } else { + for (int i = 0; i < 1000; i++) { + sum += a; + } + } + return sum; + } + + @SuppressWarnings("all") + public static int test1Snippet(int a) { + int sum = 0; + for (int i = 0; i < 1000; i++) { + if (a > 2) { + sum += 2; + } else { + sum += a; + } + } + return sum; + } + + @Test + public void test1() { + test("test1Snippet", "referenceSnippet1"); + } + + private void test(String snippet, String referenceSnippet) { + final StructuredGraph graph = parse(snippet); + final StructuredGraph referenceGraph = parse(referenceSnippet); + + new LoopTransformLowPhase().apply(graph); + + // Framestates create comparison problems + for (Node stateSplit : graph.getNodes().filterInterface(StateSplit.class)) { + ((StateSplit) stateSplit).setStateAfter(null); + } + for (Node stateSplit : referenceGraph.getNodes().filterInterface(StateSplit.class)) { + ((StateSplit) stateSplit).setStateAfter(null); + } + + new CanonicalizerPhase(null, runtime(), null).apply(graph); + new CanonicalizerPhase(null, runtime(), null).apply(referenceGraph); + Debug.scope("Test", new DebugDumpScope("Test:" + snippet), new Runnable() { + @Override + public void run() { + assertEquals(referenceGraph, graph); + } + }); + } +} diff -r e8b878817579 -r a9b8d664dddd graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/tests/LoopUnswitchTest.java --- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/tests/LoopUnswitchTest.java Fri Sep 07 18:25:48 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,91 +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.tests; - -import org.junit.*; - -import com.oracle.graal.compiler.phases.*; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.debug.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; - -public class LoopUnswitchTest extends GraalCompilerTest { - - @SuppressWarnings("all") - public static int referenceSnippet1(int a) { - int sum = 0; - if (a > 2) { - for (int i = 0; i < 1000; i++) { - sum += 2; - } - } else { - for (int i = 0; i < 1000; i++) { - sum += a; - } - } - return sum; - } - - @SuppressWarnings("all") - public static int test1Snippet(int a) { - int sum = 0; - for (int i = 0; i < 1000; i++) { - if (a > 2) { - sum += 2; - } else { - sum += a; - } - } - return sum; - } - - @Test - public void test1() { - test("test1Snippet", "referenceSnippet1"); - } - - private void test(String snippet, String referenceSnippet) { - final StructuredGraph graph = parse(snippet); - final StructuredGraph referenceGraph = parse(referenceSnippet); - - new LoopTransformLowPhase().apply(graph); - - // Framestates create comparison problems - for (Node stateSplit : graph.getNodes().filterInterface(StateSplit.class)) { - ((StateSplit) stateSplit).setStateAfter(null); - } - for (Node stateSplit : referenceGraph.getNodes().filterInterface(StateSplit.class)) { - ((StateSplit) stateSplit).setStateAfter(null); - } - - new CanonicalizerPhase(null, runtime(), null).apply(graph); - new CanonicalizerPhase(null, runtime(), null).apply(referenceGraph); - Debug.scope("Test", new DebugDumpScope("Test:" + snippet), new Runnable() { - @Override - public void run() { - assertEquals(referenceGraph, graph); - } - }); - } -}