Fix C states and P states presentation issue.
Austin Zhang
PATCH 1/1 Fix C states and P states presentation issue.
If using '10' in this 'for' loop, for P states, once the processor provides more than 10 P states, those additional ones cannot been presented; and for C states, once the processor provides maximize C states level more than 9, for example, it only has POLL, C1, C3, C6, C10, the additional one like C10 also cannot be presented.
Now we get the loop numbers from the system information we had got before.
--- src/cpu/cpu.cpp | 35 +++++++++++++++++++++++++++++------ 1 files changed, 29 insertions(+), 6 deletions(-)
src/cpu/cpu.cpp +29 -6
@@ -404,6 +404,15 @@ void report_display_cpu_cstates(void) unsigned int package, core, cpu; int line; class abstract_cpu *_package, * _core, * _cpu; + unsigned int i, j, cstates_num; + + for (i = 0, cstates_num = 0; i < all_cpus.size(); i++) { + if (all_cpus[i]) + for (j = 0; j < all_cpus[i]->cstates.size(); j++) + if ((all_cpus[i]->cstates[j])->line_level >= 0 && + (all_cpus[i]->cstates[j])->line_level > cstates_num) + cstates_num = (all_cpus[i]->cstates[j])->line_level; + } report.begin_section(SECTION_CPUIDLE); report.add_header("Processor Idle state report");
@@ -421,7 +430,7 @@ void report_display_cpu_cstates(void) if (!_core) continue; - for (line = LEVEL_HEADER; line < 10; line++) { + for (line = LEVEL_HEADER; line <= (int)cstates_num; line++) { bool first_cpu = true; if (!_package->has_cstate_level(line))
@@ -628,14 +637,29 @@ void impl_w_display_cpu_states(int state) char buffer[128]; char linebuf[1024]; unsigned int package, core, cpu; - int line; + int line, loop; class abstract_cpu *_package, * _core, * _cpu; int ctr = 0; + unsigned int i, j, cstates_num, pstates_num; + + for (i = 0, cstates_num = 0, pstates_num = 0; i < all_cpus.size(); i++) { + if (all_cpus[i] && all_cpus[i]->pstates.size() > pstates_num) + pstates_num = all_cpus[i]->pstates.size(); - if (state == PSTATE) + if (all_cpus[i]) + for (j = 0; j < all_cpus[i]->cstates.size(); j++) + if ((all_cpus[i]->cstates[j])->line_level >= 0 && + (all_cpus[i]->cstates[j])->line_level > cstates_num) + cstates_num = (all_cpus[i]->cstates[j])->line_level; + } + + if (state == PSTATE) { win = get_ncurses_win("Frequency stats"); - else + loop = (int)pstates_num; + } else { win = get_ncurses_win("Idle stats"); + loop = (int)cstates_num; + } if (!win) return;
@@ -656,8 +680,7 @@ void impl_w_display_cpu_states(int state) if (!_core->has_pstates() && state == PSTATE) continue; - - for (line = LEVEL_HEADER; line < 10; line++) { + for (line = LEVEL_HEADER; line <= loop; line++) { int first = 1; ctr = 0; linebuf[0] = 0;
Signature · 1 line
1.7.5.4
Sergey Senozhatsky
Quoted 6 lines · Austin Zhang
If using '10' in this 'for' loop, for P states, once the processor provides more than 10 P states, those additional ones cannot been presented; and for C states, once the processor provides maximize C states level more than 9, for example, it only has POLL, C1, C3, C6, C10, the additional one like C10 also cannot be presented.
Hm, I'm sure I've seen this before. Was it the same patch from you?
I recall Igor patched html report for pstate, but I also remember we had something about c states as well.
-ss
Quoted 88 lines
Now we get the loop numbers from the system information we had got before.
Signed-off-by Austin Zhang <zhang.austin(a)gmail.com>--- src/cpu/cpu.cpp | 35 +++++++++++++++++++++++++++++------ 1 files changed, 29 insertions(+), 6 deletions(-)src/cpu/cpu.cpp +29
-6@@ -404,6 +404,15 @@ void report_display_cpu_cstates(void) unsigned int package, core, cpu; int line; class abstract_cpu *_package, * _core, * _cpu; + unsigned int i, j, cstates_num; + + for (i = 0, cstates_num = 0; i < all_cpus.size(); i++) { + if (all_cpus[i]) + for (j = 0; j < all_cpus[i]->cstates.size(); j++) + if ((all_cpus[i]->cstates[j])->line_level >= 0 && + (all_cpus[i]->cstates[j])->line_level > cstates_num) + cstates_num = (all_cpus[i]->cstates[j])->line_level; + } report.begin_section(SECTION_CPUIDLE); report.add_header("Processor Idle state report");@@ -421,7 +430,7 @@ void report_display_cpu_cstates(void) if (!_core) continue; - for (line = LEVEL_HEADER; line < 10; line++) { + for (line = LEVEL_HEADER; line <= (int)cstates_num; line++) { bool first_cpu = true; if (!_package->has_cstate_level(line))@@ -628,14 +637,29 @@ void impl_w_display_cpu_states(int state) char buffer[128]; char linebuf[1024]; unsigned int package, core, cpu; - int line; + int line, loop; class abstract_cpu *_package, * _core, * _cpu; int ctr = 0; + unsigned int i, j, cstates_num, pstates_num; + + for (i = 0, cstates_num = 0, pstates_num = 0; i < all_cpus.size(); i++) { + if (all_cpus[i] && all_cpus[i]->pstates.size() > pstates_num) + pstates_num = all_cpus[i]->pstates.size(); - if (state == PSTATE) + if (all_cpus[i]) + for (j = 0; j < all_cpus[i]->cstates.size(); j++) + if ((all_cpus[i]->cstates[j])->line_level >= 0 && + (all_cpus[i]->cstates[j])->line_level > cstates_num) + cstates_num = (all_cpus[i]->cstates[j])->line_level; + } + + if (state == PSTATE) { win = get_ncurses_win("Frequency stats"); - else + loop = (int)pstates_num; + } else { win = get_ncurses_win("Idle stats"); + loop = (int)cstates_num; + } if (!win) return;@@ -656,8 +680,7 @@ void impl_w_display_cpu_states(int state) if (!_core->has_pstates() && state == PSTATE) continue; - - for (line = LEVEL_HEADER; line < 10; line++) { + for (line = LEVEL_HEADER; line <= loop; line++) { int first = 1; ctr = 0; linebuf[0] = 0;Signature · 6 lines
1.7.5.4 _______________________________________________ PowerTop mailing list PowerTop(a)lists.01.org https://lists.01.org/mailman/listinfo/powertop
Sergey Senozhatsky
Quoted 8 lines · Sergey Senozhatsky
Quoted 6 lines · Austin Zhang
If using '10' in this 'for' loop, for P states, once the processor provides more than 10 P states, those additional ones cannot been presented; and for C states, once the processor provides maximize C states level more than 9, for example, it only has POLL, C1, C3, C6, C10, the additional one like C10 also cannot be presented.
Quoted 8 lines
Hm, I'm sure I've seen this before. Was it the same patch from you?
I recall Igor patched html report for pstate, but I also remember we had something about c states as well.
-ss
Ok, I found it: "Display all P-states in HTML-report"
(http://lists.01.org/pipermail/powertop/2012-July/000161.html).
There was a note from Igor
" The same issue may affect the function report_display_cpu_cstates() but I'm not sure that CPUs with more than 10 C-states exists. "
I'll take a look at your patch, thanks.
-ss
Quoted 88 lines
Quoted 88 lines
Now we get the loop numbers from the system information we had got before.
Signed-off-by Austin Zhang <zhang.austin(a)gmail.com>--- src/cpu/cpu.cpp | 35 +++++++++++++++++++++++++++++------ 1 files changed, 29 insertions(+), 6 deletions(-)src/cpu/cpu.cpp +29
-6@@ -404,6 +404,15 @@ void report_display_cpu_cstates(void) unsigned int package, core, cpu; int line; class abstract_cpu *_package, * _core, * _cpu; + unsigned int i, j, cstates_num; + + for (i = 0, cstates_num = 0; i < all_cpus.size(); i++) { + if (all_cpus[i]) + for (j = 0; j < all_cpus[i]->cstates.size(); j++) + if ((all_cpus[i]->cstates[j])->line_level >= 0 && + (all_cpus[i]->cstates[j])->line_level > cstates_num) + cstates_num = (all_cpus[i]->cstates[j])->line_level; + } report.begin_section(SECTION_CPUIDLE); report.add_header("Processor Idle state report");@@ -421,7 +430,7 @@ void report_display_cpu_cstates(void) if (!_core) continue; - for (line = LEVEL_HEADER; line < 10; line++) { + for (line = LEVEL_HEADER; line <= (int)cstates_num; line++) { bool first_cpu = true; if (!_package->has_cstate_level(line))@@ -628,14 +637,29 @@ void impl_w_display_cpu_states(int state) char buffer[128]; char linebuf[1024]; unsigned int package, core, cpu; - int line; + int line, loop; class abstract_cpu *_package, * _core, * _cpu; int ctr = 0; + unsigned int i, j, cstates_num, pstates_num; + + for (i = 0, cstates_num = 0, pstates_num = 0; i < all_cpus.size(); i++) { + if (all_cpus[i] && all_cpus[i]->pstates.size() > pstates_num) + pstates_num = all_cpus[i]->pstates.size(); - if (state == PSTATE) + if (all_cpus[i]) + for (j = 0; j < all_cpus[i]->cstates.size(); j++) + if ((all_cpus[i]->cstates[j])->line_level >= 0 && + (all_cpus[i]->cstates[j])->line_level > cstates_num) + cstates_num = (all_cpus[i]->cstates[j])->line_level; + } + + if (state == PSTATE) { win = get_ncurses_win("Frequency stats"); - else + loop = (int)pstates_num; + } else { win = get_ncurses_win("Idle stats"); + loop = (int)cstates_num; + } if (!win) return;@@ -656,8 +680,7 @@ void impl_w_display_cpu_states(int state) if (!_core->has_pstates() && state == PSTATE) continue; - - for (line = LEVEL_HEADER; line < 10; line++) { + for (line = LEVEL_HEADER; line <= loop; line++) { int first = 1; ctr = 0; linebuf[0] = 0;Signature · 6 lines
1.7.5.4 _______________________________________________ PowerTop mailing list PowerTop(a)lists.01.org https://lists.01.org/mailman/listinfo/powertop
Sergey Senozhatsky
Quoted 61 lines · Austin Zhang
Date: Tue, 15 Jan 2013 19:05:18 +0800
From: Austin Zhang <zhang.austin(a)gmail.com>
To: powertop(a)lists.01.org
Subject: [Powertop] [PATCH] Fix C states and P states presentation issue.
X-Mailer: git-send-email 1.7.5.4If using '10' in this 'for' loop, for P states, once the processor provides more than 10 P states, those additional ones cannot been presented; and for C states, once the processor provides maximize C states level more than 9, for example, it only has POLL, C1, C3, C6, C10, the additional one like C10 also cannot be presented.
Now we get the loop numbers from the system information we had got before.
Signed-off-by Austin Zhang <zhang.austin(a)gmail.com>--- src/cpu/cpu.cpp | 35 +++++++++++++++++++++++++++++------ 1 files changed, 29 insertions(+), 6 deletions(-)src/cpu/cpu.cpp +15
-2@@ -404,6 +404,15 @@ void report_display_cpu_cstates(void) unsigned int package, core, cpu; int line; class abstract_cpu *_package, * _core, * _cpu; + unsigned int i, j, cstates_num; + + for (i = 0, cstates_num = 0; i < all_cpus.size(); i++) { + if (all_cpus[i]) + for (j = 0; j < all_cpus[i]->cstates.size(); j++) + if ((all_cpus[i]->cstates[j])->line_level >= 0 && + (all_cpus[i]->cstates[j])->line_level > cstates_num) + cstates_num = (all_cpus[i]->cstates[j])->line_level; + } report.begin_section(SECTION_CPUIDLE); report.add_header("Processor Idle state report");@@ -421,7 +430,7 @@ void report_display_cpu_cstates(void) if (!_core) continue; - for (line = LEVEL_HEADER; line < 10; line++) { + for (line = LEVEL_HEADER; line <= (int)cstates_num; line++) { bool first_cpu = true; if (!_package->has_cstate_level(line))@@ -628,14 +637,29 @@ void impl_w_display_cpu_states(int state) char buffer[128]; char linebuf[1024]; unsigned int package, core, cpu; - int line; + int line, loop; class abstract_cpu *_package, * _core, * _cpu; int ctr = 0; + unsigned int i, j, cstates_num, pstates_num; + + for (i = 0, cstates_num = 0, pstates_num = 0; i < all_cpus.size(); i++) { + if (all_cpus[i] && all_cpus[i]->pstates.size() > pstates_num)
src/cpu/cpu.cpp void impl_w_display_cpu_states(int state) · line 655
Quoted 10 lines
src/cpu/cpu.cpp +8
-1+ pstates_num = all_cpus[i]->pstates.size(); - if (state == PSTATE) + if (all_cpus[i]) + for (j = 0; j < all_cpus[i]->cstates.size(); j++) + if ((all_cpus[i]->cstates[j])->line_level >= 0 && + (all_cpus[i]->cstates[j])->line_level > cstates_num) + cstates_num = (all_cpus[i]->cstates[j])->line_level; + } +
Hm, I think it'd be better to have these (cstates_num, pstates_num) as a cpu members and set max P/C state when we insert new P/C state. Iterating through constant data on every display(/report) seems like overkill.
-ss
Quoted 29 lines
src/cpu/cpu.cpp +6
-3+ if (state == PSTATE) { win = get_ncurses_win("Frequency stats"); - else + loop = (int)pstates_num; + } else { win = get_ncurses_win("Idle stats"); + loop = (int)cstates_num; + } if (!win) return;@@ -656,8 +680,7 @@ void impl_w_display_cpu_states(int state) if (!_core->has_pstates() && state == PSTATE) continue; - - for (line = LEVEL_HEADER; line < 10; line++) { + for (line = LEVEL_HEADER; line <= loop; line++) { int first = 1; ctr = 0; linebuf[0] = 0;Signature · 6 lines
1.7.5.4 _______________________________________________ PowerTop mailing list PowerTop(a)lists.01.org https://lists.01.org/mailman/listinfo/powertop
Sergey Senozhatsky
Quoted 64 lines · Sergey Senozhatsky
Quoted 63 lines · Austin Zhang
Date: Tue, 15 Jan 2013 19:05:18 +0800
From: Austin Zhang <zhang.austin(a)gmail.com>
To: powertop(a)lists.01.org
Subject: [Powertop] [PATCH] Fix C states and P states presentation issue.
X-Mailer: git-send-email 1.7.5.4If using '10' in this 'for' loop, for P states, once the processor provides more than 10 P states, those additional ones cannot been presented; and for C states, once the processor provides maximize C states level more than 9, for example, it only has POLL, C1, C3, C6, C10, the additional one like C10 also cannot be presented.
Now we get the loop numbers from the system information we had got before.
Signed-off-by Austin Zhang <zhang.austin(a)gmail.com>--- src/cpu/cpu.cpp | 35 +++++++++++++++++++++++++++++------ 1 files changed, 29 insertions(+), 6 deletions(-)src/cpu/cpu.cpp +16
-2@@ -404,6 +404,15 @@ void report_display_cpu_cstates(void) unsigned int package, core, cpu; int line; class abstract_cpu *_package, * _core, * _cpu; + unsigned int i, j, cstates_num; + + for (i = 0, cstates_num = 0; i < all_cpus.size(); i++) { + if (all_cpus[i]) + for (j = 0; j < all_cpus[i]->cstates.size(); j++) + if ((all_cpus[i]->cstates[j])->line_level >= 0 && + (all_cpus[i]->cstates[j])->line_level > cstates_num) + cstates_num = (all_cpus[i]->cstates[j])->line_level; + } report.begin_section(SECTION_CPUIDLE); report.add_header("Processor Idle state report");@@ -421,7 +430,7 @@ void report_display_cpu_cstates(void) if (!_core) continue; - for (line = LEVEL_HEADER; line < 10; line++) { + for (line = LEVEL_HEADER; line <= (int)cstates_num; line++) { bool first_cpu = true; if (!_package->has_cstate_level(line))@@ -628,14 +637,29 @@ void impl_w_display_cpu_states(int state) char buffer[128]; char linebuf[1024]; unsigned int package, core, cpu; - int line; + int line, loop; class abstract_cpu *_package, * _core, * _cpu; int ctr = 0; + unsigned int i, j, cstates_num, pstates_num; + + for (i = 0, cstates_num = 0, pstates_num = 0; i < all_cpus.size(); i++) { + if (all_cpus[i] && all_cpus[i]->pstates.size() > pstates_num) + pstates_num = all_cpus[i]->pstates.size();
Quoted 13 lines
src/cpu/cpu.cpp void impl_w_display_cpu_states(int state) · line 655
Quoted 8 lines
src/cpu/cpu.cpp +7
-1- if (state == PSTATE) + if (all_cpus[i]) + for (j = 0; j < all_cpus[i]->cstates.size(); j++) + if ((all_cpus[i]->cstates[j])->line_level >= 0 && + (all_cpus[i]->cstates[j])->line_level > cstates_num) + cstates_num = (all_cpus[i]->cstates[j])->line_level; + } +Hm, I think it'd be better to have these (
cstates_num,pstates_num) as a cpu members and set max P/C state when we insert new P/C state. Iterating through constant data on every display(/report) seems like overkill.
Oops my bad, don't mention it. Eventually we reset this data.
-ss
Quoted 31 lines
Quoted 31 lines
src/cpu/cpu.cpp +6
-3+ if (state == PSTATE) { win = get_ncurses_win("Frequency stats"); - else + loop = (int)pstates_num; + } else { win = get_ncurses_win("Idle stats"); + loop = (int)cstates_num; + } if (!win) return;@@ -656,8 +680,7 @@ void impl_w_display_cpu_states(int state) if (!_core->has_pstates() && state == PSTATE) continue; - - for (line = LEVEL_HEADER; line < 10; line++) { + for (line = LEVEL_HEADER; line <= loop; line++) { int first = 1; ctr = 0; linebuf[0] = 0;Signature · 6 lines
1.7.5.4 _______________________________________________ PowerTop mailing list PowerTop(a)lists.01.org https://lists.01.org/mailman/listinfo/powertop
Sergey Senozhatsky
Quoted 28 lines · Austin Zhang
Date: Tue, 15 Jan 2013 19:05:18 +0800
From: Austin Zhang <zhang.austin(a)gmail.com>
To: powertop(a)lists.01.org
Subject: [Powertop] [PATCH] Fix C states and P states presentation issue.
X-Mailer: git-send-email 1.7.5.4If using '10' in this 'for' loop, for P states, once the processor provides more than 10 P states, those additional ones cannot been presented; and for C states, once the processor provides maximize C states level more than 9, for example, it only has POLL, C1, C3, C6, C10, the additional one like C10 also cannot be presented.
Now we get the loop numbers from the system information we had got before.
Signed-off-by Austin Zhang <zhang.austin(a)gmail.com>--- src/cpu/cpu.cpp | 35 +++++++++++++++++++++++++++++------ 1 files changed, 29 insertions(+), 6 deletions(-)src/cpu/cpu.cpp +0
-0@@ -404,6 +404,15 @@ void report_display_cpu_cstates(void) unsigned int package, core, cpu; int line; class abstract_cpu *_package, * _core, * _cpu;
src/cpu/cpu.cpp void report_display_cpu_cstates(void) · line 416
Quoted 10 lines
src/cpu/cpu.cpp +9
-0+ unsigned int i, j, cstates_num; + + for (i = 0, cstates_num = 0; i < all_cpus.size(); i++) { + if (all_cpus[i]) + for (j = 0; j < all_cpus[i]->cstates.size(); j++) + if ((all_cpus[i]->cstates[j])->line_level >= 0 && + (all_cpus[i]->cstates[j])->line_level > cstates_num) + cstates_num = (all_cpus[i]->cstates[j])->line_level; + }
how about removing this `if' condition?
for (j = 0; j < all_cpus[i]->cstates.size(); j++) cstates_num = std::max(cstates_num, (all_cpus[i]->cstates[j])->line_level);
Quoted 12 lines
src/cpu/cpu.cpp +1
-1report.begin_section(SECTION_CPUIDLE); report.add_header("Processor Idle state report");@@ -421,7 +430,7 @@ void report_display_cpu_cstates(void) if (!_core) continue; - for (line = LEVEL_HEADER; line < 10; line++) { + for (line = LEVEL_HEADER; line <= (int)cstates_num; line++) { bool first_cpu = true; if (!_package->has_cstate_level(line))
src/cpu/cpu.cpp void impl_w_display_cpu_states(int state) · line 645
Quoted 10 lines
src/cpu/cpu.cpp +4
-1@@ -628,14 +637,29 @@ void impl_w_display_cpu_states(int state) char buffer[128]; char linebuf[1024]; unsigned int package, core, cpu; - int line; + int line, loop; class abstract_cpu *_package, * _core, * _cpu; int ctr = 0; + unsigned int i, j, cstates_num, pstates_num; + + for (i = 0, cstates_num = 0, pstates_num = 0; i < all_cpus.size(); i++) {
we have two all_cpus[i] checks in one for loop, let's change to single `if (!all_cpus[i]) continue;'
src/cpu/cpu.cpp void impl_w_display_cpu_states(int state) · line 648
Quoted 3 lines
src/cpu/cpu.cpp +2
-0+ if (all_cpus[i] && all_cpus[i]->pstates.size() > pstates_num) + pstates_num = all_cpus[i]->pstates.size();
pstates_num = std::max(pstates_num, all_cpus[i]->pstates.size())
src/cpu/cpu.cpp void impl_w_display_cpu_states(int state) · line 653
Quoted 6 lines
src/cpu/cpu.cpp +5
-1- if (state == PSTATE) + if (all_cpus[i]) + for (j = 0; j < all_cpus[i]->cstates.size(); j++) + if ((all_cpus[i]->cstates[j])->line_level >= 0 && + (all_cpus[i]->cstates[j])->line_level > cstates_num) + cstates_num = (all_cpus[i]->cstates[j])->line_level;
for (j = 0; j < all_cpus[i]->cstates.size(); j++) cstates_num = std::max(cstates_num, (all_cpus[i]->cstates[j])->line_level) -ss
Quoted 31 lines
src/cpu/cpu.cpp +8
-3+ } + + if (state == PSTATE) { win = get_ncurses_win("Frequency stats"); - else + loop = (int)pstates_num; + } else { win = get_ncurses_win("Idle stats"); + loop = (int)cstates_num; + } if (!win) return;@@ -656,8 +680,7 @@ void impl_w_display_cpu_states(int state) if (!_core->has_pstates() && state == PSTATE) continue; - - for (line = LEVEL_HEADER; line < 10; line++) { + for (line = LEVEL_HEADER; line <= loop; line++) { int first = 1; ctr = 0; linebuf[0] = 0;Signature · 6 lines
1.7.5.4 _______________________________________________ PowerTop mailing list PowerTop(a)lists.01.org https://lists.01.org/mailman/listinfo/powertop