Skip to content

Commit 4598f15

Browse files
authored
Replace pass registry with explicit mode pipelines (pytorch#21724)
Differential Revision: D115453092 Pull Request resolved: pytorch#21724
1 parent e7ca2b2 commit 4598f15

16 files changed

Lines changed: 209 additions & 644 deletions

‎backends/cadence/aot/BUCK‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -170,18 +170,6 @@ fbcode_target(_kind = executorch_generated_lib,
170170
],
171171
)
172172

173-
fbcode_target(_kind = python_unittest,
174-
name = "test_pass_filter",
175-
srcs = [
176-
"tests/test_pass_filter.py",
177-
],
178-
typing = True,
179-
deps = [
180-
":pass_utils",
181-
"//executorch/exir:pass_base",
182-
],
183-
)
184-
185173
fbcode_target(_kind = python_unittest,
186174
name = "test_pass_utils",
187175
srcs = [

‎backends/cadence/aot/compiler.py‎

Lines changed: 43 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
# pyre-strict
88

99
import logging
10+
import warnings
1011
from pathlib import Path
1112
from typing import Optional
1213

@@ -45,12 +46,7 @@
4546
from torch.export.exported_program import ExportedProgram
4647
from torchao.quantization.pt2e.quantize_pt2e import convert_pt2e
4748

48-
from .pass_utils import (
49-
CompileMode,
50-
EdgePassesConfig,
51-
normalize_compile_mode,
52-
resolve_opt_level,
53-
)
49+
from .pass_utils import CompileMode, EdgePassesConfig
5450
from .passes import apply_exir_ops_passes, apply_torch_ops_passes
5551
from .utils import print_ops_info
5652

@@ -366,19 +362,47 @@ def quantize_and_export_to_edge(
366362
)
367363

368364

365+
_DEPRECATED_OPT_LEVEL_TO_MODE: dict[int, CompileMode] = {
366+
0: CompileMode.MINIMAL,
367+
1: CompileMode.DEFAULT,
368+
2: CompileMode.DEFAULT,
369+
3: CompileMode.DEFAULT,
370+
4: CompileMode.SIZE,
371+
}
372+
373+
374+
def _resolve_mode(mode: CompileMode, opt_level: Optional[int]) -> CompileMode:
375+
if opt_level is None:
376+
return mode
377+
if opt_level not in _DEPRECATED_OPT_LEVEL_TO_MODE:
378+
raise ValueError(
379+
f"opt_level={opt_level} is not a known optimization level; "
380+
f"use mode=CompileMode.{{MINIMAL,DEFAULT,SIZE}} instead."
381+
)
382+
resolved = _DEPRECATED_OPT_LEVEL_TO_MODE[opt_level]
383+
warnings.warn(
384+
f"opt_level is deprecated; pass mode=CompileMode.{resolved.name} instead. "
385+
f"Note that opt_level={opt_level} now maps to CompileMode.{resolved.name}, "
386+
"which runs every graph optimization (the former O3) rather than the "
387+
"former O1/O2 subsets.",
388+
DeprecationWarning,
389+
stacklevel=3,
390+
)
391+
return resolved
392+
393+
369394
def _lower_ep_to_cadence(
370395
program: ExportedProgram,
371396
dump_graphs: bool = False,
372-
mode: CompileMode | int | None = None,
397+
mode: CompileMode = CompileMode.DEFAULT,
373398
edge_passes_config: Optional[EdgePassesConfig] = None,
374-
opt_level: Optional[int] = None,
375399
) -> EdgeProgramManager:
376400
"""
377401
Lower an existing ExportedProgram to edge IR and apply frontend optimization passes.
378402
"""
379403
edge_prog_manager = _lower_ep_to_edge(program, dump_graphs=dump_graphs)
380404
cadence_prog_manager = apply_exir_ops_passes(
381-
resolve_opt_level(mode, opt_level), edge_prog_manager, edge_passes_config
405+
mode, edge_prog_manager, edge_passes_config
382406
)
383407
return cadence_prog_manager
384408

@@ -387,13 +411,13 @@ def export_to_cadence(
387411
model: torch.nn.Module,
388412
inputs: tuple[object, ...],
389413
dump_graphs: bool = False,
390-
mode: CompileMode | int | None = None,
414+
mode: CompileMode = CompileMode.DEFAULT,
391415
edge_passes_config: Optional[EdgePassesConfig] = None,
392416
opt_level: Optional[int] = None,
393417
) -> EdgeProgramManager:
394418
edge_prog_manager = export_to_edge(model, inputs, dump_graphs=dump_graphs)
395419
cadence_prog_manager = apply_exir_ops_passes(
396-
resolve_opt_level(mode, opt_level), edge_prog_manager, edge_passes_config
420+
_resolve_mode(mode, opt_level), edge_prog_manager, edge_passes_config
397421
)
398422
return cadence_prog_manager
399423

@@ -402,7 +426,7 @@ def quantize_and_export_to_cadence(
402426
model: torch.nn.Module,
403427
inputs: tuple[object, ...],
404428
dump_graphs: bool = False,
405-
mode: CompileMode | int | None = None,
429+
mode: CompileMode = CompileMode.DEFAULT,
406430
edge_passes_config: Optional[EdgePassesConfig] = None,
407431
opt_level: Optional[int] = None,
408432
) -> EdgeProgramManager:
@@ -414,8 +438,7 @@ def quantize_and_export_to_cadence(
414438

415439
return _lower_ep_to_cadence(
416440
quantized_model,
417-
mode=mode,
418-
opt_level=opt_level,
441+
mode=_resolve_mode(mode, opt_level),
419442
dump_graphs=dump_graphs,
420443
edge_passes_config=edge_passes_config,
421444
)
@@ -425,7 +448,7 @@ def export_to_executorch_gen_etrecord(
425448
model: torch.nn.Module,
426449
inputs: tuple[object, ...],
427450
output_dir: Optional[str] = None,
428-
mode: CompileMode | int | None = None,
451+
mode: CompileMode = CompileMode.DEFAULT,
429452
mem_algo: int = 0,
430453
alloc_graph_input: bool = True,
431454
alloc_graph_output: bool = True,
@@ -437,8 +460,7 @@ def export_to_executorch_gen_etrecord(
437460
return _lower_ep_to_cadence_gen_etrecord(
438461
ep,
439462
output_dir=output_dir,
440-
mode=mode,
441-
opt_level=opt_level,
463+
mode=_resolve_mode(mode, opt_level),
442464
mem_algo=mem_algo,
443465
alloc_graph_input=alloc_graph_input,
444466
alloc_graph_output=alloc_graph_output,
@@ -453,18 +475,15 @@ def export_to_executorch_gen_etrecord(
453475
def _lower_ep_to_cadence_gen_etrecord(
454476
ep: ExportedProgram,
455477
output_dir: Optional[str] = None,
456-
mode: CompileMode | int | None = None,
478+
mode: CompileMode = CompileMode.DEFAULT,
457479
mem_algo: int = 0,
458480
alloc_graph_input: bool = True,
459481
alloc_graph_output: bool = True,
460482
memory_config: Optional[MemoryConfig] = None,
461483
dump_graphs: bool = False,
462-
opt_level: Optional[int] = None,
463484
) -> ExecutorchProgramManager:
464-
normalized_mode = normalize_compile_mode(mode, opt_level)
465-
resolved_opt_level = resolve_opt_level(normalized_mode)
466485
edge_prog_manager = _lower_ep_to_edge(ep, dump_graphs)
467-
cadence_prog_manager = apply_exir_ops_passes(resolved_opt_level, edge_prog_manager)
486+
cadence_prog_manager = apply_exir_ops_passes(mode, edge_prog_manager)
468487

469488
# Print some information to terminal
470489
print_ops_info(
@@ -477,7 +496,7 @@ def _lower_ep_to_cadence_gen_etrecord(
477496

478497
memory_planning_pass = CadenceMemoryPlanning(
479498
memory_config,
480-
mode=normalized_mode,
499+
mode=mode,
481500
mem_algo=mem_algo,
482501
alloc_graph_input=alloc_graph_input,
483502
alloc_graph_output=alloc_graph_output,
@@ -497,7 +516,7 @@ def _lower_ep_to_cadence_gen_etrecord(
497516
print_memory_planning_info(
498517
exec_prog,
499518
memory_config,
500-
normalized_mode,
519+
mode,
501520
alloc_graph_input,
502521
alloc_graph_output,
503522
)

‎backends/cadence/aot/decompose_ops.py‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,12 @@
1313

1414
from typing import Dict
1515

16-
from executorch.backends.cadence.aot.pass_utils import (
17-
CadencePassAttribute,
18-
register_cadence_pass,
19-
)
2016
from executorch.exir.dialects._ops import ops as exir_ops
2117
from executorch.exir.dialects.edge._ops import EdgeOpOverload
2218
from executorch.exir.pass_base import ExportPass, NodeMetadata, ProxyValue
2319
from torch.fx.node import Argument
2420

2521

26-
@register_cadence_pass(CadencePassAttribute(opt_level=0))
2722
class DecomposeAtenApproxGeluPass(ExportPass):
2823
"""
2924
Decompose the aten gelu op with an approximate arg to a series of simpler ops

‎backends/cadence/aot/fuse_ops.py‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@
2626
get_zero_point,
2727
)
2828
from executorch.backends.cadence.aot.pass_utils import (
29-
CadencePassAttribute,
3029
get_arg,
3130
HierarchicalInplacePassInterface,
32-
register_cadence_pass,
3331
RemoveOrReplacePassInterface,
3432
set_arg,
3533
)
@@ -61,7 +59,6 @@ def get_tensor_arg(node: torch.fx.Node, arg_name: str) -> torch.Tensor:
6159
return tensor
6260

6361

64-
@register_cadence_pass(CadencePassAttribute(opt_level=1))
6562
class FuseMMWithAdd(RemoveOrReplacePassInterface):
6663
"""
6764
Fuses mm -> add patterns into addmm.
@@ -212,7 +209,6 @@ def maybe_remove_or_replace(self, node: torch.fx.Node) -> bool:
212209
return True
213210

214211

215-
@register_cadence_pass(CadencePassAttribute(opt_level=1))
216212
class FuseBatchNormWithConv(RemoveOrReplacePassInterface):
217213
"""
218214
This pass fuses a conv op with batchnorm if the following two conditions
@@ -361,7 +357,6 @@ def maybe_remove_or_replace(self, node: torch.fx.Node) -> bool:
361357
return True
362358

363359

364-
@register_cadence_pass(CadencePassAttribute(opt_level=1))
365360
class FuseQuantizedBatchNormWithConv(RemoveOrReplacePassInterface):
366361
"""
367362
This pass fuses a quantized::conv op with quantized::batchnorm if the
@@ -589,17 +584,14 @@ def maybe_remove_or_replace(self, node: torch.fx.Node) -> bool:
589584
return True
590585

591586

592-
@register_cadence_pass(CadencePassAttribute(opt_level=1))
593587
class FuseCascadedTransposeOrPermuteOps(_SharedFuseCascadedTransposeOrPermuteOps):
594588
pass
595589

596590

597-
@register_cadence_pass(CadencePassAttribute(opt_level=1))
598591
class FuseCascadedViewOps(_SharedFuseCascadedViewOps):
599592
pass
600593

601594

602-
@register_cadence_pass(CadencePassAttribute(opt_level=1))
603595
class FuseQuantDequantToRequantizePass(FuseOpPairsAcrossBranchesPass):
604596
"""
605597
Fuse dequantize-quantize op pairs to a single requantize op.
@@ -741,7 +733,6 @@ def call(self, graph_module: torch.fx.GraphModule) -> PassResult:
741733
return PassResult(graph_module, False)
742734

743735

744-
@register_cadence_pass(CadencePassAttribute(opt_level=1))
745736
class FuseMulScalarIntoDequantPass(RemoveOrReplacePassInterface):
746737
"""
747738
Looks for the pattern where aten.mul.Scalar is multiplying the
@@ -791,7 +782,6 @@ def maybe_remove_or_replace(self, node: torch.fx.Node) -> bool:
791782
return True
792783

793784

794-
@register_cadence_pass(CadencePassAttribute(opt_level=1))
795785
class FuseMulTensorIntoQuantPass(RemoveOrReplacePassInterface):
796786
"""
797787
Looks for the pattern where aten.mul.Tensor is followed by quant node.
@@ -876,7 +866,6 @@ def maybe_remove_or_replace(self, node: torch.fx.Node) -> bool:
876866
return True
877867

878868

879-
@register_cadence_pass(CadencePassAttribute(opt_level=1))
880869
class FuseMulTensorIntoDequantPass(RemoveOrReplacePassInterface):
881870
"""
882871
Looks for the pattern where aten.mul is multiplying the outputs of dequantize
@@ -940,7 +929,6 @@ def maybe_remove_or_replace(self, node: torch.fx.Node) -> bool:
940929
return True
941930

942931

943-
@register_cadence_pass(CadencePassAttribute(opt_level=1))
944932
class FuseTransposeOrPermuteOpPairsPass(_SharedFuseTransposeOrPermuteOpPairsPass):
945933
bypass_ops: set[EdgeOpOverload] = (
946934
_SharedFuseTransposeOrPermuteOpPairsPass.bypass_ops
@@ -952,7 +940,6 @@ class FuseTransposeOrPermuteOpPairsPass(_SharedFuseTransposeOrPermuteOpPairsPass
952940
)
953941

954942

955-
@register_cadence_pass(CadencePassAttribute(opt_level=1))
956943
class FuseFullThenReshapePass(RemoveOrReplacePassInterface):
957944
"""
958945
A pass that fuses a chain of full and reshape-like operations into a single full operation.
@@ -1006,7 +993,6 @@ def maybe_remove_or_replace(self, node: torch.fx.Node) -> bool:
1006993
return True
1007994

1008995

1009-
@register_cadence_pass(CadencePassAttribute(opt_level=0))
1010996
class FuseSliceSameDimPass(RemoveOrReplacePassInterface):
1011997
"""Fuse chained slices on the same dim into a single slice.
1012998

0 commit comments

Comments
 (0)