projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NCG: Refactor representation of code with liveness info
[ghc-hetmet.git]
/
compiler
/
nativeGen
/
RegAlloc
/
Graph
/
SpillCost.hs
diff --git
a/compiler/nativeGen/RegAlloc/Graph/SpillCost.hs
b/compiler/nativeGen/RegAlloc/Graph/SpillCost.hs
index
5932d31
..
9799587
100644
(file)
--- a/
compiler/nativeGen/RegAlloc/Graph/SpillCost.hs
+++ b/
compiler/nativeGen/RegAlloc/Graph/SpillCost.hs
@@
-93,13
+93,7
@@
slurpSpillCostInfo cmm
= return ()
-- skip over comment and delta pseudo instrs
= return ()
-- skip over comment and delta pseudo instrs
- countLIs rsLive (SPILL{} : lis)
- = countLIs rsLive lis
-
- countLIs rsLive (RELOAD{} : lis)
- = countLIs rsLive lis
-
- countLIs rsLive (Instr instr Nothing : lis)
+ countLIs rsLive (LiveInstr instr Nothing : lis)
| isMetaInstr instr
= countLIs rsLive lis
| isMetaInstr instr
= countLIs rsLive lis
@@
-107,7
+101,7
@@
slurpSpillCostInfo cmm
= pprPanic "RegSpillCost.slurpSpillCostInfo"
(text "no liveness information on instruction " <> ppr instr)
= pprPanic "RegSpillCost.slurpSpillCostInfo"
(text "no liveness information on instruction " <> ppr instr)
- countLIs rsLiveEntry (Instr instr (Just live) : lis)
+ countLIs rsLiveEntry (LiveInstr instr (Just live) : lis)
= do
-- increment the lifetime counts for regs live on entry to this instr
mapM_ incLifetime $ uniqSetToList rsLiveEntry
= do
-- increment the lifetime counts for regs live on entry to this instr
mapM_ incLifetime $ uniqSetToList rsLiveEntry