From 10348beefffa03d86a06e4cd0fec1bc46099004d Mon Sep 17 00:00:00 2001
From: Ciro Santilli <ciro.santilli@gmail.com>
Date: Sat, 7 Apr 2018 18:31:55 +0100
Subject: [PATCH] bench-boot and trace-boot: make keys more pareseable and
 meaningful

---
 bench-boot | 5 ++---
 trace-boot | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/bench-boot b/bench-boot
index adeeeac5..510f34e7 100755
--- a/bench-boot
+++ b/bench-boot
@@ -7,7 +7,7 @@ bench() (
   env time --append -f 'time %e' --output="$results_file" ./eeval "./run -a $1" "$results_file"
 )
 insts() (
-  { printf 'insts '; ./gem5-stat -a "$1" sim_insts; } >> "$results_file"
+  { printf 'instructions '; ./gem5-stat -a "$1" sim_insts; } >> "$results_file"
 )
 rm -f "${results_file}"
 
@@ -16,8 +16,7 @@ arch=arm
 #bench "$arch -E '/poweroff.out'"
 bench "$arch -E 'm5 exit' -g"
 insts "$arch"
-# TODO didn't finish after 20 minutes? Stuck at:
-# ftrace: allocating 28852 entries in 85 pages
+# TODO takes more than 1 hours to finish. Why so long?
 #bench "$arch -E 'm5 exit' -g -- --caches --cpu-type=HPI"
 #insts "$arch"
 
diff --git a/trace-boot b/trace-boot
index 26d0cbbc..93230033 100755
--- a/trace-boot
+++ b/trace-boot
@@ -16,8 +16,8 @@ time ./qemu/scripts/simpletrace.py "${build_dir}/host-qemu-custom/trace-events-a
 # Instruction count.
 # We could put this on a separate script, but it just adds more arch boilerplate to a new script.
 # So let's just leave it here for now since it did not add a significant processing time.
-echo "instruction count all: $(wc -l "${qemu_out_dir}/trace.txt" | cut -d' ' -f1)"
+echo "instructions $(wc -l "${qemu_out_dir}/trace.txt" | cut -d' ' -f1)"
 entry_addr=$("${host_dir}"/bin/*-buildroot-*-readelf -h "${build_dir}/linux-custom/vmlinux" | grep 'Entry point address' | sed -E 's/.*: *//')
-echo "entry address: ${entry_addr}"
+echo "entry_address ${entry_addr}"
 sed "/${entry_addr}/q" "${qemu_out_dir}/trace.txt" >"${qemu_out_dir}/trace-boot.txt"
-echo "instruction count firmware: $(wc -l "${qemu_out_dir}/trace-boot.txt" | cut -d' ' -f1)"
+echo "instructions_firmware $(wc -l "${qemu_out_dir}/trace-boot.txt" | cut -d' ' -f1)"