[oprof-cvs] CVS: oprofile/libop op_cpu_type.c, 1.45, 1.46 op_cpu_type.h, 1.38, 1.39 op_events.c, 1.82, 1.83

[Maynard J. <may...@us...>]

Update of /cvsroot/oprofile/oprofile/libop
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26053/oprofile/libop

Modified Files:
	op_cpu_type.c op_cpu_type.h op_events.c 
Log Message:
Add support for POWER5+ revision 3.0 and later

Index: op_cpu_type.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libop/op_cpu_type.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -d -r1.45 -r1.46
--- op_cpu_type.c	24 May 2007 17:08:35 -0000	1.45
+++ op_cpu_type.c	13 Jun 2007 15:04:12 -0000	1.46
@@ -71,6 +71,7 @@ static struct cpu_descr const cpu_descrs
 	{ "ppc64 PA6T", "ppc64/pa6t", CPU_PPC64_PA6T, 6 },
 	{ "ARM MPCore", "arm/mpcore", CPU_ARM_MPCORE, 2 },
 	{ "ARM V6 PMU", "arm/armv6", CPU_ARM_V6, 3 },
+	{ "ppc64 POWER5++", "ppc64/power5++", CPU_PPC64_POWER5pp, 6 },
 };
  
 static size_t const nr_cpu_descrs = sizeof(cpu_descrs) / sizeof(struct cpu_descr);

Index: op_cpu_type.h
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libop/op_cpu_type.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -d -r1.38 -r1.39
--- op_cpu_type.h	24 May 2007 17:08:35 -0000	1.38
+++ op_cpu_type.h	13 Jun 2007 15:04:12 -0000	1.39
@@ -69,6 +69,7 @@ typedef enum {
  	CPU_PPC64_PA6T, /**< ppc64 PA6T */
 	CPU_ARM_MPCORE, /**< ARM MPCore */
 	CPU_ARM_V6, /**< ARM V6 */
+	CPU_PPC64_POWER5pp,  /**< ppc64 Power5++ family */
 	MAX_CPU_TYPE
 } op_cpu;
 

Index: op_events.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libop/op_events.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -d -r1.82 -r1.83
--- op_events.c	24 May 2007 17:08:35 -0000	1.82
+++ op_events.c	13 Jun 2007 15:04:12 -0000	1.83
@@ -648,6 +648,7 @@ char const * find_mapping_for_event(u32 
 		case CPU_PPC64_POWER4:
 		case CPU_PPC64_POWER5:
 		case CPU_PPC64_POWER5p:
+		case CPU_PPC64_POWER5pp:
 		case CPU_PPC64_POWER6:
 			if (!fp) {
 				fprintf(stderr, "oprofile: could not open event mapping file %s\n", filename);
@@ -798,6 +799,7 @@ void op_default_event(op_cpu cpu_type, s
 		case CPU_PPC64_POWER5:
 		case CPU_PPC64_POWER6:
 		case CPU_PPC64_POWER5p:
+		case CPU_PPC64_POWER5pp:
 		case CPU_PPC64_CELL:
 			descr->name = "CYCLES";
 			break;