✨ Rename staticQubitWithOp to staticQubitsWithOps and update related test cases across various dialects and programs to reflect the new functionality of allocating multiple static qubits and applying operations.

simon1hofmann · simon1hofmann · commit b82428411100 · 2026-03-19T09:31:09.000+01:00
diff --git a/mlir/unittests/Compiler/test_compiler_pipeline.cpp b/mlir/unittests/Compiler/test_compiler_pipeline.cpp
@@ -194,10 +194,10 @@ INSTANTIATE_TEST_SUITE_P(
             MQT_NAMED_BUILDER(mlir::qc::staticQubits),
             MQT_NAMED_BUILDER(mlir::qir::staticQubits), false},
         CompilerPipelineTestCase{
-            "StaticQubitWithOp", nullptr,
-            MQT_NAMED_BUILDER(mlir::qc::staticQubitWithOp),
-            MQT_NAMED_BUILDER(mlir::qc::staticQubitWithOp),
-            MQT_NAMED_BUILDER(mlir::qir::staticQubitWithOp), false},
+            "StaticQubitsWithOps", nullptr,
+            MQT_NAMED_BUILDER(mlir::qc::staticQubitsWithOps),
+            MQT_NAMED_BUILDER(mlir::qc::staticQubitsWithOps),
+            MQT_NAMED_BUILDER(mlir::qir::staticQubitsWithOps), false},
         CompilerPipelineTestCase{"AllocQubit",
                                  MQT_NAMED_BUILDER(qc::allocQubit), nullptr,
                                  MQT_NAMED_BUILDER(mlir::qc::allocQubit),
diff --git a/mlir/unittests/Conversion/QCOToQC/test_qco_to_qc.cpp b/mlir/unittests/Conversion/QCOToQC/test_qco_to_qc.cpp
@@ -117,12 +117,12 @@ TEST_P(QCOToQCTest, ProgramEquivalence) {
 /// @{
 INSTANTIATE_TEST_SUITE_P(
     QCOQubitManagementTest, QCOToQCTest,
-    testing::Values(QCOToQCTestCase{"StaticQubits",
-                                    MQT_NAMED_BUILDER(qco::staticQubits),
-                                    MQT_NAMED_BUILDER(qc::staticQubits)},
-                    QCOToQCTestCase{"StaticQubitWithOp",
-                                    MQT_NAMED_BUILDER(qco::staticQubitWithOp),
-                                    MQT_NAMED_BUILDER(qc::staticQubitWithOp)}));
+    testing::Values(
+        QCOToQCTestCase{"StaticQubits", MQT_NAMED_BUILDER(qco::staticQubits),
+                        MQT_NAMED_BUILDER(qc::staticQubits)},
+        QCOToQCTestCase{"StaticQubitsWithOps",
+                        MQT_NAMED_BUILDER(qco::staticQubitsWithOps),
+                        MQT_NAMED_BUILDER(qc::staticQubitsWithOps)}));
 /// @}
 
 /// \name QCOToQC/Modifiers/InvOp.cpp
diff --git a/mlir/unittests/Conversion/QCToQCO/test_qc_to_qco.cpp b/mlir/unittests/Conversion/QCToQCO/test_qc_to_qco.cpp
@@ -119,9 +119,9 @@ INSTANTIATE_TEST_SUITE_P(
     testing::Values(
         QCToQCOTestCase{"StaticQubits", MQT_NAMED_BUILDER(qc::staticQubits),
                         MQT_NAMED_BUILDER(qco::staticQubits)},
-        QCToQCOTestCase{"StaticQubitWithOp",
-                        MQT_NAMED_BUILDER(qc::staticQubitWithOp),
-                        MQT_NAMED_BUILDER(qco::staticQubitWithOp)}));
+        QCToQCOTestCase{"StaticQubitsWithOps",
+                        MQT_NAMED_BUILDER(qc::staticQubitsWithOps),
+                        MQT_NAMED_BUILDER(qco::staticQubitsWithOps)}));
 /// @}
 
 /// \name QCToQCO/Modifiers/InvOp.cpp
