Skip to content

Handle rank-changing views in RemovePermutesAroundElementwiseOps #19538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mcremon-meta wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Handle rank-changing views in RemovePermutesAroundElementwiseOps #19538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions backends/arm/_passes/arm_pass_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,6 @@
from executorch.backends.transforms.fuse_cascaded_transpose_or_permute_ops import (
FuseCascadedTransposeOrPermuteOps,
)
from executorch.backends.transforms.postpone_permute_below_squeeze_view import (
PostponePermuteOpBelowSqueezeOrUnsqueezeLikeView,
)

from executorch.exir import ExportedProgram
from executorch.exir.pass_base import ExportPass
from executorch.exir.pass_manager import PassManager
Expand Down Expand Up @@ -538,7 +534,6 @@ def _tosa_pipeline(
RewritePadPass(),
FuseViewCopyTransformPass(),
RemovePermutesAroundElementwiseTosaOps(),
PostponePermuteOpBelowSqueezeOrUnsqueezeLikeView(),
FuseCascadedTransposeOrPermuteOps(),
ConvertPermuteSingletonToViewPass(),
RewriteHighRankSingletonPermutePass(),
Expand Down
16 changes: 9 additions & 7 deletions backends/arm/_passes/remove_permutes_around_elementwise_tosa_ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@


class RemovePermutesAroundElementwiseTosaOps(RemovePermutesAroundElementwiseOps):
permutable_ops = {
*RemovePermutesAroundElementwiseOps.permutable_ops,
*TableOps.unary_table_ops.keys(),
*TableOps.special_table_ops,
exir_ops.backend.tosa.RESCALE.default,
exir_ops.backend.tosa.TABLE.default,
}
def __init__(self) -> None:
super().__init__(
extra_permutable_ops={
*TableOps.unary_table_ops.keys(),
*TableOps.special_table_ops,
exir_ops.backend.tosa.RESCALE.default,
exir_ops.backend.tosa.TABLE.default,
}
)

def permute_subgraph(self, subgraph):
# Original function will always permute constant nodes which is wrong for table ops
Expand Down
20 changes: 10 additions & 10 deletions backends/cadence/aot/remove_ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,16 +603,16 @@ def maybe_remove_or_replace(self, node: Node) -> bool:

@register_cadence_pass(CadencePassAttribute(opt_level=2))
class RemovePermutesAroundElementwiseOps(_SharedRemovePermutesAroundElementwiseOps):
permutable_ops: set[EdgeOpOverload] = (
_SharedRemovePermutesAroundElementwiseOps.permutable_ops
| {
exir_ops.edge.cadence.quantize_per_tensor.default,
exir_ops.edge.cadence.dequantize_per_tensor.default,
exir_ops.edge.cadence.quantized_relu.per_tensor,
exir_ops.edge.cadence.requantize.per_tensor,
exir_ops.edge.cadence.quantized_add.per_tensor,
}
)
def __init__(self) -> None:
super().__init__(
extra_permutable_ops={
exir_ops.edge.cadence.quantize_per_tensor.default,
exir_ops.edge.cadence.dequantize_per_tensor.default,
exir_ops.edge.cadence.quantized_relu.per_tensor,
exir_ops.edge.cadence.requantize.per_tensor,
exir_ops.edge.cadence.quantized_add.per_tensor,
}
)


@register_cadence_pass(CadencePassAttribute(opt_level=2))
Expand Down
Loading
Loading