X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FRtsFlags.c;h=ddc19287e4d03bbcf078b9bb105db89cf7ac8526;hb=bed7074cda231f30aec19e5c69785719d770aca4;hp=9aa906f130640f101e8c7947eb2e4e4963be2178;hpb=ab0e778ccfde61aed4c22679b24d175fc6cc9bf3;p=ghc-hetmet.git

diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c
index 9aa906f..ddc1928 100644
--- a/rts/RtsFlags.c
+++ b/rts/RtsFlags.c
@@ -177,6 +177,7 @@ void initRtsFlagsDefaults(void)
     RtsFlags.ProfFlags.includeTSOs        = rtsFalse;
     RtsFlags.ProfFlags.showCCSOnException = rtsFalse;
     RtsFlags.ProfFlags.maxRetainerSetSize = 8;
+    RtsFlags.ProfFlags.ccsLength          = 25;
     RtsFlags.ProfFlags.modSelector        = NULL;
     RtsFlags.ProfFlags.descrSelector      = NULL;
     RtsFlags.ProfFlags.typeSelector       = NULL;
@@ -300,6 +301,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 *
@@ -369,6 +375,9 @@ usage_text[] = {
 "    -hb<bio>...  closures with specified biographies (lag,drag,void,use)",
 "",
 "  -R<size>       Set the maximum retainer set size (default: 8)",
+"", 
+"  -L<chars>      Maximum length of a cost-centre stack in a heap profile",
+"                 (default: 25)",
 "",
 "  -i<sec>        Time between heap samples (seconds, default: 0.1)",
 "",
@@ -445,6 +454,16 @@ 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",
+#endif
 "",
 "RTS options may also be specified using the GHCRTS environment variable.",
 "",
@@ -643,6 +662,27 @@ 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;
+		default:
+		  bad_option( rts_argv[arg] );
+		}
+		break;
+#endif
+
 	      case 'B':
 		RtsFlags.GcFlags.ringBell = rtsTrue;
 		break;
@@ -858,7 +898,13 @@ error = rtsTrue;
 		  PROFILING_BUILD_ONLY(
 		      RtsFlags.ProfFlags.maxRetainerSetSize = atof(rts_argv[arg]+2);
   	          ) break;
-
+	      case 'L':
+		  PROFILING_BUILD_ONLY(
+		      RtsFlags.ProfFlags.ccsLength = atof(rts_argv[arg]+2);
+                      if(RtsFlags.ProfFlags.ccsLength <= 0) {
+			bad_option(rts_argv[arg]);
+                      }
+		  ) break;
 	      case 'h': /* serial heap profile */
 #if !defined(PROFILING) && defined(DEBUG)
 		switch (rts_argv[arg][2]) {