X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2Fnofib-analyse%2FSlurp.hs;h=fc605c8aa3a0e1c1820165f8c596975f9794cd8f;hb=6c2ae9c152d147623ac45a5fe52534c99d6ba835;hp=30e80635c38a27474981d6fdfb61485bf3548a8e;hpb=9d42bb70e08dfbca9aaf1834554d06ecea988b39;p=ghc-hetmet.git diff --git a/utils/nofib-analyse/Slurp.hs b/utils/nofib-analyse/Slurp.hs index 30e8063..fc605c8 100644 --- a/utils/nofib-analyse/Slurp.hs +++ b/utils/nofib-analyse/Slurp.hs @@ -33,6 +33,7 @@ data Results = Results { binary_size :: Maybe Int, link_time :: Maybe Float, run_time :: [Float], + elapsed_time :: [Float], mut_time :: [Float], mut_elapsed_time :: [Float], instrs :: Maybe Integer, @@ -42,6 +43,11 @@ data Results = Results { 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 @@ -54,6 +60,7 @@ emptyResults = Results { binary_size = Nothing, link_time = Nothing, run_time = [], + elapsed_time = [], mut_time = [], mut_elapsed_time = [], instrs = Nothing, @@ -62,6 +69,11 @@ emptyResults = Results { 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, @@ -126,6 +138,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) @@ -160,6 +173,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$" @@ -184,26 +205,33 @@ combine2Results :: Results -> Results -> Results combine2Results Results{ compile_time = ct1, link_time = lt1, module_size = ms1, - run_time = rt1, mut_time = mt1, + run_time = rt1, elapsed_time = et1, mut_time = mt1, mut_elapsed_time = me1, instrs = is1, mem_reads = mr1, mem_writes = mw1, cache_misses = cm1, 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, + run_time = rt2, elapsed_time = et2, mut_time = mt2, mut_elapsed_time = me2, instrs = is2, mem_reads = mr2, mem_writes = mw2, cache_misses = cm2, 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, module_size = Map.unionWith (flip const) ms1 ms2, link_time = lt1 `mplus` lt2, run_time = rt1 ++ rt2, + elapsed_time = et1 ++ et2, mut_time = mt1 ++ mt2, mut_elapsed_time = me1 ++ me2, instrs = is1 `mplus` is2, @@ -212,6 +240,11 @@ combine2Results 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, @@ -318,33 +351,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, mut_elapsed, gc, gc_elapsed) -> - got_run_result allocations initialisation mut mut_elapsed gc gc_elapsed + Just (allocations, _, _, _, _, _, initialisation, init_elapsed, mut, mut_elapsed, gc, gc_elapsed) -> + got_run_result allocations initialisation init_elapsed mut mut_elapsed gc gc_elapsed [] [] [] [] [] Nothing Nothing Nothing Nothing Nothing; Nothing -> case ghc2_re l of { - Just (allocations, _, _, _, _, _, initialisation, _, mut, mut_elapsed, gc, gc_elapsed) -> - got_run_result allocations initialisation mut mut_elapsed gc gc_elapsed + Just (allocations, _, _, _, _, _, initialisation, init_elapsed, mut, mut_elapsed, gc, gc_elapsed) -> + got_run_result allocations initialisation init_elapsed mut mut_elapsed gc gc_elapsed [] [] [] [] [] Nothing Nothing Nothing Nothing Nothing; Nothing -> case ghc3_re l of { - Just (allocations, _, _, _, _, gc_work', _, initialisation, _, mut, mut_elapsed, gc, gc_elapsed) -> - got_run_result allocations initialisation mut mut_elapsed gc gc_elapsed + Just (allocations, _, _, _, _, gc_work', _, initialisation, init_elapsed, mut, mut_elapsed, gc, gc_elapsed) -> + got_run_result allocations initialisation init_elapsed 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, mut_elapsed, gc, gc_elapsed, is, mem_rs, mem_ws, cache_misses') -> - got_run_result allocations initialisation mut mut_elapsed gc gc_elapsed + Just (allocations, _, _, _, _, gc_work', _, initialisation, init_elapsed, mut, mut_elapsed, gc, gc_elapsed, is, mem_rs, mem_ws, cache_misses') -> + got_run_result allocations initialisation init_elapsed 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, init_elapsed, mut, mut_elapsed, gc, gc_elapsed, gc0, gc0_elapsed, gc1, gc1_elapsed, bal) -> + got_run_result allocations initialisation init_elapsed 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); @@ -370,18 +411,25 @@ parse_run_time prog (l:ls) res ex = Nothing -> parse_run_time prog ls res ex; - }}}}}}}} + }}}}}}}}} where - got_run_result allocations initialisation mut mut_elapsed gc gc_elapsed gc_work' instrs' mem_rs mem_ws cache_misses' + got_run_result allocations initialisation init_elapsed 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 + etime = init_elapsed + mut_elapsed + gc_elapsed res' = combine2Results res emptyResults{ run_time = [time], + elapsed_time = [etime], 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', @@ -409,8 +457,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)