projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Whitespace only in nativeGen/RegAlloc/Graph/TrivColorable.hs
[ghc-hetmet.git]
/
compiler
/
nativeGen
/
RegAlloc
/
Graph
/
Coalesce.hs
diff --git
a/compiler/nativeGen/RegAlloc/Graph/Coalesce.hs
b/compiler/nativeGen/RegAlloc/Graph/Coalesce.hs
index
a5d95a3
..
1eaf00f
100644
(file)
--- a/
compiler/nativeGen/RegAlloc/Graph/Coalesce.hs
+++ b/
compiler/nativeGen/RegAlloc/Graph/Coalesce.hs
@@
-12,7
+12,7
@@
import RegAlloc.Liveness
import Instruction
import Reg
import Instruction
import Reg
-import Cmm
+import OldCmm
import Bag
import Digraph
import UniqFM
import Bag
import Digraph
import UniqFM
@@
-25,7
+25,6
@@
import Data.List
-- For Reg -> Reg moves, if the first reg dies at the same time the second reg is born
-- then the mov only serves to join live ranges. The two regs can be renamed to be
-- the same and the move instruction safely erased.
-- For Reg -> Reg moves, if the first reg dies at the same time the second reg is born
-- then the mov only serves to join live ranges. The two regs can be renamed to be
-- the same and the move instruction safely erased.
-
regCoalesce
:: Instruction instr
=> [LiveCmmTop instr]
regCoalesce
:: Instruction instr
=> [LiveCmmTop instr]
@@
-60,7
+59,6
@@
sinkReg fm r
-- | Slurp out mov instructions that only serve to join live ranges.
-- During a mov, if the source reg dies and the destiation reg is born
-- then we can rename the two regs to the same thing and eliminate the move.
-- | Slurp out mov instructions that only serve to join live ranges.
-- During a mov, if the source reg dies and the destiation reg is born
-- then we can rename the two regs to the same thing and eliminate the move.
---
slurpJoinMovs
:: Instruction instr
=> LiveCmmTop instr
slurpJoinMovs
:: Instruction instr
=> LiveCmmTop instr
@@
-69,12
+67,12
@@
slurpJoinMovs
slurpJoinMovs live
= slurpCmm emptyBag live
where
slurpJoinMovs live
= slurpCmm emptyBag live
where
- slurpCmm rs CmmData{} = rs
- slurpCmm rs (CmmProc _ _ _ sccs) = foldl' slurpBlock rs (flattenSCCs sccs)
- slurpBlock rs (BasicBlock _ instrs) = foldl' slurpLI rs instrs
+ slurpCmm rs CmmData{} = rs
+ slurpCmm rs (CmmProc _ _ sccs) = foldl' slurpBlock rs (flattenSCCs sccs)
+ slurpBlock rs (BasicBlock _ instrs) = foldl' slurpLI rs instrs
- slurpLI rs (Instr _ Nothing) = rs
- slurpLI rs (Instr instr (Just live))
+ slurpLI rs (LiveInstr _ Nothing) = rs
+ slurpLI rs (LiveInstr instr (Just live))
| Just (r1, r2) <- takeRegRegMoveInstr instr
, elementOfUniqSet r1 $ liveDieRead live
, elementOfUniqSet r2 $ liveBorn live
| Just (r1, r2) <- takeRegRegMoveInstr instr
, elementOfUniqSet r1 $ liveDieRead live
, elementOfUniqSet r2 $ liveBorn live
@@
-86,8
+84,5
@@
slurpJoinMovs live
| otherwise
= rs
| otherwise
= rs
-
- slurpLI rs SPILL{} = rs
- slurpLI rs RELOAD{} = rs