Don't use hasNextTier for loopCount, it confuses the loop merge

msimacek · msimacek · commit 45c7d7390e0e · 2022-05-25T16:46:10.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/PBytecodeRootNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/PBytecodeRootNode.java
@@ -1078,7 +1078,7 @@ private Object executeInner(VirtualFrame virtualFrame, boolean resumingAfterOSR,
                         break;
                     }
                     case OpCodesConstants.RETURN_VALUE: {
-                        if (CompilerDirectives.hasNextTier() && loopCount > 0) {
+                        if (CompilerDirectives.inInterpreter() && loopCount > 0) {
                             LoopNode.reportLoopCount(this, loopCount);
                         }
                         Object value = localFrame.getObject(stackTop);
@@ -1230,7 +1230,7 @@ private Object executeInner(VirtualFrame virtualFrame, boolean resumingAfterOSR,
                     case OpCodesConstants.JUMP_BACKWARD: {
                         oparg |= Byte.toUnsignedInt(localBC[bci + 1]);
                         bci -= oparg;
-                        if (CompilerDirectives.hasNextTier()) {
+                        if (CompilerDirectives.inInterpreter()) {
                             loopCount++;
                         }
                         if (CompilerDirectives.inInterpreter() && BytecodeOSRNode.pollOSRBackEdge(this)) {
@@ -1246,7 +1246,7 @@ private Object executeInner(VirtualFrame virtualFrame, boolean resumingAfterOSR,
                              */
                             Object osrResult = BytecodeOSRNode.tryOSR(this, bci, stackTop, null, virtualFrame);
                             if (osrResult != null) {
-                                if (CompilerDirectives.hasNextTier() && loopCount > 0) {
+                                if (CompilerDirectives.inInterpreter() && loopCount > 0) {
                                     LoopNode.reportLoopCount(this, loopCount);
                                 }
                                 return osrResult;
@@ -1368,7 +1368,7 @@ private Object executeInner(VirtualFrame virtualFrame, boolean resumingAfterOSR,
                         throw bytecodeEndExcHandler(virtualFrame, localFrame, stackTop);
                     }
                     case OpCodesConstants.YIELD_VALUE: {
-                        if (CompilerDirectives.hasNextTier() && loopCount > 0) {
+                        if (CompilerDirectives.inInterpreter() && loopCount > 0) {
                             LoopNode.reportLoopCount(this, loopCount);
                         }
                         Object value = localFrame.getObject(stackTop);
@@ -1455,7 +1455,7 @@ private Object executeInner(VirtualFrame virtualFrame, boolean resumingAfterOSR,
                 }
                 if (newTarget == -1) {
                     localFrame.setInt(bcioffset, beginBci);
-                    if (CompilerDirectives.hasNextTier() && loopCount > 0) {
+                    if (CompilerDirectives.inInterpreter() && loopCount > 0) {
                         LoopNode.reportLoopCount(this, loopCount);
                     }
                     if (e == pe) {

Original file line number	Diff line number	Diff line change
`@@ -1078,7 +1078,7 @@ private Object executeInner(VirtualFrame virtualFrame, boolean resumingAfterOSR,`
`1078`	`1078`	`break;`
`1079`	`1079`	`}`
`1080`	`1080`	`case OpCodesConstants.RETURN_VALUE: {`
`1081`		`- if (CompilerDirectives.hasNextTier() && loopCount > 0) {`
	`1081`	`+ if (CompilerDirectives.inInterpreter() && loopCount > 0) {`
`1082`	`1082`	`LoopNode.reportLoopCount(this, loopCount);`
`1083`	`1083`	`}`
`1084`	`1084`	`Object value = localFrame.getObject(stackTop);`
`@@ -1230,7 +1230,7 @@ private Object executeInner(VirtualFrame virtualFrame, boolean resumingAfterOSR,`
`1230`	`1230`	`case OpCodesConstants.JUMP_BACKWARD: {`
`1231`	`1231`	`oparg \|= Byte.toUnsignedInt(localBC[bci + 1]);`
`1232`	`1232`	`bci -= oparg;`
`1233`		`- if (CompilerDirectives.hasNextTier()) {`
	`1233`	`+ if (CompilerDirectives.inInterpreter()) {`
`1234`	`1234`	`loopCount++;`
`1235`	`1235`	`}`
`1236`	`1236`	`if (CompilerDirectives.inInterpreter() && BytecodeOSRNode.pollOSRBackEdge(this)) {`
`@@ -1246,7 +1246,7 @@ private Object executeInner(VirtualFrame virtualFrame, boolean resumingAfterOSR,`
`1246`	`1246`	`*/`
`1247`	`1247`	`Object osrResult = BytecodeOSRNode.tryOSR(this, bci, stackTop, null, virtualFrame);`
`1248`	`1248`	`if (osrResult != null) {`
`1249`		`- if (CompilerDirectives.hasNextTier() && loopCount > 0) {`
	`1249`	`+ if (CompilerDirectives.inInterpreter() && loopCount > 0) {`
`1250`	`1250`	`LoopNode.reportLoopCount(this, loopCount);`
`1251`	`1251`	`}`
`1252`	`1252`	`return osrResult;`
`@@ -1368,7 +1368,7 @@ private Object executeInner(VirtualFrame virtualFrame, boolean resumingAfterOSR,`
`1368`	`1368`	`throw bytecodeEndExcHandler(virtualFrame, localFrame, stackTop);`
`1369`	`1369`	`}`
`1370`	`1370`	`case OpCodesConstants.YIELD_VALUE: {`
`1371`		`- if (CompilerDirectives.hasNextTier() && loopCount > 0) {`
	`1371`	`+ if (CompilerDirectives.inInterpreter() && loopCount > 0) {`
`1372`	`1372`	`LoopNode.reportLoopCount(this, loopCount);`
`1373`	`1373`	`}`
`1374`	`1374`	`Object value = localFrame.getObject(stackTop);`
`@@ -1455,7 +1455,7 @@ private Object executeInner(VirtualFrame virtualFrame, boolean resumingAfterOSR,`
`1455`	`1455`	`}`
`1456`	`1456`	`if (newTarget == -1) {`
`1457`	`1457`	`localFrame.setInt(bcioffset, beginBci);`
`1458`		`- if (CompilerDirectives.hasNextTier() && loopCount > 0) {`
	`1458`	`+ if (CompilerDirectives.inInterpreter() && loopCount > 0) {`
`1459`	`1459`	`LoopNode.reportLoopCount(this, loopCount);`
`1460`	`1460`	`}`
`1461`	`1461`	`if (e == pe) {`