# HG changeset patch # User Christian Humer # Date 1372703089 -7200 # Node ID 99b58803d6d9210d50861eca1989a04b03e6d6e6 # Parent 3cc5fb59916ebaaa592ebb84dba1b9611c83eaaa Truffle-DSL: API changes for new polymorphic caching feature. diff -r 3cc5fb59916e -r 99b58803d6d9 graal/com.oracle.truffle.api.codegen.test/src/com/oracle/truffle/api/codegen/test/PolymorphicTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.truffle.api.codegen.test/src/com/oracle/truffle/api/codegen/test/PolymorphicTest.java Mon Jul 01 20:24:49 2013 +0200 @@ -0,0 +1,123 @@ +/* + * Copyright (c) 2012, 2012, 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.truffle.api.codegen.test; + +import static com.oracle.truffle.api.codegen.test.TestHelper.*; +import static org.junit.Assert.*; + +import org.junit.*; + +import com.oracle.truffle.api.codegen.*; +import com.oracle.truffle.api.codegen.test.BinaryNodeTest.BinaryNode; +import com.oracle.truffle.api.codegen.test.PolymorphicTestFactory.Node1Factory; +import com.oracle.truffle.api.codegen.test.TypeSystemTest.TestRootNode; +import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.NodeInfo.Kind; + +public class PolymorphicTest { + + @Test + public void testJustSpecialize() { + TestRootNode node = TestHelper.createRoot(Node1Factory.getInstance()); + assertEquals("(int,int)", executeWith(node, 42, 42)); + assertEquals("(boolean,boolean)", executeWith(node, false, false)); + assertEquals("(int,boolean)", executeWith(node, 42, false)); + assertEquals("(boolean,int)", executeWith(node, false, 42)); + assertEquals(Kind.SPECIALIZED, node.getNode().getClass().getAnnotation(NodeInfo.class).kind()); + } + + @Test + public void testPolymorphic2() { + TestRootNode node = TestHelper.createRoot(Node1Factory.getInstance()); + assertEquals("(int,boolean)", executeWith(node, 42, false)); + assertEquals("(int,int)", executeWith(node, 42, 42)); + assertEquals(Kind.POLYMORPHIC, node.getNode().getClass().getAnnotation(NodeInfo.class).kind()); + } + + @Test + public void testPolymorphic3() { + TestRootNode node = TestHelper.createRoot(Node1Factory.getInstance()); + assertEquals("(int,boolean)", executeWith(node, 42, false)); + assertEquals("(boolean,boolean)", executeWith(node, true, false)); + assertEquals("(int,int)", executeWith(node, 42, 42)); + assertEquals(Kind.POLYMORPHIC, node.getNode().getClass().getAnnotation(NodeInfo.class).kind()); + } + + @Test + public void testGenericLimitReached() { + TestRootNode node = TestHelper.createRoot(Node1Factory.getInstance()); + assertEquals("(boolean,int)", executeWith(node, false, 42)); + assertEquals("(int,boolean)", executeWith(node, 42, false)); + assertEquals("(boolean,boolean)", executeWith(node, true, false)); + assertEquals("(int,int)", executeWith(node, 42, 42)); + assertEquals(Kind.GENERIC, node.getNode().getClass().getAnnotation(NodeInfo.class).kind()); + } + + @Test + public void testGenericInitial() { + TestRootNode node = TestHelper.createRoot(Node1Factory.getInstance()); + assertEquals("(generic,generic)", executeWith(node, "", "")); + assertEquals(Kind.GENERIC, node.getNode().getClass().getAnnotation(NodeInfo.class).kind()); + } + + @Test + public void testGenericPolymorphic() { + TestRootNode node = TestHelper.createRoot(Node1Factory.getInstance()); + assertEquals("(boolean,int)", executeWith(node, false, 42)); + assertEquals("(int,boolean)", executeWith(node, 42, false)); + assertEquals("(generic,generic)", executeWith(node, "", "")); + assertEquals(Kind.GENERIC, node.getNode().getClass().getAnnotation(NodeInfo.class).kind()); + } + + @SuppressWarnings("unused") + @PolymorphicLimit(3) + abstract static class Node1 extends BinaryNode { + + @Specialization(order = 1) + String add(int left, int right) { + return "(int,int)"; + } + + @Specialization(order = 2) + String add(boolean left, boolean right) { + return "(boolean,boolean)"; + } + + @Specialization(order = 3) + String add(int left, boolean right) { + return "(int,boolean)"; + } + + @Specialization(order = 4) + String add(boolean left, int right) { + return "(boolean,int)"; + } + + @Generic + String add(Object left, Object right) { + return "(generic,generic)"; + } + + } + +} diff -r 3cc5fb59916e -r 99b58803d6d9 graal/com.oracle.truffle.api.codegen/src/com/oracle/truffle/api/codegen/PolymorphicLimit.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.truffle.api.codegen/src/com/oracle/truffle/api/codegen/PolymorphicLimit.java Mon Jul 01 20:24:49 2013 +0200 @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2012, 2012, 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.truffle.api.codegen; + +import java.lang.annotation.*; + +@Retention(RetentionPolicy.CLASS) +@Target({ElementType.TYPE}) +public @interface PolymorphicLimit { + + /** Specifies the maximum polymorphic cache depth until it falls back to the generic case. */ + int value(); + +} diff -r 3cc5fb59916e -r 99b58803d6d9 graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/Node.java --- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/Node.java Fri Jun 28 12:19:51 2013 +0200 +++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/Node.java Mon Jul 01 20:24:49 2013 +0200 @@ -241,6 +241,9 @@ case UNINITIALIZED: kind = "U"; break; + case POLYMORPHIC: + kind = "P"; + break; default: kind = "?"; break; diff -r 3cc5fb59916e -r 99b58803d6d9 graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/NodeInfo.java --- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/NodeInfo.java Fri Jun 28 12:19:51 2013 +0200 +++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/NodeInfo.java Mon Jul 01 20:24:49 2013 +0200 @@ -41,7 +41,7 @@ Kind kind() default Kind.SPECIALIZED; public enum Kind { - UNINITIALIZED, SPECIALIZED, GENERIC + UNINITIALIZED, SPECIALIZED, POLYMORPHIC, GENERIC } }