diff --git a/mlir/unittests/Conversion/QCToQIR/test_qc_to_qir.cpp b/mlir/unittests/Conversion/QCToQIR/test_qc_to_qir.cpp
@@ -624,9 +624,9 @@ INSTANTIATE_TEST_SUITE_P(
                         MQT_NAMED_BUILDER(qir::emptyQIR)},
         QCToQIRTestCase{"StaticQubits", MQT_NAMED_BUILDER(qc::staticQubits),
                         MQT_NAMED_BUILDER(qir::emptyQIR)},
-        QCToQIRTestCase{"StaticQubitWithOp",
-                        MQT_NAMED_BUILDER(qc::staticQubitWithOp),
-                        MQT_NAMED_BUILDER(qir::staticQubitWithOp)},
+        QCToQIRTestCase{"StaticQubitsWithOps",
+                        MQT_NAMED_BUILDER(qc::staticQubitsWithOps),
+                        MQT_NAMED_BUILDER(qir::staticQubitsWithOps)},
         QCToQIRTestCase{"AllocDeallocPair",
                         MQT_NAMED_BUILDER(qc::allocDeallocPair),
                         MQT_NAMED_BUILDER(qir::emptyQIR)}));
diff --git a/mlir/unittests/Dialect/QC/IR/test_qc_ir.cpp b/mlir/unittests/Dialect/QC/IR/test_qc_ir.cpp
@@ -899,8 +899,9 @@ INSTANTIATE_TEST_SUITE_P(
                    MQT_NAMED_BUILDER(emptyQC)},
         QCTestCase{"StaticQubits", MQT_NAMED_BUILDER(staticQubits),
                    MQT_NAMED_BUILDER(emptyQC)},
-        QCTestCase{"StaticQubitWithOp", MQT_NAMED_BUILDER(staticQubitWithOp),
-                   MQT_NAMED_BUILDER(staticQubitWithOp)},
+        QCTestCase{"StaticQubitsWithOps",
+                   MQT_NAMED_BUILDER(staticQubitsWithOps),
+                   MQT_NAMED_BUILDER(staticQubitsWithOps)},
         QCTestCase{"AllocDeallocPair", MQT_NAMED_BUILDER(allocDeallocPair),
                    MQT_NAMED_BUILDER(emptyQC)}));
 /// @}
diff --git a/mlir/unittests/Dialect/QCO/IR/test_qco_ir.cpp b/mlir/unittests/Dialect/QCO/IR/test_qco_ir.cpp
@@ -1060,8 +1060,9 @@ INSTANTIATE_TEST_SUITE_P(
                     MQT_NAMED_BUILDER(emptyQCO)},
         QCOTestCase{"StaticQubits", MQT_NAMED_BUILDER(staticQubits),
                     MQT_NAMED_BUILDER(emptyQCO)},
-        QCOTestCase{"StaticQubitWithOp", MQT_NAMED_BUILDER(staticQubitWithOp),
-                    MQT_NAMED_BUILDER(staticQubitWithOp)},
+        QCOTestCase{"StaticQubitsWithOps",
+                    MQT_NAMED_BUILDER(staticQubitsWithOps),
+                    MQT_NAMED_BUILDER(staticQubitsWithOps)},
         QCOTestCase{"AllocDeallocPair", MQT_NAMED_BUILDER(allocDeallocPair),
                     MQT_NAMED_BUILDER(emptyQCO)}));
 /// @}
