Revert "Arm backend: Merge passes that replace scalars (pytorch#15298)"

GregoryComer · GregoryComer · commit a4c3cd779377 · 2025-10-27T11:16:35.000-07:00
This reverts commit de56c81.
diff --git a/backends/arm/_passes/__init__.py b/backends/arm/_passes/__init__.py
@@ -88,7 +88,8 @@
 from .mm_to_bmm_pass import ConvertMmToBmmPass  # noqa
 from .remove_noop_pass import RemoveNoopPass  # noqa
 from .replace_scalar_with_tensor_pass import (  # noqa
-    ReplaceScalarWithTensorByProfilePass,
+    ReplaceScalarWithTensorArgPassTOSABI,
+    ReplaceScalarWithTensorArgPassTOSAMI,
 )
 from .rewrite_conv2d_pass import RewriteConv2dPass  # noqa
 from .rewrite_matmul import RewriteMatmulPass  # noqa
diff --git a/backends/arm/_passes/arm_pass_manager.py b/backends/arm/_passes/arm_pass_manager.py
@@ -87,7 +87,8 @@
     QuantizeOperatorArguments,
     RemoveNoopPass,
     ReplaceInfValues,
-    ReplaceScalarWithTensorByProfilePass,
+    ReplaceScalarWithTensorArgPassTOSABI,
+    ReplaceScalarWithTensorArgPassTOSAMI,
     RetraceFoldedDtypesPass,
     RewriteConv2dPass,
     RewriteMatmulPass,
@@ -171,7 +172,7 @@ def _tosa_INT_pipeline(self, exported_program: ExportedProgram) -> GraphModule:
             self.add_pass(CastToInt32Pass())
 
         self.add_pass(CastBoolToInt8Pass())
-        self.add_pass(ReplaceScalarWithTensorByProfilePass())
+        self.add_pass(ReplaceScalarWithTensorArgPassTOSABI())
         self.add_pass(AnnotateDecomposedMatmulPass())
         self.add_pass(QuantizeOperatorArguments())
         self.add_pass(ConvertELUParamsPass())
@@ -241,7 +242,7 @@ def _tosa_FP_pipeline(self, exported_program: ExportedProgram) -> GraphModule:
         self.add_pass(DecomposeSinhPass())
         self.add_pass(DecomposeSignPass())
         self.add_pass(DecomposeDivTensorModePass())
-        self.add_pass(ReplaceScalarWithTensorByProfilePass())
+        self.add_pass(ReplaceScalarWithTensorArgPassTOSAMI())
         self.add_pass(DecomposeEmbeddingPass())
         self.add_pass(FuseQuantizedActivationPass())
         self.add_pass(RemoveGetItemPass())
@@ -334,7 +335,7 @@ def transform_for_annotation_pipeline(self, graph_module: GraphModule):
         self.add_pass(DecomposeAddmmPass())
         self.add_pass(DecomposeDivTensorModePass())
         self.add_pass(DecomposeAddSubAlphaPass())
-        self.add_pass(ReplaceScalarWithTensorByProfilePass())
+        self.add_pass(ReplaceScalarWithTensorArgPassTOSABI())
         self.add_pass(ScalarsToAttributePass())
         self.add_pass(DecomposeGroupNormPass())
         self.add_pass(DecomposeLayerNormPass())
diff --git a/backends/arm/_passes/decompose_acosh_pass.py b/backends/arm/_passes/decompose_acosh_pass.py
@@ -12,7 +12,7 @@
 from executorch.backends.arm._passes.match_arg_dtype_pass import MatchArgDtypePass
 from executorch.backends.arm._passes.match_arg_ranks_pass import MatchArgRanksPass
 from executorch.backends.arm._passes.replace_scalar_with_tensor_pass import (
-    ReplaceScalarWithTensorByProfilePass,
+    ReplaceScalarWithTensorArgPassTOSAMI,
 )
 from executorch.exir.dialects._ops import ops as exir_ops
 from executorch.exir.pass_base import ExportPass
@@ -32,7 +32,7 @@ class DecomposeAcoshPass(ArmPass):
         DecomposeSqrtPass,
         InsertTableOpsPass,
         MatchArgRanksPass,
