[oe-commits] org.oe.dev oprofile 0.9.3: add armv7a support

koen commit oe at amethyst.openembedded.net
Fri Jul 4 09:00:58 UTC 2008


oprofile 0.9.3: add armv7a support

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 58e915acb285fd9cb4186b4a60dc67fc59205e28
ViewMTN: http://monotone.openembedded.org/revision/info/58e915acb285fd9cb4186b4a60dc67fc59205e28
Files:
1
packages/oprofile/oprofile/armv7a.diff
packages/oprofile/oprofile_0.9.3.bb
Diffs:

#
# mt diff -r4d6146837615572910b8930c58e77031ef0ced17 -r58e915acb285fd9cb4186b4a60dc67fc59205e28
#
#
#
# add_file "packages/oprofile/oprofile/armv7a.diff"
#  content [287a599dc9191dd8fc275fafefb8d7b78910a678]
# 
# patch "packages/oprofile/oprofile_0.9.3.bb"
#  from [51f8332de97969e3b83385400eabe2a803afd65d]
#    to [47e36e539aec107088958b576f16f5d733b9c9bc]
#
============================================================
--- packages/oprofile/oprofile/armv7a.diff	287a599dc9191dd8fc275fafefb8d7b78910a678
+++ packages/oprofile/oprofile/armv7a.diff	287a599dc9191dd8fc275fafefb8d7b78910a678
@@ -0,0 +1,151 @@
+diff -urN oprofile-0.9.3/ChangeLog oprofile-0.9.3.armv7/ChangeLog
+--- oprofile-0.9.3/ChangeLog	2007-07-16 20:22:17.000000000 +0200
++++ oprofile-0.9.3.armv7/ChangeLog	2008-04-23 18:38:40.000000000 +0200
+@@ -1,3 +1,14 @@
++
++2008-04-23  Jean Pihet <jpihet at mvista.com>
++
++	* events/arm/armv7/events:
++	* events/arm/armv7/unit_masks:
++	* libop/op_cpu_type.c:
++	* libop/op_cpu_type.h:
++	* libop/op_events.c:
++	* utils/ophelp.c: Added ARMv7 support to be consistent with the kernel,
++	  remove some duplicate code and add some extra events
++
+ 2007-07-09  Maynard Johnson <maynardj at us.ibm.com>
+ 
+         * doc/opreport.xsd:
+diff -urN oprofile-0.9.3/events/arm/armv7/events oprofile-0.9.3.armv7/events/arm/armv7/events
+--- oprofile-0.9.3/events/arm/armv7/events	1970-01-01 01:00:00.000000000 +0100
++++ oprofile-0.9.3.armv7/events/arm/armv7/events	2008-04-24 15:06:48.000000000 +0200
+@@ -0,0 +1,53 @@
++# ARM V7 events
++# From Cortex A8 DDI (ARM DDI 0344B, revision r1p1) 
++#
++event:0x00 counters:1,2,3,4 um:zero minimum:500 name:PMNC_SW_INCR : Software increment of PMNC registers
++event:0x01 counters:1,2,3,4 um:zero minimum:500 name:IFETCH_MISS : Instruction fetch misses from cache or normal cacheable memory
++event:0x02 counters:1,2,3,4 um:zero minimum:500 name:ITLB_MISS : Instruction fetch misses from TLB
++event:0x03 counters:1,2,3,4 um:zero minimum:500 name:DCACHE_REFILL : Data R/W operation that causes a refill from cache or normal cacheable memory
++event:0x04 counters:1,2,3,4 um:zero minimum:500 name:DCACHE_ACCESS : Data R/W from cache
++event:0x05 counters:1,2,3,4 um:zero minimum:500 name:DTLB_REFILL : Data R/W that causes a TLB refill
++event:0x06 counters:1,2,3,4 um:zero minimum:500 name:DREAD : Data read architecturally executed (note: architecturally executed = for instructions that are unconditional or that pass the condition code)
++event:0x07 counters:1,2,3,4 um:zero minimum:500 name:DWRITE : Data write architecturally executed
++event:0x08 counters:1,2,3,4 um:zero minimum:500 name:INSTR_EXECUTED : All executed instructions
++event:0x09 counters:1,2,3,4 um:zero minimum:500 name:EXC_TAKEN : Exception taken
++event:0x0A counters:1,2,3,4 um:zero minimum:500 name:EXC_EXECUTED : Exception return architecturally executed
++event:0x0B counters:1,2,3,4 um:zero minimum:500 name:CID_WRITE : Instruction that writes to the Context ID Register architecturally executed
++event:0x0C counters:1,2,3,4 um:zero minimum:500 name:PC_WRITE : SW change of PC, architecturally executed (not by exceptions)
++event:0x0D counters:1,2,3,4 um:zero minimum:500 name:PC_IMM_BRANCH : Immediate branch instruction executed (taken or not)
++event:0x0E counters:1,2,3,4 um:zero minimum:500 name:PC_PROC_RETURN : Procedure return architecturally executed (not by exceptions)
++event:0x0F counters:1,2,3,4 um:zero minimum:500 name:UNALIGNED_ACCESS : Unaligned access architecturally executed
++event:0x10 counters:1,2,3,4 um:zero minimum:500 name:PC_BRANCH_MIS_PRED : Branch mispredicted or not predicted. Counts pipeline flushes because of misprediction
++event:0x12 counters:1,2,3,4 um:zero minimum:500 name:PC_BRANCH_MIS_USED : Branch or change in program flow that could have been predicted
++event:0x40 counters:1,2,3,4 um:zero minimum:500 name:WRITE_BUFFER_FULL : Any write buffer full cycle
++event:0x41 counters:1,2,3,4 um:zero minimum:500 name:L2_STORE_MERGED : Any store that is merged in L2 cache
++event:0x42 counters:1,2,3,4 um:zero minimum:500 name:L2_STORE_BUFF : Any bufferable store from load/store to L2 cache
++event:0x43 counters:1,2,3,4 um:zero minimum:500 name:L2_ACCESS : Any access to L2 cache
++event:0x44 counters:1,2,3,4 um:zero minimum:500 name:L2_CACH_MISS : Any cacheable miss in L2 cache
++event:0x45 counters:1,2,3,4 um:zero minimum:500 name:AXI_READ_CYCLES : Number of cycles for an active AXI read
++event:0x46 counters:1,2,3,4 um:zero minimum:500 name:AXI_WRITE_CYCLES : Number of cycles for an active AXI write
++event:0x47 counters:1,2,3,4 um:zero minimum:500 name:MEMORY_REPLAY : Any replay event in the memory subsystem
++event:0x48 counters:1,2,3,4 um:zero minimum:500 name:UNALIGNED_ACCESS_REPLAY : Unaligned access that causes a replay
++event:0x49 counters:1,2,3,4 um:zero minimum:500 name:L1_DATA_MISS : L1 data cache miss as a result of the hashing algorithm
++event:0x4A counters:1,2,3,4 um:zero minimum:500 name:L1_INST_MISS : L1 instruction cache miss as a result of the hashing algorithm
++event:0x4B counters:1,2,3,4 um:zero minimum:500 name:L1_DATA_COLORING : L1 data access in which a page coloring alias occurs
++event:0x4C counters:1,2,3,4 um:zero minimum:500 name:L1_NEON_DATA : NEON data access that hits L1 cache
++event:0x4D counters:1,2,3,4 um:zero minimum:500 name:L1_NEON_CACH_DATA : NEON cacheable data access that hits L1 cache
++event:0x4E counters:1,2,3,4 um:zero minimum:500 name:L2_NEON : L2 access as a result of NEON memory access
++event:0x4F counters:1,2,3,4 um:zero minimum:500 name:L2_NEON_HIT : Any NEON hit in L2 cache
++event:0x50 counters:1,2,3,4 um:zero minimum:500 name:L1_INST : Any L1 instruction cache access, excluding CP15 cache accesses
++event:0x51 counters:1,2,3,4 um:zero minimum:500 name:PC_RETURN_MIS_PRED : Return stack misprediction at return stack pop (incorrect target address)
++event:0x52 counters:1,2,3,4 um:zero minimum:500 name:PC_BRANCH_FAILED : Branch prediction misprediction
++event:0x53 counters:1,2,3,4 um:zero minimum:500 name:PC_BRANCH_TAKEN : Any predicted branch that is taken
++event:0x54 counters:1,2,3,4 um:zero minimum:500 name:PC_BRANCH_EXECUTED : Any taken branch that is executed
++event:0x55 counters:1,2,3,4 um:zero minimum:500 name:OP_EXECUTED : Number of operations executed (in instruction or mutli-cycle instruction)
++event:0x56 counters:1,2,3,4 um:zero minimum:500 name:CYCLES_INST_STALL : Cycles where no instruction available
++event:0x57 counters:1,2,3,4 um:zero minimum:500 name:CYCLES_INST : Number of instructions issued in a cycle
++event:0x58 counters:1,2,3,4 um:zero minimum:500 name:CYCLES_NEON_DATA_STALL : Number of cycles the processor waits on MRC data from NEON
++event:0x59 counters:1,2,3,4 um:zero minimum:500 name:CYCLES_NEON_INST_STALL : Number of cycles the processor waits on NEON instruction queue or NEON load queue
++event:0x5A counters:1,2,3,4 um:zero minimum:500 name:NEON_CYCLES : Number of cycles NEON and integer processors are not idle
++event:0x70 counters:1,2,3,4 um:zero minimum:500 name:PMU0_EVENTS : Number of events from external input source PMUEXTIN[0]
++event:0x71 counters:1,2,3,4 um:zero minimum:500 name:PMU1_EVENTS : Number of events from external input source PMUEXTIN[1]
++event:0x72 counters:1,2,3,4 um:zero minimum:500 name:PMU_EVENTS : Number of events from both external input sources PMUEXTIN[0] and PMUEXTIN[1]
++event:0xFF counters:0 um:zero minimum:500 name:CPU_CYCLES : Number of CPU cycles
++
+diff -urN oprofile-0.9.3/events/arm/armv7/unit_masks oprofile-0.9.3.armv7/events/arm/armv7/unit_masks
+--- oprofile-0.9.3/events/arm/armv7/unit_masks	1970-01-01 01:00:00.000000000 +0100
++++ oprofile-0.9.3.armv7/events/arm/armv7/unit_masks	2008-04-01 10:52:00.000000000 +0200
+@@ -0,0 +1,4 @@
++# ARM V7 PMNC possible unit masks
++#
++name:zero type:mandatory default:0x00
++	0x00 No unit mask
+diff -urN oprofile-0.9.3/events/Makefile.in oprofile-0.9.3.armv7/events/Makefile.in
+--- oprofile-0.9.3/events/Makefile.in	2007-07-16 20:23:28.000000000 +0200
++++ oprofile-0.9.3.armv7/events/Makefile.in	2008-04-24 15:11:52.000000000 +0200
+@@ -211,6 +211,7 @@
+ 	arm/xscale1/events arm/xscale1/unit_masks \
+ 	arm/xscale2/events arm/xscale2/unit_masks \
+ 	arm/armv6/events arm/armv6/unit_masks \
++	arm/armv7/events arm/armv7/unit_masks \
+ 	arm/mpcore/events arm/mpcore/unit_masks \
+ 	mips/20K/events mips/20K/unit_masks \
+ 	mips/24K/events mips/24K/unit_masks \
+@@ -270,7 +271,7 @@
+ 
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/alpha/ev4 $(distdir)/alpha/ev5 $(distdir)/alpha/ev6 $(distdir)/alpha/ev67 $(distdir)/alpha/pca56 $(distdir)/arm/armv6 $(distdir)/arm/mpcore $(distdir)/arm/xscale1 $(distdir)/arm/xscale2 $(distdir)/i386/athlon $(distdir)/i386/core $(distdir)/i386/core_2 $(distdir)/i386/p4 $(distdir)/i386/p4-ht $(distdir)/i386/p6_mobile $(distdir)/i386/pii $(distdir)/i386/piii $(distdir)/i386/ppro $(distdir)/ia64/ia64 $(distdir)/ia64/itanium $(distdir)/ia64/itanium2 $(distdir)/mips/20K $(distdir)/mips/24K $(distdir)/mips/25K $(distdir)/mips/34K $(distdir)/mips/5K $(distdir)/mips/r10000 $(distdir)/mips/r12000 $(distdir)/mips/rm7000 $(distdir)/mips/rm9000 $(distdir)/mips/sb1 $(distdir)/mips/vr5432 $(distdir)/mips/vr5500 $(distdir)/ppc/7450 $(distdir)/ppc/e500 $(distdir)/ppc/e500v2 $(distdir)/ppc64/970 $(distdir)/ppc64/970MP $(distdir)/ppc64/cell-be $(distdir)/ppc64/pa6t $(distdir)/ppc64/power4 $(distdir)/ppc64/power5 $(distdir)/ppc64/power5+ $(distdir)/ppc64/power5++ $(distdir)/ppc64/power6 $(distdir)/rtc $(distdir)/x86-64/family10 $(distdir)/x86-64/hammer
++	$(mkdir_p) $(distdir)/alpha/ev4 $(distdir)/alpha/ev5 $(distdir)/alpha/ev6 $(distdir)/alpha/ev67 $(distdir)/alpha/pca56 $(distdir)/arm/armv6 $(distdir)/arm/armv7 $(distdir)/arm/mpcore $(distdir)/arm/xscale1 $(distdir)/arm/xscale2 $(distdir)/i386/athlon $(distdir)/i386/core $(distdir)/i386/core_2 $(distdir)/i386/p4 $(distdir)/i386/p4-ht $(distdir)/i386/p6_mobile $(distdir)/i386/pii $(distdir)/i386/piii $(distdir)/i386/ppro $(distdir)/ia64/ia64 $(distdir)/ia64/itanium $(distdir)/ia64/itanium2 $(distdir)/mips/20K $(distdir)/mips/24K $(distdir)/mips/25K $(distdir)/mips/34K $(distdir)/mips/5K $(distdir)/mips/r10000 $(distdir)/mips/r12000 $(distdir)/mips/rm7000 $(distdir)/mips/rm9000 $(distdir)/mips/sb1 $(distdir)/mips/vr5432 $(distdir)/mips/vr5500 $(distdir)/ppc/7450 $(distdir)/ppc/e500 $(distdir)/ppc/e500v2 $(distdir)/ppc64/970 $(distdir)/ppc64/970MP $(distdir)/ppc64/cell-be $(distdir)/ppc64/pa6t $(distdir)/ppc64/power4 $(distdir)/ppc64/power5 $(distdir)/ppc64/power5+ $(distdir)/ppc64/power5++ $(distdir)/ppc64/power6 $(distdir)/rtc $(distdir)/x86-64/family10 $(distdir)/x86-64/hammer
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+diff -urN oprofile-0.9.3/libop/op_cpu_type.c oprofile-0.9.3.armv7/libop/op_cpu_type.c
+--- oprofile-0.9.3/libop/op_cpu_type.c	2007-07-16 20:22:17.000000000 +0200
++++ oprofile-0.9.3.armv7/libop/op_cpu_type.c	2008-04-23 18:31:56.000000000 +0200
+@@ -71,6 +71,7 @@
+ 	{ "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 },
++	{ "ARM V7 PMNC", "arm/armv7", CPU_ARM_V7, 5 },
+ 	{ "ppc64 POWER5++", "ppc64/power5++", CPU_PPC64_POWER5pp, 6 },
+ };
+  
+diff -urN oprofile-0.9.3/libop/op_cpu_type.h oprofile-0.9.3.armv7/libop/op_cpu_type.h
+--- oprofile-0.9.3/libop/op_cpu_type.h	2007-07-16 20:22:17.000000000 +0200
++++ oprofile-0.9.3.armv7/libop/op_cpu_type.h	2008-04-23 18:34:37.000000000 +0200
+@@ -69,6 +69,7 @@
+  	CPU_PPC64_PA6T, /**< ppc64 PA6T */
+ 	CPU_ARM_MPCORE, /**< ARM MPCore */
+ 	CPU_ARM_V6, /**< ARM V6 */
++	CPU_ARM_V7, /**< ARM V7 */
+ 	CPU_PPC64_POWER5pp,  /**< ppc64 Power5++ family */
+ 	MAX_CPU_TYPE
+ } op_cpu;
+diff -urN oprofile-0.9.3/libop/op_events.c oprofile-0.9.3.armv7/libop/op_events.c
+--- oprofile-0.9.3/libop/op_events.c	2007-07-16 20:22:17.000000000 +0200
++++ oprofile-0.9.3.armv7/libop/op_events.c	2008-04-23 18:39:30.000000000 +0200
+@@ -788,6 +788,7 @@
+ 		case CPU_ARM_XSCALE2:
+ 		case CPU_ARM_MPCORE:
+ 		case CPU_ARM_V6:
++		case CPU_ARM_V7:
+ 			descr->name = "CPU_CYCLES";
+ 			break;
+ 
+diff -urN oprofile-0.9.3/utils/ophelp.c oprofile-0.9.3.armv7/utils/ophelp.c
+--- oprofile-0.9.3/utils/ophelp.c	2007-07-16 20:22:17.000000000 +0200
++++ oprofile-0.9.3.armv7/utils/ophelp.c	2008-04-23 19:17:51.000000000 +0200
+@@ -433,6 +433,11 @@
+ 		printf("See ARM11 Technical Reference Manual\n");
+   		break;
+ 
++	case CPU_ARM_V7:
++		printf("See ARM11 Technical Reference Manual\n"
++			"Cortex A8 DDI (ARM DDI 0344B, revision r1p1)\n");
++  		break;
++
+ 	case CPU_PPC64_PA6T:
+ 		printf("See PA6T Power Implementation Features Book IV\n"
+ 			   "Chapter 7 Performance Counters\n");
============================================================
--- packages/oprofile/oprofile_0.9.3.bb	51f8332de97969e3b83385400eabe2a803afd65d
+++ packages/oprofile/oprofile_0.9.3.bb	47e36e539aec107088958b576f16f5d733b9c9bc
@@ -5,7 +5,7 @@ RRECOMMENDS = "kernel-vmlinux"
 DEPENDS = "popt binutils"
 RDEPENDS = "binutils-symlinks"
 RRECOMMENDS = "kernel-vmlinux"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \
            file://armv6_fix.patch;patch=1 \
@@ -14,6 +14,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/oprofil
            file://opstart.patch;patch=1 \
            file://fix-arith.patch;patch=1;pnum=0 \
            file://gcc43x-fix.patch;patch=1 \
+           file://armv7a.diff;patch=1 \
            file://acinclude.m4"
 
 S = "${WORKDIR}/oprofile-${PV}"






More information about the Openembedded-commits mailing list