Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1213571

[PATCH v16 05/16] perf, tools: Support CPU id matching for x86 v2

Show all headers | View raw

From: Andi Kleen <ak@linux.intel.com>

Implement the code to match CPU types to mapfile types for x86
based on CPUID. This extends an existing similar function,
but changes it to use the x86 mapfile cpu description.
This allows to resolve event lists generated by jevents.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
---

v2: Update to new get_cpuid_str() interface
---
 tools/perf/arch/x86/util/header.c |   24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/tools/perf/arch/x86/util/header.c b/tools/perf/arch/x86/util/header.c
index 146d12a..a74a48d 100644
--- a/tools/perf/arch/x86/util/header.c
+++ b/tools/perf/arch/x86/util/header.c
@@ -19,8 +19,8 @@ cpuid(unsigned int op, unsigned int *a, unsigned int *b, unsigned int *c,
 			: "a" (op));
 }
 
-int
-get_cpuid(char *buffer, size_t sz)
+static int
+__get_cpuid(char *buffer, size_t sz, const char *fmt)
 {
 	unsigned int a, b, c, d, lvl;
 	int family = -1, model = -1, step = -1;
@@ -48,7 +48,7 @@ get_cpuid(char *buffer, size_t sz)
 		if (family >= 0x6)
 			model += ((a >> 16) & 0xf) << 4;
 	}
-	nb = scnprintf(buffer, sz, "%s,%u,%u,%u$", vendor, family, model, step);
+	nb = scnprintf(buffer, sz, fmt, vendor, family, model, step);
 
 	/* look for end marker to ensure the entire data fit */
 	if (strchr(buffer, '$')) {
@@ -57,3 +57,21 @@ get_cpuid(char *buffer, size_t sz)
 	}
 	return -1;
 }
+
+int
+get_cpuid(char *buffer, size_t sz)
+{
+	return __get_cpuid(buffer, sz, "%s,%u,%u,%u$");
+}
+
+char *
+get_cpuid_str(void)
+{
+	char *buf = malloc(128);
+
+	if (__get_cpuid(buf, 128, "%s-%u-%X$") < 0) {
+		free(buf);
+		return NULL;
+	}
+	return buf;
+}
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v16 00/16] perf, tools: Add support for PMU events in JSON format Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-08-26 08:10 +0200
  [PATCH v16 15/16] perf, tools: Handle header line in mapfile Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-08-26 08:10 +0200
  [PATCH v16 14/16] perf, tools: Add support for event list topics Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-08-26 08:10 +0200
  [PATCH v16 04/16] perf, tools: Support CPU ID matching for Powerpc Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-08-26 08:10 +0200
  [PATCH v16 02/16] perf, tools, jevents: Program to convert JSON file to C style file Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-08-26 08:10 +0200
  [PATCH v16 12/16] perf, tools: Support long descriptions with perf list Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-08-26 08:20 +0200
  [PATCH v16 09/16] perf, tools: Add override support for event list CPUID Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-08-26 08:20 +0200
  [PATCH v16 16/16] perf, tools: Add README for info on parsing JSON/map files Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-08-26 08:20 +0200
  [PATCH v16 11/16] perf, tools: Add alias support for long descriptions Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-08-26 08:20 +0200
  [PATCH v16 13/16] perf, tools, jevents: Add support for event topics Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-08-26 08:20 +0200
  [PATCH v16 05/16] perf, tools: Support CPU id matching for x86 v2 Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-08-26 08:20 +0200
  [PATCH v16 10/16] perf, tools, jevents: Add support for long descriptions Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-08-26 08:20 +0200
  [PATCH v16 01/16] perf, tools: Add jsmn `jasmine' JSON parser Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-08-26 08:20 +0200
  [PATCH v16 08/16] perf, tools: Add a --no-desc flag to perf list Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-08-26 08:20 +0200
  Re: [PATCH v16 00/16] perf, tools: Add support for PMU events in  JSON format Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-08-31 21:10 +0200

csiph-web