[GR-64249] [GR-64247] Review ExplodeLoop usages in Bytecode DSL interpreter.

PullRequest: graalpython/3768

Author: steve-s

graalpython/com.oracle.graal.python.benchmarks/python/harness.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2025, 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
@@ -270,9 +270,10 @@ def get_bench_module(bench_file):
         name = bench_file.rpartition(os.sep)[2].partition(".")[0].replace('.py', '')
         directory = bench_file.rpartition(os.sep)[0]
         pkg = []
-        while any(f.endswith("__init__.py") for f in os.listdir(directory)):
-            directory, slash, postfix = directory.rpartition("/")
-            pkg.insert(0, postfix)
+        if directory:
+            while any(f.endswith("__init__.py") for f in os.listdir(directory)):
+                directory, slash, postfix = directory.rpartition("/")
+                pkg.insert(0, postfix)
 
         if pkg:
             sys.path.insert(0, directory)

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/objects/ObjectHashMapTests.java

@@ -52,7 +52,6 @@
 import java.util.Random;
 import java.util.stream.Collectors;
 
-import com.oracle.graal.python.lib.RichCmpOp;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -68,8 +67,10 @@
 import com.oracle.graal.python.builtins.objects.common.ObjectHashMap;
 import com.oracle.graal.python.builtins.objects.common.ObjectHashMap.MapCursor;
 import com.oracle.graal.python.builtins.objects.common.ObjectHashMap.PopNode;
+import com.oracle.graal.python.builtins.objects.common.ObjectHashMap.PutUnsafeNode;
 import com.oracle.graal.python.lib.PyObjectHashNode;
 import com.oracle.graal.python.lib.PyObjectRichCompareBool;
+import com.oracle.graal.python.lib.RichCmpOp;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.interop.TruffleObject;
 import com.oracle.truffle.api.nodes.Node;
