diff -urN oprofile.orig/events/Makefile.am oprofile/events/Makefile.am --- oprofile.orig/events/Makefile.am 2006-04-23 03:46:52.000000000 +0200 +++ oprofile/events/Makefile.am 2006-04-23 02:53:14.000000000 +0200 @@ -31,6 +31,7 @@ mips/vr5432/events mips/vr5432/unit_masks \ mips/vr5500/events mips/vr5500/unit_masks \ ppc/e500/events ppc/e500/unit_masks \ + ppc/7450/events ppc/7450/unit_masks \ ppc/e500v2/events ppc/e500v2/unit_masks install-data-local: diff -urN oprofile.orig/events/ppc/7450/events oprofile/events/ppc/7450/events --- oprofile.orig/events/ppc/7450/events 1970-01-01 01:00:00.000000000 +0100 +++ oprofile/events/ppc/7450/events 2006-04-23 03:34:21.000000000 +0200 @@ -0,0 +1,15 @@ +# 7450 Events +# +event:0x1 counters:0,1,2,3,4,5 um:zero minimum:100 name:CYCLES : Cycles +event:0x2 counters:0,1,2,3 um:zero minimum:100 name:COMPLETED_INS : Completed Instructions +event:0x3 counters:0,1,2,3 um:zero minimum:500 name:TLB_TRANS : TBL bit transitions +event:0x4 counters:0,1,2,3 um:zero minimum:500 name:DISPATCHED_INS : Number of instructions dispatched: 0, 1, 2, or 3 per cycle +event:0x5 counters:0,1,2,3 um:zero minimum:0 name:PMC_EXCEPTION : Processor performance monitor exception +event:0x7 counters:0,1,2 um:zero minimum:0 name:EXTERNAL_PMC_SIGN : External performance monitor signal +event:0x8 counters:0,1,2 um:zero minimum:0 name:COMPLETED_VPU_INS : VPU instructions completed +event:0x9 counters:0,1,2 um:zero minimum:0 name:COMPLETED_VFPU_INS : VFPU instructions completed +event:0xa counters:0,1,2 um:zero minimum:0 name:COMPLETED_VIU1_INS : VIU1 instructions completed +event:0xb counters:0,1,2 um:zero minimum:0 name:COMPLETED_VIU2_INS : VIU2 instructions completed + + + diff -urN oprofile.orig/libop/op_cpu_type.c oprofile/libop/op_cpu_type.c --- oprofile.orig/libop/op_cpu_type.c 2006-04-23 03:31:19.000000000 +0200 +++ oprofile/libop/op_cpu_type.c 2006-04-23 03:10:27.000000000 +0200 @@ -57,6 +57,7 @@ { "NEC VR5500", "mips/vr5500", CPU_MIPS_VR5500, 2 }, { "e500", "ppc/e500", CPU_PPC_E500, 4 }, { "e500v2", "ppc/e500v2", CPU_PPC_E500_2, 4 }, + { "PowerPC G4", "ppc/7450", CPU_PPC_7450, 6 }, }; static size_t const nr_cpu_descrs = sizeof(cpu_descrs) / sizeof(struct cpu_descr); diff -urN oprofile.orig/libop/op_cpu_type.h oprofile/libop/op_cpu_type.h --- oprofile.orig/libop/op_cpu_type.h 2006-04-23 03:31:19.000000000 +0200 +++ oprofile/libop/op_cpu_type.h 2006-04-23 01:52:23.000000000 +0200 @@ -53,6 +53,7 @@ CPU_MIPS_VR5500, /**< MIPS VR5500, VR5532 and VR7701 */ CPU_PPC_E500, /**< e500 */ CPU_PPC_E500_2, /**< e500v2 */ + CPU_PPC_7450, /**< PowerPC G4 */ MAX_CPU_TYPE } op_cpu; diff -urN oprofile.orig/libop/op_events.c oprofile/libop/op_events.c --- oprofile.orig/libop/op_events.c 2006-04-23 03:31:19.000000000 +0200 +++ oprofile/libop/op_events.c 2006-04-23 02:50:21.000000000 +0200 @@ -780,6 +780,7 @@ descr->name = "CPU_CYCLES"; break; + case CPU_PPC_7450: //FIXME doublecheck case CPU_PPC64_970: case CPU_PPC64_POWER4: case CPU_PPC64_POWER5: diff -urN oprofile.orig/events/ppc/7450/unit_masks oprofile/events/ppc/7450/unit_masks --- oprofile.orig/events/ppc/7450/unit_masks 1970-01-01 01:00:00.000000000 +0100 +++ oprofile/events/ppc/7450/unit_masks 2006-04-23 02:49:27.000000000 +0200 @@ -0,0 +1,4 @@ +# 7450 possible unit masks +# +name:zero type:mandatory default:0x0 + 0x0 No unit mask