perf tests: Remove Intel CQM perf test

Intel CQM perf test is obsolete for perf PMU code has been removed in
commit c39a0e2c8850 ("x86/perf/cqm: Wipe out perf based cqm").

Signed-off-by: Xiaochen Shen <xiaochen.shen@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Pei P Jia <pei.p.jia@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Vikas Shivappa <vikas.shivappa@linux.intel.com>
Link: http://lkml.kernel.org/r/1505797057-16300-1-git-send-email-xiaochen.shen@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/arch/x86/include/arch-tests.h b/tools/perf/arch/x86/include/arch-tests.h
index 4e0b806a7a0fe0cc5a1881085e251775afb7d782..01ad4208bcdf2b757178dd5b14f135628998f1cd 100644 (file)
--- a/tools/perf/arch/x86/include/arch-tests.h
+++ b/tools/perf/arch/x86/include/arch-tests.h
@@ -8,7 +8,6 @@ struct test;
 int test__rdpmc(struct test *test __maybe_unused, int subtest);
 int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest);
 int test__insn_x86(struct test *test __maybe_unused, int subtest);
-int test__intel_cqm_count_nmi_context(struct test *test __maybe_unused, int subtest);
 
 #ifdef HAVE_DWARF_UNWIND_SUPPORT
 struct thread;

diff --git a/tools/perf/arch/x86/tests/Build b/tools/perf/arch/x86/tests/Build
index cbb7e978166bcc67209f31a9600149c6a5fe30bc..8e2c5a38c3b90c18c2159b8f91e54500734cd9f3 100644 (file)
--- a/tools/perf/arch/x86/tests/Build
+++ b/tools/perf/arch/x86/tests/Build
@@ -5,4 +5,3 @@ libperf-y += arch-tests.o
 libperf-y += rdpmc.o
 libperf-y += perf-time-to-tsc.o
 libperf-$(CONFIG_AUXTRACE) += insn-x86.o
-libperf-y += intel-cqm.o

diff --git a/tools/perf/arch/x86/tests/arch-tests.c b/tools/perf/arch/x86/tests/arch-tests.c
index 99d66191e56ccf8df7ae4f2a432f6f74782dd57d..271c0a0f95d732e4636b37b29603b5a22a8c595f 100644 (file)
--- a/tools/perf/arch/x86/tests/arch-tests.c
+++ b/tools/perf/arch/x86/tests/arch-tests.c
@@ -23,10 +23,6 @@ struct test arch_tests[] = {
                .func = test__insn_x86,
        },
 #endif
-       {
-               .desc = "Intel cqm nmi context read",
-               .func = test__intel_cqm_count_nmi_context,
-       },
        {
                .func = NULL,
        },

diff --git a/tools/perf/arch/x86/tests/intel-cqm.c b/tools/perf/arch/x86/tests/intel-cqm.c
deleted file mode 100644 (file)
index 57f86b6..0000000
--- a/tools/perf/arch/x86/tests/intel-cqm.c
+++ /dev/null
@@ -1,127 +0,0 @@
-#include "tests/tests.h"
-#include "perf.h"
-#include "cloexec.h"
-#include "debug.h"
-#include "evlist.h"
-#include "evsel.h"
-#include "arch-tests.h"
-
-#include <signal.h>
-#include <sys/mman.h>
-#include <sys/wait.h>
-#include <errno.h>
-#include <string.h>
-
-static pid_t spawn(void)
-{
-       pid_t pid;
-
-       pid = fork();
-       if (pid)
-               return pid;
-
-       while(1)
-               sleep(5);
-       return 0;
-}
-
-/*
- * Create an event group that contains both a sampled hardware
- * (cpu-cycles) and software (intel_cqm/llc_occupancy/) event. We then
- * wait for the hardware perf counter to overflow and generate a PMI,
- * which triggers an event read for both of the events in the group.
- *
- * Since reading Intel CQM event counters requires sending SMP IPIs, the
- * CQM pmu needs to handle the above situation gracefully, and return
- * the last read counter value to avoid triggering a WARN_ON_ONCE() in
- * smp_call_function_many() caused by sending IPIs from NMI context.
- */
-int test__intel_cqm_count_nmi_context(struct test *test __maybe_unused, int subtest __maybe_unused)
-{
-       struct perf_evlist *evlist = NULL;
-       struct perf_evsel *evsel = NULL;
-       struct perf_event_attr pe;
-       int i, fd[2], flag, ret;
-       size_t mmap_len;
-       void *event;
-       pid_t pid;
-       int err = TEST_FAIL;
-
-       flag = perf_event_open_cloexec_flag();
-
-       evlist = perf_evlist__new();
-       if (!evlist) {
-               pr_debug("perf_evlist__new failed\n");
-               return TEST_FAIL;
-       }
-
-       ret = parse_events(evlist, "intel_cqm/llc_occupancy/", NULL);
-       if (ret) {
-               pr_debug("parse_events failed, is \"intel_cqm/llc_occupancy/\" available?\n");
-               err = TEST_SKIP;
-               goto out;
-       }
-
-       evsel = perf_evlist__first(evlist);
-       if (!evsel) {
-               pr_debug("perf_evlist__first failed\n");
-               goto out;
-       }
-
-       memset(&pe, 0, sizeof(pe));
-       pe.size = sizeof(pe);
-
-       pe.type = PERF_TYPE_HARDWARE;
-       pe.config = PERF_COUNT_HW_CPU_CYCLES;
-       pe.read_format = PERF_FORMAT_GROUP;
-
-       pe.sample_period = 128;
-       pe.sample_type = PERF_SAMPLE_IP | PERF_SAMPLE_READ;
-
-       pid = spawn();
-
-       fd[0] = sys_perf_event_open(&pe, pid, -1, -1, flag);
-       if (fd[0] < 0) {
-               pr_debug("failed to open event\n");
-               goto out;
-       }
-
-       memset(&pe, 0, sizeof(pe));
-       pe.size = sizeof(pe);
-
-       pe.type = evsel->attr.type;
-       pe.config = evsel->attr.config;
-
-       fd[1] = sys_perf_event_open(&pe, pid, -1, fd[0], flag);
-       if (fd[1] < 0) {
-               pr_debug("failed to open event\n");
-               goto out;
-       }
-
-       /*
-        * Pick a power-of-two number of pages + 1 for the meta-data
-        * page (struct perf_event_mmap_page). See tools/perf/design.txt.
-        */
-       mmap_len = page_size * 65;
-
-       event = mmap(NULL, mmap_len, PROT_READ, MAP_SHARED, fd[0], 0);
-       if (event == (void *)(-1)) {
-               pr_debug("failed to mmap %d\n", errno);
-               goto out;
-       }
-
-       sleep(1);
-
-       err = TEST_OK;
-
-       munmap(event, mmap_len);
-
-       for (i = 0; i < 2; i++)
-               close(fd[i]);
-
-       kill(pid, SIGKILL);
-       wait(NULL);
-out:
-       perf_evlist__delete(evlist);
-       return err;
-}