[BACKOUT] 8367608: [lworld] Update/reimplement valhalla benchmarks for JEP 401

Author: David Simms

make/test/BuildMicrobenchmark.gmk

@@ -97,7 +97,6 @@ $(eval $(call SetupJavaCompilation, BUILD_JDK_MICROBENCHMARK, \
         --add-exports java.base/jdk.internal.util=ALL-UNNAMED \
         --add-exports java.base/jdk.internal.value=ALL-UNNAMED \
         --add-exports java.base/jdk.internal.vm=ALL-UNNAMED \
-        --add-exports java.base/jdk.internal.vm.annotation=ALL-UNNAMED \
         --add-exports java.base/sun.invoke.util=ALL-UNNAMED \
         --add-exports java.base/sun.security.util=ALL-UNNAMED \
         --add-exports java.base/sun.security.util.math=ALL-UNNAMED \

test/micro/org/openjdk/bench/valhalla/ackermann/AckermannBase.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2020, 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
@@ -41,7 +41,7 @@
 @State(Scope.Thread)
 public abstract class AckermannBase {
 
-    // ackermann(1,1748) + ackermann(2,1897) + ackermann(3,8) == 9999999 invocations
+    // ackermann(1,1748)+ ackermann(2,1897)+ ackermann(3,8); == 9999999 calls
     // max depth - 3798
     public static final int X1 = 1;
     public static final int Y1 = 1748;

test/micro/org/openjdk/bench/valhalla/ackermann/Identity.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2020, 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 org.openjdk.bench.valhalla.ackermann;
+
+import org.openjdk.bench.valhalla.types.Int64;
+import org.openjdk.bench.valhalla.types.R64byte;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.OperationsPerInvocation;
+
+public class Identity64byte extends AckermannBase {
+
+    private static R64byte ack_ref(R64byte x, R64byte y) {
+        return x.longValue() == 0 ?
+                new R64byte(y.longValue() + 1) :
+                (y.longValue() == 0 ?
+                        ack_ref(new R64byte(x.longValue()-1) , new R64byte(1)) :
+                        ack_ref(new R64byte(x.longValue()-1), ack_ref(x, new R64byte(y.longValue()-1))));
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(OPI)
+    public long ack_Ref() {
+        return ack_ref(new R64byte(X1), new R64byte(Y1)).longValue()
+                + ack_ref(new R64byte(X2), new R64byte(Y2)).longValue()
+                + ack_ref(new R64byte(X3), new R64byte(Y3)).longValue();
+    }
+
+    private static Int64 ack_inter(Int64 x, Int64 y) {
+        return x.longValue() == 0 ?
+                new R64byte(y.longValue() + 1) :
+                (y.longValue() == 0 ?
+                        ack_inter(new R64byte(x.longValue()-1) , new R64byte(1)) :
+                        ack_inter(new R64byte(x.longValue()-1), ack_inter(x, new R64byte(y.longValue()-1))));
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(OPI)
+    public long ack_Int() {
+        return ack_inter(new R64byte(X1), new R64byte(Y1)).longValue()
+                + ack_inter(new R64byte(X2), new R64byte(Y2)).longValue()
+                + ack_inter(new R64byte(X3), new R64byte(Y3)).longValue();
+    }
+
+}

test/micro/org/openjdk/bench/valhalla/ackermann/Identity64byte.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2020, 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 org.openjdk.bench.valhalla.ackermann;
+
+import org.openjdk.bench.valhalla.types.Int64;
+import org.openjdk.bench.valhalla.types.R64int;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.OperationsPerInvocation;
+
+public class Identity64int extends AckermannBase {
+
+    private static R64int ack_ref(R64int x, R64int y) {
+        return x.longValue() == 0 ?
+                new R64int(y.longValue() + 1) :
+                (y.longValue() == 0 ?
+                        ack_ref(new R64int(x.longValue()-1) , new R64int(1)) :
+                        ack_ref(new R64int(x.longValue()-1), ack_ref(x, new R64int(y.longValue()-1))));
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(OPI)
+    public long ack_Ref() {
+        return ack_ref(new R64int(X1), new R64int(Y1)).longValue()
+                + ack_ref(new R64int(X2), new R64int(Y2)).longValue()
+                + ack_ref(new R64int(X3), new R64int(Y3)).longValue();
+    }
+
+    private static Int64 ack_inter(Int64 x, Int64 y) {
+        return x.longValue() == 0 ?
+                new R64int(y.longValue() + 1) :
+                (y.longValue() == 0 ?
+                        ack_inter(new R64int(x.longValue()-1) , new R64int(1)) :
+                        ack_inter(new R64int(x.longValue()-1), ack_inter(x, new R64int(y.longValue()-1))));
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(OPI)
+    public long ack_Int() {
+        return ack_inter(new R64int(X1), new R64int(Y1)).longValue()
+                + ack_inter(new R64int(X2), new R64int(Y2)).longValue()
+                + ack_inter(new R64int(X3), new R64int(Y3)).longValue();
+    }
+
+}

test/micro/org/openjdk/bench/valhalla/ackermann/Identity64int.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2020, 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 org.openjdk.bench.valhalla.ackermann;
+
+import org.openjdk.bench.valhalla.types.Int64;
+import org.openjdk.bench.valhalla.types.R64long;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.OperationsPerInvocation;
+
+public class Identity64long extends AckermannBase {
+
+    private static R64long ack_ref(R64long x, R64long y) {
+        return x.longValue() == 0 ?
+                new R64long(y.longValue() + 1) :
+                (y.longValue() == 0 ?
+                        ack_ref(new R64long(x.longValue()-1) , new R64long(1)) :
+                        ack_ref(new R64long(x.longValue()-1), ack_ref(x, new R64long(y.longValue()-1))));
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(OPI)
+    public long ack_Ref() {
+        return ack_ref(new R64long(X1), new R64long(Y1)).longValue()
+                + ack_ref(new R64long(X2), new R64long(Y2)).longValue()
+                + ack_ref(new R64long(X3), new R64long(Y3)).longValue();
+    }
+
+    private static Int64 ack_inter(Int64 x, Int64 y) {
+        return x.longValue() == 0 ?
+                new R64long(y.longValue() + 1) :
+                (y.longValue() == 0 ?
+                        ack_inter(new R64long(x.longValue()-1) , new R64long(1)) :
+                        ack_inter(new R64long(x.longValue()-1), ack_inter(x, new R64long(y.longValue()-1))));
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(OPI)
+    public long ack_Int() {
+        return ack_inter(new R64long(X1), new R64long(Y1)).longValue()
+                + ack_inter(new R64long(X2), new R64long(Y2)).longValue()
+                + ack_inter(new R64long(X3), new R64long(Y3)).longValue();
+    }
+
+}

test/micro/org/openjdk/bench/valhalla/ackermann/Identity64long.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2020, 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 org.openjdk.bench.valhalla.ackermann;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.OperationsPerInvocation;
+
+public class IdentityLong extends AckermannBase {
+
+    private static Long ack_Long(Long x, Long y) {
+        return x == 0 ?
+                y + 1 :
+                (y == 0 ?
+                        ack_Long(x - 1, 1L) :
+                        ack_Long(x - 1, ack_Long(x, y - 1)));
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(OPI)
+    public long ref_Long() {
+        return ack_Long(Long.valueOf(X1), Long.valueOf(Y1))
+                + ack_Long(Long.valueOf(X2), Long.valueOf(Y2))
+                + ack_Long(Long.valueOf(X3), Long.valueOf(Y3));
+    }
+
+}