X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2Fnofib-analyse%2FSlurp.hs;h=55d238e5d2ffd207b2e087bf7d28153c80567fa3;hb=0da51cdd6404332ba6531364e6b7de30cbc0333a;hp=5387a8ff0fc7e082a71d3d545c3a8b4cad260270;hpb=7f54886b21c58cdb733c0e26b2a7710e6ed9586e;p=ghc-hetmet.git diff --git a/utils/nofib-analyse/Slurp.hs b/utils/nofib-analyse/Slurp.hs index 5387a8f..55d238e 100644 --- a/utils/nofib-analyse/Slurp.hs +++ b/utils/nofib-analyse/Slurp.hs @@ -34,12 +34,19 @@ data Results = Results { link_time :: Maybe Float, run_time :: [Float], mut_time :: [Float], + mut_elapsed_time :: [Float], instrs :: Maybe Integer, mem_reads :: Maybe Integer, mem_writes :: Maybe Integer, cache_misses :: Maybe Integer, gc_work :: Maybe Integer, gc_time :: [Float], + gc_elapsed_time :: [Float], + gc0_time :: [Float], + gc0_elapsed_time :: [Float], + gc1_time :: [Float], + gc1_elapsed_time :: [Float], + balance :: [Float], allocs :: Maybe Integer, run_status :: Status, compile_status :: Status @@ -53,11 +60,18 @@ emptyResults = Results { link_time = Nothing, run_time = [], mut_time = [], + mut_elapsed_time = [], instrs = Nothing, mem_reads = Nothing, mem_writes = Nothing, cache_misses = Nothing, gc_time = [], + gc_elapsed_time = [], + gc0_time = [], + gc0_elapsed_time = [], + gc1_time = [], + gc1_elapsed_time = [], + balance = [], gc_work = Nothing, allocs = Nothing, compile_status = NotDone, @@ -79,7 +93,7 @@ Various banner lines: -- NB. the hyphen must come last (or first) inside [...] to stand for itself. banner_re :: Regex -banner_re = mkRegex "^==nofib==[ \t]+([A-Za-z0-9_-]+):[ \t]+(size of|time to link|time to run|time to compile)[ \t]+([A-Za-z0-9_-]+)(\\.o)?[ \t]+follows" +banner_re = mkRegex "^==nofib==[ \t]+([A-Za-z0-9_-]+):[ \t]+(size of|time to link|time to run|time to compile|time to compile & run)[ \t]+([A-Za-z0-9_-]+)(\\.o)?[ \t]+follows" {- This regexp for the output of "time" works on FreeBSD, other versions @@ -122,6 +136,7 @@ size_re s = case matchRegex re s of ghc1_re = pre GHC 4.02 ghc2_re = GHC 4.02 (includes "xxM in use") ghc3_re = GHC 4.03 (includes "xxxx bytes GC work") +ghc5_re = GHC 6.9 (includes GC(0) and GC(1) times) -} ghc1_re :: String -> Maybe (Integer, Integer, Integer, Integer, Integer, Integer, Float, Float, Float, Float, Float, Float) @@ -156,6 +171,14 @@ ghc4_re s = case matchRegex re s of Nothing -> Nothing where re = mkRegex "^<>" +ghc5_re :: String -> Maybe (Integer, Integer, Integer, Integer, Integer, Integer, Integer, Float, Float, Float, Float, Float, Float,Float,Float,Float,Float,Float) +ghc5_re s = case matchRegex re s of + Just [allocations, gcs, avg_residency, max_residency, samples, gc_work', in_use, initialisation, initialisation_elapsed, mut, mut_elapsed, gc, gc_elapsed, gc0, gc0_elapsed, gc1, gc1_elapsed, bal] -> + Just (read allocations, read gcs, read avg_residency, read max_residency, read samples, read gc_work', read in_use, read initialisation, read initialisation_elapsed, read mut, read mut_elapsed, read gc, read gc_elapsed, read gc0, read gc0_elapsed, read gc1, read gc1_elapsed, read bal) + Just _ -> error "ghc3_re: Can't happen" + Nothing -> Nothing + where re = mkRegex "^<>" + wrong_exit_status, wrong_output, out_of_heap, out_of_stack :: Regex wrong_exit_status = mkRegex "^\\**[ \t]*expected exit status ([0-9]+) not seen ; got ([0-9]+)" wrong_output = mkRegex "^expected (stdout|stderr) not matched by reality$" @@ -181,17 +204,25 @@ combine2Results Results{ compile_time = ct1, link_time = lt1, module_size = ms1, run_time = rt1, mut_time = mt1, + mut_elapsed_time = me1, instrs = is1, mem_reads = mr1, mem_writes = mw1, cache_misses = cm1, - gc_time = gt1, gc_work = gw1, + gc_time = gt1, gc_elapsed_time = ge1, gc_work = gw1, + gc0_time = g0t1, gc0_elapsed_time = g0e1, + gc1_time = g1t1, gc1_elapsed_time = g1e1, + balance = b1, binary_size = bs1, allocs = al1, run_status = rs1, compile_status = cs1 } Results{ compile_time = ct2, link_time = lt2, module_size = ms2, run_time = rt2, mut_time = mt2, + mut_elapsed_time = me2, instrs = is2, mem_reads = mr2, mem_writes = mw2, cache_misses = cm2, - gc_time = gt2, gc_work = gw2, + gc_time = gt2, gc_elapsed_time = ge2, gc_work = gw2, + gc0_time = g0t2, gc0_elapsed_time = g0e2, + gc1_time = g1t2, gc1_elapsed_time = g1e2, + balance = b2, binary_size = bs2, allocs = al2, run_status = rs2, compile_status = cs2 } = Results{ compile_time = Map.unionWith (flip const) ct1 ct2, @@ -199,11 +230,18 @@ combine2Results link_time = lt1 `mplus` lt2, run_time = rt1 ++ rt2, mut_time = mt1 ++ mt2, + mut_elapsed_time = me1 ++ me2, instrs = is1 `mplus` is2, mem_reads = mr1 `mplus` mr2, mem_writes = mw1 `mplus` mw2, cache_misses = cm1 `mplus` cm2, gc_time = gt1 ++ gt2, + gc_elapsed_time= ge1 ++ ge2, + gc0_time = g0t1 ++ g0t2, + gc0_elapsed_time= g0e1 ++ g0e2, + gc1_time = g1t1 ++ g1t2, + gc1_elapsed_time= g1e1 ++ g1e2, + balance = b1 ++ b2, gc_work = gw1 `mplus` gw2, binary_size = bs1 `mplus` bs2, allocs = al1 `mplus` al2, @@ -227,6 +265,8 @@ process_chunk (progName : what : modName : _, chk) = case what of "time to compile" -> parse_compile_time progName modName chk "time to run" -> parse_run_time progName (reverse chk) emptyResults NotDone + "time to compile & run" -> parse_compile_time progName modName chk + ++ parse_run_time progName (reverse chk) emptyResults NotDone "time to link" -> parse_link_time progName chk "size of" -> parse_size progName modName chk _ -> error ("process_chunk: "++what) @@ -308,33 +348,41 @@ parse_run_time _ [] _ NotDone = [] parse_run_time prog [] res ex = [(prog, res{run_status=ex})] parse_run_time prog (l:ls) res ex = case ghc1_re l of { - Just (allocations, _, _, _, _, _, initialisation, _, mut, _, gc, _) -> - got_run_result allocations initialisation mut gc Nothing - Nothing Nothing Nothing Nothing; + Just (allocations, _, _, _, _, _, initialisation, _, mut, mut_elapsed, gc, gc_elapsed) -> + got_run_result allocations initialisation mut mut_elapsed gc gc_elapsed [] [] [] [] [] + Nothing Nothing Nothing Nothing Nothing; Nothing -> case ghc2_re l of { - Just (allocations, _, _, _, _, _, initialisation, _, mut, _, gc, _) -> - got_run_result allocations initialisation mut gc Nothing - Nothing Nothing Nothing Nothing; + Just (allocations, _, _, _, _, _, initialisation, _, mut, mut_elapsed, gc, gc_elapsed) -> + got_run_result allocations initialisation mut mut_elapsed gc gc_elapsed [] [] [] [] [] + Nothing Nothing Nothing Nothing Nothing; Nothing -> case ghc3_re l of { - Just (allocations, _, _, _, _, gc_work', _, initialisation, _, mut, _, gc, _) -> - got_run_result allocations initialisation mut gc + Just (allocations, _, _, _, _, gc_work', _, initialisation, _, mut, mut_elapsed, gc, gc_elapsed) -> + got_run_result allocations initialisation mut mut_elapsed gc gc_elapsed [] [] [] [] [] (Just gc_work') Nothing Nothing Nothing Nothing; Nothing -> case ghc4_re l of { - Just (allocations, _, _, _, _, gc_work', _, initialisation, _, mut, _, gc, _, is, mem_rs, mem_ws, cache_misses') -> - got_run_result allocations initialisation mut gc + Just (allocations, _, _, _, _, gc_work', _, initialisation, _, mut, mut_elapsed, gc, gc_elapsed, is, mem_rs, mem_ws, cache_misses') -> + got_run_result allocations initialisation mut mut_elapsed gc gc_elapsed [] [] [] [] [] (Just gc_work') (Just is) (Just mem_rs) (Just mem_ws) (Just cache_misses'); Nothing -> + case ghc5_re l of { + Just (allocations, _, _, _, _, gc_work', _, initialisation, _, mut, mut_elapsed, gc, gc_elapsed, gc0, gc0_elapsed, gc1, gc1_elapsed, bal) -> + got_run_result allocations initialisation mut mut_elapsed gc gc_elapsed + [gc0] [gc0_elapsed] [gc1] [gc1_elapsed] [bal] + (Just gc_work') Nothing Nothing Nothing Nothing; + + Nothing -> + case matchRegex wrong_output l of { Just ["stdout"] -> parse_run_time prog ls res (combineRunResult WrongStdout ex); @@ -360,16 +408,23 @@ parse_run_time prog (l:ls) res ex = Nothing -> parse_run_time prog ls res ex; - }}}}}}}} + }}}}}}}}} where - got_run_result allocations initialisation mut gc gc_work' instrs' mem_rs mem_ws cache_misses' + got_run_result allocations initialisation mut mut_elapsed gc gc_elapsed gc0 gc0_elapsed gc1 gc1_elapsed bal gc_work' instrs' mem_rs mem_ws cache_misses' = -- trace ("got_run_result: " ++ initialisation ++ ", " ++ mut ++ ", " ++ gc) $ let time = initialisation + mut + gc res' = combine2Results res emptyResults{ run_time = [time], mut_time = [mut], + mut_elapsed_time = [mut_elapsed], gc_time = [gc], + gc_elapsed_time = [gc_elapsed], + gc0_time = gc0, + gc0_elapsed_time = gc0_elapsed, + gc1_time = gc1, + gc1_elapsed_time = gc1_elapsed, + balance = bal, gc_work = gc_work', allocs = Just allocations, instrs = instrs', @@ -397,8 +452,8 @@ parse_size progName modName (l:ls) = Nothing -> parse_size progName modName ls Just (text, datas, _bss) | progName == modName -> - [(progName,emptyResults{binary_size = - Just (text + datas), + [(progName,emptyResults{binary_size = + Just (text + datas), compile_status = Success})] | otherwise -> let ms = Map.singleton modName (text + datas)