don't key benchmarks on cpu frequency

5 files changed, 19 insertions, 16 deletions

diff --git a/Makefile b/Makefile
index 3c320cfa7..410adb640 100644
--- a/Makefile
+++ b/Makefile
@@ -153,7 +153,7 @@ DISPLAY_X25519_C64_VO := $(filter src/Specific/X25519/C64/%,$(DISPLAY_NON_JAVA_V
 src/Specific/X25519/C64/measure: src/Specific/X25519/C64/compiler.sh measure.c $(DISPLAY_X25519_C64_VO:Display.vo=.c) $(DISPLAY_X25519_C64_VO:Display.vo=.h) src/Specific/X25519/C64/scalarmult.c
 	src/Specific/X25519/C64/compiler.sh -o src/Specific/X25519/C64/measure -I src/Specific/X25519/C64/ measure.c $(DISPLAY_X25519_C64_VO:Display.vo=.c) src/Specific/X25519/C64/scalarmult.c -D TIMINGS=2047 -D UUT=crypto_scalarmult_bench
 
-src/Specific/X25519/C64/measurements.txt: src/Specific/X25519/C64/measure capture.sh etc/machine.sh
+src/Specific/X25519/C64/measurements.txt: src/Specific/X25519/C64/measure capture.sh etc/machine.sh etc/freq.sh
 	./capture.sh src/Specific/X25519/C64
 
 bench: src/Specific/X25519/C64/measurements.txt
diff --git a/capture.sh b/capture.sh
index 6eef0dcd0..123058628 100755
--- a/capture.sh
+++ b/capture.sh
@@ -2,12 +2,14 @@
 set -eu
 
 machine=$(etc/machine.sh)
+freq=$(etc/freq.sh)
+compiler=$($1/compiler.sh -dumpversion)
 measurement=$($1/measure | (LC_ALL=C sort -n || true) | head -1024 | tail -1)
 revision=$(git rev-parse --short HEAD)
 
 (
   grep -v "$machine" "$1/measurements.txt" 2>/dev/null || true;
-  echo "$measurement  $machine  $revision"
+  echo "$measurement	$machine	$freq	$compiler	$revision"
 ) | (LC_ALL=C sort -n || true) > "$1/measurements.txt.tmp"
 
 mv "$1/measurements.txt.tmp" "$1/measurements.txt"
diff --git a/etc/freq.sh b/etc/freq.sh
new file mode 100755
index 000000000..7fe306f2e
--- /dev/null
+++ b/etc/freq.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -eu
+
+for cpu in $(seq 1 $(nproc)); do
+	echo "scale=100000;pi=4*a(1);0" | bc -l &
+	echo $!
+done | ( \
+	sleep .1 ;
+        mhz=$(cat /proc/cpuinfo | grep "^[c]pu MHz" | cut -d: -f2 | tr -d ' ' | sort -nr | head -1);
+	printf "$(echo "scale=2; ($mhz + 5)/1000" | bc)ghz\n"
+        while IFS= read -r pid; do
+		kill "$pid";
+	done )
+
diff --git a/etc/machine.sh b/etc/machine.sh
index 06cea8ac4..fa8d419b4 100755
--- a/etc/machine.sh
+++ b/etc/machine.sh
@@ -14,17 +14,4 @@ else
 fi
 printf -
 printf "$(gcc -march=native -Q --help=target|grep march | cut -d= -f2 | grep -ow '\S*')"
-printf -
-
-for cpu in $(seq 1 $(nproc)); do
-	echo "scale=100000;pi=4*a(1);0" | bc -l &
-	echo $!
-done | ( \
-	sleep .1 ;
-        mhz=$(cat /proc/cpuinfo | grep "^[c]pu MHz" | cut -d: -f2 | tr -d ' ' | sort -nr | head -1);
-	printf "$(echo "scale=2; ($mhz + 5)/1000" | bc)ghz"
-        while IFS= read -r pid; do
-		kill "$pid";
-	done )
-
 printf '\n'
diff --git a/src/Specific/X25519/C64/measurements.txt b/src/Specific/X25519/C64/measurements.txt
index eca0dd245..b5245385b 100644
--- a/src/Specific/X25519/C64/measurements.txt
+++ b/src/Specific/X25519/C64/measurements.txt
@@ -1 +1 @@
-174312  ashryn-noht-notb-ac-broadwell-2.50ghz  694c4878
+174300	ashryn-noht-notb-ac-broadwell	2.50ghz	7.1.1	4dc08623