Render the graph from previous results

Author: nobrakal

bench/Command.hs

@@ -44,7 +44,7 @@ type Graph = String
 data ListOption = Benchs | Libs
   deriving (Show, Eq)
 
-data Command = List ListOption | Run (Maybe Option) (Maybe [String]) Output (Maybe [Lib]) Bool Bool [(Graph,Int)]
+data Command = List ListOption | Run (Maybe Option) (Maybe [String]) Output (Maybe [Lib]) Bool Bool [(Graph,Int)] | Render String ChartOutput
   deriving (Show, Eq)
 
 newtype CommandDataSize = RunD [(Graph,Int)]
@@ -81,14 +81,17 @@ saveOpt = strOption $ long "saveRawResults" <> short 'r' <> help "Write the raw
 
 figFlag :: Parser (Maybe ChartOutput)
 #ifdef CHART
-figFlag = optional $ ChartOutput <$> outfile <*> outtype
-  where
-    outfile = strOption $ long "chartfile" <> short 'f' <> metavar "FILENAME" <> help "Output file WITHOUT extension" <> value "result"
-    outtype = option auto $ long "chart" <> short 'c' <> metavar "OUTTYPE" <> help "Output type: Png or Svg"
+figFlag = optional figSFlag
 #else
 figFlag = pure Nothing
 #endif
 
+figSFlag :: Parser ChartOutput
+figSFlag = ChartOutput <$> outfile <*> outtype
+  where
+    outfile = strOption $ long "chartfile" <> short 'f' <> metavar "FILENAME" <> help "Output file WITHOUT extension" <> value "result"
+    outtype = option auto $ long "chart" <> short 'c' <> metavar "OUTTYPE" <> help "Output type: Png or Svg"
+
 benchWithCreation :: Parser Bool
 benchWithCreation = flag False True $ long "bench-with-creation" <> short 'b' <> help "When set, will benchmark also the graph-creation function. See README (IGNORED FOR SPACE BENCHMARKS)"
 
@@ -110,10 +113,17 @@ listOpt = flag' Benchs (long "benchs") <|> flag' Libs (long "libs")
 listCom :: Parser Command
 listCom = List <$> listOpt
 
+renderGOpt :: Parser String
+renderGOpt = strArgument $ help "the file to load raw datas. Likely something exported with \" run -r \"" <> metavar "INFILE"
+
+renderGCom :: Parser Command
+renderGCom = Render <$> renderGOpt <*> figSFlag
+
 command' :: Parser Command
 command' = subparser
   ( command "list" list
     <> command "run" run
+    <> command "renderG" renderG
   )
   where
     run = info (runCom <**> helper)
@@ -124,6 +134,10 @@ command' = subparser
       ( fullDesc
      <> progDesc "List benchmarks"
      <> header "Help" )
+    renderG = info (renderGCom <**> helper)
+      ( fullDesc
+     <> progDesc "Render data into a graph"
+     <> header "Help" )
 
 commandP :: ParserInfo Command
 commandP = info (semiOptional <**> helper)

bench/Space.hs

@@ -69,10 +69,9 @@ useResults flg notDef todo = do
   putStrLn "Note: results are in bytes"
   results <- mapM mapped $ nubBy (liftExtract2 eqG) namedBenchs
   maybe (return ()) (\x -> writeFile x $ show results) $ saveToFile flg
-#ifdef CHART
-  maybe (return ()) (\x -> mkChart "time" defaultGr show x $ Left $ catMaybes results) $ figOut flg
-#endif
-  return ()
+  case figOut flg of
+    Nothing -> return ()
+    (Just x) -> renderG x results
   where
     namedBenchs = concatMap sequence $ mapMaybe groupedToNamed todo
     mapped e = do
@@ -92,6 +91,13 @@ useResults flg notDef todo = do
                   printAbstract "lighter" onlyLargeBenchs
                 return $ Just (showGrouped $ snd e, onlyLargeBenchs)
 
