Skip to content

Commit 6e9fb80

Browse files
martinlsmmartinlsm
authored
Arm backend: Rename passes for consistency (#15888)
* Add *Pass suffix for passes missing it * Add missing _pass suffixes to python files containing passes * Correct pass name: DecomposeLinearVectorNormPass to DecomposeLinalgVectorNormPass * Rename ConvertIntPowToMuls to DecomposeIntPowPass * Rename QuantizeOperatorArguments to QuantizeClampArgumentsPass Signed-off-by: Martin Lindström <[email protected]>
1 parent ee7e95e commit 6e9fb80

33 files changed

+136
-97
lines changed

‎backends/arm/_passes/__init__.py‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,13 @@
1818
from .convert_full_like_to_full_pass import ConvertFullLikeToFullPass # noqa
1919
from .convert_int64_const_ops_to_int32 import ConvertInt64ConstOpsToInt32Pass # noqa
2020
from .convert_int64_output_ops_to_int32 import ConvertInt64OutputOpsToInt32Pass # noqa
21-
from .convert_int_pow_to_mul import ConvertIntPowToMuls # noqa
2221
from .convert_minmax_pass import ConvertMinMaxPass # noqa
2322
from .convert_permute_singleton_to_view_pass import ( # noqa
2423
ConvertPermuteSingletonToViewPass,
2524
)
2625
from .convert_split_to_slice import ConvertSplitToSlicePass # noqa
2726
from .convert_squeezes_to_view import ConvertSqueezesToViewPass # noqa
28-
from .convert_to_clamp import ConvertToClampPass # noqa
27+
from .convert_to_clamp_pass import ConvertToClampPass # noqa
2928
from .decompose_acosh_pass import DecomposeAcoshPass # noqa
3029
from .decompose_adaptive_avg_pool2d_pass import DecomposeAdaptiveAvgPool2dPass # noqa
3130
from .decompose_add_sub_alpha_pass import DecomposeAddSubAlphaPass # noqa
@@ -35,7 +34,7 @@
3534
from .decompose_asinh_pass import DecomposeAsinhPass # noqa
3635
from .decompose_atan_pass import DecomposeAtanPass # noqa
3736
from .decompose_atanh_pass import DecomposeAtanhPass # noqa
38-
from .decompose_avg_pool2d import DecomposeAvgPool2d # noqa
37+
from .decompose_avg_pool2d_pass import DecomposeAvgPool2dPass # noqa
3938
from .decompose_batch_norm_no_stats import DecomposeBatchNormNoStatsPass # noqa
4039
from .decompose_cosh_pass import DecomposeCoshPass # noqa
4140
from .decompose_cosine_similarity_pass import DecomposeCosineSimilarityPass # noqa
@@ -48,23 +47,24 @@
4847
from .decompose_floor_divide_pass import DecomposeFloorDividePass # noqa
4948
from .decompose_gelu_pass import DecomposeGeluPass # noqa
5049
from .decompose_glu_pass import DecomposeGluPass # noqa
51-
from .decompose_grouped_conv import DecomposeGroupedConv # noqa
50+
from .decompose_grouped_conv_pass import DecomposeGroupedConvPass # noqa
5251
from .decompose_groupnorm_pass import DecomposeGroupNormPass # noqa
5352
from .decompose_int16_activation_conv2d_pass import ( # noqa
5453
DecomposeConv2dWithInt16ActivationPass,
5554
)
55+
from .decompose_int_pow_pass import DecomposeIntPowPass # noqa
5656
from .decompose_layernorm_pass import DecomposeLayerNormPass # noqa
5757
from .decompose_leaky_relu_pass import DecomposeLeakyReLUPass # noqa
58-
from .decompose_linalg_vector_norm_pass import DecomposeLinearVectorNormPass # noqa
58+
from .decompose_linalg_vector_norm_pass import DecomposeLinalgVectorNormPass # noqa
5959
from .decompose_linear_pass import DecomposeLinearPass # noqa
6060
from .decompose_logit_pass import DecomposeLogitPass # noqa
61-
from .decompose_masked_fill import DecomposeMaskedFill # noqa
62-
from .decompose_maxpool2d_with_dilation import DecomposeMaxPool2DPass # noqa
61+
from .decompose_masked_fill_pass import DecomposeMaskedFillPass # noqa
62+
from .decompose_maxpool2d_with_dilation_pass import DecomposeMaxPool2dPass # noqa
6363
from .decompose_meandim_pass import DecomposeMeanDimPass # noqa
6464
from .decompose_ne_pass import DecomposeNotEqualPass # noqa
6565
from .decompose_remainder_pass import DecomposeRemainderPass # noqa
6666
from .decompose_round_pass import DecomposeRoundPass # noqa
67-
from .decompose_sdpa_pass import DecomposeScaledDotProductAttention # noqa
67+
from .decompose_sdpa_pass import DecomposeScaledDotProductAttentionPass # noqa
6868
from .decompose_select import DecomposeSelectPass # noqa
6969
from .decompose_sign_pass import DecomposeSignPass # noqa
7070
from .decompose_silu_pass import DecomposeSiluPass # noqa
@@ -77,10 +77,13 @@
7777
from .decorate_fp32_to_int32_casting_pass import DecorateFp32toInt32CastingPass # noqa
7878
from .fold_qdq_with_annotated_qparams_pass import ( # noqa
7979
FoldAndAnnotateQParamsPass,
80-
QuantizeOperatorArguments,
80+
QuantizeClampArgumentsPass,
81+
)
82+
from .fuse_batch_norm2d_pass import FuseBatchNorm2dPass # noqa
83+
from .fuse_constant_ops_pass import ( # noqa
84+
ComputeConstantOpsAOTPass,
85+
FuseConstantArgsPass,
8186
)
82-
from .fuse_batchnorm2d_pass import FuseBatchnorm2DPass # noqa
83-
from .fuse_constant_ops_pass import ComputeConstantOpsAOT, FuseConstantArgsPass # noqa
8487
from .fuse_duplicate_users_pass import FuseDuplicateUsersPass # noqa
8588
from .fuse_equal_placeholders_pass import FuseEqualPlaceholdersPass # noqa
8689
from .fuse_quantized_activation_pass import FuseQuantizedActivationPass # noqa
@@ -111,5 +114,5 @@
111114
from .to_tosa_memory_format_pass import ToTosaMemoryFormatPass # noqa
112115
from .unsqueeze_before_repeat_pass import UnsqueezeBeforeRepeatPass # noqa
113116
from .unsqueeze_scalar_placeholders_pass import UnsqueezeScalarPlaceholdersPass # noqa
114-
from .replace_inf_values_pass import ReplaceInfValues # noqa # usort: skip
117+
from .replace_inf_values_pass import ReplaceInfValuesPass # noqa # usort: skip
115118
from .arm_pass_manager import ArmPassManager # noqa # usort: skip

‎backends/arm/_passes/arm_pass_manager.py‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@
1717
CastBoolToInt8Pass,
1818
CastInt64BuffersToInt32Pass,
1919
CastToInt32Pass,
20-
ComputeConstantOpsAOT,
20+
ComputeConstantOpsAOTPass,
2121
Conv1dUnsqueezePass,
2222
ConvertELUParamsPass,
2323
ConvertExpandCopyToRepeatPass,
2424
ConvertFullLikeToFullPass,
2525
ConvertInt64ConstOpsToInt32Pass,
2626
ConvertInt64OutputOpsToInt32Pass,
27-
ConvertIntPowToMuls,
2827
ConvertMinMaxPass,
2928
ConvertMmToBmmPass,
3029
ConvertPermuteSingletonToViewPass,
@@ -40,7 +39,7 @@
4039
DecomposeAsinhPass,
4140
DecomposeAtanhPass,
4241
DecomposeAtanPass,
43-
DecomposeAvgPool2d,
42+
DecomposeAvgPool2dPass,
4443
DecomposeBatchNormNoStatsPass,
4544
DecomposeConv2dWithInt16ActivationPass,
4645
DecomposeCoshPass,
@@ -54,20 +53,21 @@
5453
DecomposeFloorDividePass,
5554
DecomposeGeluPass,
5655
DecomposeGluPass,
57-
DecomposeGroupedConv,
56+
DecomposeGroupedConvPass,
5857
DecomposeGroupNormPass,
58+
DecomposeIntPowPass,
5959
DecomposeLayerNormPass,
6060
DecomposeLeakyReLUPass,
61+
DecomposeLinalgVectorNormPass,
6162
DecomposeLinearPass,
62-
DecomposeLinearVectorNormPass,
6363
DecomposeLogitPass,
64-
DecomposeMaskedFill,
65-
DecomposeMaxPool2DPass,
64+
DecomposeMaskedFillPass,
65+
DecomposeMaxPool2dPass,
6666
DecomposeMeanDimPass,
6767
DecomposeNotEqualPass,
6868
DecomposeRemainderPass,
6969
DecomposeRoundPass,
70-
DecomposeScaledDotProductAttention,
70+
DecomposeScaledDotProductAttentionPass,
7171
DecomposeSelectPass,
7272
DecomposeSignPass,
7373
DecomposeSiluPass,
@@ -79,7 +79,7 @@
7979
DecomposeVarPass,
8080
DecorateFp32toInt32CastingPass,
8181
FoldAndAnnotateQParamsPass,
82-
FuseBatchnorm2DPass,
82+
FuseBatchNorm2dPass,
8383
FuseConstantArgsPass,
8484
FuseDuplicateUsersPass,
8585
FuseEqualPlaceholdersPass,
@@ -92,11 +92,11 @@
9292
InsertTableOpsPass,
9393
MatchArgDtypePass,
9494
MatchArgRanksPass,
95-
QuantizeOperatorArguments,
95+
QuantizeClampArgumentsPass,
9696
RemoveGetItemPass,
9797
RemoveGraphAssertsPass,
9898
RemoveNoopPass,
99-
ReplaceInfValues,
99+
ReplaceInfValuesPass,
100100
ReplaceScalarWithTensorByProfilePass,
101101
RewriteConv2dPass,
102102
RewriteMatmulPass,
@@ -182,7 +182,7 @@ def _tosa_pipeline(
182182
AnnotateDecomposedMatmulPass(),
183183
ConvertELUParamsPass(),
184184
ConvertSplitToSlicePass(),
185-
QuantizeOperatorArguments(),
185+
QuantizeClampArgumentsPass(),
186186
]
187187
)
188188

