< prev index next >

test/micro/org/openjdk/bench/jdk/incubator/foreign/Upcalls.java

Print this page
@@ -1,7 +1,7 @@
  /*
-  * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+  * Copyright (c) 2020, 2021, 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.

@@ -20,13 +20,14 @@
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.openjdk.bench.jdk.incubator.foreign;
  
- import jdk.incubator.foreign.FunctionDescriptor;
- import jdk.incubator.foreign.MemoryAddress;
+ import jdk.incubator.foreign.Addressable;
  import jdk.incubator.foreign.CLinker;
+ import jdk.incubator.foreign.FunctionDescriptor;
+ import jdk.incubator.foreign.NativeSymbol;
  import jdk.incubator.foreign.ResourceScope;
  import jdk.incubator.foreign.SymbolLookup;
  import org.openjdk.jmh.annotations.Benchmark;
  import org.openjdk.jmh.annotations.BenchmarkMode;
  import org.openjdk.jmh.annotations.Fork;

@@ -39,74 +40,70 @@
  import java.lang.invoke.MethodHandle;
  import java.lang.invoke.MethodType;
  import java.util.concurrent.TimeUnit;
  
  import static java.lang.invoke.MethodHandles.lookup;
- import static jdk.incubator.foreign.CLinker.C_DOUBLE;
- import static jdk.incubator.foreign.CLinker.C_INT;
- import static jdk.incubator.foreign.CLinker.C_LONG_LONG;
- import static jdk.incubator.foreign.CLinker.C_POINTER;
  
  @BenchmarkMode(Mode.AverageTime)
  @Warmup(iterations = 5, time = 500, timeUnit = TimeUnit.MILLISECONDS)
  @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
  @State(org.openjdk.jmh.annotations.Scope.Thread)
  @OutputTimeUnit(TimeUnit.NANOSECONDS)
  @Fork(value = 3, jvmArgsAppend = { "--add-modules=jdk.incubator.foreign", "--enable-native-access=ALL-UNNAMED" })
- public class Upcalls {
+ public class Upcalls extends CLayouts {
  
-     static final CLinker abi = CLinker.getInstance();
+     static final CLinker abi = CLinker.systemCLinker();
      static final MethodHandle blank;
      static final MethodHandle identity;
      static final MethodHandle args5;
      static final MethodHandle args10;
  
-     static final MemoryAddress cb_blank;
-     static final MemoryAddress cb_identity;
-     static final MemoryAddress cb_args5;
-     static final MemoryAddress cb_args10;
+     static final NativeSymbol cb_blank;
+     static final NativeSymbol cb_identity;
+     static final NativeSymbol cb_args5;
+     static final NativeSymbol cb_args10;
  
      static final long cb_blank_jni;
      static final long cb_identity_jni;
      static final long cb_args5_jni;
      static final long cb_args10_jni;
  
      static {
          System.loadLibrary("UpcallsJNI");
  
          String className = "org/openjdk/bench/jdk/incubator/foreign/Upcalls";
-         cb_blank_jni = makeCB(className, "blank", "()V");
-         cb_identity_jni = makeCB(className, "identity", "(I)I");
-         cb_args5_jni = makeCB(className, "args5", "(JDJDJ)V");
-         cb_args10_jni = makeCB(className, "args10", "(JDJDJDJDJD)V");
+         cb_blank_jni = JNICB.makeCB(className, "blank", "()V");
+         cb_identity_jni = JNICB.makeCB(className, "identity", "(I)I");
+         cb_args5_jni = JNICB.makeCB(className, "args5", "(JDJDJ)V");
+         cb_args10_jni = JNICB.makeCB(className, "args10", "(JDJDJDJDJD)V");
  
          try {
              System.loadLibrary("Upcalls");
              {
                  String name = "blank";
                  MethodType mt = MethodType.methodType(void.class);
                  FunctionDescriptor fd = FunctionDescriptor.ofVoid();
  
-                 blank = linkFunc(name, mt, fd);
+                 blank = linkFunc(name, fd);
                  cb_blank = makeCB(name, mt, fd);
              }
              {
                  String name = "identity";
                  MethodType mt = MethodType.methodType(int.class, int.class);
                  FunctionDescriptor fd = FunctionDescriptor.of(C_INT, C_INT);
  
-                 identity = linkFunc(name, mt, fd);
+                 identity = linkFunc(name, fd);
                  cb_identity = makeCB(name, mt, fd);
              }
              {
                  String name = "args5";
                  MethodType mt = MethodType.methodType(void.class,
                          long.class, double.class, long.class, double.class, long.class);
                  FunctionDescriptor fd = FunctionDescriptor.ofVoid(
                          C_LONG_LONG, C_DOUBLE, C_LONG_LONG, C_DOUBLE, C_LONG_LONG);
  
-                 args5 = linkFunc(name, mt, fd);
+                 args5 = linkFunc(name, fd);
                  cb_args5 = makeCB(name, mt, fd);
              }
              {
                  String name = "args10";
                  MethodType mt = MethodType.methodType(void.class,

@@ -114,48 +111,46 @@
                          double.class, long.class, double.class, long.class, double.class);
                  FunctionDescriptor fd = FunctionDescriptor.ofVoid(
                          C_LONG_LONG, C_DOUBLE, C_LONG_LONG, C_DOUBLE, C_LONG_LONG,
                          C_DOUBLE, C_LONG_LONG, C_DOUBLE, C_LONG_LONG, C_DOUBLE);
  
-                 args10 = linkFunc(name, mt, fd);
+                 args10 = linkFunc(name, fd);
                  cb_args10 = makeCB(name, mt, fd);
              }
          } catch (ReflectiveOperationException e) {
              throw new BootstrapMethodError(e);
          }
      }
  
-     static MethodHandle linkFunc(String name, MethodType baseType, FunctionDescriptor baseDesc) {
+     static MethodHandle linkFunc(String name, FunctionDescriptor baseDesc) {
          return abi.downcallHandle(
              SymbolLookup.loaderLookup().lookup(name).orElseThrow(),
-             baseType.insertParameterTypes(baseType.parameterCount(), MemoryAddress.class),
-             baseDesc.withAppendedArgumentLayouts(C_POINTER)
+                 baseDesc.withAppendedArgumentLayouts(C_POINTER)
          );
      }
  
-     static MemoryAddress makeCB(String name, MethodType mt, FunctionDescriptor fd) throws ReflectiveOperationException {
+     static NativeSymbol makeCB(String name, MethodType mt, FunctionDescriptor fd) throws ReflectiveOperationException {
          return abi.upcallStub(
              lookup().findStatic(Upcalls.class, name, mt),
              fd, ResourceScope.globalScope()
-         ).address();
+         );
      }
  
      static native void blank(long cb);
      static native int identity(int x, long cb);
      static native void args5(long a0, double a1, long a2, double a3, long a4, long cb);
      static native void args10(long a0, double a1, long a2, double a3, long a4,
                                double a5, long a6, double a7, long a8, double a9, long cb);
-     static native long makeCB(String holder, String name, String signature);
  
      @Benchmark
      public void jni_blank() throws Throwable {
          blank(cb_blank_jni);
      }
  
      @Benchmark
      public void panama_blank() throws Throwable {
-         blank.invokeExact(cb_blank);
+         blank.invokeExact((Addressable)cb_blank);
      }
  
      @Benchmark
      public int jni_identity() throws Throwable {
          return identity(10, cb_identity_jni);

@@ -171,21 +166,21 @@
          args10(1L, 2D, 3L, 4D, 5L, 6D, 7L, 8D, 9L, 10D, cb_args10_jni);
      }
  
      @Benchmark
      public int panama_identity() throws Throwable {
-         return (int) identity.invokeExact(10, cb_identity);
+         return (int) identity.invokeExact(10, (Addressable)cb_identity);
      }
  
      @Benchmark
      public void panama_args5() throws Throwable {
-         args5.invokeExact(1L, 2D, 3L, 4D, 5L, cb_args5);
+         args5.invokeExact(1L, 2D, 3L, 4D, 5L, (Addressable)cb_args5);
      }
  
      @Benchmark
      public void panama_args10() throws Throwable {
-         args10.invokeExact(1L, 2D, 3L, 4D, 5L, 6D, 7L, 8D, 9L, 10D, cb_args10);
+         args10.invokeExact(1L, 2D, 3L, 4D, 5L, 6D, 7L, 8D, 9L, 10D, (Addressable)cb_args10);
      }
  
      static void blank() {}
      static int identity(int x) { return x; }
      static void args5(long a0, double a1, long a2, double a3, long a4) { }
< prev index next >