diff options
author | Ben Gamari <bgamari.foss@gmail.com> | 2015-11-18 12:22:02 +0100 |
---|---|---|
committer | Ben Gamari <ben@smart-cactus.org> | 2015-11-18 12:53:50 +0100 |
commit | 6b3d5b5990b9b306e13575e60d7e1c8ce264b0ef (patch) | |
tree | 3d7ac58f233767e78de8eec6bde7f81ec46f6485 /rts/RtsFlags.c | |
parent | f9e17fd70d466fc00825f7324c944609f5c09251 (diff) | |
download | haskell-6b3d5b5990b9b306e13575e60d7e1c8ce264b0ef.tar.gz |
rts: Kill PAPI support
This hasn't been used for a very long time and will soon be superceded
by perf_events support.
Test Plan: validate
Reviewers: austin, simonmar
Reviewed By: austin, simonmar
Subscribers: thomie, erikd
Differential Revision: https://phabricator.haskell.org/D1493
Diffstat (limited to 'rts/RtsFlags.c')
-rw-r--r-- | rts/RtsFlags.c | 71 |
1 files changed, 0 insertions, 71 deletions
diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c index b9979bcf43..e3051287e6 100644 --- a/rts/RtsFlags.c +++ b/rts/RtsFlags.c @@ -103,10 +103,6 @@ static void read_debug_flags(const char *arg); static rtsBool read_heap_profiling_flag(const char *arg); #endif -#ifdef USE_PAPI -static void read_papi_flag(const char *arg); -#endif - #ifdef TRACING static void read_trace_flags(const char *arg); #endif @@ -251,12 +247,6 @@ void initRtsFlagsDefaults(void) RtsFlags.TickyFlags.showTickyStats = rtsFalse; RtsFlags.TickyFlags.tickyFile = NULL; #endif - -#ifdef USE_PAPI - /* By default no special measurements taken */ - RtsFlags.PapiFlags.eventType = 0; - RtsFlags.PapiFlags.numUserEvents = 0; -#endif } static const char * @@ -422,19 +412,6 @@ usage_text[] = { " -xm Base address to mmap memory in the GHCi linker", " (hex; must be <80000000)", #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", -" +PAPI_EVENT - collect papi preset event PAPI_EVENT", -" #NATIVE_EVENT - collect native event NATIVE_EVENT (in hex)", -#endif " -xq The allocation limit given to a thread after it receives", " an AllocationLimitExceeded exception. (default: 100k)", "", @@ -790,13 +767,6 @@ error = rtsTrue; / BLOCK_SIZE; break; -#ifdef USE_PAPI - case 'a': - OPTION_UNSAFE; - read_papi_flag(&rts_argv[arg]) - break; -#endif - case 'B': OPTION_UNSAFE; RtsFlags.GcFlags.ringBell = rtsTrue; @@ -1559,47 +1529,6 @@ static void read_debug_flags(const char* arg) } #endif -#ifdef USE_PAPI -static void read_papi_flags(const char *arg) -{ - // Already parsed "-a" - switch(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; - case '+': - case '#': - 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 = arg[2]; - nat eventKind = - kind == '+' ? PAPI_PRESET_EVENT_KIND : PAPI_NATIVE_EVENT_KIND; - - RtsFlags.PapiFlags.userEvents[eventNum] = arg + 3; - RtsFlags.PapiFlags.eventType = PAPI_USER_EVENTS; - RtsFlags.PapiFlags.userEventsKind[eventNum] = eventKind; - break; - default: - bad_option( arg ); - } -} -#endif - #ifdef PROFILING // Parse a "-h" flag, returning whether the parse resulted in an error. static rtsBool read_heap_profiling_flag(const char *arg) |