From d7f9f8d5f528b370ca0ff52dda7b5606c9b101b1 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Tue, 12 Dec 2006 18:22:15 +0000 Subject: [PATCH] Fix whitespace --- utils/nofib-analyse/Slurp.hs | 480 +++++++++++++++++++++--------------------- 1 file changed, 240 insertions(+), 240 deletions(-) diff --git a/utils/nofib-analyse/Slurp.hs b/utils/nofib-analyse/Slurp.hs index 618bd1b..16dfdc1 100644 --- a/utils/nofib-analyse/Slurp.hs +++ b/utils/nofib-analyse/Slurp.hs @@ -19,50 +19,50 @@ import Data.Maybe type ResultTable = Map String Results data Status - = NotDone - | Success - | OutOfHeap - | OutOfStack - | Exit Int - | WrongStdout - | WrongStderr - -data Results = Results { - compile_time :: Map String Float, - module_size :: Map String Int, - binary_size :: Maybe Int, - link_time :: Maybe Float, - run_time :: [Float], - mut_time :: [Float], - instrs :: Maybe Integer, - mem_reads :: Maybe Integer, - mem_writes :: Maybe Integer, - cache_misses :: Maybe Integer, - gc_work :: Maybe Integer, - gc_time :: [Float], - allocs :: Maybe Integer, - run_status :: Status, - compile_status :: Status - } + = NotDone + | Success + | OutOfHeap + | OutOfStack + | Exit Int + | WrongStdout + | WrongStderr + +data Results = Results { + compile_time :: Map String Float, + module_size :: Map String Int, + binary_size :: Maybe Int, + link_time :: Maybe Float, + run_time :: [Float], + mut_time :: [Float], + instrs :: Maybe Integer, + mem_reads :: Maybe Integer, + mem_writes :: Maybe Integer, + cache_misses :: Maybe Integer, + gc_work :: Maybe Integer, + gc_time :: [Float], + allocs :: Maybe Integer, + run_status :: Status, + compile_status :: Status + } emptyResults :: Results -emptyResults = Results { - compile_time = Map.empty, - module_size = Map.empty, - binary_size = Nothing, - link_time = Nothing, - run_time = [], - mut_time = [], - instrs = Nothing, - mem_reads = Nothing, - mem_writes = Nothing, - cache_misses = Nothing, - gc_time = [], - gc_work = Nothing, - allocs = Nothing, - compile_status = NotDone, - run_status = NotDone - } +emptyResults = Results { + compile_time = Map.empty, + module_size = Map.empty, + binary_size = Nothing, + link_time = Nothing, + run_time = [], + mut_time = [], + instrs = Nothing, + mem_reads = Nothing, + mem_writes = Nothing, + cache_misses = Nothing, + gc_time = [], + gc_work = Nothing, + allocs = Nothing, + compile_status = NotDone, + run_status = NotDone + } ----------------------------------------------------------------------------- -- Parse the log file @@ -100,8 +100,8 @@ size_re = mkRegex "^[ \t]*([0-9]+)[ \t]+([0-9]+)[ \t]+([0-9]+)" {- <> - = (bytes, gcs, avg_resid, max_resid, samples, gc_work, - init, init_elapsed, mut, mut_elapsed, gc, gc_elapsed) + = (bytes, gcs, avg_resid, max_resid, samples, gc_work, + init, init_elapsed, mut, mut_elapsed, gc, gc_elapsed) ghc1_re = pre GHC 4.02 ghc2_re = GHC 4.02 (includes "xxM in use") @@ -125,51 +125,51 @@ out_of_stack = mkRegex "^\\+ Stack space overflow:" parse_log :: String -> ResultTable parse_log - = combine_results -- collate information - . concat - . map process_chunk -- get information from each chunk - . tail -- first chunk is junk - . chunk_log [] [] -- break at banner lines - . lines + = combine_results -- collate information + . concat + . map process_chunk -- get information from each chunk + . tail -- first chunk is junk + . chunk_log [] [] -- break at banner lines + . lines combine_results :: [(String,Results)] -> Map String Results combine_results = foldr f Map.empty where - f (prog,results) fm = Map.insertWith (flip combine2Results) prog results fm + f (prog,results) fm = Map.insertWith (flip combine2Results) prog results fm combine2Results :: Results -> Results -> Results combine2Results - Results{ compile_time = ct1, link_time = lt1, - module_size = ms1, - run_time = rt1, mut_time = mt1, - instrs = is1, mem_reads = mr1, mem_writes = mw1, - cache_misses = cm1, - gc_time = gt1, gc_work = gw1, - 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, - instrs = is2, mem_reads = mr2, mem_writes = mw2, - cache_misses = cm2, - gc_time = gt2, gc_work = gw2, - 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, - mut_time = mt1 ++ mt2, - instrs = is1 `mplus` is2, - mem_reads = mr1 `mplus` mr2, - mem_writes = mw1 `mplus` mw2, - cache_misses = cm1 `mplus` cm2, - gc_time = gt1 ++ gt2, - gc_work = gw1 `mplus` gw2, - binary_size = bs1 `mplus` bs2, - allocs = al1 `mplus` al2, - run_status = combStatus rs1 rs2, - compile_status = combStatus cs1 cs2 } + Results{ compile_time = ct1, link_time = lt1, + module_size = ms1, + run_time = rt1, mut_time = mt1, + instrs = is1, mem_reads = mr1, mem_writes = mw1, + cache_misses = cm1, + gc_time = gt1, gc_work = gw1, + 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, + instrs = is2, mem_reads = mr2, mem_writes = mw2, + cache_misses = cm2, + gc_time = gt2, gc_work = gw2, + 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, + mut_time = mt1 ++ mt2, + instrs = is1 `mplus` is2, + mem_reads = mr1 `mplus` mr2, + mem_writes = mw1 `mplus` mw2, + cache_misses = cm1 `mplus` cm2, + gc_time = gt1 ++ gt2, + gc_work = gw1 `mplus` gw2, + binary_size = bs1 `mplus` bs2, + allocs = al1 `mplus` al2, + run_status = combStatus rs1 rs2, + compile_status = combStatus cs1 cs2 } combStatus :: Status -> Status -> Status combStatus NotDone y = y @@ -179,96 +179,96 @@ combStatus x _ = x chunk_log :: [String] -> [String] -> [String] -> [([String],[String])] chunk_log header chunk [] = [(header,chunk)] chunk_log header chunk (l:ls) = - case matchRegex banner_re l of - Nothing -> chunk_log header (l:chunk) ls - Just stuff -> (header,chunk) : chunk_log stuff [] ls + case matchRegex banner_re l of + Nothing -> chunk_log header (l:chunk) ls + Just stuff -> (header,chunk) : chunk_log stuff [] ls process_chunk :: ([String],[String]) -> [(String,Results)] 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 link" -> parse_link_time progName chk - "size of" -> parse_size progName modName chk - _ -> error ("process_chunk: "++what) + "time to compile" -> parse_compile_time progName modName chk + "time to run" -> 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) process_chunk _ = error "process_chunk: Can't happen" parse_compile_time :: String -> String -> [String] -> [(String, Results)] parse_compile_time _ _ [] = [] parse_compile_time progName modName (l:ls) = - case matchRegex time_re l of { - Just (_real:user:_system:_) -> - let ct = Map.singleton modName (read user) - in - [(progName, emptyResults{compile_time = ct})]; - Nothing -> - - case matchRegex time_gnu17_re l of { - Just (user:_system:_elapsed:_) -> - let ct = Map.singleton modName (read user) - in - [(progName, emptyResults{compile_time = ct})]; - Nothing -> - - case matchRegex ghc1_re l of { - Just (_allocations:_:_:_:_:initialisation:_:mut:_:gc:_) -> - let - read_mut = read mut - read_gc = read gc - time = (read initialisation + read_mut + read_gc) :: Float - ct = Map.singleton modName time - in - [(progName, emptyResults{compile_time = ct})]; - Nothing -> - - case matchRegex ghc2_re l of { - Just (_allocations:_:_:_:_:_:initialisation:_:mut:_:gc:_) -> - let - read_mut = read mut - read_gc = read gc - time = (read initialisation + read_mut + read_gc) :: Float - ct = Map.singleton modName time - in - [(progName, emptyResults{compile_time = ct})]; - Nothing -> - - case matchRegex ghc3_re l of { - Just (_allocations:_:_:_:_:_:_:initialisation:_:mut:_:gc:_) -> - let - read_mut = read mut - read_gc = read gc - time = (read initialisation + read_mut + read_gc) :: Float - ct = Map.singleton modName time - in - [(progName, emptyResults{compile_time = ct})]; - Nothing -> - - case matchRegex ghc4_re l of { - Just (_allocations:_:_:_:_:_:_:initialisation:_:mut:_:gc:_:_:_:_) -> - let - read_mut = read mut - read_gc = read gc - time = (read initialisation + read_mut + read_gc) :: Float - ct = Map.singleton modName time - in - [(progName, emptyResults{compile_time = ct})]; - Nothing -> - - parse_compile_time progName modName ls - }}}}}} + case matchRegex time_re l of { + Just (_real:user:_system:_) -> + let ct = Map.singleton modName (read user) + in + [(progName, emptyResults{compile_time = ct})]; + Nothing -> + + case matchRegex time_gnu17_re l of { + Just (user:_system:_elapsed:_) -> + let ct = Map.singleton modName (read user) + in + [(progName, emptyResults{compile_time = ct})]; + Nothing -> + + case matchRegex ghc1_re l of { + Just (_allocations:_:_:_:_:initialisation:_:mut:_:gc:_) -> + let + read_mut = read mut + read_gc = read gc + time = (read initialisation + read_mut + read_gc) :: Float + ct = Map.singleton modName time + in + [(progName, emptyResults{compile_time = ct})]; + Nothing -> + + case matchRegex ghc2_re l of { + Just (_allocations:_:_:_:_:_:initialisation:_:mut:_:gc:_) -> + let + read_mut = read mut + read_gc = read gc + time = (read initialisation + read_mut + read_gc) :: Float + ct = Map.singleton modName time + in + [(progName, emptyResults{compile_time = ct})]; + Nothing -> + + case matchRegex ghc3_re l of { + Just (_allocations:_:_:_:_:_:_:initialisation:_:mut:_:gc:_) -> + let + read_mut = read mut + read_gc = read gc + time = (read initialisation + read_mut + read_gc) :: Float + ct = Map.singleton modName time + in + [(progName, emptyResults{compile_time = ct})]; + Nothing -> + + case matchRegex ghc4_re l of { + Just (_allocations:_:_:_:_:_:_:initialisation:_:mut:_:gc:_:_:_:_) -> + let + read_mut = read mut + read_gc = read gc + time = (read initialisation + read_mut + read_gc) :: Float + ct = Map.singleton modName time + in + [(progName, emptyResults{compile_time = ct})]; + Nothing -> + + parse_compile_time progName modName ls + }}}}}} parse_link_time :: String -> [String] -> [(String, Results)] parse_link_time _ [] = [] parse_link_time prog (l:ls) = - case matchRegex time_re l of { - Just (_real:user:_system:_) -> - [(prog,emptyResults{link_time = Just (read user)})]; - Nothing -> + case matchRegex time_re l of { + Just (_real:user:_system:_) -> + [(prog,emptyResults{link_time = Just (read user)})]; + Nothing -> - case matchRegex time_gnu17_re l of { - Just (user:_system:_elapsed:_) -> - [(prog,emptyResults{link_time = Just (read user)})]; - Nothing -> + case matchRegex time_gnu17_re l of { + Just (user:_system:_elapsed:_) -> + [(prog,emptyResults{link_time = Just (read user)})]; + Nothing -> parse_link_time prog ls }} @@ -282,79 +282,79 @@ parse_run_time :: String -> [String] -> Results -> Status parse_run_time _ [] _ NotDone = [] parse_run_time prog [] res ex = [(prog, res{run_status=ex})] parse_run_time prog (l:ls) res ex = - case matchRegex ghc1_re l of { - Just (allocations:_:_:_:_:initialisation:_:mut:_:gc:_) -> - got_run_result allocations initialisation mut gc Nothing - Nothing Nothing Nothing Nothing; - Nothing -> - - case matchRegex ghc2_re l of { - Just (allocations:_:_:_:_:_:initialisation:_:mut:_:gc:_) -> - got_run_result allocations initialisation mut gc Nothing - Nothing Nothing Nothing Nothing; - - Nothing -> - - case matchRegex ghc3_re l of { - Just (allocations:_:_:_:_:gc_work':_:initialisation:_:mut:_:gc:_) -> - got_run_result allocations initialisation mut gc (Just (read gc_work')) - Nothing Nothing Nothing Nothing; - - Nothing -> - - case matchRegex 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 (read gc_work')) - (Just (read is)) (Just (read mem_rs)) - (Just (read mem_ws)) (Just (read cache_misses')); - - Nothing -> - - case matchRegex wrong_output l of { - Just ("stdout":_) -> - parse_run_time prog ls res (combineRunResult WrongStdout ex); - Just ("stderr":_) -> - parse_run_time prog ls res (combineRunResult WrongStderr ex); - Nothing -> - - case matchRegex wrong_exit_status l of { - Just (_wanted:got:_) -> - parse_run_time prog ls res (combineRunResult (Exit (read got)) ex); - Nothing -> - - case matchRegex out_of_heap l of { - Just _ -> - parse_run_time prog ls res (combineRunResult OutOfHeap ex); - Nothing -> - - case matchRegex out_of_stack l of { - Just _ -> - parse_run_time prog ls res (combineRunResult OutOfStack ex); - Nothing -> - parse_run_time prog ls res ex; - - }}}}}}}} + case matchRegex ghc1_re l of { + Just (allocations:_:_:_:_:initialisation:_:mut:_:gc:_) -> + got_run_result allocations initialisation mut gc Nothing + Nothing Nothing Nothing Nothing; + Nothing -> + + case matchRegex ghc2_re l of { + Just (allocations:_:_:_:_:_:initialisation:_:mut:_:gc:_) -> + got_run_result allocations initialisation mut gc Nothing + Nothing Nothing Nothing Nothing; + + Nothing -> + + case matchRegex ghc3_re l of { + Just (allocations:_:_:_:_:gc_work':_:initialisation:_:mut:_:gc:_) -> + got_run_result allocations initialisation mut gc (Just (read gc_work')) + Nothing Nothing Nothing Nothing; + + Nothing -> + + case matchRegex 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 (read gc_work')) + (Just (read is)) (Just (read mem_rs)) + (Just (read mem_ws)) (Just (read cache_misses')); + + Nothing -> + + case matchRegex wrong_output l of { + Just ("stdout":_) -> + parse_run_time prog ls res (combineRunResult WrongStdout ex); + Just ("stderr":_) -> + parse_run_time prog ls res (combineRunResult WrongStderr ex); + Nothing -> + + case matchRegex wrong_exit_status l of { + Just (_wanted:got:_) -> + parse_run_time prog ls res (combineRunResult (Exit (read got)) ex); + Nothing -> + + case matchRegex out_of_heap l of { + Just _ -> + parse_run_time prog ls res (combineRunResult OutOfHeap ex); + Nothing -> + + case matchRegex out_of_stack l of { + Just _ -> + parse_run_time prog ls res (combineRunResult OutOfStack 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' = -- trace ("got_run_result: " ++ initialisation ++ ", " ++ mut ++ ", " ++ gc) $ - let - read_mut = read mut - read_gc = read gc - time = (read initialisation + read_mut + read_gc) :: Float - res' = combine2Results res - emptyResults{ run_time = [time], - mut_time = [read_mut], - gc_time = [read_gc], - gc_work = gc_work', - allocs = Just (read allocations), - instrs = instrs', - mem_reads = mem_rs, - mem_writes = mem_ws, - cache_misses = cache_misses', - run_status = Success - } - in - parse_run_time prog ls res' Success + let + read_mut = read mut + read_gc = read gc + time = (read initialisation + read_mut + read_gc) :: Float + res' = combine2Results res + emptyResults{ run_time = [time], + mut_time = [read_mut], + gc_time = [read_gc], + gc_work = gc_work', + allocs = Just (read allocations), + instrs = instrs', + mem_reads = mem_rs, + mem_writes = mem_ws, + cache_misses = cache_misses', + run_status = Success + } + in + parse_run_time prog ls res' Success combineRunResult :: Status -> Status -> Status combineRunResult OutOfHeap _ = OutOfHeap @@ -363,20 +363,20 @@ combineRunResult OutOfStack _ = OutOfStack combineRunResult _ OutOfStack = OutOfStack combineRunResult (Exit e) _ = Exit e combineRunResult _ (Exit e) = Exit e -combineRunResult exit _ = exit +combineRunResult exit _ = exit parse_size :: String -> String -> [String] -> [(String, Results)] parse_size _ _ [] = [] parse_size progName modName (l:ls) = - case matchRegex size_re l of - Nothing -> parse_size progName modName ls - Just (text:datas:_bss:_) - | progName == modName -> - [(progName,emptyResults{binary_size = - Just (read text + read datas), - compile_status = Success})] - | otherwise -> - let ms = Map.singleton modName (read text + read datas) - in - [(progName,emptyResults{module_size = ms})] + case matchRegex size_re l of + Nothing -> parse_size progName modName ls + Just (text:datas:_bss:_) + | progName == modName -> + [(progName,emptyResults{binary_size = + Just (read text + read datas), + compile_status = Success})] + | otherwise -> + let ms = Map.singleton modName (read text + read datas) + in + [(progName,emptyResults{module_size = ms})] -- 1.7.10.4