X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FRtsFlags.c;h=d818e774cb5440b836edfc01435d4fc0d4075964;hb=8d4bb83f1c3c6abb12e3ae1204034149349f047d;hp=b2bb9e79c0aeac9c1d5c602eddb3d69b76a63c26;hpb=2b522adea22f77a1c03230f5c9865c00bedb5a5b;p=ghc-hetmet.git

diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c
index b2bb9e7..d818e77 100644
--- a/rts/RtsFlags.c
+++ b/rts/RtsFlags.c
@@ -303,7 +303,8 @@ void initRtsFlagsDefaults(void)
     RtsFlags.TraceFlags.sched 		= rtsFalse;
 
 #ifdef USE_PAPI
-    RtsFlags.PapiFlags.eventType        = PAPI_FLAG_BRANCH;
+    /* By default no special measurements taken */
+    RtsFlags.PapiFlags.eventType        = 0;
 #endif
 }
 
@@ -454,14 +455,15 @@ usage_text[] = {
 "  -b...     All GranSim options start with -b; see GranSim User's Guide for details",
 #endif
 #if defined(USE_PAPI)
-"  -aX       Perform measurements using PAPI, it should be used with the -s<file> option.",
-"            Where X is one of:",
+"  -aX       CPU performance counter measurements using PAPI",
+"            (use with the -s<file> option).  X is one of:",
 "",
 /* "            y - cycles", */
 "            1 - level 1 cache misses",
 "            2 - level 2 cache misses",
 "            b - branch mispredictions",
 "            s - stalled cycles",
+"            e - cache miss and branch misprediction events",
 #endif
 "",
 "RTS options may also be specified using the GHCRTS environment variable.",
@@ -676,6 +678,9 @@ error = rtsTrue;
 		case 's':
 		  RtsFlags.PapiFlags.eventType = PAPI_FLAG_STALLS;
 		  break;
+		case 'e':
+		  RtsFlags.PapiFlags.eventType = PAPI_FLAG_CB_EVENTS;
+		  break;
 		default:
 		  bad_option( rts_argv[arg] );
 		}