-        ReplaceScalarWithTensorByProfilePass,
+        ReplaceScalarWithTensorArgPassTOSAMI,
         MatchArgDtypePass,
     }
 
diff --git a/backends/arm/_passes/decompose_asin_and_acos_pass.py b/backends/arm/_passes/decompose_asin_and_acos_pass.py
@@ -19,7 +19,7 @@
 from executorch.backends.arm._passes.match_arg_dtype_pass import MatchArgDtypePass
 from executorch.backends.arm._passes.match_arg_ranks_pass import MatchArgRanksPass
 from executorch.backends.arm._passes.replace_scalar_with_tensor_pass import (
-    ReplaceScalarWithTensorByProfilePass,
+    ReplaceScalarWithTensorArgPassTOSAMI,
 )
 from executorch.exir.dialects._ops import ops as exir_ops
 from executorch.exir.pass_base import ExportPass
@@ -71,7 +71,7 @@ class DecomposeAsinAndAcosPass(ArmPass):
         ConvertFullLikeToFullPass,
         MatchArgRanksPass,
         MatchArgDtypePass,
-        ReplaceScalarWithTensorByProfilePass,
+        ReplaceScalarWithTensorArgPassTOSAMI,
     }
 
     def _build_polynomial(
diff --git a/backends/arm/_passes/decompose_asinh_pass.py b/backends/arm/_passes/decompose_asinh_pass.py
@@ -12,7 +12,7 @@
 from executorch.backends.arm._passes.match_arg_dtype_pass import MatchArgDtypePass
 from executorch.backends.arm._passes.match_arg_ranks_pass import MatchArgRanksPass
 from executorch.backends.arm._passes.replace_scalar_with_tensor_pass import (
-    ReplaceScalarWithTensorByProfilePass,
+    ReplaceScalarWithTensorArgPassTOSAMI,
 )
 from executorch.exir.dialects._ops import ops as exir_ops
 from executorch.exir.pass_base import ExportPass
@@ -32,7 +32,7 @@ class DecomposeAsinhPass(ArmPass):
         DecomposeSqrtPass,
         InsertTableOpsPass,
         MatchArgRanksPass,
-        ReplaceScalarWithTensorByProfilePass,
+        ReplaceScalarWithTensorArgPassTOSAMI,
         MatchArgDtypePass,
     }
 
diff --git a/backends/arm/_passes/decompose_atan_pass.py b/backends/arm/_passes/decompose_atan_pass.py
@@ -12,7 +12,7 @@
 from executorch.backends.arm._passes.match_arg_dtype_pass import MatchArgDtypePass
 from executorch.backends.arm._passes.match_arg_ranks_pass import MatchArgRanksPass
 from executorch.backends.arm._passes.replace_scalar_with_tensor_pass import (
-    ReplaceScalarWithTensorByProfilePass,
+    ReplaceScalarWithTensorArgPassTOSAMI,
 )
 from executorch.exir.dialects._ops import ops as exir_ops
 from executorch.exir.pass_base import ExportPass
@@ -47,7 +47,7 @@ class DecomposeAtanPass(ArmPass):
         InsertTableOpsPass,
         MatchArgRanksPass,
         MatchArgDtypePass,
-        ReplaceScalarWithTensorByProfilePass,
+        ReplaceScalarWithTensorArgPassTOSAMI,
     }
 
     def _rational_approximation(self, z, ops, meta):
diff --git a/backends/arm/_passes/decompose_atanh_pass.py b/backends/arm/_passes/decompose_atanh_pass.py
@@ -10,7 +10,7 @@
 from executorch.backends.arm._passes.match_arg_dtype_pass import MatchArgDtypePass
 from executorch.backends.arm._passes.match_arg_ranks_pass import MatchArgRanksPass
 from executorch.backends.arm._passes.replace_scalar_with_tensor_pass import (
-    ReplaceScalarWithTensorByProfilePass,
+    ReplaceScalarWithTensorArgPassTOSAMI,
 )
 from executorch.exir.dialects._ops import ops as exir_ops
 from executorch.exir.pass_base import ExportPass
@@ -43,7 +43,7 @@ class DecomposeAtanhPass(ArmPass):
         InsertTableOpsPass,
         MatchArgRanksPass,
         MatchArgDtypePass,
