Several fixes and improvements

- Create efi-vars disk images for each instance: this prevents them
  stomping on the single copy, corrupting it and causing the firmware to
  crash.
- Improve README.md.
- Create a new file env.sh to hold common variables such as version
  numbers.
- Replace duplication of version numbers by environment variables.
- Fix issues noted by ShellCheck.
- Improve stop_qemu.sh by storing the QEMU PIDs in qemu_pids.txt and
  using that to kill the instances.
- Count the rounds from 1, not 0.
- Clean up more files in stop_qemu.sh.
- In run_pts.sh, wait for the ssh commands to finish.

Author: Rebecca Cran

README.md

@@ -40,17 +40,18 @@ It should run on other distros and architectures (POWER, RISCV64, LOONGSON etc.)
 ## Run
 
 Run PTS / coremark on each instance.
-Argument 1 is the number of times you want to run Coremark on each QEMU.
+Argument 1 is the number of times you want to run CoreMark on each QEMU.
 Default Value is 1
 
 ```
 ./run_pts.sh <count>
 ```
-Example - It will report the output as follow -
+Example - it will report the output as follow -
 ```
-	$ ./run_pts_once.sh 2
-	23 QEMU running in parallel. Total CoreMark Score is: 1937195
-	23 QEMU running in parallel. Total CoreMark Score is: 1940554
+	$ ./run_pts.sh 2
+    23 instances of pts/coremark running in parallel in arm64 VMs!
+	Round 1 - Total CoreMark Score is: 1937195
+	Round 2 - Total CoreMark Score is: 1940554
 ```
 ## Teardown
 To stop / kill QEMU instances

build_qemu.sh

@@ -4,16 +4,17 @@
 #
 # SPDX-License-Identifier: BSD-3-Clause
 
-
 # Runs coremark in an arm64 QEMU VM
-# Version 20241002-01
+# Version 20241005-01
 
 set -o errexit
 set -o nounset
 
+. env.sh
+
 echo "Checking for prerequisites"
 
-DISTRO_LIKE="$(cat /etc/os-release | grep ID_LIKE | awk -F '=' '{print $2}')"
+DISTRO_LIKE="$(grep ID_LIKE /etc/os-release | awk -F '=' '{print $2}')"
 
 if [ "${DISTRO_LIKE}" = "debian" ]; then
   QEMU_AARCH64_FW="/usr/share/qemu-efi-aarch64/QEMU_EFI.fd"
@@ -61,8 +62,6 @@ if [ "${DISTRO_LIKE}" = "debian" ]; then
     echo "Instaling bzip2"
     sudo apt-get install -y bzip2
   fi
-
-
 elif [ ! "$(command -v ninja)" ] || [ ! "$(command -v gcc)" ] || [ ! "$(command -v g++)" ] || [ ! "$(command -v git)" ] ||
      [ ! "$(command -v make)" ] || [ ! "$(command -v wget)" ] || [ ! "$(command -v  cloud-localds)" ] ||
      [ ! "$(command -v bzip2)" ]; then
@@ -82,7 +81,7 @@ fi
 echo "Downloading Phoronix Test Suite"
 mkdir phoronix-test-suite || true
 pushd phoronix-test-suite || exit 1
-wget -c -O phoronix-test-suite_10.8.4_all.deb https://phoronix-test-suite.com/releases/repo/pts.debian/files/phoronix-test-suite_10.8.4_all.deb
+wget -c -O "phoronix-test-suite_${PTS_VERSION}_all.deb" "https://phoronix-test-suite.com/releases/repo/pts.debian/files/phoronix-test-suite_${PTS_VERSION}_all.deb"
 cat >phoronix-test-suite.xml <<EOF
 <?xml version="1.0"?>
 <!--Phoronix Test Suite v10.8.4-->
@@ -170,13 +169,13 @@ EOF
 popd || exit 1
 
 # Build QEMU
-echo "8d2f4cfe25af01c73526ea0d5059fcae  qemu-9.1.0.tar.gz" > MD5SUM
+echo "${QEMU_MD5} qemu-${QEMU_VERSION}.tar.gz" > MD5SUM
 if ! md5sum -c MD5SUM; then
   echo "Downloading QEMU"
