Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions frontend/qasm/qasm-import.py
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ def _visitBinaryGates(self, instr: Instruction, qubits: list[QubitSpecifier], cl
def _visitDefinedGate(self, instr: QASM2_Gate, qubits: list[QubitSpecifier], clbits: list[ClbitSpecifier]) -> None:
if instr.definition is not None:
if self.scope.findGate(instr) is None:
# Construct qillr.GateOp for dDefined custom gate
# Construct qillr.GateOp for defined custom gate
# Insert into module body and recursively visit gate body
inputs: list[QubitType] = [QubitType.get(self.context) for _ in range(instr.num_qubits)]
gty: func.FunctionType = func.FunctionType.get(inputs=inputs, results=[], context=self.context)
Expand All @@ -315,13 +315,14 @@ def _visitDefinedGate(self, instr: QASM2_Gate, qubits: list[QubitSpecifier], clb
arg_locs = [self.loc for _ in inputs]
gate.body.blocks.append(*inputs, arg_locs=arg_locs)
gateBody: Block = gate.body.blocks[0]
self.scope.setGate(instr, gate)

self.scope.setGate(instr, gate)
circuit: QuantumCircuit = instr.definition
gateQregs = {str(q): a for q, a in zip(circuit.qubits, gate.body.blocks[0].arguments)}
innerGateScope: Scope = Scope.fromMap(gateQregs, {}, self.scope.visitedGates)
visitor: QASMToMLIRVisitor = QASMToMLIRVisitor.fromParent(self, block=gateBody, scope=innerGateScope)
visitor.visitCircuit(circuit)
qillr.ReturnOp(loc=self.loc, ip=InsertionPoint(gateBody))
# Construct qillr.CallOp for defined custom gate
callee: StringAttr = instr.name
operands: list[Value] = [self.visitQuantumBit(q) for q in qubits]
Expand All @@ -339,9 +340,11 @@ def _visitIfElse(self, instr: IfElseOp, qubits: list[QubitSpecifier], clbits: li

thenVisitor = QASMToMLIRVisitor.fromParent(self, block=ifOp.then_block)
thenVisitor.visitCircuit(true_body)
scf.YieldOp(results_=[], ip=InsertionPoint(ifOp.then_block))
if hasElse:
elseVisitor = QASMToMLIRVisitor.fromParent(self, block=ifOp.else_block)
elseVisitor.visitCircuit(false_body)
scf.YieldOp(results_=[], ip=InsertionPoint(ifOp.else_block))

def _visitIfElseCondition(
self,
Expand Down