From f5b0b64462ccecf31dad57f71b8870d2d9885099 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Thu, 16 Jun 2016 12:39:58 -0400 Subject: [PATCH] Prefer cpuinfo_max_freq over cpuinfo --- cryptest.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cryptest.sh b/cryptest.sh index 66e78d56..d2b9c28f 100755 --- a/cryptest.sh +++ b/cryptest.sh @@ -334,13 +334,13 @@ fi # Benchmarks expect frequency in GiHz. CPU_FREQ=0.5 -if [[ (-e "/proc/cpuinfo") ]]; then +if [[ (-e "/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq") ]]; then + CPU_FREQ=$(cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq) + CPU_FREQ=$(awk "BEGIN {print $CPU_FREQ/1024/1024}") +elif [[ (-e "/proc/cpuinfo") ]]; then CPU_FREQ=$(cat /proc/cpuinfo | grep 'MHz' | head -1 | awk '{print $4}') if [[ -z "$CPU_FREQ" ]]; then CPU_FREQ=512; fi CPU_FREQ=$(awk "BEGIN {print $CPU_FREQ/1024}") -elif [[ (-e "/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq") ]]; then - CPU_FREQ=$(cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq) - CPU_FREQ=$(awk "BEGIN {print $CPU_FREQ/1024/1024}") elif [[ "$IS_DARWIN" -ne "0" ]]; then CPU_FREQ=$(sysctl -a 2>/dev/null | $GREP 'hw.cpufrequency' | head -1 | awk '{print $3}') CPU_FREQ=$(awk "BEGIN {print $CPU_FREQ/1024/1024/1024}")