From patchwork Mon Jul 23 13:02:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [3/8] cpu: cpufreq: tidy up table output Date: Mon, 23 Jul 2012 03:02:53 -0000 From: Colin King X-Patchwork-Id: 172662 Message-Id: <1343048578-13332-4-git-send-email-colin.king@canonical.com> To: fwts-devel@lists.ubuntu.com From: Colin Ian King The cpufreq test reports about CPU performance issues but it would be also good to dump out some more information in the table and also in the test failure messages to make this failure mode clearer. Signed-off-by: Colin Ian King Acked-by: Keng-Yu Lin Acked-by: Ivan Hu --- src/cpu/cpufreq/cpufreq.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/src/cpu/cpufreq/cpufreq.c b/src/cpu/cpufreq/cpufreq.c index 02506cb..7c93473 100644 --- a/src/cpu/cpufreq/cpufreq.c +++ b/src/cpu/cpufreq/cpufreq.c @@ -49,7 +49,7 @@ static int nrspeeds = -1; static int totaltests = 1; static int performedtests = 0; static int no_cpufreq = 0; -static unsigned long topspeed=1; +static unsigned long topspeed = 0; #define GET_PERFORMANCE_MAX (0) #define GET_PERFORMANCE_MIN (1) @@ -265,6 +265,7 @@ static void do_cpu(fwts_framework *fw, int cpu) int speedcount; static int warned=0; int warned_PSS = 0; + unsigned long cpu_topspeed = 0; memset(freqs, 0, sizeof(freqs)); memset(line, 0, 4096); @@ -300,8 +301,8 @@ static void do_cpu(fwts_framework *fw, int cpu) freqs[i].Hz = strtoull(c, NULL, 10); set_HZ(fw, cpu, freqs[i].Hz); freqs[i].speed = get_performance(cpu); - if (freqs[i].speed > topspeed) - topspeed = freqs[i].speed; + if (freqs[i].speed > cpu_topspeed) + cpu_topspeed = freqs[i].speed; performedtests++; fwts_progress(fw, 100*performedtests/totaltests); @@ -311,14 +312,19 @@ static void do_cpu(fwts_framework *fw, int cpu) } speedcount = i; - fwts_log_info_verbatum(fw, " Frequency | Speed \n-----------+---------\n"); + if (cpu_topspeed > topspeed) + topspeed = cpu_topspeed; + + fwts_log_info(fw, "CPU %d: %i CPU frequency steps supported.", cpu, speedcount); + fwts_log_info_verbatum(fw, " Frequency | Relative Speed | Bogo loops"); + fwts_log_info_verbatum(fw, "-----------+----------------+-----------"); for (i=0; i < speedcount; i++) - fwts_log_info_verbatum(fw, "%9s | %5.1f %%\n", HzToHuman(freqs[i].Hz), 100.0*freqs[i].speed/topspeed); + fwts_log_info_verbatum(fw, "%9s | %5.1f %% | %9lu", HzToHuman(freqs[i].Hz), 100.0*freqs[i].speed/cpu_topspeed, freqs[i].speed); - if (nrspeeds == -1) { - fwts_log_info(fw, "%i CPU frequency steps supported", speedcount); + if (nrspeeds == -1) nrspeeds = speedcount; - } + + fwts_log_nl(fw); if (nrspeeds != speedcount) fwts_failed(fw, LOG_LEVEL_MEDIUM, @@ -353,7 +359,10 @@ static void do_cpu(fwts_framework *fw, int cpu) if (freqs[i].speed > freqs[i+1].speed) fwts_failed(fw, LOG_LEVEL_MEDIUM, "CPUFreqSlowerOnCPU", - "Supposedly higher frequency is slower on CPU %i!", cpu); + "Supposedly higher frequency %s is slower (%lu bogo loops) than frequency %s (%lu bogo loops) on CPU %i.", + HzToHuman(freqs[i+1].Hz), freqs[i+1].speed, + HzToHuman(freqs[i].Hz), freqs[i].speed, + cpu); if (freqs[i].Hz > get_claimed_hz(cpu) && !warned_PSS) { warned_PSS = 1; fwts_warning(fw, "Frequency %lu not achievable; _PSS limit of %lu in effect?",