diff options
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/cases_generator/analysis.py | 4 | ||||
| -rw-r--r-- | Tools/cases_generator/generate_cases.py | 10 | ||||
| -rw-r--r-- | Tools/cases_generator/instructions.py | 2 | ||||
| -rw-r--r-- | Tools/cases_generator/stacking.py | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/Tools/cases_generator/analysis.py b/Tools/cases_generator/analysis.py index 7c7c908..9e0124b 100644 --- a/Tools/cases_generator/analysis.py +++ b/Tools/cases_generator/analysis.py @@ -365,8 +365,8 @@ class Analyzer: case Instruction() as instr: part, offset = self.analyze_instruction(instr, offset) parts.append(part) - if instr.name != "SAVE_IP": - # SAVE_IP in a macro is a no-op in Tier 1 + if instr.name != "_SET_IP": + # _SET_IP in a macro is a no-op in Tier 1 flags.add(instr.instr_flags) case _: assert_never(component) diff --git a/Tools/cases_generator/generate_cases.py b/Tools/cases_generator/generate_cases.py index ad4a999..3ed7130 100644 --- a/Tools/cases_generator/generate_cases.py +++ b/Tools/cases_generator/generate_cases.py @@ -68,7 +68,7 @@ OPARG_SIZES = { "OPARG_CACHE_4": 4, "OPARG_TOP": 5, "OPARG_BOTTOM": 6, - "OPARG_SAVE_IP": 7, + "OPARG_SET_IP": 7, } INSTR_FMT_PREFIX = "INSTR_FMT_" @@ -658,8 +658,8 @@ class Generator(Analyzer): seen.add(name) # These two are first by convention - add("EXIT_TRACE") - add("SAVE_IP") + add("_EXIT_TRACE") + add("_SET_IP") for instr in self.instrs.values(): if instr.kind == "op": @@ -687,8 +687,8 @@ class Generator(Analyzer): ) return if not part.active_caches: - if part.instr.name == "SAVE_IP": - size, offset = OPARG_SIZES["OPARG_SAVE_IP"], cache_offset + if part.instr.name == "_SET_IP": + size, offset = OPARG_SIZES["OPARG_SET_IP"], cache_offset else: size, offset = OPARG_SIZES["OPARG_FULL"], 0 else: diff --git a/Tools/cases_generator/instructions.py b/Tools/cases_generator/instructions.py index 145c1ad..78b3c29 100644 --- a/Tools/cases_generator/instructions.py +++ b/Tools/cases_generator/instructions.py @@ -124,7 +124,7 @@ class Instruction: if "FRAME" in self.name: dprint = print - if self.name == "EXIT_TRACE": + if self.name == "_EXIT_TRACE": return True # This has 'return frame' but it's okay if self.always_exits: dprint(f"Skipping {self.name} because it always exits: {self.always_exits}") diff --git a/Tools/cases_generator/stacking.py b/Tools/cases_generator/stacking.py index 3021324..026f039 100644 --- a/Tools/cases_generator/stacking.py +++ b/Tools/cases_generator/stacking.py @@ -362,7 +362,7 @@ def write_macro_instr( parts = [ part for part in mac.parts - if isinstance(part, Component) and part.instr.name != "SAVE_IP" + if isinstance(part, Component) and part.instr.name != "_SET_IP" ] out.emit("") with out.block(f"TARGET({mac.name})"): @@ -444,7 +444,7 @@ def write_components( ), f"Expected {mgr.instr.name!r} to be the last uop" assert_no_pokes(managers) - if mgr.instr.name == "SAVE_CURRENT_IP": + if mgr.instr.name == "_SAVE_CURRENT_IP": next_instr_is_set = True if cache_offset: out.emit(f"next_instr += {cache_offset};") |