From 906d85b414941fe3ff25adc89aeb6ced13a8b3e5 Mon Sep 17 00:00:00 2001
From: Ethan Ng <ethann@meta.com>
Date: Fri, 19 Sep 2025 13:22:14 -0700
Subject: [PATCH] Update ReplaceConvolutionOptionalArgsWithConcreteArgsPass to
 work with cadence.convolution (#14445)

Summary:

ReplaceConvolutionOptionalArgsWithConcreteArgsPass runs after ReplaceAtenConvolutionWithCadenceConvolutionPass so ReplaceConvolutionOptionalArgsWithConcreteArgsPass should be configured to run on a cadence.convolution not aten.convolution

Reviewed By: zonglinpeng

Differential Revision: D82842567
---
 backends/cadence/aot/replace_ops.py                   | 4 ++--
 backends/cadence/aot/tests/test_replace_ops_passes.py | 9 +++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/backends/cadence/aot/replace_ops.py b/backends/cadence/aot/replace_ops.py
index 3d5bd493cfe..bf0657315a3 100644
--- a/backends/cadence/aot/replace_ops.py
+++ b/backends/cadence/aot/replace_ops.py
@@ -438,11 +438,11 @@ class ReplaceConvolutionOptionalArgsWithConcreteArgsPass(ExportPass):
     """
 
     def call_operator(self, op, args, kwargs, meta):
-        if get_edge_overload_packet(op) != exir_ops.edge.aten.convolution:
+        if get_edge_overload_packet(op) != exir_ops.edge.cadence.convolution:
             return super().call_operator(op, args, kwargs, meta)
 
         # Check if the bias is already concrete
-        assert len(args) == 9
+        assert len(args) == 8
         if args[2] is not None:
             return super().call_operator(op, args, kwargs, meta)
 
diff --git a/backends/cadence/aot/tests/test_replace_ops_passes.py b/backends/cadence/aot/tests/test_replace_ops_passes.py
index 8f1f2e86deb..d6dee4e7eab 100644
--- a/backends/cadence/aot/tests/test_replace_ops_passes.py
+++ b/backends/cadence/aot/tests/test_replace_ops_passes.py
@@ -455,8 +455,6 @@ def test_replace_convolution_optional_args_with_concrete_args(
         bias_enabled: bool = True,
         channel_last: bool = False,
     ) -> None:
-        transposed = True
-        output_padding = [0]
         groups = in_channels if depthwise else 1
         builder = GraphBuilder()
         x = builder.placeholder("x", torch.randn(*shape, dtype=torch.float32))
@@ -477,7 +475,7 @@ def test_replace_convolution_optional_args_with_concrete_args(
                 args=(x, [0, 2, 1]),
             )
         convolution = builder.call_operator(
-            op=exir_ops.edge.aten.convolution.default,
+            op=exir_ops.edge.cadence.convolution.default,
             args=(
                 x,
                 weights,
@@ -485,9 +483,8 @@ def test_replace_convolution_optional_args_with_concrete_args(
                 [stride],
                 [padding],
                 [dilation],
-                transposed,
-                output_padding,
                 groups,
+                False,
             ),
         )
         if channel_last:
@@ -504,7 +501,7 @@ def test_replace_convolution_optional_args_with_concrete_args(
             1,
         )
         self.assertEqual(
-            count_node(graph_after_passes, exir_ops.edge.aten.convolution.default),
+            count_node(graph_after_passes, exir_ops.edge.cadence.convolution.default),
             1,
         )