Aug 15, 2023 · Aug 2, 2023 · Aug 2, 2023 · Aug 2, 2023 · Aug 2, 2023 · Aug 2, 2023
diff --git a/.gitattributes b/.gitattributes
 Python/Python-ast.c                                 generated
 Python/executor_cases.c.h                           generated
 Python/generated_cases.c.h                          generated
 Python/abstract_interp_cases.c.h                    generated
 Python/opcode_targets.h                             generated
 Python/stdlib_module_names.h                        generated
 Tools/peg_generator/pegen/grammar_parser.py         generated
diff --git a/Include/cpython/optimizer.h b/Include/cpython/optimizer.h
 typedef struct _PyOptimizerObject _PyOptimizerObject;

 /* Should return > 0 if a new executor is created. O if no executor is produced and < 0 if an error occurred. */
 typedef int (*optimize_func)(_PyOptimizerObject* self, PyCodeObject *code, _Py_CODEUNIT *instr, _PyExecutorObject **);
 typedef int (*optimize_func)(_PyOptimizerObject* self, PyCodeObject *code, _Py_CODEUNIT *instr, _PyExecutorObject **, int curr_stackentries);

 typedef struct _PyOptimizerObject {
    PyObject_HEAD
diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h
diff --git a/Include/internal/pycore_optimizer.h b/Include/internal/pycore_optimizer.h
 #ifndef Py_INTERNAL_OPTIMIZER_H
 #define Py_INTERNAL_OPTIMIZER_H
 #ifdef __cplusplus
 extern "C" {
 #endif

 #ifndef Py_BUILD_CORE
 #  error "this header requires Py_BUILD_CORE define"
 #endif

 #include "pycore_uops.h"

 int _Py_uop_analyze_and_optimize(PyCodeObject *code,
    _PyUOpInstruction *trace, int trace_len, int curr_stackentries);


 #ifdef __cplusplus
 }
 #endif
 #endif /* !Py_INTERNAL_OPTIMIZER_H */
diff --git a/Include/internal/pycore_uops.h b/Include/internal/pycore_uops.h
 #  error "this header requires Py_BUILD_CORE define"
 #endif

 #define _Py_UOP_MAX_TRACE_LENGTH32
 #define _Py_UOP_MAX_TRACE_LENGTH256

 typedef struct {
 uint32_t opcode;
 uint32_t oparg;
 int32_t opcode;
 int32_t oparg;
    uint64_t operand;  // A cache entry
 } _PyUOpInstruction;

diff --git a/Lib/test/test_capi/test_misc.py b/Lib/test/test_capi/test_misc.py
                next(it)


 class TestUopsOptimization(unittest.TestCase):

    def test_int_constant_propagation(self):
        def testfunc(loops):
            num = 0
            while num < loops:
                x = 0
                y = 1
                z = 2
                a = x + y + z + x + y + z + x + y + z
                num += 1
            return a

        opt = _testinternalcapi.get_uop_optimizer()
        res = None
        with temporary_optimizer(opt):
            res = testfunc(3)

        ex = get_first_executor(testfunc)
        self.assertIsNotNone(ex)
        self.assertEqual(res, 9)
        binop_count = [opname for opname, _, _ in ex if opname == "_BINARY_OP_ADD_INT"]
        self.assertEqual(len(binop_count), 1)

 if __name__ == "__main__":
    unittest.main()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -90,6 +90,7 @@ Programs/test_frozenmain.h generated
		Python/Python-ast.c generated
		Python/executor_cases.c.h generated
		Python/generated_cases.c.h generated
		Python/abstract_interp_cases.c.h generated
		Python/opcode_targets.h generated
		Python/stdlib_module_names.h generated
		Tools/peg_generator/pegen/grammar_parser.py generated
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,7 +22,7 @@ typedef struct _PyExecutorObject {
		typedef struct _PyOptimizerObject _PyOptimizerObject;

		/* Should return > 0 if a new executor is created. O if no executor is produced and < 0 if an error occurred. */
		typedef int (optimize_func)(_PyOptimizerObject self, PyCodeObject code, _Py_CODEUNIT instr, _PyExecutorObject **);
		typedef int (optimize_func)(_PyOptimizerObject self, PyCodeObject code, _Py_CODEUNIT instr, _PyExecutorObject **, int curr_stackentries);

		typedef struct _PyOptimizerObject {
		PyObject_HEAD
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,20 @@
		#ifndef Py_INTERNAL_OPTIMIZER_H
		#define Py_INTERNAL_OPTIMIZER_H
		#ifdef __cplusplus
		extern "C" {
		#endif

		#ifndef Py_BUILD_CORE
		# error "this header requires Py_BUILD_CORE define"
		#endif

		#include "pycore_uops.h"

		int _Py_uop_analyze_and_optimize(PyCodeObject *code,
		_PyUOpInstruction *trace, int trace_len, int curr_stackentries);


		#ifdef __cplusplus
		}
		#endif
		#endif /* !Py_INTERNAL_OPTIMIZER_H */
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,11 +8,11 @@ extern "C" {
		# error "this header requires Py_BUILD_CORE define"
		#endif

		#define _Py_UOP_MAX_TRACE_LENGTH32
		#define _Py_UOP_MAX_TRACE_LENGTH256
Fidget-Spinner marked this conversation as resolved. OutdatedShow resolvedHide resolved

		typedef struct {
		uint32_t opcode;
		uint32_t oparg;
		int32_t opcode;
		int32_t oparg;
Copy link Member gvanrossumAug 13, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. I'm curious about this change. Are you using negative opcodes or opargs? IIUC oparg really is treated as a 32-bit unsigned int in ceval.c and bytecodes.c. Copy link MemberAuthor Fidget-SpinnerAug 14, 2023• edited Loading Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. I'm using both negative ints and opargs, but only during the analysis phase. They are converted back to unsigned after the last pass. For all intents and purposes outside of the optimizer pass, they can be treated as unsigned.
		uint64_t operand; // A cache entry
		} _PyUOpInstruction;

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2619,5 +2619,29 @@ def testfunc(it):
		next(it)


		class TestUopsOptimization(unittest.TestCase):

		def test_int_constant_propagation(self):
		def testfunc(loops):
		num = 0
		while num < loops:
		x = 0
		y = 1
		z = 2
		a = x + y + z + x + y + z + x + y + z
		num += 1
		return a

		opt = _testinternalcapi.get_uop_optimizer()
		res = None
		with temporary_optimizer(opt):
		res = testfunc(3)

		ex = get_first_executor(testfunc)
		self.assertIsNotNone(ex)
		self.assertEqual(res, 9)
		binop_count = [opname for opname, _, _ in ex if opname == "_BINARY_OP_ADD_INT"]
		self.assertEqual(len(binop_count), 1)

Fidget-Spinner marked this conversation as resolved. OutdatedShow resolvedHide resolved
		if __name__ == "__main__":
		unittest.main()