@@ -204,7 +204,7 @@ def _tosa_pipeline(
204204
self.add_passes(
205205
[
206206
DecomposeLogitPass(),
207-
DecomposeMaskedFill(),
207+
DecomposeMaskedFillPass(),
208208
DecomposeRoundPass(),
209209
DecomposeAcoshPass(),
210210
DecomposeAsinhPass(),
@@ -216,14 +216,14 @@ def _tosa_pipeline(
216216
DecomposeAddmmPass(),
217217
DecomposeEluPass(),
218218
DecomposeExpm1Pass(),
219-
ConvertIntPowToMuls(),
219+
DecomposeIntPowPass(),
220220
CastBoolToInt8Pass(),
221221
DecomposeSinhPass(),
222222
DecomposeSignPass(),
223223
DecomposeFloorDividePass(),
224224
DecomposeGeluPass(),
225225
DecomposeAddSubAlphaPass(),
226-
DecomposeGroupedConv(),
226+
DecomposeGroupedConvPass(),
227227
Conv1dUnsqueezePass(),
228228
]
229229
)
@@ -249,7 +249,7 @@ def _tosa_pipeline(
249249
DecomposeRemainderPass(),
250250
DecomposeDivTensorModePass(),
251251
DecomposeEmbeddingPass(),
252-
FuseBatchnorm2DPass(exported_program),
252+
FuseBatchNorm2dPass(exported_program),
253253
ConvertMmToBmmPass(),
254254
DecomposeGluPass(),
255255
DecomposeLeakyReLUPass(),
@@ -258,13 +258,13 @@ def _tosa_pipeline(
258258
ConvertMinMaxPass(),
259259
DecomposeAnyPass(),
260260
DecomposeAdaptiveAvgPool2dPass(),
261-
DecomposeAvgPool2d(),
261+
DecomposeAvgPool2dPass(),
262262
DecorateFp32toInt32CastingPass(),
263-
ComputeConstantOpsAOT(exported_program),
263+
ComputeConstantOpsAOTPass(exported_program),
264264
ConvertExpandCopyToRepeatPass(),
265265
UnsqueezeBeforeRepeatPass(),
266266
DecomposeCumsumPass(exported_program),
267-
DecomposeMaxPool2DPass(),
267+
DecomposeMaxPool2dPass(),
268268
SizeAdjustInputPass(),
269269
DecomposeSelectPass(),
270270
ConvertSqueezesToViewPass(),
@@ -326,7 +326,7 @@ def transform_for_annotation_pipeline(self, graph_module: GraphModule):
326326
ConvertInt64OutputOpsToInt32Pass(),
327327
InsertInt32CastsAfterInt64PlaceholdersPass(),
328328
DecomposeEmbeddingPass(),
329-
DecomposeScaledDotProductAttention(),
329+
DecomposeScaledDotProductAttentionPass(),
330330
DecomposeRoundPass(),
331331
DecomposeLogitPass(),
332332
CastBoolToInt8Pass(),
@@ -359,10 +359,10 @@ def transform_for_annotation_pipeline(self, graph_module: GraphModule):
359359
DecomposeGluPass(),
360360
DecomposeDivPass(),
361361
DecomposeLeakyReLUPass(),
362-
DecomposeLinearVectorNormPass(),
362+
DecomposeLinalgVectorNormPass(),
363363
DecomposeSqrtPass(),
364364
DecomposeSiluPass(),
365-
DecomposeAvgPool2d(),
365+
DecomposeAvgPool2dPass(),
366366
(
367367
DecomposeSoftmaxUnstablePass()
368368
if self.tosa_spec.is_U55_subset
@@ -375,8 +375,8 @@ def transform_for_annotation_pipeline(self, graph_module: GraphModule):
375375
# Postprocessing passes
376376
self.add_passes(
377377
[
378-
ReplaceInfValues(),
379-
DecomposeMaskedFill() if not self.tosa_spec.is_U55_subset else None,
378+
ReplaceInfValuesPass(),
379+
DecomposeMaskedFillPass() if not self.tosa_spec.is_U55_subset else None,
380380
]
381381
)
382382

‎backends/arm/_passes/convert_full_like_to_full_pass.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
from typing import Set, Type
77

88
from executorch.backends.arm._passes.arm_pass import ArmPass
9-
from executorch.backends.arm._passes.fuse_constant_ops_pass import ComputeConstantOpsAOT
9+
from executorch.backends.arm._passes.fuse_constant_ops_pass import (
10+
ComputeConstantOpsAOTPass,
11+
)
1012

1113
from executorch.exir.dialects._ops import ops as exir_ops
1214
from executorch.exir.pass_base import ExportPass
@@ -24,7 +26,7 @@ class ConvertFullLikeToFullPass(ArmPass):
2426
Skip layout and device since it's not relevant for our backend.
2527
"""
2628

27-
_passes_required_after: Set[Type[ExportPass]] = {ComputeConstantOpsAOT}
29+
_passes_required_after: Set[Type[ExportPass]] = {ComputeConstantOpsAOTPass}
2830

2931
def call_operator(self, op, args, kwargs, meta):
3032
if op not in [

‎backends/arm/_passes/convert_int64_const_ops_to_int32.py‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99

1010
import torch
1111
from executorch.backends.arm._passes import ArmPass
12-
from executorch.backends.arm._passes.fuse_constant_ops_pass import ComputeConstantOpsAOT
12+
from executorch.backends.arm._passes.fuse_constant_ops_pass import (
13+
ComputeConstantOpsAOTPass,
14+
)
1315
from executorch.exir.pass_base import ExportPass, PassResult
1416

1517

@@ -30,7 +32,7 @@ class ConvertInt64ConstOpsToInt32Pass(ArmPass):
3032
5. `torch.tensor`
3133
"""
3234

33-
_passes_required_after: Set[Type[ExportPass]] = {ComputeConstantOpsAOT}
35+
_passes_required_after: Set[Type[ExportPass]] = {ComputeConstantOpsAOTPass}
3436

3537
torch_ops = [
3638
torch.ops.aten.full.default,
@@ -47,7 +49,10 @@ def call(self, graph_module: torch.fx.GraphModule):
4749
if node.op != "call_function":
4850
continue
4951

50-
if node.target not in ComputeConstantOpsAOT.targeted_ops + self.torch_ops:
52+
if (
53+
node.target
54+
not in ComputeConstantOpsAOTPass.targeted_ops + self.torch_ops
55+
):
5156
continue
5257

5358
data = node.target(*node.args, **node.kwargs)

‎backends/arm/_passes/convert_to_clamp.py‎ renamed to ‎backends/arm/_passes/convert_to_clamp_pass.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from executorch.backends.arm._passes import ArmPass
99

1010
from executorch.backends.arm._passes.fold_qdq_with_annotated_qparams_pass import (
11-
QuantizeOperatorArguments,
11+
QuantizeClampArgumentsPass,
1212
)
1313

1414
from executorch.exir.dialects._ops import ops as exir_ops
@@ -30,7 +30,7 @@ def get_clamp_params(op, args) -> Tuple[float | None, float | None]:
3030

3131

3232
class ConvertToClampPass(ArmPass):
33-
_passes_required_after: Set[Type[ExportPass]] = {QuantizeOperatorArguments}
33+
_passes_required_after: Set[Type[ExportPass]] = {QuantizeClampArgumentsPass}
3434

3535
def call_operator(self, op, args, kwargs, meta):
3636
if op not in edge_operators:

‎backends/arm/_passes/decompose_adaptive_avg_pool2d_pass.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
import torch
1010

1111
from executorch.backends.arm._passes import ArmPass
12-
from executorch.backends.arm._passes.decompose_avg_pool2d import DecomposeAvgPool2d
12+
from executorch.backends.arm._passes.decompose_avg_pool2d_pass import (
13+
DecomposeAvgPool2dPass,
14+
)
1315

1416
from executorch.exir.dialects._ops import ops as exir_ops
1517
from executorch.exir.pass_base import ExportPass, NodeMetadata
@@ -44,7 +46,7 @@ class DecomposeAdaptiveAvgPool2dPass(ArmPass):
4446
The output is of size output_size_h x output_size_w for any input.
4547
"""
4648

47-
_passes_required_after: Set[Type[ExportPass]] = {DecomposeAvgPool2d}
49+
_passes_required_after: Set[Type[ExportPass]] = {DecomposeAvgPool2dPass}
4850

4951
def call_operator(self, op, args, kwargs, meta, updated=False):
5052
if op not in (edge_ops + aten_ops):

‎backends/arm/_passes/decompose_avg_pool2d.py‎ renamed to ‎backends/arm/_passes/decompose_avg_pool2d_pass.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
import torch
1010
from executorch.backends.arm._passes.arm_pass import ArmPass
11-
from executorch.backends.arm._passes.fuse_constant_ops_pass import ComputeConstantOpsAOT
11+
from executorch.backends.arm._passes.fuse_constant_ops_pass import (
12+
ComputeConstantOpsAOTPass,
13+
)
1214
from executorch.backends.arm.operators.operator_validation_utils import (
1315
adjust_pooling_pad_if_needed,
1416
)
@@ -37,8 +39,8 @@ def get_decomposition(op) -> tuple:
3739
raise RuntimeError(f"Can't get avg_pool2d decomposition for op {op}")
3840

3941

40-
class DecomposeAvgPool2d(ArmPass):
41-
_passes_required_after: Set[Type[ExportPass]] = {ComputeConstantOpsAOT}
42+
class DecomposeAvgPool2dPass(ArmPass):
43+
_passes_required_after: Set[Type[ExportPass]] = {ComputeConstantOpsAOTPass}
4244

4345
def call_operator(self, op, args, kwargs, meta):
4446
if op not in (edge_div_ops + aten_div_ops):

‎backends/arm/_passes/decompose_batch_norm_no_stats.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
import torch
1111
from executorch.backends.arm._passes import ArmPass
1212
from executorch.backends.arm._passes.arm_pass_utils import create_node
13-
from executorch.backends.arm._passes.fuse_constant_ops_pass import ComputeConstantOpsAOT
13+
from executorch.backends.arm._passes.fuse_constant_ops_pass import (
14+
ComputeConstantOpsAOTPass,
15+
)
1416

1517
from executorch.backends.arm._passes.insert_table_ops import InsertTableOpsPass
1618
from executorch.exir.dialects._ops import ops as exir_ops
@@ -37,7 +39,7 @@ class DecomposeBatchNormNoStatsPass(ArmPass):
3739
"""
3840

3941
_passes_required_after: Set[Type[ExportPass]] = {
40-
ComputeConstantOpsAOT,
42+
ComputeConstantOpsAOTPass,
4143
InsertTableOpsPass,
4244
}
4345

‎backends/arm/_passes/decompose_expm1_pass.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
from typing import Set, Type
77

88
from executorch.backends.arm._passes import ArmPass
9-
from executorch.backends.arm._passes.convert_int_pow_to_mul import ConvertIntPowToMuls
109
from executorch.backends.arm._passes.decompose_div_pass import DecomposeDivPass
10+
from executorch.backends.arm._passes.decompose_int_pow_pass import DecomposeIntPowPass
1111
from executorch.backends.arm._passes.insert_table_ops import InsertTableOpsPass
1212
from executorch.backends.arm._passes.match_arg_dtype_pass import MatchArgDtypePass
1313
from executorch.backends.arm._passes.match_arg_ranks_pass import MatchArgRanksPass
@@ -80,7 +80,7 @@ class DecomposeExpm1Pass(ArmPass):
8080
"""
8181

8282
_passes_required_after: Set[Type[ExportPass]] = {
83-
ConvertIntPowToMuls,
83+
DecomposeIntPowPass,
8484
InsertTableOpsPass,
8585
DecomposeDivPass,
8686
ReplaceScalarWithTensorByProfilePass,

0 commit comments

Comments
 (0)