Revert "TMP, needs to be removed; allow OpenQASM export with round-trip pass"

This reverts commit 4b54f87.

Author: taminob

mlir/lib/Dialect/MQTOpt/Transforms/MQTCoreRoundTrip.cpp

@@ -33,15 +33,12 @@ struct MQTCoreRoundTrip final : impl::MQTCoreRoundTripBase<MQTCoreRoundTrip> {
     // Define the set of patterns to use.
     mlir::RewritePatternSet patterns(ctx);
     populateToQuantumComputationPatterns(patterns, circuit);
-    // populateFromQuantumComputationPatterns(patterns, circuit);
+    populateFromQuantumComputationPatterns(patterns, circuit);
 
     // Apply patterns in an iterative and greedy manner.
     if (mlir::failed(mlir::applyPatternsGreedily(op, std::move(patterns)))) {
       signalPassFailure();
     }
-    std::cerr << "======================\n";
-      circuit.dumpOpenQASM(std::cerr, false);
-    std::cerr << "======================\n";
   }
 };
 

mlir/lib/Dialect/MQTOpt/Transforms/ToQuantumComputationPattern.cpp

@@ -8,7 +8,6 @@
  * Licensed under the MIT License
  */
 
-#include "Helpers.h"
 #include "ir/Definitions.hpp"
 #include "ir/QuantumComputation.hpp"
 #include "ir/operations/Control.hpp"
@@ -183,9 +182,7 @@ struct ToQuantumComputationPattern final : mlir::OpRewritePattern<AllocOp> {
             findQubitIndex(val, currentQubitVariables));
       }
       // Get the qubit index of the target qubit (if already collected).
-      if (!in.empty()) {
       targetIndex[0] = findQubitIndex(in[0], currentQubitVariables);
-      }
       if (in.size() > 1) {
         targetIndex[1] = findQubitIndex(in[1], currentQubitVariables);
       }
@@ -206,9 +203,7 @@ struct ToQuantumComputationPattern final : mlir::OpRewritePattern<AllocOp> {
       currentQubitVariables[negCtrlInsIndices[i]] =
           outs[i + 1 + posCtrlInsIndices.size()];
     }
-    if (!op.getOutQubits().empty()) {
-      currentQubitVariables[targetIndex[0]] = outs[0];
-    }
+    currentQubitVariables[targetIndex[0]] = outs[0];
     if (op.getOutQubits().size() > 1) {
       currentQubitVariables[targetIndex[1]] = outs[1];
     }
@@ -230,8 +225,6 @@ struct ToQuantumComputationPattern final : mlir::OpRewritePattern<AllocOp> {
         parameters.emplace_back(param);
       }
     }
-    auto x = helpers::getParameters(op);
-    parameters.insert(parameters.end(), x.begin(), x.end());
 
     if (op.getOutQubits().size() > 1) {
       circuit.emplace_back<qc::StandardOperation>(
@@ -372,7 +365,7 @@ struct ToQuantumComputationPattern final : mlir::OpRewritePattern<AllocOp> {
 
     std::string regName;
     llvm::raw_string_ostream os(regName);
-    os << "q";
+    op.getResult().print(os);
 
     circuit.addQubitRegister(numQubits, regName);
     circuit.addClassicalRegister(numQubits);