commit d861a6ead478821d174bcd7cc77f61794c49ab7a
author David Chase <drchase@google.com> Mon Apr 17 14:58:51 2023 -0400
committer David Chase <drchase@google.com> Wed May 31 15:14:23 2023 +0000
tree ded8fd86a9f1d484dce8efef16e356357cb289ee
parent c4c5b3d18f14d8a083658ec26d06778e9a4c8437

cmd/bent: freshen cmpjob.sh and cmpcl.sh

Added optional running of localfix for better behavior on
processors than need that (e.g., arm64 Big.little), and added
more shell quoting just-in-case.

Change-Id: Ic55c0a81b2c1f2ecbae75abcb6f965a1cc862867
Reviewed-on: https://go-review.googlesource.com/c/benchmarks/+/485395
Reviewed-by: Michael Pratt <mpratt@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: David Chase <drchase@google.com>

cmd/bent/scripts/cmpcl.sh

diff --git a/cmd/bent/scripts/cmpcl.sh b/cmd/bent/scripts/cmpcl.sh
index be5cb73..5798f5d 100755
--- a/cmd/bent/scripts/cmpcl.sh
+++ b/cmd/bent/scripts/cmpcl.sh
@@ -26,6 +26,11 @@
 N=15
 B=1
 
+# Adjust N, B, define NUMACTL, set GOMAXPROCS, as necessary.
+if [ -e ./localfix ] ; then
+	. ./localfix
+fi
+
 cd "${ROOT}"
 
 if [ -e go-old ] ; then
@@ -88,7 +93,7 @@
 export newtag
 
 cd "${ROOT}"
-${PERFLOCK} bent -v -N=${N} -a=${B} -L=bentjobs.log -C=configurations-cmpjob.toml "$@"
+GOARCH="${BENTARCH}" ${NUMACTL} ${PERFLOCK}  bent -v -N=${N} -a=${B} -L=bentjobs.log -C=configurations-cmpjob.toml "$@"
 RUN=`tail -1 bentjobs.log | awk -c '{print $1}'`
 
 cd bench
@@ -102,11 +107,11 @@
 oldlog="old-${oldtag}"
 newlog="new-${newtag}"
 
-cat ${RUN}.Old.build > ${oldlog}
-cat ${RUN}.New.build > ${newlog}
-egrep '^(Benchmark|[-_a-zA-Z0-9]+:)' ${RUN}.Old.stdout >> ${oldlog}
-egrep '^(Benchmark|[-_a-zA-Z0-9]+:)' ${RUN}.New.stdout >> ${newlog}
-cat ${RUN}.Old.{benchsize,benchdwarf} >> ${oldlog}
-cat ${RUN}.New.{benchsize,benchdwarf} >> ${newlog}
+cat "${RUN}.Old.build" > "${oldlog}"
+cat "${RUN}.New.build" > "${newlog}"
+egrep '^(Benchmark|[-_a-zA-Z0-9]+:)' "${RUN}.Old.stdout" >> "${oldlog}"
+egrep '^(Benchmark|[-_a-zA-Z0-9]+:)' "${RUN}.New.stdout" >> "${newlog}"
+cat "${RUN}.Old.{benchsize,benchdwarf}" >> "${oldlog}"
+cat "${RUN}.New.{benchsize,benchdwarf}" >> "${newlog}"
 benchsave -header "${STAMP}" "${oldlog}" "${newlog}"
 rm "${STAMP}"

cmd/bent/scripts/cmpjob.sh

diff --git a/cmd/bent/scripts/cmpjob.sh b/cmd/bent/scripts/cmpjob.sh
index b8fc8be..ef1a05d 100755
--- a/cmd/bent/scripts/cmpjob.sh
+++ b/cmd/bent/scripts/cmpjob.sh
@@ -32,6 +32,11 @@
 N=15
 B=1
 
+# Adjust N, B, define NUMACTL, set GOMAXPROCS, as necessary.
+if [ -e ./localfix ] ; then
+	. ./localfix
+fi
+
 REPO="https://go.googlesource.com/go"
 
 cd "${ROOT}"
@@ -82,7 +87,7 @@
 fi
 
 cd "${ROOT}"
-${PERFLOCK} bent -v -N=${N} -a=${B} -L=bentjobs.log -C=configurations-cmpjob.toml "$@"
+GOARCH="${BENTARCH}" ${NUMACTL} ${PERFLOCK}  bent -v -N=${N} -a=${B} -L=bentjobs.log -C=configurations-cmpjob.toml "$@"
 RUN=`tail -1 bentjobs.log | awk -c '{print $1}'`
 
 cd bench