Skip to content

Commit

Permalink
address reviews
Browse files Browse the repository at this point in the history
  • Loading branch information
@reza-j
reza-j committed Mar 6, 2024
1 parent 6d906b8 commit 15208bb
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 27 deletions.
28 changes: 14 additions & 14 deletions include/Conversion/QUIRToPulse/QUIRToPulse.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ struct QUIRToPulsePass

// convert quir circuit to pulse sequence
mlir::pulse::CallSequenceOp
convertCircuitToSequence(mlir::quir::CallCircuitOp callCircuitOp,
mlir::func::FuncOp &mainFunc, ModuleOp moduleOp);
convertCircuitToSequence(mlir::quir::CallCircuitOp &callCircuitOp,
mlir::func::FuncOp &mainFunc, ModuleOp &moduleOp);
// helper datastructure for converting quir circuit to pulse sequence; these
// will be reset every time convertCircuitToSequence is called and will be
// used by several functions that are called within that function
Expand All @@ -75,51 +75,51 @@ struct QUIRToPulsePass

// process the args of the circuit op, and add corresponding args to the
// converted pulse sequence op
void processCircuitArgs(mlir::quir::CallCircuitOp callCircuitOp,
mlir::quir::CircuitOp circuitOp,
SequenceOp convertedPulseSequenceOp,
void processCircuitArgs(mlir::quir::CallCircuitOp &callCircuitOp,
mlir::quir::CircuitOp &circuitOp,
SequenceOp &convertedPulseSequenceOp,
mlir::func::FuncOp &mainFunc,
mlir::OpBuilder &builder);

// process the args of the pulse cal sequence op corresponding to quirOp
void processPulseCalArgs(mlir::Operation *quirOp,
SequenceOp pulseCalSequenceOp,
SequenceOp &pulseCalSequenceOp,
SmallVector<Value> &pulseCalSeqArgs,
SequenceOp convertedPulseSequenceOp,
SequenceOp &convertedPulseSequenceOp,
mlir::func::FuncOp &mainFunc,
mlir::OpBuilder &builder);
void getQUIROpClassicalOperands(mlir::Operation *quirOp,
std::queue<Value> &angleOperands,
std::queue<Value> &durationOperands);
void processMixFrameOpArg(std::string const &mixFrameName,
std::string const &portName,
SequenceOp convertedPulseSequenceOp,
SequenceOp &convertedPulseSequenceOp,
SmallVector<Value> &quirOpPulseCalSeqArgs,
Value argumentValue, mlir::func::FuncOp &mainFunc,
mlir::OpBuilder &builder);
void processPortOpArg(std::string const &portName,
SequenceOp convertedPulseSequenceOp,
SequenceOp &convertedPulseSequenceOp,
SmallVector<Value> &quirOpPulseCalSeqArgs,
Value argumentValue, mlir::func::FuncOp &mainFunc,
mlir::OpBuilder &builder);
void processWfrOpArg(std::string const &wfrName,
SequenceOp convertedPulseSequenceOp,
SequenceOp &convertedPulseSequenceOp,
SmallVector<Value> &quirOpPulseCalSeqArgs,
Value argumentValue, mlir::func::FuncOp &mainFunc,
mlir::OpBuilder &builder);
void processAngleArg(Value nextAngleOperand,
SequenceOp convertedPulseSequenceOp,
SequenceOp &convertedPulseSequenceOp,
SmallVector<Value> &quirOpPulseCalSeqArgs,
mlir::OpBuilder &builder);
void processDurationArg(Value frontDurOperand,
SequenceOp convertedPulseSequenceOp,
SequenceOp &convertedPulseSequenceOp,
SmallVector<Value> &quirOpPulseCalSeqArgs,
mlir::OpBuilder &builder);

// convert angle to F64
mlir::Value convertAngleToF64(Operation *angleOp, mlir::OpBuilder &builder);
// convert duration to I64
mlir::Value convertDurationToI64(mlir::quir::CallCircuitOp callCircuitOp,
mlir::Value convertDurationToI64(mlir::quir::CallCircuitOp &callCircuitOp,
Operation *durOp, uint &cnt,
mlir::OpBuilder &builder,
mlir::func::FuncOp &mainFunc);
Expand Down Expand Up @@ -158,7 +158,7 @@ struct QUIRToPulsePass
std::map<std::string, Waveform_CreateOp> pulseNameToWaveformMap;

llvm::StringMap<Operation *> symbolMap;
mlir::quir::CircuitOp getCircuitOp(mlir::quir::CallCircuitOp callCircuitOp);
mlir::quir::CircuitOp getCircuitOp(mlir::quir::CallCircuitOp &callCircuitOp);
mlir::pulse::SequenceOp getSequenceOp(std::string const &symbolName);
};
} // namespace mlir::pulse
Expand Down
26 changes: 13 additions & 13 deletions lib/Conversion/QUIRToPulse/QUIRToPulse.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,9 @@ void QUIRToPulsePass::runOnOperation() {
}

