X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FsimplCore%2FSimplCore.lhs;h=844c401ce83cd4cd078c83e2b7182b3e3f2d5aaf;hb=ca919ae01e81fb4afb2243bb34eceff56ca66043;hp=8c98492ec3b56ee9e75734e318349a71e4d93314;hpb=913c612f25e118f06a2c21617fbccf34b80f1146;p=ghc-hetmet.git

diff --git a/compiler/simplCore/SimplCore.lhs b/compiler/simplCore/SimplCore.lhs
index 8c98492..844c401 100644
--- a/compiler/simplCore/SimplCore.lhs
+++ b/compiler/simplCore/SimplCore.lhs
@@ -4,6 +4,13 @@
 \section[SimplCore]{Driver for simplifying @Core@ programs}
 
 \begin{code}
+{-# OPTIONS -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/Commentary/CodingStyle#Warnings
+-- for details
+
 module SimplCore ( core2core, simplifyExpr ) where
 
 #include "HsVersions.h"
@@ -22,7 +29,7 @@ import Rules		( RuleBase, emptyRuleBase, mkRuleBase, unionRuleBase,
 import PprCore		( pprCoreBindings, pprCoreExpr, pprRules )
 import OccurAnal	( occurAnalysePgm, occurAnalyseExpr )
 import IdInfo		( setNewStrictnessInfo, newStrictnessInfo, 
-			  setWorkerInfo, workerInfo,
+			  setWorkerInfo, workerInfo, setSpecInfoHead,
 			  setInlinePragInfo, inlinePragInfo,
 			  setSpecInfo, specInfo, specInfoRules )
 import CoreUtils	( coreBindsSize )
@@ -30,7 +37,7 @@ import Simplify		( simplTopBinds, simplExpr )
 import SimplEnv		( SimplEnv, simplBinders, mkSimplEnv, setInScopeSet )
 import SimplMonad
 import ErrUtils		( dumpIfSet, dumpIfSet_dyn, showPass )
-import CoreLint		( endPass )
+import CoreLint		( endPass, endIteration )
 import FloatIn		( floatInwards )
 import FloatOut		( floatOutwards )
 import FamInstEnv
@@ -137,23 +144,23 @@ doCorePasses hsc_env rb us stats guts (to_do : to_dos)
 
 doCorePass :: CoreToDo -> HscEnv -> UniqSupply -> RuleBase
 	   -> ModGuts -> IO (SimplCount, ModGuts)
-doCorePass (CoreDoSimplify mode sws)   = _scc_ "Simplify"      simplifyPgm mode sws
-doCorePass CoreCSE		       = _scc_ "CommonSubExpr" trBinds  cseProgram
-doCorePass CoreLiberateCase	       = _scc_ "LiberateCase"  liberateCase
-doCorePass CoreDoFloatInwards          = _scc_ "FloatInwards"  trBinds  floatInwards
-doCorePass (CoreDoFloatOutwards f)     = _scc_ "FloatOutwards" trBindsU (floatOutwards f)
-doCorePass CoreDoStaticArgs	       = _scc_ "StaticArgs"    trBinds  doStaticArgs
-doCorePass CoreDoStrictness	       = _scc_ "Stranal"       trBinds  dmdAnalPgm
-doCorePass CoreDoWorkerWrapper         = _scc_ "WorkWrap"      trBindsU wwTopBinds
-doCorePass CoreDoSpecialising          = _scc_ "Specialise"    trBindsU specProgram
-doCorePass CoreDoSpecConstr	       = _scc_ "SpecConstr"    trBindsU specConstrProgram
+doCorePass (CoreDoSimplify mode sws)   = {-# SCC "Simplify" #-}      simplifyPgm mode sws
+doCorePass CoreCSE		       = {-# SCC "CommonSubExpr" #-} trBinds  cseProgram
+doCorePass CoreLiberateCase	       = {-# SCC "LiberateCase" #-}  liberateCase
+doCorePass CoreDoFloatInwards          = {-# SCC "FloatInwards" #-}  trBinds  floatInwards
+doCorePass (CoreDoFloatOutwards f)     = {-# SCC "FloatOutwards" #-} trBindsU (floatOutwards f)
+doCorePass CoreDoStaticArgs	       = {-# SCC "StaticArgs" #-}    trBinds  doStaticArgs
+doCorePass CoreDoStrictness	       = {-# SCC "Stranal" #-}       trBinds  dmdAnalPgm
+doCorePass CoreDoWorkerWrapper         = {-# SCC "WorkWrap" #-}      trBindsU wwTopBinds
+doCorePass CoreDoSpecialising          = {-# SCC "Specialise" #-}    trBindsU specProgram
+doCorePass CoreDoSpecConstr	       = {-# SCC "SpecConstr" #-}    trBindsU specConstrProgram
 doCorePass CoreDoGlomBinds	       = trBinds glomBinds
-doCorePass CoreDoVectorisation         = _scc_ "Vectorise"     vectorise
+doCorePass CoreDoVectorisation         = {-# SCC "Vectorise" #-}     vectorise
 doCorePass CoreDoPrintCore	       = observe printCore
 doCorePass (CoreDoRuleCheck phase pat) = observe (ruleCheck phase pat)
 doCorePass CoreDoNothing	       = observe (\ _ _ -> return ())
 #ifdef OLD_STRICTNESS		       
-doCorePass CoreDoOldStrictness	       = _scc_ "OldStrictness" trBinds doOldStrictness
+doCorePass CoreDoOldStrictness	       = {-# SCC "OldStrictness" #-} trBinds doOldStrictness
 #else
 doCorePass CoreDoOldStrictness	       = panic "CoreDoOldStrictness"
 #endif
@@ -400,7 +407,7 @@ simplifyPgm mode switches hsc_env us imp_rule_base guts
 			 text "",
 			 pprSimplCount counts_out]);
 
-	endPass dflags ("Simplify phase " ++ phase_info ++ " done") Opt_D_verbose_core2core binds';
+	endPass dflags ("Simplify phase " ++ phase_info ++ " done") Opt_D_dump_simpl_phases binds';
 
 	return (counts_out, guts { mg_binds = binds' })
     }
@@ -422,7 +429,7 @@ simplifyPgm mode switches hsc_env us imp_rule_base guts
 	    if  max_iterations > 2 then
 		hPutStr stderr ("NOTE: Simplifier still going after " ++ 
 				show max_iterations ++ 
-			    	" iterations; bailing out.\n")
+			    	" iterations; bailing out.  Size = " ++ show (coreBindsSize binds) ++ "\n" )
 	    else 
 		return ();
 #endif
@@ -436,7 +443,7 @@ simplifyPgm mode switches hsc_env us imp_rule_base guts
       | let sz = coreBindsSize binds in sz == sz
       = do {
 		-- Occurrence analysis
-	   let { tagged_binds = _scc_ "OccAnal" occurAnalysePgm binds } ;
+	   let { tagged_binds = {-# SCC "OccAnal" #-} occurAnalysePgm binds } ;
 	   dumpIfSet_dyn dflags Opt_D_dump_occur_anal "Occurrence analysis"
 		     (pprCoreBindings tagged_binds);
 
@@ -448,7 +455,7 @@ simplifyPgm mode switches hsc_env us imp_rule_base guts
 	   eps <- hscEPS hsc_env ;
 	   let	{ rule_base' = unionRuleBase imp_rule_base (eps_rule_base eps)
 		; simpl_env  = mkSimplEnv mode sw_chkr 
-		; simpl_binds = _scc_ "SimplTopBinds" 
+		; simpl_binds = {-# SCC "SimplTopBinds" #-} 
 				simplTopBinds simpl_env tagged_binds
 		; fam_envs = (eps_fam_inst_env eps, mg_fam_inst_env guts) } ;
 	   
@@ -485,12 +492,12 @@ simplifyPgm mode switches hsc_env us imp_rule_base guts
 		--
 		-- ToDo: alas, this means that indirection-shorting does not happen at all
 		--	 if the simplifier does nothing (not common, I know, but unsavoury)
-	   let { binds'' = _scc_ "ZapInd" shortOutIndirections binds' } ;
+	   let { binds'' = {-# SCC "ZapInd" #-} shortOutIndirections binds' } ;
 
 		-- Dump the result of this iteration
 	   dumpIfSet_dyn dflags Opt_D_dump_simpl_iterations herald
 		         (pprSimplCount counts') ;
-	   endPass dflags herald Opt_D_dump_simpl_iterations binds'' ;
+	   endIteration dflags herald Opt_D_dump_simpl_iterations binds'' ;
 
 		-- Loop
   	   do_iteration us2 (iteration_no + 1) all_counts binds''
@@ -693,6 +700,9 @@ transferIdInfo exported_id local_id
     transfer exp_info = exp_info `setNewStrictnessInfo` newStrictnessInfo local_info
 				 `setWorkerInfo`        workerInfo local_info
 				 `setInlinePragInfo`	inlinePragInfo local_info
-				 `setSpecInfo`	        addSpecInfo (specInfo exp_info)
-							            (specInfo local_info)
+				 `setSpecInfo`	        addSpecInfo (specInfo exp_info) new_info
+    new_info = setSpecInfoHead (idName exported_id) 
+			       (specInfo local_info)
+	-- Remember to set the function-name field of the
+	-- rules as we transfer them from one function to another
 \end{code}