[PATCH] INST_RETIRED unit mask testsuite fix for Nehalem

Michael Petlan <[email protected]>
Newsgroups gmane.linux.oprofile
Organization Red Hat
Message-ID <1427986697.21931.36.camel@Rudolf-RHEL-7>
The default unit mask for the event INST_RETIRED on Intel Nehalem
microarchitecture is 0x1 instead of 0x0, that is common for other
Intels. A new event table for Nehalems has been added in order to
make the testsuite pass there.

Signed-off-by: Michael Petlan <[email protected]>
--
diff --git a/testsuite/lib/op_events.exp b/testsuite/lib/op_events.exp
index 70acace..d88ab6c 100644
--- a/testsuite/lib/op_events.exp
+++ b/testsuite/lib/op_events.exp
@@ -178,6 +178,22 @@ set op_event_table(arch_perf)                       \
        }                                           \
     }
 
+set op_event_table(nehalem)                         \
+    {                                               \
+       {                                           \
+            {0 INST_RETIRED      1 500000}         \
+            {1 CPU_CLK_UNHALTED  0 500000}         \
+       }                                           \
+       {                                           \
+            {0 LLC_MISSES        0x41 10000}       \
+            {1 LLC_REFS          0x4f 10000}       \
+       }                                           \
+       {                                           \
+            {0 BR_INST_RETIRED   0 500000}         \
+            {1 BR_MISS_PRED_RETIRED 0 50000}       \
+       }                                           \
+    }
+
 set op_event_table(sandybridge)                     \
     {                                               \
        {                                           \
@@ -697,8 +713,8 @@ proc select_cpu_events {cpu_name} {
        ppc64/ibm-compat-v1 {set type ibm_compat_v1}
        ppc64_compat_version_1 {set type ibm_compat_v1}
        56 {set type arch_perf}
-       i386/core_i7 {set type arch_perf}
-       Intel_Core/i7 {set type arch_perf}
+       i386/core_i7 {set type nehalem}
+       Intel_Core/i7 {set type nehalem}
        57 {set type arch_perf}
        i386/atom {set type arch_perf}
        Intel_Atom {set type arch_perf}
@@ -706,7 +722,7 @@ proc select_cpu_events {cpu_name} {
        mips/loongson2 {set type mips}
        Loongson2 {set type mips}
        59 {set type arch_perf}
-       i386/nehalem {set type arch_perf}
+       i386/nehalem {set type nehalem}
        Intel_Nehalem_microarchitecture {set type arch_perf}
        60 {set type arm7}
        arm/armv7-ca9 {set type arm7}

------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the 
conversation now. http://goparallel.sourceforge.net/

_______________________________________________
oprofile-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/oprofile-list
oprofile-tests_nehalem_umask_fix.patch (text/x-patch, 1.8 KB)
diff --git a/testsuite/lib/op_events.exp b/testsuite/lib/op_events.exp
index 70acace..d88ab6c 100644
--- a/testsuite/lib/op_events.exp
+++ b/testsuite/lib/op_events.exp
@@ -178,6 +178,22 @@ set op_event_table(arch_perf)                       \
 	}                                           \
     }
 
+set op_event_table(nehalem)                         \
+    {                                               \
+	{                                           \
+	     {0 INST_RETIRED      1 500000}         \
+	     {1 CPU_CLK_UNHALTED  0 500000}         \
+	}                                           \
+	{                                           \
+	     {0 LLC_MISSES        0x41 10000}       \
+	     {1 LLC_REFS          0x4f 10000}       \
+	}                                           \
+	{                                           \
+	     {0 BR_INST_RETIRED   0 500000}         \
+	     {1 BR_MISS_PRED_RETIRED 0 50000}       \
+	}                                           \
+    }
+
 set op_event_table(sandybridge)                     \
     {                                               \
 	{                                           \
@@ -697,8 +713,8 @@ proc select_cpu_events {cpu_name} {
 	ppc64/ibm-compat-v1 {set type ibm_compat_v1}
 	ppc64_compat_version_1 {set type ibm_compat_v1}
 	56 {set type arch_perf}
-	i386/core_i7 {set type arch_perf}
-	Intel_Core/i7 {set type arch_perf}
+	i386/core_i7 {set type nehalem}
+	Intel_Core/i7 {set type nehalem}
 	57 {set type arch_perf}
 	i386/atom {set type arch_perf}
 	Intel_Atom {set type arch_perf}
@@ -706,7 +722,7 @@ proc select_cpu_events {cpu_name} {
 	mips/loongson2 {set type mips}
 	Loongson2 {set type mips}
 	59 {set type arch_perf}
-	i386/nehalem {set type arch_perf}
+	i386/nehalem {set type nehalem}
 	Intel_Nehalem_microarchitecture {set type arch_perf}
 	60 {set type arm7}
 	arm/armv7-ca9 {set type arm7}
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.