From caec5ed465712b447ad712f1d23b40970a04cf8e Mon Sep 17 00:00:00 2001
From: Sagar Karandikar <sagark@eecs.berkeley.edu>
Date: Thu, 31 Jan 2019 22:39:47 +0000
Subject: [PATCH] flash stress includes runworkload now

---
 deploy/workloads/Makefile                     |  4 +-
 .../unittest/flash-stress-config.ini          |  2 +-
 deploy/workloads/unittest/flash-stress.json   | 58 ++-----------------
 deploy/workloads/unittest/run-flash-stress.sh |  1 +
 4 files changed, 10 insertions(+), 55 deletions(-)

diff --git a/deploy/workloads/Makefile b/deploy/workloads/Makefile
index c90e0c96..291fc440 100644
--- a/deploy/workloads/Makefile
+++ b/deploy/workloads/Makefile
@@ -63,6 +63,8 @@ simperf-test-scale: simperf-test
 
 simperf-test-latency: simperf-test
 
+flash-stress: simperf-test-latency
+
 iperf3: iperf3.json
 	mkdir -p $@
 	cd $@ && ln -sf ../$(BASE_LINUX) bbl-vmlinux
@@ -90,4 +92,4 @@ ccbench-cache-sweep:
 	memcached-thread-imbalance bw-test-one-instance bw-test-two-instances \
 	ping-latency simperf-test simperf-test-latency simperf-test-scale \
 	iperf3 check-rtc check-rtc-linux allpaper checksum-test \
-	ccbench-cache-sweep
+	ccbench-cache-sweep flash-stress
diff --git a/deploy/workloads/unittest/flash-stress-config.ini b/deploy/workloads/unittest/flash-stress-config.ini
index 495a3501..33d30f01 100644
--- a/deploy/workloads/unittest/flash-stress-config.ini
+++ b/deploy/workloads/unittest/flash-stress-config.ini
@@ -1,5 +1,5 @@
 [runfarm]
-runfarmtag=bwtest-mainrunfarm
+runfarmtag=flash-stress
 
 f1_16xlarges=1
 m4_16xlarges=0
diff --git a/deploy/workloads/unittest/flash-stress.json b/deploy/workloads/unittest/flash-stress.json
index f492d231..3a873dcd 100644
--- a/deploy/workloads/unittest/flash-stress.json
+++ b/deploy/workloads/unittest/flash-stress.json
@@ -1,55 +1,7 @@
 {
-  "benchmark_name" : "bw-test-two-instances",
-  "common_simulation_outputs" : ["uartlog"],
-  "common_rootfs" : "dummy.ext2",
-  "workloads" : [
-    {
-      "name" : "client-0",
-      "bootbinary" : "bw-test-client-0.riscv",
-      "simulation_outputs": [],
-      "outputs" : []
-    },
-    {
-      "name" : "client-1",
-      "bootbinary" : "bw-test-client-1.riscv",
-      "simulation_outputs": [],
-      "outputs" : []
-    },
-    {
-      "name" : "client-2",
-      "bootbinary" : "bw-test-client-2.riscv",
-      "simulation_outputs": [],
-      "outputs" : []
-    },
-    {
-      "name" : "client-3",
-      "bootbinary" : "bw-test-client-3.riscv",
-      "simulation_outputs": [],
-      "outputs" : []
-    },
-    {
-      "name" : "client-4",
-      "bootbinary" : "bw-test-client-4.riscv",
-      "simulation_outputs": [],
-      "outputs" : []
-    },
-    {
-      "name" : "client-5",
-      "bootbinary" : "bw-test-client-5.riscv",
-      "simulation_outputs": [],
-      "outputs" : []
-    },
-    {
-      "name" : "client-6",
-      "bootbinary" : "bw-test-client-6.riscv",
-      "simulation_outputs": [],
-      "outputs" : []
-    },
-    {
-      "name" : "client-7",
-      "bootbinary" : "bw-test-client-7.riscv",
-      "simulation_outputs": [],
-      "outputs" : []
-    }
-  ]
+  "benchmark_name" : "simperf-test-latency",
+  "common_bootbinary" : "bbl-vmlinux",
+  "common_rootfs"     : "poweroffnode.ext2",
+  "common_outputs"    : [],
+  "common_simulation_outputs" : ["uartlog"]
 }
diff --git a/deploy/workloads/unittest/run-flash-stress.sh b/deploy/workloads/unittest/run-flash-stress.sh
index fd53e6b4..6492a48d 100755
--- a/deploy/workloads/unittest/run-flash-stress.sh
+++ b/deploy/workloads/unittest/run-flash-stress.sh
@@ -21,6 +21,7 @@ date >> STRESSRUNS
 while [ $COUNTER -gt 0 ]; do
     firesim launchrunfarm -c workloads/unittest/flash-stress-config.ini
     firesim infrasetup -c workloads/unittest/flash-stress-config.ini
+    firesim runworkload -c workloads/unittest/flash-stress-config.ini
     firesim terminaterunfarm -c workloads/unittest/flash-stress-config.ini --forceterminate
     echo "done $COUNTER"
     echo "done $COUNTER" >> STRESSRUNS