From: John L. <mov...@us...> - 2007-05-23 14:02:41
|
Update of /cvsroot/oprofile/oprofile/libop In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7587/libop Modified Files: op_cpu_type.c op_cpu_type.h op_events.c Log Message: ARM events patches Index: op_cpu_type.c =================================================================== RCS file: /cvsroot/oprofile/oprofile/libop/op_cpu_type.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -p -d -r1.43 -r1.44 --- op_cpu_type.c 19 May 2007 14:01:12 -0000 1.43 +++ op_cpu_type.c 23 May 2007 14:02:34 -0000 1.44 @@ -63,12 +63,14 @@ static struct cpu_descr const cpu_descrs { "e500v2", "ppc/e500v2", CPU_PPC_E500_2, 4 }, { "Core Solo / Duo", "i386/core", CPU_CORE, 2 }, { "PowerPC G4", "ppc/7450", CPU_PPC_7450, 6 }, - { "Core 2", "i386/core_2", CPU_CORE_2, 2 }, + { "Core 2", "i386/core_2", CPU_CORE_2, 2 }, { "ppc64 POWER6", "ppc64/power6", CPU_PPC64_POWER6, 4 }, { "ppc64 970MP", "ppc64/970MP", CPU_PPC64_970MP, 8 }, { "ppc64 Cell Broadband Engine", "ppc64/cell-be", CPU_PPC64_CELL, 8 }, { "AMD64 family10", "x86-64/family10", CPU_FAMILY10, 4 }, - { "ppc64 PA6T", "ppc64/pa6t", CPU_PPC64_PA6T, 6 }, + { "ppc64 PA6T", "ppc64/pa6t", CPU_PPC64_PA6T, 6 }, + { "ARM MPCore", "arm/mpcore", CPU_ARM_MPCORE, 2 }, + { "ARM11 PMU", "arm/armv6", CPU_ARM_ARM11, 3 }, }; 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.36 retrieving revision 1.37 diff -u -p -d -r1.36 -r1.37 --- op_cpu_type.h 19 May 2007 14:01:12 -0000 1.36 +++ op_cpu_type.h 23 May 2007 14:02:34 -0000 1.37 @@ -67,6 +67,8 @@ typedef enum { CPU_PPC64_CELL, /**< ppc64 Cell Broadband Engine*/ CPU_FAMILY10, /**< AMD family 10 */ CPU_PPC64_PA6T, /**< ppc64 PA6T */ + CPU_ARM_MPCORE, /**< ARM MPCore */ + CPU_ARM_ARM11, /**< ARM11 */ MAX_CPU_TYPE } op_cpu; Index: op_events.c =================================================================== RCS file: /cvsroot/oprofile/oprofile/libop/op_events.c,v retrieving revision 1.80 retrieving revision 1.81 diff -u -p -d -r1.80 -r1.81 --- op_events.c 19 May 2007 14:01:12 -0000 1.80 +++ op_events.c 23 May 2007 14:02:34 -0000 1.81 @@ -785,6 +785,7 @@ void op_default_event(op_cpu cpu_type, s // we could possibly use the CCNT case CPU_ARM_XSCALE1: case CPU_ARM_XSCALE2: + case CPU_ARM_MPCORE: descr->name = "CPU_CYCLES"; break; @@ -840,6 +841,10 @@ void op_default_event(op_cpu cpu_type, s case CPU_PPC_E500_2: descr->name = "CPU_CLK"; break; + + case CPU_ARM_ARM11: + descr->name = "CPU_CYCLES"; + break; // don't use default, if someone add a cpu he wants a compiler // warning if he forgets to handle it here. |