Hello community, here is the log from the commit of package oprofile checked in at Sun May 7 16:28:00 CEST 2006. -------- --- oprofile/oprofile.changes 2006-02-27 18:33:19.000000000 +0100 +++ STABLE/oprofile/oprofile.changes 2006-05-04 14:53:21.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 4 14:52:58 CEST 2006 - schwab@suse.de + +- Fix last change. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oprofile.spec ++++++ --- /var/tmp/diff_new_pack.2vKJ5E/_old 2006-05-07 16:27:50.000000000 +0200 +++ /var/tmp/diff_new_pack.2vKJ5E/_new 2006-05-07 16:27:50.000000000 +0200 @@ -17,7 +17,7 @@ Group: Development/Tools/Other Autoreqprov: on Version: 0.9.1 -Release: 5 +Release: 16 Summary: System-Wide Profiler for Linux Systems BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %{name}-%{version}.tar.gz @@ -94,6 +94,8 @@ %doc doc/oprofile.html COPYING README TODO ChangeLog %changelog -n oprofile +* Thu May 04 2006 - schwab@suse.de +- Fix last change. * Mon Feb 27 2006 - schwab@suse.de - Add events for power5+ [#152494]. * Fri Jan 27 2006 - mls@suse.de ++++++ power5+-events.diff ++++++ --- /var/tmp/diff_new_pack.2vKJ5E/_old 2006-05-07 16:27:50.000000000 +0200 +++ /var/tmp/diff_new_pack.2vKJ5E/_new 2006-05-07 16:27:51.000000000 +0200 @@ -12,14 +12,10 @@ * utils/ophelp.c: Add support for Power5+ Index: events/Makefile.am -=================================================================== -RCS file: /cvsroot/oprofile/oprofile/events/Makefile.am,v -retrieving revision 1.12 -retrieving revision 1.13 -diff -u -a -p -r1.12 -r1.13 ---- events/Makefile.am 17 Oct 2005 23:35:00 -0000 1.12 -+++ events/Makefile.am 22 Feb 2006 14:36:36 -0000 1.13 -@@ -16,6 +16,7 @@ event_files = \ +================================================================================ +--- events/Makefile.am ++++ events/Makefile.am +@@ -16,6 +16,7 @@ ia64/itanium/events ia64/itanium/unit_masks \ ppc64/power4/events ppc64/power4/event_mappings ppc64/power4/unit_masks \ ppc64/power5/events ppc64/power5/event_mappings ppc64/power5/unit_masks \ @@ -27,12 +23,18 @@ ppc64/970/events ppc64/970/event_mappings ppc64/970/unit_masks \ rtc/events rtc/unit_masks \ x86-64/hammer/events x86-64/hammer/unit_masks \ -Index: events/ppc64/power5+/event_mappings -=================================================================== -RCS file: events/ppc64/power5+/event_mappings -diff -N events/ppc64/power5+/event_mappings ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ events/ppc64/power5+/event_mappings 22 Feb 2006 14:36:40 -0000 1.1 +--- events/Makefile.in ++++ events/Makefile.in +@@ -197,6 +197,7 @@ + ia64/itanium/events ia64/itanium/unit_masks \ + ppc64/power4/events ppc64/power4/event_mappings ppc64/power4/unit_masks \ + ppc64/power5/events ppc64/power5/event_mappings ppc64/power5/unit_masks \ ++ ppc64/power5+/events ppc64/power5+/event_mappings ppc64/power5+/unit_masks \ + ppc64/970/events ppc64/970/event_mappings ppc64/970/unit_masks \ + rtc/events rtc/unit_masks \ + x86-64/hammer/events x86-64/hammer/unit_masks \ +--- events/ppc64/power5+/event_mappings ++++ events/ppc64/power5+/event_mappings @@ -0,0 +1,1232 @@ +#Mapping of event groups to MMCR values + @@ -1266,12 +1268,8 @@ +event:0X993 mmcr0:0X00000000 mmcr1:0X0030000012501220 mmcra:0X00000000 +event:0X994 mmcr0:0X00000000 mmcr1:0X0030000012501220 mmcra:0X00000000 +event:0X995 mmcr0:0X00000000 mmcr1:0X0030000012501220 mmcra:0X00000000 -Index: events/ppc64/power5+/events -=================================================================== -RCS file: events/ppc64/power5+/events -diff -N events/ppc64/power5+/events ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ events/ppc64/power5+/events 22 Feb 2006 14:36:40 -0000 1.1 +--- events/ppc64/power5+/events ++++ events/ppc64/power5+/events @@ -0,0 +1,1242 @@ +#PPC64 Power5+ events +# @@ -2515,26 +2513,16 @@ +event:0X993 counters:3 um:zero minimum:1000 name:PM_LD_REF_L1_GRP153 : (Group 153 pm_eprof2) L1 D cache load references +event:0X994 counters:4 um:zero minimum:1000 name:PM_RUN_INST_CMPL_GRP153 : (Group 153 pm_eprof2) Run instructions completed +event:0X995 counters:5 um:zero minimum:10000 name:PM_RUN_CYC_GRP153 : (Group 153 pm_eprof2) Run cycles -Index: events/ppc64/power5+/unit_masks -=================================================================== -RCS file: events/ppc64/power5+/unit_masks -diff -N events/ppc64/power5+/unit_masks ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ events/ppc64/power5+/unit_masks 22 Feb 2006 14:36:40 -0000 1.1 +--- events/ppc64/power5+/unit_masks ++++ events/ppc64/power5+/unit_masks @@ -0,0 +1,4 @@ +# ppc64 Power5+ possible unit masks +# +name:zero type:mandatory default:0x0 + 0x0 No unit mask -Index: libop/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 -a -p -r1.32 -r1.33 ---- libop/op_cpu_type.c 17 Oct 2005 23:35:00 -0000 1.32 -+++ libop/op_cpu_type.c 22 Feb 2006 14:36:40 -0000 1.33 -@@ -45,6 +45,7 @@ static struct cpu_descr const cpu_descrs +--- libop/op_cpu_type.c ++++ libop/op_cpu_type.c +@@ -45,6 +45,7 @@ { "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 }, @@ -2542,15 +2530,9 @@ { "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: libop/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 -a -p -r1.25 -r1.26 ---- libop/op_cpu_type.h 17 Oct 2005 23:35:00 -0000 1.25 -+++ libop/op_cpu_type.h 22 Feb 2006 14:36:40 -0000 1.26 -@@ -41,6 +41,7 @@ typedef enum { +--- libop/op_cpu_type.h ++++ libop/op_cpu_type.h +@@ -41,6 +41,7 @@ CPU_ARM_XSCALE2, /**< ARM XScale 2 */ CPU_PPC64_POWER4, /**< ppc64 POWER4 family */ CPU_PPC64_POWER5, /**< ppc64 POWER5 family */ @@ -2558,15 +2540,9 @@ CPU_PPC64_970, /**< ppc64 970 family */ CPU_MIPS_24K, /**< MIPS 24K */ CPU_MIPS_R10000, /**< MIPS R10000 */ -Index: libop/op_events.c -=================================================================== -RCS file: /cvsroot/oprofile/oprofile/libop/op_events.c,v -retrieving revision 1.68 -retrieving revision 1.69 -diff -u -a -p -r1.68 -r1.69 ---- libop/op_events.c 17 Oct 2005 23:35:00 -0000 1.68 -+++ libop/op_events.c 22 Feb 2006 14:36:40 -0000 1.69 -@@ -643,6 +643,7 @@ char const * find_mapping_for_event(u32 +--- libop/op_events.c ++++ libop/op_events.c +@@ -648,6 +648,7 @@ case CPU_PPC64_970: case CPU_PPC64_POWER4: case CPU_PPC64_POWER5: @@ -2574,7 +2550,7 @@ 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 +@@ -787,6 +788,7 @@ case CPU_PPC64_970: case CPU_PPC64_POWER4: case CPU_PPC64_POWER5: @@ -2582,15 +2558,9 @@ descr->name = "CYCLES"; break; -Index: utils/opcontrol -=================================================================== -RCS file: /cvsroot/oprofile/oprofile/utils/opcontrol,v -retrieving revision 1.126 -retrieving revision 1.127 -diff -u -a -p -r1.126 -r1.127 ---- utils/opcontrol 10 Feb 2006 14:18:13 -0000 1.126 -+++ utils/opcontrol 22 Feb 2006 14:36:41 -0000 1.127 -@@ -998,7 +998,7 @@ set_ctr_param() +--- utils/opcontrol ++++ utils/opcontrol +@@ -933,7 +933,7 @@ check_event_mapping_data() { @@ -2599,15 +2569,9 @@ MMCR0=`echo $EVENT_STR | awk '{print $2}'` MMCR1=`echo $EVENT_STR | awk '{print $3}'` MMCRA=`echo $EVENT_STR | awk '{print $4}'` -Index: utils/ophelp.c -=================================================================== -RCS file: /cvsroot/oprofile/oprofile/utils/ophelp.c,v -retrieving revision 1.4 -retrieving revision 1.5 -diff -u -a -p -r1.4 -r1.5 ---- utils/ophelp.c 17 Oct 2005 23:35:00 -0000 1.4 -+++ utils/ophelp.c 22 Feb 2006 14:36:41 -0000 1.5 -@@ -411,6 +411,7 @@ int main(int argc, char const * argv[]) +--- utils/ophelp.c ++++ utils/ophelp.c +@@ -413,6 +413,7 @@ case CPU_PPC64_POWER4: case CPU_PPC64_POWER5: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root@suse.de