Revert "Arm backend: Enable pytest VKML op unit testing in ciflow/trunk" (#15841)

Reverts #14109

This caused timeout on arm ops unit tests

cc @freddan80 @per @oscarandersson8218 @digantdesai

Author: zingo

.ci/scripts/test_backend.sh

@@ -57,25 +57,15 @@ if [[ "$FLOW" == *vulkan* ]]; then
 fi
 
 if [[ "$FLOW" == *arm* ]]; then
-
     # Setup ARM deps.
-    if [[ "$FLOW" == *vgf* ]]; then
-        .ci/scripts/setup-arm-baremetal-tools.sh --enable-mlsdk-deps --install-mlsdk-deps-with-pip
-    else
-        .ci/scripts/setup-arm-baremetal-tools.sh
-    fi
+    .ci/scripts/setup-arm-baremetal-tools.sh
     source examples/arm/ethos-u-scratch/setup_path.sh
 
     if [[ "$FLOW" == *ethos_u* ]]; then
         # Prepare a test runner binary that can run on the Corstone-3x0 FVPs
         backends/arm/scripts/build_executorch.sh
         backends/arm/test/setup_testing.sh
     fi
-
-    if [[ "$FLOW" == *vgf* ]]; then
-        # Prepare a test runner binary for VKML runtime
-        backends/arm/test/setup_testing_vkml.sh
-    fi
 fi
 
 if [[ $IS_MACOS -eq 1 ]]; then

.github/workflows/test-backend-arm.yml

@@ -26,7 +26,7 @@ jobs:
     uses: ./.github/workflows/_test_backend.yml
     with:
       backend: arm
-      flows: '["arm_tosa_fp", "arm_tosa_int", "arm_ethos_u55", "arm_ethos_u85", "arm_vgf_fp", "arm_vgf_int"]'
+      flows: '["arm_tosa_fp", "arm_tosa_int", "arm_ethos_u55", "arm_ethos_u85"]'
       ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       timeout: 120
       run-linux: true

.github/workflows/trunk.yml

@@ -284,7 +284,6 @@ jobs:
         include:
           - test_arm_baremetal: test_pytest_ops_ethosu_fvp
           - test_arm_baremetal: test_pytest_models_ethosu_fvp
-          - test_arm_baremetal: test_pytest_ops_vkml
           - test_arm_baremetal: test_run_ethosu_fvp
           - test_arm_baremetal: test_models_tosa
           - test_arm_baremetal: test_models_ethos-u55
@@ -307,7 +306,7 @@ jobs:
         source .ci/scripts/utils.sh
         install_executorch "--use-pt-pinned-commit"
 
-        .ci/scripts/setup-arm-baremetal-tools.sh --enable-mlsdk-deps --install-mlsdk-deps-with-pip
+        .ci/scripts/setup-arm-baremetal-tools.sh
 
         # Increase number of files user can monitor to bypass buck failures.
         # Hopefully this is high enough for this setup.

backends/test/suite/flow.py

@@ -132,17 +132,13 @@ def all_flows() -> dict[str, TestFlow]:
             ARM_ETHOS_U85_FLOW,
             ARM_TOSA_FP_FLOW,
             ARM_TOSA_INT_FLOW,
-            ARM_VGF_FP_FLOW,
-            ARM_VGF_INT_FLOW,
         )
 
         flows += [
             ARM_TOSA_FP_FLOW,
             ARM_TOSA_INT_FLOW,
             ARM_ETHOS_U55_FLOW,
             ARM_ETHOS_U85_FLOW,
-            ARM_VGF_FP_FLOW,
-            ARM_VGF_INT_FLOW,
         ]
     except Exception as e:
         logger.info(f"Skipping ARM flow registration: {e}")

backends/test/suite/flows/arm.py

@@ -78,15 +78,3 @@ def create_quantize_stage() -> Quantize:
     lambda: common.get_u85_compile_spec(),
     quantize=True,
 )
-ARM_VGF_FP_FLOW = _create_arm_flow(
-    "arm_vgf_fp",
-    lambda: common.get_vgf_compile_spec(tosa_spec="TOSA-1.0+FP"),
-    quantize=False,
-    use_portable_ops=False,
-)
-ARM_VGF_INT_FLOW = _create_arm_flow(
-    "arm_vgf_int",
-    lambda: common.get_vgf_compile_spec(tosa_spec="TOSA-1.0+INT"),
-    quantize=True,
-    use_portable_ops=False,
-)