Skip to content

Commit 76ebaa0

Browse files
Arm backend: Rewrite le/lt to ge/gt and simplify visitors (pytorch#17783)
Add a pass that rewrites le/lt to ge/gt with swapped inputs. Move eq/ge/gt to SimpleNodeVisitor and drop comparison visitor. Create test for rewrite_le_lt_to_ge_gt_pass. Signed-off-by: Sebastian Larsson <sebastian.larsson@arm.com>
1 parent 01d21fa commit 76ebaa0

12 files changed

Lines changed: 155 additions & 252 deletions

‎backends/arm/_passes/__init__.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@
132132
)
133133
from .rewrite_conv_pass import RewriteConvPass # noqa
134134
from .rewrite_index_put_pass import RewriteIndexPutPass # noqa
135+
from .rewrite_le_lt_to_ge_gt_pass import RewriteLeLtToGeGtPass # noqa
135136
from .rewrite_matmul import RewriteMatmulPass # noqa
136137
from .rewrite_upsample import RewriteUpsamplePass # noqa
137138
from .scalars_to_attribute_pass import ScalarsToAttributePass # noqa

‎backends/arm/_passes/arm_pass_manager.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@
117117
RewriteBoolToFp32CastViaInt8Pass,
118118
RewriteConvPass,
119119
RewriteIndexPutPass,
120+
RewriteLeLtToGeGtPass,
120121
RewriteMatmulPass,
121122
RewriteUpsamplePass,
122123
ScalarsToAttributePass,
@@ -310,6 +311,7 @@ def _tosa_pipeline(
310311
self.add_passes(
311312
[
312313
ReplaceScalarWithTensorByProfilePass(),
314+
RewriteLeLtToGeGtPass(),
313315
ConvertFullLikeToFullPass(),
314316
MatchArgDtypePass(),
315317
UnsqueezeScalarPlaceholdersPass(exported_program),

‎backends/arm/_passes/decompose_div_tensor_mode.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"floor": exir_ops.edge.aten.floor.default,
2121
"ceil": exir_ops.edge.aten.ceil.default,
2222
"full": exir_ops.edge.aten.full.default,
23-
"lt": exir_ops.edge.aten.lt.Tensor,
23+
"gt": exir_ops.edge.aten.gt.Tensor,
2424
"where": exir_ops.edge.aten.where.self,
2525
}
2626

@@ -29,7 +29,7 @@
2929
"floor": torch.ops.aten.floor.default,
3030
"ceil": torch.ops.aten.ceil.default,
3131
"full": torch.ops.aten.full.default,
32-
"lt": torch.ops.aten.lt.Tensor,
32+
"gt": torch.ops.aten.gt.Tensor,
3333
"where": torch.ops.aten.where.self,
3434
}
3535

@@ -87,11 +87,13 @@ def call_operator(self, op, args, kwargs, meta):
8787
meta=meta,
8888
updated=True,
8989
)
90-
lt0 = super().call_operator(opset["lt"], (q, zero), {}, meta, updated=True)
90+
is_neg = super().call_operator(
91+
opset["gt"], (zero, q), {}, meta, updated=True
92+
)
9193
ceilq = super().call_operator(opset["ceil"], (q,), {}, meta, updated=True)
9294
floorq = super().call_operator(opset["floor"], (q,), {}, meta, updated=True)
9395
return super().call_operator(
94-
opset["where"], (lt0, ceilq, floorq), {}, meta, updated=True
96+
opset["where"], (is_neg, ceilq, floorq), {}, meta, updated=True
9597
)
9698

