X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2Fnofib-analyse%2FMain.hs;h=9e8088ba7c593c24cc2112c4bf2b8e28d4221aa0;hb=6e4c802adf4e8d9beaeb4e4529ae2ef3e702157f;hp=c81cfb4d81e5ebfa1c473e623339039da1d6da28;hpb=435d4a45509ef2d703716453c4e64bb513b79006;p=ghc-hetmet.git diff --git a/utils/nofib-analyse/Main.hs b/utils/nofib-analyse/Main.hs index c81cfb4..9e8088b 100644 --- a/utils/nofib-analyse/Main.hs +++ b/utils/nofib-analyse/Main.hs @@ -7,22 +7,23 @@ module Main where import GenUtils -import Text.Printf import Slurp import CmdLine -import Text.Html hiding ((!)) +import Text.Printf +import Text.Html hiding (cols, rows, (!)) import qualified Text.Html as Html ((!)) -import Data.FiniteMap -import System.Console.GetOpt -import System.Exit ( exitWith, ExitCode(..) ) +import qualified Data.Map as Map +import Data.Map (Map) +import System.Exit ( exitWith, ExitCode(..) ) -import Numeric ( showFloat, showEFloat, showSigned ) -import Data.Maybe ( isNothing ) +import Control.Monad +import Data.Maybe ( isNothing ) import Data.Char import System.IO import Data.List +( a -> [HtmlAttr] -> a ( IO a die s = hPutStr stderr s >> exitWith (ExitFailure 1) -usageHeader = "usage: nofib-analyse [OPTION...] ..." - +main :: IO () main = do - if not (null cmdline_errors) || OptHelp `elem` flags - then die (concat cmdline_errors ++ usageInfo usageHeader argInfo) - else do + when (not (null cmdline_errors) || OptHelp `elem` flags) $ + die (concat cmdline_errors ++ usage) - let { html = OptHTMLOutput `elem` flags; + let { html = OptHTMLOutput `elem` flags; latex = OptLaTeXOutput `elem` flags; ascii = OptASCIIOutput `elem` flags } - if ascii && html - then die "Can't produce both ASCII and HTML" - else do - - if devs && nodevs - then die "Can't both display and hide deviations" - else do + when (ascii && html) $ die "Can't produce both ASCII and HTML" + when (devs && nodevs) $ die "Can't both display and hide deviations" results <- parse_logs other_args summary_spec <- case [ cols | OptColumns cols <- flags ] of - [] -> return (pickSummary results) - (cols:_) -> namedColumns (split ',' cols) + [] -> return (pickSummary results) + (cols:_) -> namedColumns (split ',' cols) let summary_rows = case [ rows | OptRows rows <- flags ] of - [] -> Nothing - rows -> Just (split ',' (last rows)) + [] -> Nothing + rows -> Just (split ',' (last rows)) let column_headings = map (reverse . takeWhile (/= '/') . reverse) other_args -- sanity check - sequence_ [ checkTimes prog res | table <- results, - (prog,res) <- fmToList table ] + sequence_ [ checkTimes prog res | result_table <- results, + (prog,res) <- Map.toList result_table ] case () of - _ | html -> - putStr (renderHtml (htmlPage results column_headings)) - _ | latex -> - putStr (latexOutput results column_headings summary_spec summary_rows) - _ | otherwise -> - putStr (asciiPage results column_headings summary_spec summary_rows) + _ | html -> + putStr (renderHtml (htmlPage results column_headings)) + _ | latex -> + putStr (latexOutput results column_headings summary_spec summary_rows) + _ | otherwise -> + putStr (asciiPage results column_headings summary_spec summary_rows) parse_logs :: [String] -> IO [ResultTable] parse_logs [] = do - f <- hGetContents stdin - return [parse_log f] + f <- hGetContents stdin + return [parse_log f] parse_logs log_files = - mapM (\f -> do h <- openFile f ReadMode - c <- hGetContents h - return (parse_log c)) log_files + mapM (\f -> do h <- openFile f ReadMode + c <- hGetContents h + return (parse_log c)) log_files ----------------------------------------------------------------------------- -- List of tables we're going to generate data PerProgTableSpec = - forall a . Result a => - SpecP - String -- Name of the table - String -- Short name (for column heading) - String -- HTML tag for the table - (Results -> Maybe a) -- How to get the result - (Results -> Status) -- How to get the status of this result - (a -> Bool) -- Result within reasonable limits? + forall a . Result a => + SpecP + String -- Name of the table + String -- Short name (for column heading) + String -- HTML tag for the table + (Results -> Maybe a) -- How to get the result + (Results -> Status) -- How to get the status of this result + (a -> Bool) -- Result within reasonable limits? data PerModuleTableSpec = - forall a . Result a => - SpecM - String -- Name of the table - String -- HTML tag for the table - (Results -> FiniteMap String a) -- get the module map - (a -> Bool) -- Result within reasonable limits? + forall a . Result a => + SpecM + String -- Name of the table + String -- HTML tag for the table + (Results -> Map String a) -- get the module map + (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, gctime_spec, + gcwork_spec, instrs_spec, mreads_spec, mwrite_spec, cmiss_spec + :: PerProgTableSpec 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 @@ -119,6 +116,7 @@ mreads_spec = SpecP "Memory Reads" "Reads" "mem-reads" mem_reads run_status alw mwrite_spec = SpecP "Memory Writes" "Writes" "mem-writes" mem_writes run_status always_ok cmiss_spec = SpecP "Cache Misses" "Misses" "cache-misses" cache_misses run_status always_ok +all_specs :: [PerProgTableSpec] all_specs = [ size_spec, alloc_spec, @@ -134,16 +132,16 @@ all_specs = [ namedColumns :: [String] -> IO [PerProgTableSpec] namedColumns ss = mapM findSpec ss - where findSpec s = - case [ spec | spec@(SpecP _ short_name _ _ _ _) <- all_specs, - short_name == s ] of - [] -> die ("unknown column: " ++ s) - (spec:_) -> return spec + where findSpec s = + case [ spec | spec@(SpecP _ short_name _ _ _ _) <- all_specs, + short_name == s ] of + [] -> die ("unknown column: " ++ s) + (spec:_) -> return spec mean :: (Results -> [Float]) -> Results -> Maybe Float mean f results = go (f results) where go [] = Nothing - go fs = Just (foldl' (+) 0 fs / fromIntegral (length fs)) + go fs = Just (foldl' (+) 0 fs / fromIntegral (length fs)) -- Look for bogus-looking times: On Linux we occasionally get timing results -- that are bizarrely low, and skew the average. @@ -153,42 +151,46 @@ checkTimes prog results = do check "mut time" (mut_time results) check "GC time" (gc_time results) where - check kind ts - | any strange ts = - hPutStrLn stderr ("warning: dubious " ++ kind - ++ " results for " ++ prog - ++ ": " ++ show ts) - | otherwise = return () - where strange t = any (\r -> time_ok r && r / t > 1.4) ts - -- looks for times that are >40% smaller than - -- any other. + check kind ts + | any strange ts = + hPutStrLn stderr ("warning: dubious " ++ kind + ++ " results for " ++ prog + ++ ": " ++ show ts) + | otherwise = return () + where strange t = any (\r -> time_ok r && r / t > 1.4) ts + -- looks for times that are >40% smaller than + -- any other. -- 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, gctime_spec, - gcwork_spec, instrs_spec, mreads_spec, mwrite_spec, cmiss_spec ] + [ size_spec, alloc_spec, runtime_spec, muttime_spec, gctime_spec, + gcwork_spec, instrs_spec, mreads_spec, mwrite_spec, cmiss_spec ] -- A single summary table, giving comparison figures for a number of -- 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 ] + +cachegrind_summary_specs :: [PerProgTableSpec] cachegrind_summary_specs = - [ size_spec, alloc_spec, instrs_spec, mreads_spec, mwrite_spec ] - + [ size_spec, alloc_spec, instrs_spec, mreads_spec, mwrite_spec ] + -- Pick an appropriate summary table: if we're cachegrinding, then -- we're probably not interested in the runtime, but we are interested -- in instructions, mem reads and mem writes (and vice-versa). pickSummary :: [ResultTable] -> [PerProgTableSpec] -pickSummary rs - | isNothing (instrs (head (eltsFM (head rs)))) = normal_summary_specs +pickSummary rs + | isNothing (instrs (head (Map.elems (head rs)))) = normal_summary_specs | otherwise = cachegrind_summary_specs +per_module_result_tab :: [PerModuleTableSpec] per_module_result_tab = - [ SpecM "Module Sizes" "mod-sizes" module_size always_ok - , SpecM "Compile Times" "compile-time" compile_time time_ok - ] + [ SpecM "Module Sizes" "mod-sizes" module_size always_ok + , SpecM "Compile Times" "compile-time" compile_time time_ok + ] always_ok :: a -> Bool always_ok = const True @@ -199,49 +201,59 @@ time_ok t = t > tooquick_threshold ----------------------------------------------------------------------------- -- HTML page generation ---htmlPage :: Results -> [String] -> Html +htmlPage :: [ResultTable] -> [String] -> Html htmlPage results args = header << thetitle << reportTitle - +++ hr + +++ hr +++ h1 << reportTitle - +++ gen_menu - +++ hr - +++ body (gen_tables results args) + +++ gen_menu + +++ hr + +++ body (gen_tables results args) +gen_menu :: Html gen_menu = unordList (map (prog_menu_item) per_prog_result_tab - ++ map (module_menu_item) per_module_result_tab) + ++ map (module_menu_item) per_module_result_tab) -prog_menu_item (SpecP name _ anc _ _ _) = anchor Html +prog_menu_item (SpecP long_name _ anc _ _ _) + = anchor Html +module_menu_item (SpecM long_name anc _ _) + = anchor [String] -> Html gen_tables results args = - foldr1 (+++) (map (htmlGenProgTable results args) per_prog_result_tab) - +++ foldr1 (+++) (map (htmlGenModTable results args) per_module_result_tab) + foldr1 (+++) (map (htmlGenProgTable results args) per_prog_result_tab) + +++ foldr1 (+++) (map (htmlGenModTable results args) per_module_result_tab) -htmlGenProgTable results args (SpecP title _ anc get_result get_status result_ok) - = sectHeading title anc +htmlGenProgTable :: [ResultTable] -> [String] -> PerProgTableSpec -> Html +htmlGenProgTable results args (SpecP long_name _ anc get_result get_status result_ok) + = sectHeading long_name anc +++ font [String] -> PerModuleTableSpec -> Html +htmlGenModTable results args (SpecM long_name anc get_result result_ok) + = sectHeading long_name anc + +++ font String -> Html sectHeading s nm = h2 << anchor [ResultTable] - -> [String] - -> (Results -> Maybe a) - -> (Results -> Status) - -> (a -> Bool) - -> HtmlTable - + => [ResultTable] + -> [String] + -> (Results -> Maybe a) + -> (Results -> Status) + -> (a -> Bool) + -> HtmlTable + +htmlShowResults [] _ _ _ _ + = error "htmlShowResults: Can't happen?" htmlShowResults (r:rs) ss f stat result_ok = tabHeader ss aboves (zipWith tableRow [1..] results_per_prog) @@ -250,23 +262,25 @@ htmlShowResults (r:rs) ss f stat result_ok tableRow (-1) ("+1 s.d.", highs)]) ++ [tableRow (-1) ("Average", gms)]) where - -- results_per_prog :: [ (String,[BoxValue a]) ] - results_per_prog = map (calc_result rs f stat result_ok) (fmToList r) - - results_per_run = transpose (map snd results_per_prog) - (lows,gms,highs) = unzip3 (map calc_gmsd results_per_run) + -- results_per_prog :: [ (String,[BoxValue a]) ] + results_per_prog = map (calc_result rs f stat result_ok) (Map.toList r) + + results_per_run = transpose (map snd results_per_prog) + (lows,gms,highs) = unzip3 (map calc_gmsd results_per_run) htmlShowMultiResults :: Result a - => [ResultTable] - -> [String] - -> (Results -> FiniteMap String a) - -> (a -> Bool) - -> HtmlTable - + => [ResultTable] + -> [String] + -> (Results -> Map String a) + -> (a -> Bool) + -> HtmlTable + +htmlShowMultiResults [] _ _ _ + = error "htmlShowMultiResults: Can't happen?" htmlShowMultiResults (r:rs) ss f result_ok = - multiTabHeader ss - aboves (map show_results_for_prog results_per_prog_mod_run) + multiTabHeader ss + aboves (map show_results_for_prog results_per_prog_mod_run) aboves ((if nodevs then [] else [td << bold << "-1 s.d." <-> tableRow (-1) ("", lows), @@ -274,31 +288,31 @@ htmlShowMultiResults (r:rs) ss f result_ok = <-> tableRow (-1) ("", highs)]) ++ [td << bold << "Average" <-> tableRow (-1) ("", gms)]) - where - base_results = fmToList r :: [(String,Results)] + base_results = Map.toList r :: [(String,Results)] -- results_per_prog_mod_run :: [(String,[(String,[BoxValue a])])] results_per_prog_mod_run = map get_results_for_prog base_results -- get_results_for_prog :: (String,Results) -> (String,[BoxValue a]) - get_results_for_prog (prog,r) = (prog, map get_results_for_mod (fmToList (f r))) + get_results_for_prog (prog, results) + = (prog, map get_results_for_mod (Map.toList (f results))) where fms = map get_run_results rs - get_run_results fm = case lookupFM fm prog of - Nothing -> emptyFM + get_run_results fm = case Map.lookup prog fm of + Nothing -> Map.empty Just res -> f res - get_results_for_mod (id,attr) = calc_result fms Just (const Success) - result_ok (id,attr) + get_results_for_mod id_attr + = calc_result fms Just (const Success) result_ok id_attr show_results_for_prog (prog,mrs) = - td (if null mrs then - td << "(no modules compiled)" - else - toHtml (aboves (map (tableRow 0) mrs))) + td (if null mrs then + td << "(no modules compiled)" + else + toHtml (aboves (map (tableRow 0) mrs))) results_per_run = transpose [xs | (_,mods) <- results_per_prog_mod_run, (_,xs) <- mods] @@ -306,13 +320,14 @@ htmlShowMultiResults (r:rs) ss f result_ok = tableRow :: Int -> (String, [BoxValue]) -> HtmlTable tableRow row_no (prog, results) - = td besides (map (\s -> td besides (map (\s -> td [BoxValue a] -> [(Bool,BoxValue a)] findBest stuff@(Result base : rest) = map (\a -> (a==base, a)) where - best = snd (minimumBy (\a b -> fst a < fst b) no_pcnt_stuff + best = snd (minimumBy (\a b -> fst a < fst b) no_pcnt_stuff - no_pcnt_stuff = map unPcnt stuff + no_pcnt_stuff = map unPcnt stuff - unPcnt (r@(Percentage f) : rest) = (base * f/100, r) : unPcnt rest - unPcnt (r@(Result a) : rest) = (a, r) : unPcnt rest - unPcnt (_ : rest) = unPcnt rest + unPcnt (r@(Percentage f) : rest) = (base * f/100, r) : unPcnt rest + unPcnt (r@(Result a) : rest) = (a, r) : unPcnt rest + unPcnt (_ : rest) = unPcnt rest -} +logHeaders :: [String] -> HtmlTable logHeaders ss = besides (map (\s -> (td Html mkTable t = table HtmlTable tabHeader ss - = (td logHeaders ss +multiTabHeader :: [String] -> HtmlTable multiTabHeader ss = (td (td logHeaders ss -- Calculate a color ranging from bright blue for -100% to bright red for +100%. - calcColor :: Int -> String -calcColor p | p >= 0 = "#" ++ (showHex red 2 "0000") - | otherwise = "#0000" ++ (showHex blue 2 "") - where red = p * 255 `div` 100 - blue = (-p) * 255 `div` 100 - -showHex 0 f s = if f > 0 then take f (repeat '0') ++ s else s -showHex i f s = showHex (i `div` 16) (f-1) (hexDig (i `mod` 16) : s) - -hexDig i | i > 10 = chr (i-10 + ord 'a') - | otherwise = chr (i + ord '0') +calcColor percentage | percentage >= 0 = printf "#%02x0000" val + | otherwise = printf "#0000%02x" val + where val = abs percentage * 255 `div` 100 ----------------------------------------------------------------------------- -- LaTeX table generation (just the summary for now) -latexOutput results args summary_spec summary_rows = +latexOutput :: [ResultTable] -> [String] -> [PerProgTableSpec] + -> Maybe [String] -> String +latexOutput results _ summary_spec summary_rows = (if (length results == 2) - then ascii_summary_table True results summary_spec summary_rows - . str "\n\n" - else id) "" + then ascii_summary_table True results summary_spec summary_rows + . str "\n\n" + else id) "" ----------------------------------------------------------------------------- -- ASCII page generation +asciiPage :: [ResultTable] -> [String] -> [PerProgTableSpec] -> Maybe [String] + -> String asciiPage results args summary_spec summary_rows = ( str reportTitle . str "\n\n" -- only show the summary table if we're comparing two runs . (if (length results == 2) - then ascii_summary_table False results summary_spec summary_rows . str "\n\n" - else id) + then ascii_summary_table False results summary_spec summary_rows . str "\n\n" + else id) . interleave "\n\n" (map (asciiGenProgTable results args) per_prog_result_tab) . str "\n" . interleave "\n\n" (map (asciiGenModTable results args) per_module_result_tab) ) "\n" -asciiGenProgTable results args (SpecP title _ anc get_result get_status result_ok) - = str title +asciiGenProgTable :: [ResultTable] -> [String] -> PerProgTableSpec -> ShowS +asciiGenProgTable results args (SpecP long_name _ _ get_result get_status result_ok) + = str long_name . str "\n" . ascii_show_results results args get_result get_status result_ok -asciiGenModTable results args (SpecM title anc get_result result_ok) - = str title +asciiGenModTable :: [ResultTable] -> [String] -> PerModuleTableSpec -> ShowS +asciiGenModTable results args (SpecM long_name _ get_result result_ok) + = str long_name . str "\n" . ascii_show_multi_results results args get_result result_ok -ascii_header width ss - = str "\n-------------------------------------------------------------------------------\n" - . str (rjustify 15 "Program") - . str (space 5) - . foldr (.) id (map (str . rjustify width) ss) - . str "\n-------------------------------------------------------------------------------\n" +ascii_header :: Int -> [String] -> ShowS +ascii_header w ss + = str "\n-------------------------------------------------------------------------------\n" + . str (rjustify 15 "Program") + . str (space 5) + . foldr (.) id (map (str . rjustify w) ss) + . str "\n-------------------------------------------------------------------------------\n" ascii_show_results :: Result a - => [ResultTable] - -> [String] - -> (Results -> Maybe a) - -> (Results -> Status) - -> (a -> Bool) - -> ShowS - + => [ResultTable] + -> [String] + -> (Results -> Maybe a) + -> (Results -> Status) + -> (a -> Bool) + -> ShowS + +ascii_show_results [] _ _ _ _ + = error "ascii_show_results: Can't happen?" ascii_show_results (r:rs) ss f stat result_ok - = ascii_header fIELD_WIDTH ss - . interleave "\n" (map show_per_prog_results results_per_prog) + = ascii_header fIELD_WIDTH ss + . interleave "\n" (map show_per_prog_results results_per_prog) . if nodevs then id else str "\n" - . show_per_prog_results ("-1 s.d.",lows) - . str "\n" - . show_per_prog_results ("+1 s.d.",highs) - . str "\n" - . show_per_prog_results ("Average",gms) + . show_per_prog_results ("-1 s.d.",lows) + . str "\n" + . show_per_prog_results ("+1 s.d.",highs) + . str "\n" + . show_per_prog_results ("Average",gms) where - -- results_per_prog :: [ (String,[BoxValue a]) ] - results_per_prog = map (calc_result rs f stat result_ok) (fmToList r) - - results_per_run = transpose (map snd results_per_prog) + -- results_per_prog :: [ (String,[BoxValue a]) ] + results_per_prog = map (calc_result rs f stat result_ok) (Map.toList r) + + results_per_run = transpose (map snd results_per_prog) (lows,gms,highs) = unzip3 (map calc_gmsd results_per_run) -- A summary table, useful only when we are comparing two runs. This table -- shows a number of different result categories, one per column. -ascii_summary_table - :: Bool -- generate a LaTeX table? - -> [ResultTable] - -> [PerProgTableSpec] - -> Maybe [String] - -> ShowS +ascii_summary_table + :: Bool -- generate a LaTeX table? + -> [ResultTable] + -> [PerProgTableSpec] + -> Maybe [String] + -> ShowS +ascii_summary_table _ [] _ _ + = error "ascii_summary_table: Can't happen?" +ascii_summary_table _ [_] _ _ + = error "ascii_summary_table: Can't happen?" ascii_summary_table latex (r1:r2:_) specs mb_restrict | latex = makeLatexTable (rows ++ TableLine : av_rows) - | otherwise = - makeTable (table_layout (length specs) width) - (TableLine : TableRow header : TableLine : rows ++ TableLine : av_rows) + | otherwise = + makeTable (table_layout (length specs) w) + (TableLine : TableRow header_row : + TableLine : rows ++ + TableLine : av_rows) where - header = BoxString "Program" : map BoxString headings + header_row = BoxString "Program" : map BoxString headings - (headings, columns, av_cols) = unzip3 (map calc_col specs) + (headings, columns, av_cols) = unzip3 (map calc_col specs) av_heads = [BoxString "Min", BoxString "Max", BoxString "Geometric Mean"] - baseline = fmToList r1 - progs = map BoxString (keysFM r1) - rows0 = map TableRow (zipWith (:) progs (transpose columns)) + baseline = Map.toList r1 + progs = map BoxString (Map.keys r1) + rows0 = map TableRow (zipWith (:) progs (transpose columns)) - rows1 = restrictRows mb_restrict rows0 + rows1 = restrictRows mb_restrict rows0 - rows | latex = mungeForLaTeX rows1 - | otherwise = rows1 + rows | latex = mungeForLaTeX rows1 + | otherwise = rows1 - av_rows = map TableRow (zipWith (:) av_heads (transpose av_cols)) - width = 10 + av_rows = map TableRow (zipWith (:) av_heads (transpose av_cols)) + w = 10 - calc_col (SpecP _ heading _ getr gets ok) - = (heading, column, [min,max,mean]) -- throw away the baseline result - where (_, boxes) = unzip (map calc_one_result baseline) - calc_one_result = calc_result [r2] getr gets ok - column = map (\(_:b:_) -> b) boxes - (_,mean,_) = calc_gmsd column - (min,max) = calc_minmax column + calc_col (SpecP _ heading _ getr gets ok) + -- throw away the baseline result + = (heading, column, [column_min, column_max, column_mean]) + where (_, boxes) = unzip (map calc_one_result baseline) + calc_one_result = calc_result [r2] getr gets ok + column = map (\(_:b:_) -> b) boxes + (_, column_mean, _) = calc_gmsd column + (column_min, column_max) = calc_minmax column restrictRows :: Maybe [String] -> [TableRow] -> [TableRow] restrictRows Nothing rows = rows restrictRows (Just these) rows = filter keep_it rows where keep_it (TableRow (BoxString s: _)) = s `elem` these - keep_it TableLine = True - keep_it _ = False + keep_it TableLine = True + keep_it _ = False mungeForLaTeX :: [TableRow] -> [TableRow] mungeForLaTeX = map transrow where - transrow (TableRow boxes) = TableRow (map transbox boxes) - transrow row = row + transrow (TableRow boxes) = TableRow (map transbox boxes) + transrow row = row - transbox (BoxString s) = BoxString (foldr transchar "" s) - transbox box = box + transbox (BoxString s) = BoxString (foldr transchar "" s) + transbox box = box - transchar '_' s = '\\':'_':s - transchar c s = c:s + transchar '_' s = '\\':'_':s + transchar c s = c:s -table_layout n width = - (str . rjustify 15) : - (\s -> str (space 5) . str (rjustify width s)) : - replicate (n-1) (str . rjustify width) +table_layout :: Int -> Int -> Layout +table_layout n w = + (str . rjustify 15) : + (\s -> str (space 5) . str (rjustify w s)) : + replicate (n-1) (str . rjustify w) ascii_show_multi_results :: Result a - => [ResultTable] - -> [String] - -> (Results -> FiniteMap String a) - -> (a -> Bool) - -> ShowS - + => [ResultTable] + -> [String] + -> (Results -> Map String a) + -> (a -> Bool) + -> ShowS + +ascii_show_multi_results [] _ _ _ + = error "ascii_show_multi_results: Can't happen?" ascii_show_multi_results (r:rs) ss f result_ok - = ascii_header fIELD_WIDTH ss - . interleave "\n" (map show_results_for_prog results_per_prog_mod_run) - . str "\n" + = ascii_header fIELD_WIDTH ss + . interleave "\n" (map show_results_for_prog results_per_prog_mod_run) + . str "\n" . if nodevs then id else str "\n" - . show_per_prog_results ("-1 s.d.",lows) - . str "\n" - . show_per_prog_results ("+1 s.d.",highs) - . str "\n" - . show_per_prog_results ("Average",gms) + . show_per_prog_results ("-1 s.d.",lows) + . str "\n" + . show_per_prog_results ("+1 s.d.",highs) + . str "\n" + . show_per_prog_results ("Average",gms) where - base_results = fmToList r :: [(String,Results)] + base_results = Map.toList r :: [(String,Results)] -- results_per_prog_mod_run :: [(String,[(String,[BoxValue a])])] results_per_prog_mod_run = map get_results_for_prog base_results -- get_results_for_prog :: (String,Results) -> (String,[BoxValue a]) - get_results_for_prog (prog,r) = (prog, map get_results_for_mod (fmToList (f r))) + get_results_for_prog (prog, results) + = (prog, map get_results_for_mod (Map.toList (f results))) where fms = map get_run_results rs - get_run_results fm = case lookupFM fm prog of - Nothing -> emptyFM + get_run_results fm = case Map.lookup prog fm of + Nothing -> Map.empty Just res -> f res - get_results_for_mod (id,attr) = calc_result fms Just (const Success) - result_ok (id,attr) + get_results_for_mod id_attr + = calc_result fms Just (const Success) result_ok id_attr show_results_for_prog (prog,mrs) = - str ("\n"++prog++"\n") - . (if null mrs then - str "(no modules compiled)\n" - else - interleave "\n" (map show_per_prog_results mrs)) + str ("\n"++prog++"\n") + . (if null mrs then + str "(no modules compiled)\n" + else + interleave "\n" (map show_per_prog_results mrs)) results_per_run = transpose [xs | (_,mods) <- results_per_prog_mod_run, (_,xs) <- mods] @@ -542,62 +573,63 @@ ascii_show_multi_results (r:rs) ss f result_ok show_per_prog_results :: (String, [BoxValue]) -> ShowS show_per_prog_results = show_per_prog_results_width fIELD_WIDTH -show_per_prog_results_width width (prog,results) - = str (rjustify 15 prog) - . str (space 5) - . foldr (.) id (map (str . rjustify width . showBox) results) +show_per_prog_results_width :: Int -> (String, [BoxValue]) -> ShowS +show_per_prog_results_width w (prog,results) + = str (rjustify 15 prog) + . str (space 5) + . foldr (.) id (map (str . rjustify w . showBox) results) -- --------------------------------------------------------------------------- -- Generic stuff for results generation -- calc_result is a nice exercise in higher-order programming... -calc_result +calc_result :: Result a - => [FiniteMap String b] -- accumulated results - -> (b -> Maybe a) -- get a result from the b - -> (b -> Status) -- get a status from the b - -> (a -> Bool) -- is this result ok? - -> (String,b) -- the baseline result - -> (String,[BoxValue]) + => [Map String b] -- accumulated results + -> (b -> Maybe a) -- get a result from the b + -> (b -> Status) -- get a status from the b + -> (a -> Bool) -- is this result ok? + -> (String,b) -- the baseline result + -> (String,[BoxValue]) calc_result rts get_maybe_a get_stat result_ok (prog,base_r) = - (prog, (just_result baseline base_stat : - - let - rts' = map (\rt -> get_stuff (lookupFM rt prog)) rts - - get_stuff Nothing = (Nothing, NotDone) - get_stuff (Just r) = (get_maybe_a r, get_stat r) - in - ( - case baseline of - Just base | result_ok base - -> map (\(r,s) -> percentage r s base) rts' - _other - -> map (\(r,s) -> just_result r s) rts' - ))) + (prog, (just_result m_baseline base_stat : + + let + rts' = map (\rt -> get_stuff (Map.lookup prog rt)) rts + + get_stuff Nothing = (Nothing, NotDone) + get_stuff (Just r) = (get_maybe_a r, get_stat r) + in + ( + case m_baseline of + Just baseline + | result_ok baseline + -> map (\(r,s) -> percentage r s baseline) rts' + _ -> map (\(r,s) -> just_result r s) rts' + ))) where - baseline = get_maybe_a base_r - base_stat = get_stat base_r + m_baseline = get_maybe_a base_r + base_stat = get_stat base_r - just_result Nothing s = RunFailed s - just_result (Just a) s = toBox a + just_result Nothing s = RunFailed s + just_result (Just a) _ = toBox a - percentage Nothing s base = RunFailed s - percentage (Just a) s base = Percentage - (convert_to_percentage base a) + percentage Nothing s _ = RunFailed s + percentage (Just a) _ baseline + = Percentage (convert_to_percentage baseline a) ----------------------------------------------------------------------------- -- Calculating geometric means and standard deviations {- This is done using the log method, to avoid needing really large -intermediate results. The formula for a geometric mean is +intermediate results. The formula for a geometric mean is - (a1 * .... * an) ^ 1/n + (a1 * .... * an) ^ 1/n which is equivalent to - e ^ ( (log a1 + ... + log an) / n ) + e ^ ( (log a1 + ... + log an) / n ) where log is the natural logarithm function. @@ -619,30 +651,30 @@ We therefore return a (low, mean, high) triple. -} calc_gmsd :: [BoxValue] -> (BoxValue, BoxValue, BoxValue) -calc_gmsd xs +calc_gmsd xs | null percentages = (RunFailed NotDone, RunFailed NotDone, RunFailed NotDone) - | otherwise = let sqr x = x * x - len = fromIntegral (length percentages) - logs = map log percentages - lbar = sum logs / len - devs = map (sqr . (lbar-)) logs - dbar = sum devs / len - gm = exp lbar - sdf = exp (sqrt dbar) + | otherwise = let sqr x = x * x + len = fromIntegral (length percentages) + logs = map log percentages + lbar = sum logs / len + st_devs = map (sqr . (lbar-)) logs + dbar = sum st_devs / len + gm = exp lbar + sdf = exp (sqrt dbar) in (Percentage (gm/sdf), Percentage gm, Percentage (gm*sdf)) where percentages = [ if f < 5 then 5 else f | Percentage f <- xs ] - -- can't do log(0.0), so exclude zeros + -- can't do log(0.0), so exclude zeros -- small values have inordinate effects so cap at -95%. calc_minmax :: [BoxValue] -> (BoxValue, BoxValue) calc_minmax xs | null percentages = (RunFailed NotDone, RunFailed NotDone) - | otherwise = (Percentage (minimum percentages), - Percentage (maximum percentages)) + | otherwise = (Percentage (minimum percentages), + Percentage (maximum percentages)) where percentages = [ if f < 5 then 5 else f | Percentage f <- xs ] @@ -651,28 +683,29 @@ calc_minmax xs -- Show the Results class Num a => Result a where - toBox :: a -> BoxValue - convert_to_percentage :: a -> a -> Float + toBox :: a -> BoxValue + convert_to_percentage :: a -> a -> Float -- We assume an Int is a size, and print it in kilobytes. instance Result Int where - convert_to_percentage 0 size = 100 - convert_to_percentage base size = (fromIntegral size / fromIntegral base) * 100 + convert_to_percentage 0 _ = 100 + convert_to_percentage baseline val + = (fromIntegral val / fromIntegral baseline) * 100 - toBox = BoxInt + toBox = BoxInt instance Result Integer where - convert_to_percentage 0 size = 100 - convert_to_percentage base size = (fromInteger size / fromInteger base) * 100 - toBox = BoxInteger - + convert_to_percentage 0 _ = 100 + convert_to_percentage baseline val + = (fromInteger val / fromInteger baseline) * 100 + toBox = BoxInteger instance Result Float where - convert_to_percentage 0.0 size = 100.0 - convert_to_percentage base size = size / base * 100 + convert_to_percentage 0.0 _ = 100.0 + convert_to_percentage baseline val = val / baseline * 100 - toBox = BoxFloat + toBox = BoxFloat -- ----------------------------------------------------------------------------- -- BoxValues @@ -688,19 +721,18 @@ data BoxValue showBox :: BoxValue -> String showBox (RunFailed stat) = show_stat stat -showBox (Percentage f) = show_pcntage f -showBox (BoxFloat f) = show f +showBox (Percentage f) = case printf "%.1f%%" (f-100) of + xs@('-':_) -> xs + xs -> '+':xs +showBox (BoxFloat f) = printf "%.2f" f showBox (BoxInt n) = show (n `div` 1024) ++ "k" showBox (BoxInteger n) = show (n `div` 1024) ++ "k" showBox (BoxString s) = s -instance Show BoxValue where { show = showBox } - -show_pcntage n = show (n-100) ++ "%" ---show_pcntage n = show_float_signed (n-100) ++ "%" - ---show_float_signed = showFloat False False True False False Nothing (Just 1) +instance Show BoxValue where + show = showBox +show_stat :: Status -> String show_stat Success = "(no result)" show_stat WrongStdout = "(stdout)" show_stat WrongStderr = "(stderr)" @@ -719,41 +751,45 @@ data TableRow type Layout = [String -> ShowS] makeTable :: Layout -> [TableRow] -> ShowS -makeTable p = interleave "\n" . map do_row - where do_row (TableRow boxes) = applyLayout p boxes - do_row TableLine = str (take 80 (repeat '-')) +makeTable layout = interleave "\n" . map do_row + where do_row (TableRow boxes) = applyLayout layout boxes + do_row TableLine = str (take 80 (repeat '-')) makeLatexTable :: [TableRow] -> ShowS makeLatexTable = foldr (.) id . map do_row where do_row (TableRow boxes) - = applyLayout latexTableLayout boxes . str "\\\\\n" - do_row TableLine - = str "\\hline\n" + = applyLayout latexTableLayout boxes . str "\\\\\n" + do_row TableLine + = str "\\hline\n" latexTableLayout :: Layout latexTableLayout = box : repeat (box . (" & "++)) where box s = str (foldr transchar "" s) - transchar '%' s = s -- leave out the percentage signs - transchar c s = c : s + transchar '%' s = s -- leave out the percentage signs + transchar c s = c : s applyLayout :: Layout -> [BoxValue] -> ShowS -applyLayout layout values = +applyLayout layout values = foldr (.) id [ f (show val) | (val,f) <- zip values layout ] -- ----------------------------------------------------------------------------- -- General Utils split :: Char -> String -> [String] -split c s = case rest of - [] -> [chunk] - _:rest -> chunk : split c rest - where (chunk, rest) = break (==c) s +split c s = case break (==c) s of + (chunk, rest) -> + case rest of + [] -> [chunk] + _:rest' -> chunk : split c rest' +str :: String -> ShowS str = showString -interleave s = foldr1 (\a b -> a . str s . b) +interleave :: String -> [ShowS] -> ShowS +interleave s = foldr1 (\a b -> a . str s . b) -fIELD_WIDTH = 16 :: Int +fIELD_WIDTH :: Int +fIELD_WIDTH = 16 -----------------------------------------------------------------------------