[PATCH] [9/9] Add the Atom/NHM CPU types to the oprofile binaries

[Andi K. <an...@fi...>]

Using the earlier added event files.

That's a single patch because they all touch the same files.

I also fixed the Intel manual reference in ophelp.c

Signed-off-by: Andi Kleen <ak...@li...>

---
 events/Makefile.am  |    3 +++
 libop/op_cpu_type.c |    4 +++-
 libop/op_cpu_type.h |    2 ++
 libop/op_events.c   |    2 ++
 utils/ophelp.c      |    4 +++-
 5 files changed, 13 insertions(+), 2 deletions(-)

Index: oprofile/events/Makefile.am
===================================================================
--- oprofile.orig/events/Makefile.am	2009-04-27 14:44:46.000000000 +0200
+++ oprofile/events/Makefile.am	2009-04-27 14:55:13.000000000 +0200
@@ -14,6 +14,9 @@
 	i386/p6_mobile/events i386/p6_mobile/unit_masks \
 	i386/core/events i386/core/unit_masks \
 	i386/arch_perfmon/events i386/arch_perfmon/unit_masks \
+	i386/atom/events i386/atom/unit_masks \
+	i386/core_i7/events i386/core_i7/unit_masks \
+	i386/nehalem/events i386/nehalem/unit_masks \
 	ia64/ia64/events ia64/ia64/unit_masks \
 	ia64/itanium2/events ia64/itanium2/unit_masks \
 	ia64/itanium/events ia64/itanium/unit_masks \
Index: oprofile/libop/op_cpu_type.c
===================================================================
--- oprofile.orig/libop/op_cpu_type.c	2009-04-27 14:44:46.000000000 +0200
+++ oprofile/libop/op_cpu_type.c	2009-04-27 14:57:09.000000000 +0200
@@ -78,6 +78,8 @@
 	{ "ARM V7 PMNC", "arm/armv7", CPU_ARM_V7, 5 },
  	{ "Intel Architectural Perfmon", "i386/arch_perfmon", CPU_ARCH_PERFMON, 0},
 	{ "AMD64 family11h", "x86-64/family11h", CPU_FAMILY11H, 4 },
+ 	{ "Intel Core/i7", "i386/core_i7", CPU_CORE_I7, 4 },
+ 	{ "Intel Atom", "i386/atom", CPU_ATOM, 2 },
 };
  
 static size_t const nr_cpu_descrs = sizeof(cpu_descrs) / sizeof(struct cpu_descr);
Index: oprofile/libop/op_cpu_type.h
===================================================================
--- oprofile.orig/libop/op_cpu_type.h	2009-04-27 14:44:46.000000000 +0200
+++ oprofile/libop/op_cpu_type.h	2009-04-27 14:55:13.000000000 +0200
@@ -75,6 +75,8 @@
 	CPU_ARM_V7, /**< ARM V7 */
  	CPU_ARCH_PERFMON, /**< Intel architectural perfmon */
 	CPU_FAMILY11H, /**< AMD family 11h */
+ 	CPU_CORE_I7, /* Intel Core i7 */
+ 	CPU_ATOM, /* First generation Intel Atom */
 	MAX_CPU_TYPE
 } op_cpu;
 
Index: oprofile/libop/op_events.c
===================================================================
--- oprofile.orig/libop/op_events.c	2009-04-27 14:47:28.000000000 +0200
+++ oprofile/libop/op_events.c	2009-04-27 14:55:13.000000000 +0200
@@ -942,6 +942,8 @@
 		case CPU_FAMILY10:
 		case CPU_ARCH_PERFMON:
 		case CPU_FAMILY11H:
+ 		case CPU_ATOM:
+ 		case CPU_CORE_I7:
 			descr->name = "CPU_CLK_UNHALTED";
 			break;
 
Index: oprofile/utils/ophelp.c
===================================================================
--- oprofile.orig/utils/ophelp.c	2009-04-27 14:44:46.000000000 +0200
+++ oprofile/utils/ophelp.c	2009-04-27 14:55:13.000000000 +0200
@@ -472,8 +472,10 @@
 	case CPU_P4_HT2:
 	case CPU_CORE:
 	case CPU_CORE_2:
+	case CPU_CORE_I7:
+	case CPU_ATOM:
 		event_doc =
-			"See Intel Architecture Developer's Manual Volume 3, Appendix A and\n"
+			"See Intel Architecture Developer's Manual Volume 3B, Appendix A and\n"
 			"Intel Architecture Optimization Reference Manual (730795-001)\n\n";
 		break;