diff --git a/mlir/unittests/Dialect/QIR/IR/test_qir_ir.cpp b/mlir/unittests/Dialect/QIR/IR/test_qir_ir.cpp
@@ -522,18 +522,20 @@ INSTANTIATE_TEST_SUITE_P(
 /// @{
 INSTANTIATE_TEST_SUITE_P(
     QIRQubitManagementTest, QIRTest,
-    testing::Values(
-        QIRTestCase{"AllocQubit", MQT_NAMED_BUILDER(allocQubit),
-                    MQT_NAMED_BUILDER(allocQubit)},
-        QIRTestCase{"AllocQubitRegister", MQT_NAMED_BUILDER(allocQubitRegister),
-                    MQT_NAMED_BUILDER(allocQubitRegister)},
-        QIRTestCase{"AllocMultipleQubitRegisters",
-                    MQT_NAMED_BUILDER(allocMultipleQubitRegisters),
-                    MQT_NAMED_BUILDER(allocMultipleQubitRegisters)},
-        QIRTestCase{"AllocLargeRegister", MQT_NAMED_BUILDER(allocLargeRegister),
-                    MQT_NAMED_BUILDER(allocLargeRegister)},
-        QIRTestCase{"StaticQubits", MQT_NAMED_BUILDER(staticQubits),
-                    MQT_NAMED_BUILDER(staticQubits)},
-        QIRTestCase{"StaticQubitWithOp", MQT_NAMED_BUILDER(staticQubitWithOp),
-                    MQT_NAMED_BUILDER(staticQubitWithOp)}));
+    testing::Values(QIRTestCase{"AllocQubit", MQT_NAMED_BUILDER(allocQubit),
+                                MQT_NAMED_BUILDER(allocQubit)},
+                    QIRTestCase{"AllocQubitRegister",
+                                MQT_NAMED_BUILDER(allocQubitRegister),
+                                MQT_NAMED_BUILDER(allocQubitRegister)},
+                    QIRTestCase{"AllocMultipleQubitRegisters",
+                                MQT_NAMED_BUILDER(allocMultipleQubitRegisters),
+                                MQT_NAMED_BUILDER(allocMultipleQubitRegisters)},
+                    QIRTestCase{"AllocLargeRegister",
+                                MQT_NAMED_BUILDER(allocLargeRegister),
+                                MQT_NAMED_BUILDER(allocLargeRegister)},
+                    QIRTestCase{"StaticQubits", MQT_NAMED_BUILDER(staticQubits),
+                                MQT_NAMED_BUILDER(staticQubits)},
+                    QIRTestCase{"StaticQubitsWithOps",
+                                MQT_NAMED_BUILDER(staticQubitsWithOps),
+                                MQT_NAMED_BUILDER(staticQubitsWithOps)}));
 /// @}
diff --git a/mlir/unittests/programs/qc_programs.cpp b/mlir/unittests/programs/qc_programs.cpp
@@ -34,9 +34,11 @@ void staticQubits(QCProgramBuilder& b) {
   b.staticQubit(1);
 }
 
