Add profile for NO_VALUE in DynamicObjectStorage.GetItemWithState.

Author: fangerer

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

@@ -146,16 +146,18 @@ private static int incrementLen(DynamicObjectStorage self, ReadAttributeFromDyna
     public static class GetItemWithState {
         @Specialization
         static Object string(DynamicObjectStorage self, String key, ThreadState state,
-                        @Shared("readKey") @Cached ReadAttributeFromDynamicObjectNode readKey) {
+                        @Shared("readKey") @Cached ReadAttributeFromDynamicObjectNode readKey,
+                        @Exclusive @Cached("createBinaryProfile()") ConditionProfile noValueProfile) {
             Object result = readKey.execute(self.store, key);
-            return result == PNone.NO_VALUE ? null : result;
+            return noValueProfile.profile(result == PNone.NO_VALUE) ? null : result;
         }
 
         @Specialization(guards = "isBuiltinString(key, profile)", limit = "1")
         static Object pstring(DynamicObjectStorage self, PString key, ThreadState state,
                         @Shared("readKey") @Cached ReadAttributeFromDynamicObjectNode readKey,
-                        @Shared("builtinStringProfile") @Cached IsBuiltinClassProfile profile) {
-            return string(self, key.getValue(), state, readKey);
+                        @Shared("builtinStringProfile") @Cached IsBuiltinClassProfile profile,
+                        @Exclusive @Cached("createBinaryProfile()") ConditionProfile noValueProfile) {
+            return string(self, key.getValue(), state, readKey, noValueProfile);
         }
 
         @Specialization(guards = {"cachedShape == self.store.getShape()", "!isBuiltinString(key, profile)"}, limit = "1")
@@ -166,20 +168,21 @@ static Object notString(DynamicObjectStorage self, Object key, ThreadState state
                         @Cached(value = "cachedShape.getKeyList().toArray()", dimensions = 1) Object[] keyList,
                         @Shared("builtinStringProfile") @Cached IsBuiltinClassProfile profile,
                         @CachedLibrary(limit = "2") PythonObjectLibrary lib,
-                        @Exclusive @Cached("createBinaryProfile()") ConditionProfile gotState) {
+                        @Exclusive @Cached("createBinaryProfile()") ConditionProfile gotState,
+                        @Exclusive @Cached("createBinaryProfile()") ConditionProfile noValueProfile) {
             long hash = self.getHashWithState(key, lib, state, gotState);
             for (int i = 0; i < keyList.length; i++) {
                 Object currentKey = keyList[i];
                 if (currentKey instanceof String) {
                     if (gotState.profile(state != null)) {
                         long keyHash = lib.hashWithState(currentKey, state);
                         if (keyHash == hash && lib.equalsWithState(key, currentKey, lib, state)) {
-                            return string(self, (String) currentKey, state, readKey);
+                            return string(self, (String) currentKey, state, readKey, noValueProfile);
                         }
                     } else {
                         long keyHash = lib.hash(currentKey);
                         if (keyHash == hash && lib.equals(key, currentKey, lib)) {
-                            return string(self, (String) currentKey, null, readKey);
+                            return string(self, (String) currentKey, null, readKey, noValueProfile);
                         }
                     }
                 }
@@ -192,7 +195,8 @@ static Object notStringLoop(DynamicObjectStorage self, Object key, ThreadState s
                         @Shared("readKey") @Cached ReadAttributeFromDynamicObjectNode readKey,
                         @Shared("builtinStringProfile") @Cached IsBuiltinClassProfile profile,
                         @CachedLibrary(limit = "2") PythonObjectLibrary lib,
-                        @Exclusive @Cached("createBinaryProfile()") ConditionProfile gotState) {
+                        @Exclusive @Cached("createBinaryProfile()") ConditionProfile gotState,
+                        @Exclusive @Cached("createBinaryProfile()") ConditionProfile noValueProfile) {
             long hash = self.getHashWithState(key, lib, state, gotState);
             Iterator<Object> keys = self.store.getShape().getKeys().iterator();
             while (hasNext(keys)) {
@@ -202,12 +206,12 @@ static Object notStringLoop(DynamicObjectStorage self, Object key, ThreadState s
                     if (gotState.profile(state != null)) {
                         keyHash = lib.hashWithState(currentKey, state);
                         if (keyHash == hash && lib.equalsWithState(key, currentKey, lib, state)) {
-                            return string(self, (String) currentKey, state, readKey);
+                            return string(self, (String) currentKey, state, readKey, noValueProfile);
                         }
                     } else {
                         keyHash = lib.hash(currentKey);
                         if (keyHash == hash && lib.equals(key, currentKey, lib)) {
-                            return string(self, (String) currentKey, null, readKey);
+                            return string(self, (String) currentKey, null, readKey, noValueProfile);
                         }
                     }
                 }

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

@@ -75,7 +75,6 @@
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.attributes.LookupInheritedAttributeNode;
-import com.oracle.graal.python.nodes.attributes.ReadAttributeFromDynamicObjectNode;
 import com.oracle.graal.python.nodes.builtins.ListNodes.FastConstructListNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode;
@@ -91,8 +90,6 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.Cached;
-import com.oracle.truffle.api.dsl.Cached.Exclusive;
-import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.CachedContext;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.GenerateUncached;
@@ -366,7 +363,7 @@ public static GetItemNode create() {
         public abstract Object execute(VirtualFrame frame, HashingStorage storage, Object key);
 
         @Specialization
-        Object doGeneric(@SuppressWarnings("unused") VirtualFrame frame, HashingStorage storage, Object key,
+        static Object doGeneric(@SuppressWarnings("unused") VirtualFrame frame, HashingStorage storage, Object key,
                         @Cached("createBinaryProfile()") ConditionProfile hasFrame,
                         @CachedLibrary(limit = "3") HashingStorageLibrary lib) {
             if (hasFrame.profile(frame != null)) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/ReadGlobalOrBuiltinNode.java

@@ -32,11 +32,9 @@
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.common.HashingStorage;
 import com.oracle.graal.python.builtins.objects.common.HashingStorageLibrary;
-import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
-import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.nodes.BuiltinNames;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;