From 231fc6a570f48c89238c586f457f5215cbc82a3f Mon Sep 17 00:00:00 2001 From: Mikhail Efimov Date: Sat, 12 Jul 2025 20:17:08 +0300 Subject: [PATCH 1/2] Fix for optimizer_generator to run correctly with -OO --- Tools/cases_generator/optimizer_generator.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Tools/cases_generator/optimizer_generator.py b/Tools/cases_generator/optimizer_generator.py index 81ae534bddae5c..9f0763fd73f2e8 100644 --- a/Tools/cases_generator/optimizer_generator.py +++ b/Tools/cases_generator/optimizer_generator.py @@ -398,9 +398,9 @@ def generate_abstract_interpreter( out.emit("\n") base_uop_names = set([uop.name for uop in base.uops.values()]) for abstract_uop_name in abstract.uops: - assert ( - abstract_uop_name in base_uop_names - ), f"All abstract uops should override base uops, but {abstract_uop_name} is not." + if abstract_uop_name not in base_uop_names: + raise AssertionError(f"All abstract uops should override base uops, " + "but {abstract_uop_name} is not.") for uop in base.uops.values(): override: Uop | None = None From 1ee1a66b05ffd47d86eebdcc88f33586d13f9a67 Mon Sep 17 00:00:00 2001 From: Mikhail Efimov Date: Sun, 20 Jul 2025 23:33:08 +0300 Subject: [PATCH 2/2] AssertionError is replaced by ValueError. --- Lib/test/test_generated_cases.py | 2 +- Tools/cases_generator/optimizer_generator.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_generated_cases.py b/Lib/test/test_generated_cases.py index 81d4e39f5be1ee..ec44a0f9ce3fb3 100644 --- a/Lib/test/test_generated_cases.py +++ b/Lib/test/test_generated_cases.py @@ -2037,7 +2037,7 @@ def test_missing_override_failure(self): """ output = """ """ - with self.assertRaisesRegex(AssertionError, "All abstract uops"): + with self.assertRaisesRegex(ValueError, "All abstract uops"): self.run_cases_test(input, input2, output) def test_validate_uop_input_length_mismatch(self): diff --git a/Tools/cases_generator/optimizer_generator.py b/Tools/cases_generator/optimizer_generator.py index 9f0763fd73f2e8..ea9dd836d98e22 100644 --- a/Tools/cases_generator/optimizer_generator.py +++ b/Tools/cases_generator/optimizer_generator.py @@ -399,7 +399,7 @@ def generate_abstract_interpreter( base_uop_names = set([uop.name for uop in base.uops.values()]) for abstract_uop_name in abstract.uops: if abstract_uop_name not in base_uop_names: - raise AssertionError(f"All abstract uops should override base uops, " + raise ValueError(f"All abstract uops should override base uops, " "but {abstract_uop_name} is not.") for uop in base.uops.values():