Arm backend: Refactor OpNotSupportedPipeline to allow for Tosa 1.0

SaoirseARM · SaoirseARM · commit 894258cb34cc · 2025-05-08T14:05:40.000+01:00
Change-Id: Ieb0e0104a9ebc15f319453f983edfaf0016d4050
diff --git a/backends/arm/test/ops/test_amax.py b/backends/arm/test/ops/test_amax.py
@@ -87,8 +87,9 @@ def test_amax_u55_BI_not_delegated():
     pipeline = OpNotSupportedPipeline[Amax.input_t](
         Amax(dim, keep_dims),
         data,
-        "TOSA-0.80+BI+u55",
         {" executorch_exir_dialects_edge__ops_aten_amax_default": 1},
+        quantize=True,
+        u55_subset=True,
     )
     pipeline.run()
 
@@ -128,14 +129,12 @@ def test_max_dim_tosa_BI_to_amax(test_data: Max.input_t):
 def test_max_dim_tosa_BI_not_delegated():
     data, dim = Max.test_data()["rank_4_dim_3"]()
     pipeline = OpNotSupportedPipeline[Max.input_t](
-        MaxWithIndex(dim), data, "TOSA-0.80+BI", {}
+        MaxWithIndex(dim), data, {}, quantize=True
     )
     pipeline.run()
 
 
 def test_max_dim_tosa_MI_not_delegated():
     data, dim = Max.test_data["rank_4_dim_3"]()
-    pipeline = OpNotSupportedPipeline[Max.input_t](
-        MaxWithIndex(dim), data, "TOSA-0.80+MI", {}
-    )
+    pipeline = OpNotSupportedPipeline[Max.input_t](MaxWithIndex(dim), data, {})
     pipeline.run()
diff --git a/backends/arm/test/ops/test_amin.py b/backends/arm/test/ops/test_amin.py
@@ -96,8 +96,9 @@ def test_amin_u55_BI_not_delegated():
     pipeline = OpNotSupportedPipeline[Amin.input_t](
         Amin(dim, keep_dims),
         data,
-        "TOSA-0.80+BI+u55",
         {" executorch_exir_dialects_edge__ops_aten_amin_default": 1},
+        quantize=True,
+        u55_subset=True,
     )
     pipeline.run()
 
@@ -137,14 +138,15 @@ def test_min_dim_tosa_BI_to_amin(test_data: Min.input_t):
 def test_min_dim_tosa_BI_not_delegated():
     data, dim = Min.test_data["rank_4_dim_3"]()
     pipeline = OpNotSupportedPipeline[Min.input_t](
-        MinWithIndex(dim), data, "TOSA-0.80+BI+u55", {}
+        MinWithIndex(dim),
+        data,
+        {},
+        quantize=True,
     )
     pipeline.run()
 
 
 def test_min_dim_tosa_MI_not_delegated():
     data, dim = Min.test_data["rank_4_dim_3"]()
-    pipeline = OpNotSupportedPipeline[Min.input_t](
-        MinWithIndex(dim), data, "TOSA-0.80+MI", {}
-    )
+    pipeline = OpNotSupportedPipeline[Min.input_t](MinWithIndex(dim), data, {})
     pipeline.run()
diff --git a/backends/arm/test/ops/test_any.py b/backends/arm/test/ops/test_any.py
@@ -143,7 +143,11 @@ def test_any_u55_BI(test_data: input_t1):
     # Tests that we don't delegate these ops since they are not supported on U55.
     op, test_input = test_data()
     pipeline = OpNotSupportedPipeline[input_t1](
-        op, test_input(), "TOSA-0.80+BI+u55", {op.exir_op: 1}
+        op,
+        test_input(),
+        {op.exir_op: 1},
+        quantize=True,
+        u55_subset=True,
     )
     pipeline.run()
 
diff --git a/backends/arm/test/ops/test_avg_pool2d.py b/backends/arm/test/ops/test_avg_pool2d.py
@@ -159,8 +159,8 @@ def test_avg_pool2d_tosa_BI_not_delegated(reject_module):
     pipeline = OpNotSupportedPipeline[input_t](
         module=model,
         test_data=(test_data,),
-        tosa_version="TOSA-0.80+BI",
         non_delegated_ops={},
         n_expected_delegates=0,
+        quantize=True,
     )
     pipeline.run()
