diff mbox

[V6,1/5] perf tools: making coresight PMU listable

Message ID 1472156445-24283-2-git-send-email-mathieu.poirier@linaro.org (mailing list archive)
State New, archived
Headers show

Commit Message

Mathieu Poirier Aug. 25, 2016, 8:20 p.m. UTC 
Adding the required mechanic allowing 'perf list pmu' to
discover coresight ETM/PTM tracers.

Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
---
 MAINTAINERS                    |  1 +
 tools/perf/Makefile.config     | 11 +++++++----
 tools/perf/arch/arm/util/Build |  2 ++
 tools/perf/arch/arm/util/pmu.c | 34 ++++++++++++++++++++++++++++++++++
 4 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 tools/perf/arch/arm/util/pmu.c

Comments

Jiri Olsa Aug. 28, 2016, 2:16 p.m. UTC | #1 
On Thu, Aug 25, 2016 at 02:20:41PM -0600, Mathieu Poirier wrote:

SNIP

>  ARM/CORGI MACHINE SUPPORT
>  M:	Richard Purdie <rpurdie@rpsys.net>
> diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
> index 24803c58049a..72edf83d76b7 100644
> --- a/tools/perf/Makefile.config
> +++ b/tools/perf/Makefile.config
> @@ -746,10 +746,13 @@ ifdef LIBBABELTRACE
>  endif
>  
>  ifndef NO_AUXTRACE
> -  ifeq ($(feature-get_cpuid), 0)
> -    msg := $(warning Your gcc lacks the __get_cpuid() builtin, disables support for auxtrace/Intel PT, please install a newer gcc);
> -    NO_AUXTRACE := 1
> -  else
> +  ifeq ($(ARCH),x86)
> +    ifeq ($(feature-get_cpuid), 0)
> +      msg := $(warning Your gcc lacks the __get_cpuid() builtin, disables support for auxtrace/Intel PT, please install a newer gcc);
> +      NO_AUXTRACE := 1
> +    endif
> +  endif
> +  ifndef NO_AUXTRACE

hum, how's this hunk connected to the issue described in changelog?

thanks,
jirka

>      $(call detected,CONFIG_AUXTRACE)
>      CFLAGS += -DHAVE_AUXTRACE_SUPPORT
>    endif

SNIP
Mathieu Poirier Aug. 29, 2016, 3:56 p.m. UTC | #2 
On 28 August 2016 at 08:16, Jiri Olsa <jolsa@redhat.com> wrote:
> On Thu, Aug 25, 2016 at 02:20:41PM -0600, Mathieu Poirier wrote:
>
> SNIP
>
>>  ARM/CORGI MACHINE SUPPORT
>>  M:   Richard Purdie <rpurdie@rpsys.net>
>> diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
>> index 24803c58049a..72edf83d76b7 100644
>> --- a/tools/perf/Makefile.config
>> +++ b/tools/perf/Makefile.config
>> @@ -746,10 +746,13 @@ ifdef LIBBABELTRACE
>>  endif
>>
>>  ifndef NO_AUXTRACE
>> -  ifeq ($(feature-get_cpuid), 0)
>> -    msg := $(warning Your gcc lacks the __get_cpuid() builtin, disables support for auxtrace/Intel PT, please install a newer gcc);
>> -    NO_AUXTRACE := 1
>> -  else
>> +  ifeq ($(ARCH),x86)
>> +    ifeq ($(feature-get_cpuid), 0)
>> +      msg := $(warning Your gcc lacks the __get_cpuid() builtin, disables support for auxtrace/Intel PT, please install a newer gcc);
>> +      NO_AUXTRACE := 1
>> +    endif
>> +  endif
>> +  ifndef NO_AUXTRACE
>
> hum, how's this hunk connected to the issue described in changelog?

Patch 1/6 and 2/6 are needed by [3, 4, 5, 6]/6 of this set.
Originally they were part of a separate patchset I but decided to
include them here for completeness.  Let me know if you'd like to see
them split again.