mlir::pulse::CallSequenceOp
QUIRToPulsePass::convertCircuitToSequence(CallCircuitOp callCircuitOp,
QUIRToPulsePass::convertCircuitToSequence(CallCircuitOp &callCircuitOp,
mlir::func::FuncOp &mainFunc,
ModuleOp moduleOp) {
ModuleOp &moduleOp) {
mlir::OpBuilder builder(mainFunc);

auto circuitOp = getCircuitOp(callCircuitOp);
Expand Down Expand Up @@ -262,8 +262,8 @@ QUIRToPulsePass::convertCircuitToSequence(CallCircuitOp callCircuitOp,
}

void QUIRToPulsePass::processCircuitArgs(
mlir::quir::CallCircuitOp callCircuitOp, mlir::quir::CircuitOp circuitOp,
SequenceOp convertedPulseSequenceOp, mlir::func::FuncOp &mainFunc,
mlir::quir::CallCircuitOp &callCircuitOp, mlir::quir::CircuitOp &circuitOp,
SequenceOp &convertedPulseSequenceOp, mlir::func::FuncOp &mainFunc,
mlir::OpBuilder &builder) {
for (uint cnt = 0; cnt < circuitOp.getNumArguments(); cnt++) {
auto arg = circuitOp.getArgument(cnt);
Expand Down Expand Up @@ -307,9 +307,9 @@ void QUIRToPulsePass::processCircuitArgs(
}

void QUIRToPulsePass::processPulseCalArgs(
mlir::Operation *quirOp, SequenceOp pulseCalSequenceOp,
mlir::Operation *quirOp, SequenceOp &pulseCalSequenceOp,
SmallVector<Value> &pulseCalSequenceArgs,
SequenceOp convertedPulseSequenceOp, mlir::func::FuncOp &mainFunc,
SequenceOp &convertedPulseSequenceOp, mlir::func::FuncOp &mainFunc,
mlir::OpBuilder &builder) {

// get the classical operands of the quir op
Expand Down Expand Up @@ -405,7 +405,7 @@ void QUIRToPulsePass::getQUIROpClassicalOperands(

void QUIRToPulsePass::processMixFrameOpArg(
std::string const &mixFrameName, std::string const &portName,
SequenceOp convertedPulseSequenceOp,
SequenceOp &convertedPulseSequenceOp,
SmallVector<Value> &pulseCalSequenceArgs, Value argumentValue,
mlir::func::FuncOp &mainFunc, mlir::OpBuilder &builder) {
auto mixedFrameOp =
Expand Down Expand Up @@ -433,7 +433,7 @@ void QUIRToPulsePass::processMixFrameOpArg(
}

void QUIRToPulsePass::processPortOpArg(std::string const &portName,
SequenceOp convertedPulseSequenceOp,
SequenceOp &convertedPulseSequenceOp,
SmallVector<Value> &pulseCalSequenceArgs,
Value argumentValue,
mlir::func::FuncOp &mainFunc,
Expand Down Expand Up @@ -461,7 +461,7 @@ void QUIRToPulsePass::processPortOpArg(std::string const &portName,
}

void QUIRToPulsePass::processWfrOpArg(std::string const &wfrName,
SequenceOp convertedPulseSequenceOp,
SequenceOp &convertedPulseSequenceOp,
SmallVector<Value> &pulseCalSequenceArgs,
Value argumentValue,
mlir::func::FuncOp &mainFunc,
Expand Down Expand Up @@ -490,7 +490,7 @@ void QUIRToPulsePass::processWfrOpArg(std::string const &wfrName,
}

void QUIRToPulsePass::processAngleArg(Value nextAngleOperand,
SequenceOp convertedPulseSequenceOp,
SequenceOp &convertedPulseSequenceOp,
SmallVector<Value> &pulseCalSequenceArgs,
mlir::OpBuilder &entryBuilder) {
if (nextAngleOperand.isa<BlockArgument>()) {
Expand Down Expand Up @@ -518,7 +518,7 @@ void QUIRToPulsePass::processAngleArg(Value nextAngleOperand,
}

void QUIRToPulsePass::processDurationArg(
Value nextDurationOperand, SequenceOp convertedPulseSequenceOp,
Value nextDurationOperand, SequenceOp &convertedPulseSequenceOp,
SmallVector<Value> &pulseCalSequenceArgs, mlir::OpBuilder &entryBuilder) {
if (nextDurationOperand.isa<BlockArgument>()) {
uint const circNum =
Expand Down Expand Up @@ -589,7 +589,7 @@ mlir::Value QUIRToPulsePass::convertAngleToF64(Operation *angleOp,
}

mlir::Value QUIRToPulsePass::convertDurationToI64(
mlir::quir::CallCircuitOp callCircuitOp, Operation *durationOp, uint &cnt,
mlir::quir::CallCircuitOp &callCircuitOp, Operation *durationOp, uint &cnt,
mlir::OpBuilder &builder, mlir::func::FuncOp &mainFunc) {
assert(durationOp && "duration op is null");
std::string const durLocHash =
Expand Down Expand Up @@ -694,7 +694,7 @@ void QUIRToPulsePass::parsePulseWaveformContainerOps(
}

mlir::quir::CircuitOp
QUIRToPulsePass::getCircuitOp(CallCircuitOp callCircuitOp) {
QUIRToPulsePass::getCircuitOp(CallCircuitOp &callCircuitOp) {
auto search = symbolMap.find(callCircuitOp.getCallee());
assert(search != symbolMap.end() && "matching circuit not found");
auto circuitOp = dyn_cast<CircuitOp>(search->second);
Expand Down

0 comments on commit 15208bb

Please sign in to comment.