Commit 3337bf41 authored by Desnes A. Nunes do Rosario's avatar Desnes A. Nunes do Rosario Committed by Michael Ellerman

selftests/powerpc: Purge extra count_pmc() calls of ebb selftests

An extra count on ebb_state.stats.pmc_count[PMC_INDEX(pmc)] is being per-
formed when count_pmc() is used to reset PMCs on a few selftests. This
extra pmc_count can occasionally invalidate results, such as the ones from
cycles_test shown hereafter. The ebb_check_count() failed with an above
the upper limit error due to the extra value on ebb_state.stats.pmc_count.

Furthermore, this extra count is also indicated by extra PMC1 trace_log on
the output of the cycle test (as well as on pmc56_overflow_test):

==========
   ...
   [21]: counter = 8
   [22]: register SPRN_MMCR0 = 0x0000000080000080
   [23]: register SPRN_PMC1  = 0x0000000080000004
   [24]: counter = 9
   [25]: register SPRN_MMCR0 = 0x0000000080000080
   [26]: register SPRN_PMC1  = 0x0000000080000004
   [27]: counter = 10
   [28]: register SPRN_MMCR0 = 0x0000000080000080
   [29]: register SPRN_PMC1  = 0x0000000080000004
>> [30]: register SPRN_PMC1  = 0x000000004000051e
PMC1 count (0x280000546) above upper limit 0x2800003e8 (+0x15e)
[FAIL] Test FAILED on line 52
failure: cycles
==========
Signed-off-by: default avatarDesnes A. Nunes do Rosario <desnesn@linux.ibm.com>
Tested-by: default avatarSachin Sant <sachinp@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200626164737.21943-1-desnesn@linux.ibm.com
parent 76f09371
...@@ -91,8 +91,6 @@ int back_to_back_ebbs(void) ...@@ -91,8 +91,6 @@ int back_to_back_ebbs(void)
ebb_global_disable(); ebb_global_disable();
ebb_freeze_pmcs(); ebb_freeze_pmcs();
count_pmc(1, sample_period);
dump_ebb_state(); dump_ebb_state();
event_close(&event); event_close(&event);
......
...@@ -42,8 +42,6 @@ int cycles(void) ...@@ -42,8 +42,6 @@ int cycles(void)
ebb_global_disable(); ebb_global_disable();
ebb_freeze_pmcs(); ebb_freeze_pmcs();
count_pmc(1, sample_period);
dump_ebb_state(); dump_ebb_state();
event_close(&event); event_close(&event);
......
...@@ -99,8 +99,6 @@ int cycles_with_freeze(void) ...@@ -99,8 +99,6 @@ int cycles_with_freeze(void)
ebb_global_disable(); ebb_global_disable();
ebb_freeze_pmcs(); ebb_freeze_pmcs();
count_pmc(1, sample_period);
dump_ebb_state(); dump_ebb_state();
printf("EBBs while frozen %d\n", ebbs_while_frozen); printf("EBBs while frozen %d\n", ebbs_while_frozen);
......
...@@ -71,8 +71,6 @@ int cycles_with_mmcr2(void) ...@@ -71,8 +71,6 @@ int cycles_with_mmcr2(void)
ebb_global_disable(); ebb_global_disable();
ebb_freeze_pmcs(); ebb_freeze_pmcs();
count_pmc(1, sample_period);
dump_ebb_state(); dump_ebb_state();
event_close(&event); event_close(&event);
......
...@@ -396,8 +396,6 @@ int ebb_child(union pipe read_pipe, union pipe write_pipe) ...@@ -396,8 +396,6 @@ int ebb_child(union pipe read_pipe, union pipe write_pipe)
ebb_global_disable(); ebb_global_disable();
ebb_freeze_pmcs(); ebb_freeze_pmcs();
count_pmc(1, sample_period);
dump_ebb_state(); dump_ebb_state();
event_close(&event); event_close(&event);
......
...@@ -38,8 +38,6 @@ static int victim_child(union pipe read_pipe, union pipe write_pipe) ...@@ -38,8 +38,6 @@ static int victim_child(union pipe read_pipe, union pipe write_pipe)
ebb_global_disable(); ebb_global_disable();
ebb_freeze_pmcs(); ebb_freeze_pmcs();
count_pmc(1, sample_period);
dump_ebb_state(); dump_ebb_state();
FAIL_IF(ebb_state.stats.ebb_count == 0); FAIL_IF(ebb_state.stats.ebb_count == 0);
......
...@@ -75,7 +75,6 @@ static int test_body(void) ...@@ -75,7 +75,6 @@ static int test_body(void)
ebb_freeze_pmcs(); ebb_freeze_pmcs();
ebb_global_disable(); ebb_global_disable();
count_pmc(4, sample_period);
mtspr(SPRN_PMC4, 0xdead); mtspr(SPRN_PMC4, 0xdead);
dump_summary_ebb_state(); dump_summary_ebb_state();
......
...@@ -70,13 +70,6 @@ int multi_counter(void) ...@@ -70,13 +70,6 @@ int multi_counter(void)
ebb_global_disable(); ebb_global_disable();
ebb_freeze_pmcs(); ebb_freeze_pmcs();
count_pmc(1, sample_period);
count_pmc(2, sample_period);
count_pmc(3, sample_period);
count_pmc(4, sample_period);
count_pmc(5, sample_period);
count_pmc(6, sample_period);
dump_ebb_state(); dump_ebb_state();
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
......
...@@ -61,8 +61,6 @@ static int cycles_child(void) ...@@ -61,8 +61,6 @@ static int cycles_child(void)
ebb_global_disable(); ebb_global_disable();
ebb_freeze_pmcs(); ebb_freeze_pmcs();
count_pmc(1, sample_period);
dump_summary_ebb_state(); dump_summary_ebb_state();
event_close(&event); event_close(&event);
......
...@@ -82,8 +82,6 @@ static int test_body(void) ...@@ -82,8 +82,6 @@ static int test_body(void)
ebb_global_disable(); ebb_global_disable();
ebb_freeze_pmcs(); ebb_freeze_pmcs();
count_pmc(1, sample_period);
dump_ebb_state(); dump_ebb_state();
if (mmcr0_mismatch) if (mmcr0_mismatch)
......
...@@ -76,8 +76,6 @@ int pmc56_overflow(void) ...@@ -76,8 +76,6 @@ int pmc56_overflow(void)
ebb_global_disable(); ebb_global_disable();
ebb_freeze_pmcs(); ebb_freeze_pmcs();
count_pmc(2, sample_period);
dump_ebb_state(); dump_ebb_state();
printf("PMC5/6 overflow %d\n", pmc56_overflowed); printf("PMC5/6 overflow %d\n", pmc56_overflowed);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment