Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f33d1227 authored by Andi Kleen's avatar Andi Kleen Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Support CPU id matching for x86 v2 



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: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarSukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Acked-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: linuxppc-dev@lists.ozlabs.org
Link: http://lkml.kernel.org/r/1473978296-20712-6-git-send-email-sukadev@linux.vnet.ibm.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent ce88f27c

tools/perf/arch/x86/util/header.c

+21 −3
Original line number Diff line number Diff line
@@ -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;

}