[PATCH] [4/5] Use existing P4 unit masks in test suite

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

The P4 events checks in the test suite were using non existing
unit masks. With the new improved checking in the next patch
this bombed out. Use existing unit masks instead.

2009-05-15  Andi Kleen  <ak...@li...>

	* oprofile/libop/tests/alloc_counter_tests.c:
	Don't use non existent unit masks in P4 counter tests.

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

---
 ChangeLog                         |    4 ++++
 libop/tests/alloc_counter_tests.c |   32 ++++++++++++++++----------------
 2 files changed, 20 insertions(+), 16 deletions(-)

Index: oprofile/libop/tests/alloc_counter_tests.c
===================================================================
--- oprofile.orig/libop/tests/alloc_counter_tests.c	2009-05-16 00:27:13.000000000 +0200
+++ oprofile/libop/tests/alloc_counter_tests.c	2009-05-16 00:29:37.000000000 +0200
@@ -81,27 +81,27 @@
 };
 
 static char const * const events_p4_1[] = {
-	"BRANCH_RETIRED:4096:0:1:1",
-	"MISPRED_BRANCH_RETIRED:4096:0:1:1",
-	"BPU_FETCH_REQUEST:4096:0:1:1",
-	"ITLB_REFERENCE:4096:0:1:1",
-	"MEMORY_CANCEL:4096:0:1:1",
-	"MEMORY_COMPLETE:4096:0:1:1",
-	"TC_MS_XFER:4096:0:1:1",
-	"UOP_QUEUE_WRITES:4096:0:1:1",
+	"BRANCH_RETIRED:4096:1:1:1",
+	"MISPRED_BRANCH_RETIRED:4096:1:1:1",
+	"BPU_FETCH_REQUEST:4096:1:1:1",
+	"ITLB_REFERENCE:4096:1:1:1",
+	"MEMORY_CANCEL:4096:4:1:1",
+	"MEMORY_COMPLETE:4096:1:1:1",
+	"TC_MS_XFER:4096:1:1:1",
+	"UOP_QUEUE_WRITES:4096:1:1:1",
 	NULL
 };
 
 static char const * const events_p4_2[] = {
 	/* fail_to_alloc_counter: 3 event to counter 3, 7 */
-	"BRANCH_RETIRED:4096:0:1:1",
-	"MISPRED_BRANCH_RETIRED:4096:0:1:1",
-	"INSTR_RETIRED:4096:0:1:1",
-	"BPU_FETCH_REQUEST:4096:0:1:1",
-	"ITLB_REFERENCE:4096:0:1:1",
-	"MEMORY_CANCEL:4096:0:1:1",
-	"MEMORY_COMPLETE:4096:0:1:1",
-	"TC_MS_XFER:4096:0:1:1",
+	"BRANCH_RETIRED:4096:1:1:1",
+	"MISPRED_BRANCH_RETIRED:4096:1:1:1",
+	"INSTR_RETIRED:4096:1:1:1",
+	"BPU_FETCH_REQUEST:4096:1:1:1",
+	"ITLB_REFERENCE:4096:1:1:1",
+	"MEMORY_CANCEL:4096:4:1:1",
+	"MEMORY_COMPLETE:4096:1:1:1",
+	"TC_MS_XFER:4096:1:1:1",
 	NULL
 };
 
Index: oprofile/ChangeLog
===================================================================
--- oprofile.orig/ChangeLog	2009-05-16 00:29:33.000000000 +0200
+++ oprofile/ChangeLog	2009-05-16 00:30:13.000000000 +0200
@@ -1,3 +1,7 @@
+2009-05-15  Andi Kleen  <ak...@li...>
+	* oprofile/libop/tests/alloc_counter_tests.c:
+	Don't use non existent unit masks in P4 counter tests.
+
 2009-05-15 Andi Kleen  <ak...@li...>
 	* utils/ophelp.c: (cleanup) Fix cleanup crash.