From 2bee672d92e58ba16b5d094a6577a810b4bd04d8 Mon Sep 17 00:00:00 2001
From: Arif Ali <arif.ali@canonical.com>
Date: Wed, 10 Jun 2020 13:50:53 +0000
Subject: [PATCH] Fix clean_arch, and update run_job

Added timestamp variable, and output the results to a file, so that these
can be viewed agin at a later date
---
 scripts/CONFIG      |  1 +
 scripts/make_hpl.sh |  2 +-
 scripts/run_job.sh  | 11 ++++++++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/scripts/CONFIG b/scripts/CONFIG
index 303219a..7562b0e 100644
--- a/scripts/CONFIG
+++ b/scripts/CONFIG
@@ -1,5 +1,6 @@
 export DOWNLOADS=~/Downloads
 export WORKDIR=~/rpi-hpl-workdir
+export RESULTSDIR=${WORKDIR}/results
 export SCRIPTSDIR=${PWD}
 export SERVICES="snap.lxd.daemon snap.lxd.daemon.unix.socket postfix systemd-timesyncd wpa_supplicant snapd snapd.apparmor.service systemd-resolved snapd.service snapd.socket"
 
diff --git a/scripts/make_hpl.sh b/scripts/make_hpl.sh
index 8480743..022ea6b 100755
--- a/scripts/make_hpl.sh
+++ b/scripts/make_hpl.sh
@@ -14,5 +14,5 @@ tar xfz ${DOWNLOADS}/${package}-${version}.tar.gz
 cd ${package}-${version}
 
 cp ${SCRIPTSDIR}/../configs/Make.rpi4-mpich .
-make arch=rpi4-mpich -j 3 cleab_arch
+make arch=rpi4-mpich -j 3 clean_arch
 make arch=rpi4-mpich -j 3 install 
diff --git a/scripts/run_job.sh b/scripts/run_job.sh
index de3ab65..20129c9 100755
--- a/scripts/run_job.sh
+++ b/scripts/run_job.sh
@@ -2,6 +2,9 @@
 
 . CONFIG
 
+mkdir -p ${RESULTSDIR}
+TIMESTAMP=$(date +%s)
+
 # stop unnecessary services
 sudo systemctl stop ${SERVICES}
 
@@ -9,4 +12,10 @@ sudo systemctl stop ${SERVICES}
 for mount in $(df -h | grep loop.*snap | awk '{print $6}'); do sudo umount $mount; done
 
 cd ${SCRIPTSDIR}/../configs
-${WORKDIR}/hpl-2.3/bin/rpi4-mpich/xhpl
+${WORKDIR}/hpl-2.3/bin/rpi4-mpich/xhpl | tee -a ${RESULTSDIR}/HPL.out.${TIMESTAMP}
+
+echo
+echo Results ...
+echo
+
+grep WR.*17 ${RESULTSDIR}/HPL.out.${TIMESTAMP}