The output of the Turbo Ratio Limits is 75 lines long (each bucket has
3 lines and the headers).  This can be shrunk down into a table that is
easier to consume for both scripts and humans.

Display Turbo Ratio Limits in a table.

Signed-off-by: Prarit Bhargava <pra...@redhat.com>
Cc: Srinivas Pandruvada <srinivas.pandruv...@linux.intel.com>
---
 .../x86/intel-speed-select/isst-display.c     | 86 ++++++++-----------
 1 file changed, 34 insertions(+), 52 deletions(-)

diff --git a/tools/power/x86/intel-speed-select/isst-display.c 
b/tools/power/x86/intel-speed-select/isst-display.c
index df4aa99c4e92..9b0ae0831a60 100644
--- a/tools/power/x86/intel-speed-select/isst-display.c
+++ b/tools/power/x86/intel-speed-select/isst-display.c
@@ -287,6 +287,28 @@ static void _isst_fact_display_information(int cpu, FILE 
*outf, int level,
        format_and_print(outf, base_level + 2, header, value);
 }
 
+static void isst_turbo_ratio_limits(FILE *outf, char *header_name,
+                                   int *active_cores,
+                                   unsigned long long buckets_info,
+                                   int base_level)
+{
+       char header[256];
+       int i;
+
+       snprintf(header, sizeof(header), header_name);
+       format_and_print(outf, base_level, header, NULL);
+       snprintf(header, sizeof(header),"%11s %8s %8s",
+                "" , "core-count", "max_freq(MHz)");
+       format_and_print(outf, base_level + 1, header, NULL);
+
+       for (i = 0; i < 8; ++i) {
+               snprintf(header, sizeof (header), "bucket-%d %8lld %12d", i,
+                        (buckets_info >> (i * 8)) & 0xff,
+                        active_cores[i] * DISP_FREQ_MULTIPLIER);
+               format_and_print(outf, base_level + 1, header, NULL);
+       }
+}
+
 void isst_ctdp_display_information(int cpu, FILE *outf, int tdp_level,
                                   struct isst_pkg_ctdp *pkg_dev)
 {
@@ -365,58 +387,18 @@ void isst_ctdp_display_information(int cpu, FILE *outf, 
int tdp_level,
                snprintf(value, sizeof(value), "%d", ctdp_level->t_proc_hot);
                format_and_print(outf, base_level + 4, header, value);
 
-               snprintf(header, sizeof(header), "turbo-ratio-limits-sse");
-               format_and_print(outf, base_level + 4, header, NULL);
-               for (j = 0; j < 8; ++j) {
-                       snprintf(header, sizeof(header), "bucket-%d", j);
-                       format_and_print(outf, base_level + 5, header, NULL);
-
-                       snprintf(header, sizeof(header), "core-count");
-                       snprintf(value, sizeof(value), "%llu", 
(ctdp_level->buckets_info >> (j * 8)) & 0xff);
-                       format_and_print(outf, base_level + 6, header, value);
-
-                       snprintf(header, sizeof(header),
-                               "max-turbo-frequency(MHz)");
-                       snprintf(value, sizeof(value), "%d",
-                                ctdp_level->trl_sse_active_cores[j] *
-                                 DISP_FREQ_MULTIPLIER);
-                       format_and_print(outf, base_level + 6, header, value);
-               }
-               snprintf(header, sizeof(header), "turbo-ratio-limits-avx");
-               format_and_print(outf, base_level + 4, header, NULL);
-               for (j = 0; j < 8; ++j) {
-                       snprintf(header, sizeof(header), "bucket-%d", j);
-                       format_and_print(outf, base_level + 5, header, NULL);
-
-                       snprintf(header, sizeof(header), "core-count");
-                       snprintf(value, sizeof(value), "%llu", 
(ctdp_level->buckets_info >> (j * 8)) & 0xff);
-                       format_and_print(outf, base_level + 6, header, value);
-
-                       snprintf(header, sizeof(header),
-                               "max-turbo-frequency(MHz)");
-                       snprintf(value, sizeof(value), "%d",
-                                ctdp_level->trl_avx_active_cores[j] *
-                                 DISP_FREQ_MULTIPLIER);
-                       format_and_print(outf, base_level + 6, header, value);
-               }
-
-               snprintf(header, sizeof(header), "turbo-ratio-limits-avx512");
-               format_and_print(outf, base_level + 4, header, NULL);
-               for (j = 0; j < 8; ++j) {
-                       snprintf(header, sizeof(header), "bucket-%d", j);
-                       format_and_print(outf, base_level + 5, header, NULL);
-
-                       snprintf(header, sizeof(header), "core-count");
-                       snprintf(value, sizeof(value), "%llu", 
(ctdp_level->buckets_info >> (j * 8)) & 0xff);
-                       format_and_print(outf, base_level + 6, header, value);
-
-                       snprintf(header, sizeof(header),
-                               "max-turbo-frequency(MHz)");
-                       snprintf(value, sizeof(value), "%d",
-                                ctdp_level->trl_avx_512_active_cores[j] *
-                                 DISP_FREQ_MULTIPLIER);
-                       format_and_print(outf, base_level + 6, header, value);
-               }
+               isst_turbo_ratio_limits(outf, "turbo-ratio-limits-sse",
+                                       ctdp_level->trl_sse_active_cores,
+                                       ctdp_level->buckets_info,
+                                       base_level + 4);
+               isst_turbo_ratio_limits(outf, "turbo-ratio-limits-avx",
+                                       ctdp_level->trl_avx_active_cores,
+                                       ctdp_level->buckets_info,
+                                       base_level + 4);
+               isst_turbo_ratio_limits(outf, "turbo-ratio-limits-avx512",
+                                       ctdp_level->trl_avx_512_active_cores,
+                                       ctdp_level->buckets_info,
+                                       base_level + 4);
                if (ctdp_level->pbf_support)
                        _isst_pbf_display_information(cpu, outf, i,
                                                      &ctdp_level->pbf_info,
-- 
2.21.0

Reply via email to