Address the Rabbit's comments from #1671

Author: denialhaag

mlir/lib/Dialect/QC/Translation/TranslateQASM3ToQC.cpp

@@ -300,6 +300,10 @@ class MLIRQasmImporter final : public qasm3::InstVisitor {
     }
     declarations.emplace(id, stmt);
 
+    if (stmt->isConst) {
+      return; // nothing to emit
+    }
+
     const auto ty = std::get<1>(stmt->type);
     const auto sizedTy =
         std::dynamic_pointer_cast<qasm3::DesignatedType<uint64_t>>(ty);
@@ -340,9 +344,6 @@ class MLIRQasmImporter final : public qasm3::InstVisitor {
         visitMeasureAssignment(lhsId, measureExpr, stmt->debugInfo);
         return;
       }
-      if (stmt->isConst) {
-        return; // nothing to emit
-      }
       throw qasm3::CompilerError(
           "Only measure statements are supported as initializers.",
           stmt->debugInfo);
@@ -734,11 +735,14 @@ class MLIRQasmImporter final : public qasm3::InstVisitor {
     for (size_t i = 0; i < gate.targetNames.size(); ++i) {
       for (auto target : gateOperands[i]) {
         auto* it = llvm::find(targets, target);
+        size_t index = 0;
         if (it == targets.end()) {
+          index = targets.size();
           targets.push_back(target);
+        } else {
+          index = static_cast<size_t>(std::distance(targets.begin(), it));
         }
-        targetsMap[gate.targetNames[i]].push_back(
-            std::distance(targets.begin(), it));
+        targetsMap[gate.targetNames[i]].push_back(index);
       }
     }
 

mlir/unittests/Dialect/QC/Translation/test_qasm3_translation.cpp

@@ -68,6 +68,20 @@ class QASM3TranslationTest
 
 } // namespace
 
+static void singleNegControlledX(qc::QCProgramBuilder& b) {
+  auto q = b.allocQubitRegister(2);
+  b.x(q[0]);
+  b.cx(q[0], q[1]);
+  b.x(q[0]);
+}
+
+static void mixedControlledX(qc::QCProgramBuilder& b) {
+  auto q = b.allocQubitRegister(3);
+  b.x(q[1]);
+  b.mcx({q[0], q[1]}, q[2]);
+  b.x(q[1]);
+}
+
 TEST_P(QASM3TranslationTest, ProgramEquivalence) {
   const auto name = " (" + GetParam().name + ")";
   const auto& source = GetParam().source;
@@ -148,6 +162,11 @@ INSTANTIATE_TEST_SUITE_P(
         QASM3TranslationTestCase{"X", qasm::x, MQT_NAMED_BUILDER(qc::x)},
         QASM3TranslationTestCase{"SingleControlledX", qasm::singleControlledX,
                                  MQT_NAMED_BUILDER(qc::singleControlledX)},
+        QASM3TranslationTestCase{"SingleNegControlledX",
+                                 qasm::singleNegControlledX,
+                                 MQT_NAMED_BUILDER(singleNegControlledX)},
+        QASM3TranslationTestCase{"MixedControlledX", qasm::mixedControlledX,
+                                 MQT_NAMED_BUILDER(mixedControlledX)},
         QASM3TranslationTestCase{"MultipleControlledX",
                                  qasm::multipleControlledX,
                                  MQT_NAMED_BUILDER(qc::multipleControlledX)},
@@ -341,12 +360,12 @@ INSTANTIATE_TEST_SUITE_P(
                                  qasm::barrierMultipleQubits,
                                  MQT_NAMED_BUILDER(qc::barrierMultipleQubits)},
         QASM3TranslationTestCase{"CtrlTwo", qasm::ctrlTwo,
-                                 MQT_NAMED_BUILDER(mlir::qc::ctrlTwo)},
+                                 MQT_NAMED_BUILDER(qc::ctrlTwo)},
         QASM3TranslationTestCase{"CtrlTwoMixed", qasm::ctrlTwoMixed,
-                                 MQT_NAMED_BUILDER(mlir::qc::ctrlTwoMixed)},
+                                 MQT_NAMED_BUILDER(qc::ctrlTwoMixed)},
         QASM3TranslationTestCase{"SimpleIf", qasm::simpleIf,
-                                 MQT_NAMED_BUILDER(mlir::qc::simpleIf)},
+                                 MQT_NAMED_BUILDER(qc::simpleIf)},
         QASM3TranslationTestCase{"IfTwoQubits", qasm::ifTwoQubits,
-                                 MQT_NAMED_BUILDER(mlir::qc::ifTwoQubits)},
+                                 MQT_NAMED_BUILDER(qc::ifTwoQubits)},
         QASM3TranslationTestCase{"IfElse", qasm::ifElse,
-                                 MQT_NAMED_BUILDER(mlir::qc::ifElse)}));
+                                 MQT_NAMED_BUILDER(qc::ifElse)}));

