X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fprofiling%2FSCCfinal.lhs;h=256984ad91b0cecf9ac76ab6d87a3bdbed548960;hb=022fc24719ba4b98b8d9f19bfe7f75dd0f19d585;hp=c95db9c358a72644a5e9e6560bf5693117bb0145;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git

diff --git a/compiler/profiling/SCCfinal.lhs b/compiler/profiling/SCCfinal.lhs
index c95db9c..256984a 100644
--- a/compiler/profiling/SCCfinal.lhs
+++ b/compiler/profiling/SCCfinal.lhs
@@ -29,13 +29,16 @@ module SCCfinal ( stgMassageForProfiling ) where
 
 import StgSyn
 
-import Packages		( HomeModules )
+import PackageConfig	( PackageId )
 import StaticFlags	( opt_AutoSccsOnIndividualCafs )
 import CostCentre	-- lots of things
-import Id		( Id )
+import Id
+import Name
 import Module		( Module )
-import UniqSupply	( uniqFromSupply, splitUniqSupply, UniqSupply )
-import Unique           ( Unique )
+import UniqSupply	( splitUniqSupply, UniqSupply )
+#ifdef PROF_DO_BOXING
+import UniqSupply	( uniqFromSupply )
+#endif
 import VarSet
 import ListSetOps	( removeDups )
 import Outputable	
@@ -45,13 +48,13 @@ infixr 9 `thenMM`, `thenMM_`
 
 \begin{code}
 stgMassageForProfiling
-	:: HomeModules
+	:: PackageId
 	-> Module			-- module name
 	-> UniqSupply		    	-- unique supply
 	-> [StgBinding]		    	-- input
 	-> (CollectedCCs, [StgBinding])
 
-stgMassageForProfiling pdeps mod_name us stg_binds
+stgMassageForProfiling this_pkg mod_name us stg_binds
   = let
 	((local_ccs, extern_ccs, cc_stacks),
 	 stg_binds2)
@@ -102,7 +105,7 @@ stgMassageForProfiling pdeps mod_name us stg_binds
     do_top_rhs :: Id -> StgRhs -> MassageM StgRhs
 
     do_top_rhs binder (StgRhsClosure _ bi fv u srt [] (StgSCC cc (StgConApp con args)))
-      | not (isSccCountCostCentre cc) && not (isDllConApp pdeps con args)
+      | not (isSccCountCostCentre cc) && not (isDllConApp this_pkg con args)
 	-- Trivial _scc_ around nothing but static data
 	-- Eliminate _scc_ ... and turn into StgRhsCon
 
@@ -125,10 +128,15 @@ stgMassageForProfiling pdeps mod_name us stg_binds
 	-- Top level CAF without a cost centre attached
 	-- Attach CAF cc (collect if individual CAF ccs)
       = (if opt_AutoSccsOnIndividualCafs 
-		then let cc = mkAutoCC binder mod_name CafCC
+		then let cc = mkAutoCC binder modl CafCC
 			 ccs = mkSingletonCCS cc
+                                -- careful: the binder might be :Main.main,
+                                -- which doesn't belong to module mod_name.
+                                -- bug #249, tests prof001, prof002
+                         modl | Just m <- nameModule_maybe (idName binder) = m
+                              | otherwise = mod_name
 		     in
-		     collectCC  cc  `thenMM_`
+		     collectNewCC  cc  `thenMM_`
 		     collectCCS ccs `thenMM_`
 		     returnMM ccs
 		else 
@@ -192,6 +200,10 @@ stgMassageForProfiling pdeps mod_name us stg_binds
 	= do_let b e `thenMM` \ (b,e) ->
 	  returnMM (StgLetNoEscape lvs1 lvs2 b e)
 
+    do_expr (StgTick m n expr) 
+        = do_expr expr `thenMM` \ expr' ->
+          returnMM (StgTick m n expr')
+
 #ifdef DEBUG
     do_expr other = pprPanic "SCCfinal.do_expr" (ppr other)
 #endif
@@ -358,8 +370,10 @@ mapAccumMM f b (m:ms)
     mapAccumMM f b2 ms	`thenMM` \ (b3, rs) ->
     returnMM (b3, r:rs)
 
+#ifdef PROF_DO_BOXING
 getUniqueMM :: MassageM Unique
 getUniqueMM mod scope_cc us ids ccs = (ccs, uniqFromSupply us)
+#endif
 
 addTopLevelIshId :: Id -> MassageM a -> MassageM a
 addTopLevelIshId id scope mod scope_cc us ids ccs
@@ -403,6 +417,14 @@ collectCC cc mod_name scope_cc us ids (local_ccs, extern_ccs, ccss)
     else -- must declare it "extern"
 	((local_ccs, cc : extern_ccs, ccss), ())
 
+-- Version of collectCC used when we definitely want to declare this
+-- CC as local, even if its module name is not the same as the current
+-- module name (eg. the special :Main module) see bug #249, #1472, 
+-- test prof001,prof002.
+collectNewCC :: CostCentre -> MassageM ()
+collectNewCC cc mod_name scope_cc us ids (local_ccs, extern_ccs, ccss)
+  = ((cc : local_ccs, extern_ccs, ccss), ())
+
 collectCCS :: CostCentreStack -> MassageM ()
 
 collectCCS ccs mod_name scope_cc us ids (local_ccs, extern_ccs, ccss)