Arm backend: Correct buck2 files

This commit is exact suggestion that kirklandsign posted in
#19969

Signed-off-by: Martin Lindström <Martin.Lindstroem@arm.com>
Suggested-by: @kirklandsign
Change-Id: Iacce4dd11e61e4d79296e37e59ddb214072dd2ef

Author: martinlsm

backends/arm/test/BUCK

@@ -49,42 +49,6 @@ fbcode_target(_kind = runtime.python_library,
     ]
 )
 
-fbcode_target(_kind = runtime.python_library,
-    name = "custom_vgf_test_utils",
-    srcs = ["_custom_vgf_test_utils.py"],
-    resources = [
-        "assets/test_add_buffer.glsl",
-        "assets/test_grid_read_tensor_debug.glsl",
-        "assets/test_grid_sample_buffer_nchw_debug.glsl",
-        "assets/test_grid_sample_sampler.glsl",
-        "assets/test_grid_sample_sampler_buffer_debug.glsl",
-        "assets/test_identity_buffer.glsl",
-        "assets/test_identity_image_packed_buffer.glsl",
-        "assets/test_threes_buffer.glsl",
-        "assets/test_threes_image_packed_buffer.glsl",
-    ],
-    deps = [
-        "//caffe2:torch",
-        "//executorch/backends/arm:constants",
-        "//executorch/backends/arm/_passes:passes",
-        "//executorch/backends/arm/tosa/dialect:lib",
-        "//executorch/exir:lib",
-    ],
-)
-
-fbcode_target(_kind = runtime.python_library,
-    name = "vgf_runtime_test_utils",
-    srcs = ["runtime/_vgf_runtime_test_utils.py"],
-    deps = [
-        ":custom_vgf_test_utils",
-        ":runner_utils",
-        "//executorch/backends/arm:vgf",
-        "//executorch/backends/arm/_passes:passes",
-        "//executorch/exir:lib",
-        "fbsource//third-party/pypi/pytest:pytest",
-    ],
-)
-
 fbcode_target(_kind = runtime.python_library,
     name = "arm_tester_serialize",
     srcs = ["tester/serialize.py"],
@@ -120,4 +84,17 @@ fbcode_target(_kind = runtime.python_library,
     ]
 )
 
+fbcode_target(_kind = runtime.python_library,
+    name = "mxfp_test_common",
+    srcs = [
+        "ops/mxfp/__init__.py",
+        "ops/mxfp/common.py",
+    ],
+    deps = [
+        ":arm_tester" if runtime.is_oss else "//executorch/backends/arm/test/tester/fb:arm_tester_fb",
+        "//executorch/backends/arm:ao_ext",
+        "//executorch/backends/test/harness:tester",
+    ],
+)
+
 fbcode_target(_kind = define_arm_tests,)

backends/arm/test/targets.bzl

@@ -43,7 +43,6 @@ def define_arm_tests():
         "ops/test_gelu.py",
         "ops/test_bmm.py",
         "ops/test_split.py",
-        "ops/test_custom_shader_lowering.py",
     ]
 
     # Quantization
@@ -63,7 +62,6 @@ def define_arm_tests():
         "misc/test_tosa_spec.py",
         "misc/test_bn_relu_folding_qat.py",
         "misc/test_custom_partition.py",
-        "misc/test_custom_shader_payloads.py",
         "misc/test_debug_hook.py",
         "misc/test_mxfp_linear_ao.py",
         "misc/test_post_quant_device_switch.py",
@@ -73,14 +71,6 @@ def define_arm_tests():
         # "misc/test_dim_order.py", (TODO - T238390249)
     ]
 
-    test_files += [
-        "runtime/test_vgf_aliasing_runtime.py",
-        "runtime/test_vgf_combinations_runtime.py",
-        "runtime/test_vgf_multi_segment_runtime.py",
-        "runtime/test_vgf_sampler_image_runtime.py",
-        "runtime/test_vgf_tensor_buffer_runtime.py",
-    ]
-
     # Deprecation tests
     test_files += [
         "deprecation/test_arm_compile_spec_deprecation.py",
@@ -91,16 +81,10 @@ def define_arm_tests():
     for test_file in test_files:
         test_file_name = paths.basename(test_file)
         test_name = test_file_name.replace("test_", "").replace(".py", "")
-        test_srcs = [test_file]
-        if test_file == "ops/mxfp/test_mxfp_linear.py":
-            test_srcs += [
-                "ops/mxfp/__init__.py",
-                "ops/mxfp/common.py",
-            ]
 
         python_pytest(
             name = test_name,
-            srcs = test_srcs,
+            srcs = [test_file],
             pytest_config = "pytest.ini",
             resources = ["conftest.py"],
             compile = "with-source",
@@ -124,9 +108,8 @@ def define_arm_tests():
             deps = [
                 "//executorch/backends/arm/test:arm_tester" if runtime.is_oss else "//executorch/backends/arm/test/tester/fb:arm_tester_fb",
                 "//executorch/backends/arm/test:conftest",
+                "//executorch/backends/arm/test:mxfp_test_common",
                 "//executorch/backends/arm/test/misc:dw_convs_shared_weights_module",
-                "//executorch/backends/arm/test:custom_vgf_test_utils",
-                "//executorch/backends/arm/test:vgf_runtime_test_utils",
                 "//executorch/backends/arm:ao_ext",
                 "//executorch/backends/arm:ethosu",
                 "//executorch/backends/arm/tosa:compile_spec",