Add CommutativeOptimization to transpiler pipeline

qiskit/transpiler/preset_passmanagers/builtin_plugins.py

@@ -42,6 +42,7 @@
 from qiskit.transpiler.passes.optimization import (
     Optimize1qGatesDecomposition,
     CommutativeCancellation,
+    CommutativeOptimization,
     ConsolidateBlocks,
     InverseCancellation,
     RemoveIdentityEquivalent,
@@ -152,11 +153,15 @@ def pass_manager(self, pass_manager_config, optimization_level=None) -> PassMana
                     ContractIdleWiresInControlFlow(),
                 ]
             )
-            init.append(CommutativeCancellation())
 
-            # We do not want to consolidate blocks for a Clifford+T basis set,
-            # since this involves resynthesizing 2-qubit unitaries.
-            if not pass_manager_config._is_clifford_t:
+            # For continuous basis sets, we now CommutativeOptimization instead of
+            # CommutativeCancellation. For Clifford+T transpilation, we still use
+            # CommutativeCancellation and disable consolidating
+            # blocks as this involves resynthesizing 2-qubit unitaries.
+            if pass_manager_config._is_clifford_t:
+                init.append(CommutativeCancellation())
+            else:
+                init.append(CommutativeOptimization())
                 init.append(ConsolidateBlocks())
 
             # If approximation degree is None that indicates a request to approximate up to the
@@ -521,27 +526,27 @@ def _opt_control(property_set):
 
             # Basic steps for optimization level 2:
             # 1. RemoveIdentityEquivalent
-            # 2. Optimize1qGatesDecomposition
-            # 3. CommutativeCancellation
+            # 2. CommutativeOptimization
+            # 3. Optimize1qGatesDecomposition
             elif optimization_level == 2:
                 _opt = [
                     RemoveIdentityEquivalent(
                         approximation_degree=pass_manager_config.approximation_degree,
                         target=pass_manager_config.target,
                     ),
+                    CommutativeOptimization(),
                     Optimize1qGatesDecomposition(
                         basis=pass_manager_config.basis_gates, target=pass_manager_config.target
                     ),
-                    CommutativeCancellation(target=pass_manager_config.target),
                     ContractIdleWiresInControlFlow(),
                 ]
 
             # Basic steps for optimization level 3:
             # 1. ConsolidateBlocks
             # 2. UnitarySynthesis
             # 3. RemoveIdentityEquivalent
-            # 4. Optimize1qGatesDecomposition
-            # 5. CommutativeCancellation
+            # 4. CommutativeOptimization
+            # 5. Optimize1qGatesDecomposition
             elif optimization_level == 3:
                 _opt = [
                     ConsolidateBlocks(
@@ -561,10 +566,10 @@ def _opt_control(property_set):
                         approximation_degree=pass_manager_config.approximation_degree,
                         target=pass_manager_config.target,
                     ),
+                    CommutativeOptimization(),
                     Optimize1qGatesDecomposition(
                         basis=pass_manager_config.basis_gates, target=pass_manager_config.target
                     ),
-                    CommutativeCancellation(target=pass_manager_config.target),
                     ContractIdleWiresInControlFlow(),
                 ]
 

releasenotes/notes/add-comm-opt-to-pipeline-28193163c52489f4.yaml

@@ -0,0 +1,7 @@
+---
+features_transpiler:
+  - |
+    The default compilation pipeline for continuous basis sets now uses
+    :class:`.CommutativeOptimization` instead of :class:`.CommutativeCancellation`,
+    which is relevant for optimization levels 2 and 3. This change should
+    yield higher-quality circuits at similar runtimes.