-  wget -c -O qemu-9.1.0.tar.gz https://github.com/qemu/qemu/archive/refs/tags/v9.1.0.tar.gz
+  wget -c -O qemu-${QEMU_VERSION}.tar.gz https://github.com/qemu/qemu/archive/refs/tags/v${QEMU_VERSION}.tar.gz
 fi
-tar xf qemu-9.1.0.tar.gz
-pushd qemu-9.1.0 || exit 1
+tar xf qemu-${QEMU_VERSION}.tar.gz
+pushd qemu-${QEMU_VERSION} || exit 1
 if [ ! -e "build/qemu-system-aarch64" ]; then
   echo "Building QEMU"
   ./configure --target-list=aarch64-softmmu --enable-slirp --enable-kvm
@@ -189,7 +188,6 @@ echo "Setting up VM configuration"
 cp -vf "${QEMU_AARCH64_FW}" efi-code.img
 
 truncate -s 64m efi-code.img
-truncate -s 64m efi-vars.img
 
 SSH_KEY_FILE="id_rsa_coremark_qemu"
 if [ ! -e "${SSH_KEY_FILE}" ]; then

env.sh

@@ -0,0 +1,8 @@
+# Copyright (c) 2024, Ampere Computing LLC
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
+QEMU_VERSION="9.1.0"
+QEMU_MD5="8d2f4cfe25af01c73526ea0d5059fcae"
+PTS_VERSION="10.8.4"
+DEBIAN_FILENAME="debian-12-genericcloud-arm64-20240901-1857.qcow2"

launch_qemu.sh

@@ -7,14 +7,17 @@
 set -o errexit
 set -o nounset
 
-bash stop_qemu.sh
-sleep 5
+. env.sh
+
+if [ -f "qemu_pids.txt" ]; then
+  ./stop_qemu.sh
+fi
 
 # Download img file (debian genericcloud arm64) to load into QEMU
 if [ ! -f "disk.qcow2" ]; then
   echo "Downloading Debian 'genericcloud' arm64 image"
-  wget -c -O debian-12-genericcloud-arm64-20240901-1857.qcow2 https://cloud.debian.org/images/cloud/bookworm/20240901-1857/debian-12-genericcloud-arm64-20240901-1857.qcow2
-  ./qemu-9.1.0/build/qemu-img resize -q debian-12-genericcloud-arm64-20240901-1857.qcow2 5G
+  wget -c -O "${DEBIAN_FILENAME}" "https://cloud.debian.org/images/cloud/bookworm/20240901-1857/${DEBIAN_FILENAME}"
+  "./qemu-${QEMU_VERSION}/build/qemu-img" resize -q "${DEBIAN_FILENAME}" 5G
 fi
 
 if [ "$(uname -m)" = "aarch64" ]; then
@@ -27,18 +30,23 @@ fi
 
 echo -n "Running QEMU VMs"
 
-bash ./thread.sh
+./thread.sh
 
 count=0
 portnum=2000
 qemu_pids=()
 while read line; do
-  if [ ! -f "disk${count}.qemu" ]; then
-    ./qemu-9.1.0/build/qemu-img create -q -f qcow2 -F qcow2 -b debian-12-genericcloud-arm64-20240901-1857.qcow2 disk${count}.qcow2
+  if [ ! -f "disk${count}.qcow2" ]; then
+    "./qemu-${QEMU_VERSION}/build/qemu-img" create -q -f qcow2 -F qcow2 -b "${DEBIAN_FILENAME}" "disk${count}.qcow2"
+  fi
+
+  if [ ! -f "efi-vars-${count}.img" ]; then
+    truncate -s 64m "efi-vars-${count}.img"
   fi
 
+  # shellcheck disable=SC2086
   nohup taskset -c ${line} \
-    $PWD/qemu-9.1.0/build/qemu-system-aarch64 \
+    "$PWD/qemu-${QEMU_VERSION}/build/qemu-system-aarch64" \
       -machine virt,gic-version=max        \
       -m 4G                                \
       -cpu ${QEMU_CPU}                     \