@@ -100,7 +101,7 @@ public boolean execute(Frame frame, Node inliningTarget, Object a, Object b, Ric
 
     @Test
     public void testCollisionsByPuttingManyKeysWithSameHash() {
-        ObjectHashMap map = new ObjectHashMap();
+        ObjectHashMap map = new ObjectHashMap(true);
         LinkedHashMap<DictKey, Object> expected = new LinkedHashMap<>();
         for (int i = 0; i < 100; i++) {
             DictKey key = new DictKey(42);
@@ -126,7 +127,7 @@ public void testCollisionsByPuttingManyKeysWithSameHash() {
 
     @Test
     public void testCollisionsByPuttingAndRemovingTheSameKey() {
-        ObjectHashMap map = new ObjectHashMap();
+        ObjectHashMap map = new ObjectHashMap(true);
         LinkedHashMap<DictKey, Object> expected = new LinkedHashMap<>();
         DictKey key = new DictKey(42);
         for (int i = 0; i < 100; i++) {
@@ -143,7 +144,7 @@ public void testCollisionsByPuttingAndRemovingTheSameKey() {
 
     @Test
     public void testCollisionsByPuttingAndRemovingTheSameKeys() {
-        ObjectHashMap map = new ObjectHashMap();
+        ObjectHashMap map = new ObjectHashMap(true);
         LinkedHashMap<DictKey, Object> expected = new LinkedHashMap<>();
         DictKey[] keys = new DictKey[]{new DictKey(42), new DictKey(1)};
         for (int i = 0; i < 100; i++) {
@@ -162,7 +163,7 @@ public void testCollisionsByPuttingAndRemovingTheSameKeys() {
 
     @Test
     public void testLongHashMapStressTest() {
-        ObjectHashMap map = new ObjectHashMap();
+        ObjectHashMap map = new ObjectHashMap(true);
 
         // put/remove many random (with fixed seed) keys, check consistency against LinkedHashMap
         testBasics(map);
@@ -373,7 +374,7 @@ private static void remove(ObjectHashMap map, Object key, long hash) {
 
     private static void put(ObjectHashMap map, Object key, long hash, Object value) {
         InlinedCountingConditionProfile uncachedCounting = InlinedCountingConditionProfile.getUncached();
-        ObjectHashMap.PutNode.doPutWithRestart(null, null, map, key, hash, value,
+        PutUnsafeNode.doPutWithRestart(null, null, map, key, hash, value,
                         InlinedBranchProfile.getUncached(), uncachedCounting, uncachedCounting, uncachedCounting,
                         uncachedCounting, InlinedBranchProfile.getUncached(), InlinedBranchProfile.getUncached(),
                         new EqNodeStub());

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_pystate.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2025, 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
@@ -111,4 +111,4 @@ def other_thread():
         SetAsyncExcCaller.trigger_ex(t.ident, Exception("test my message"))
         t.join()
 
-        assert "test my message" in str(caught_ex)
+        assert "test my message" in str(caught_ex), str(caught_ex)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ErrnoModuleBuiltins.java

@@ -51,7 +51,6 @@
 import com.oracle.graal.python.builtins.objects.common.EconomicMapStorage;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.exception.OSErrorEnum;
-import com.oracle.graal.python.lib.PyObjectHashNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.runtime.object.PFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
@@ -82,6 +81,6 @@ public void initialize(Python3Core core) {
 
     private void addConstant(int number, TruffleString name, EconomicMapStorage storage) {
         addBuiltinConstant(name, number);
-        storage.putUncachedWithJavaEq(number, PyObjectHashNode.hash(number), name);
+        storage.putUncached(number, name);
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixModuleBuiltins.java

@@ -2874,8 +2874,8 @@ abstract static class SysconfNode extends PythonUnaryBuiltinNode {
         public static final EconomicMapStorage SYSCONF_NAMES = EconomicMapStorage.create();
         static {
             // TODO populate from constants
-            SYSCONF_NAMES.putUncachedWithJavaEq(T_SC_CLK_TCK, SC_CLK_TCK);
-            SYSCONF_NAMES.putUncachedWithJavaEq(T_SC_NPROCESSORS_ONLN, SC_NPROCESSORS_ONLN);
+            SYSCONF_NAMES.putUncached(T_SC_CLK_TCK, SC_CLK_TCK);
+            SYSCONF_NAMES.putUncached(T_SC_NPROCESSORS_ONLN, SC_NPROCESSORS_ONLN);
         }
 
         @Specialization

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SysModuleBuiltins.java

@@ -611,6 +611,9 @@ public void postInitialize0(Python3Core core) {
         }
         sys.setAttribute(tsLiteral("dont_write_bytecode"), context.getOption(PythonOptions.DontWriteBytecodeFlag));
         TruffleString pycachePrefix = context.getOption(PythonOptions.PyCachePrefix);
+        if (pycachePrefix.isEmpty() && PythonOptions.ENABLE_BYTECODE_DSL_INTERPRETER && System.getenv("CI") == null) {
+            pycachePrefix = PythonUtils.toTruffleStringUncached("__bci_dsl_pycache__");
+        }
         sys.setAttribute(tsLiteral("pycache_prefix"), pycachePrefix.isEmpty() ? PNone.NONE : pycachePrefix);
         sys.setAttribute(tsLiteral("_stdlib_dir"), stdlibHome);
 
@@ -683,7 +686,7 @@ public void postInitialize0(Python3Core core) {
     private static PFrozenSet createStdLibModulesSet(PythonLanguage language) {
         EconomicMapStorage storage = EconomicMapStorage.create(STDLIB_MODULE_NAMES.length);
         for (String s : STDLIB_MODULE_NAMES) {
-            storage.putUncachedWithJavaEq(s, PNone.NONE);
+            storage.putUncached(s, PNone.NONE);
         }
         return PFactory.createFrozenSet(language, storage);
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/hashlib/HashlibModuleBuiltins.java

@@ -157,7 +157,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
     public void initialize(Python3Core core) {
         EconomicMapStorage algos = EconomicMapStorage.create(DIGEST_ALGORITHMS.length);
         for (var digest : DIGEST_ALGORITHMS) {
-            algos.putUncachedWithJavaEq(digest, PNone.NONE);
+            algos.putUncached(digest, PNone.NONE);
         }
         PythonLanguage language = core.getLanguage();
         addBuiltinConstant("openssl_md_meth_names", PFactory.createFrozenSet(language, algos));

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, 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
@@ -50,6 +50,7 @@
 import com.oracle.graal.python.builtins.objects.common.ObjectHashMap.DictKey;
 import com.oracle.graal.python.builtins.objects.common.ObjectHashMap.MapCursor;
 import com.oracle.graal.python.builtins.objects.common.ObjectHashMap.PutNode;
+import com.oracle.graal.python.builtins.objects.common.ObjectHashMap.PutUnsafeNode;
 import com.oracle.graal.python.lib.PyObjectHashNode;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -131,11 +132,15 @@ void clear() {
         map.clear();
     }
 
+    public boolean mapIsEqualTo(ObjectHashMap other) {
+        return other == this.map;
+    }
+
     public HashingStorage copy() {
         return new EconomicMapStorage(this.map, true);
     }
 
-    protected void setValueForAllKeys(VirtualFrame frame, Node inliningTarget, Object value, PutNode putNode, InlinedLoopConditionProfile loopProfile) {
+    protected void setValueForAllKeys(VirtualFrame frame, Node inliningTarget, Object value, PutUnsafeNode putNode, InlinedLoopConditionProfile loopProfile) {
         MapCursor cursor = map.getEntries();
         final int size = map.size();
         loopProfile.profileCounted(inliningTarget, size);
@@ -147,26 +152,23 @@ protected void setValueForAllKeys(VirtualFrame frame, Node inliningTarget, Objec
 
     @TruffleBoundary
     public void putUncached(TruffleString key, Object value) {
-        ObjectHashMap.PutNode.putUncached(this.map, key, PyObjectHashNode.hash(key, HashCodeNode.getUncached()), value);
-    }
-
-    private void putUncached(Object key, Object value) {
-        ObjectHashMap.PutNode.putUncached(this.map, key, PyObjectHashNode.executeUncached(key), value);
+        PutUnsafeNode.putUncached(this.map, key, PyObjectHashNode.hash(key, HashCodeNode.getUncached()), value);
     }
 
-    // Solves boot-order problem, do not use in normal code or during startup when __eq__ of
-    // builtins may not be properly set-up
-    public void putUncachedWithJavaEq(Object key, long keyHash, Object value) {
-        ObjectHashMap.PutNode.putUncachedWithJavaEq(this.map, key, keyHash, value);
+    @TruffleBoundary
+    public void putUncached(Object key, Object value) {
+        PutNode.getUncached().execute(null, null, this.map, key, PyObjectHashNode.executeUncached(key), value);
     }
 
-    public void putUncachedWithJavaEq(TruffleString key, Object value) {
-        putUncachedWithJavaEq(key, PyObjectHashNode.hash(key, HashCodeNode.getUncached()), value);
+    @TruffleBoundary
+    public void putUncached(int key, Object value) {
+        PutUnsafeNode.putUncached(this.map, key, PyObjectHashNode.hash(key), value);
     }
 
-    public void putUncachedWithJavaEq(String key, Object value) {
+    @TruffleBoundary
+    public void putUncached(String key, Object value) {
         TruffleString ts = toTruffleStringUncached(key);
-        putUncachedWithJavaEq(ts, value);
+        putUncached(ts, value);
     }
 
     private static void putAllUncached(LinkedHashMap<String, Object> map, EconomicMapStorage result) {
@@ -212,7 +214,7 @@ public abstract static class EconomicMapSetStringKey extends SpecializedSetStrin
         @Specialization
         static void doIt(Node inliningTarget, HashingStorage self, TruffleString key, Object value,
                         @Cached PyObjectHashNode hashNode,
-                        @Cached PutNode putNode) {
+                        @Cached PutUnsafeNode putNode) {
             putNode.put(null, inliningTarget, ((EconomicMapStorage) self).map, key, hashNode.execute(null, inliningTarget, key), value);
         }
     }

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

@@ -51,6 +51,7 @@
 import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.HashingStorageIteratorKey;
 import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.HashingStorageIteratorNext;
 import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.HashingStorageSetItem;
+import com.oracle.graal.python.builtins.objects.common.ObjectHashMap.PutUnsafeNode;
 import com.oracle.graal.python.builtins.objects.dict.DictNodes;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.dict.PDictView;
@@ -120,7 +121,7 @@ abstract static class SetValueHashingStorageNode extends PNodeWithContext {
 
         @Specialization
         static HashingStorage doEconomicStorage(VirtualFrame frame, Node inliningTarget, EconomicMapStorage map, Object value,
-                        @Cached ObjectHashMap.PutNode putNode,
+                        @Cached PutUnsafeNode putNode,
                         @Cached InlinedLoopConditionProfile loopProfile) {
             // We want to avoid calling __hash__() during map.put
             map.setValueForAllKeys(frame, inliningTarget, value, putNode, loopProfile);