also count total dispatch stalls in +RTS -as

diff --git a/rts/Papi.c b/rts/Papi.c
index 0963ca7..78cf9b1 100644 (file)
--- a/rts/Papi.c
+++ b/rts/Papi.c
@@ -57,7 +57,10 @@ struct _papi_events {
 #define FR_BR_MISCOMPARE 0x40000048
 #define DC_ACCESS 0x40000019
 #define DC_MISS 0x4000001a
+#define FR_DISPATCH_STALLS 0x40000054
 #define FR_DISPATCH_STALLS_BR 0x40000055
+#define FR_DISPATCH_STALLS_FULL_REORDER 0x40000058
+#define FR_DISPATCH_STALLS_FULL_RESERVATION 0x40000059
 #define FR_DISPATCH_STALLS_FULL_LS 0x4000005b
 #define DC_L2_REFILL_MOES 0x40001e1b
 #define DC_SYS_REFILL_MOES 0x40001e1c
@@ -114,6 +117,7 @@ init_countable_events(void)
        PAPI_ADD_EVENT(FR_BR_MISCOMPARE);
     }
     if(RtsFlags.PapiFlags.eventType==PAPI_FLAG_STALLS) {
+       PAPI_ADD_EVENT(FR_DISPATCH_STALLS);
        PAPI_ADD_EVENT(FR_DISPATCH_STALLS_BR);
        PAPI_ADD_EVENT(FR_DISPATCH_STALLS_FULL_LS);
     }
@@ -165,6 +169,7 @@ papi_report(long_long PapiCounters[])
     }
 
     if(RtsFlags.PapiFlags.eventType==PAPI_FLAG_STALLS) {
+       PAPI_REPORT(PapiCounters,FR_DISPATCH_STALLS);
        PAPI_REPORT(PapiCounters,FR_DISPATCH_STALLS_BR);
        //PAPI_REPORT_PCT(PapiCounters,FR_DISPATCH_STALLS_BR,PAPI_TOT_CYC);
        PAPI_REPORT(PapiCounters,FR_DISPATCH_STALLS_FULL_LS);