-void staticQubitWithOp(QCProgramBuilder& b) {
-  auto q = b.staticQubit(0);
-  b.h(q);
+void staticQubitsWithOps(QCProgramBuilder& b) {
+  auto q0 = b.staticQubit(0);
+  auto q1 = b.staticQubit(1);
+  b.h(q0);
+  b.h(q1);
 }
 
 void allocDeallocPair(QCProgramBuilder& b) {
diff --git a/mlir/unittests/programs/qc_programs.h b/mlir/unittests/programs/qc_programs.h
@@ -33,8 +33,8 @@ void allocLargeRegister(QCProgramBuilder& b);
 /// Allocates two inline qubits.
 void staticQubits(QCProgramBuilder& b);
 
-/// Allocates a static qubit and applies an operation.
-void staticQubitWithOp(QCProgramBuilder& b);
+/// Allocates two static qubits and applies operations.
+void staticQubitsWithOps(QCProgramBuilder& b);
 
 /// Allocates and explicitly deallocates a single qubit.
 void allocDeallocPair(QCProgramBuilder& b);
diff --git a/mlir/unittests/programs/qco_programs.cpp b/mlir/unittests/programs/qco_programs.cpp
@@ -38,9 +38,11 @@ void staticQubits(QCOProgramBuilder& b) {
   b.staticQubit(1);
 }
 
-void staticQubitWithOp(QCOProgramBuilder& b) {
-  auto q = b.staticQubit(0);
-  b.h(q);
+void staticQubitsWithOps(QCOProgramBuilder& b) {
+  auto q0 = b.staticQubit(0);
+  auto q1 = b.staticQubit(1);
+  q0 = b.h(q0);
+  q1 = b.h(q1);
 }
 
 void allocDeallocPair(QCOProgramBuilder& b) {
diff --git a/mlir/unittests/programs/qco_programs.h b/mlir/unittests/programs/qco_programs.h
@@ -33,8 +33,8 @@ void allocLargeRegister(QCOProgramBuilder& b);
 /// Allocates two inline qubits.
 void staticQubits(QCOProgramBuilder& b);
 
-/// Allocates a static qubit and applies an operation.
-void staticQubitWithOp(QCOProgramBuilder& b);
+/// Allocates two static qubits and applies operations.
+void staticQubitsWithOps(QCOProgramBuilder& b);
 
 /// Allocates and explicitly deallocates a single qubit.
 void allocDeallocPair(QCOProgramBuilder& b);
diff --git a/mlir/unittests/programs/qir_programs.cpp b/mlir/unittests/programs/qir_programs.cpp
@@ -32,9 +32,11 @@ void staticQubits(QIRProgramBuilder& b) {
   b.staticQubit(1);
 }
 
-void staticQubitWithOp(QIRProgramBuilder& b) {
-  auto q = b.staticQubit(0);
-  b.h(q);
+void staticQubitsWithOps(QIRProgramBuilder& b) {
+  auto q0 = b.staticQubit(0);
+  auto q1 = b.staticQubit(1);
+  b.h(q0);
+  b.h(q1);
 }
 
 void singleMeasurementToSingleBit(QIRProgramBuilder& b) {
diff --git a/mlir/unittests/programs/qir_programs.h b/mlir/unittests/programs/qir_programs.h
@@ -33,8 +33,8 @@ void allocLargeRegister(QIRProgramBuilder& b);
 /// Allocates two inline qubits.
 void staticQubits(QIRProgramBuilder& b);
 
-/// Allocates a static qubit and applies an operation.
-void staticQubitWithOp(QIRProgramBuilder& b);
+/// Allocates two static qubits and applies operations.
+void staticQubitsWithOps(QIRProgramBuilder& b);
 
 // --- MeasureOp ------------------------------------------------------------ //
 

Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,11 @@ void staticQubits(QCProgramBuilder& b) {`
`34`	`34`	`b.staticQubit(1);`
`35`	`35`	`}`
`36`	`36`
`37`		`-void staticQubitWithOp(QCProgramBuilder& b) {`
`38`		`- auto q = b.staticQubit(0);`
`39`		`- b.h(q);`
	`37`	`+void staticQubitsWithOps(QCProgramBuilder& b) {`
	`38`	`+ auto q0 = b.staticQubit(0);`
	`39`	`+ auto q1 = b.staticQubit(1);`
	`40`	`+ b.h(q0);`
	`41`	`+ b.h(q1);`
`40`	`42`	`}`
`41`	`43`
`42`	`44`	`void allocDeallocPair(QCProgramBuilder& b) {`
Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,11 @@ void staticQubits(QCOProgramBuilder& b) {`
`38`	`38`	`b.staticQubit(1);`
`39`	`39`	`}`
`40`	`40`
`41`		`-void staticQubitWithOp(QCOProgramBuilder& b) {`
`42`		`- auto q = b.staticQubit(0);`
`43`		`- b.h(q);`
	`41`	`+void staticQubitsWithOps(QCOProgramBuilder& b) {`
	`42`	`+ auto q0 = b.staticQubit(0);`
	`43`	`+ auto q1 = b.staticQubit(1);`
	`44`	`+ q0 = b.h(q0);`
	`45`	`+ q1 = b.h(q1);`
`44`	`46`	`}`
`45`	`47`
`46`	`48`	`void allocDeallocPair(QCOProgramBuilder& b) {`