Fix type errors

Author: markshannon

Tools/cases_generator/analyzer.py

@@ -417,14 +417,11 @@ def analyze_caches(inputs: list[parser.InputEffect]) -> list[CacheEntry]:
         i for i in inputs if isinstance(i, parser.CacheEffect)
     ]
     if caches:
-        if caches[0].name == "unused":
-            raise analysis_error(
-                "First cache entry in op is unused. Move to enclosing macro.", cache.tokens[0]
-            )
-        if caches[-1].name == "unused":
-            raise analysis_error(
-                "Last cache entry in op is unused. Move to enclosing macro.", cache.tokens[0]
-            )
+        for cache in (caches[0], caches[-1]):
+            if cache.name == "unused":
+                raise analysis_error(
+                    "First cache entry in op is unused. Move to enclosing macro.", cache.tokens[0]
+                )
     return [CacheEntry(i.name, int(i.size)) for i in caches]
 
 

Tools/cases_generator/opcode_metadata_generator.py

@@ -319,7 +319,7 @@ def generate_expansion_table(analysis: Analysis, out: CWriter) -> None:
     expansions_table: dict[str, list[tuple[str, str, int]]] = {}
     for inst in sorted(analysis.instructions.values(), key=lambda t: t.name):
         offset: int = 0  # Cache effect offset
-        expansions: list[tuple[str, int, int]] = []  # [(name, size, offset), ...]
+        expansions: list[tuple[str, str, int]] = []  # [(name, size, offset), ...]
         if inst.is_super():
             pieces = inst.name.split("_")
             assert len(pieces) == 4, f"{inst.name} doesn't look like a super-instr"
@@ -335,20 +335,19 @@ def generate_expansion_table(analysis: Analysis, out: CWriter) -> None:
             assert (
                 len(instr2.parts) == 1
             ), f"{name2} is not a good superinstruction part"
-            expansions.append((instr1.parts[0].name, OPARG_KINDS["OPARG_TOP"], 0))
-            expansions.append((instr2.parts[0].name, OPARG_KINDS["OPARG_BOTTOM"], 0))
+            expansions.append((instr1.parts[0].name, "OPARG_TOP", 0))
+            expansions.append((instr2.parts[0].name, "OPARG_BOTTOM", 0))
         elif not is_viable_expansion(inst):
             continue
         else:
             for part in inst.parts:
                 size = part.size
                 if isinstance(part, Uop):
+                    fmt = "0"
                     if part.name == "_SAVE_RETURN_OFFSET":
                         fmt = "OPARG_SAVE_RETURN_OFFSET"
                     elif part.caches:
                         fmt = str(part.caches[0].size)
-                    else:
-                        fmt = "0"
                     # Skip specializations
                     if "specializing" in part.annotations:
                         continue