Merge branch 'main' into qco-if

Signed-off-by: Lukas Burgholzer <burgholzer@me.com>

Author: burgholzer

.pre-commit-config.yaml

@@ -30,7 +30,7 @@ repos:
 
   ## Check the pyproject.toml file
   - repo: https://github.com/henryiii/validate-pyproject-schema-store
-    rev: 2026.02.15
+    rev: 2026.02.21
     hooks:
       - id: validate-pyproject
         priority: 0
@@ -132,7 +132,7 @@ repos:
 
   ## Python linting using ruff
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.1
+    rev: v0.15.2
     hooks:
       - id: ruff-format
         priority: 1

CHANGELOG.md

@@ -12,8 +12,8 @@ This project adheres to [Semantic Versioning], with the exception that minor rel
 ### Added
 
 - ✨ 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], [#1513])
-  ([**@burgholzer**], [**@denialhaag**], [**@taminob**], [**@DRovara**], [**@li-mingbao**], [**@Ectras**])
+  ([#1264], [#1330], [#1402], [#1428], [#1430], [#1436], [#1443], [#1446], [#1464], [#1465], [#1470], [#1471], [#1472], [#1474], [#1475], [#1506], [#1510], [#1513], [#1521])
+  ([**@burgholzer**], [**@denialhaag**], [**@taminob**], [**@DRovara**], [**@li-mingbao**], [**@Ectras**], [**@MatthiasReumann**])
 
 ### Changed
 
@@ -327,7 +327,9 @@ _📚 Refer to the [GitHub Release Notes](https://github.com/munich-quantum-tool
 
 <!-- PR links -->
 
+[#1521]: https://github.com/munich-quantum-toolkit/core/pull/1521
 [#1513]: https://github.com/munich-quantum-toolkit/core/pull/1513
+[#1510]: https://github.com/munich-quantum-toolkit/core/pull/1510
 [#1506]: https://github.com/munich-quantum-toolkit/core/pull/1506
 [#1481]: https://github.com/munich-quantum-toolkit/core/pull/1481
 [#1475]: https://github.com/munich-quantum-toolkit/core/pull/1475

mlir/include/mlir/Conversion/QCOToQC/QCOToQC.h

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include <mlir/Pass/Pass.h> // from @llvm-project
+#include <mlir/Pass/Pass.h>
 
 namespace mlir {
 #define GEN_PASS_DECL_QCOTOQC

mlir/include/mlir/Conversion/QCToQCO/QCToQCO.h

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include <mlir/Pass/Pass.h> // from @llvm-project
+#include <mlir/Pass/Pass.h>
 
 namespace mlir {
 #define GEN_PASS_DECL_QCTOQCO

mlir/include/mlir/Conversion/QCToQIR/QCToQIR.h

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include <mlir/Pass/Pass.h> // from @llvm-project
+#include <mlir/Pass/Pass.h>
 
 namespace mlir {
 #define GEN_PASS_DECL_QCTOQIR

mlir/include/mlir/Dialect/QC/IR/QCOps.td

@@ -943,7 +943,7 @@ def CtrlOp : QCOp<"ctrl",
         ```mlir
         qc.ctrl(%q0) {
           qc.x %q1 : !qc.qubit
-        }
+        } : !qc.qubit
         ```
     }];
 

mlir/include/mlir/Dialect/QCO/Utils/WireIterator.h

@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2023 - 2026 Chair for Design Automation, TUM
+ * Copyright (c) 2025 - 2026 Munich Quantum Software Company GmbH
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * Licensed under the MIT License
+ */
+
+#pragma once
+
+#include <iterator>
+#include <mlir/IR/Operation.h>
+
+namespace mlir::qco {
+
+/**
+ * @brief A bidirectional_iterator traversing the def-use chain of a qubit wire.
+ *
+ * The iterator follows the flow of a qubit through a sequence of quantum
+ * operations while respecting the semantics of the respective operation.
+ **/
+class [[nodiscard]] WireIterator {
+public:
+  using iterator_category = std::bidirectional_iterator_tag;
+  using difference_type = std::ptrdiff_t;
+  using value_type = mlir::Operation*;
+
+  WireIterator() : op_(nullptr), qubit_(nullptr), isSentinel_(false) {}
+  explicit WireIterator(mlir::Value qubit)
+      : op_(qubit.getDefiningOp()), qubit_(qubit), isSentinel_(false) {}
+
+  /// @returns the operation the iterator points to.
+  [[nodiscard]] mlir::Operation* operation() const { return op_; }
+
+  /// @returns the operation the iterator points to.
+  [[nodiscard]] mlir::Operation* operator*() const { return operation(); }
+
+  /// @returns the qubit the iterator points to.
+  [[nodiscard]] mlir::Value qubit() const;
+
+  WireIterator& operator++() {
+    forward();
+    return *this;
+  }
+
+  WireIterator operator++(int) {
+    auto tmp = *this;
+    operator++();
+    return tmp;
+  }
+
+  WireIterator& operator--() {
+    backward();
+    return *this;
+  }
+
+  WireIterator operator--(int) {
+    auto tmp = *this;
+    operator--();
+    return tmp;
+  }
+
+  bool operator==(const WireIterator& other) const {
+    return other.qubit_ == qubit_ && other.op_ == op_ &&
+           other.isSentinel_ == isSentinel_;
+  }
+
+  bool operator==([[maybe_unused]] std::default_sentinel_t s) const {
+    return isSentinel_;
+  }
+
+private:
+  /// @brief Move to the next operation on the qubit wire.
+  void forward();
+
+  /// @brief Move to the previous operation on the qubit wire.
+  void backward();
+
+  mlir::Operation* op_;
+  mlir::Value qubit_;
+  bool isSentinel_;
+};
+} // namespace mlir::qco

mlir/lib/Conversion/QCOToQC/QCOToQC.cpp

@@ -68,7 +68,7 @@ static LogicalResult
 convertOneTargetZeroParameter(QCOOpType& op, QCOOpAdaptorType& adaptor,
                               ConversionPatternRewriter& rewriter) {
   // OpAdaptor provides the already type-converted input qubit
-  const auto& qcQubit = adaptor.getQubitIn();
+  auto qcQubit = adaptor.getQubitIn();
 
   // Create the QC operation (in-place, no result)
   rewriter.create<QCOpType>(op.getLoc(), qcQubit);
@@ -95,7 +95,7 @@ static LogicalResult
 convertOneTargetOneParameter(QCOOpType& op, QCOOpAdaptorType& adaptor,
                              ConversionPatternRewriter& rewriter) {
   // OpAdaptor provides the already type-converted input qubit
-  const auto& qcQubit = adaptor.getQubitIn();
+  auto qcQubit = adaptor.getQubitIn();
 
   // Create the QC operation (in-place, no result)
   rewriter.create<QCOpType>(op.getLoc(), qcQubit, op.getParameter(0));
@@ -122,7 +122,7 @@ static LogicalResult
 convertOneTargetTwoParameter(QCOOpType& op, QCOOpAdaptorType& adaptor,
                              ConversionPatternRewriter& rewriter) {
   // OpAdaptor provides the already type-converted input qubit
-  const auto& qcQubit = adaptor.getQubitIn();
+  auto qcQubit = adaptor.getQubitIn();
 
   // Create the QC operation (in-place, no result)
   rewriter.create<QCOpType>(op.getLoc(), qcQubit, op.getParameter(0),
@@ -150,7 +150,7 @@ static LogicalResult
 convertOneTargetThreeParameter(QCOOpType& op, QCOOpAdaptorType& adaptor,
                                ConversionPatternRewriter& rewriter) {
   // OpAdaptor provides the already type-converted input qubit
-  const auto& qcQubit = adaptor.getQubitIn();
+  auto qcQubit = adaptor.getQubitIn();
 
   // Create the QC operation (in-place, no result)
   rewriter.create<QCOpType>(op.getLoc(), qcQubit, op.getParameter(0),
@@ -178,8 +178,8 @@ static LogicalResult
 convertTwoTargetZeroParameter(QCOOpType& op, QCOOpAdaptorType& adaptor,
                               ConversionPatternRewriter& rewriter) {
   // OpAdaptor provides the already type-converted input qubits
-  const auto& qcQubit0 = adaptor.getQubit0In();
-  const auto& qcQubit1 = adaptor.getQubit1In();
+  auto qcQubit0 = adaptor.getQubit0In();
+  auto qcQubit1 = adaptor.getQubit1In();
 
   // Create the QC operation (in-place, no result)
   rewriter.create<QCOpType>(op.getLoc(), qcQubit0, qcQubit1);
@@ -206,8 +206,8 @@ static LogicalResult
 convertTwoTargetOneParameter(QCOOpType& op, QCOOpAdaptorType& adaptor,
                              ConversionPatternRewriter& rewriter) {
   // OpAdaptor provides the already type-converted input qubits
-  const auto& qcQubit0 = adaptor.getQubit0In();
-  const auto& qcQubit1 = adaptor.getQubit1In();
+  auto qcQubit0 = adaptor.getQubit0In();
+  auto qcQubit1 = adaptor.getQubit1In();
 
   // Create the QC operation (in-place, no result)
   rewriter.create<QCOpType>(op.getLoc(), qcQubit0, qcQubit1,
@@ -235,8 +235,8 @@ static LogicalResult
 convertTwoTargetTwoParameter(QCOOpType& op, QCOOpAdaptorType& adaptor,
                              ConversionPatternRewriter& rewriter) {
   // OpAdaptor provides the already type-converted input qubits
-  const auto& qcQubit0 = adaptor.getQubit0In();
-  const auto& qcQubit1 = adaptor.getQubit1In();
+  auto qcQubit0 = adaptor.getQubit0In();
+  auto qcQubit1 = adaptor.getQubit1In();
 
   // Create the QC operation (in-place, no result)
   rewriter.create<QCOpType>(op.getLoc(), qcQubit0, qcQubit1, op.getParameter(0),
@@ -392,7 +392,7 @@ struct ConvertQCOMeasureOp final : OpConversionPattern<qco::MeasureOp> {
   matchAndRewrite(qco::MeasureOp op, OpAdaptor adaptor,
                   ConversionPatternRewriter& rewriter) const override {
     // OpAdaptor provides the already type-converted input qubit
-    const auto& qcQubit = adaptor.getQubitIn();
+    auto qcQubit = adaptor.getQubitIn();
 
     // Create qc.measure (in-place operation, returns only bit)
     // Preserve register metadata for output recording
@@ -437,7 +437,7 @@ struct ConvertQCOResetOp final : OpConversionPattern<qco::ResetOp> {
   matchAndRewrite(qco::ResetOp op, OpAdaptor adaptor,
                   ConversionPatternRewriter& rewriter) const override {
     // OpAdaptor provides the already type-converted input qubit
-    const auto& qcQubit = adaptor.getQubitIn();
+    auto qcQubit = adaptor.getQubitIn();
 
     // Create qc.reset (in-place operation, no result)
     rewriter.create<qc::ResetOp>(op.getLoc(), qcQubit);
@@ -737,7 +737,7 @@ struct ConvertQCOBarrierOp final : OpConversionPattern<qco::BarrierOp> {
   matchAndRewrite(qco::BarrierOp op, OpAdaptor adaptor,
                   ConversionPatternRewriter& rewriter) const override {
     // OpAdaptor provides the already type-converted qubits
-    const auto& qcQubits = adaptor.getQubitsIn();
+    auto qcQubits = adaptor.getQubitsIn();
 
     // Create qc.barrier operation
     rewriter.create<qc::BarrierOp>(op.getLoc(), qcQubits);
@@ -763,7 +763,7 @@ struct ConvertQCOBarrierOp final : OpConversionPattern<qco::BarrierOp> {
  * ```mlir
  * qc.ctrl(%q0) {
  *   qc.x %q1 : !qc.qubit
- * }
+ * } : !qc.qubit
  * ```
  */
 struct ConvertQCOCtrlOp final : OpConversionPattern<qco::CtrlOp> {
@@ -773,7 +773,7 @@ struct ConvertQCOCtrlOp final : OpConversionPattern<qco::CtrlOp> {
   matchAndRewrite(qco::CtrlOp op, OpAdaptor adaptor,
                   ConversionPatternRewriter& rewriter) const override {
     // Get QC controls
-    const auto& qcControls = adaptor.getControlsIn();
+    auto qcControls = adaptor.getControlsIn();
 
     // Create qc.ctrl operation
     auto qcOp = qc::CtrlOp::create(rewriter, op.getLoc(), qcControls);