diff --git a/backends/arm/test/ops/test_bitwise.py b/backends/arm/test/ops/test_bitwise.py
@@ -87,7 +87,11 @@ def test_bitwise_and_tensor_tosa_BI(test_data: input_t2):
 def test_bitwise_and_tensor_u55_BI(test_data: input_t2):
     # Tests that we don't delegate these ops since they are not supported on U55.
     pipeline = OpNotSupportedPipeline[input_t2](
-        And(), test_data(), "TOSA-0.80+BI+u55", {And().exir_op: 1}
+        And(),
+        test_data(),
+        {And().exir_op: 1},
+        quantize=True,
+        u55_subset=True,
     )
     pipeline.run()
 
@@ -126,7 +130,11 @@ def test_bitwise_xor_tensor_tosa_BI(test_data: input_t2):
 def test_bitwise_xor_tensor_u55_BI(test_data: input_t2):
     # Tests that we don't delegate these ops since they are not supported on U55.
     pipeline = OpNotSupportedPipeline[input_t2](
-        Xor(), test_data(), "TOSA-0.80+BI+u55", {Xor().exir_op: 1}
+        Xor(),
+        test_data(),
+        {Xor().exir_op: 1},
+        quantize=True,
+        u55_subset=True,
     )
     pipeline.run()
 
@@ -161,7 +169,11 @@ def test_bitwise_or_tensor_tosa_BI(test_data: input_t2):
 def test_bitwise_or_tensor_u55_BI(test_data: input_t2):
     # Tests that we don't delegate these ops since they are not supported on U55.
     pipeline = OpNotSupportedPipeline[input_t2](
-        Or(), test_data(), "TOSA-0.80+BI+u55", {Or().exir_op: 1}
+        Or(),
+        test_data(),
+        {Or().exir_op: 1},
+        quantize=True,
+        u55_subset=True,
     )
     pipeline.run()
 
diff --git a/backends/arm/test/ops/test_conv2d.py b/backends/arm/test/ops/test_conv2d.py
@@ -445,6 +445,7 @@ def test_convolution_2d_u55_BI_not_delegated(module: Conv2d):
     OpNotSupportedPipeline(
         module(),
         module().get_inputs(),
-        "TOSA-0.80+BI+u55",
         {"executorch_exir_dialects_edge__ops_aten_convolution_default": 1},
+        quantize=True,
+        u55_subset=True,
     ).run()
diff --git a/backends/arm/test/ops/test_conv3d.py b/backends/arm/test/ops/test_conv3d.py
@@ -400,6 +400,7 @@ def test_convolution_u55_BI_not_delegated_3d(module: Conv3d):
     OpNotSupportedPipeline(
         module(),
         module().get_inputs(),
-        "TOSA-0.80+BI+u55",
         {"executorch_exir_dialects_edge__ops_aten_convolution_default": 1},
+        quantize=True,
+        u55_subset=True,
     ).run()
diff --git a/backends/arm/test/ops/test_eq.py b/backends/arm/test/ops/test_eq.py
@@ -127,8 +127,9 @@ def test_eq_scalar_u55_BI_tensor(test_module):
     pipeline = OpNotSupportedPipeline[input_t](
         test_module(),
         test_module().get_inputs(),
-        "TOSA-0.80+BI+u55",
         {Equal.exir_op: 1},
+        quantize=True,
+        u55_subset=True,
     )
     pipeline.run()
 
@@ -140,9 +141,10 @@ def test_eq_scalar_u55_BI(test_module):
     pipeline = OpNotSupportedPipeline[input_t](
         test_module(),
         test_module().get_inputs(),
-        "TOSA-0.80+BI+u55",
         {Equal.exir_op: 1},
         n_expected_delegates=1,
+        quantize=True,
+        u55_subset=True,
     )
     pipeline.run()
 
diff --git a/backends/arm/test/ops/test_ge.py b/backends/arm/test/ops/test_ge.py
@@ -127,8 +127,9 @@ def test_ge_tensor_u55_BI(test_module):
     pipeline = OpNotSupportedPipeline[input_t](
         test_module(),
         test_module().get_inputs(),
-        "TOSA-0.80+BI+u55",
         {GreaterEqual.exir_op: 1},
+        quantize=True,
+        u55_subset=True,
     )
     pipeline.run()
 
@@ -140,9 +141,10 @@ def test_ge_scalar_u55_BI(test_module):
     pipeline = OpNotSupportedPipeline[input_t](
         test_module(),
         test_module().get_inputs(),
-        "TOSA-0.80+BI+u55",
         {GreaterEqual.exir_op: 1},
         n_expected_delegates=1,
+        quantize=True,
+        u55_subset=True,
     )
     pipeline.run()
 
