Skip to content

Commit 9e09a55

Browse files
steve-ssteve-s
committed
[GR-46187] Use uncached nodes in bytecode interpreter.
PullRequest: graalpython/2798
2 parents 95a2cce + 2d308c1 commit 9e09a55

File tree

5 files changed

+40
-28
lines changed

5 files changed

+40
-28
lines changed

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyObjectFormat.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
import com.oracle.graal.python.nodes.call.special.CallBinaryMethodNode;
5757
import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode;
5858
import com.oracle.graal.python.nodes.object.GetClassNode;
59-
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
59+
import com.oracle.graal.python.util.PythonUtils;
6060
import com.oracle.truffle.api.dsl.Cached;
6161
import com.oracle.truffle.api.dsl.Cached.Exclusive;
6262
import com.oracle.truffle.api.dsl.Cached.Shared;
@@ -134,11 +134,11 @@ static Object doGeneric(VirtualFrame frame, Object obj, Object formatSpec,
134134
}
135135

136136
@Specialization(guards = "isString(formatSpec)", replaces = "doGeneric")
137-
@TruffleBoundary
138-
static Object doGenericUncached(Object obj, Object formatSpec) {
137+
static Object doGenericUncached(VirtualFrame frame, Object obj, Object formatSpec) {
138+
PythonUtils.assertUncached();
139139
Object klass = GetClassNode.getUncached().execute(obj);
140140
Object slot = LookupCallableSlotInMRONode.getUncached(SpecialMethodSlot.Format).execute(klass);
141-
return CallBinaryMethodNode.getUncached().executeObject(null, slot, obj, formatSpec);
141+
return CallBinaryMethodNode.getUncached().executeObject(frame, slot, obj, formatSpec);
142142
}
143143

144144
// Note: PRaiseNode is @Exclusive to workaround a bug in DSL

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/DeleteAttributeNode.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import com.oracle.graal.python.nodes.call.special.CallBinaryMethodNode;
4646
import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode;
4747
import com.oracle.graal.python.nodes.object.GetClassNode;
48-
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
48+
import com.oracle.graal.python.util.PythonUtils;
4949
import com.oracle.truffle.api.dsl.Cached;
5050
import com.oracle.truffle.api.dsl.GenerateUncached;
5151
import com.oracle.truffle.api.dsl.NeverDefault;
@@ -68,10 +68,10 @@ protected void doIt(VirtualFrame frame, Object object, Object key,
6868
}
6969

7070
@Specialization(replaces = "doIt")
71-
@TruffleBoundary
72-
protected void doItUncached(Object object, Object key) {
71+
protected void doItUncached(VirtualFrame frame, Object object, Object key) {
72+
PythonUtils.assertUncached();
7373
Object klass = GetClassNode.getUncached().execute(object);
7474
Object method = LookupCallableSlotInMRONode.getUncached(SpecialMethodSlot.DelAttr).execute(klass);
75-
CallBinaryMethodNode.getUncached().executeObject(null, method, object, key);
75+
CallBinaryMethodNode.getUncached().executeObject(frame, method, object, key);
7676
}
7777
}

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/PBytecodeRootNode.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,8 @@ public final class PBytecodeRootNode extends PRootNode implements BytecodeOSRNod
256256
private static final NodeSupplier<CastToJavaIntExactNode> NODE_CAST_TO_JAVA_INT_EXACT = CastToJavaIntExactNode::create;
257257
private static final CastToJavaIntExactNode UNCACHED_CAST_TO_JAVA_INT_EXACT = CastToJavaIntExactNode.getUncached();
258258
private static final ImportNode UNCACHED_IMPORT = ImportNode.getUncached();
259+
private static final ReadNameNode UNCACHED_READ_NAME = ReadNameNodeGen.getUncached();
260+
private static final WriteNameNode UNCACHED_WRITE_NAME = WriteNameNodeGen.getUncached();
259261
private static final NodeSupplier<ImportNode> NODE_IMPORT = ImportNode::create;
260262
private static final ImportStarNode UNCACHED_IMPORT_STAR = ImportStarNode.getUncached();
261263
private static final NodeSupplier<ImportStarNode> NODE_IMPORT_STAR = ImportStarNode::create;
@@ -337,6 +339,7 @@ public final class PBytecodeRootNode extends PRootNode implements BytecodeOSRNod
337339
private static final NodeSupplier<PyObjectSizeNode> NODE_SIZE = PyObjectSizeNode::create;
338340
private static final NodeSupplier<GetTPFlagsNode> NODE_TP_FLAGS = GetTPFlagsNode::create;
339341
private static final GetTPFlagsNode UNCACHED_TP_FLAGS = GetTPFlagsNode.getUncached();
342+
private static final DeleteGlobalNode UNCACHED_DELETE_GLOBAL = DeleteGlobalNodeGen.getUncached();
340343
private static final NodeSupplier<MatchKeysNode> NODE_MATCH_KEYS = MatchKeysNode::create;
341344
private static final NodeSupplier<CopyDictWithoutKeysNode> NODE_COPY_DICT_WITHOUT_KEYS = CopyDictWithoutKeysNode::create;
342345
private static final KwargsMergeNode UNCACHED_KWARGS_MERGE = KwargsMergeNode.getUncached();
@@ -551,6 +554,7 @@ public final class PBytecodeRootNode extends PRootNode implements BytecodeOSRNod
551554
*/
552555
@Children private final Node[] adoptedNodes;
553556
@Child private CalleeContext calleeContext = CalleeContext.create();
557+
// TODO: make some of those lazy?
554558
@Child private PythonObjectFactory factory = PythonObjectFactory.create();
555559
@Child private ExceptionStateNodes.GetCaughtExceptionNode getCaughtExceptionNode;
556560
@Child private MaterializeFrameNode traceMaterializeFrameNode = null;
@@ -4628,7 +4632,7 @@ private int bytecodeLoadGlobal(VirtualFrame virtualFrame, Object globals, int st
46284632

46294633
private void bytecodeDeleteGlobal(VirtualFrame virtualFrame, Object globals, int bci, int oparg, Node[] localNodes, TruffleString[] localNames) {
46304634
TruffleString varname = localNames[oparg];
4631-
DeleteGlobalNode deleteGlobalNode = insertChildNode(localNodes, bci, DeleteGlobalNodeGen.class, NODE_DELETE_GLOBAL);
4635+
DeleteGlobalNode deleteGlobalNode = insertChildNode(localNodes, bci, UNCACHED_DELETE_GLOBAL, DeleteGlobalNodeGen.class, NODE_DELETE_GLOBAL, usingCachedNodes);
46324636
deleteGlobalNode.executeWithGlobals(virtualFrame, globals, varname);
46334637
}
46344638

@@ -4668,7 +4672,7 @@ private void bytecodeDeleteName(VirtualFrame virtualFrame, Object globals, Objec
46684672
PyObjectDelItem delItemNode = insertChildNode(localNodes, bci, UNCACHED_OBJECT_DEL_ITEM, PyObjectDelItemNodeGen.class, NODE_OBJECT_DEL_ITEM, useCachedNodes);
46694673
delItemNode.execute(virtualFrame, locals, varname);
46704674
} else {
4671-
DeleteGlobalNode deleteGlobalNode = insertChildNode(localNodes, bci + 1, DeleteGlobalNodeGen.class, NODE_DELETE_GLOBAL);
4675+
DeleteGlobalNode deleteGlobalNode = insertChildNode(localNodes, bci + 1, UNCACHED_DELETE_GLOBAL, DeleteGlobalNodeGen.class, NODE_DELETE_GLOBAL, useCachedNodes);
46724676
deleteGlobalNode.executeWithGlobals(virtualFrame, globals, varname);
46734677
}
46744678
}
@@ -4974,7 +4978,7 @@ private void bytecodeCallMethodVarargs(VirtualFrame virtualFrame, int stackTop,
49744978
@BytecodeInterpreterSwitch
49754979
private int bytecodeLoadName(VirtualFrame virtualFrame, int initialStackTop, int bci, int oparg, Node[] localNodes, TruffleString[] localNames) {
49764980
int stackTop = initialStackTop;
4977-
ReadNameNode readNameNode = insertChildNode(localNodes, bci, ReadNameNodeGen.class, NODE_READ_NAME);
4981+
ReadNameNode readNameNode = insertChildNode(localNodes, bci, UNCACHED_READ_NAME, ReadNameNodeGen.class, NODE_READ_NAME, usingCachedNodes);
49784982
virtualFrame.setObject(++stackTop, readNameNode.execute(virtualFrame, localNames[oparg]));
49794983
return stackTop;
49804984
}
@@ -5209,7 +5213,7 @@ private int bytecodeStoreName(VirtualFrame virtualFrame, int initialStackTop, in
52095213
int stackTop = initialStackTop;
52105214
Object value = virtualFrame.getObject(stackTop);
52115215
virtualFrame.setObject(stackTop--, null);
5212-
WriteNameNode writeNameNode = insertChildNode(localNodes, bci, WriteNameNodeGen.class, NODE_WRITE_NAME);
5216+
WriteNameNode writeNameNode = insertChildNode(localNodes, bci, UNCACHED_WRITE_NAME, WriteNameNodeGen.class, NODE_WRITE_NAME, usingCachedNodes);
52135217
writeNameNode.execute(virtualFrame, localNames[oparg], value);
52145218
return stackTop;
52155219
}

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/ReadNameNode.java

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,17 @@
4545
import com.oracle.graal.python.builtins.objects.common.HashingStorage;
4646
import com.oracle.graal.python.builtins.objects.dict.PDict;
4747
import com.oracle.graal.python.builtins.objects.function.PArguments;
48-
import com.oracle.graal.python.lib.PyObjectGetItem;
4948
import com.oracle.graal.python.nodes.PNodeWithContext;
5049
import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
5150
import com.oracle.graal.python.runtime.exception.PException;
5251
import com.oracle.truffle.api.CompilerAsserts;
5352
import com.oracle.truffle.api.dsl.Cached;
54-
import com.oracle.truffle.api.dsl.Cached.Shared;
53+
import com.oracle.truffle.api.dsl.GenerateUncached;
5554
import com.oracle.truffle.api.dsl.Specialization;
5655
import com.oracle.truffle.api.frame.VirtualFrame;
5756
import com.oracle.truffle.api.strings.TruffleString;
5857

58+
@GenerateUncached
5959
public abstract class ReadNameNode extends PNodeWithContext implements AccessNameNode {
6060
public final Object execute(VirtualFrame frame, TruffleString attributeId) {
6161
CompilerAsserts.partialEvaluationConstant(attributeId);
@@ -79,7 +79,7 @@ protected static HashingStorage getStorage(VirtualFrame frame) {
7979

8080
@Specialization(guards = "!hasLocals(frame)")
8181
protected Object readFromLocals(VirtualFrame frame, TruffleString attributeId,
82-
@Shared("readGlobal") @Cached ReadGlobalOrBuiltinNode readGlobalNode) {
82+
@Cached ReadGlobalOrBuiltinNode readGlobalNode) {
8383
return readGlobalNode.execute(frame, attributeId);
8484
}
8585

@@ -94,17 +94,4 @@ protected Object readFromLocalsDict(VirtualFrame frame, TruffleString attributeI
9494
return result;
9595
}
9696
}
97-
98-
@Specialization(guards = "hasLocals(frame)", replaces = "readFromLocalsDict")
99-
protected Object readFromLocals(VirtualFrame frame, TruffleString attributeId,
100-
@Shared("readGlobal") @Cached ReadGlobalOrBuiltinNode readGlobalNode,
101-
@Cached PyObjectGetItem getItem,
102-
@Cached IsBuiltinClassProfile keyError) {
103-
Object frameLocals = PArguments.getSpecialArgument(frame);
104-
try {
105-
return getItem.execute(frame, frameLocals, attributeId);
106-
} catch (PException e) {
107-
return readGlobalsIfKeyError(frame, attributeId, readGlobalNode, e, keyError);
108-
}
109-
}
11097
}

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/util/PythonUtils.java

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
import com.oracle.truffle.api.CompilerDirectives;
9090
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
9191
import com.oracle.truffle.api.RootCallTarget;
92+
import com.oracle.truffle.api.TruffleOptions;
9293
import com.oracle.truffle.api.dsl.NodeFactory;
9394
import com.oracle.truffle.api.frame.Frame;
9495
import com.oracle.truffle.api.frame.MaterializedFrame;
@@ -864,4 +865,24 @@ public static long crc32(int initialValue, byte[] bytes, int offset, int length)
864865
0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
865866
0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
866867
};
868+
869+
/**
870+
* Use as a documentation and safety guard in specializations that are meant to be activated
871+
* only in the uncached case. Those Specializations exist only to allow to generate an uncached
872+
* variant of the node, but should never be activated in a regular cached case.
873+
*
874+
* Note that such specializations can take VirtualFrame and should forward it to other uncached
875+
* (and cached) nodes. The uncached nodes may be executed during the uncached execution of the
876+
* bytecode root node where it is allowed to pass the VirtualFrame around without materializing
877+
* it.
878+
*/
879+
public static void assertUncached() {
880+
if (!TruffleOptions.AOT) {
881+
// We cannot assert that it's never part of compilation, because then it would fail
882+
// during native-image build since it cannot prove that this Specialization is never
883+
// activated at runtime and includes this in runtime compiled methods.
884+
CompilerAsserts.neverPartOfCompilation();
885+
}
886+
CompilerDirectives.transferToInterpreter();
887+
}
867888
}

0 commit comments

Comments
 (0)