[GR-52437] Avoid HashMap lookup for resolving tagged pointers.

PullRequest: graalpython/3226

Author: fangerer

graalpython/com.oracle.graal.python.cext/src/capi.h

@@ -105,6 +105,11 @@ typedef struct {
 
 typedef struct {
     PyObject_VAR_HEAD
+    int32_t handle_table_index;
+} GraalPyObject;
+
+typedef struct {
+    GraalPyObject ob_base;
     PyObject **ob_item;
 } GraalPyVarObject;
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyTruffleObjectFree.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -44,7 +44,9 @@
 
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.ClearNativeWrapperNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions;
+import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.HandleContext;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.HandlePointerConverter;
+import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.PythonObjectReference;
 import com.oracle.graal.python.builtins.objects.cext.common.CArrayWrappers.CArrayWrapper;
 import com.oracle.graal.python.builtins.objects.cext.structs.CStructAccess;
 import com.oracle.graal.python.builtins.objects.cext.structs.CStructAccessFactory;
@@ -123,12 +125,21 @@ static void releaseNativeWrapper(PythonNativeWrapper nativeWrapper, CStructAcces
             }
             if (HandlePointerConverter.pointsToPyHandleSpace(nativePointer)) {
                 // In this case, we are up to free a native object stub.
-                nativePointer = HandlePointerConverter.pointerToStub(nativePointer);
-                assert CApiTransitions.nativeStubLookupGet(PythonContext.get(freeNode).nativeContext, nativePointer) == null;
+                assert tableEntryRemoved(PythonContext.get(freeNode).nativeContext, nativeWrapper);
             } else {
                 CApiTransitions.nativeLookupRemove(PythonContext.get(freeNode).nativeContext, nativePointer);
             }
             freeNode.free(nativePointer);
         }
     }
+
+    private static boolean tableEntryRemoved(HandleContext context, PythonNativeWrapper nativeWrapper) {
+        PythonObjectReference ref = nativeWrapper.ref;
+        if (ref != null) {
+            int id = ref.getHandleTableIndex();
+            return id <= 0 || CApiTransitions.nativeStubLookupGet(context, nativeWrapper.getNativePointer(), id) == null;
+        }
+        // there cannot be a table entry if the wrapper does not have a PythonObjectReference
+        return true;
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/transitions/CApiTransitions.java

@@ -314,7 +314,7 @@ private static String dlopenFlagsToString(int flags) {
     public static Object loadCExtModule(Node location, PythonContext context, ModuleSpec spec, CheckFunctionResultNode checkFunctionResultNode)
                     throws IOException, ApiInitException, ImportException {
 
-        // we always need to load the CPython C API (even for HPy modules)
+        // we always need to load the CPython C API
         CApiContext cApiContext = CApiContext.ensureCapiWasLoaded(location, context, spec.name, spec.path);
         Object library;
         InteropLibrary interopLib;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/common/CExtContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -42,12 +42,21 @@
 
 import java.util.Arrays;
 
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+
 public final class HandleStack {
     private int[] handles;
     private int top = 0;
 
     public HandleStack(int initialCapacity) {
+        this(initialCapacity, false);
+    }
+
+    public HandleStack(int initialCapacity, boolean fill) {
         handles = new int[initialCapacity];
+        if (fill) {
+            pushRange(0, initialCapacity);
+        }
     }
 
     public void push(int i) {
@@ -57,6 +66,24 @@ public void push(int i) {
         handles[top++] = i;
     }
 
+    /**
+     * Push a range of values to the stack.
+     *
+     * @param start The first value to push (inclusive).
+     * @param end The last value to push (exclusive).
+     */
+    @TruffleBoundary
+    public void pushRange(int start, int end) {
+        int n = end - start;
+        if (top + n > handles.length) {
+            handles = Arrays.copyOf(handles, top + n);
+        }
+        for (int i = 0; i < n; i++) {
+            handles[top + i] = end - i - 1;
+        }
+        top += n;
+    }
+
     public int pop() {
         if (top <= 0) {
             return -1;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/common/HandleStack.java

@@ -116,6 +116,7 @@ public enum CFields {
 
     PyVarObject__ob_size(Py_ssize_t),
 
+    GraalPyObject__handle_table_index(Int),
     GraalPyVarObject__ob_item(PyObjectPtr),
 
     PyModuleDef__m_name(ConstCharPtr),

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/structs/CFields.java

@@ -988,6 +988,10 @@ static void writeManaged(Object pointer, long offset, short value,
     @GenerateUncached
     public abstract static class WriteIntNode extends Node implements CStructAccessNode {
 
+        public static void writeUncached(Object pointer, CFields field, int value) {
+            CStructAccessFactory.WriteIntNodeGen.getUncached().write(pointer, field, value);
+        }
+
         abstract void execute(Object pointer, long offset, int value);
 
         public final void write(Object pointer, CFields field, int value) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/structs/CStructAccess.java

@@ -53,6 +53,7 @@ public enum CStructs {
     PyModuleDef_Slot,
     PyMethodDef,
     PyObject,
+    GraalPyObject,
     PyBytesObject,
     PyByteArrayObject,
     PyListObject,

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/structs/CStructs.java

@@ -213,7 +213,7 @@ public final class PythonContext extends Python3Core {
 
     private static final TruffleLogger LOGGER = PythonLanguage.getLogger(PythonContext.class);
 
-    public final HandleContext nativeContext = new HandleContext();
+    public final HandleContext nativeContext = new HandleContext(DEBUG_CAPI);
     private volatile boolean finalizing;
 
     @TruffleBoundary