diff --git a/backends/arm/test/ops/test_gt.py b/backends/arm/test/ops/test_gt.py
@@ -128,8 +128,9 @@ def test_gt_tensor_u55_BI(test_module):
     pipeline = OpNotSupportedPipeline[input_t](
         test_module(),
         test_module().get_inputs(),
-        "TOSA-0.80+BI+u55",
         {Greater.exir_op: 1},
+        quantize=True,
+        u55_subset=True,
     )
     pipeline.run()
 
@@ -141,9 +142,10 @@ def test_gt_scalar_u55_BI(test_module):
     pipeline = OpNotSupportedPipeline[input_t](
         test_module(),
         test_module().get_inputs(),
-        "TOSA-0.80+BI+u55",
         {Greater.exir_op: 1},
         n_expected_delegates=1,
+        quantize=True,
+        u55_subset=True,
     )
     pipeline.run()
 
diff --git a/backends/arm/test/ops/test_le.py b/backends/arm/test/ops/test_le.py
@@ -85,8 +85,9 @@ def test_le_tensor_u55_BI_not_delegated(test_module):
     pipeline = OpNotSupportedPipeline[input_t](
         test_module(),
         test_module().get_inputs(),
-        "TOSA-0.80+BI+u55",
         {exir_op: 1},
+        quantize=True,
+        u55_subset=True,
     )
     pipeline.run()
 
diff --git a/backends/arm/test/ops/test_logical.py b/backends/arm/test/ops/test_logical.py
@@ -103,7 +103,11 @@ def test_logical_and_tosa_BI(test_data: input_t2):
 def test_logical_and_u55_BI_not_delegated(test_data: input_t2):
     # Tests that we don't delegate these ops since they are not supported on U55.
     pipeline = OpNotSupportedPipeline[input_t2](
-        And(), test_data(), "TOSA-0.80+BI+u55", {And().exir_op: 1}
+        And(),
+        test_data(),
+        {And().exir_op: 1},
+        quantize=True,
+        u55_subset=True,
     )
     pipeline.run()
 
@@ -142,7 +146,11 @@ def test_logical_xor_tosa_BI(test_data: input_t2):
 def test_logical_xor_u55_BI_not_delegated(test_data: input_t2):
     # Tests that we don't delegate these ops since they are not supported on U55.
     pipeline = OpNotSupportedPipeline[input_t2](
-        Xor(), test_data(), "TOSA-0.80+BI+u55", {Xor().exir_op: 1}
+        Xor(),
+        test_data(),
+        {Xor().exir_op: 1},
+        quantize=True,
+        u55_subset=True,
     )
     pipeline.run()
 
@@ -177,7 +185,11 @@ def test_logical_or_tosa_BI(test_data: input_t2):
 def test_logical_or_u55_BI_not_delegated(test_data: input_t2):
     # Tests that we don't delegate these ops since they are not supported on U55.
     pipeline = OpNotSupportedPipeline[input_t2](
-        Or(), test_data(), "TOSA-0.80+BI+u55", {Or().exir_op: 1}
+        Or(),
+        test_data(),
+        {Or().exir_op: 1},
+        quantize=True,
+        u55_subset=True,
     )
     pipeline.run()
 
@@ -216,7 +228,11 @@ def test_logical_not_tosa_BI(test_data: input_t2):
 def test_logical_not_u55_BI_not_delegated(test_data: input_t2):
     # Tests that we don't delegate these ops since they are not supported on U55.
     pipeline = OpNotSupportedPipeline[input_t2](
-        Not(), test_data(), "TOSA-0.80+BI+u55", {Not().exir_op: 1}
+        Not(),
+        test_data(),
+        {Not().exir_op: 1},
+        quantize=True,
+        u55_subset=True,
     )
     pipeline.run()
 
diff --git a/backends/arm/test/ops/test_lt.py b/backends/arm/test/ops/test_lt.py
@@ -128,8 +128,9 @@ def test_lt_tensor_u55_BI_not_delegated(test_module):
     pipeline = OpNotSupportedPipeline[input_t](
         test_module(),
         test_module().get_inputs(),
-        "TOSA-0.80+BI+u55",
         {LessThan.exir_op: 1},
+        quantize=True,
+        u55_subset=True,
     )
     pipeline.run()
 
@@ -141,9 +142,10 @@ def test_lt_scalar_u55_BI_not_delegated(test_module):
     pipeline = OpNotSupportedPipeline[input_t](
         test_module(),
         test_module().get_inputs(),
-        "TOSA-0.80+BI+u55",
         {LessThan.exir_op: 1},
         n_expected_delegates=1,
+        quantize=True,
+        u55_subset=True,
     )
     pipeline.run()
 