>
> thanks,
> jirka
>
>>      $(call detected,CONFIG_AUXTRACE)
>>      CFLAGS += -DHAVE_AUXTRACE_SUPPORT
>>    endif
>
> SNIP
Jiri Olsa Aug. 31, 2016, 6:58 a.m. UTC | #3 
On Mon, Aug 29, 2016 at 09:56:02AM -0600, Mathieu Poirier wrote:
> On 28 August 2016 at 08:16, Jiri Olsa <jolsa@redhat.com> wrote:
> > On Thu, Aug 25, 2016 at 02:20:41PM -0600, Mathieu Poirier wrote:
> >
> > SNIP
> >
> >>  ARM/CORGI MACHINE SUPPORT
> >>  M:   Richard Purdie <rpurdie@rpsys.net>
> >> diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
> >> index 24803c58049a..72edf83d76b7 100644
> >> --- a/tools/perf/Makefile.config
> >> +++ b/tools/perf/Makefile.config
> >> @@ -746,10 +746,13 @@ ifdef LIBBABELTRACE
> >>  endif
> >>
> >>  ifndef NO_AUXTRACE
> >> -  ifeq ($(feature-get_cpuid), 0)
> >> -    msg := $(warning Your gcc lacks the __get_cpuid() builtin, disables support for auxtrace/Intel PT, please install a newer gcc);
> >> -    NO_AUXTRACE := 1
> >> -  else
> >> +  ifeq ($(ARCH),x86)
> >> +    ifeq ($(feature-get_cpuid), 0)
> >> +      msg := $(warning Your gcc lacks the __get_cpuid() builtin, disables support for auxtrace/Intel PT, please install a newer gcc);
> >> +      NO_AUXTRACE := 1
> >> +    endif
> >> +  endif
> >> +  ifndef NO_AUXTRACE
> >
> > hum, how's this hunk connected to the issue described in changelog?
> 
> Patch 1/6 and 2/6 are needed by [3, 4, 5, 6]/6 of this set.
> Originally they were part of a separate patchset I but decided to
> include them here for completeness.  Let me know if you'd like to see
> them split again.

ook, jirka
diff mbox

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index 0bbe4b105c34..c12a907372c5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1113,6 +1113,7 @@  F:	drivers/hwtracing/coresight/*
 F:	Documentation/trace/coresight.txt
 F:	Documentation/devicetree/bindings/arm/coresight.txt
 F:	Documentation/ABI/testing/sysfs-bus-coresight-devices-*
+F:	tools/perf/arch/arm/util/pmu.c
 
 ARM/CORGI MACHINE SUPPORT
 M:	Richard Purdie <rpurdie@rpsys.net>
diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
index 24803c58049a..72edf83d76b7 100644
--- a/tools/perf/Makefile.config
+++ b/tools/perf/Makefile.config
@@ -746,10 +746,13 @@  ifdef LIBBABELTRACE
 endif
 
 ifndef NO_AUXTRACE
-  ifeq ($(feature-get_cpuid), 0)
-    msg := $(warning Your gcc lacks the __get_cpuid() builtin, disables support for auxtrace/Intel PT, please install a newer gcc);
-    NO_AUXTRACE := 1
-  else
+  ifeq ($(ARCH),x86)
+    ifeq ($(feature-get_cpuid), 0)
+      msg := $(warning Your gcc lacks the __get_cpuid() builtin, disables support for auxtrace/Intel PT, please install a newer gcc);
+      NO_AUXTRACE := 1
+    endif
+  endif
+  ifndef NO_AUXTRACE
     $(call detected,CONFIG_AUXTRACE)
     CFLAGS += -DHAVE_AUXTRACE_SUPPORT
   endif
diff --git a/tools/perf/arch/arm/util/Build b/tools/perf/arch/arm/util/Build
index f98da17357c0..4093fd146f46 100644
--- a/tools/perf/arch/arm/util/Build
+++ b/tools/perf/arch/arm/util/Build
@@ -2,3 +2,5 @@  libperf-$(CONFIG_DWARF) += dwarf-regs.o
 
 libperf-$(CONFIG_LOCAL_LIBUNWIND)    += unwind-libunwind.o
 libperf-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o
+
+libperf-$(CONFIG_AUXTRACE) += pmu.o
diff --git a/tools/perf/arch/arm/util/pmu.c b/tools/perf/arch/arm/util/pmu.c
new file mode 100644
index 000000000000..af9fb666b44f
--- /dev/null
+++ b/tools/perf/arch/arm/util/pmu.c
@@ -0,0 +1,34 @@ 
+/*
+ * Copyright(C) 2015 Linaro Limited. All rights reserved.
+ * Author: Mathieu Poirier <mathieu.poirier@linaro.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <string.h>
+#include <linux/coresight-pmu.h>
+#include <linux/perf_event.h>
+
+#include "../../util/pmu.h"
+
+struct perf_event_attr
+*perf_pmu__get_default_config(struct perf_pmu *pmu __maybe_unused)
+{
+#ifdef HAVE_AUXTRACE_SUPPORT
+	if (!strcmp(pmu->name, CORESIGHT_ETM_PMU_NAME)) {
+		/* add ETM default config here */
+		pmu->selectable = true;
+	}
+#endif
+	return NULL;
+}