Merge branch 'main' into add-dim-dims-ops

Author: YufengShi-dudu

.ci/scripts/unittest-buck2.sh

@@ -19,8 +19,11 @@ buck2 query "//backends/apple/... + //backends/example/... + \
 
 UNBUILDABLE_OPTIMIZED_OPS_REGEX="gelu|fft_r2c|log_softmax"
 BUILDABLE_OPTIMIZED_OPS=$(buck2 query //kernels/optimized/cpu/... | grep -E -v $UNBUILDABLE_OPTIMIZED_OPS_REGEX)
+
+BUILDABLE_KERNELS_PRIM_OPS_TARGETS=$(buck2 query //kernels/prim_ops/... | grep -v prim_ops_test_py)
 # TODO: expand the covered scope of Buck targets.
 # //runtime/kernel/... is failing because //third-party:torchgen_files's shell script can't find python on PATH.
 # //runtime/test/... requires Python torch, which we don't have in our OSS buck setup.
-buck2 test $BUILDABLE_OPTIMIZED_OPS //kernels/portable/... //runtime/backend/... //runtime/core/... \
+buck2 test $BUILDABLE_OPTIMIZED_OPS //kernels/portable/... \
+      $BUILDABLE_KERNELS_PRIM_OPS_TARGETS //runtime/backend/... //runtime/core/... \
       //runtime/executor: //runtime/kernel/... //runtime/platform/...

.github/workflows/apple-perf.yml

@@ -353,7 +353,7 @@ jobs:
     with:
       runner: macos-latest-xlarge
       python-version: '3.11'
-      submodules: 'true'
+      submodules: 'recursive'
       ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       upload-artifact: ios-apps
       secrets-env: BUILD_CERTIFICATE_BASE64 EXECUTORCH_BENCHMARK_BUILD_PROVISION_PROFILE_BASE64 KEYCHAIN_PASSWORD

.github/workflows/build-wheels-m1.yml renamed to .github/workflows/build-wheels-macos.yml

@@ -1,11 +1,11 @@
 # From https://github.com/pytorch/test-infra/wiki/Using-Nova-Reusable-Build-Workflows
-name: Build M1 Wheels
+name: Build macOS Wheels
 
 on:
   pull_request:
     paths:
       - build/packaging/**
-      - .github/workflows/build-wheels-m1.yml
+      - .github/workflows/build-wheels-macos.yml
   push:
     branches:
       - nightly
@@ -56,7 +56,7 @@ jobs:
       # files to look at.
       submodules: true
       delocate-wheel: false
-      env-var-script: build/packaging/env_var_script_m1.sh
+      env-var-script: build/packaging/env_var_script_macos.sh
       pre-script: ${{ matrix.pre-script }}
       post-script: ${{ matrix.post-script }}
       package-name: ${{ matrix.package-name }}

.github/workflows/trunk.yml

@@ -234,7 +234,7 @@ jobs:
     uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
     with:
       runner: macos-m1-stable
-      python-version: '3.11'
+      python-version: "3.11"
       submodules: 'true'
       ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       script: |

backends/arm/scripts/build_executorch.sh

@@ -15,6 +15,8 @@ et_root_dir=$(cd ${script_dir}/../../.. && pwd)
 et_root_dir=$(realpath ${et_root_dir})
 toolchain_cmake=${script_dir}/../../../examples/arm/ethos-u-setup/arm-none-eabi-gcc.cmake
 toolchain_cmake=$(realpath ${toolchain_cmake})
+setup_path_script=${et_root_dir}/examples/arm/ethos-u-scratch/setup_path.sh
+_setup_msg="please refer to ${et_root_dir}/examples/arm/setup.sh to properly install necessary tools."
 
 et_build_root="${et_root_dir}/arm_test"
 build_type="Release"
@@ -43,6 +45,13 @@ for arg in "$@"; do
     esac
 done
 
+# Source the tools
+# This should be prepared by the setup.sh
+[[ -f ${setup_path_script} ]] \
+    || { echo "Missing ${setup_path_script}. ${_setup_msg}"; exit 1; }
+
+source ${setup_path_script}
+
 et_build_dir="${et_build_root}/cmake-out"
 
 # Used for flatcc host excutable if Devtools is used

backends/arm/scripts/build_executorch_runner.sh

@@ -10,6 +10,8 @@ script_dir=$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd)
 et_root_dir=$(cd ${script_dir}/../../.. && pwd)
 et_root_dir=$(realpath ${et_root_dir})
 toolchain_cmake=${et_root_dir}/examples/arm/ethos-u-setup/arm-none-eabi-gcc.cmake
+setup_path_script=${et_root_dir}/examples/arm/ethos-u-scratch/setup_path.sh
+_setup_msg="please refer to ${et_root_dir}/examples/arm/setup.sh to properly install necessary tools."
 
 pte_file=""
 target="ethos-u55-128"
@@ -66,6 +68,13 @@ for arg in "$@"; do
     esac
 done
 
+# Source the tools
+# This should be prepared by the setup.sh
+[[ -f ${setup_path_script} ]] \
+    || { echo "Missing ${setup_path_script}. ${_setup_msg}"; exit 1; }
+
+source ${setup_path_script}
+
 pte_file=$(realpath ${pte_file})
 ethosu_tools_dir=$(realpath ${ethosu_tools_dir})
 ethos_u_root_dir="$ethosu_tools_dir/ethos-u"

backends/arm/scripts/build_portable_kernels.sh

@@ -15,6 +15,8 @@ et_root_dir=$(cd ${script_dir}/../../.. && pwd)
 et_root_dir=$(realpath ${et_root_dir})
 toolchain_cmake=${script_dir}/../../../examples/arm/ethos-u-setup/arm-none-eabi-gcc.cmake
 toolchain_cmake=$(realpath ${toolchain_cmake})
+setup_path_script=${et_root_dir}/examples/arm/ethos-u-scratch/setup_path.sh
+_setup_msg="please refer to ${et_root_dir}/examples/arm/setup.sh to properly install necessary tools."
 
 
 et_build_root="${et_root_dir}/arm_test"
@@ -41,6 +43,13 @@ for arg in "$@"; do
     esac
 done
 
+# Source the tools
+# This should be prepared by the setup.sh
+[[ -f ${setup_path_script} ]] \
+    || { echo "Missing ${setup_path_script}. ${_setup_msg}"; exit 1; }
+
+source ${setup_path_script}
+
 et_build_dir=${et_build_root}/cmake-out
 
 cd "${et_root_dir}"

backends/arm/scripts/run_fvp.sh

@@ -19,7 +19,7 @@ _setup_msg="please refer to ${et_root_dir}/examples/arm/setup.sh to properly ins
 
 elf_file=""
 target="ethos-u55-128"
-timeout="240"
+timeout="600"
 
 help() {
     echo "Usage: $(basename $0) [options]"

backends/arm/test/ops/test_batch_norm.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.
@@ -647,7 +647,7 @@ def _test_batchnorm2d_u55_BI_pipeline(
         )
 
     @parameterized.expand(test_data_suite)
-    def test_batchnorm2d_tosa_MI(
+    def test_native_batch_norm_legit_no_training_tosa_MI(
         self,
         test_name: str,
         test_data: torch.Tensor,
@@ -665,7 +665,7 @@ def test_batchnorm2d_tosa_MI(
     # Expected to fail since not inplemented
     @parameterized.expand(test_no_stats_data_suite)
     @unittest.expectedFailure
-    def test_batchnorm2d_no_stats_tosa_MI(
+    def test_native_batch_norm_legit_tosa_MI(
         self,
         test_name: str,
         test_data: torch.Tensor,
@@ -686,7 +686,7 @@ def test_batchnorm2d_no_stats_tosa_MI(
     @unittest.skip(
         reason="Expected to fail since TOSAQuantizer (for BI) cannot quantize a BatchNorm layer"
     )
-    def test_batchnorm2d_tosa_BI(
+    def test_native_batch_norm_legit_no_training_tosa_BI(
         self,
         test_name: str,
         test_data: torch.Tensor,
@@ -708,7 +708,7 @@ def test_batchnorm2d_tosa_BI(
         reason="Expected to fail since EthosUQuantizer cannot quantize a BatchNorm layer"
     )
     @unittest.expectedFailure
-    def test_batchnorm2d_u55_BI(
+    def test_native_batch_norm_legit_no_training_u55_BI(
         self,
         test_name: str,
         test_data: torch.Tensor,

backends/arm/test/ops/test_bmm.py

@@ -150,11 +150,9 @@ def test_bmm_single_input_tosa_BI(self, test_data_generator: Callable[[], Tuple]
         test_data = test_data_generator()
         self._test_bmm_tosa_BI_pipeline(self.BMMSingleInput(), test_data)
 
-    # Expected to fail on FVP as TOSA.MATMUL is not supported on U55
     @parameterized.expand(BMM.test_data_generators)
     @pytest.mark.corstone_fvp
-    @conftest.expectedFailureOnFVP
-    def test_bmm_u55_BI_xfails(self, test_data_generator: Callable[[], Tuple]):
+    def test_bmm_u55_BI(self, test_data_generator: Callable[[], Tuple]):
         test_data = test_data_generator()
         self._test_bmm_ethosu_BI_pipeline(
             self.BMM(), common.get_u55_compile_spec(), test_data
@@ -171,10 +169,7 @@ def test_bmm_u85_BI(self, test_data_generator: Callable[[], Tuple]):
     # Expected to fail on FVP as TOSA.MATMUL is not supported on U55
     @parameterized.expand(BMMSingleInput.test_data_generators)
     @pytest.mark.corstone_fvp
-    @conftest.expectedFailureOnFVP
-    def test_bmm_single_input_u55_BI_xfails(
-        self, test_data_generator: Callable[[], Tuple]
-    ):
+    def test_bmm_single_input_u55_BI(self, test_data_generator: Callable[[], Tuple]):
         test_data = test_data_generator()
         self._test_bmm_ethosu_BI_pipeline(
             self.BMMSingleInput(), common.get_u55_compile_spec(), test_data