Update

[ghstack-poisoned]

Author: swolchok

.github/workflows/build-wheels-m1.yml .github/workflows/build-wheels-macos.yml.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 }}

backends/arm/operator_support/tosa_supported_operators.py

@@ -115,6 +115,7 @@ def is_node_supported(
             exir_ops.edge.aten.logical_and.default,
             exir_ops.edge.aten.logical_or.default,
             exir_ops.edge.aten.logical_xor.default,
+            exir_ops.edge.aten.logical_not.default,
             exir_ops.edge.aten.bitwise_and.Tensor,
             exir_ops.edge.aten.bitwise_or.Tensor,
             exir_ops.edge.aten.bitwise_xor.Tensor,
@@ -199,6 +200,7 @@ def is_node_supported(
                 exir_ops.edge.aten.logical_and.default,
                 exir_ops.edge.aten.logical_or.default,
                 exir_ops.edge.aten.logical_xor.default,
+                exir_ops.edge.aten.logical_not.default,
                 exir_ops.edge.aten.amax.default,
                 exir_ops.edge.aten.amin.default,
                 exir_ops.edge.aten.eq.Tensor,

backends/arm/operators/ops_unary.py

@@ -14,17 +14,17 @@
 )
 
 from executorch.backends.arm.tosa_mapping import TosaArg
-from executorch.backends.arm.tosa_specification import TosaSpecification
 from serializer.tosa_serializer import TosaOp
 
 
 def unary_operator_factory(unary_target: str, tosa_op):
     "Creates and registers NodeVisitors for operations that have one input and map directly into a TOSA op."
 
-    class UnaryOperator_080_MI(NodeVisitor):
-        target = unary_target
+    # Some TOSA unary operators only support float
+    fp_only_ops = ["aten.floor.default"]
 
-        tosa_specs = [TosaSpecification.create_from_string("TOSA-0.80+MI")]
+    class UnaryOperator(NodeVisitor):
+        target = unary_target
 
         def __init__(self, *args):
             super().__init__(*args)
@@ -43,15 +43,15 @@ def define_node(
                     f"Got {inputs[0].dtype=}, {output.dtype=}"
                 )
 
-            if not (inputs[0].dtype == ts.DType.FP32):
+            if self.target in fp_only_ops and not (inputs[0].dtype == ts.DType.FP32):
                 raise ValueError(
                     "All inputs need to be FP32." f"Got {inputs[0].dtype=}"
                 )
 
-            # MI lowering
             tosa_graph.addOperator(tosa_op, [inputs[0].name], [output.name])
 
-    register_node_visitor(UnaryOperator_080_MI)
+    register_node_visitor(UnaryOperator)
 
 
 unary_operator_factory("aten.floor.default", TosaOp.Op().FLOOR)
+unary_operator_factory("aten.logical_not.default", TosaOp.Op().LOGICAL_NOT)

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/models/test_conformer.py

@@ -34,7 +34,6 @@ class TestConformer(unittest.TestCase):
         "executorch_exir_dialects_edge__ops_aten_max_default": 1,
         "executorch_exir_dialects_edge__ops_aten_eq_Scalar": 2,
         "executorch_exir_dialects_edge__ops_aten_where_self": 4,
-        "executorch_exir_dialects_edge__ops_aten_logical_not_default": 4,
         "executorch_exir_dialects_edge__ops_aten_any_dim": 2,
         "torch.ops.aten._assert_scalar.default": 10,
         "torch.ops.aten._local_scalar_dense.default": 1,

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

backends/arm/test/ops/test_logical.py

@@ -40,6 +40,14 @@ def forward(self, tensor1: torch.Tensor, tensor2: torch.Tensor):
         return tensor1.logical_or(tensor2)
 
 
+class Not(torch.nn.Module):
+    aten_op = "torch.ops.aten.logical_not.default"
+    exir_op = "executorch_exir_dialects_edge__ops_aten_logical_not_default"
+
+    def forward(self, tensor: torch.Tensor):
+        return torch.logical_not(tensor)
+
+
 input_t2 = Tuple[torch.Tensor, torch.Tensor]  # Input x, y
 
 
@@ -64,6 +72,10 @@ def forward(self, tensor1: torch.Tensor, tensor2: torch.Tensor):
 
 
 test_data = {
+    "not_rank1": (Not(), test_input["rank1"][:-1]),
+    "not_rand_rank2": (Not(), test_input["rand_rank2"][:-1]),
+    "not_rand_rank3": (Not(), test_input["rand_rank3"][:-1]),
+    "not_rand_rank4": (Not(), test_input["rand_rank4"][:-1]),
     "and_rank1": (And(), test_input["rank1"]),
     "and_rand_rank2": (And(), test_input["rand_rank2"]),
     "and_rand_rank3": (And(), test_input["rand_rank3"]),
@@ -80,6 +92,10 @@ def forward(self, tensor1: torch.Tensor, tensor2: torch.Tensor):
 
 
 fvp_xfails = {
+    "not_rank1": "MLETORCH-706 Support ScalarType::Bool in EthosUBackend.",
+    "not_rand_rank2": "MLETORCH-706: Support ScalarType::Bool in EthosUBackend.",
+    "not_rand_rank3": "MLETORCH-706: Support ScalarType::Bool in EthosUBackend.",
+    "not_rand_rank4": "MLETORCH-706: Support ScalarType::Bool in EthosUBackend.",
     "and_rank1": "MLETORCH-706 Support ScalarType::Bool in EthosUBackend.",
     "and_rand_rank2": "MLETORCH-706: Support ScalarType::Bool in EthosUBackend.",
     "and_rand_rank3": "MLETORCH-706: Support ScalarType::Bool in EthosUBackend.",