fxmark: add ssd support

Signed-off-by: Li Zhijian <[email protected]>
Signed-off-by: Philip Li <[email protected]>

jobs/fxmark-1hdd.yaml

@@ -0,0 +1,6 @@
+<< : jobs/fxmark.yaml
+
+disk:
+ - 1HDD
+
+media: hdd

jobs/fxmark-1ssd.yaml

@@ -0,0 +1,6 @@
+<< : jobs/fxmark.yaml
+
+disk:
+ - 1SSD
+
+media: ssd

jobs/fxmark.yaml

@@ -4,9 +4,6 @@ suite: fxmark
 testcase: fxmark
 category: benchmark
 
-disk:
-- 1HDD
-
 fxmark:
  test:
   - DWAL
@@ -32,7 +29,6 @@ fxmark:
   - DRBH
   - DRBM
   - DRBL
- media: hdd
  fstype:
   - ext4
   - ext4_no_jnl

tests/fxmark

@@ -9,12 +9,32 @@
 cd $BENCHMARK_ROOT/$testcase || die "can not enter $BENCHMARK_ROOT/$testcase"
 
 # fxmark can not be run until we change the source to fit the target machine
-# TODO: support more media type: ssd,nvme,mem
+# TODO: support more media type: nvme,mem
+# after setup_config, the changes are like:
+# $ git diff
+# diff --git a/bin/run-fxmark.py b/bin/run-fxmark.py
+# index 2df42a5..ec3b5df 100755
+# --- a/bin/run-fxmark.py
+# +++ b/bin/run-fxmark.py
+# @@ -528,6 +528,9 @@ if __name__ == "__main__":
+#          #  ("*", "*", "*", str(cpupol.PHYSICAL_CHIPS * cpupol.CORE_PER_CHIP), "*"))
+#      ]
+#
+# +    Runner.HDDDEV="/dev/sdc"
+# +    Runner.SSDDEV="/dev/sdc"
+# +    run_config = [(Runner.CORE_FINE_GRAIN, PerfMon.LEVEL_LOW, ("hdd", "ext4", "DWAL", "*", "bufferedio")),]
+#      confirm_media_path()
+#      for c in run_config:
+#          runner = Runner(c[0], c[1], c[2])
 setup_config()
 {
 	partition="${partitions%% *}"
-	sed -i "s#HDDDEV.*=.*#HDDDEV = \"$partition\"#" bin/run-fxmark.py
-	sed -i "/    confirm_media_path()/i\    run_config = [(Runner.CORE_FINE_GRAIN, PerfMon.LEVEL_LOW, (\"$media\", \"$fstype\", \"$test\", \"*\", \"$directio\")),]"  bin/run-fxmark.py
+	[ "$partition" ] || return
+
+	sed -i "/    confirm_media_path()/i\\
+    Runner.HDDDEV = \"$partition\"\n\
+    Runner.SSDDEV = \"$partition\"\n\
+    run_config = [(Runner.CORE_FINE_GRAIN, PerfMon.LEVEL_LOW, (\"$media\", \"$fstype\", \"$test\", \"*\", \"$directio\")),]"  bin/run-fxmark.py
 }
 
 do_backup()
@@ -31,9 +51,10 @@ run()
 {
 	echo -e "Y\nY" | ./bin/run-fxmark.py
 }
+
 do_backup
 
-setup_config
+setup_config || die "failed to setup configuration"
 
 run