diff --git a/.gitattributes b/.gitattributes
index 1f2f8a4cd8735a..9a416f70359b68 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -89,6 +89,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
diff --git a/Include/internal/pycore_optimizer.h b/Include/internal/pycore_optimizer.h
new file mode 100644
index 00000000000000..ccbe7e52af289a
--- /dev/null
+++ b/Include/internal/pycore_optimizer.h
@@ -0,0 +1,18 @@
+#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(_PyUOpInstruction *trace, int trace_len);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_INTERNAL_OPTIMIZER_H */
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 12409774746a30..94beadabce18cc 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -405,6 +405,7 @@ PYTHON_OBJS= \
Python/mysnprintf.o \
Python/mystrtoul.o \
Python/optimizer.o \
+ Python/optimizer_analysis.o \
Python/pathconfig.o \
Python/preconfig.o \
Python/pyarena.o \
@@ -1562,6 +1563,7 @@ Python/ceval.o: \
Python/executor.o: \
$(srcdir)/Include/internal/pycore_opcode_metadata.h \
+ $(srcdir)/Include/internal/pycore_optimizer.h \
$(srcdir)/Python/ceval_macros.h \
$(srcdir)/Python/executor_cases.c.h
@@ -1570,7 +1572,12 @@ Python/flowgraph.o: \
Python/optimizer.o: \
$(srcdir)/Python/executor_cases.c.h \
- $(srcdir)/Include/internal/pycore_opcode_metadata.h
+ $(srcdir)/Include/internal/pycore_opcode_metadata.h \
+ $(srcdir)/Include/internal/pycore_optimizer.h
+
+Python/optimizer_analysis.o: \
+ $(srcdir)/Include/internal/pycore_opcode_metadata.h \
+ $(srcdir)/Include/internal/pycore_optimizer.h
Python/frozen.o: $(FROZEN_FILES_OUT)
@@ -1780,6 +1787,7 @@ PYTHON_HEADERS= \
$(srcdir)/Include/internal/pycore_obmalloc_init.h \
$(srcdir)/Include/internal/pycore_opcode.h \
$(srcdir)/Include/internal/pycore_opcode_utils.h \
+ $(srcdir)/Include/internal/pycore_optimizer.h \
$(srcdir)/Include/internal/pycore_pathconfig.h \
$(srcdir)/Include/internal/pycore_pyarena.h \
$(srcdir)/Include/internal/pycore_pyerrors.h \
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-08-02-09-55-21.gh-issue-107557.P1z-in.rst b/Misc/NEWS.d/next/Core and Builtins/2023-08-02-09-55-21.gh-issue-107557.P1z-in.rst
new file mode 100644
index 00000000000000..392f59c79e8de9
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2023-08-02-09-55-21.gh-issue-107557.P1z-in.rst
@@ -0,0 +1 @@
+Generate the cases needed for the barebones tier 2 abstract interpreter for optimization passes in CPython.
diff --git a/PCbuild/_freeze_module.vcxproj b/PCbuild/_freeze_module.vcxproj
index e247637a0dfe5c..bdcf29ba44dab5 100644
--- a/PCbuild/_freeze_module.vcxproj
+++ b/PCbuild/_freeze_module.vcxproj
@@ -218,6 +218,7 @@
+
diff --git a/PCbuild/_freeze_module.vcxproj.filters b/PCbuild/_freeze_module.vcxproj.filters
index 2a0e009308022b..45333fa97f1c64 100644
--- a/PCbuild/_freeze_module.vcxproj.filters
+++ b/PCbuild/_freeze_module.vcxproj.filters
@@ -283,6 +283,9 @@
Source Files
+
+ Source Files
+
Source Files
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
index bfe59acf12a69d..b0e62864421e17 100644
--- a/PCbuild/pythoncore.vcxproj
+++ b/PCbuild/pythoncore.vcxproj
@@ -248,6 +248,7 @@
+
@@ -279,6 +280,7 @@
+
@@ -548,6 +550,7 @@
+
diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters
index 0a8b0c3faf51e1..d5f61e9c5d7c89 100644
--- a/PCbuild/pythoncore.vcxproj.filters
+++ b/PCbuild/pythoncore.vcxproj.filters
@@ -648,6 +648,9 @@
Include\internal
+
+ Include\internal
+
Include\internal
@@ -732,6 +735,9 @@
Include\internal
+
+ Include\internal
+
Modules\zlib
@@ -1223,6 +1229,9 @@
Python
+
+ Python
+
Python
diff --git a/Python/abstract_interp_cases.c.h b/Python/abstract_interp_cases.c.h
new file mode 100644
index 00000000000000..33e726cc78e17d
--- /dev/null
+++ b/Python/abstract_interp_cases.c.h
@@ -0,0 +1,1026 @@
+// This file is generated by Tools/cases_generator/generate_cases.py
+// from:
+// Python/bytecodes.c
+// Do not edit!
+
+
+ case NOP: {
+ break;
+ }
+
+
+
+
+ case LOAD_FAST_CHECK: {
+ STACK_GROW(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case LOAD_FAST: {
+ STACK_GROW(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case LOAD_FAST_AND_CLEAR: {
+ STACK_GROW(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+
+ case LOAD_CONST: {
+ STACK_GROW(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case STORE_FAST: {
+ STACK_SHRINK(1);
+ break;
+ }
+
+
+
+
+ case POP_TOP: {
+ STACK_SHRINK(1);
+ break;
+ }
+
+
+ case PUSH_NULL: {
+ STACK_GROW(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+
+ case END_SEND: {
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+
+ case UNARY_NEGATIVE: {
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case UNARY_NOT: {
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case TO_BOOL: {
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case TO_BOOL_BOOL: {
+ break;
+ }
+
+
+ case TO_BOOL_INT: {
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case TO_BOOL_LIST: {
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case TO_BOOL_NONE: {
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case TO_BOOL_STR: {
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case TO_BOOL_ALWAYS_TRUE: {
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case UNARY_INVERT: {
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case _GUARD_BOTH_INT: {
+ break;
+ }
+
+
+ case _BINARY_OP_MULTIPLY_INT: {
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case _BINARY_OP_ADD_INT: {
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case _BINARY_OP_SUBTRACT_INT: {
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case _GUARD_BOTH_FLOAT: {
+ break;
+ }
+
+
+ case _BINARY_OP_MULTIPLY_FLOAT: {
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case _BINARY_OP_ADD_FLOAT: {
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case _BINARY_OP_SUBTRACT_FLOAT: {
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case _GUARD_BOTH_UNICODE: {
+ break;
+ }
+
+
+ case _BINARY_OP_ADD_UNICODE: {
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+
+ case BINARY_SUBSCR: {
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case BINARY_SLICE: {
+ STACK_SHRINK(2);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case STORE_SLICE: {
+ STACK_SHRINK(4);
+ break;
+ }
+
+
+ case BINARY_SUBSCR_LIST_INT: {
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case BINARY_SUBSCR_TUPLE_INT: {
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case BINARY_SUBSCR_DICT: {
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+
+ case LIST_APPEND: {
+ STACK_SHRINK(1);
+ break;
+ }
+
+
+ case SET_ADD: {
+ STACK_SHRINK(1);
+ break;
+ }
+
+
+ case STORE_SUBSCR: {
+ STACK_SHRINK(3);
+ break;
+ }
+
+
+ case STORE_SUBSCR_LIST_INT: {
+ STACK_SHRINK(3);
+ break;
+ }
+
+
+ case STORE_SUBSCR_DICT: {
+ STACK_SHRINK(3);
+ break;
+ }
+
+
+ case DELETE_SUBSCR: {
+ STACK_SHRINK(2);
+ break;
+ }
+
+
+ case CALL_INTRINSIC_1: {
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case CALL_INTRINSIC_2: {
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+
+
+
+
+
+
+ case GET_AITER: {
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case GET_ANEXT: {
+ STACK_GROW(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case GET_AWAITABLE: {
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+
+
+
+
+ case POP_EXCEPT: {
+ STACK_SHRINK(1);
+ break;
+ }
+
+
+
+
+
+ case LOAD_ASSERTION_ERROR: {
+ STACK_GROW(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case LOAD_BUILD_CLASS: {
+ STACK_GROW(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case STORE_NAME: {
+ STACK_SHRINK(1);
+ break;
+ }
+
+
+ case DELETE_NAME: {
+ break;
+ }
+
+
+ case UNPACK_SEQUENCE: {
+ STACK_SHRINK(1);
+ STACK_GROW(oparg);
+ break;
+ }
+
+
+ case UNPACK_SEQUENCE_TWO_TUPLE: {
+ STACK_SHRINK(1);
+ STACK_GROW(oparg);
+ break;
+ }
+
+
+ case UNPACK_SEQUENCE_TUPLE: {
+ STACK_SHRINK(1);
+ STACK_GROW(oparg);
+ break;
+ }
+
+
+ case UNPACK_SEQUENCE_LIST: {
+ STACK_SHRINK(1);
+ STACK_GROW(oparg);
+ break;
+ }
+
+
+ case UNPACK_EX: {
+ STACK_GROW((oparg & 0xFF) + (oparg >> 8));
+ stack_pointer[-1 - (oparg >> 8)] = NULL;
+ break;
+ }
+
+
+ case STORE_ATTR: {
+ STACK_SHRINK(2);
+ break;
+ }
+
+
+ case DELETE_ATTR: {
+ STACK_SHRINK(1);
+ break;
+ }
+
+
+ case STORE_GLOBAL: {
+ STACK_SHRINK(1);
+ break;
+ }
+
+
+ case DELETE_GLOBAL: {
+ break;
+ }
+
+
+ case _LOAD_LOCALS: {
+ STACK_GROW(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case _LOAD_FROM_DICT_OR_GLOBALS: {
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case LOAD_GLOBAL: {
+ STACK_GROW(1);
+ STACK_GROW(((oparg & 1) ? 1 : 0));
+ stack_pointer[-1 - (oparg & 1 ? 1 : 0)] = NULL;
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case _GUARD_GLOBALS_VERSION: {
+ break;
+ }
+
+
+ case _GUARD_BUILTINS_VERSION: {
+ break;
+ }
+
+
+ case _LOAD_GLOBAL_MODULE: {
+ STACK_GROW(1);
+ STACK_GROW(((oparg & 1) ? 1 : 0));
+ stack_pointer[-1 - (oparg & 1 ? 1 : 0)] = NULL;
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case _LOAD_GLOBAL_BUILTINS: {
+ STACK_GROW(1);
+ STACK_GROW(((oparg & 1) ? 1 : 0));
+ stack_pointer[-1 - (oparg & 1 ? 1 : 0)] = NULL;
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case DELETE_FAST: {
+ break;
+ }
+
+
+
+ case DELETE_DEREF: {
+ break;
+ }
+
+
+ case LOAD_FROM_DICT_OR_DEREF: {
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case LOAD_DEREF: {
+ STACK_GROW(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case STORE_DEREF: {
+ STACK_SHRINK(1);
+ break;
+ }
+
+
+ case COPY_FREE_VARS: {
+ break;
+ }
+
+
+ case BUILD_STRING: {
+ STACK_SHRINK(oparg);
+ STACK_GROW(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case BUILD_TUPLE: {
+ STACK_SHRINK(oparg);
+ STACK_GROW(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case BUILD_LIST: {
+ STACK_SHRINK(oparg);
+ STACK_GROW(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case LIST_EXTEND: {
+ STACK_SHRINK(1);
+ break;
+ }
+
+
+ case SET_UPDATE: {
+ STACK_SHRINK(1);
+ break;
+ }
+
+
+ case BUILD_SET: {
+ STACK_SHRINK(oparg);
+ STACK_GROW(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case BUILD_MAP: {
+ STACK_SHRINK(oparg*2);
+ STACK_GROW(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case SETUP_ANNOTATIONS: {
+ break;
+ }
+
+
+ case BUILD_CONST_KEY_MAP: {
+ STACK_SHRINK(oparg);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case DICT_UPDATE: {
+ STACK_SHRINK(1);
+ break;
+ }
+
+
+ case DICT_MERGE: {
+ STACK_SHRINK(1);
+ break;
+ }
+
+
+ case MAP_ADD: {
+ STACK_SHRINK(2);
+ break;
+ }
+
+
+
+
+ case LOAD_SUPER_ATTR_ATTR: {
+ STACK_SHRINK(2);
+ STACK_GROW(((oparg & 1) ? 1 : 0));
+ stack_pointer[-1 - (oparg & 1 ? 1 : 0)] = NULL;
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case LOAD_SUPER_ATTR_METHOD: {
+ STACK_SHRINK(1);
+ stack_pointer[-2] = NULL;
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case LOAD_ATTR: {
+ STACK_GROW(((oparg & 1) ? 1 : 0));
+ stack_pointer[-1 - (oparg & 1 ? 1 : 0)] = NULL;
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case _GUARD_TYPE_VERSION: {
+ break;
+ }
+
+
+ case _CHECK_MANAGED_OBJECT_HAS_VALUES: {
+ break;
+ }
+
+
+ case _LOAD_ATTR_INSTANCE_VALUE: {
+ STACK_GROW(((oparg & 1) ? 1 : 0));
+ stack_pointer[-1 - (oparg & 1 ? 1 : 0)] = NULL;
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+
+
+
+
+
+
+
+
+
+ case COMPARE_OP: {
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case COMPARE_OP_FLOAT: {
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case COMPARE_OP_INT: {
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case COMPARE_OP_STR: {
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case IS_OP: {
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case CONTAINS_OP: {
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case CHECK_EG_MATCH: {
+ stack_pointer[-2] = NULL;
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case CHECK_EXC_MATCH: {
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+
+
+
+
+
+
+
+ case IS_NONE: {
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+
+ case GET_LEN: {
+ STACK_GROW(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case MATCH_CLASS: {
+ STACK_SHRINK(2);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case MATCH_MAPPING: {
+ STACK_GROW(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case MATCH_SEQUENCE: {
+ STACK_GROW(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case MATCH_KEYS: {
+ STACK_GROW(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case GET_ITER: {
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case GET_YIELD_FROM_ITER: {
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+
+
+ case _ITER_CHECK_LIST: {
+ break;
+ }
+
+
+
+ case _IS_ITER_EXHAUSTED_LIST: {
+ STACK_GROW(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case _ITER_NEXT_LIST: {
+ STACK_GROW(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case _ITER_CHECK_TUPLE: {
+ break;
+ }
+
+
+
+ case _IS_ITER_EXHAUSTED_TUPLE: {
+ STACK_GROW(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case _ITER_NEXT_TUPLE: {
+ STACK_GROW(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case _ITER_CHECK_RANGE: {
+ break;
+ }
+
+
+
+ case _IS_ITER_EXHAUSTED_RANGE: {
+ STACK_GROW(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case _ITER_NEXT_RANGE: {
+ STACK_GROW(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+
+
+
+ case WITH_EXCEPT_START: {
+ STACK_GROW(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case PUSH_EXC_INFO: {
+ STACK_GROW(1);
+ stack_pointer[-2] = NULL;
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+ case CALL_NO_KW_TYPE_1: {
+ STACK_SHRINK(oparg);
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case CALL_NO_KW_STR_1: {
+ STACK_SHRINK(oparg);
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case CALL_NO_KW_TUPLE_1: {
+ STACK_SHRINK(oparg);
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+
+ case EXIT_INIT_CHECK: {
+ STACK_SHRINK(1);
+ break;
+ }
+
+
+
+ case CALL_NO_KW_BUILTIN_O: {
+ STACK_SHRINK(oparg);
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case CALL_NO_KW_BUILTIN_FAST: {
+ STACK_SHRINK(oparg);
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+
+ case CALL_NO_KW_LEN: {
+ STACK_SHRINK(oparg);
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case CALL_NO_KW_ISINSTANCE: {
+ STACK_SHRINK(oparg);
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+
+ case CALL_NO_KW_METHOD_DESCRIPTOR_O: {
+ STACK_SHRINK(oparg);
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+
+ case CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS: {
+ STACK_SHRINK(oparg);
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case CALL_NO_KW_METHOD_DESCRIPTOR_FAST: {
+ STACK_SHRINK(oparg);
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+
+
+ case MAKE_FUNCTION: {
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case SET_FUNCTION_ATTRIBUTE: {
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+
+ case BUILD_SLICE: {
+ STACK_SHRINK(((oparg == 3) ? 1 : 0));
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case CONVERT_VALUE: {
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case FORMAT_SIMPLE: {
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case FORMAT_WITH_SPEC: {
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case COPY: {
+ STACK_GROW(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case BINARY_OP: {
+ STACK_SHRINK(1);
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+ case SWAP: {
+ stack_pointer[-2 - (oparg-2)] = NULL;
+ stack_pointer[-1] = NULL;
+ break;
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+ case _POP_JUMP_IF_FALSE: {
+ STACK_SHRINK(1);
+ break;
+ }
+
+
+ case _POP_JUMP_IF_TRUE: {
+ STACK_SHRINK(1);
+ break;
+ }
+
+
+ case JUMP_TO_TOP: {
+ break;
+ }
+
+
+ case SAVE_IP: {
+ break;
+ }
+
+
+ case EXIT_TRACE: {
+ break;
+ }
diff --git a/Python/optimizer.c b/Python/optimizer.c
index d2ed8dfcd2cff2..8981c22f0cda29 100644
--- a/Python/optimizer.c
+++ b/Python/optimizer.c
@@ -4,6 +4,7 @@
#include "pycore_opcode.h"
#include "pycore_opcode_metadata.h"
#include "pycore_opcode_utils.h"
+#include "pycore_optimizer.h"
#include "pycore_pystate.h" // _PyInterpreterState_GET()
#include "pycore_uops.h"
#include "cpython/optimizer.h"
@@ -698,6 +699,7 @@ uop_optimize(
return -1;
}
executor->base.execute = _PyUopExecute;
+ trace_length = _Py_uop_analyze_and_optimize(trace, trace_length);
memcpy(executor->trace, trace, trace_length * sizeof(_PyUOpInstruction));
*exec_ptr = (_PyExecutorObject *)executor;
return 1;
diff --git a/Python/optimizer_analysis.c b/Python/optimizer_analysis.c
new file mode 100644
index 00000000000000..cb399b0beb9129
--- /dev/null
+++ b/Python/optimizer_analysis.c
@@ -0,0 +1,22 @@
+#include "Python.h"
+#include "opcode.h"
+#include "pycore_interp.h"
+#include "pycore_opcode.h"
+#include "pycore_opcode_metadata.h"
+#include "pycore_opcode_utils.h"
+#include "pycore_pystate.h" // _PyInterpreterState_GET()
+#include "pycore_uops.h"
+#include "cpython/optimizer.h"
+#include
+#include
+#include
+#include "pycore_optimizer.h"
+
+int
+_Py_uop_analyze_and_optimize(
+ _PyUOpInstruction *trace,
+ int trace_len
+)
+{
+ return trace_len;
+}
diff --git a/Tools/c-analyzer/cpython/_parser.py b/Tools/c-analyzer/cpython/_parser.py
index 9bc7285e18b2fb..90334d0e79da80 100644
--- a/Tools/c-analyzer/cpython/_parser.py
+++ b/Tools/c-analyzer/cpython/_parser.py
@@ -84,6 +84,7 @@ def clean_lines(text):
Python/frozen_modules/*.h
Python/generated_cases.c.h
Python/executor_cases.c.h
+Python/abstract_interp_cases.c.h
# not actually source
Python/bytecodes.c
diff --git a/Tools/cases_generator/generate_cases.py b/Tools/cases_generator/generate_cases.py
index d35a16a80e8d00..10351e7a768a56 100644
--- a/Tools/cases_generator/generate_cases.py
+++ b/Tools/cases_generator/generate_cases.py
@@ -15,6 +15,7 @@
from flags import InstructionFlags, variable_used
from instructions import (
AnyInstruction,
+ AbstractInstruction,
Component,
Instruction,
MacroInstruction,
@@ -43,6 +44,9 @@
DEFAULT_EXECUTOR_OUTPUT = os.path.relpath(
os.path.join(ROOT, "Python/executor_cases.c.h")
)
+DEFAULT_ABSTRACT_INTERPRETER_OUTPUT = os.path.relpath(
+ os.path.join(ROOT, "Python/abstract_interp_cases.c.h")
+)
# Constants used instead of size for macro expansions.
# Note: 1, 2, 4 must match actual cache entry sizes.
@@ -91,7 +95,13 @@
help="Write executor cases to this file",
default=DEFAULT_EXECUTOR_OUTPUT,
)
-
+arg_parser.add_argument(
+ "-a",
+ "--abstract-interpreter-cases",
+ type=str,
+ help="Write abstract interpreter cases to this file",
+ default=DEFAULT_ABSTRACT_INTERPRETER_OUTPUT,
+)
class Generator(Analyzer):
def get_stack_effect_info(
@@ -604,6 +614,39 @@ def write_executor_instructions(
file=sys.stderr,
)
+ def write_abstract_interpreter_instructions(
+ self, abstract_interpreter_filename: str, emit_line_directives: bool
+ ) -> None:
+ """Generate cases for the Tier 2 abstract interpreter/analzyer."""
+ with open(abstract_interpreter_filename, "w") as f:
+ self.out = Formatter(f, 8, emit_line_directives)
+ self.write_provenance_header()
+ for thing in self.everything:
+ match thing:
+ case OverriddenInstructionPlaceHolder():
+ # TODO: Is this helpful?
+ self.write_overridden_instr_place_holder(thing)
+ case parsing.InstDef():
+ instr = AbstractInstruction(self.instrs[thing.name].inst)
+ self.out.emit("")
+ if instr.is_viable_uop():
+ self.out.emit("")
+ with self.out.block(f"case {thing.name}:"):
+ instr.write(self.out, tier=TIER_TWO)
+ self.out.emit("break;")
+ # elif instr.kind != "op":
+ # print(f"NOTE: {thing.name} is not a viable uop")
+ case parsing.Macro():
+ pass
+ case parsing.Pseudo():
+ pass
+ case _:
+ typing.assert_never(thing)
+ print(
+ f"Wrote some stuff to {abstract_interpreter_filename}",
+ file=sys.stderr,
+ )
+
def write_overridden_instr_place_holder(
self, place_holder: OverriddenInstructionPlaceHolder
) -> None:
@@ -645,6 +688,8 @@ def main():
a.write_instructions(args.output, args.emit_line_directives)
a.write_metadata(args.metadata, args.pymetadata)
a.write_executor_instructions(args.executor_cases, args.emit_line_directives)
+ a.write_abstract_interpreter_instructions(args.abstract_interpreter_cases,
+ args.emit_line_directives)
if __name__ == "__main__":
diff --git a/Tools/cases_generator/instructions.py b/Tools/cases_generator/instructions.py
index aa94dbb07ea1c0..a10e8f41ab67db 100644
--- a/Tools/cases_generator/instructions.py
+++ b/Tools/cases_generator/instructions.py
@@ -248,6 +248,34 @@ def write_body(
InstructionOrCacheEffect = Instruction | parsing.CacheEffect
+# Instruction used for abstract interpretation.
+class AbstractInstruction(Instruction):
+ def __init__(self, inst: parsing.InstDef):
+ super().__init__(inst)
+
+ def write(self, out: Formatter, tier: Tiers = TIER_ONE) -> None:
+ """Write one abstract instruction, sans prologue and epilogue."""
+ # Write a static assertion that a family's cache size is correct
+ if family := self.family:
+ if self.name == family.name:
+ if cache_size := family.size:
+ out.emit(
+ f"static_assert({cache_size} == "
+ f'{self.cache_offset}, "incorrect cache size");'
+ )
+
+ stacking.write_single_instr_for_abstract_interp(self, out)
+
+ def write_body(
+ self,
+ out: Formatter,
+ dedent: int,
+ active_caches: list[ActiveCacheEffect],
+ tier: Tiers = TIER_ONE,
+ ) -> None:
+ pass
+
+
@dataclasses.dataclass
class Component:
instr: Instruction
diff --git a/Tools/cases_generator/stacking.py b/Tools/cases_generator/stacking.py
index 23eca3037f896d..8ae08f70904305 100644
--- a/Tools/cases_generator/stacking.py
+++ b/Tools/cases_generator/stacking.py
@@ -398,3 +398,39 @@ def write_components(
),
poke.effect,
)
+
+
+def write_single_instr_for_abstract_interp(
+ instr: Instruction, out: Formatter
+):
+ try:
+ _write_components_for_abstract_interp(
+ [Component(instr, instr.active_caches)],
+ out,
+ )
+ except AssertionError as err:
+ raise AssertionError(f"Error writing abstract instruction {instr.name}") from err
+
+
+def _write_components_for_abstract_interp(
+ parts: list[Component],
+ out: Formatter,
+):
+ managers = get_managers(parts)
+ for mgr in managers:
+ if mgr is managers[-1]:
+ out.stack_adjust(mgr.final_offset.deep, mgr.final_offset.high)
+ # Use clone() since adjust_inverse() mutates final_offset
+ mgr.adjust_inverse(mgr.final_offset.clone())
+ # NULL out the output stack effects
+ for poke in mgr.pokes:
+ if not poke.effect.size and poke.effect.name not in mgr.instr.unmoved_names:
+ out.assign(
+ StackEffect(
+ poke.as_variable(),
+ poke.effect.type,
+ poke.effect.cond,
+ poke.effect.size,
+ ),
+ StackEffect("NULL"),
+ )