cmd/bent: cleanup cronjob.sh and cronjob configuration toml
Change-Id: I3365065d5fb1408bf5606c676e86e4dc0742f067
Reviewed-on: https://go-review.googlesource.com/c/benchmarks/+/432360
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: David Chase <drchase@google.com>
Reviewed-by: Michael Pratt <mpratt@google.com>
diff --git a/cmd/bent/configs/configurations-cronjob.toml b/cmd/bent/configs/configurations-cronjob.toml
index eac54d0..8f19c7d 100644
--- a/cmd/bent/configs/configurations-cronjob.toml
+++ b/cmd/bent/configs/configurations-cronjob.toml
@@ -1,18 +1,18 @@
[[Configurations]]
- Name = "Base"
+ Name = "baseline"
Root = "$ROOT/${BASE}"
AfterBuild = [ "benchsize", "benchdwarf" ]
GcEnv = ["GOARCH=${BENTARCH}"]
[[Configurations]]
- Name = "Tip"
+ Name = "experiment"
Root = "$ROOT/go-tip/"
AfterBuild = [ "benchsize", "benchdwarf" ]
GcEnv = ["GOARCH=${BENTARCH}"]
RunEnv = ["GOARCH=${BENTARCH}"]
[[Configurations]]
- Name = "Base-prof"
+ Name = "baseline-prof"
Root = "$ROOT/${BASE}"
RunWrapper = ["cpuprofile"]
GcEnv = ["GOARCH=${BENTARCH}"]
@@ -20,7 +20,7 @@
Disabled = true
[[Configurations]]
- Name = "Tip-prof"
+ Name = "experiment-prof"
Root = "$ROOT/go-tip/"
RunWrapper = ["cpuprofile"]
GcEnv = ["GOARCH=${BENTARCH}"]
@@ -28,7 +28,7 @@
Disabled = true
[[Configurations]]
- Name = "Tip-prof-nopreempt"
+ Name = "experiment-prof-nopreempt"
Root = "$ROOT/go-tip/"
RunWrapper = ["cpuprofile"]
RunEnv = ["GODEBUG=asyncpreemptoff=1", "GOARCH=${BENTARCH}"]
@@ -36,7 +36,7 @@
Disabled = true
[[Configurations]]
- Name = "BaseNl"
+ Name = "baseline-Nl"
GcFlags = "-N -l"
Root = "$ROOT/${BASE}"
AfterBuild = [ "benchsize", "benchdwarf" ]
@@ -45,7 +45,7 @@
Disabled = true
[[Configurations]]
- Name = "TipNl"
+ Name = "experiment-Nl"
GcFlags = "-N -l"
Root = "$ROOT/go-tip/"
AfterBuild = [ "benchsize", "benchdwarf" ]
@@ -54,7 +54,7 @@
Disabled = true
[[Configurations]]
- Name = "Basel"
+ Name = "baseline-l"
GcFlags = "-l"
Root = "$ROOT/${BASE}"
AfterBuild = [ "benchsize", "benchdwarf" ]
@@ -63,7 +63,7 @@
Disabled = true
[[Configurations]]
- Name = "Tipl"
+ Name = "experiment-l"
GcFlags = "-l"
Root = "$ROOT/go-tip/"
AfterBuild = [ "benchsize", "benchdwarf" ]
diff --git a/cmd/bent/scripts/cronjob.sh b/cmd/bent/scripts/cronjob.sh
index 3fc2e16..6948dc8 100755
--- a/cmd/bent/scripts/cronjob.sh
+++ b/cmd/bent/scripts/cronjob.sh
@@ -76,7 +76,7 @@
cd "${ROOT}"
# For arm64 big.little, might need to prefix with something like:
# GOMAXPROCS=4 numactl -C 2-5 -- ...
-GOARCH="${BENTARCH}" ${NUMACTL} ${PERFLOCK} bent -v -N=${N} -a=${B} -L=bentjobs.log -C=configurations-cronjob.toml -c Base,Tip "$@"
+GOARCH="${BENTARCH}" ${NUMACTL} ${PERFLOCK} bent -v -N=${N} -a=${B} -L=bentjobs.log -C=configurations-cronjob.toml -c baseline,experiment "$@"
RUN=`tail -1 bentjobs.log | awk -c '{print $1}'`
runstamp="$RUN"
bentstamp="$RUN"
@@ -99,31 +99,38 @@
append () {
c=`eval echo $\`echo $1\``
echo "$1: $c" >> ${STAMP}
+ if [ x$2 != x ] ; then
+ echo "$2: $c" >> ${STAMP}
+ fi
+}
+
+append_tags () {
+ append bentstamp
+ append numerator_branch
+ append numerator_hash experiment-commit
+ append numerator_stamp
+ append denominator_branch
+ append denominator_hash baseline-commit
+ append builder_id
+ append builder_type
+ append runstamp
}
echo "suite: ${SUITE}" >> ${STAMP}
-append bentstamp
-# new stuff for better benchmarking
-append numerator_branch
-append numerator_hash
-append numerator_stamp
-append denominator_branch
-append denominator_hash
-append builder_id
-append builder_type
-append runstamp
+
+append_tags
SFX="${RUN}"
cp ${STAMP} ${BASE}-opt.${SFX}
cp ${STAMP} ${tip}-opt.${SFX}
-cat ${RUN}.Base.build >> ${BASE}-opt.${SFX}
-cat ${RUN}.Tip.build >> ${tip}-opt.${SFX}
-egrep '^(Benchmark|[-_a-zA-Z0-9]+:)' ${RUN}.Base.stdout >> ${BASE}-opt.${SFX}
-egrep '^(Benchmark|[-_a-zA-Z0-9]+:)' ${RUN}.Tip.stdout >> ${tip}-opt.${SFX}
-cat ${RUN}.Base.{benchsize,benchdwarf} >> ${BASE}-opt.${SFX}
-cat ${RUN}.Tip.{benchsize,benchdwarf} >> ${tip}-opt.${SFX}
+cat ${RUN}.baseline.build >> ${BASE}-opt.${SFX}
+cat ${RUN}.experiment.build >> ${tip}-opt.${SFX}
+egrep '^(Benchmark|[-_a-zA-Z0-9]+:)' ${RUN}.baseline.stdout >> ${BASE}-opt.${SFX}
+egrep '^(Benchmark|[-_a-zA-Z0-9]+:)' ${RUN}.experiment.stdout >> ${tip}-opt.${SFX}
+cat ${RUN}.baseline.{benchsize,benchdwarf} >> ${BASE}-opt.${SFX}
+cat ${RUN}.experiment.{benchsize,benchdwarf} >> ${tip}-opt.${SFX}
benchsave ${BASE}-opt.${SFX} ${tip}-opt.${SFX}
rm "${STAMP}"
@@ -138,7 +145,7 @@
# Debugging build
cd "${ROOT}"
-GOARCH="${BENTARCH}" ${NUMACTL} ${PERFLOCK} bent -v -N=${NNl} -a=${BNl} -L=bentjobsNl.log -C=configurations-cronjob.toml -c BaseNl,TipNl
+GOARCH="${BENTARCH}" ${NUMACTL} ${PERFLOCK} bent -v -N=${NNl} -a=${BNl} -L=bentjobsNl.log -C=configurations-cronjob.toml -c baseline-Nl,experiment-Nl "$@"
RUN=`tail -1 bentjobsNl.log | awk -c '{print $1}'`
runstamp="$RUN"
bentstamp="$RUN"
@@ -148,36 +155,26 @@
export STAMP
echo "suite: ${SUITE}-Nl" >> ${STAMP}
-
-append bentstamp
-# new stuff for better benchmarking
-append numerator_branch
-append numerator_hash
-append numerator_stamp
-append denominator_branch
-append denominator_hash
-append builder_id
-append builder_type
-append runstamp
+append_tags
SFX="${RUN}"
cp ${STAMP} ${BASE}-Nl.${SFX}
cp ${STAMP} ${tip}-Nl.${SFX}
-cat ${RUN}.BaseNl.build >> ${BASE}-Nl.${SFX}
-cat ${RUN}.TipNl.build >> ${tip}-Nl.${SFX}
-egrep '^(Benchmark|[-_a-zA-Z0-9]+:)' ${RUN}.BaseNl.stdout >> ${BASE}-Nl.${SFX}
-egrep '^(Benchmark|[-_a-zA-Z0-9]+:)' ${RUN}.TipNl.stdout >> ${tip}-Nl.${SFX}
-cat ${RUN}.BaseNl.{benchsize,benchdwarf} >> ${BASE}-Nl.${SFX}
-cat ${RUN}.TipNl.{benchsize,benchdwarf} >> ${tip}-Nl.${SFX}
+cat ${RUN}.baseline-Nl.build >> ${BASE}-Nl.${SFX}
+cat ${RUN}.experiment-Nl.build >> ${tip}-Nl.${SFX}
+egrep '^(Benchmark|[-_a-zA-Z0-9]+:)' ${RUN}.baseline-Nl.stdout >> ${BASE}-Nl.${SFX}
+egrep '^(Benchmark|[-_a-zA-Z0-9]+:)' ${RUN}.experiment-Nl.stdout >> ${tip}-Nl.${SFX}
+cat ${RUN}.baseline-Nl.{benchsize,benchdwarf} >> ${BASE}-Nl.${SFX}
+cat ${RUN}.experiment-Nl.{benchsize,benchdwarf} >> ${tip}-Nl.${SFX}
benchsave ${BASE}-Nl.${SFX} ${tip}-Nl.${SFX}
rm "${STAMP}"
# No-inline build
cd "${ROOT}"
-${NUMACTL} ${PERFLOCK} bent -v -N=${Nl} -a=${Bl} -L=bentjobsl.log -C=configurations-cronjob.toml -c Basel,Tipl
+${NUMACTL} ${PERFLOCK} bent -v -N=${Nl} -a=${Bl} -L=bentjobsl.log -C=configurations-cronjob.toml -c baseline-l,experiment-l "$@"
RUN=`tail -1 bentjobsl.log | awk -c '{print $1}'`
runstamp="$RUN"
bentstamp="$RUN"
@@ -186,27 +183,18 @@
STAMP="stamp-$$"
export STAMP
echo "suite: ${SUITE}-l" >> ${STAMP}
-append bentstamp
-# new stuff for better benchmarking
-append numerator_branch
-append numerator_hash
-append numerator_stamp
-append denominator_branch
-append denominator_hash
-append builder_id
-append builder_type
-append runstamp
+append_tags
SFX="${RUN}"
cp ${STAMP} ${BASE}-l.${SFX}
cp ${STAMP} ${tip}-l.${SFX}
-cat ${RUN}.Basel.build >> ${BASE}-l.${SFX}
-cat ${RUN}.Tipl.build >> ${tip}-l.${SFX}
-egrep '^(Benchmark|[-_a-zA-Z0-9]+:)' ${RUN}.Basel.stdout >> ${BASE}-l.${SFX}
-egrep '^(Benchmark|[-_a-zA-Z0-9]+:)' ${RUN}.Tipl.stdout >> ${tip}-l.${SFX}
-cat ${RUN}.Basel.{benchsize,benchdwarf} >> ${BASE}-l.${SFX}
-cat ${RUN}.Tipl.{benchsize,benchdwarf} >> ${tip}-l.${SFX}
+cat ${RUN}.baseline-l.build >> ${BASE}-l.${SFX}
+cat ${RUN}.experiment-l.build >> ${tip}-l.${SFX}
+egrep '^(Benchmark|[-_a-zA-Z0-9]+:)' ${RUN}.baseline-l.stdout >> ${BASE}-l.${SFX}
+egrep '^(Benchmark|[-_a-zA-Z0-9]+:)' ${RUN}.experiment-l.stdout >> ${tip}-l.${SFX}
+cat ${RUN}.baseline-l.{benchsize,benchdwarf} >> ${BASE}-l.${SFX}
+cat ${RUN}.experiment-l.{benchsize,benchdwarf} >> ${tip}-l.${SFX}
benchsave ${BASE}-l.${SFX} ${tip}-l.${SFX}
rm "${STAMP}"
