pythonGH-111485: Factor out tier 2 code generation from the rest of t…

…he interpreter code generator (pythonGH-112968)
aisk · Feb 11, 2024 · cd18c36 · cd18c36
1 parent 279b7f9
commit cd18c36
Show file tree

Hide file tree

Showing 14 changed files with 1,391 additions and 974 deletions.
diff --git a/Include/internal/pycore_uop_ids.h b/Include/internal/pycore_uop_ids.h
diff --git a/Include/opcode_ids.h b/Include/opcode_ids.h
diff --git a/Makefile.pre.in b/Makefile.pre.in
@@ -1589,7 +1589,6 @@ regen-cases:
  $(CASESFLAG) \
  -t $(srcdir)/Python/opcode_targets.h.new \
  -m $(srcdir)/Include/internal/pycore_opcode_metadata.h.new \
- -e $(srcdir)/Python/executor_cases.c.h.new \
  -p $(srcdir)/Lib/_opcode_metadata.py.new \
  -a $(srcdir)/Python/abstract_interp_cases.c.h.new \
  $(srcdir)/Python/bytecodes.c
@@ -1599,6 +1598,8 @@ regen-cases:
  $(srcdir)/Tools/cases_generator/uop_id_generator.py -o $(srcdir)/Include/internal/pycore_uop_ids.h.new $(srcdir)/Python/bytecodes.c
  $(PYTHON_FOR_REGEN) \
  $(srcdir)/Tools/cases_generator/tier1_generator.py -o $(srcdir)/Python/generated_cases.c.h.new $(srcdir)/Python/bytecodes.c
+ $(PYTHON_FOR_REGEN) \
+ $(srcdir)/Tools/cases_generator/tier2_generator.py -o $(srcdir)/Python/executor_cases.c.h.new $(srcdir)/Python/bytecodes.c
  $(UPDATE_FILE) $(srcdir)/Python/generated_cases.c.h $(srcdir)/Python/generated_cases.c.h.new
  $(UPDATE_FILE) $(srcdir)/Include/opcode_ids.h $(srcdir)/Include/opcode_ids.h.new
  $(UPDATE_FILE) $(srcdir)/Include/internal/pycore_uop_ids.h $(srcdir)/Include/internal/pycore_uop_ids.h.new

diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -3967,6 +3967,7 @@ dummy_func(
  }
 
  inst(EXTENDED_ARG, ( -- )) {
+ TIER_ONE_ONLY
  assert(oparg);
  opcode = next_instr->op.code;
  oparg = oparg << 8 | next_instr->op.arg;
@@ -3975,11 +3976,13 @@ dummy_func(
  }
 
  inst(CACHE, (--)) {
+ TIER_ONE_ONLY
  assert(0 && "Executing a cache.");
  Py_UNREACHABLE();
  }
 
  inst(RESERVED, (--)) {
+ TIER_ONE_ONLY
  assert(0 && "Executing RESERVED instruction.");
  Py_UNREACHABLE();
  }