diff --git a/backends/arm/test/ops/test_ne.py b/backends/arm/test/ops/test_ne.py
@@ -126,11 +126,12 @@ def test_ne_tensor_u55_BI(test_module):
     pipeline = OpNotSupportedPipeline[input_t](
         test_module,
         test_module.get_inputs(),
-        "TOSA-0.80+BI+u55",
         {
             NotEqual.decomposed_exir_ops[0]: 1,
             NotEqual.decomposed_exir_ops[1]: 1,
         },
+        quantize=True,
+        u55_subset=True,
     )
     pipeline.run()
 
@@ -143,11 +144,12 @@ def test_ne_scalar_u55_BI(test_module):
     pipeline = OpNotSupportedPipeline[input_t](
         test_module,
         test_module.get_inputs(),
-        "TOSA-0.80+BI+u55",
         {
             NotEqual.decomposed_exir_ops[0]: 1,
             NotEqual.decomposed_exir_ops[1]: 1,
         },
+        quantize=True,
+        u55_subset=True,
         n_expected_delegates=1,
     )
     pipeline.run()
diff --git a/backends/arm/test/ops/test_sigmoid_16bit.py b/backends/arm/test/ops/test_sigmoid_16bit.py
@@ -134,7 +134,11 @@ def test_sigmoid_tosa_BI_add_sigmoid(test_data):
 @pytest.mark.flaky(reruns=32)  # Flaky due to Vela bug: MLBEDSW-10642
 def test_sigmoid_u55_BI(test_data):
     pipeline = OpNotSupportedPipeline(
-        Sigmoid(), (test_data(),), "TOSA-0.80+BI+u55", {Sigmoid.exir_op: 1}
+        Sigmoid(),
+        (test_data(),),
+        {Sigmoid.exir_op: 1},
+        quantize=True,
+        u55_subset=True,
     )
     pipeline.change_args("quantize", get_16bit_sigmoid_quantizer(True))
     pipeline.run()
@@ -149,9 +153,10 @@ def test_sigmoid_u55_BI_add_sigmoid(test_data):
     pipeline = OpNotSupportedPipeline(
         SigmoidAddSigmoid(),
         (test_data(),),
-        "TOSA-0.80+BI+u55",
         {Sigmoid.exir_op: 3},
         n_expected_delegates=1,
+        quantize=True,
+        u55_subset=True,
     )
     pipeline.change_args("quantize", get_16bit_sigmoid_quantizer(True))
     pipeline.run()
diff --git a/backends/arm/test/ops/test_sigmoid_32bit.py b/backends/arm/test/ops/test_sigmoid_32bit.py
@@ -136,7 +136,11 @@ def test_sigmoid_tosa_BI_add_sigmoid(test_data):
 @pytest.mark.flaky(reruns=32)  # Flaky due to Vela bug: MLBEDSW-10642
 def test_sigmoid_u55_BI(test_data):
     pipeline = OpNotSupportedPipeline(
-        Sigmoid(), (test_data(),), "TOSA-0.80+BI+u55", {Sigmoid.exir_op: 1}
+        Sigmoid(),
+        (test_data(),),
+        {Sigmoid.exir_op: 1},
+        quantize=True,
+        u55_subset=True,
     )
     pipeline.change_args("quantize", get_32bit_sigmoid_quantizer(True))
     pipeline.run()
@@ -148,9 +152,10 @@ def test_sigmoid_u55_BI_add_sigmoid(test_data):
     pipeline = OpNotSupportedPipeline(
         SigmoidAddSigmoid(),
         (test_data(),),
-        "TOSA-0.80+BI+u55",
         {Sigmoid.exir_op: 3},
         n_expected_delegates=1,
+        quantize=True,
+        u55_subset=True,
     )
     pipeline.change_args("quantize", get_32bit_sigmoid_quantizer(True))
     pipeline.run()
diff --git a/backends/arm/test/ops/test_where.py b/backends/arm/test/ops/test_where.py
@@ -181,12 +181,13 @@ def test_where_self_u55_BI_not_delegated(test_module):
     pipeline = OpNotSupportedPipeline[input_t](
         test_module(),
         test_module().get_inputs(),
-        "TOSA-0.80+BI+u55",
         {
             exir_op: 1,
             "executorch_exir_dialects_edge__ops_aten_full_default": num_exir,
         },
         num_delegates,
+        quantize=True,
+        u55_subset=True,
     )
     pipeline.change_args(
         "quantize", Quantize(quantizer, get_symmetric_quantization_config())
diff --git a/backends/arm/test/tester/test_pipeline.py b/backends/arm/test/tester/test_pipeline.py