-        ReplaceScalarWithTensorByProfilePass,
+        ReplaceScalarWithTensorArgPassTOSAMI,
     }
 
     def call_operator(self, op, args, kwargs, meta):
diff --git a/backends/arm/_passes/decompose_cosh_pass.py b/backends/arm/_passes/decompose_cosh_pass.py
@@ -10,7 +10,7 @@
 from executorch.backends.arm._passes.match_arg_dtype_pass import MatchArgDtypePass
 from executorch.backends.arm._passes.match_arg_ranks_pass import MatchArgRanksPass
 from executorch.backends.arm._passes.replace_scalar_with_tensor_pass import (
-    ReplaceScalarWithTensorByProfilePass,
+    ReplaceScalarWithTensorArgPassTOSAMI,
 )
 from executorch.exir.dialects._ops import ops as exir_ops
 from executorch.exir.pass_base import ExportPass
@@ -31,7 +31,7 @@ class DecomposeCoshPass(ArmPass):
     _passes_required_after: Set[Type[ExportPass]] = {
         InsertTableOpsPass,
         MatchArgRanksPass,
-        ReplaceScalarWithTensorByProfilePass,
+        ReplaceScalarWithTensorArgPassTOSAMI,
         MatchArgDtypePass,
     }
 
diff --git a/backends/arm/_passes/decompose_expm1_pass.py b/backends/arm/_passes/decompose_expm1_pass.py
@@ -12,7 +12,7 @@
 from executorch.backends.arm._passes.match_arg_dtype_pass import MatchArgDtypePass
 from executorch.backends.arm._passes.match_arg_ranks_pass import MatchArgRanksPass
 from executorch.backends.arm._passes.replace_scalar_with_tensor_pass import (
-    ReplaceScalarWithTensorByProfilePass,
+    ReplaceScalarWithTensorArgPassTOSAMI,
 )
 from executorch.exir.dialects._ops import ops as exir_ops
 from executorch.exir.pass_base import ExportPass
@@ -83,7 +83,7 @@ class DecomposeExpm1Pass(ArmPass):
         ConvertIntPowToMuls,
         InsertTableOpsPass,
         DecomposeDivPass,
-        ReplaceScalarWithTensorByProfilePass,
+        ReplaceScalarWithTensorArgPassTOSAMI,
         MatchArgDtypePass,
         MatchArgRanksPass,
     }
diff --git a/backends/arm/_passes/decompose_logit_pass.py b/backends/arm/_passes/decompose_logit_pass.py
@@ -12,7 +12,7 @@
 from executorch.backends.arm._passes.match_arg_dtype_pass import MatchArgDtypePass
 from executorch.backends.arm._passes.match_arg_ranks_pass import MatchArgRanksPass
 from executorch.backends.arm._passes.replace_scalar_with_tensor_pass import (
-    ReplaceScalarWithTensorByProfilePass,
+    ReplaceScalarWithTensorArgPassTOSAMI,
 )
 from executorch.exir.dialects._ops import ops as exir_ops
 from executorch.exir.pass_base import ExportPass
@@ -73,7 +73,7 @@ class DecomposeLogitPass(ArmPass):
         InsertTableOpsPass,
         MatchArgRanksPass,
         MatchArgDtypePass,
-        ReplaceScalarWithTensorByProfilePass,
+        ReplaceScalarWithTensorArgPassTOSAMI,
     }
 
     def call_operator(self, op, args, kwargs, meta):
diff --git a/backends/arm/_passes/decompose_sinh_pass.py b/backends/arm/_passes/decompose_sinh_pass.py
@@ -11,7 +11,7 @@
 from executorch.backends.arm._passes.match_arg_dtype_pass import MatchArgDtypePass
 from executorch.backends.arm._passes.match_arg_ranks_pass import MatchArgRanksPass
 from executorch.backends.arm._passes.replace_scalar_with_tensor_pass import (
-    ReplaceScalarWithTensorByProfilePass,
+    ReplaceScalarWithTensorArgPassTOSAMI,
 )
 from executorch.exir.dialects._ops import ops as exir_ops
 from executorch.exir.pass_base import ExportPass
