Fix failing tests.

Author: MartinPavella

backends/nxp/tests/generic_tests/test_integration.py

@@ -5,6 +5,8 @@
 
 import executorch.extension.pybindings.portable_lib
 import executorch.kernels.quantized  # noqa F401
+from executorch.backends.nxp.tests.executors import graph_contains_any_of_ops
+from executorch.backends.nxp.tests.ops_aliases import AddMM, Convolution
 from executorch.backends.nxp.tests.use_qat import *  # noqa F401
 
 from executorch.backends.nxp.tests.executorch_pipeline import (
@@ -29,12 +31,10 @@ def test_conv_fc_softmax__to_executorch_program(use_qat):
     delegation_info = get_delegation_info(program.graph_module)
     assert delegation_info.num_delegated_subgraphs == 1
     assert delegation_info.num_non_delegated_nodes == 11
-    assert delegation_info.num_delegated_nodes == 13
+    assert delegation_info.num_delegated_nodes == 15
 
-    for node in program.graph.nodes:
-        # Make sure Convolution and AddMM are delegated
-        assert "convolution" not in node.name
-        assert "addmm" not in node.name
+    # Make sure Convolution and AddMM are delegated.
+    assert not graph_contains_any_of_ops(program.graph, [Convolution, AddMM])
 
 
 def test_cifarnet(use_qat):
@@ -47,7 +47,8 @@ def test_cifarnet(use_qat):
     delegation_info = get_delegation_info(exec_prog.exported_program().graph_module)
     assert delegation_info.num_delegated_subgraphs == 1
     assert delegation_info.num_non_delegated_nodes == 11
-    assert delegation_info.num_delegated_nodes == 45
+    assert delegation_info.num_delegated_nodes == 47
 
     nodes = list(exec_prog.exported_program().graph.nodes)
+    # `nodes[2].target` is an OpOverload (not and EdgeOpOverload that we usually test against), so just check the name.
     assert nodes[2].name == "quantized_decomposed_quantize_per_tensor_default"

backends/nxp/tests/ir/edge_passes/test_edge_passes.py

@@ -255,17 +255,17 @@ def test_moving_fusable_activations_into_separate_qdq_clusters__linear(
 
             # Check linear and activation are in separate QDQ clusters
             nodes = list(exported_program.graph.nodes)
-            assert len(nodes) == 13
+            assert len(nodes) == 15
             assert _is_dequantize(nodes[5])
             assert (
                 neutron_target_spec.neutron_target_info.is_fusable_conv_or_linear__edge(
-                    nodes[7]
+                    nodes[9]
                 )
             )
-            assert _is_quantize(nodes[8])
-            assert _is_dequantize(nodes[9])
+            assert _is_quantize(nodes[10])
+            assert _is_dequantize(nodes[11])
             assert neutron_target_spec.neutron_target_info.is_supported_fused_activation__edge(
-                nodes[10]
+                nodes[12]
             )
             assert _is_quantize(nodes[11])