refactor(test-benchmark): repricing filter logic (#1810)

* refactor: update filter logic

* fix: fixed opcode count logic

* chore: update comment

* refactor: add negate logic

Author: LouisTsai-Csie

packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/benchmarking.py

@@ -44,10 +44,16 @@ def pytest_configure(config: pytest.Config) -> None:
 def pytest_collection_modifyitems(
     config: pytest.Config, items: list[pytest.Item]
 ) -> None:
-    """Remove non-repricing tests when --fixed-opcode-count is specified."""
+    """Filter tests based on repricing marker"""
+    gas_benchmark_value = config.getoption("gas_benchmark_value")
     fixed_opcode_count = config.getoption("fixed_opcode_count")
-    if not fixed_opcode_count:
-        # If --fixed-opcode-count is not specified, don't filter anything
+
+    if not gas_benchmark_value and not fixed_opcode_count:
+        return
+
+    # Check if -m repricing marker filter was specified
+    markexpr = config.getoption("markexpr", "")
+    if "repricing" not in markexpr or "not repricing" in markexpr:
         return
 
     filtered = []
@@ -105,27 +111,22 @@ def pytest_generate_tests(metafunc: pytest.Metafunc) -> None:
             )
 
     if "fixed_opcode_count" in metafunc.fixturenames:
-        # Only parametrize if test has repricing marker
-        has_repricing = (
-            metafunc.definition.get_closest_marker("repricing") is not None
-        )
-        if has_repricing:
-            if fixed_opcode_counts:
-                opcode_counts = [
-                    int(x.strip()) for x in fixed_opcode_counts.split(",")
-                ]
-                opcode_count_parameters = [
-                    pytest.param(
-                        opcode_count,
-                        id=f"opcount_{opcode_count}K",
-                    )
-                    for opcode_count in opcode_counts
-                ]
-                metafunc.parametrize(
-                    "fixed_opcode_count",
-                    opcode_count_parameters,
-                    scope="function",
+        if fixed_opcode_counts:
+            opcode_counts = [
+                int(x.strip()) for x in fixed_opcode_counts.split(",")
+            ]
+            opcode_count_parameters = [
+                pytest.param(
+                    opcode_count,
+                    id=f"opcount_{opcode_count}K",
                 )
+                for opcode_count in opcode_counts
+            ]
+            metafunc.parametrize(
+                "fixed_opcode_count",
+                opcode_count_parameters,
+                scope="function",
+            )
 
 
 @pytest.fixture(scope="function")

packages/testing/src/execution_testing/specs/benchmark.py

@@ -248,6 +248,11 @@ def model_post_init(self, __context: Any, /) -> None:
 
         blocks: List[Block] = self.setup_blocks
 
+        if self.fixed_opcode_count is not None and self.code_generator is None:
+            pytest.skip(
+                "Cannot run fixed opcode count tests without a code generator"
+            )
+
         if self.code_generator is not None:
             # Inject fixed_opcode_count into the code generator if provided
             self.code_generator.fixed_opcode_count = self.fixed_opcode_count

tests/benchmark/conftest.py

@@ -49,11 +49,10 @@ def pytest_collection_modifyitems(config: Any, items: Any) -> None:
         return
 
     marker_expr = config.getoption("-m", default="")
+
     run_benchmarks = (
-        marker_expr
-        and "benchmark" in marker_expr
-        and "not benchmark" not in marker_expr
-    )
+        "benchmark" in marker_expr and "not benchmark" not in marker_expr
+    ) or ("repricing" in marker_expr and "not repricing" not in marker_expr)
     run_stateful_tests = (
         marker_expr
         and "stateful" in marker_expr