@@ -36,7 +36,7 @@ class DecomposeSinhPass(ArmPass):
     _passes_required_after: Set[Type[ExportPass]] = {
         InsertTableOpsPass,
         MatchArgRanksPass,
-        ReplaceScalarWithTensorByProfilePass,
+        ReplaceScalarWithTensorArgPassTOSAMI,
         MatchArgDtypePass,
     }
 
diff --git a/backends/arm/_passes/replace_scalar_with_tensor_pass.py b/backends/arm/_passes/replace_scalar_with_tensor_pass.py
@@ -7,8 +7,6 @@
 from typing import Dict, Set, Type, Union
 
 import torch
-
-from executorch.backends.arm.tosa.specification import get_context_spec
 from executorch.backends.transforms.replace_scalar_with_tensor import (
     ReplaceScalarWithTensorArgPass,
 )
@@ -17,8 +15,6 @@
 from executorch.exir.dialects.edge._ops import EdgeOpOverload
 from executorch.exir.pass_base import ExportPass
 
-from .arm_pass import ArmPass
-
 
 # Operators that are included for both TOSA profiles
 _common_ops: Dict[
@@ -57,51 +53,23 @@
     torch.ops.aten.bitwise_xor.Scalar: torch.ops.aten.bitwise_xor.Tensor,
 }
 
-_fp_profile_ops: Dict[
-    Union[EdgeOpOverload, torch._ops.OpOverload],
-    Union[EdgeOpOverload, torch._ops.OpOverload],
-] = _common_ops | {
-    exir_ops.edge.aten.pow.Tensor_Scalar: exir_ops.edge.aten.pow.Tensor_Tensor,
-    torch.ops.aten.pow.Tensor_Scalar: torch.ops.aten.pow.Tensor_Tensor,
-}
 
-_int_profile_ops: Dict[
-    Union[EdgeOpOverload, torch._ops.OpOverload],
-    Union[EdgeOpOverload, torch._ops.OpOverload],
-] = _common_ops
+class ReplaceScalarWithTensorArgPassTOSAMI(ReplaceScalarWithTensorArgPass):
+    _passes_required_after: Set[Type[ExportPass]] = set()
 
-_all_ops: Dict[
-    Union[EdgeOpOverload, torch._ops.OpOverload],
-    Union[EdgeOpOverload, torch._ops.OpOverload],
-] = (
-    _fp_profile_ops | _int_profile_ops
-)
+    scalar_to_tensor_ops = _common_ops | {
+        exir_ops.edge.aten.pow.Tensor_Scalar: exir_ops.edge.aten.pow.Tensor_Tensor,
+        torch.ops.aten.pow.Tensor_Scalar: torch.ops.aten.pow.Tensor_Tensor,
+    }
 
+    def __init__(self):
+        super().__init__(self.scalar_to_tensor_ops)
 
-class ReplaceScalarWithTensorByProfilePass(ReplaceScalarWithTensorArgPass, ArmPass):
-    """Profile-aware scalar-to-tensor replacement pass for binary ops."""
 
+class ReplaceScalarWithTensorArgPassTOSABI(ReplaceScalarWithTensorArgPass):
     _passes_required_after: Set[Type[ExportPass]] = set()
 
-    def __init__(self):
-        # Initialize base (ReplaceScalarWithTensorArgPass) with the full
-        # superset which will make the superclass handle ops in _all_ops.
-        # Actual selection is done per-call in call_operator.
-        super().__init__(_all_ops)
-
-    def call_operator(self, op, args, kwargs, meta):
-        tosa_spec = get_context_spec()
+    scalar_to_tensor_ops = _common_ops
 
-        if tosa_spec.support_integer():
-            included_ops = _int_profile_ops
-        elif tosa_spec.support_float():
-            included_ops = _fp_profile_ops
-        else:
-            raise ValueError("Profile must support either INT or FP")
-
-        if op in included_ops:
-            # Include this op based on the current profile.
-            return super().call_operator(op, args, kwargs, meta)
-        else:
-            # Do not handle; forward unchanged.
-            return ExportPass.call_operator(self, op, args, kwargs, meta)
+    def __init__(self):
+        super().__init__(self.scalar_to_tensor_ops)
