Merge pull request #51 from A-DaRo/feature/nv-processor-fixes

Fix failing examples and implement missing instructions in NVProcessor

Author: mkvanhooft

examples/advanced/fidelity_constraint/example_fidelity.py

@@ -5,6 +5,9 @@
 from typing import Any, Dict, Generator
 
 import netsquid as ns
+from netqasm.sdk.connection import BaseNetQASMConnection
+from netqasm.sdk.futures import RegFuture
+from netqasm.sdk.qubit import Qubit
 
 from pydynaa import EventExpression
 from squidasm.run.stack.config import StackNetworkConfig
@@ -53,16 +56,25 @@ def run(
         conn = context.connection
         epr_socket = context.epr_sockets[self.PEER]
 
-        eprs = epr_socket.create_keep(
-            number=2, min_fidelity_all_at_end=70, max_tries=20
-        )
+        outcomes = conn.new_array(length=2)
+
+        def post_create(_: BaseNetQASMConnection, q: Qubit, index: RegFuture):
+            q.measure(future=outcomes.get_future_index(index))
 
-        m0 = eprs[0].measure()
-        m1 = eprs[1].measure()
+        epr_socket.create_keep(
+            number=2,
+            min_fidelity_all_at_end=70,
+            max_tries=20,
+            sequential=True,
+            post_routine=post_create,
+        )
 
         yield from conn.flush()
 
-        return {"m0": int(m0), "m1": int(m1)}
+        m0 = int(outcomes.get_future_index(0))
+        m1 = int(outcomes.get_future_index(1))
+
+        return {"m0": m0, "m1": m1}
 
 
 class ServerProgram(Program):
@@ -83,14 +95,25 @@ def run(
         conn = context.connection
         epr_socket = context.epr_sockets[self.PEER]
 
-        eprs = epr_socket.recv_keep(number=2, min_fidelity_all_at_end=70, max_tries=20)
+        outcomes = conn.new_array(length=2)
 
-        m0 = eprs[0].measure()
-        m1 = eprs[1].measure()
+        def post_recv(_: BaseNetQASMConnection, q: Qubit, index: RegFuture):
+            q.measure(future=outcomes.get_future_index(index))
+
+        epr_socket.recv_keep(
+            number=2,
+            min_fidelity_all_at_end=70,
+            max_tries=20,
+            sequential=True,
+            post_routine=post_recv,
+        )
 
         yield from conn.flush()
 
-        return {"m0": int(m0), "m1": int(m1)}
+        m0 = int(outcomes.get_future_index(0))
+        m1 = int(outcomes.get_future_index(1))
+
+        return {"m0": m0, "m1": m1}
 
 
 PI = math.pi

squidasm/nqasm/executor/nv.py

@@ -12,6 +12,7 @@
     INSTR_ROT_X,
     INSTR_ROT_Y,
     INSTR_ROT_Z,
+    INSTR_SWAP,
 )
 from netsquid.nodes.node import Node as NetSquidNode
 
@@ -27,6 +28,7 @@
     nv.RotZInstruction: INSTR_ROT_Z,
     nv.ControlledRotXInstruction: INSTR_CXDIR,
     nv.ControlledRotYInstruction: INSTR_CYDIR,
+    nv.MovInstruction: INSTR_SWAP,
 }
 
 

squidasm/sim/network/network.py

@@ -551,6 +551,7 @@ def __init__(
             PhysicalInstruction(ns_instructions.INSTR_ROT_Z, duration=2),
             PhysicalInstruction(ns_instructions.INSTR_CXDIR, duration=5),
             PhysicalInstruction(ns_instructions.INSTR_CYDIR, duration=5),
+            PhysicalInstruction(ns_instructions.INSTR_SWAP, duration=5),
         ]
 
         super().__init__(

squidasm/sim/stack/processor.py

@@ -173,6 +173,7 @@ def execute_subroutine(
         self, subroutine: Subroutine
     ) -> Generator[EventExpression, None, None]:
         """Execute a NetQASM subroutine on this processor."""
+        self._logger.info(f"Executing subroutine {subroutine}")
         app_id = subroutine.app_id
         assert app_id in self.app_memories
         app_mem = self.app_memories[app_id]
@@ -230,6 +231,8 @@ def _interpret_instruction(
             pass
         elif isinstance(instr, core.SingleQubitInstruction):
             return self._interpret_single_qubit_instr(app_id, instr)
+        elif isinstance(instr, vanilla.MovInstruction) or isinstance(instr, nv.MovInstruction):
+            return self._interpret_mov(app_id, instr)
         elif isinstance(instr, core.TwoQubitInstruction):
             return self._interpret_two_qubit_instr(app_id, instr)
         elif isinstance(instr, core.RotationInstruction):
@@ -288,6 +291,12 @@ def _interpret_set(self, app_id: int, instr: core.SetInstruction) -> None:
         self._logger.debug(f"Set register {instr.reg} to {instr.imm}")
         self.app_memories[app_id].set_reg_value(instr.reg, instr.imm.value)
 
+    def _interpret_mov(self, app_id: int, instr: vanilla.MovInstruction) -> None:
+        self._logger.debug(f"Moving value from {instr.reg1} to {instr.reg0}")
+        app_mem = self.app_memories[app_id]
+        val = app_mem.get_reg_value(instr.reg1)
+        app_mem.set_reg_value(instr.reg0, val)
+
     def _interpret_qalloc(self, app_id: int, instr: core.QAllocInstruction) -> None:
         app_mem = self.app_memories[app_id]
 
@@ -883,3 +892,23 @@ def _interpret_controlled_rotation_instr(
             yield from self._do_controlled_rotation(app_id, instr, INSTR_CYDIR)
         else:
             raise RuntimeError(f"Unsupported instruction {instr}")
+
+    def _interpret_two_qubit_instr(
+        self, app_id: int, instr: core.SingleQubitInstruction
+    ) -> Generator[EventExpression, None, None]:
+        app_mem = self.app_memories[app_id]
+        virt_id0 = app_mem.get_reg_value(instr.reg0)
+        phys_id0 = app_mem.phys_id_for(virt_id0)
+        virt_id1 = app_mem.get_reg_value(instr.reg1)
+        phys_id1 = app_mem.phys_id_for(virt_id1)
+
+        if isinstance(instr, vanilla.CnotInstruction):
+            prog = QuantumProgram()
+            prog.apply(INSTR_CNOT, qubit_indices=[phys_id0, phys_id1])
+            yield self.qdevice.execute_program(prog)
+        elif isinstance(instr, vanilla.CphaseInstruction):
+            prog = QuantumProgram()
+            prog.apply(INSTR_CZ, qubit_indices=[phys_id0, phys_id1])
+            yield self.qdevice.execute_program(prog)
+        else:
+            raise RuntimeError(f"Unsupported instruction {instr}")