Update

[ghstack-poisoned]

Author: swolchok

.ci/scripts/unittest-macos.sh

@@ -35,7 +35,7 @@ if [[ "$BUILD_TOOL" == "cmake" ]]; then
     .ci/scripts/unittest-macos-cmake.sh
 elif [[ "$BUILD_TOOL" == "buck2" ]]; then
     .ci/scripts/unittest-buck2.sh
-    .ci/scripts/unittest-macos-buck2.sh
+    # .ci/scripts/unittest-macos-buck2.sh
 else
     echo "Unknown build tool $BUILD_TOOL"
     exit 1

backends/arm/test/common.py

@@ -1,5 +1,4 @@
 # Copyright 2024-2025 Arm Limited and/or its affiliates.
-# All rights reserved.
 #
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
@@ -159,13 +158,38 @@ def get_u85_compile_spec_unbuilt(
     not corstone300_installed() or not arm_executor_runner_exists("corstone-300"),
     reason="Did not find Corstone-300 FVP or executor_runner on path",
 )
-"""Skips a test if Corsone300 FVP is not installed, or if the executor runner is not built"""
+"""
+TO BE DEPRECATED - Use XfailIfNoCorstone300 instead
+Skips a test if Corsone300 FVP is not installed, or if the executor runner is not built
+"""
 
 SkipIfNoCorstone320 = pytest.mark.skipif(
     not corstone320_installed() or not arm_executor_runner_exists("corstone-320"),
     reason="Did not find Corstone-320 FVP or executor_runner on path",
 )
-"""Skips a test if Corsone320 FVP is not installed, or if the executor runner is not built."""
+"""
+TO BE DEPRECATED - Use XfailIfNoCorstone320 instead
+Skips a test if Corsone320 FVP is not installed, or if the executor runner is not built
+"""
+
+
+XfailIfNoCorstone300 = pytest.mark.xfail(
+    condition=not (
+        corstone300_installed() and arm_executor_runner_exists("corstone-300")
+    ),
+    raises=FileNotFoundError,
+    reason="Did not find Corstone-300 FVP or executor_runner on path",
+)
+"""Xfails a test if Corsone300 FVP is not installed, or if the executor runner is not built"""
+
+XfailIfNoCorstone320 = pytest.mark.xfail(
+    condition=not (
+        corstone320_installed() and arm_executor_runner_exists("corstone-320")
+    ),
+    raises=FileNotFoundError,
+    reason="Did not find Corstone-320 FVP or executor_runner on path",
+)
+"""Xfails a test if Corsone320 FVP is not installed, or if the executor runner is not built"""
 
 
 def parametrize(

backends/arm/test/ops/test_add.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.
@@ -106,79 +106,47 @@ def test_add_i32_tosa_BI(test_data: input_t1):
 
 
 @common.parametrize("test_data", Add.test_data)
+@common.XfailIfNoCorstone300
 def test_add_u55_BI(test_data: input_t1):
-    pipeline = EthosU55PipelineBI[input_t1](
-        Add(), test_data, aten_op, exir_op, run_on_fvp=False
-    )
-    pipeline.run()
-
-
-@common.parametrize("test_data", Add.test_data)
-def test_add_u85_BI(test_data: input_t1):
-    pipeline = EthosU85PipelineBI[input_t1](
-        Add(), test_data, aten_op, exir_op, run_on_fvp=False
-    )
-    pipeline.run()
-
-
-@common.parametrize("test_data", Add.test_data)
-@common.SkipIfNoCorstone300
-def test_add_u55_BI_on_fvp(test_data: input_t1):
     pipeline = EthosU55PipelineBI[input_t1](
         Add(), test_data, aten_op, exir_op, run_on_fvp=True
     )
     pipeline.run()
 
 
 @common.parametrize("test_data", Add.test_data)
-@common.SkipIfNoCorstone320
-def test_add_u85_BI_on_fvp(test_data: input_t1):
+@common.XfailIfNoCorstone320
+def test_add_u85_BI(test_data: input_t1):
     pipeline = EthosU85PipelineBI[input_t1](
         Add(), test_data, aten_op, exir_op, run_on_fvp=True
     )
     pipeline.run()
 
 
 @common.parametrize("test_data", Add2.test_data)
-def test_add2_tosa_MI(test_data: input_t2):
+def test_add_2_tosa_MI(test_data: input_t2):
     pipeline = TosaPipelineMI[input_t2](Add2(), test_data, aten_op, exir_op)
     pipeline.run()
 
 
 @common.parametrize("test_data", Add2.test_data)
-def test_add2_tosa_BI(test_data: input_t2):
+def test_add_2_tosa_BI(test_data: input_t2):
     pipeline = TosaPipelineBI[input_t2](Add2(), test_data, aten_op, exir_op)
     pipeline.run()
 
 
 @common.parametrize("test_data", Add2.test_data)
-def test_add2_u55_BI(test_data: input_t2):
-    pipeline = EthosU55PipelineBI[input_t2](
-        Add2(), test_data, aten_op, exir_op, run_on_fvp=False
-    )
-    pipeline.run()
-
-
-@common.parametrize("test_data", Add2.test_data)
-@common.SkipIfNoCorstone300
-def test_add2_u55_BI_on_fvp(test_data: input_t2):
+@common.XfailIfNoCorstone300
+def test_add_2_u55_BI(test_data: input_t2):
     pipeline = EthosU55PipelineBI[input_t2](
         Add2(), test_data, aten_op, exir_op, run_on_fvp=True
     )
     pipeline.run()
 
 
 @common.parametrize("test_data", Add2.test_data)
-def test_add2_u85_BI(test_data: input_t2):
-    pipeline = EthosU85PipelineBI[input_t2](
-        Add2(), test_data, aten_op, exir_op, run_on_fvp=False
-    )
-    pipeline.run()
-
-
-@common.parametrize("test_data", Add2.test_data)
-@common.SkipIfNoCorstone320
-def test_add2_u85_BI_on_fvp(test_data: input_t2):
+@common.XfailIfNoCorstone320
+def test_add_2_u85_BI(test_data: input_t2):
     pipeline = EthosU85PipelineBI[input_t2](
         Add2(), test_data, aten_op, exir_op, run_on_fvp=True
     )

backends/arm/test/runner_utils.py

@@ -529,7 +529,7 @@ def get_elf_path(target_board):
         "arm_executor_runner",
     )
     if not os.path.exists(elf_path):
-        raise RuntimeError(
+        raise FileNotFoundError(
             f"Did not find build arm_executor_runner in path {elf_path}, run setup_testing.sh?"
         )
     else:

backends/cadence/hifi/operators/op_quantized_conv_out.cpp

@@ -1,4 +1,10 @@
-// (c) Meta Platforms, Inc. and affiliates. Confidential and proprietary.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
 
 #include <executorch/backends/cadence/hifi/kernels/kernels.h>
 #include <executorch/backends/cadence/hifi/operators/operators.h>

devtools/etdump/utils.h

@@ -1,4 +1,10 @@
-// (c) Meta Platforms, Inc. and affiliates. Confidential and proprietary.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
 
 #include <cstddef>
 #include <cstdint>

examples/models/llama/norm.py

@@ -1,4 +1,8 @@
-# (c) Meta Platforms, Inc. and affiliates. Confidential and proprietary.
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
 
 import torch
 from torch import nn

examples/models/llama/runner/static_attention_io_manager.h

@@ -1,4 +1,10 @@
-// (c) Meta Platforms, Inc. and affiliates. Confidential and proprietary.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
 
 #include <memory>
 #include <tuple>