de-couple the MAX_CACHED_REGISTER and MIN_GENERATED_CACHE_REGISTER

Author: aisk

Include/internal/pycore_uop.h

@@ -8,6 +8,8 @@ extern "C" {
 #  error "this header requires Py_BUILD_CORE define"
 #endif
 
+#define MAX_CACHED_REGISTER 3
+
 #include <stdint.h>
 /* Depending on the format,
  * the 32 bits between the oparg and operand are:

Include/internal/pycore_uop_ids.h

@@ -7,8 +7,11 @@
 
 from parser import Stmt, SimpleStmt, BlockStmt, IfStmt, WhileStmt, ForStmt, MacroIfStmt
 
+MIN_GENERATED_CACHED_REGISTER = 3
 MAX_GENERATED_CACHED_REGISTER = 5
-MAX_CACHED_REGISTER = 3  # Platform-specific; controls compile-time case pruning
+MAX_CACHED_REGISTER = (
+    MIN_GENERATED_CACHED_REGISTER  # Platform-specific; controls compile-time case pruning
+)
 
 @dataclass
 class EscapingCall:

Tools/cases_generator/analyzer.py

@@ -17,6 +17,7 @@
     get_uop_cache_depths,
     is_large,
     MAX_CACHED_REGISTER,
+    MIN_GENERATED_CACHED_REGISTER,
     MAX_GENERATED_CACHED_REGISTER,
 )
 
@@ -267,7 +268,7 @@ def generate_tier2(
 
     first = True
     for target_depth in range(
-        MAX_CACHED_REGISTER, MAX_GENERATED_CACHED_REGISTER + 1
+        MIN_GENERATED_CACHED_REGISTER, MAX_GENERATED_CACHED_REGISTER + 1
     ):
         directive = "#if" if first else "#elif"
         out.start_line()

Tools/cases_generator/tier2_generator.py

@@ -10,7 +10,7 @@
     Analysis,
     analyze_files,
     get_uop_cache_depths,
-    MAX_CACHED_REGISTER,
+    MIN_GENERATED_CACHED_REGISTER,
     MAX_GENERATED_CACHED_REGISTER,
 )
 from generators_common import (
@@ -31,6 +31,7 @@ def generate_uop_ids(
     write_header(__file__, filenames, outfile)
     out = CWriter(outfile, 0, False)
     with out.header_guard("Py_CORE_UOP_IDS_H"):
+        out.emit('#include "pycore_uop.h"\n')
         next_id = 1 if distinct_namespace else 300
         # These two are first by convention
         out.emit(f"#define _EXIT_TRACE {next_id}\n")
@@ -52,10 +53,9 @@ def generate_uop_ids(
 
         base_max_uop_id = next_id - 1
         out.emit(f"#define MAX_UOP_ID {base_max_uop_id}\n")
-        out.emit(f"#define MAX_CACHED_REGISTER {MAX_CACHED_REGISTER}\n")
         first = True
         for target_depth in range(
-            MAX_CACHED_REGISTER, MAX_GENERATED_CACHED_REGISTER + 1
+            MIN_GENERATED_CACHED_REGISTER, MAX_GENERATED_CACHED_REGISTER + 1
         ):
             directive = "#if" if first else "#elif"
             out.emit(f"{directive} MAX_CACHED_REGISTER == {target_depth}\n")

Tools/cases_generator/uop_id_generator.py

@@ -11,6 +11,7 @@
     get_uop_cache_depths,
     Uop,
     MAX_CACHED_REGISTER,
+    MIN_GENERATED_CACHED_REGISTER,
     MAX_GENERATED_CACHED_REGISTER,
 )
 from generators_common import (
@@ -82,7 +83,7 @@ def emit_runtime_tables(out: CWriter, max_cached_register: int) -> None:
 def emit_runtime_table_selector(out: CWriter) -> None:
     first = True
     for max_cached_register in range(
-        MAX_CACHED_REGISTER, MAX_GENERATED_CACHED_REGISTER + 1
+        MIN_GENERATED_CACHED_REGISTER, MAX_GENERATED_CACHED_REGISTER + 1
     ):
         directive = "#if" if first else "#elif"
         out.emit(f"{directive} MAX_CACHED_REGISTER == {max_cached_register}\n")
@@ -135,7 +136,7 @@ def emit_exact_match_dispatch(
 ) -> None:
     first = True
     for max_cached_register in range(
-        MAX_CACHED_REGISTER, MAX_GENERATED_CACHED_REGISTER + 1
+        MIN_GENERATED_CACHED_REGISTER, MAX_GENERATED_CACHED_REGISTER + 1
     ):
         directive = "#if" if first else "#elif"
         out.emit(f"{directive} MAX_CACHED_REGISTER == {max_cached_register}\n")
@@ -154,7 +155,7 @@ def generate_names_and_flags(analysis: Analysis, out: CWriter) -> None:
     out.emit("extern int _PyUop_num_popped(int opcode, int oparg);\n")
     out.emit(CACHING_INFO_DECL)
     for max_cached_register in range(
-        MAX_CACHED_REGISTER, MAX_GENERATED_CACHED_REGISTER + 1
+        MIN_GENERATED_CACHED_REGISTER, MAX_GENERATED_CACHED_REGISTER + 1
     ):
         emit_runtime_tables(out, max_cached_register)
     emit_runtime_table_selector(out)

Tools/cases_generator/uop_metadata_generator.py

@@ -31,7 +31,6 @@
 
 ASYNCIO_RUNNER = asyncio.Runner()
 
-# TODO: Read this from Tools/cases_generator/analyzer.py instead of hardcoding.
 _MAX_CACHED_REGISTER = 3
 
 _S = typing.TypeVar("_S", _schema.COFFSection, _schema.ELFSection, _schema.MachOSection)