Merge branch 'main' into linux_arm_build

Author: mergennachin

backends/arm/TARGETS

@@ -1,3 +1,8 @@
+# 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.
+
 # @noautodeps
 load("@fbcode_macros//build_defs:python_library.bzl", "python_library")
 
@@ -12,6 +17,17 @@ python_library(
         ":arm_partitioner",
     ]
 )
+python_library(
+    name = "vgf_partitioner",
+    srcs = [
+        "vgf/__init__.py",
+        "vgf/backend.py",
+        "vgf/partitioner.py"
+    ],
+    deps = [
+        ":arm_partitioner",
+    ]
+)
 python_library(
     name = "constants",
     srcs = [
@@ -39,8 +55,6 @@ python_library(
     srcs = [
         "tosa/backend.py",
         "tosa/partitioner.py",
-        "vgf_backend.py",
-        "vgf_partitioner.py",
     ],
     deps = [
         ":arm_backend",

backends/arm/operators/__init__.py

@@ -15,19 +15,22 @@
     op_avg_pool2d,
     op_bmm,
     op_cat,
+    op_ceil,
     op_clamp,
     op_constant_pad_nd,
     op_conv2d,
     op_cos,
     op_eq,
     op_erf,
     op_exp,
+    op_floor,
     op_ge,
     op_gt,
     op_index_select,
     op_index_tensor,
     op_le,
     op_log,
+    op_logical_not,
     op_lt,
     op_max_pool2d,
     op_maximum,
@@ -57,5 +60,4 @@
     op_where,
     ops_binary,
     ops_identity,
-    ops_unary,
 )

backends/arm/operators/op_ceil.py

@@ -0,0 +1,54 @@
+# 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.
+
+from typing import Any, List
+
+import torch.fx
+
+from executorch.backends.arm.operators.node_visitor import (
+    NodeVisitor,
+    register_node_visitor,
+)
+from executorch.backends.arm.operators.operator_validation_utils import (
+    validate_num_inputs,
+    validate_same_dtype,
+    validate_valid_dtype,
+)
+from executorch.backends.arm.tosa import TosaSpecification
+
+from executorch.backends.arm.tosa.mapping import TosaArg
+
+
+@register_node_visitor
+class CeilVisitor(NodeVisitor):
+    target = "aten.ceil.default"
+
+    # INT case should be handled by op_table
+    tosa_specs = [TosaSpecification.create_from_string("TOSA-1.0+FP")]
+
+    def __init__(self, *args):
+        super().__init__(*args)
+
+    def define_node(
+        self,
+        node: torch.fx.Node,
+        tosa_graph: Any,
+        inputs: List[TosaArg],
+        output: TosaArg,
+    ) -> None:
+        import serializer.tosa_serializer as ts  # type: ignore  # noqa: F401
+
+        validate_num_inputs(self.target, inputs, 1)
+        validate_same_dtype(self.target, [*inputs, output], ts)
+        validate_valid_dtype(
+            self.target,
+            inputs[0],
+            ts.DType.FP32,
+            output.tosa_spec,
+        )
+
+        self._serialize_operator(
+            node, tosa_graph, ts.TosaOp.Op().CEIL, [inputs[0].name], [output.name]
+        )

backends/arm/operators/op_floor.py

@@ -0,0 +1,54 @@
+# 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.
+
+from typing import Any, List
+
+import torch.fx
+
+from executorch.backends.arm.operators.node_visitor import (
+    NodeVisitor,
+    register_node_visitor,
+)
+from executorch.backends.arm.operators.operator_validation_utils import (
+    validate_num_inputs,
+    validate_same_dtype,
+    validate_valid_dtype,
+)
+from executorch.backends.arm.tosa import TosaSpecification
+
+from executorch.backends.arm.tosa.mapping import TosaArg
+
+
+@register_node_visitor
+class FloorVisitor(NodeVisitor):
+    target = "aten.floor.default"
+
+    # INT case should be handled by op_table
+    tosa_specs = [TosaSpecification.create_from_string("TOSA-1.0+FP")]
+
+    def __init__(self, *args):
+        super().__init__(*args)
+
+    def define_node(
+        self,
+        node: torch.fx.Node,
+        tosa_graph: Any,
+        inputs: List[TosaArg],
+        output: TosaArg,
+    ) -> None:
+        import serializer.tosa_serializer as ts  # type: ignore  # noqa: F401
+
+        validate_num_inputs(self.target, inputs, 1)
+        validate_same_dtype(self.target, [*inputs, output], ts)
+        validate_valid_dtype(
+            self.target,
+            inputs[0],
+            ts.DType.FP32,
+            output.tosa_spec,
+        )
+
+        self._serialize_operator(
+            node, tosa_graph, ts.TosaOp.Op().FLOOR, [inputs[0].name], [output.name]
+        )

backends/arm/operators/op_logical_not.py

@@ -0,0 +1,59 @@
+# 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.
+
+from typing import Any, List
+
+import torch.fx
+
+from executorch.backends.arm.operators.node_visitor import (
+    NodeVisitor,
+    register_node_visitor,
+)
+from executorch.backends.arm.operators.operator_validation_utils import (
+    validate_num_inputs,
+    validate_same_dtype,
+    validate_valid_dtype,
+)
+from executorch.backends.arm.tosa import TosaSpecification
+from executorch.backends.arm.tosa.mapping import TosaArg
+
+
+@register_node_visitor
+class LogicalNotVisitor(NodeVisitor):
+    target = "aten.logical_not.default"
+
+    tosa_specs = [
+        TosaSpecification.create_from_string("TOSA-1.0+INT"),
+        TosaSpecification.create_from_string("TOSA-1.0+FP"),
+    ]
+
+    def __init__(self, *args):
+        super().__init__(*args)
+
+    def define_node(
+        self,
+        node: torch.fx.Node,
+        tosa_graph: Any,
+        inputs: List[TosaArg],
+        output: TosaArg,
+    ) -> None:
+        import serializer.tosa_serializer as ts  # type: ignore  # noqa: F401
+
+        validate_num_inputs(self.target, inputs, 1)
+        validate_same_dtype(self.target, [*inputs, output], ts)
+        validate_valid_dtype(
+            self.target,
+            [*inputs, output],
+            [ts.DType.BOOL],
+            output.tosa_spec,
+        )
+
+        self._serialize_operator(
+            node,
+            tosa_graph,
+            ts.TosaOp.Op().LOGICAL_NOT,
+            [inputs[0].name],
+            [output.name],
+        )

backends/arm/operators/ops_unary.py

@@ -17,7 +17,7 @@
 from executorch.backends.arm.test.common import SkipIfNoModelConverter
 from executorch.backends.arm.tosa import TosaSpecification
 from executorch.backends.arm.tosa.partitioner import TOSAPartitioner
-from executorch.backends.arm.vgf_partitioner import VgfPartitioner
+from executorch.backends.arm.vgf import VgfPartitioner
 from executorch.exir import to_edge_transform_and_lower
 from executorch.exir.passes.quantize_io_pass import extract_io_quant_params
 from torchao.quantization.pt2e.quantize_pt2e import convert_pt2e, prepare_pt2e

backends/arm/test/misc/test_extract_io_params_tosa.py

@@ -63,7 +63,7 @@
 from executorch.backends.arm.tosa.partitioner import TOSAPartitioner
 from executorch.backends.arm.tosa.specification import get_tosa_spec
 
-from executorch.backends.arm.vgf_partitioner import VgfPartitioner
+from executorch.backends.arm.vgf import VgfPartitioner
 
 from executorch.backends.test.harness.stages import Stage, StageType
 from executorch.backends.xnnpack.test.tester import Tester

backends/arm/test/tester/arm_tester.py

@@ -0,0 +1,14 @@
+# 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
+
+from .backend import VgfBackend  # noqa: F401
+from .partitioner import VgfPartitioner  # noqa: F401
+
+__all__ = [
+    "VgfBackend",
+    "VgfPartitioner",
+]