Unify reorder passes.

Differential Revision: D85264577

Pull Request resolved: #15561

Author: eigen-k

backends/cadence/aot/reorder_ops.py

@@ -820,9 +820,7 @@ def call(self, graph_module: torch.fx.GraphModule) -> PassResult:
         return super().call(self.graph_module)
 
 
-# The following class consolidates functions to reoder ops (i.e., either hoist
-# or sink some ops in the graph).
-class CadenceReorderOpsInGraph:
+class CommonReorderPasses:
     passes = [
         # Hoist/sink nodes closer to their SSA def/use
         HoistOpsCloserToDefPass,
@@ -832,6 +830,13 @@ class CadenceReorderOpsInGraph:
         # nodes closer to their def/use.
         AdvanceQuantizeOpAboveDefChainPass,
         PostponeDequantizeOpBelowUseChainPass,
+    ]
+
+
+# The following class consolidates functions to reoder ops (i.e., either hoist
+# or sink some ops in the graph).
+class CadenceReorderOpsInGraph:
+    passes = CommonReorderPasses.passes + [
         # These passes work on branches instead of linear chains to advance
         # quantize op beyond their def.
         AdvanceQuantizeOpAboveDefInBranchPass,