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: Desnes A. Nunes do Rosario <desnesn@linux.ibm.com>
Tested-by: Sachin Sant <sachinp@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200626164737.21943-1-desnesn@linux.ibm.com

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/back_to_back_ebbs_test.c b/tools/testing/selftests/powerpc/pmu/ebb/back_to_back_ebbs_test.c
index a2d7b0e3dca9764083c98a2cdbc82f4e9f0288b4..a26ac122c759f9b8cd17d56d509301b496564e44 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/back_to_back_ebbs_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/back_to_back_ebbs_test.c
@@ -91,8 +91,6 @@ int back_to_back_ebbs(void)
        ebb_global_disable();
        ebb_freeze_pmcs();
 
-       count_pmc(1, sample_period);
-
        dump_ebb_state();
 
        event_close(&event);

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/cycles_test.c b/tools/testing/selftests/powerpc/pmu/ebb/cycles_test.c
index bc893813483eeea008a7231e38bd83d87af48773..bb9f587fa76e886cf19d0218d4dfa81ece8eadff 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/cycles_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/cycles_test.c
@@ -42,8 +42,6 @@ int cycles(void)
        ebb_global_disable();
        ebb_freeze_pmcs();
 
-       count_pmc(1, sample_period);
-
        dump_ebb_state();
 
        event_close(&event);

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/cycles_with_freeze_test.c b/tools/testing/selftests/powerpc/pmu/ebb/cycles_with_freeze_test.c
index dcd351d2032896c30356bd09d8cc8500ec043740..9ae795ce314e6f5bca91d4b588a120dac3297538 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/cycles_with_freeze_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/cycles_with_freeze_test.c
@@ -99,8 +99,6 @@ int cycles_with_freeze(void)
        ebb_global_disable();
        ebb_freeze_pmcs();
 
-       count_pmc(1, sample_period);
-
        dump_ebb_state();
 
        printf("EBBs while frozen %d\n", ebbs_while_frozen);

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/cycles_with_mmcr2_test.c b/tools/testing/selftests/powerpc/pmu/ebb/cycles_with_mmcr2_test.c
index 94c99c12c0f23314db939abdcff335632bc168d1..4b45a2e70f62b4ef64faf45087595f237f200ab6 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/cycles_with_mmcr2_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/cycles_with_mmcr2_test.c
@@ -71,8 +71,6 @@ int cycles_with_mmcr2(void)
        ebb_global_disable();
        ebb_freeze_pmcs();
 
-       count_pmc(1, sample_period);
-
        dump_ebb_state();
 
        event_close(&event);

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/ebb.c b/tools/testing/selftests/powerpc/pmu/ebb/ebb.c
index dfbc5c3ad52d7476b674296f30e122f74bc71a37..21537d6eb6b7d01b2f400eb102cd95e7724906ec 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/ebb.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/ebb.c
@@ -396,8 +396,6 @@ int ebb_child(union pipe read_pipe, union pipe write_pipe)
        ebb_global_disable();
        ebb_freeze_pmcs();
 
-       count_pmc(1, sample_period);
-
        dump_ebb_state();
 
        event_close(&event);

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/ebb_on_willing_child_test.c b/tools/testing/selftests/powerpc/pmu/ebb/ebb_on_willing_child_test.c
index ca2f7d729155bdb67a748400afe154f62afddb8a..b208bf6ad58d3924593633a3ea5d42b501f437e0 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/ebb_on_willing_child_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/ebb_on_willing_child_test.c
@@ -38,8 +38,6 @@ static int victim_child(union pipe read_pipe, union pipe write_pipe)
        ebb_global_disable();
        ebb_freeze_pmcs();
 
-       count_pmc(1, sample_period);
-
        dump_ebb_state();
 
        FAIL_IF(ebb_state.stats.ebb_count == 0);

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/lost_exception_test.c b/tools/testing/selftests/powerpc/pmu/ebb/lost_exception_test.c
index ac3e6e182614af63ce66f29f74a963f328e4709e..ba2681a12cc7be32ca08ce0fa2ebd21af7024fd9 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/lost_exception_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/lost_exception_test.c
@@ -75,7 +75,6 @@ static int test_body(void)
        ebb_freeze_pmcs();
        ebb_global_disable();
 
-       count_pmc(4, sample_period);
        mtspr(SPRN_PMC4, 0xdead);
 
        dump_summary_ebb_state();

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/multi_counter_test.c b/tools/testing/selftests/powerpc/pmu/ebb/multi_counter_test.c
index b8242e9d97d2d8e222f6020c0682b11080355395..791d37ba327b58930025ff61304adb639d89096d 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/multi_counter_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/multi_counter_test.c
@@ -70,13 +70,6 @@ int multi_counter(void)
        ebb_global_disable();
        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();
 
        for (i = 0; i < 6; i++)

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/multi_ebb_procs_test.c b/tools/testing/selftests/powerpc/pmu/ebb/multi_ebb_procs_test.c
index a05c0e18ded63fbe99e8b5436f512b4e90288e6f..9b0f70d597020bb524ee1711aa490c357b864603 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/multi_ebb_procs_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/multi_ebb_procs_test.c
@@ -61,8 +61,6 @@ static int cycles_child(void)
        ebb_global_disable();
        ebb_freeze_pmcs();
 
-       count_pmc(1, sample_period);
-
        dump_summary_ebb_state();
 
        event_close(&event);

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/pmae_handling_test.c b/tools/testing/selftests/powerpc/pmu/ebb/pmae_handling_test.c
index 153ebc92234fda18863a8089129d85de8d5eee58..2904c741e04e502fe45fb7624c0e7c4cbcb68a5d 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/pmae_handling_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/pmae_handling_test.c
@@ -82,8 +82,6 @@ static int test_body(void)
        ebb_global_disable();
        ebb_freeze_pmcs();
 
-       count_pmc(1, sample_period);
-
        dump_ebb_state();
 
        if (mmcr0_mismatch)

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/pmc56_overflow_test.c b/tools/testing/selftests/powerpc/pmu/ebb/pmc56_overflow_test.c
index eadad75ed7e6f6669a41eda86a2c3a4a3e9ddb3e..b29f8ba22d1e65e68dc295a5e51d0bd7711d19ac 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/pmc56_overflow_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/pmc56_overflow_test.c
@@ -76,8 +76,6 @@ int pmc56_overflow(void)
        ebb_global_disable();
        ebb_freeze_pmcs();
 
-       count_pmc(2, sample_period);
-
        dump_ebb_state();
 
        printf("PMC5/6 overflow %d\n", pmc56_overflowed);