⬆️ Update munich-quantum-toolkit/core (#167)

* ⬆️ Update `munich-quantum-toolkit/core`

* Update to version 3.3.1 of mqt-core

* Adapt code to mqt-core 3.3.1

* Fix linter errors

* Raise error for invalid if-else operations

---------

Co-authored-by: mqt-app[bot] <219534693+mqt-app[bot]@users.noreply.github.com>
Co-authored-by: Daniel Haag <[email protected]>

Author: mqt-app[bot]

cmake/ExternalDependencies.cmake

@@ -27,11 +27,11 @@ endif()
 
 # ---------------------------------------------------------------------------------Fetch MQT Core
 # cmake-format: off
-set(MQT_CORE_MINIMUM_VERSION 3.2.1
+set(MQT_CORE_MINIMUM_VERSION 3.3.1
         CACHE STRING "MQT Core minimum version")
-set(MQT_CORE_VERSION 3.2.1
+set(MQT_CORE_VERSION 3.3.1
         CACHE STRING "MQT Core version")
-set(MQT_CORE_REV "0425f88169f573e4505b49703c4cadf3699ccbcd"
+set(MQT_CORE_REV "1392d1b70f7331ea1ebb3247587c62cb8fd1d078"
         CACHE STRING "MQT Core identifier (tag, branch or commit hash)")
 set(MQT_CORE_REPO_OWNER "munich-quantum-toolkit"
         CACHE STRING "MQT Core repository owner (change when using a fork)")

src/backend/dd/DDSimDebug.cpp

@@ -32,7 +32,7 @@
 #include "dd/StateGeneration.hpp"
 #include "ir/Definitions.hpp"
 #include "ir/Register.hpp"
-#include "ir/operations/ClassicControlledOperation.hpp"
+#include "ir/operations/IfElseOperation.hpp"
 #include "ir/operations/OpType.hpp"
 #include "qasm3/Importer.hpp"
 
@@ -838,13 +838,21 @@ Result ddsimStepForward(SimulationState* self) {
     ddsim->iterator++;
     return OK;
   }
-  if ((*ddsim->iterator)->isClassicControlledOperation()) {
-    // For classic-controlled operations, we need to read the values of the
-    // classical register first.
+  if ((*ddsim->iterator)->isIfElseOperation()) {
+    // For if-else operations, we need to read the values of the classical
+    // register first.
     const auto* op =
-        dynamic_cast<qc::ClassicControlledOperation*>((*ddsim->iterator).get());
+        dynamic_cast<qc::IfElseOperation*>((*ddsim->iterator).get());
+    if (op->getComparisonKind() != qc::Eq) {
+      throw std::runtime_error("If-else operations with non-equality "
+                               "comparisons are currently not supported");
+    }
+    if (op->getControlBit().has_value()) {
+      throw std::runtime_error("If-else operations controlled by a single "
+                               "classical bit are currently not supported");
+    }
     const auto& controls = op->getControlRegister();
-    const auto& exp = op->getExpectedValue();
+    const auto& exp = op->getExpectedValueRegister();
     size_t registerValue = 0;
     for (size_t i = 0; i < controls->getSize(); i++) {
       const auto name =
@@ -853,7 +861,11 @@ Result ddsimStepForward(SimulationState* self) {
       registerValue |= (value ? 1ULL : 0ULL) << i;
     }
     if (registerValue == exp) {
-      currDD = dd::getDD(**ddsim->iterator, *ddsim->dd);
+      auto* thenOp = op->getThenOp();
+      currDD = dd::getDD(*thenOp, *ddsim->dd);
+    } else if (op->getElseOp() != nullptr) {
+      auto* elseOp = op->getElseOp();
+      currDD = dd::getDD(*elseOp, *ddsim->dd);
     } else {
       currDD = dd::Package::makeIdent();
     }
@@ -915,11 +927,19 @@ Result ddsimStepBackward(SimulationState* self) {
   if ((*ddsim->iterator)->getType() == qc::Barrier) {
     return OK;
   }
-  if ((*ddsim->iterator)->isClassicControlledOperation()) {
+  if ((*ddsim->iterator)->isIfElseOperation()) {
     const auto* op =
-        dynamic_cast<qc::ClassicControlledOperation*>((*ddsim->iterator).get());
+        dynamic_cast<qc::IfElseOperation*>((*ddsim->iterator).get());
+    if (op->getComparisonKind() != qc::Eq) {
+      throw std::runtime_error("If-else operations with non-equality "
+                               "comparisons are currently not supported");
+    }
+    if (op->getControlBit().has_value()) {
+      throw std::runtime_error("If-else operations controlled by a single "
+                               "classical bit are currently not supported");
+    }
     const auto& controls = op->getControlRegister();
-    const auto& exp = op->getExpectedValue();
+    const auto& exp = op->getExpectedValueRegister();
     size_t registerValue = 0;
     for (size_t i = 0; i < controls->getSize(); i++) {
       const auto name =
@@ -928,7 +948,11 @@ Result ddsimStepBackward(SimulationState* self) {
       registerValue |= (value ? 1ULL : 0ULL) << i;
     }
     if (registerValue == exp) {
-      currDD = dd::getInverseDD(**ddsim->iterator, *ddsim->dd);
+      auto* thenOp = op->getThenOp();
+      currDD = dd::getInverseDD(*thenOp, *ddsim->dd);
+    } else if (op->getElseOp() != nullptr) {
+      auto* elseOp = op->getElseOp();
+      currDD = dd::getInverseDD(*elseOp, *ddsim->dd);
     } else {
       currDD = dd::Package::makeIdent();
     }

test/test_custom_code.cpp

@@ -41,7 +41,7 @@ class CustomCodeTest : public CustomCodeFixture {};
  * @test Test the usage of classically controlled operations where the condition
  * evaluates to false.
  */
-TEST_F(CustomCodeTest, ClassicControlledOperationFalse) {
+TEST_F(CustomCodeTest, IfElseOperationFalse) {
   loadCode(2, 1,
            "z q[0];"
            "cx q[0], q[1];"
@@ -62,7 +62,7 @@ TEST_F(CustomCodeTest, ClassicControlledOperationFalse) {
  * @test Test the usage of classically controlled operations where the condition
  * evaluates to true.
  */
-TEST_F(CustomCodeTest, ClassicControlledOperationTrue) {
+TEST_F(CustomCodeTest, IfElseOperationTrue) {
   loadCode(2, 1,
            "x q[0];"
            "cx q[0], q[1];"
@@ -80,10 +80,9 @@ TEST_F(CustomCodeTest, ClassicControlledOperationTrue) {
 }
 
 /**
- * @test Test the usage of classically controlled operations with multiple
- * gates.
+ * @test Test the usage of if-else operations with multiple gates.
  */
-TEST_F(CustomCodeTest, ClassicControlledMultiOperation) {
+TEST_F(CustomCodeTest, IfElseOperationMulti) {
   loadCode(2, 1,
            "x q[0];"
            "measure q[0] -> c[0];"