Raise analysis_error instead of ValueError

python · Oct 21, 2024 · f9ecb16 · f9ecb16
1 parent 33343dd
commit f9ecb16
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Tools/cases_generator/analyzer.py b/Tools/cases_generator/analyzer.py
@@ -1105,8 +1105,7 @@ def get_instruction_size_for_uop(instructions: dict[str, Instruction], uop: Uop)
                 f"must have the same size: {size} != {inst.size}"
             )
     if size is None:
-        msg = f"No instruction containing the uop '{uop.name}' was found"
-        raise ValueError(msg)
+        raise analysis_error(f"No instruction containing the uop '{uop.name}' was found")
     return size
 
 

diff --git a/Tools/cases_generator/generators_common.py b/Tools/cases_generator/generators_common.py
@@ -366,7 +366,8 @@ def instruction_size(self,
         inst: Instruction | None,
     ) -> bool:
         """Replace the INSTRUCTION_SIZE macro with the size of the current instruction."""
-        assert uop.instruction_size is not None, "INSTRUCTION_SIZE macro requires uop.instruction_size to be set"
+        if uop.instruction_size is None:
+            raise analysis_error("INSTRUCTION_SIZE macro requires uop.instruction_size to be set", tkn)
         self.out.emit(f" {uop.instruction_size} ")
         return True