projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
When generating C, don't pretend functions are data
[ghc-hetmet.git]
/
compiler
/
cmm
/
ZipDataflow.hs
diff --git
a/compiler/cmm/ZipDataflow.hs
b/compiler/cmm/ZipDataflow.hs
index
2d50165
..
883de76
100644
(file)
--- a/
compiler/cmm/ZipDataflow.hs
+++ b/
compiler/cmm/ZipDataflow.hs
@@
-485,7
+485,6
@@
fwd_pure_anal name env transfers in_fact g =
type Fuel = OptimizationFuel
type Fuel = OptimizationFuel
-{-# INLINE forward_sol #-}
forward_sol
:: forall m l a .
(DebugNodes m l, LastNode l, Outputable a)
forward_sol
:: forall m l a .
(DebugNodes m l, LastNode l, Outputable a)
@@
-601,8
+600,6
@@
mk_set_or_save is_local (LastOutFacts l) = mapM_ set_or_save_one l
-
-{-# INLINE forward_rew #-}
forward_rew
:: forall m l a .
(DebugNodes m l, LastNode l, Outputable a)
forward_rew
:: forall m l a .
(DebugNodes m l, LastNode l, Outputable a)
@@
-748,7
+745,6
@@
rewrite_b_agraph depth start_facts name lattice transfers rewrites exit_fact g =
-{-# INLINE backward_sol #-}
backward_sol
:: forall m l a .
(DebugNodes m l, LastNode l, Outputable a)
backward_sol
:: forall m l a .
(DebugNodes m l, LastNode l, Outputable a)
@@
-867,7
+863,6
@@
bwd_pure_anal name env transfers g exit_fact =
{- ================================================================ -}
{- ================================================================ -}
-{-# INLINE backward_rew #-}
backward_rew
:: forall m l a .
(DebugNodes m l, LastNode l, Outputable a)
backward_rew
:: forall m l a .
(DebugNodes m l, LastNode l, Outputable a)
@@
-900,7
+895,7
@@
backward_rew check_maybe = back
rewrite start g exit_fact fuel =
let Graph entry blockenv = g
blocks = reverse $ G.postorder_dfs_from blockenv entry
rewrite start g exit_fact fuel =
let Graph entry blockenv = g
blocks = reverse $ G.postorder_dfs_from blockenv entry
- in do { (FP env in_fact _ _ _, _) <- -- don't drop the entry fact!
+ in do { (FP _ in_fact _ _ _, _) <- -- don't drop the entry fact!
solve depth name start transfers rewrites g exit_fact fuel
--; env <- getAllFacts
-- ; my_trace "facts after solving" (ppr env) $ return ()
solve depth name start transfers rewrites g exit_fact fuel
--; env <- getAllFacts
-- ; my_trace "facts after solving" (ppr env) $ return ()
@@
-1008,7
+1003,7
@@
instance FixedPoint ForwardFixedPoint where
dump_things :: Bool
dump_things :: Bool
-dump_things = True
+dump_things = False
my_trace :: String -> SDoc -> a -> a
my_trace = if dump_things then pprTrace else \_ _ a -> a
my_trace :: String -> SDoc -> a -> a
my_trace = if dump_things then pprTrace else \_ _ a -> a
@@
-1070,11
+1065,11
@@
subAnalysis' :: (Monad (m f), DataflowAnalysis m, Outputable f) =>
m f a -> m f a
subAnalysis' m =
do { a <- subAnalysis $
m f a -> m f a
subAnalysis' m =
do { a <- subAnalysis $
- do { a <- m; facts <- getAllFacts
+ do { a <- m; -- facts <- getAllFacts
; -- my_trace "after sub-analysis facts are" (pprFacts facts) $
return a }
; -- my_trace "after sub-analysis facts are" (pprFacts facts) $
return a }
- ; facts <- getAllFacts
+ -- ; facts <- getAllFacts
; -- my_trace "in parent analysis facts are" (pprFacts facts) $
return a }
; -- my_trace "in parent analysis facts are" (pprFacts facts) $
return a }
- where pprFacts env = nest 2 $ vcat $ map pprFact $ blockEnvToList env
- pprFact (id, a) = hang (ppr id <> colon) 4 (ppr a)
+ -- where pprFacts env = nest 2 $ vcat $ map pprFact $ blockEnvToList env
+ -- pprFact (id, a) = hang (ppr id <> colon) 4 (ppr a)