[GR-35718] Use HPy NFI backend by default for benchmarks.

PullRequest: graalpython/2071

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContext.java

@@ -1140,30 +1140,35 @@ final void toNative() {
                 if (initJNI(this, castLong(nativePointer)) != 0) {
                     throw new RuntimeException("Could not initialize HPy JNI backend.");
                 }
-            }
-            if (useNativeFastPaths) {
-                PythonContext context = getContext();
-                InteropLibrary interop = InteropLibrary.getUncached();
-                SignatureLibrary signatures = SignatureLibrary.getUncached();
-                try {
-                    Object rlib = evalNFI(context, "load \"" + getJNILibrary() + "\"", "load " + PythonContext.PYTHON_JNI_LIBRARY_NAME);
+                /*
+                 * Currently, the native fast path functions are only available if the JNI backend
+                 * is used because they rely on 'initJNI' being called. In future, we might also
+                 * want to use the native fast path functions for the NFI backend.
+                 */
+                if (useNativeFastPaths) {
+                    PythonContext context = getContext();
+                    InteropLibrary interop = InteropLibrary.getUncached();
+                    SignatureLibrary signatures = SignatureLibrary.getUncached();
+                    try {
+                        Object rlib = evalNFI(context, "load \"" + getJNILibrary() + "\"", "load " + PythonContext.PYTHON_JNI_LIBRARY_NAME);
 
-                    Object augmentSignature = evalNFI(context, "(POINTER):VOID", "hpy-nfi-signature");
-                    Object augmentFunction = interop.readMember(rlib, "initDirectFastPaths");
-                    signatures.call(augmentSignature, augmentFunction, nativePointer);
+                        Object augmentSignature = evalNFI(context, "(POINTER):VOID", "hpy-nfi-signature");
+                        Object augmentFunction = interop.readMember(rlib, "initDirectFastPaths");
+                        signatures.call(augmentSignature, augmentFunction, nativePointer);
 
-                    Object setNativeSpaceSignature = evalNFI(context, "(POINTER, SINT64):VOID", "hpy-nfi-signature");
-                    setNativeSpaceFunction = signatures.bind(setNativeSpaceSignature, interop.readMember(rlib, "setHPyContextNativeSpace"));
+                        Object setNativeSpaceSignature = evalNFI(context, "(POINTER, SINT64):VOID", "hpy-nfi-signature");
+                        setNativeSpaceFunction = signatures.bind(setNativeSpaceSignature, interop.readMember(rlib, "setHPyContextNativeSpace"));
 
-                    /*
-                     * Allocate a native array for the native space pointers of HPy objects and
-                     * initialize it.
-                     */
-                    allocateNativeSpacePointersMirror();
+                        /*
+                         * Allocate a native array for the native space pointers of HPy objects and
+                         * initialize it.
+                         */
+                        allocateNativeSpacePointersMirror();
 
-                    interop.execute(setNativeSpaceFunction, nativePointer, nativeSpacePointers);
-                } catch (UnsupportedTypeException | ArityException | UnsupportedMessageException | UnknownIdentifierException e) {
-                    throw CompilerDirectives.shouldNotReachHere();
+                        interop.execute(setNativeSpaceFunction, nativePointer, nativeSpacePointers);
+                    } catch (UnsupportedTypeException | ArityException | UnsupportedMessageException | UnknownIdentifierException e) {
+                        throw CompilerDirectives.shouldNotReachHere();
+                    }
                 }
             }
         }
@@ -1489,7 +1494,7 @@ public final long ctxGetItemi(long hCollection, long lidx) {
 
     /**
      * HPy signature: {@code HPy_SetItem(HPyContext ctx, HPy obj, HPy key, HPy value)}
-     * 
+     *
      * @param hSequence
      * @param hKey
      * @param hValue

mx.graalpython/mx_graalpython.py

@@ -1578,20 +1578,21 @@ def _register_vms(namespace):
         '--llvm.managed', '--python.PosixModuleBackend=java'
     ]), SUITE, 10)
     python_vm_registry.add_vm(GraalPythonVm(config_name=CONFIGURATION_NATIVE, extra_polyglot_args=[
+        '--experimental-options', '--python.HPyBackend=NFI'
     ]), SUITE, 10)
     python_vm_registry.add_vm(GraalPythonVm(config_name=CONFIGURATION_NATIVE_INTERPRETER, extra_polyglot_args=[
-        '--experimental-options', '--engine.Compilation=false']), SUITE, 10)
+        '--experimental-options', '--engine.Compilation=false', '--python.HPyBackend=NFI']), SUITE, 10)
     python_vm_registry.add_vm(GraalPythonVm(config_name=CONFIGURATION_SANDBOXED_MULTI, extra_polyglot_args=[
         '--experimental-options', '-multi-context', '--llvm.managed', '--python.PosixModuleBackend=java'
     ]), SUITE, 10)
     python_vm_registry.add_vm(GraalPythonVm(config_name=CONFIGURATION_NATIVE_MULTI, extra_polyglot_args=[
-        '--experimental-options', '-multi-context',
+        '--experimental-options', '-multi-context', '--python.HPyBackend=NFI'
     ]), SUITE, 10)
     python_vm_registry.add_vm(GraalPythonVm(config_name=CONFIGURATION_NATIVE_INTERPRETER_MULTI, extra_polyglot_args=[
-        '--experimental-options', '-multi-context', '--engine.Compilation=false',
+        '--experimental-options', '-multi-context', '--engine.Compilation=false', '--python.HPyBackend=NFI'
     ]), SUITE, 10)
     python_vm_registry.add_vm(GraalPythonVm(config_name=CONFIGURATION_NATIVE_MULTI_TIER, extra_polyglot_args=[
-        '--experimental-options', '--engine.MultiTier=true',
+        '--experimental-options', '--engine.MultiTier=true', '--python.HPyBackend=NFI'
     ]), SUITE, 10)
 
     # java embedding driver