From 7eeac4d143e9287d7c2e27ba23b84d175df49962 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Thu, 23 Oct 2008 08:06:48 +0000 Subject: [PATCH] include an elapsed time table --- utils/nofib-analyse/Main.hs | 8 +++++--- utils/nofib-analyse/Slurp.hs | 31 ++++++++++++++++++------------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/utils/nofib-analyse/Main.hs b/utils/nofib-analyse/Main.hs index 0896a8467..456747f 100644 --- a/utils/nofib-analyse/Main.hs +++ b/utils/nofib-analyse/Main.hs @@ -106,7 +106,7 @@ data PerModuleTableSpec = (a -> Bool) -- Result within reasonable limits? -- The various per-program aspects of execution that we can generate results for. -size_spec, alloc_spec, runtime_spec, muttime_spec, mutetime_spec, +size_spec, alloc_spec, runtime_spec, elapsedtime_spec, muttime_spec, mutetime_spec, gctime_spec, gcelap_spec, gcwork_spec, instrs_spec, mreads_spec, mwrite_spec, cmiss_spec, gc0time_spec, gc0elap_spec, gc1time_spec, gc1elap_spec, balance_spec @@ -114,6 +114,7 @@ size_spec, alloc_spec, runtime_spec, muttime_spec, mutetime_spec, size_spec = SpecP "Binary Sizes" "Size" "binary-sizes" binary_size compile_status always_ok alloc_spec = SpecP "Allocations" "Allocs" "allocations" allocs run_status always_ok runtime_spec = SpecP "Run Time" "Runtime" "run-times" (mean run_time) run_status time_ok +elapsedtime_spec = SpecP "Elapsed Time" "Elapsed" "elapsed-times" (mean elapsed_time) run_status time_ok muttime_spec = SpecP "Mutator Time" "MutTime" "mutator-time" (mean mut_time) run_status time_ok mutetime_spec = SpecP "Mutator Elapsed Time" "MutETime" "mutator-elapsed-time" (mean mut_elapsed_time) run_status time_ok gctime_spec = SpecP "GC Time" "GCTime" "gc-time" (mean gc_time) run_status time_ok @@ -134,6 +135,7 @@ all_specs = [ size_spec, alloc_spec, runtime_spec, + elapsedtime_spec, muttime_spec, mutetime_spec, gctime_spec, @@ -185,7 +187,7 @@ checkTimes prog results = do -- These are the per-prog tables we want to generate per_prog_result_tab :: [PerProgTableSpec] per_prog_result_tab = - [ size_spec, alloc_spec, runtime_spec, muttime_spec, mutetime_spec, gctime_spec, + [ size_spec, alloc_spec, runtime_spec, elapsedtime_spec, muttime_spec, mutetime_spec, gctime_spec, gcelap_spec, gc0time_spec, gc0elap_spec, gc1time_spec, gc1elap_spec, gcwork_spec, balance_spec, instrs_spec, mreads_spec, mwrite_spec, cmiss_spec] @@ -193,7 +195,7 @@ per_prog_result_tab = -- aspects, each in its own column. Only works when comparing two runs. normal_summary_specs :: [PerProgTableSpec] normal_summary_specs = - [ size_spec, alloc_spec, runtime_spec ] + [ size_spec, alloc_spec, runtime_spec, elapsedtime_spec ] cachegrind_summary_specs :: [PerProgTableSpec] cachegrind_summary_specs = diff --git a/utils/nofib-analyse/Slurp.hs b/utils/nofib-analyse/Slurp.hs index 55d238e..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, @@ -59,6 +60,7 @@ emptyResults = Results { binary_size = Nothing, link_time = Nothing, run_time = [], + elapsed_time = [], mut_time = [], mut_elapsed_time = [], instrs = Nothing, @@ -203,7 +205,7 @@ 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, @@ -215,7 +217,7 @@ combine2Results 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, @@ -229,6 +231,7 @@ combine2Results 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, @@ -348,36 +351,36 @@ 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, _, mut, mut_elapsed, gc, gc_elapsed, gc0, gc0_elapsed, gc1, gc1_elapsed, bal) -> - got_run_result allocations initialisation mut mut_elapsed gc gc_elapsed + 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; @@ -410,12 +413,14 @@ parse_run_time prog (l:ls) res ex = }}}}}}}}} where - 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' + 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], -- 1.7.10.4