Skip to content

Arm backend: Don't execute eagerly with sym-ints #19638

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

Merged
oscarandersson8218 merged 1 commit into from
May 19, 2026
+37 −28
Merged

Arm backend: Don't execute eagerly with sym-ints #19638

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
13 changes: 13 additions & 0 deletions backends/arm/_passes/arm_pass_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,3 +413,16 @@ def to_2tuple(value):
if len(value) == 1:
return (value[0], value[0])
return tuple(value)


def permute_fake_tensor_metadata(
fake_tensor: FakeTensor, permute_dims: tuple[int, ...]
) -> FakeTensor:
permuted_shape = tuple(fake_tensor.shape[dim] for dim in permute_dims)
meta_tensor = torch.empty(
permuted_shape,
dtype=fake_tensor.dtype,
device="meta",
requires_grad=fake_tensor.requires_grad,
)
return FakeTensor(fake_tensor.fake_mode, meta_tensor, fake_tensor.fake_device)
9 changes: 5 additions & 4 deletions backends/arm/_passes/normalize_delegate_io_layout_pass.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
create_node,
get_first_fake_tensor,
is_param_node,
permute_fake_tensor_metadata,
)
from executorch.exir import ExportedProgram
from executorch.exir.dialects._ops import ops as exir_ops
Expand Down Expand Up @@ -63,8 +64,8 @@ def _normalize_input_layout(self, graph_module: torch.fx.GraphModule) -> bool:
args=(node, list(transpose_perm)),
from_node=node,
)
permute_node.meta["val"] = exir_ops.edge.aten.permute_copy.default(
node.meta["val"], list(transpose_perm)
permute_node.meta["val"] = permute_fake_tensor_metadata(
get_first_fake_tensor(node), transpose_perm
)

users = [user for user in node.users if user != permute_node]
Expand All @@ -91,8 +92,8 @@ def _rewrite_output_arg(
args=(arg, list(dim_order)),
from_node=arg,
)
permute_node.meta["val"] = exir_ops.edge.aten.permute_copy.default(
output_fake, list(dim_order)
permute_node.meta["val"] = permute_fake_tensor_metadata(
output_fake, dim_order
)

return permute_node, True
Expand Down
35 changes: 15 additions & 20 deletions backends/arm/_passes/rewrite_conv_pass.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
get_first_fake_tensor,
get_param_tensor,
is_persistent_buffer,
permute_fake_tensor_metadata,
)
from executorch.backends.arm._passes.fold_qdq_with_annotated_qparams_pass import (
get_input_qparams,
Expand Down Expand Up @@ -421,17 +422,17 @@ def call(self, graph_module: torch.fx.GraphModule) -> PassResult: # noqa: C901
args=(x, list(pre_permute_dims)),
from_node=node,
)
x.meta["val"] = exir_ops.edge.aten.permute_copy.default(
input_fake_tensor, list(pre_permute_dims)
input_tensor_for_tosa_fake = permute_fake_tensor_metadata(
input_fake_tensor, pre_permute_dims
)
x.meta["val"] = input_tensor_for_tosa_fake
weight = self._rewrite_weight(
graph_module,
weight,
node,
permute_dims=OHWI_ORDER,
name_suffix="ohwi",
)
input_tensor_for_tosa_fake = input_fake_tensor.permute(pre_permute_dims)
weight_fake_tensor = get_first_fake_tensor(weight)
conv_args = (
x,
Expand Down Expand Up @@ -471,19 +472,17 @@ def call(self, graph_module: torch.fx.GraphModule) -> PassResult: # noqa: C901
args=(x, list(pre_permute_dims)),
from_node=node,
)
x.meta["val"] = exir_ops.edge.aten.permute_copy.default(
input_fake_tensor, list(pre_permute_dims)
input_tensor_for_tosa_fake = permute_fake_tensor_metadata(
input_fake_tensor, pre_permute_dims
)
x.meta["val"] = input_tensor_for_tosa_fake
weight = self._rewrite_weight(
graph_module,
weight,
node,
permute_dims=ODHWI_ORDER,
name_suffix="odhwi",
)
input_tensor_for_tosa_fake = input_fake_tensor.permute(
pre_permute_dims
)
weight_fake_tensor = get_first_fake_tensor(weight)
elif self._is_depthwise_conv2d(node):
target_op = exir_ops.backend.tosa.DEPTHWISE_CONV2D.default
Expand All @@ -496,9 +495,10 @@ def call(self, graph_module: torch.fx.GraphModule) -> PassResult: # noqa: C901
args=(x, list(pre_permute_dims)),
from_node=node,
)
x.meta["val"] = exir_ops.edge.aten.permute_copy.default(
input_fake_tensor, list(pre_permute_dims)
input_tensor_for_tosa_fake = permute_fake_tensor_metadata(
input_fake_tensor, pre_permute_dims
)
x.meta["val"] = input_tensor_for_tosa_fake
kh, kw = weight_shape[2], weight_shape[3]
in_channels = input_fake_tensor.shape[1]
m_length = weight_shape[0] // in_channels
Expand All @@ -510,9 +510,6 @@ def call(self, graph_module: torch.fx.GraphModule) -> PassResult: # noqa: C901
name_suffix="hwicm",
reshape_dims=(kh, kw, in_channels, m_length),
)
input_tensor_for_tosa_fake = input_fake_tensor.permute(
pre_permute_dims
)
weight_fake_tensor = get_first_fake_tensor(weight)
else:
target_op = exir_ops.backend.tosa.CONV2D.default
Expand All @@ -525,19 +522,17 @@ def call(self, graph_module: torch.fx.GraphModule) -> PassResult: # noqa: C901
args=(x, list(pre_permute_dims)),
from_node=node,
)
x.meta["val"] = exir_ops.edge.aten.permute_copy.default(
input_fake_tensor, list(pre_permute_dims)
input_tensor_for_tosa_fake = permute_fake_tensor_metadata(
input_fake_tensor, pre_permute_dims
)
x.meta["val"] = input_tensor_for_tosa_fake
weight = self._rewrite_weight(
graph_module,
weight,
node,
permute_dims=NHWC_ORDER,
name_suffix="ohwi",
)
input_tensor_for_tosa_fake = input_fake_tensor.permute(
pre_permute_dims
)
weight_fake_tensor = get_first_fake_tensor(weight)

conv_args = (
Expand Down Expand Up @@ -612,8 +607,8 @@ def call(self, graph_module: torch.fx.GraphModule) -> PassResult: # noqa: C901
TosaSpecialDtype.meta_key()
):
node_replacement.meta[TosaSpecialDtype.meta_key()] = special_dtype
node_replacement.meta["val"] = exir_ops.edge.aten.permute_copy.default(
node_replacement_fake_tensor, list(post_permute_dims)
node_replacement.meta["val"] = permute_fake_tensor_metadata(
node_replacement_fake_tensor, post_permute_dims
)

node.replace_all_uses_with(node_replacement)
Expand Down
8 changes: 4 additions & 4 deletions backends/arm/_passes/rewrite_upsample.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
create_node,
create_shape_node,
get_first_fake_tensor,
permute_fake_tensor_metadata,
)
from executorch.backends.arm.tosa.mapping import TosaSpecialDtype
from executorch.exir.dialects._ops import ops as exir_ops
Expand Down Expand Up @@ -196,7 +197,7 @@ def call(self, graph_module):
args=(x, list(self._NHWC_ORDER)),
from_node=node,
)
pre_permute.meta["val"] = exir_ops.edge.aten.permute_copy.default(
pre_permute.meta["val"] = permute_fake_tensor_metadata(
get_first_fake_tensor(x), list(self._NHWC_ORDER)
)

Expand Down Expand Up @@ -255,9 +256,8 @@ def call(self, graph_module):
args=(node_replacement, list(self._NHWC_INVERSE_ORDER)),
from_node=node,
)
post_permute.meta["val"] = exir_ops.edge.aten.permute_copy.default(
node_replacement_fake,
list(self._NHWC_INVERSE_ORDER),
post_permute.meta["val"] = permute_fake_tensor_metadata(
node_replacement_fake, self._NHWC_INVERSE_ORDER
)
node.replace_all_uses_with(post_permute)
graph_module.graph.erase_node(node)
Expand Down
Loading