projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix space leak in NCG
[ghc-hetmet.git]
/
compiler
/
nativeGen
/
RegAllocColor.hs
diff --git
a/compiler/nativeGen/RegAllocColor.hs
b/compiler/nativeGen/RegAllocColor.hs
index
45727c5
..
27b603c
100644
(file)
--- a/
compiler/nativeGen/RegAllocColor.hs
+++ b/
compiler/nativeGen/RegAllocColor.hs
@@
-13,6
+13,13
@@
-- Colors in graphviz graphs could be nicer.
--
-- Colors in graphviz graphs could be nicer.
--
+{-# OPTIONS_GHC -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+-- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings
+-- for details
+
module RegAllocColor (
regAlloc,
regDotColor
module RegAllocColor (
regAlloc,
regDotColor
@@
-23,6
+30,7
@@
where
import qualified GraphColor as Color
import RegLiveness
import RegSpill
import qualified GraphColor as Color
import RegLiveness
import RegSpill
+import RegSpillClean
import RegAllocStats
import MachRegs
import MachInstrs
import RegAllocStats
import MachRegs
import MachInstrs
@@
-108,6
+116,9
@@
regAlloc_spin dump (spinCount :: Int) triv regsFree slotsFree debug_codeGraphs c
-- patch the registers using the info in the graph
let code_patched = map (patchRegsFromGraph graph_colored) code
-- patch the registers using the info in the graph
let code_patched = map (patchRegsFromGraph graph_colored) code
+ -- clean out unneeded SPILL/RELOADs
+ let code_spillclean = map cleanSpills code_patched
+
-- strip off liveness information
let code_nat = map stripLive code_patched
-- strip off liveness information
let code_nat = map stripLive code_patched
@@
-119,10
+130,12
@@
regAlloc_spin dump (spinCount :: Int) triv regsFree slotsFree debug_codeGraphs c
let stat =
RegAllocStatsColored
{ raGraph = graph_colored
let stat =
RegAllocStatsColored
{ raGraph = graph_colored
- , raPatchedCmm = code_patched
- , raFinalCmm = code_final }
+ , raPatched = code_patched
+ , raSpillClean = code_spillclean
+ , raFinal = code_final
+ , raSRMs = foldl addSRM (0, 0, 0) $ map countSRMs code_spillclean }
- return ( code_nat
+ return ( code_final
, if dump
then [stat] ++ maybeToList stat1 ++ debug_codeGraphs
else []
, if dump
then [stat] ++ maybeToList stat1 ++ debug_codeGraphs
else []