Add RemoveAssert pass to remove _assert_tensor_metadata nodes

Differential Revision: D67057219

Pull Request resolved: #7277

Author: yushangdi

exir/passes/remove_graph_asserts_pass.py

@@ -29,6 +29,7 @@ def call(self, graph_module: torch.fx.GraphModule) -> PassResult:
                         torch.ops.aten._assert_scalar.default,
                         torch.ops.aten.sym_constrain_range_for_size.default,
                         torch.ops.aten.sym_constrain_range.default,
+                        torch.ops.aten._assert_tensor_metadata.default,
                     )
                 ):
                     module.graph.erase_node(node)
@@ -37,3 +38,25 @@ def call(self, graph_module: torch.fx.GraphModule) -> PassResult:
             module.graph.eliminate_dead_code()
 
         return PassResult(graph_module, True)
+
+
+class RemoveNonCoreAtenOpGraphAssertsPass(PassBase):
+    """
+    Remove assert ops from the graph that're not Aten Canonical.
+    """
+
+    def call(self, graph_module: torch.fx.GraphModule) -> PassResult:
+        for module in graph_module.modules():
+            if not isinstance(module, torch.fx.GraphModule):
+                continue
+
+            for node in module.graph.nodes:
+                if node.op == "call_function" and (
+                    node.target in (torch.ops.aten._assert_tensor_metadata.default,)
+                ):
+                    module.graph.erase_node(node)
+
+            module.recompile()
+            module.graph.eliminate_dead_code()
+
+        return PassResult(graph_module, True)

exir/program/_program.py

@@ -40,7 +40,10 @@
 from executorch.exir.passes.normalize_view_copy_base_pass import (
     NormalizeViewCopyBasePass,
 )
-from executorch.exir.passes.remove_graph_asserts_pass import RemoveGraphAssertsPass
+from executorch.exir.passes.remove_graph_asserts_pass import (
+    RemoveGraphAssertsPass,
+    RemoveNonCoreAtenOpGraphAssertsPass,
+)
 from executorch.exir.passes.remove_mixed_type_operators import RemoveMixedTypeOperators
 from executorch.exir.passes.replace_aten_with_edge_pass import aten_to_edge
 from executorch.exir.passes.replace_view_copy_with_view_pass import (
@@ -722,13 +725,20 @@ def _generate_edge_program(
     program: ExportedProgram,
     ops_set_to_not_decompose: Optional[List[torch._ops.OpOverload]] = None,
 ) -> ExportedProgram:
+
+    # Remove invalid assert ops, such as _assert_tensor_metadata
+    gm = program.graph_module
+    gm_res = RemoveNonCoreAtenOpGraphAssertsPass()(gm)
+    assert gm_res is not None
+    gm = gm_res.graph_module
+
     if config._check_ir_validity:
         try:
             EXIRATenDialectVerifier(
                 edge_compile_config=config,
                 class_only=False,
                 exception_list=ops_set_to_not_decompose,
-            )(program.graph_module)
+            )(gm)
         except ExportError as e:
             logging.info(f"Input program {name} is not in ATen dialect.")
             raise e
@@ -745,7 +755,6 @@ def _generate_edge_program(
         if not config._skip_dim_order:
             passes.append(MemoryFormatOpsPass())
 
-    gm = program.graph_module
     for p in passes:
         gm_res = p(gm)
         assert gm_res is not None