[pull] master from firesim:master

boards/firechip/base-workloads/fedora-base.json

@@ -16,5 +16,10 @@
   },
   "firmware" : {
       "opensbi-src" : "../../firmware/opensbi"
-  }
+  },
+  "host-init" : "host-init.sh",
+  "files" : [
+      [ "trigger/start", "/usr/bin/firesim-start-trigger"],
+      [ "trigger/end", "/usr/bin/firesim-end-trigger"]
+  ]
 }

boards/firechip/base-workloads/fedora-base/host-init.sh

@@ -0,0 +1 @@
+../br-base/host-init.sh

boards/firechip/base-workloads/fedora-base/linux-config

@@ -61,6 +61,6 @@ CONFIG_RISCV_ROCC=y
 CONFIG_STACKPROTECTOR_PER_TASK=y
 CONFIG_TOOLCHAIN_HAS_ZICBOM=y
 CONFIG_TOOLCHAIN_HAS_ZIHINTPAUSE=y
+# CONFIG_RISCV_PMU is not set
 CONFIG_OVERRIDE_RNG_ENTROPY=y
 CONFIG_OVERRIDE_RNG_ENTROPY_VALUE=256
-

boards/firechip/base-workloads/fedora-base/trigger

@@ -0,0 +1 @@
+../br-base/trigger/

boards/firechip/base-workloads/ubuntu-base.json

@@ -17,5 +17,10 @@
   },
   "firmware" : {
       "opensbi-src" : "../../firmware/opensbi"
-  }
+  },
+  "host-init" : "host-init.sh",
+  "files" : [
+      [ "trigger/start", "/usr/bin/firesim-start-trigger"],
+      [ "trigger/end", "/usr/bin/firesim-end-trigger"]
+  ]
 }

boards/firechip/base-workloads/ubuntu-base/host-init.sh

@@ -0,0 +1 @@
+../br-base/host-init.sh

boards/firechip/base-workloads/ubuntu-base/linux-config

@@ -61,5 +61,8 @@ CONFIG_RISCV_ROCC=y
 CONFIG_STACKPROTECTOR_PER_TASK=y
 CONFIG_TOOLCHAIN_HAS_ZICBOM=y
 CONFIG_TOOLCHAIN_HAS_ZIHINTPAUSE=y
+# CONFIG_RISCV_PMU is not set
 CONFIG_BLK_DEV_DM=y
 CONFIG_DM_MULTIPATH=y
+CONFIG_OVERRIDE_RNG_ENTROPY=y
+CONFIG_OVERRIDE_RNG_ENTROPY_VALUE=256

boards/firechip/base-workloads/ubuntu-base/trigger

@@ -0,0 +1 @@
+../br-base/trigger/

docs/source/commands.rst

@@ -94,8 +94,8 @@ workload.
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 In some cases, you may need to boot your workload in spike (typically due to a
 custom ISA extension or hardware model). In that case, you may use the -s
-option. Note that spike currently does not support network or block devices.
-You must pass the --no-disk option to FireMarshal when using spike.
+option. Note that spike currently does not support network.
+You may need to pass the --no-disk option to FireMarshal when using spike.
 
 clean
 --------------------------------------
@@ -115,8 +115,7 @@ included in the output directory.
 
 ``-s --spike``
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Test using spike instead of qemu (requires the --no-disk option to the
-``marshal`` command).
+Test using spike instead of qemu.
 
 ``-m testDir --manual testDir``
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

docs/source/internal/Build.rst

@@ -4,10 +4,12 @@ Build Process
 
 The goal of building a workload is to produce a working boot binary and
 (optionally) a root filesystem to boot from. The same outputs are used for
-Spike, Qemu, and FireSim. The one exception is that Spike does not support a
-disk, so users may choose to create an initramfs-only version of their workload
-for Spike (that binary will boot on Qemu and FireSim as well). The build process
-proceeds as follows:
+Spike, Qemu, and FireSim. Spike now supports a disk. In order to use a disk,
+``libspikedevices.so`` should be installed by Chipyard to the ``RISCV`` library path (i.e. ``$RISCV/lib``)).
+The Iceblk block device model will be used as the default block device model. Users may also choose to create 
+an initramfs-only version of their workload instead for Spike
+(that binary will boot on Qemu and FireSim as well).
+The build process proceeds as follows:
 
 Build Parents
 --------------------

wlutil/launch.py

@@ -32,22 +32,30 @@ def get_free_tcp_port():
 # Returns a command string to launch the given config in spike. Must be called with shell=True.
 def getSpikeCmd(config, nodisk=False):
     log = logging.getLogger()
-
+    spikeArgs = ''
     if 'img' in config and config['img-hardcoded']:
         log.warn("You have hard-coded a disk image in your workload. Spike does not support disk images, your workload may not work correctly. Consider building with the '--nodisk' option (for linux-based workloads).")
     elif 'img' in config and not nodisk:
-        raise ValueError("Spike does not support disk-based configurations")
+        riscv_lib_path = os.getenv('RISCV')
+        if riscv_lib_path is None:
+            raise ValueError("The RISCV environment variable is not set")
+        elif not os.path.isfile(riscv_lib_path+'/lib/libspikedevices.so'):
+            raise ValueError("Spike does not support disk-based configurations without libspikedevices.so installed by Chipyard")
+        else:
+            spikeArgs += '--extlib=libspikedevices.so ' +\
+                         "--device=\"iceblk," +\
+                         'img=' + str(config.get('img', '')) + "\" "
 
     if 'spike' in config:
         spikeBin = str(config['spike'])
     else:
         spikeBin = 'spike'
 
     cmd = [spikeBin,
+           spikeArgs,
            config.get('spike-args', ''),
            ' -p' + str(config['cpus']),
            ' -m' + str(int(config['mem'] / (1024*1024)))]
-
     if nodisk:
         cmd.append(str(wlutil.noDiskPath(config['bin'])))
     else:
@@ -119,12 +127,14 @@ def launchWorkload(baseConfig, jobs=None, spike=False, silent=False):
     baseResDir = wlutil.getOpt('res-dir') / wlutil.getOpt('run-name')
 
     screenIdentifiers = {}
+    uartlogs = []
 
     try:
         for config in configs:
             if config['launch']:
                 runResDir = baseResDir / config['name']
                 uartLog = runResDir / "uartlog"
+                uartlogs.append(uartLog)
                 os.makedirs(runResDir)
 
                 if spike:
@@ -156,6 +166,15 @@ def launchWorkload(baseConfig, jobs=None, spike=False, silent=False):
         for proc in jobProcs:
             proc.wait()
 
+        for uartlog in uartlogs:
+            try:
+                with open(uartlog, 'r') as f:
+                    last_line = f.readlines()[-1]
+                    if 'COMMAND_EXIT_CODE="0"' not in last_line:
+                        raise RuntimeError("One (or more) job(s) returned a non-zero error code. Please check output.")
+            except FileNotFoundError:
+                raise RuntimeError(f"Unable to check output of job with {uartlog} uartlog.")
+
     except Exception:
         cleanUpSubProcesses()
         raise