Merge remote-tracking branch 'origin/main' into android-test-kt

Author: kirklandsign

.ci/scripts/test_ios_ci.sh

@@ -7,7 +7,7 @@
 
 set -e
 
-APP_PATH="executorch-examples/apple/ExecuTorchDemo/ExecuTorchDemo"
+APP_PATH="executorch-examples/mv3/apple/ExecuTorchDemo/ExecuTorchDemo"
 MODEL_NAME="mv3"
 SIMULATOR_NAME="executorch"
 

.github/scripts/extract_benchmark_results.py

@@ -341,6 +341,7 @@ def transform(
     benchmark_results: List,
     benchmark_config: Dict[str, str],
     job_name: str,
+    job_report: Any = {},
 ) -> List:
     """
     Transform the benchmark results into the format writable into the benchmark database
@@ -361,6 +362,7 @@ def transform(
                     # Just keep a copy of the benchmark config here
                     "benchmark_config": json.dumps(benchmark_config),
                     "job_conclusion": "SUCCESS",
+                    "job_arn": job_report.get("arn", ""),
                 },
             },
             "model": {
@@ -446,6 +448,7 @@ def transform_failure_record(
                 "app_type": app_type,
                 "job_conclusion": result,
                 "failure_type": level,
+                "job_arn": report.get("arn", ""),
                 "job_report": json.dumps(report),
             },
         },
@@ -512,6 +515,7 @@ def get_benchmark_config(
 def extract_benchmark_result_from_artifact(
     artifact: Dict[str, Any],
     benchmark_config: Dict[str, str],
+    job_report: Any,
 ) -> List[Any]:
     job_name = artifact.get("job_name", "")
     artifact_type = artifact.get("type", "")
@@ -532,7 +536,9 @@ def extract_benchmark_result_from_artifact(
         )
     if not benchmark_results:
         return []
-    return transform(app_type, benchmark_results, benchmark_config, job_name)
+    return transform(
+        app_type, benchmark_results, benchmark_config, job_name, job_report
+    )
 
 
 def get_app_type(type: str):
@@ -674,7 +680,7 @@ def process_benchmark_results(content: Any, app: str, benchmark_configs: str):
             for job_artifact in job_artifacts:
                 # generate result for each schema
                 results = extract_benchmark_result_from_artifact(
-                    job_artifact, benchmark_config
+                    job_artifact, benchmark_config, job_report
                 )
                 all_benchmark_results.extend(results)
     return all_benchmark_results

CMakeLists.txt

@@ -410,20 +410,6 @@ endif()
 message(STATUS "executorch: Using sources file ${EXECUTORCH_SRCS_FILE}")
 include(${EXECUTORCH_SRCS_FILE})
 
-#
-# Modify default options when cross-compiling.
-#
-# The intent is for the EXECUTORCH_BUILD_HOST_TARGETS option to affect the
-# default ON/OFF values of host targets around the tree. This way, a user can
-# disable EXECUTORCH_BUILD_HOST_TARGETS to disable all host targets, and then
-# optionally re-enable some of those targets. Or they could leave
-# EXECUTORCH_BUILD_HOST_TARGETS enabled and then optionally disable any given
-# host target.
-#
-# We can then use various cross-compilation hints to set the default value of
-# EXECUTORCH_BUILD_HOST_TARGETS, which can still be overridden if desired.
-#
-
 # Detect if an iOS toolchain is set.
 if(CMAKE_TOOLCHAIN_FILE MATCHES ".*(iOS|ios\.toolchain)\.cmake$")
   set(CMAKE_TOOLCHAIN_IOS ON)
@@ -458,16 +444,6 @@ if(EXECUTORCH_USE_CPP_CODE_COVERAGE)
   endif()
 endif()
 
-# EXECUTORCH_BUILD_HOST_TARGETS: Option to control the building of host-only
-# tools like `flatc`, along with example executables like `executor_runner` and
-# libraries that it uses, like `gflags`. Disabling this can be helpful when
-# cross-compiling, but some required tools that would have been built need to be
-# provided directly.
-cmake_dependent_option(
-  EXECUTORCH_BUILD_HOST_TARGETS "Build host-only targets." ON
-  "NOT CMAKE_TOOLCHAIN_IOS" OFF
-)
-
 #
 # flatc: Flatbuffer commandline tool to generate .h files from .fbs files
 #
@@ -665,10 +641,7 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/configurations)
 #
 # gflags: Commandline flag host library.
 #
-cmake_dependent_option(
-  EXECUTORCH_BUILD_GFLAGS "Build the gflags library." ON
-  EXECUTORCH_BUILD_HOST_TARGETS OFF
-)
+option(EXECUTORCH_BUILD_GFLAGS "Build the gflags library." ON)
 if(EXECUTORCH_BUILD_GFLAGS)
   add_subdirectory(third-party/gflags)
 endif()
@@ -694,7 +667,7 @@ install(FILES tools/cmake/executorch-config.cmake DESTINATION lib/cmake/ExecuTor
 #
 cmake_dependent_option(
   EXECUTORCH_BUILD_EXECUTOR_RUNNER "Build the executor_runner executable" ON
-  EXECUTORCH_BUILD_HOST_TARGETS OFF
+  "NOT CMAKE_TOOLCHAIN_IOS" OFF
 )
 
 # Add googletest if any test targets should be built

backends/apple/mps/setup.md

@@ -15,7 +15,7 @@ The MPS backend device maps machine learning computational graphs and primitives
 * [Introduction to ExecuTorch](../../../docs/source/intro-how-it-works.md)
 * [Setting up ExecuTorch](../../../docs/source/getting-started-setup.rst)
 * [Building ExecuTorch with CMake](../../../docs/source/using-executorch-cpp.md#building-with-cmake)
-* [ExecuTorch iOS Demo App](../../../docs/source/demo-apps-ios.md)
+* [ExecuTorch iOS Demo App](https://github.com/pytorch-labs/executorch-examples/tree/main/mv3/apple/ExecuTorchDemo)
 * [ExecuTorch iOS LLaMA Demo App](../../../docs/source/llm/llama-demo-ios.md)
 :::
 ::::

backends/arm/__init__.py

@@ -48,6 +48,8 @@ class TableOps:
         exir_ops.edge.aten.reciprocal.default: torch.reciprocal,
         exir_ops.edge.aten.rsqrt.default: torch.rsqrt,
         exir_ops.edge.aten.sigmoid.default: torch.sigmoid,
+        exir_ops.edge.aten.cos.default: torch.cos,
+        exir_ops.edge.aten.sin.default: torch.sin,
         exir_ops.edge.aten.tanh.default: torch.tanh,
         exir_ops.edge.aten.hardsigmoid.default: torch.nn.functional.hardsigmoid,
         exir_ops.edge.aten.hardswish.default: torch.nn.functional.hardswish,

backends/arm/_passes/insert_table_ops.py

@@ -14,9 +14,9 @@
 import logging
 from typing import final, List
 
-from executorch.backends.arm import TOSABackend
-
 from executorch.backends.arm.arm_vela import vela_compile
+
+from executorch.backends.arm.tosa_backend import TOSABackend
 from executorch.exir.backend.backend_details import BackendDetails, PreprocessResult
 from executorch.exir.backend.compile_spec_schema import CompileSpec
 from torch.export.exported_program import ExportedProgram

backends/arm/ethosu_backend.py

@@ -10,7 +10,8 @@
 from executorch.backends.arm.arm_backend import (
     is_ethosu,
 )  # usort: skip
-from executorch.backends.arm import EthosUBackend, TOSAPartitioner
+from executorch.backends.arm.ethosu_backend import EthosUBackend
+from executorch.backends.arm.tosa_partitioner import TOSAPartitioner
 from executorch.exir.backend.compile_spec_schema import CompileSpec
 from executorch.exir.backend.partitioner import DelegationSpec
 from torch.fx.passes.operator_support import OperatorSupportBase

backends/arm/ethosu_partitioner.py

@@ -12,6 +12,7 @@
     pool_2d_support,
     reduce_sum_support,
     right_shift_support,
+    sin_cos_support,
     slice_copy_support,
     to_copy_support,
     tosa_supported_operators,

backends/arm/operator_support/__init__.py

@@ -0,0 +1,32 @@
+# Copyright 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.
+
+# pyre-unsafe
+
+
+import torch.fx as fx
+from executorch.backends.arm.operator_support.tosa_supported_operators import (
+    register_tosa_support_check,
+    SupportedTOSAOperatorCheck,
+)
+from executorch.backends.arm.tosa_specification import TosaSpecification
+from executorch.exir.dialects._ops import ops as exir_ops
+
+
+@register_tosa_support_check
+class SinCosSupported(SupportedTOSAOperatorCheck):
+    targets = [
+        exir_ops.edge.aten.cos.default,
+        exir_ops.edge.aten.sin.default,
+    ]
+
+    tosa_specs = [
+        TosaSpecification.create_from_string("TOSA-0.80+BI"),
+        TosaSpecification.create_from_string("TOSA-1.0+INT"),
+        TosaSpecification.create_from_string("TOSA-1.0+FP"),
+    ]
+
+    def is_node_tosa_supported(self, node: fx.Node, tosa_spec: TosaSpecification):
+        return True