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

Author: Sergey Kuksenko

make/test/BuildMicrobenchmark.gmk

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

test/micro/org/openjdk/bench/valhalla/ackermann/IdentityLong.java renamed to test/micro/org/openjdk/bench/valhalla/ackermann/Identity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 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
@@ -25,22 +25,40 @@
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
 
-public class IdentityLong extends AckermannBase {
+public class Identity 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)));
+    private static IdentityLong ack_identity(IdentityLong x, IdentityLong y) {
+        return x.value() == 0 ?
+                IdentityLong.valueOf(y.value() + 1) :
+                (y.value() == 0 ?
+                        ack_identity(IdentityLong.valueOf(x.value() - 1), IdentityLong.valueOf(1)) :
+                        ack_identity(IdentityLong.valueOf(x.value() - 1), ack_identity(x, IdentityLong.valueOf(y.value() - 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));
+    public long ackermann() {
+        return ack_identity(IdentityLong.valueOf(X1), IdentityLong.valueOf(Y1)).value()
+                + ack_identity(IdentityLong.valueOf(X2), IdentityLong.valueOf(Y2)).value()
+                + ack_identity(IdentityLong.valueOf(X3), IdentityLong.valueOf(Y3)).value();
+    }
+
+    public static class IdentityLong {
+
+        public final long v0;
+
+        public IdentityLong(long v0) {
+            this.v0 = v0;
+        }
+
+        public long value() {
+            return v0;
+        }
+
+        public static IdentityLong valueOf(long value) {
+            return new IdentityLong(value);
+        }
+
     }
 
 }