From: Maynard J. <may...@us...> - 2006-02-22 14:37:16
|
Update of /cvsroot/oprofile/oprofile/libop In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6577/libop Modified Files: op_cpu_type.c op_cpu_type.h op_events.c Log Message: Add support for Power5+ Index: op_cpu_type.c =================================================================== RCS file: /cvsroot/oprofile/oprofile/libop/op_cpu_type.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -p -d -r1.32 -r1.33 --- op_cpu_type.c 17 Oct 2005 23:35:00 -0000 1.32 +++ op_cpu_type.c 22 Feb 2006 14:36:40 -0000 1.33 @@ -45,6 +45,7 @@ static struct cpu_descr const cpu_descrs { "ARM/XScale PMU2", "arm/xscale2", CPU_ARM_XSCALE2, 5 }, { "ppc64 POWER4", "ppc64/power4", CPU_PPC64_POWER4, 8 }, { "ppc64 POWER5", "ppc64/power5", CPU_PPC64_POWER5, 6 }, + { "ppc64 POWER5+", "ppc64/power5+", CPU_PPC64_POWER5p, 6 }, { "ppc64 970", "ppc64/970", CPU_PPC64_970, 8 }, { "MIPS 24K", "mips/24K", CPU_MIPS_24K, 2}, { "MIPS R10000", "mips/r10000", CPU_MIPS_R10000, 2 }, Index: op_cpu_type.h =================================================================== RCS file: /cvsroot/oprofile/oprofile/libop/op_cpu_type.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -d -r1.25 -r1.26 --- op_cpu_type.h 17 Oct 2005 23:35:00 -0000 1.25 +++ op_cpu_type.h 22 Feb 2006 14:36:40 -0000 1.26 @@ -41,6 +41,7 @@ typedef enum { CPU_ARM_XSCALE2, /**< ARM XScale 2 */ CPU_PPC64_POWER4, /**< ppc64 POWER4 family */ CPU_PPC64_POWER5, /**< ppc64 POWER5 family */ + CPU_PPC64_POWER5p, /**< ppc64 Power5+ family */ CPU_PPC64_970, /**< ppc64 970 family */ CPU_MIPS_24K, /**< MIPS 24K */ CPU_MIPS_R10000, /**< MIPS R10000 */ Index: op_events.c =================================================================== RCS file: /cvsroot/oprofile/oprofile/libop/op_events.c,v retrieving revision 1.68 retrieving revision 1.69 diff -u -p -d -r1.68 -r1.69 --- op_events.c 17 Oct 2005 23:35:00 -0000 1.68 +++ op_events.c 22 Feb 2006 14:36:40 -0000 1.69 @@ -643,6 +643,7 @@ char const * find_mapping_for_event(u32 case CPU_PPC64_970: case CPU_PPC64_POWER4: case CPU_PPC64_POWER5: + case CPU_PPC64_POWER5p: if (!fp) { fprintf(stderr, "oprofile: could not open event mapping file %s\n", filename); exit(EXIT_FAILURE); @@ -782,6 +783,7 @@ void op_default_event(op_cpu cpu_type, s case CPU_PPC64_970: case CPU_PPC64_POWER4: case CPU_PPC64_POWER5: + case CPU_PPC64_POWER5p: descr->name = "CYCLES"; break; |