reduce diff

Author: Fidget-Spinner

Include/internal/pycore_opcode_metadata.h

@@ -1969,12 +1969,12 @@ def run_cases_test(self, input: str, input2: str, expected: str):
 
     def test_overridden_abstract(self):
         input = """
-        op(OP, (--)) {
+        pure op(OP, (--)) {
             SPAM();
         }
         """
         input2 = """
-        op(OP, (--)) {
+        pure op(OP, (--)) {
             eggs();
         }
         """
@@ -1988,7 +1988,7 @@ def test_overridden_abstract(self):
 
     def test_overridden_abstract_args(self):
         input = """
-        op(OP, (arg1 -- out)) {
+        pure op(OP, (arg1 -- out)) {
             out = SPAM(arg1);
         }
         op(OP2, (arg1 -- out)) {
@@ -2021,16 +2021,16 @@ def test_overridden_abstract_args(self):
 
     def test_no_overridden_case(self):
         input = """
-        op(OP, (arg1 -- out)) {
+        pure op(OP, (arg1 -- out)) {
             out = SPAM(arg1);
         }
 
-        op(OP2, (arg1 -- out)) {
+        pure op(OP2, (arg1 -- out)) {
         }
 
         """
         input2 = """
-        op(OP2, (arg1 -- out)) {
+        pure op(OP2, (arg1 -- out)) {
             out = NULL;
         }
         """

Include/internal/pycore_uop_metadata.h

@@ -143,7 +143,7 @@ dummy_func(
     switch (opcode) {
 
 // BEGIN BYTECODES //
-        inst(NOP, (--)) {
+        pure inst(NOP, (--)) {
         }
 
         family(RESUME, 0) = {
@@ -266,12 +266,12 @@ dummy_func(
             value = PyStackRef_DUP(value_s);
         }
 
-        replicate(8) inst(LOAD_FAST, (-- value)) {
+        replicate(8) pure inst(LOAD_FAST, (-- value)) {
             assert(!PyStackRef_IsNull(GETLOCAL(oparg)));
             value = PyStackRef_DUP(GETLOCAL(oparg));
         }
 
-        replicate(8) inst (LOAD_FAST_BORROW, (-- value)) {
+        replicate(8) pure inst (LOAD_FAST_BORROW, (-- value)) {
             assert(!PyStackRef_IsNull(GETLOCAL(oparg)));
             value = PyStackRef_Borrow(GETLOCAL(oparg));
         }
@@ -340,7 +340,7 @@ dummy_func(
             PyStackRef_XCLOSE(tmp);
         }
 
-        inst(POP_TOP, (value --)) {
+        pure inst(POP_TOP, (value --)) {
             PyStackRef_XCLOSE(value);
         }
 
@@ -349,7 +349,7 @@ dummy_func(
             PyStackRef_CLOSE(nos);
         }
 
-        inst(PUSH_NULL, (-- res)) {
+        pure inst(PUSH_NULL, (-- res)) {
             res = PyStackRef_NULL;
         }
 
@@ -388,7 +388,7 @@ dummy_func(
             PyStackRef_CLOSE(iter);
         }
 
-        inst(END_SEND, (receiver, value -- val)) {
+        pure inst(END_SEND, (receiver, value -- val)) {
             val = value;
             DEAD(value);
             PyStackRef_CLOSE(receiver);
@@ -769,7 +769,7 @@ dummy_func(
             DEOPT_IF(!res);
         }
 
-       op(_BINARY_OP_EXTEND, (descr/4, left, right -- res)) {
+       pure op(_BINARY_OP_EXTEND, (descr/4, left, right -- res)) {
             PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
             PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
             assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5);
@@ -3925,7 +3925,7 @@ dummy_func(
             DEOPT_IF(tstate->py_recursion_remaining <= 1);
         }
 
-        replicate(5) op(_INIT_CALL_PY_EXACT_ARGS, (callable, self_or_null, args[oparg] -- new_frame: _PyInterpreterFrame*)) {
+        replicate(5) pure op(_INIT_CALL_PY_EXACT_ARGS, (callable, self_or_null, args[oparg] -- new_frame: _PyInterpreterFrame*)) {
             int has_self = !PyStackRef_IsNull(self_or_null);
             STAT_INC(CALL, hit);
             new_frame = _PyFrame_PushUnchecked(tstate, callable, oparg + has_self, frame);
@@ -4991,7 +4991,7 @@ dummy_func(
             res = PyStackRef_FromPyObjectSteal(res_o);
         }
 
-        inst(COPY, (bottom, unused[oparg-1] -- bottom, unused[oparg-1], top)) {
+        pure inst(COPY, (bottom, unused[oparg-1] -- bottom, unused[oparg-1], top)) {
             assert(oparg > 0);
             top = PyStackRef_DUP(bottom);
         }
@@ -5025,7 +5025,7 @@ dummy_func(
 
         macro(BINARY_OP) = _SPECIALIZE_BINARY_OP + unused/4 + _BINARY_OP;
 
-        inst(SWAP, (bottom, unused[oparg-2], top --
+        pure inst(SWAP, (bottom, unused[oparg-2], top --
                     bottom, unused[oparg-2], top)) {
             _PyStackRef temp = bottom;
             bottom = top;
@@ -5260,16 +5260,16 @@ dummy_func(
             DEOPT_IF(!current_executor->vm_data.valid);
         }
 
-        tier2 op(_LOAD_CONST_INLINE, (ptr/4 -- value)) {
+        tier2 pure op(_LOAD_CONST_INLINE, (ptr/4 -- value)) {
             value = PyStackRef_FromPyObjectNew(ptr);
         }
 
-        tier2 op (_POP_TOP_LOAD_CONST_INLINE, (ptr/4, pop -- value)) {
+        tier2 pure op (_POP_TOP_LOAD_CONST_INLINE, (ptr/4, pop -- value)) {
             PyStackRef_CLOSE(pop);
             value = PyStackRef_FromPyObjectNew(ptr);
         }
 
-        tier2 op(_LOAD_CONST_INLINE_BORROW, (ptr/4 -- value)) {
+        tier2 pure op(_LOAD_CONST_INLINE_BORROW, (ptr/4 -- value)) {
             value = PyStackRef_FromPyObjectBorrow(ptr);
         }
 

Lib/test/test_generated_cases.py

@@ -75,6 +75,7 @@ def write_header(
 """
     )
 
+
 def emit_to(out: CWriter, tkn_iter: TokenIterator, end: str) -> Token:
     parens = 0
     for tkn in tkn_iter: