m-labs · Oct 29, 2015 · Oct 30, 2015 · Oct 30, 2015 · Oct 30, 2015 · Oct 30, 2015
diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,6 @@ __pycache__
 *.elf
 *.fbi
 *.pyc
-soc/runtime/service_table.h
 doc/manual/_build
 /build
 /dist
@@ -19,3 +18,8 @@ examples/master/dataset_db.pyon
 examples/sim/dataset_db.pyon
 Output/
 /lit-test/libartiq_support/libartiq_support.so
+
+# for developer convenience
+/test*.py
+/device_db.pyon
+/dataset_db.pyon
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
-[submodule "soc/runtime/lwip"]
-	path = soc/runtime/lwip
+[submodule "artiq/runtime/lwip"]
+	path = artiq/runtime/lwip
 	url = git://git.savannah.nongnu.org/lwip.git
-    ignore = untracked
+	ignore = untracked
diff --git a/.travis.yml b/.travis.yml
@@ -18,7 +18,6 @@ install:
   - if [ $TRAVIS_PULL_REQUEST != false ]; then BUILD_SOC=none; fi
   - if [ $BUILD_SOC != none ]; then ./.travis/get-xilinx.sh; fi
   - if [ $BUILD_SOC != none ]; then ./.travis/get-toolchain.sh; fi
-  - if [ $BUILD_SOC != none ]; then ./.travis/get-misoc.sh; fi
   - . ./.travis/get-anaconda.sh
   - source $HOME/miniconda/bin/activate py35
   - conda install -q pip coverage anaconda-client cython

diff --git a/.travis/get-anaconda.sh b/.travis/get-anaconda.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 # Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
 
+set -e
+
 export PATH=$HOME/miniconda/bin:$PATH
 wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
 bash miniconda.sh -b -p $HOME/miniconda

diff --git a/.travis/get-misoc.sh b/.travis/get-misoc.sh
diff --git a/.travis/get-toolchain.sh b/.travis/get-toolchain.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 packages="http://us.archive.ubuntu.com/ubuntu/pool/universe/i/iverilog/iverilog_0.9.7-1_amd64.deb"
 
 mkdir -p packages

diff --git a/.travis/get-xilinx.sh b/.travis/get-xilinx.sh
@@ -2,6 +2,8 @@
 # Copyright (C) 2014, 2015 M-Labs Limited
 # Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
 
+set -e
+
 wget http://sionneau.net/artiq/Xilinx/xilinx_ise_14.7_s3_s6.tar.gz.gpg
 echo "$secret" | gpg --passphrase-fd 0 xilinx_ise_14.7_s3_s6.tar.gz.gpg
 tar -C $HOME/ -xzf xilinx_ise_14.7_s3_s6.tar.gz
@@ -26,13 +28,13 @@ echo "$secret" | gpg --passphrase-fd 0 Xilinx.lic.gpg
 mkdir -p ~/.Xilinx
 mv Xilinx.lic ~/.Xilinx/Xilinx.lic
 
-git clone https://github.com/fallen/impersonate_macaddress
+git clone https://github.com/m-labs/impersonate_macaddress
 make -C impersonate_macaddress
 # Tell mibuild where Xilinx toolchains are installed
 # and feed it the mac address corresponding to the license
 cat >> $HOME/.m-labs/build_settings.sh << EOF
-MISOC_EXTRA_VIVADO_CMDLINE="-Ob vivado_path $HOME/Xilinx/Vivado"
-MISOC_EXTRA_ISE_CMDLINE="-Ob ise_path $HOME/opt/Xilinx/"
+MISOC_EXTRA_ISE_CMDLINE="--gateware-toolchain-path $HOME/opt/Xilinx/"
+MISOC_EXTRA_VIVADO_CMDLINE="--gateware-toolchain-path $HOME/Xilinx/Vivado"
 export MACADDR=$macaddress
 export LD_PRELOAD=$PWD/impersonate_macaddress/impersonate_macaddress.so
 EOF
diff --git a/artiq/compiler/types.py b/artiq/compiler/types.py
@@ -262,9 +262,9 @@ class TRPCFunction(TFunction):
     attributes = OrderedDict()
 
     def __init__(self, args, optargs, ret, service):
-        super().__init__(args, optargs, ret,
-                         delay=FixedDelay(iodelay.Constant(0)))
+        super().__init__(args, optargs, ret)
         self.service = service
+        self.delay   = TFixedDelay(iodelay.Const(0))
 
     def unify(self, other):
         if isinstance(other, TRPCFunction) and \
@@ -285,9 +285,9 @@ class TCFunction(TFunction):
     attributes = OrderedDict()
 
     def __init__(self, args, ret, name):
-        super().__init__(args, OrderedDict(), ret,
-                         delay=FixedDelay(iodelay.Constant(0)))
-        self.name = name
+        super().__init__(args, OrderedDict(), ret)
+        self.name  = name
+        self.delay = TFixedDelay(iodelay.Const(0))
 
     def unify(self, other):
         if isinstance(other, TCFunction) and \

diff --git a/artiq/frontend/artiq_flash.sh b/artiq/frontend/artiq_flash.sh
@@ -11,17 +11,14 @@ def run(script):
 		file.close()
 
 run("""
-# exit on error
 set -e
-# print commands
-#set -x
 
 ARTIQ_PREFIX=$(python3 -c "import artiq; print(artiq.__path__[0])")
 
 # Default is kc705
 BOARD=kc705
-# Default mezzanine board is nist_qc1
-MEZZANINE_BOARD=nist_qc1
+# Default hardware adapter is qc1
+HARDWARE_ADAPTER=qc1
 
 while getopts "bBrht:d:f:m:" opt
 do
@@ -67,14 +64,14 @@ do
 			fi
 			;;
 		m)
-			if [ "$OPTARG" == "nist_qc1" ]
+			if [ "$OPTARG" == "qc1" ]
 			then
-				MEZZANINE_BOARD=nist_qc1
-			elif [ "$OPTARG" == "nist_qc2" ]
+				HARDWARE_ADAPTER=qc1
+			elif [ "$OPTARG" == "qc2" ]
 			then
-				MEZZANINE_BOARD=nist_qc2
+				HARDWARE_ADAPTER=qc2
 			else
-				echo "KC705 mezzanine board is either nist_qc1 or nist_qc2"
+				echo "Hardware adapter should be qc1 or qc2"
 				exit 1
 			fi
 			;;
@@ -88,8 +85,8 @@ do
 			echo "-B  Flash BIOS"
 			echo "-r  Flash ARTIQ runtime"
 			echo "-h  Show this help message"
-			echo "-t  Target (kc705, pipistrello, default is: kc705)"
-			echo "-m  Mezzanine board (nist_qc1, nist_qc2, default is: nist_qc1)"
+			echo "-t  Target (kc705/pipistrello, default: kc705)"
+			echo "-m  Hardware adapter (qc1/qc2, default: qc1)"
 			echo "-f  Flash storage image generated with artiq_mkfs"
 			echo "-d  Directory containing the binaries to be flashed"
 			exit 1
@@ -129,30 +126,28 @@ fi
 if [ "$BOARD" == "kc705" ]
 then
 	UDEV_RULES=99-kc705.rules
-	BITSTREAM=artiq_kc705-${MEZZANINE_BOARD}-kc705.bit
 	CABLE=jtaghs1_fast
 	PROXY=bscan_spi_kc705.bit
 	BIOS_ADDR=0xaf0000
 	RUNTIME_ADDR=0xb00000
-	RUNTIME_FILE=runtime.fbi
 	FS_ADDR=0xb40000
 	if [ -z "$BIN_PREFIX" ]
 	then
-		RUNTIME_FILE=${MEZZANINE_BOARD}/runtime.fbi
-		BIN_PREFIX=$ARTIQ_PREFIX/binaries/kc705
+		BIN_PREFIX=$ARTIQ_PREFIX/binaries/kc705-$HARDWARE_ADAPTER
 	fi
 	search_for_proxy $PROXY
 elif [ "$BOARD" == "pipistrello" ]
 then
 	UDEV_RULES=99-papilio.rules
-	BITSTREAM=artiq_pipistrello-nist_qc1-pipistrello.bit
 	CABLE=papilio
 	PROXY=bscan_spi_lx45_csg324.bit
 	BIOS_ADDR=0x170000
 	RUNTIME_ADDR=0x180000
-	RUNTIME_FILE=runtime.fbi
 	FS_ADDR=0x1c0000
-	if [ -z "$BIN_PREFIX" ]; then BIN_PREFIX=$ARTIQ_PREFIX/binaries/pipistrello; fi
+	if [ -z "$BIN_PREFIX" ];
+	then
+		BIN_PREFIX=$ARTIQ_PREFIX/binaries/pipistrello-$HARDWARE_ADAPTER
+	fi
 	search_for_proxy $PROXY
 fi
 
@@ -166,9 +161,17 @@ fi
 
 set +e
 xc3sprog -c $CABLE -R > /dev/null 2>&1
-if [ "$?" != "0" ]
+STATUS=$?
+set -e
+if [ "$STATUS" == "127" ]
 then
-		echo "Flashing failed. Maybe you do not have permission to access the USB device?"
+		echo "xc3sprog not found. Please install it or check your PATH."
+		exit
+fi
+if [ "$STATUS" != "0" ]
+then
+		echo "Failed to connect to FPGA."
+		echo "Maybe you do not have permission to access the USB device?"
 		echo "To fix this you might want to add a udev rule by doing:"
 		echo "$ sudo cp $ARTIQ_PREFIX/misc/$UDEV_RULES /etc/udev/rules.d"
 		echo "Then unplug/replug your device and try flashing again"
@@ -177,7 +180,6 @@ then
 		echo "Please make sure you used the correct -t option (currently: $BOARD)"
 		exit
 fi
-set -e
 
 if [ ! -z "$FILENAME" ]
 then
@@ -188,7 +190,7 @@ fi
 if [ "${FLASH_BITSTREAM}" == "1" ]
 then
 	echo "Flashing FPGA bitstream..."
-	xc3sprog -v -c $CABLE -I$PROXY_PATH/$PROXY $BIN_PREFIX/$BITSTREAM:w:0x0:BIT
+	xc3sprog -v -c $CABLE -I$PROXY_PATH/$PROXY $BIN_PREFIX/top.bit:w:0x0:BIT
 fi
 
 if [ "${FLASH_BIOS}" == "1" ]
@@ -200,7 +202,7 @@ fi
 if [ "${FLASH_RUNTIME}" == "1" ]
 then
 	echo "Flashing ARTIQ runtime..."
-	xc3sprog -v -c $CABLE -I$PROXY_PATH/$PROXY $BIN_PREFIX/${RUNTIME_FILE}:w:$RUNTIME_ADDR:BIN
+	xc3sprog -v -c $CABLE -I$PROXY_PATH/$PROXY $BIN_PREFIX/runtime.fbi:w:$RUNTIME_ADDR:BIN
 fi
 echo "Done."
 xc3sprog -v -c $CABLE -R > /dev/null 2>&1

diff --git a/artiq/frontend/artiq_gui.py b/artiq/frontend/artiq_gui.py
@@ -10,7 +10,7 @@
 from quamash import QEventLoop, QtGui, QtCore
 from pyqtgraph import dockarea
 
-from artiq.tools import verbosity_args, init_logger
+from artiq.tools import verbosity_args, init_logger, artiq_dir
 from artiq.protocols.pc_rpc import AsyncioClient
 from artiq.gui.state import StateManager
 from artiq.gui.explorer import ExplorerDock
@@ -21,10 +21,6 @@
 from artiq.gui.console import ConsoleDock
 
 
-data_dir = os.path.join(os.path.abspath(os.path.dirname(__file__)),
-                        "..", "gui")
-
-
 def get_argparser():
     parser = argparse.ArgumentParser(description="ARTIQ GUI client")
     parser.add_argument(
@@ -46,7 +42,8 @@ def get_argparser():
 class MainWindow(QtGui.QMainWindow):
     def __init__(self, app, server):
         QtGui.QMainWindow.__init__(self)
-        self.setWindowIcon(QtGui.QIcon(os.path.join(data_dir, "icon.png")))
+        icon = QtGui.QIcon(os.path.join(artiq_dir, "gui", "icon.png"))
+        self.setWindowIcon(icon)
         self.setWindowTitle("ARTIQ - {}".format(server))
         self.exit_request = asyncio.Event()
 
@@ -67,14 +64,17 @@ def main():
     app = QtGui.QApplication([])
     loop = QEventLoop(app)
     asyncio.set_event_loop(loop)
-    atexit.register(lambda: loop.close())
+    atexit.register(loop.close)
 
-    smgr = StateManager(args.db_file)
+    rpc_clients = dict()
+    for target in "schedule", "repository", "dataset_db":
+        client = AsyncioClient()
+        loop.run_until_complete(client.connect_rpc(
+            args.server, args.port_control, "master_" + target))
+        atexit.register(client.close_rpc)
+        rpc_clients[target] = client
 
-    schedule_ctl = AsyncioClient()
-    loop.run_until_complete(schedule_ctl.connect_rpc(
-        args.server, args.port_control, "master_schedule"))
-    atexit.register(lambda: schedule_ctl.close_rpc())
+    smgr = StateManager(args.db_file)
 
     win = MainWindow(app, args.server)
     area = dockarea.DockArea()
@@ -85,7 +85,9 @@ def main():
     status_bar.showMessage("Connected to {}".format(args.server))
     win.setStatusBar(status_bar)
 
-    d_explorer = ExplorerDock(win, status_bar, schedule_ctl)
+    d_explorer = ExplorerDock(win, status_bar,
+                              rpc_clients["schedule"],
+                              rpc_clients["repository"])
     smgr.register(d_explorer)
     loop.run_until_complete(d_explorer.sub_connect(
         args.server, args.port_notify))
@@ -110,25 +112,22 @@ def main():
         area.addDock(d_datasets, "top")
     area.addDock(d_explorer, "above", d_datasets)
 
-    d_schedule = ScheduleDock(status_bar, schedule_ctl)
+    d_schedule = ScheduleDock(status_bar, rpc_clients["schedule"])
     loop.run_until_complete(d_schedule.sub_connect(
         args.server, args.port_notify))
     atexit.register(lambda: loop.run_until_complete(d_schedule.sub_close()))
+    d_explorer.get_current_schedule = d_schedule.get_current_schedule
 
     d_log = LogDock()
     smgr.register(d_log)
     loop.run_until_complete(d_log.sub_connect(
         args.server, args.port_notify))
     atexit.register(lambda: loop.run_until_complete(d_log.sub_close()))
 
-    dataset_db = AsyncioClient()
-    loop.run_until_complete(dataset_db.connect_rpc(
-        args.server, args.port_control, "master_dataset_db"))
-    atexit.register(lambda: dataset_db.close_rpc())
     def _set_dataset(k, v):
-        asyncio.ensure_future(dataset_db.set(k, v))
+        asyncio.ensure_future(rpc_clients["dataset_db"].set(k, v))
     def _del_dataset(k):
-        asyncio.ensure_future(dataset_db.delete(k))
+        asyncio.ensure_future(rpc_clients["dataset_db"].delete(k))
     d_console = ConsoleDock(
         d_datasets.get_dataset,
         _set_dataset,

diff --git a/artiq/frontend/artiq_master.py b/artiq/frontend/artiq_master.py
@@ -83,7 +83,12 @@ def main():
         "log": log_worker
     }
     scheduler = Scheduler(get_last_rid() + 1, worker_handlers, repo_backend)
-    worker_handlers["scheduler_submit"] = scheduler.submit
+    worker_handlers.update({
+        "scheduler_submit": scheduler.submit,
+        "scheduler_delete": scheduler.delete,
+        "scheduler_request_termination": scheduler.request_termination,
+        "scheduler_get_status": scheduler.get_status
+    })
     scheduler.start()
     atexit.register(lambda: loop.run_until_complete(scheduler.stop()))
 

diff --git a/artiq/frontend/artiq_run.py b/artiq/frontend/artiq_run.py
@@ -38,20 +38,28 @@ def run(self):
 
 class DummyScheduler:
     def __init__(self):
-        self.next_rid = 0
+        self.rid = 0
         self.pipeline_name = "main"
         self.priority = 0
         self.expid = None
 
+        self._next_rid = 1
+
     def submit(self, pipeline_name, expid, priority, due_date, flush):
-        rid = self.next_rid
-        self.next_rid += 1
+        rid = self._next_rid
+        self._next_rid += 1
         logger.info("Submitting: %s, RID=%s", expid, rid)
         return rid
 
     def delete(self, rid):
         logger.info("Deleting RID %s", rid)
 
+    def request_termination(self, rid):
+        logger.info("Requesting termination of RID %s", rid)
+
+    def get_status(self):
+        return dict()
+
     def pause(self):
         pass