Move more bytecodes to infrequent

Author: msimacek

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

@@ -1616,11 +1616,6 @@ private Object bytecodeLoop(VirtualFrame virtualFrame, Frame localFrame, Bytecod
                         stackTop = bytecodeStoreDeref(virtualFrame, localFrame, stackTop, oparg, localCelloffset);
                         break;
                     }
-                    case OpCodesConstants.DELETE_DEREF: {
-                        oparg |= Byte.toUnsignedInt(localBC[++bci]);
-                        bytecodeDeleteDeref(localFrame, beginBci, localNodes, oparg, localCelloffset, useCachedNodes);
-                        break;
-                    }
                     case OpCodesConstants.STORE_FAST: {
                         oparg |= Byte.toUnsignedInt(localBC[bci + 1]);
                         bytecodeStoreFastAdaptive(virtualFrame, localFrame, stackTop--, bci++, localBC, oparg, hasUnboxedLocals);
@@ -1887,10 +1882,6 @@ private Object bytecodeLoop(VirtualFrame virtualFrame, Frame localFrame, Bytecod
                         bytecodeLoadBuildClass(virtualFrame, useCachedNodes, ++stackTop, localNodes, beginBci);
                         break;
                     }
-                    case OpCodesConstants.LOAD_ASSERTION_ERROR: {
-                        virtualFrame.setObject(++stackTop, PythonBuiltinClassType.AssertionError);
-                        break;
-                    }
                     case OpCodesConstants.STORE_NAME: {
                         setCurrentBci(virtualFrame, bciSlot, bci);
                         oparg |= Byte.toUnsignedInt(localBC[++bci]);
@@ -1903,12 +1894,6 @@ private Object bytecodeLoop(VirtualFrame virtualFrame, Frame localFrame, Bytecod
                         stackTop = bytecodeStoreAttr(virtualFrame, stackTop, beginBci, oparg, localNodes, localNames, useCachedNodes);
                         break;
                     }
-                    case OpCodesConstants.DELETE_ATTR: {
-                        setCurrentBci(virtualFrame, bciSlot, bci);
-                        oparg |= Byte.toUnsignedInt(localBC[++bci]);
-                        stackTop = bytecodeDeleteAttr(virtualFrame, stackTop, beginBci, oparg, localNodes, localNames, useCachedNodes);
-                        break;
-                    }
                     case OpCodesConstants.STORE_GLOBAL: {
                         setCurrentBci(virtualFrame, bciSlot, bci);
                         oparg |= Byte.toUnsignedInt(localBC[++bci]);
@@ -2324,6 +2309,8 @@ private Object bytecodeLoop(VirtualFrame virtualFrame, Frame localFrame, Bytecod
                     case OpCodesConstants.LOAD_FROM_DICT_OR_GLOBALS:
                     case OpCodesConstants.MAKE_TYPE_PARAM:
                     case OpCodesConstants.IMPORT_STAR:
+                    case OpCodesConstants.DELETE_DEREF:
+                    case OpCodesConstants.DELETE_ATTR:
                     case OpCodesConstants.DELETE_GLOBAL:
                     case OpCodesConstants.DELETE_NAME:
                         stackTop = infrequentBytecodes(virtualFrame, localFrame, bc, bci, stackTop, beginBci, oparg, localBC, globals, locals, localNames, localNodes, bciSlot, localCelloffset,
@@ -2335,6 +2322,7 @@ private Object bytecodeLoop(VirtualFrame virtualFrame, Frame localFrame, Bytecod
                     case OpCodesConstants.MAKE_TYPE_ALIAS:
                     case OpCodesConstants.MAKE_GENERIC:
                     case OpCodesConstants.DELETE_SUBSCR:
+                    case OpCodesConstants.LOAD_ASSERTION_ERROR:
                         stackTop = infrequentBytecodes(virtualFrame, localFrame, bc, bci, stackTop, beginBci, oparg, localBC, globals, locals, localNames, localNodes, bciSlot, localCelloffset,
                                         useCachedNodes);
                         break;
@@ -2441,6 +2429,10 @@ private int infrequentBytecodes(VirtualFrame virtualFrame, Frame localFrame, byt
                 virtualFrame.setObject(++stackTop, locals);
                 break;
             }
+            case OpCodesConstants.LOAD_ASSERTION_ERROR: {
+                virtualFrame.setObject(++stackTop, PythonBuiltinClassType.AssertionError);
+                break;
+            }
             case OpCodesConstants.LOAD_FROM_DICT_OR_DEREF: {
                 setCurrentBci(virtualFrame, bciSlot, bci);
                 oparg |= Byte.toUnsignedInt(localBC[++bci]);
@@ -2479,6 +2471,17 @@ private int infrequentBytecodes(VirtualFrame virtualFrame, Frame localFrame, byt
                 stackTop = bytecodeImportStar(virtualFrame, stackTop, beginBci, oparg, localNames, localNodes, useCachedNodes);
                 break;
             }
+            case OpCodesConstants.DELETE_DEREF: {
+                oparg |= Byte.toUnsignedInt(localBC[++bci]);
+                bytecodeDeleteDeref(localFrame, beginBci, localNodes, oparg, localCelloffset, useCachedNodes);
+                break;
+            }
+            case OpCodesConstants.DELETE_ATTR: {
+                setCurrentBci(virtualFrame, bciSlot, bci);
+                oparg |= Byte.toUnsignedInt(localBC[++bci]);
+                stackTop = bytecodeDeleteAttr(virtualFrame, stackTop, beginBci, oparg, localNodes, localNames, useCachedNodes);
+                break;
+            }
             case OpCodesConstants.DELETE_GLOBAL: {
                 setCurrentBci(virtualFrame, bciSlot, bci);
                 oparg |= Byte.toUnsignedInt(localBC[++bci]);