Simplify the case extract

Author: aisk

Tools/cases_generator/tier2_generator.py

@@ -281,10 +281,9 @@ def generate_tier2(
             emitter = Tier2Emitter(out, analysis.labels, exit_depth)
             opname = f"{uop.name}_r{inputs}{outputs}"
             needed_cached_registers = max(inputs, outputs)
-            out.emit(f"/* BEGIN_JIT_CASE {opname} */\n")
+            out.emit(f"case {opname}: {{\n")
             if needed_cached_registers:
                 out.emit(f"#if MAX_CACHED_REGISTER >= {needed_cached_registers}\n")
-            out.emit(f"case {opname}: {{\n")
             out.emit(f"CHECK_CURRENT_CACHED_VALUES({inputs});\n")
             out.emit("assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());\n")
             declare_variables(uop, out)
@@ -297,13 +296,13 @@ def generate_tier2(
                 out.emit("assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());\n")
                 if not uop.properties.always_exits:
                     out.emit("break;\n")
+            if needed_cached_registers:
+                out.emit("#else\n")
+                out.emit("Py_UNREACHABLE();\n")
+                out.emit("#endif\n")
             out.start_line()
             out.emit("}")
             out.emit("\n\n")
-            if needed_cached_registers:
-                out.emit("#endif\n\n")
-            out.emit(f"/* END_JIT_CASE {opname} */\n")
-            out.emit("\n")
     out.emit("\n")
     outfile.write("#undef TIER_TWO\n")
 

Tools/jit/_targets.py

@@ -36,29 +36,6 @@
     "_R", _schema.COFFRelocation, _schema.ELFRelocation, _schema.MachORelocation
 )
 
-def _extract_jit_cases(generated_cases: str) -> list[tuple[str, str]]:
-    begin_case = re.compile(r"\s*/\* BEGIN_JIT_CASE (\w+) \*/\n")
-    cases_and_opnames: list[tuple[str, str]] = []
-    current_opname: str | None = None
-    current_lines: list[str] = []
-    for line in generated_cases.splitlines(keepends=True):
-        if current_opname is None:
-            match = begin_case.fullmatch(line)
-            if match is not None:
-                current_opname = match.group(1)
-                current_lines = []
-            continue
-        if line.strip() == f"/* END_JIT_CASE {current_opname} */":
-            cases_and_opnames.append(("".join(current_lines), current_opname))
-            current_opname = None
-            current_lines = []
-            continue
-        current_lines.append(line)
-    if current_opname is not None:
-        raise RuntimeError(f"Unterminated JIT case block for {current_opname}")
-    return cases_and_opnames
-
-
 @dataclasses.dataclass
 class _Target(typing.Generic[_S, _R]):
     triple: str
@@ -217,7 +194,11 @@ async def _compile(
 
     async def _build_stencils(self) -> dict[str, _stencils.StencilGroup]:
         generated_cases = PYTHON_EXECUTOR_CASES_C_H.read_text()
-        cases_and_opnames = _extract_jit_cases(generated_cases)
+        cases_and_opnames = sorted(
+            re.findall(
+                r"\n {8}(case (\w+): \{\n.*?\n {8}\})", generated_cases, flags=re.DOTALL
+            )
+        )
         tasks = []
         with tempfile.TemporaryDirectory() as tempdir:
             work = pathlib.Path(tempdir).resolve()