mlir/unittests/programs/CMakeLists.txt

@@ -7,21 +7,31 @@
 # Licensed under the MIT License
 
 add_library(MLIRQASMPrograms qasm_programs.cpp)
+target_link_libraries(MLIRQASMPrograms PRIVATE MQT::ProjectOptions)
 target_sources(MLIRQASMPrograms PUBLIC FILE_SET HEADERS BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} FILES
                                        qasm_programs.h)
 
 add_library(MLIRQCPrograms qc_programs.cpp)
-target_link_libraries(MLIRQCPrograms PUBLIC MLIRQCProgramBuilder)
+target_link_libraries(
+  MLIRQCPrograms
+  PUBLIC MLIRQCProgramBuilder
+  PRIVATE MQT::ProjectOptions)
 target_sources(MLIRQCPrograms PUBLIC FILE_SET HEADERS BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} FILES
                                      qc_programs.h)
 
 add_library(MLIRQCOPrograms qco_programs.cpp)
-target_link_libraries(MLIRQCOPrograms PUBLIC MLIRQCOProgramBuilder)
+target_link_libraries(
+  MLIRQCOPrograms
+  PUBLIC MLIRQCOProgramBuilder
+  PRIVATE MQT::ProjectOptions)
 target_sources(MLIRQCOPrograms PUBLIC FILE_SET HEADERS BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} FILES
                                       qco_programs.h)
 
 add_library(MLIRQIRPrograms qir_programs.cpp)
-target_link_libraries(MLIRQIRPrograms PUBLIC MLIRQIRProgramBuilder)
+target_link_libraries(
+  MLIRQIRPrograms
+  PUBLIC MLIRQIRProgramBuilder
+  PRIVATE MQT::ProjectOptions)
 target_sources(MLIRQIRPrograms PUBLIC FILE_SET HEADERS BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} FILES
                                       qir_programs.h)
 

mlir/unittests/programs/qasm_programs.cpp

@@ -132,12 +132,24 @@ qubit[2] q;
 ctrl @ x q[0], q[1];
 )qasm";
 
+const std::string singleNegControlledX = R"qasm(OPENQASM 3.0;
+include "stdgates.inc";
+qubit[2] q;
+negctrl @ x q[0], q[1];
+)qasm";
+
 const std::string multipleControlledX = R"qasm(OPENQASM 3.0;
 include "stdgates.inc";
 qubit[3] q;
 ctrl(2) @ x q[0], q[1], q[2];
 )qasm";
 
+const std::string mixedControlledX = R"qasm(OPENQASM 3.0;
+include "stdgates.inc";
+qubit[3] q;
+ctrl @ negctrl @ x q[0], q[1], q[2];
+)qasm";
+
 const std::string y = R"qasm(OPENQASM 3.0;
 include "stdgates.inc";
 qubit[1] q;

mlir/unittests/programs/qasm_programs.h

@@ -66,9 +66,16 @@ extern const std::string x;
 /// Creates a circuit with a single controlled X gate.
 extern const std::string singleControlledX;
 
+/// Creates a circuit with a single negatively controlled X gate.
+extern const std::string singleNegControlledX;
+
 /// Creates a circuit with a multi-controlled X gate.
 extern const std::string multipleControlledX;
 
+/// Creates a circuit with an X gate that is positively and negatively
+/// controlled.
+extern const std::string mixedControlledX;
+
 /// Creates a circuit with just a Y gate.
 extern const std::string y;