Add vreg-conflicts and vreg-conflict-lifetimes to drop-asm-stats

[ghc-hetmet.git] / compiler / nativeGen / AsmCodeGen.lhs

diff --git a/compiler/nativeGen/AsmCodeGen.lhs b/compiler/nativeGen/AsmCodeGen.lhs
index c9779ee..29ffb89 100644 (file)
--- a/compiler/nativeGen/AsmCodeGen.lhs
+++ b/compiler/nativeGen/AsmCodeGen.lhs
@@ -23,7 +23,6 @@ import RegAllocLinear
 import RegAllocStats
 import RegLiveness
 import RegCoalesce
-import qualified RegSpill      as Spill
 import qualified RegAllocColor as Color
 import qualified GraphColor    as Color
 
@@ -404,6 +403,7 @@ cmmNativeGenDump dflags mod modLocation dump
                                (zip [0..] codeGraphs)))
         $ map ((\(Just c) -> c) . cdRegAllocStats) dump
 
+
        -- Build a global register conflict graph.
        --      If you want to see the graph for just one basic block then use asm-regalloc-stages instead.
        dumpIfSet_dyn dflags
@@ -416,7 +416,6 @@ cmmNativeGenDump dflags mod modLocation dump
        -- Drop native code gen statistics.
        --      This is potentially a large amount of information, so we make a new file instead
        --      of dumping it to stdout.
-       --
        when (dopt Opt_D_drop_asm_stats dflags)
         $ do   -- make the drop file name based on the object file name
                let dropFile    = (init $ ml_obj_file modLocation) ++ "drop-asm-stats"
@@ -424,41 +423,17 @@ cmmNativeGenDump dflags mod modLocation dump
                -- slurp out all the regalloc stats
                let stats       = concat $ catMaybes $ map cdRegAllocStats dump
 
-               ---- Spiller
-               -- slurp out the stats from all the spiller stages
-               let spillStats  = [ s   | s@RegAllocStatsSpill{} <- stats]
-
-               -- build a map of how many spill load/stores were inserted for each vreg
-               let spillLS     = foldl' (plusUFM_C Spill.accSpillLS) emptyUFM
-                               $ map (Spill.spillLoadStore . raSpillStats) spillStats
-
-               -- print the count of load/spills as a tuple so we can read back from the file easilly
-               let pprSpillLS :: (Reg, Int, Int) -> SDoc
-                   pprSpillLS  (r, loads, stores) =
-                       (parens $ (hcat $ punctuate (text ", ") [doubleQuotes (ppr r), int loads, int stores]))
-
-
-               let outSpill    = ( text "-- (spills-added)"
-                               $$  text "--    Spill instructions inserted for each virtual reg."
-                               $$  text "--    (reg_name, spill_loads_added, spill_stores_added)."
-                               $$  (vcat $ map pprSpillLS $ eltsUFM spillLS)
-                               $$  text "\n")
-
-               ---- Lifetimes
-               -- slurp out the maps of all the reg lifetimes
-               let lifetimes   = map raLifetimes stats
-               let lifeMap     = foldl' plusUFM emptyUFM $ map raLifetimes stats
-               let lifeBins    = binLifetimeCount lifeMap
+               -- build a global conflict graph
+               let graph       = foldl Color.union Color.initGraph $ map raGraph stats
 
-               let outLife     = ( text "-- (vreg-population-lifetimes)"
-                               $$  text "--   Number of vregs which lived for a certain number of instructions"
-                               $$  text "--   (instruction_count, number_of_vregs_that_lived_that_long)"
-                               $$ (vcat $ map ppr $ eltsUFM lifeBins)
-                               $$ text "\n")
+               -- pretty print the various sections and write out the file.
+               let outSpills   = pprStatsSpills    stats
+               let outLife     = pprStatsLifetimes stats
+               let outConflict = pprStatsConflict  stats
+               let outScatter  = pprStatsLifeConflict stats graph
 
-               -- write out the file
                writeFile dropFile
-                       (showSDoc $ vcat [outSpill, outLife])
+                       (showSDoc $ vcat [outSpills, outLife, outConflict, outScatter])
 
                return ()