Arm backend: Remove unittest legacy solutions (#11146)

- Removes corstone_fvp pytest marks
- Removes uses of --arm_run_corstoneFVP
- Removes @expectedFailureOnFVP
- Removes @SkipIfNoCorstone3*0
- Removes pre-push tests related to old tests
- Set run_on_fvp=True and use_to_edge_transform_and_lower=True for
relevant pipelines.
- Updates unittests to work with run_on_fvp=True as default

Signed-off-by: Adrian Lundell <[email protected]>

Author: AdrianLundell

backends/arm/README.md

@@ -101,7 +101,7 @@ backends/arm/test/setup_testing.sh
 The you can run the tests with
 
 ```
-pytest -c /dev/null -v -n auto backends/arm/test --arm_run_corstoneFVP
+pytest -c /dev/null -v -n auto backends/arm/test
 ```
 
 ## Passes

backends/arm/scripts/pre-push

@@ -181,31 +181,6 @@ for COMMIT in ${COMMITS}; do
     op_test_files=$(echo $commit_files | grep -oE 'backends/arm/test/ops/\S+')
     if [ "$op_test_files" ]; then
 
-        # TODO: These checks can be removed when all unittests are refactored.
-        if grep -icq "SkipIfNoCorstone" $op_test_files; then
-            echo -e "${ERROR} @SkipIfNoCorstone300/320 is deprecated;"\
-                "please use XfailIfNoCorstone300/320 instead." >&2
-            FAILED=1
-        fi
-
-        if grep -icq "conftest.expectedFailureOnFVP" $op_test_files; then
-            echo -e "${ERROR} @conftest.expectedFailureOnFVP is deprecated;"\
-                "please use XfailIfCorstone300/320 instead." >&2
-            FAILED=1
-        fi
-
-        if grep -icq "unittest.TestCase" $op_test_files; then
-            echo -e "${ERROR} Use of the Unittest test framework is deprecated;"\
-            "please use Pytest instead." >&2
-            FAILED=1
-        fi
-
-        if grep -icq "on_fvp(" $op_test_files; then
-            echo -e "${ERROR} All unittests should run on FVP if relevant,"\
-            "on_fvp suffix can be excluded." >&2
-            FAILED=1
-        fi
-
         # Check that the tested op and target is parsed correctly from the test name
         test_names=$(grep -h "def test_" $op_test_files | cut -d"(" -f1 | cut -d" " -f2)
         python ./backends/arm/scripts/parse_test_names.py $test_names

backends/arm/test/common.py

@@ -186,25 +186,6 @@ def get_u85_compile_spec_unbuilt(
     return compile_spec  # type: ignore[return-value]
 
 
-SkipIfNoCorstone300 = pytest.mark.skipif(
-    not corstone300_installed() or not arm_executor_runner_exists("corstone-300"),
-    reason="Did not find Corstone-300 FVP or executor_runner on path",
-)
-"""
-TO BE DEPRECATED - Use XfailIfNoCorstone300 instead
-Skips a test if Corsone300 FVP is not installed, or if the executor runner is not built
-"""
-
-SkipIfNoCorstone320 = pytest.mark.skipif(
-    not corstone320_installed() or not arm_executor_runner_exists("corstone-320"),
-    reason="Did not find Corstone-320 FVP or executor_runner on path",
-)
-"""
-TO BE DEPRECATED - Use XfailIfNoCorstone320 instead
-Skips a test if Corsone320 FVP is not installed, or if the executor runner is not built
-"""
-
-
 XfailIfNoCorstone300 = pytest.mark.xfail(
     condition=not (
         corstone300_installed() and arm_executor_runner_exists("corstone-300")

backends/arm/test/conftest.py

@@ -6,7 +6,6 @@
 import logging
 import os
 import random
-import shutil
 import sys
 from typing import Any
 
@@ -22,20 +21,6 @@
 
 def pytest_configure(config):
     pytest._test_options = {}  # type: ignore[attr-defined]
-    pytest._test_options["corstone_fvp"] = False  # type: ignore[attr-defined]
-
-    if (
-        getattr(config.option, "arm_run_corstoneFVP", False)
-        and config.option.arm_run_corstoneFVP
-    ):
-        corstone300_exists = shutil.which("FVP_Corstone_SSE-300_Ethos-U55")
-        corstone320_exists = shutil.which("FVP_Corstone_SSE-320")
-        if not (corstone300_exists and corstone320_exists):
-            raise RuntimeError(
-                "Tests are run with --arm_run_corstoneFVP but corstone FVP is not installed."
-            )
-        # Only enable if we also have the TOSA reference model available.
-        pytest._test_options["corstone_fvp"] = True  # type: ignore[attr-defined]
 
     if getattr(config.option, "llama_inputs", False) and config.option.llama_inputs:
         pytest._test_options["llama_inputs"] = config.option.llama_inputs  # type: ignore[attr-defined]
@@ -135,18 +120,6 @@ def set_random_seed():
 # ==== End of Pytest fixtures =====
 
 
-# ==== Custom Pytest decorators =====
-
-
-def expectedFailureOnFVP(test_item):
-    if is_option_enabled("corstone_fvp"):
-        test_item.__unittest_expecting_failure__ = True
-    return test_item
-
-
-# ==== End of Custom Pytest decorators =====
-
-
 def is_option_enabled(option: str, fail_if_not_enabled: bool = False) -> bool:
     """
     Returns whether an option is successfully enabled, i.e. if the flag was

backends/arm/test/misc/test_debug_feats.py

@@ -212,11 +212,7 @@ def forward(self, x):
 @common.parametrize("test_data", Add.inputs)
 def test_fail_dump_tosa_ops(caplog, test_data: input_t1):
     pipeline = EthosU55PipelineBI[input_t1](
-        Add(),
-        test_data,
-        [],
-        [],
-        use_to_edge_transform_and_lower=True,
+        Add(), test_data, [], [], use_to_edge_transform_and_lower=True, run_on_fvp=False
     )
     pipeline.dump_operator_distribution("to_edge_transform_and_lower")
     pipeline.run()

backends/arm/test/models/test_mobilenet_v2_arm.py

@@ -1,6 +1,6 @@
 # Copyright (c) Meta Platforms, Inc. and affiliates.
-# Copyright 2024-2025 Arm Limited and/or its affiliates.
 # All rights reserved.
+# Copyright 2024-2025 Arm Limited and/or its affiliates.
 #
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
@@ -53,7 +53,6 @@ def test_mv2_tosa_BI():
 
 
 @pytest.mark.slow
-@pytest.mark.corstone_fvp
 @common.XfailIfNoCorstone300
 def test_mv2_u55_BI():
     pipeline = EthosU55PipelineBI[input_t](
@@ -70,7 +69,6 @@ def test_mv2_u55_BI():
 
 
 @pytest.mark.slow
-@pytest.mark.corstone_fvp
 @common.XfailIfNoCorstone320
 def test_mv2_u85_BI():
     pipeline = EthosU85PipelineBI[input_t](

backends/arm/test/models/test_mobilenet_v3_arm.py

@@ -53,7 +53,6 @@ def test_mv3_tosa_BI():
 
 
 @pytest.mark.slow
-@pytest.mark.corstone_fvp
 @common.XfailIfNoCorstone300
 def test_mv3_u55_BI():
     pipeline = EthosU55PipelineBI[input_t](
@@ -70,7 +69,6 @@ def test_mv3_u55_BI():
 
 
 @pytest.mark.slow
-@pytest.mark.corstone_fvp
 @common.XfailIfNoCorstone320
 def test_mv3_u85_BI():
     pipeline = EthosU85PipelineBI[input_t](

backends/arm/test/ops/test_alias_copy.py

@@ -64,6 +64,7 @@ def test_alias_tosa_BI(test_data: input_t1):
 
 
 @common.parametrize("test_data", AliasCopy.test_data)
+@common.XfailIfNoCorstone300
 def test_alias_u55_BI(test_data: input_t1):
     EthosU55PipelineBI[input_t1](
         AliasCopy(),
@@ -74,6 +75,7 @@ def test_alias_u55_BI(test_data: input_t1):
 
 
 @common.parametrize("test_data", AliasCopy.test_data)
+@common.XfailIfNoCorstone320
 def test_alias_u85_BI(test_data: input_t1):
     EthosU85PipelineBI[input_t1](
         AliasCopy(),

backends/arm/test/ops/test_arange.py

@@ -90,6 +90,7 @@ def test_arange_start_step_tosa_BI(test_data: test_data_t):
 
 
 @common.parametrize("test_data", ArangeAdd.test_data)
+@common.XfailIfNoCorstone300
 def test_arange_start_step_u55_BI(test_data: test_data_t):
     input_data, init_data = test_data
     pipeline = EthosU55PipelineBI[input_t](
@@ -102,6 +103,7 @@ def test_arange_start_step_u55_BI(test_data: test_data_t):
 
 
 @common.parametrize("test_data", ArangeAdd.test_data)
+@common.XfailIfNoCorstone320
 def test_arange_start_step_u85_BI(test_data: test_data_t):
     input_data, init_data = test_data
     pipeline = EthosU85PipelineBI[input_t](

backends/arm/test/ops/test_eye.py

@@ -71,6 +71,7 @@ def test_eye_tosa_BI(test_data: test_data_t):
 
 
 @common.parametrize("test_data", EyeAdd.test_data)
+@common.XfailIfNoCorstone300
 def test_eye_u55_BI(test_data: test_data_t):
     input_data, init_data = test_data
     pipeline = EthosU55PipelineBI[input_t](
@@ -84,6 +85,7 @@ def test_eye_u55_BI(test_data: test_data_t):
 
 
 @common.parametrize("test_data", EyeAdd.test_data)
+@common.XfailIfNoCorstone320
 def test_eye_u85_BI(test_data: test_data_t):
     input_data, init_data = test_data
     pipeline = EthosU85PipelineBI[input_t](