X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FRtsFlags.c;h=a3d1d83603400352292acda5a8104195632b85d0;hb=aee2068e034aca6ddaf6f20f85902137ecf718b7;hp=7b8a4d1d68d9cf048b5fcf8cf4fa95af3209818b;hpb=16871485a44ba8a6e93e40f30af7ea46839e0c4c;p=ghc-hetmet.git

diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c
index 7b8a4d1..a3d1d83 100644
--- a/rts/RtsFlags.c
+++ b/rts/RtsFlags.c
@@ -165,6 +165,7 @@ void initRtsFlagsDefaults(void)
     RtsFlags.DebugFlags.par		= rtsFalse;
     RtsFlags.DebugFlags.linker		= rtsFalse;
     RtsFlags.DebugFlags.squeeze		= rtsFalse;
+    RtsFlags.DebugFlags.hpc		= rtsFalse;
 #endif
 
 #if defined(PROFILING) || defined(PAR)
@@ -301,6 +302,11 @@ void initRtsFlagsDefaults(void)
 
     RtsFlags.TraceFlags.timestamp	= rtsFalse;
     RtsFlags.TraceFlags.sched 		= rtsFalse;
+
+#ifdef USE_PAPI
+    /* By default no special measurements taken */
+    RtsFlags.PapiFlags.eventType        = 0;
+#endif
 }
 
 static const char *
@@ -422,6 +428,7 @@ usage_text[] = {
 "  -Dl  DEBUG: linker",
 "  -Dm  DEBUG: stm",
 "  -Dz  DEBUG: stack squezing",
+"  -Dc  DEBUG: program coverage",
 "",
 #endif /* DEBUG */
 #if defined(THREADED_RTS) && !defined(NOSMP)
@@ -449,6 +456,17 @@ usage_text[] = {
 #if defined(GRAN)  /* ToDo: fill in decent Docu here */
 "  -b...     All GranSim options start with -b; see GranSim User's Guide for details",
 #endif
+#if defined(USE_PAPI)
+"  -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.",
 "",
@@ -647,6 +665,30 @@ error = rtsTrue;
 		}
 		break;
 
+#ifdef USE_PAPI
+	      case 'a':
+		switch(rts_argv[arg][2]) {
+		case '1':
+		  RtsFlags.PapiFlags.eventType = PAPI_FLAG_CACHE_L1;
+		  break;
+		case '2':
+		  RtsFlags.PapiFlags.eventType = PAPI_FLAG_CACHE_L2;
+		  break;
+		case 'b':
+		  RtsFlags.PapiFlags.eventType = PAPI_FLAG_BRANCH;
+		  break;
+		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] );
+		}
+		break;
+#endif
+
 	      case 'B':
 		RtsFlags.GcFlags.ringBell = rtsTrue;
 		break;
@@ -719,6 +761,9 @@ error = rtsTrue;
 		      case 'z':
 			  RtsFlags.DebugFlags.squeeze = rtsTrue;
 			  break;
+		      case 'c':
+			  RtsFlags.DebugFlags.hpc = rtsTrue;
+			  break;
 		      default:
 			  bad_option( rts_argv[arg] );
 		      }