+renderG :: T.ChartOutput -> [Maybe (Named (T.Grouped [Named Double]))] -> IO ()
+#ifdef CHART
+renderG x results = mkChart "Space results" defaultGr show x $ Left $ catMaybes results
+#else
+renderG _ _ = return ()
+#endif
+
 -- | Print a report from the lists of benchmarks
 printReport :: Int -- ^ The number of # to write, must start with 2
             -> StaOut -- ^ Output infos
@@ -169,6 +175,7 @@ main' :: Command -> IO ()
 main' (List opt) = case opt of
                     Benchs -> putStr $ unlines $ benchsNames Nothing Nothing
                     Libs -> putStr $ unlines $ nub $ map fst listOfSuites
+main' (Render fp opt) = readFile fp >>= renderG opt . read
 main' (Run only notonly flg libs _ _ _) = do
   printHeader defaultGr bN
   mainWeigh benchs (useResults flg (mapMaybe (\(n,Shadow s) -> either (\x -> Just (n,x)) (const Nothing) s ) filteredArr))
@@ -180,7 +187,7 @@ main' (Run only notonly flg libs _ _ _) = do
     filteredArr = filter (`isNameIn` bN) listOfSuites
 
 benchsNames :: Maybe Option -> Maybe [String] -> [String]
-benchsNames only notonly = useNotOnly $ useOnly extractedNames
+benchsNames only notonly = nub $ useNotOnly $ useOnly extractedNames
   where
     extractedNames = "creation" : map (\(_,Shadow s) -> either fst name s) listOfSuites
     useOnly = case only of

bench/Time.hs

@@ -80,11 +80,10 @@ genReport gr flg arr = do
                                        oth =  head $ tail libNames
                                    in unwords ["\nComparing",comp,"to",oth,". It means that the displayed number will be k such that", comp,"= k *", oth ]
   results <- mapM mapped $ nubBy (liftExtract2 (==)) refinedarr
-  maybe (return ()) (\x -> writeFile x $ show results) $ saveToFile flg
-#ifdef CHART
-  maybe (return ()) (\x -> mkChart "Time results" gr secs x $ Right $ catMaybes results) $ figOut flg
-#endif
-  return ()
+  maybe (return ()) (\x -> writeFile x $ unlines [show gr,show results]) $ saveToFile flg
+  case figOut flg of
+    Nothing -> return ()
+    (Just x) -> renderG gr x results
   where
     mapped e = do
       let bname = showBenchName $ snd e
@@ -111,6 +110,13 @@ genReport gr flg arr = do
     notquickComp = staOut flg /= QuickComparison
     (noimpl,refinedarr) = partitionEithers $ map stripOutEither arr
 
+renderG :: [(String,Int)] -> ChartOutput -> [Maybe (Name, Grouped [(Name, (Double, Double))])] -> IO ()
+#ifdef CHART
+renderG gr x results = mkChart "Time results" gr secs x $ Right $ catMaybes results
+#else
+renderG _ _ _ = return ()
+#endif
+
 toPrint :: Int -- ^ Will start with 2
         -> StaOut -> [Named Benchmark] -> Benchmark -> IO (Maybe (Grouped [Named Report]))
 toPrint lev flg arr breport = case lev of
@@ -202,6 +208,9 @@ main' opts
       List listOpt -> case listOpt of
                         Benchs -> putStr $ unlines grNames
                         Libs -> putStr $ unlines $ nub $ map fst listOfSuites ++ map fst (listOfCreation False [])
+      Render filep dg -> do
+        (gr,res) <- span (/='\n') <$> readFile filep
+        renderG (read gr) dg (read res)
       Run opt nottodo' flg libs benchWithCreation dontBenchLittleOnes gr' -> do
         let modifyL = case libs of
               Nothing -> id

src/BenchGraph/Render/Types.hs

@@ -15,7 +15,7 @@ where
 
 -- | The Bool is here to tell if we get it into the benchs
 -- The string is the type of graphs used
-data Grouped a = Simple Bool String a | Group [Grouped a] deriving (Show)
+data Grouped a = Simple Bool String a | Group [Grouped a] deriving (Show, Read)
 
 instance Functor Grouped where
   fmap f (Simple b n a) = Simple b n $ f a