9799
raise RuntimeError(
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Copyright 2026 Arm Limited and/or its affiliates.
2+
#
3+
# This source code is licensed under the BSD-style license found in the
4+
# LICENSE file in the root directory of this source tree.
5+
6+
from typing import Set, Type
7+
8+
import torch
9+
10+
from executorch.backends.arm._passes import ArmPass
11+
from executorch.exir.dialects._ops import ops as exir_ops
12+
from executorch.exir.pass_base import ExportPass
13+
14+
OP_MAP = {
15+
exir_ops.edge.aten.le.Tensor: exir_ops.edge.aten.ge.Tensor,
16+
exir_ops.edge.aten.lt.Tensor: exir_ops.edge.aten.gt.Tensor,
17+
torch.ops.aten.le.Tensor: torch.ops.aten.ge.Tensor,
18+
torch.ops.aten.lt.Tensor: torch.ops.aten.gt.Tensor,
19+
}
20+
21+
22+
class RewriteLeLtToGeGtPass(ArmPass):
23+
"""Rewrite le/lt into ge/gt with swapped inputs."""
24+
25+
_passes_required_after: Set[Type[ExportPass]] = set()
26+
27+
def call_operator(self, op, args, kwargs, meta):
28+
if not self.allowed_to_transform(meta):
29+
return super().call_operator(op, args, kwargs, meta)
30+
31+
target_op = OP_MAP.get(op)
32+
if target_op is None:
33+
return super().call_operator(op, args, kwargs, meta)
34+
35+
lhs, rhs = args
36+
return super().call_operator(
37+
target_op,
38+
(rhs, lhs),
39+
kwargs,
40+
meta,
41+
updated=True,
42+
)

‎backends/arm/operators/__init__.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,8 @@
3232
op_ge,
3333
op_gt,
3434
op_index_tensor,
35-
op_le,
3635
op_log,
3736
op_logical_not,
38-
op_lt,
3937
op_max_pool2d,
4038
op_maximum,
4139
op_minimum,

‎backends/arm/operators/op_eq.py‎

Lines changed: 15 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -3,56 +3,27 @@
33
# This source code is licensed under the BSD-style license found in the
44
# LICENSE file in the root directory of this source tree.
55

6-
7-
from typing import Any, List
8-
96
import tosa_serializer as ts
107

11-
from executorch.backends.arm.operators.node_visitor import (
12-
NodeVisitor,
13-
register_node_visitor,
8+
from executorch.backends.arm.operators.node_visitor import register_node_visitor
9+
from executorch.backends.arm.operators.simple_node_visitor import (
10+
SimpleNodeVisitor,
11+
SimpleNodeVisitorConfig,
1412
)
15-
from executorch.backends.arm.operators.operator_validation_utils import (
16-
validate_num_inputs,
17-
validate_same_dtype,
18-
validate_valid_dtype,
19-
)
20-
from executorch.backends.arm.tosa.mapping import TosaArg
21-
22-
from torch.fx import Node
2313

2414

2515
@register_node_visitor
26-
class EqualVisitor(NodeVisitor):
16+
class EqualVisitor(SimpleNodeVisitor):
2717
target = "aten.eq.Tensor"
2818

29-
def __init__(self, *args):
30-
super().__init__(*args)
31-
32-
def define_node(
33-
self,
34-
node: Node,
35-
tosa_graph: Any,
36-
inputs: List[TosaArg],
37-
output: TosaArg,
38-
) -> None:
39-
validate_num_inputs(self.target, inputs, 2)
40-
validate_same_dtype(self.target, inputs, ts)
41-
validate_valid_dtype(
42-
self.target,
43-
inputs,
44-
[ts.DType.INT32, ts.DType.FP16, ts.DType.FP32, ts.DType.BF16],
45-
self.tosa_spec,
46-
)
47-
validate_valid_dtype(self.target, output, ts.DType.BOOL, self.tosa_spec)
48-
49-
attr = ts.TosaSerializerAttribute()
50-
attr.EqualAttribute()
51-
self._serialize_operator(
52-
node,
53-
tosa_graph,
54-
ts.Op.EQUAL,
55-
[inputs[0].name, inputs[1].name],
56-
[output.name],
57-
attr,
19+
@classmethod
20+
def get_config(cls) -> SimpleNodeVisitorConfig:
21+
return SimpleNodeVisitorConfig(
22+
tosa_op=ts.Op.EQUAL,
23+
attr_method="EqualAttribute",
24+
num_inputs=2,
25+
input_dtypes=[ts.DType.INT32, ts.DType.FP16, ts.DType.FP32, ts.DType.BF16],
26+
output_dtypes=[ts.DType.BOOL],
27+
same_dtype_with_output=False,
28+
dtype_check_inputs_only=True,
5829
)

‎backends/arm/operators/op_ge.py‎

Lines changed: 16 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3,56 +3,29 @@
33
# This source code is licensed under the BSD-style license found in the
44
# LICENSE file in the root directory of this source tree.
55

6-
7-
from typing import Any, List
8-
96
import tosa_serializer as ts
107

11-
from executorch.backends.arm.operators.node_visitor import (
12-
NodeVisitor,
13-
register_node_visitor,
14-
)
15-
from executorch.backends.arm.operators.operator_validation_utils import (
16-
validate_num_inputs,
17-
validate_same_dtype,
18-
validate_valid_dtype,
8+
from executorch.backends.arm.operators.node_visitor import register_node_visitor
9+
from executorch.backends.arm.operators.simple_node_visitor import (
10+
SimpleNodeVisitor,
11+
SimpleNodeVisitorConfig,
1912
)
20-
from executorch.backends.arm.tosa.mapping import TosaArg
2113

22-
from torch.fx import Node
14+
COMPARE_INPUT_DTYPES = [ts.DType.INT32, ts.DType.FP32, ts.DType.BF16, ts.DType.FP16]
2315

2416

2517
@register_node_visitor
26-
class GreaterEqualVisitor(NodeVisitor):
18+
class GreaterEqualVisitor(SimpleNodeVisitor):
2719
target = "aten.ge.Tensor"
2820

29-
def __init__(self, *args):
30-
super().__init__(*args)
31-
32-
def define_node(
33-
self,
34-
node: Node,
35-
tosa_graph: Any,
36-
inputs: List[TosaArg],
37-
output: TosaArg,
38-
) -> None:
39-
validate_num_inputs(self.target, inputs, 2)
40-
validate_same_dtype(self.target, inputs, ts)
41-
validate_valid_dtype(
42-
self.target,
43-
inputs,
44-
[ts.DType.INT32, ts.DType.FP32, ts.DType.BF16, ts.DType.FP16],
45-
self.tosa_spec,
46-
)
47-
validate_valid_dtype(self.target, output, ts.DType.BOOL, self.tosa_spec)
48-
49-
attr = ts.TosaSerializerAttribute()
50-
attr.GreaterEqualAttribute()
51-
self._serialize_operator(
52-
node,
53-
tosa_graph,
54-
ts.Op.GREATER_EQUAL,
55-
[inputs[0].name, inputs[1].name],
56-
[output.name],
57-
attr,
21+
@classmethod
22+
def get_config(cls) -> SimpleNodeVisitorConfig:
23+
return SimpleNodeVisitorConfig(
24+
tosa_op=ts.Op.GREATER_EQUAL,
25+
attr_method="GreaterEqualAttribute",
26+
num_inputs=2,
27+
input_dtypes=COMPARE_INPUT_DTYPES,
28+
output_dtypes=[ts.DType.BOOL],
29+
same_dtype_with_output=False,
30+
dtype_check_inputs_only=True,
5831
)

‎backends/arm/operators/op_gt.py‎

Lines changed: 16 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3,56 +3,29 @@
33
# This source code is licensed under the BSD-style license found in the
44
# LICENSE file in the root directory of this source tree.
55

6-
7-
from typing import Any, List
8-
96
import tosa_serializer as ts
107

11-
from executorch.backends.arm.operators.node_visitor import (
12-
NodeVisitor,
13-
register_node_visitor,
14-
)
15-
from executorch.backends.arm.operators.operator_validation_utils import (
16-
validate_num_inputs,
17-
validate_same_dtype,
18-
validate_valid_dtype,
8+
from executorch.backends.arm.operators.node_visitor import register_node_visitor
9+
from executorch.backends.arm.operators.simple_node_visitor import (
10+
SimpleNodeVisitor,
11+
SimpleNodeVisitorConfig,
1912
)
20-
from executorch.backends.arm.tosa.mapping import TosaArg
2113

22-
from torch.fx import Node
14+
COMPARE_INPUT_DTYPES = [ts.DType.INT32, ts.DType.FP32, ts.DType.BF16, ts.DType.FP16]
2315

2416

2517
@register_node_visitor
26-
class GreaterThanVisitor(NodeVisitor):
18+
class GreaterThanVisitor(SimpleNodeVisitor):
2719
target = "aten.gt.Tensor"
2820

29-
def __init__(self, *args):
30-
super().__init__(*args)
31-
32-
def define_node(
33-
self,
34-
node: Node,
35-
tosa_graph: Any,
36-
inputs: List[TosaArg],
37-
output: TosaArg,
38-
) -> None:
39-
validate_num_inputs(self.target, inputs, 2)
40-
validate_same_dtype(self.target, inputs, ts)
41-
validate_valid_dtype(
42-
self.target,
43-
inputs,
44-
[ts.DType.INT32, ts.DType.FP32, ts.DType.BF16, ts.DType.FP16],
45-
self.tosa_spec,
46-
)
47-
validate_valid_dtype(self.target, output, ts.DType.BOOL, self.tosa_spec)
48-
49-
attr = ts.TosaSerializerAttribute()
50-
attr.GreaterAttribute()
51-
self._serialize_operator(
52-
node,
53-
tosa_graph,
54-
ts.Op.GREATER,
55-
[inputs[0].name, inputs[1].name],
56-
[output.name],
57-
attr,
21+
@classmethod
22+
def get_config(cls) -> SimpleNodeVisitorConfig:
23+
return SimpleNodeVisitorConfig(
24+
tosa_op=ts.Op.GREATER,
25+
attr_method="GreaterAttribute",
26+
num_inputs=2,
27+
input_dtypes=COMPARE_INPUT_DTYPES,
28+
output_dtypes=[ts.DType.BOOL],
29+
same_dtype_with_output=False,
30+
dtype_check_inputs_only=True,
5831
)

‎backends/arm/operators/op_le.py‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)