@@ -67,8 +75,7 @@ sleep 5
 echo "Checking if VMs successfully started."
 count=0
 for p in "${qemu_pids[@]}"; do
-  if ! kill -0 $p 2>/dev/null; then
-    #wait $!
+  if ! kill -0 "$p" 2>/dev/null; then
     echo "QEMU VM ${count} failed to start. See /tmp/qemu${count}.log for details."
     exit 1
   fi
@@ -89,5 +96,6 @@ while read line; do
   count=$((count+1))
 done < core_spread.txt
 
+echo "${qemu_pids[@]}" > "qemu_pids.txt"
 
 echo "The QEMU VMs are ready."

run_pts.sh

@@ -8,55 +8,46 @@ set -o errexit
 set -o nounset
 
 # Assign default value if no argument is passed
-arg=${1:-1}
+num_iterations=${1:-1}
 
 num_inst=$(wc -l core_spread.txt | cut -d" " -f1)
-num_minus_1=$((num_inst-1))
-num_minus_2=$((num_inst-2))
-count=0
 
-SSH_KEY_FILE="id_rsa_coremark_qemu"
+ssh_key_file="id_rsa_coremark_qemu"
 
 echo "${num_inst} instances of pts/coremark running in parallel in arm64 VMs!"
-while true; do
+ssh_pids=()
+# shellcheck disable=SC2034
+for iter in $(seq 1 ${num_iterations}); do
 
   rm -f /tmp/20*
   portnum=2000;
 
-  for i in $(seq 0 ${num_minus_2}); do
+  # shellcheck disable=SC2034
+  for i in $(seq 0 $((num_inst-1))); do
     ssh                           \
       -p ${portnum}               \
-      -i "${SSH_KEY_FILE}"        \
+      -i "${ssh_key_file}"        \
       debian@localhost            \
       -o StrictHostKeyChecking=no \
       "phoronix-test-suite debug-benchmark pts/coremark" >> /tmp/${portnum} 2>&1 &
-    portnum=$((${portnum}+1))
+    ssh_pids+=($!)
+    portnum=$((portnum+1))
   done
 
-  ssh                                  \
-    -p ${portnum}                      \
-    -i ${SSH_KEY_FILE}                 \
-    debian@localhost                   \
-    -o UserKnownHostsFile=/dev/null    \
-    -o StrictHostKeyChecking=no        \
-    "phoronix-test-suite debug-benchmark pts/coremark" >> /tmp/${portnum} 2>&1
+  for pid in "${ssh_pids[@]}"; do
+    wait "${pid}"
+  done
 
-  sleep 10
   sum=0
   portnum=2000;
 
   # Add the coremark scores
-  for i in $(seq 0 ${num_minus_1}); do
+  # shellcheck disable=SC2034
+  for i in $(seq 0 $((num_inst-1))); do
     score=$(cat /tmp/${portnum} | grep "Average: " | cut -d " " -f2 | cut -d"." -f1)
     sum=$((sum+score))
     portnum=$((portnum+1))
   done
 
-  echo "Round ${count} - Total CoreMark Score is: ${sum}"
-
-  count=$((count+1))
-
-  if [ "${count}" -ge "$arg" ]; then
-    exit 0;
-  fi
+  echo "Round ${iter} - Total CoreMark Score is: ${sum}"
 done

stop_qemu.sh

@@ -4,6 +4,14 @@
 #
 # SPDX-License-Identifier: BSD-3-Clause
 
-killall qemu-system-aarch64
-rm -rf disk*.qcow2
+if [ -f "qemu_pids.txt" ]; then
+  QEMU_PIDS="$(cat qemu_pids.txt)"
+  # shellcheck disable=SC2059
+  kill ${QEMU_PIDS}
+fi
+rm -f disk*.qcow2
+rm -f efi-vars-*.img
 rm -f /tmp/qemu*.log
+rm -f /tmp/20*
+rm -f qemu_pids.txt
+rm -f core_spread.txt