From 1d44f945a2fd163b35dc30f599fdcc5e016011bc Mon Sep 17 00:00:00 2001
From: Joshua Bakita <jbakita@cs.unc.edu>
Date: Tue, 9 Mar 2021 20:49:40 -0500
Subject: Benchmarks: Move thrashing task to a submodule and update paths

---
 .gitmodules               |  4 ++++
 dis/run_pair_convexity.sh | 14 +++++++-------
 run_bench.sh              | 14 +++++++-------
 thrasher                  |  1 +
 4 files changed, 19 insertions(+), 14 deletions(-)
 create mode 160000 thrasher

diff --git a/.gitmodules b/.gitmodules
index ebc7523..53b771e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,7 @@
 [submodule "wbinvd"]
 	path = wbinvd
 	url = https://github.com/JoshuaJB/wbinvd.git
+[submodule "thrasher"]
+	path = thrasher
+	url = https://github.com/JoshuaJB/imx6q-thrasher.git
+	branch = amd-3950x-thrasher
diff --git a/dis/run_pair_convexity.sh b/dis/run_pair_convexity.sh
index a4e204f..bdd25c8 100644
--- a/dis/run_pair_convexity.sh
+++ b/dis/run_pair_convexity.sh
@@ -100,7 +100,7 @@ cat /sys/fs/resctrl/schemata
 echo "=== Core $firstCore and $secondCore Config ==="
 cat /sys/fs/resctrl/benchmarks/schemata
 if [[ $8 == "--contend" ]]; then
-    if [[ ! -f "/playpen/mc2/imx6q-thrasher/thrasher" ]]; then
+    if [[ ! -f "../thrasher/thrasher" ]]; then
         echo "ERROR: thrasher binary not fonud. Exiting..."
         exit
     fi
@@ -124,12 +124,12 @@ read
 if [[ $8 == "--contend" ]]; then
     echo "Done. Starting 6 contending tasks..."
     # Run two contending tasks on each other CCX
-    taskset -c 1 /playpen/mc2/imx6q-thrasher/thrasher &
-    taskset -c 2 /playpen/mc2/imx6q-thrasher/thrasher &
-    taskset -c 5 /playpen/mc2/imx6q-thrasher/thrasher &
-    taskset -c 6 /playpen/mc2/imx6q-thrasher/thrasher &
-    taskset -c 9 /playpen/mc2/imx6q-thrasher/thrasher &
-    taskset -c 10 /playpen/mc2/imx6q-thrasher/thrasher &
+    taskset -c 1 ../thrasher/thrasher &
+    taskset -c 2 ../thrasher/thrasher &
+    taskset -c 5 ../thrasher/thrasher &
+    taskset -c 6 ../thrasher/thrasher &
+    taskset -c 9 ../thrasher/thrasher &
+    taskset -c 10 ../thrasher/thrasher &
 fi
 sleep 1 # Wait for contending tasks to start
 echo "Done. Beginning benchmarks..."
diff --git a/run_bench.sh b/run_bench.sh
index 6c92fd5..c5ed73b 100755
--- a/run_bench.sh
+++ b/run_bench.sh
@@ -111,7 +111,7 @@ if [[ $userRunID == "" ]]; then
     echo "Missing argument: a run ID is required"
     exit
 fi
-if [[ -v contend && ! -f "/playpen/mc2/imx6q-thrasher/thrasher" ]]; then
+if [[ -v contend && ! -f "./thrasher/thrasher" ]]; then
     echo "ERROR: cannot find thrasher binary for -B. Exiting..."
     exit
 fi
@@ -307,12 +307,12 @@ read
 if [[ -v contend ]]; then
     echo "Done. Starting 6 contending tasks..."
     # Run two contending tasks on each other CCX
-    taskset -c 1 /playpen/mc2/imx6q-thrasher/thrasher &
-    taskset -c 2 /playpen/mc2/imx6q-thrasher/thrasher &
-    taskset -c 5 /playpen/mc2/imx6q-thrasher/thrasher &
-    taskset -c 6 /playpen/mc2/imx6q-thrasher/thrasher &
-    taskset -c 9 /playpen/mc2/imx6q-thrasher/thrasher &
-    taskset -c 10 /playpen/mc2/imx6q-thrasher/thrasher &
+    taskset -c 1 ./thrasher/thrasher &
+    taskset -c 2 ./thrasher/thrasher &
+    taskset -c 5 ./thrasher/thrasher &
+    taskset -c 6 ./thrasher/thrasher &
+    taskset -c 9 ./thrasher/thrasher &
+    taskset -c 10 ./thrasher/thrasher &
 fi
 sleep 1 # Wait for contending tasks to start
 echo "Done. Beginning benchmarks..."
diff --git a/thrasher b/thrasher
new file mode 160000
index 0000000..8f91787
--- /dev/null
+++ b/thrasher
@@ -0,0 +1 @@
+Subproject commit 8f9178743c340f36f1634f91e9b798499476a619
-- 
cgit v1.2.2