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

diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c
index 43d527b..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)
@@ -303,7 +304,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
 }
 
@@ -426,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)
@@ -462,6 +465,7 @@ usage_text[] = {
 "            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 +680,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] );
 		}
@@ -754,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] );
 		      }