handle qcs.delay_cycles

bcdonovan · Apr 18, 2024 · 9b272b6 · 9b272b6
1 parent f235cce
commit 9b272b6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/Conversion/QUIRToPulse/LoadPulseCals.cpp b/lib/Conversion/QUIRToPulse/LoadPulseCals.cpp
@@ -22,6 +22,7 @@
 
 #include "Dialect/Pulse/IR/PulseDialect.h"
 #include "Dialect/Pulse/IR/PulseOps.h"
+#include "Dialect/QCS/IR/QCSOps.h"
 #include "Dialect/QUIR/IR/QUIROps.h"
 #include "Dialect/QUIR/IR/QUIRTraits.h"
 #include "Dialect/QUIR/Utils/Utils.h"
@@ -145,6 +146,8 @@ void LoadPulseCalsPass::loadPulseCals(CallCircuitOp callCircuitOp,
       loadPulseCals(castOp, callCircuitOp, funcOp);
     else if (auto castOp = dyn_cast<mlir::quir::ResetQubitOp>(op))
       loadPulseCals(castOp, callCircuitOp, funcOp);
+    else if (isa<mlir::qcs::DelayCyclesOp>(op))
+      void; // no pulse call to load for a delay cycles op
     else {
       LLVM_DEBUG(llvm::dbgs() << "no pulse cal loading needed for " << op);
       assert((!op->hasTrait<mlir::quir::UnitaryOp>() and

diff --git a/lib/Conversion/QUIRToPulse/QUIRToPulse.cpp b/lib/Conversion/QUIRToPulse/QUIRToPulse.cpp
@@ -221,6 +221,11 @@ QUIRToPulsePass::convertCircuitToSequence(CallCircuitOp &callCircuitOp,
         PulseOpSchedulingInterface::setDuration(pulseCalCallSequenceOp,
                                                 durValue);
       }
+    } else if (isa<qcs::DelayCyclesOp>(quirOp)) {
+      // a qcs.delay_cycles may be inserted into a quir.circuit and should be
+      // placed outside of the sequence at the call point
+      auto newDelayCyclesOp = builder.clone(*quirOp);
+      newDelayCyclesOp->moveAfter(callCircuitOp);
     } else
       assert(((isa<quir::ConstantOp>(quirOp) or isa<quir::ReturnOp>(quirOp) or
                isa<quir::CircuitOp>(quirOp))) &&
@@ -234,7 +239,7 @@ QUIRToPulsePass::convertCircuitToSequence(CallCircuitOp &callCircuitOp,
                 convertedPulseSequenceOpReturnTypes.size()));
   convertedPulseSequenceOp.setType(newFuncType);
   entryBuilder.create<mlir::pulse::ReturnOp>(
-      convertedPulseSequenceOp.back().back().getLoc(),
+      convertedPulseSequenceOp.getLoc(),
       mlir::ValueRange{convertedPulseSequenceOpReturnValues});
   convertedPulseSequenceOp->moveBefore(mainFunc);
 
@@ -244,7 +249,6 @@ QUIRToPulsePass::convertCircuitToSequence(CallCircuitOp &callCircuitOp,
                                                   convertedPulseSequenceOp,
                                                   convertedPulseSequenceOpArgs);
   convertedPulseCallSequenceOp->moveAfter(callCircuitOp);
-
   return convertedPulseCallSequenceOp;
 }