Merge remote-tracking branch 'origin/main' into more-control

Author: denialhaag

CHANGELOG.md

@@ -18,7 +18,7 @@ This project adheres to [Semantic Versioning], with the exception that minor rel
 - ✨ Add conversions between `jeff` and QCO ([#1479], [#1548], [#1565], [#1637], [#1676], [#1706]) ([**@denialhaag**], [**@burgholzer**])
 - ✨ Add a `place-and-route` pass for mapping circuits to architectures with restricted topologies ([#1537], [#1547], [#1568], [#1581], [#1583], [#1588], [#1600], [#1664], [#1709], [#1716], [#1748]) ([**@MatthiasReumann**], [**@burgholzer**])
 - ✨ Add initial infrastructure for new QC and QCO MLIR dialects
-  ([#1264], [#1330], [#1402], [#1428], [#1430], [#1436], [#1443], [#1446], [#1464], [#1465], [#1470], [#1471], [#1472], [#1474], [#1475], [#1506], [#1510], [#1513], [#1521], [#1542], [#1548], [#1550], [#1554], [#1567], [#1569], [#1570], [#1572], [#1573], [#1580], [#1602], [#1620], [#1623], [#1624], [#1626], [#1627], [#1635], [#1638], [#1673], [#1675], [#1700], [#1717], [#1728], [#1730], [#1749])
+  ([#1264], [#1330], [#1402], [#1428], [#1430], [#1436], [#1443], [#1446], [#1464], [#1465], [#1470], [#1471], [#1472], [#1474], [#1475], [#1506], [#1510], [#1513], [#1521], [#1542], [#1548], [#1550], [#1554], [#1567], [#1569], [#1570], [#1572], [#1573], [#1580], [#1602], [#1620], [#1623], [#1624], [#1626], [#1627], [#1635], [#1638], [#1673], [#1675], [#1700], [#1717], [#1728], [#1730], [#1749], [#1762])
   ([**@burgholzer**], [**@denialhaag**], [**@taminob**], [**@DRovara**], [**@li-mingbao**], [**@Ectras**], [**@MatthiasReumann**], [**@simon1hofmann**])
 
 ### Changed
@@ -402,6 +402,7 @@ _📚 Refer to the [GitHub Release Notes](https://github.com/munich-quantum-tool
 
 <!-- PR links -->
 
+[#1762]: https://github.com/munich-quantum-toolkit/core/pull/1762
 [#1749]: https://github.com/munich-quantum-toolkit/core/pull/1749
 [#1748]: https://github.com/munich-quantum-toolkit/core/pull/1748
 [#1737]: https://github.com/munich-quantum-toolkit/core/pull/1737

mlir/include/mlir/Dialect/QCO/QCOUtils.h

@@ -34,9 +34,10 @@ removeInversePairOneTargetZeroParameter(OpType op, PatternRewriter& rewriter) {
     return failure();
   }
 
-  // Unlink both operations
-  rewriter.replaceOp(op, op.getInputQubits());
-  rewriter.replaceOp(nextOp, nextOp.getInputQubits());
+  // Erase both operations
+  rewriter.replaceAllUsesWith(nextOp->getResult(0), op.getInputQubit(0));
+  rewriter.eraseOp(nextOp);
+  rewriter.eraseOp(op);
 
   return success();
 }
@@ -64,9 +65,11 @@ removeInversePairTwoTargetZeroParameter(OpType op, PatternRewriter& rewriter) {
     return failure();
   }
 
-  // Unlink both operations
-  rewriter.replaceOp(op, op.getInputQubits());
-  rewriter.replaceOp(nextOp, nextOp.getInputQubits());
+  // Erase both operations
+  rewriter.replaceAllUsesWith(nextOp->getResults(),
+                              {op.getInputQubit(0), op.getInputQubit(1)});
+  rewriter.eraseOp(nextOp);
+  rewriter.eraseOp(op);
 
   return success();
 }
@@ -96,9 +99,11 @@ removeTwoTargetZeroParameterPairWithSwappedTargets(OpType op,
     return failure();
   }
 
-  // Unlink both operations
-  rewriter.replaceOp(op, op.getInputQubits());
-  rewriter.replaceOp(nextOp, nextOp.getInputQubits());
+  // Erase both operations
+  rewriter.replaceAllUsesWith(nextOp->getResults(),
+                              {op.getInputQubit(1), op.getInputQubit(0)});
+  rewriter.eraseOp(nextOp);
+  rewriter.eraseOp(op);
 
   return success();
 }
@@ -196,6 +201,7 @@ LogicalResult mergeTwoTargetOneParameter(OpType op, PatternRewriter& rewriter) {
 
   // Replace the second operation with the result of the first operation
   rewriter.replaceOp(nextOp, op.getResults());
+
   return success();
 }
 
@@ -236,6 +242,7 @@ mergeTwoTargetOneParameterWithSwappedTargets(OpType op,
 
   // nextOp results correspond to swapped operands, so swap replacements too
   rewriter.replaceOp(nextOp, {op.getOutputQubit(1), op.getOutputQubit(0)});
+
   return success();
 }