projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LLVM: Use mangler to fix up stack alignment issues on OSX
[ghc-hetmet.git]
/
rts
/
RtsFlags.c
diff --git
a/rts/RtsFlags.c
b/rts/RtsFlags.c
index
93482f5
..
5eb7800
100644
(file)
--- a/
rts/RtsFlags.c
+++ b/
rts/RtsFlags.c
@@
-324,9
+324,6
@@
usage_text[] = {
" --install-signal-handlers=<yes|no>",
" Install signal handlers (default: yes)",
#if defined(THREADED_RTS)
" --install-signal-handlers=<yes|no>",
" Install signal handlers (default: yes)",
#if defined(THREADED_RTS)
-" -e<size> Size of spark pools (default 100)",
-#endif
-#if defined(THREADED_RTS)
" -e<n> Maximum number of outstanding local sparks (default: 4096)",
#endif
#if defined(x86_64_HOST_ARCH)
" -e<n> Maximum number of outstanding local sparks (default: 4096)",
#endif
#if defined(x86_64_HOST_ARCH)
@@
-343,6
+340,8
@@
usage_text[] = {
" b - branch mispredictions",
" s - stalled cycles",
" e - cache miss and branch misprediction events",
" b - branch mispredictions",
" s - stalled cycles",
" e - cache miss and branch misprediction events",
+" +PAPI_EVENT - collect papi preset event PAPI_EVENT",
+" #NATIVE_EVENT - collect native event NATIVE_EVENT (in hex)",
#endif
"",
"RTS options may also be specified using the GHCRTS environment variable.",
#endif
"",
"RTS options may also be specified using the GHCRTS environment variable.",
@@
-580,12
+579,18
@@
error = rtsTrue;
RtsFlags.PapiFlags.eventType = PAPI_FLAG_CB_EVENTS;
break;
case '+':
RtsFlags.PapiFlags.eventType = PAPI_FLAG_CB_EVENTS;
break;
case '+':
+ case '#':
if (RtsFlags.PapiFlags.numUserEvents >= MAX_PAPI_USER_EVENTS) {
errorBelch("maximum number of PAPI events reached");
stg_exit(EXIT_FAILURE);
}
if (RtsFlags.PapiFlags.numUserEvents >= MAX_PAPI_USER_EVENTS) {
errorBelch("maximum number of PAPI events reached");
stg_exit(EXIT_FAILURE);
}
+ nat eventNum = RtsFlags.PapiFlags.numUserEvents++;
+ char kind = rts_argv[arg][2];
+ nat eventKind = kind == '+' ? PAPI_PRESET_EVENT_KIND : PAPI_NATIVE_EVENT_KIND;
+
+ RtsFlags.PapiFlags.userEvents[eventNum] = rts_argv[arg] + 3;
RtsFlags.PapiFlags.eventType = PAPI_USER_EVENTS;
RtsFlags.PapiFlags.eventType = PAPI_USER_EVENTS;
- RtsFlags.PapiFlags.userEvents[RtsFlags.PapiFlags.numUserEvents++] = rts_argv[arg] + 3;
+ RtsFlags.PapiFlags.userEventsKind[eventNum] = eventKind;
break;
default:
bad_option( rts_argv[arg] );
break;
default:
bad_option( rts_argv[arg] );