X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fcmm%2FCmmCPS.hs;h=025c12735e59c1718da2ff692a6ca4faa7988f0f;hp=f098941529106d7101381c156bede6c076d2748f;hb=0d80489c9b9f2421f65d8dd86c1e50c6bb429715;hpb=7bfd7890bcf6f27d601604a0964975ba2e4ea2eb diff --git a/compiler/cmm/CmmCPS.hs b/compiler/cmm/CmmCPS.hs index f098941..025c127 100644 --- a/compiler/cmm/CmmCPS.hs +++ b/compiler/cmm/CmmCPS.hs @@ -1,3 +1,10 @@ +{-# 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 CmmCPS ( -- | Converts C-- with full proceedures and parameters -- to a CPS transformed C-- with the stack made manifest. @@ -6,6 +13,7 @@ module CmmCPS ( #include "HsVersions.h" +import BlockId import Cmm import CmmLint import PprCmm @@ -40,69 +48,64 @@ import Data.List -- |Top level driver for the CPS pass ----------------------------------------------------------------------------- cmmCPS :: DynFlags -- ^ Dynamic flags: -dcmm-lint -ddump-cps-cmm - -> [GenCmm CmmStatic CmmInfo CmmStmt] -- ^ Input C-- with Proceedures - -> IO [GenCmm CmmStatic CmmInfo CmmStmt] -- ^ Output CPS transformed C-- -cmmCPS dflags abstractC = do - when (dopt Opt_DoCmmLinting dflags) $ - do showPass dflags "CmmLint" - case firstJust $ map cmmLint abstractC of - Just err -> do printDump err - ghcExit dflags 1 - Nothing -> return () - showPass dflags "CPS" + -> [Cmm] -- ^ Input C-- with Proceedures + -> IO [Cmm] -- ^ Output CPS transformed C-- +cmmCPS dflags cmm_with_calls + = do { when (dopt Opt_DoCmmLinting dflags) $ + do showPass dflags "CmmLint" + case firstJust $ map cmmLint cmm_with_calls of + Just err -> do printDump err + ghcExit dflags 1 + Nothing -> return () + ; showPass dflags "CPS" -- TODO: more lint checking -- check for use of branches to non-existant blocks -- check for use of Sp, SpLim, R1, R2, etc. - uniqSupply <- mkSplitUniqSupply 'p' - let supplies = listSplitUniqSupply uniqSupply - let doCpsProc s (Cmm c) = - Cmm $ concat $ zipWith cpsProc (listSplitUniqSupply s) c - let continuationC = zipWith doCpsProc supplies abstractC + ; uniqSupply <- mkSplitUniqSupply 'p' + ; let supplies = listSplitUniqSupply uniqSupply + ; let cpsd_cmm = zipWith doCpsProc supplies cmm_with_calls - dumpIfSet_dyn dflags Opt_D_dump_cps_cmm "CPS Cmm" (pprCmms continuationC) + ; dumpIfSet_dyn dflags Opt_D_dump_cps_cmm "CPS Cmm" (pprCmms cpsd_cmm) -- TODO: add option to dump Cmm to file - return continuationC + ; return cpsd_cmm } -make_stack_check stack_check_block_id info stack_use next_block_id = - BasicBlock stack_check_block_id $ - check_stmts ++ [CmmBranch next_block_id] - where - check_stmts = - case info of - -- If we are given a stack check handler, - -- then great, well check the stack. - CmmInfo (Just gc_block) _ _ - -> [CmmCondBranch - (CmmMachOp (MO_U_Lt $ cmmRegRep spReg) - [CmmReg stack_use, CmmReg spLimReg]) - gc_block] - -- If we aren't given a stack check handler, - -- then humph! we just won't check the stack for them. - CmmInfo Nothing _ _ - -> [] ----------------------------------------------------------------------------- -- |CPS a single CmmTop (proceedure) -- Only 'CmmProc' are transformed 'CmmData' will be left alone. ----------------------------------------------------------------------------- +doCpsProc :: UniqSupply -> Cmm -> Cmm +doCpsProc s (Cmm c) + = Cmm $ concat $ zipWith cpsProc (listSplitUniqSupply s) c + cpsProc :: UniqSupply - -> GenCmmTop CmmStatic CmmInfo CmmStmt -- ^Input proceedure - -> [GenCmmTop CmmStatic CmmInfo CmmStmt] -- ^Output proceedure and continuations + -> CmmTop -- ^Input procedure + -> [CmmTop] -- ^Output procedures; + -- a single input procedure is converted to + -- multiple output procedures -- Data blocks don't need to be CPS transformed cpsProc uniqSupply proc@(CmmData _ _) = [proc] -- Empty functions just don't work with the CPS algorithm, but -- they don't need the transformation anyway so just output them directly -cpsProc uniqSupply proc@(CmmProc _ _ _ []) = [proc] +cpsProc uniqSupply proc@(CmmProc _ _ _ (ListGraph [])) + = pprTrace "cpsProc: unexpected empty proc" (ppr proc) [proc] -- CPS transform for those procs that actually need it -cpsProc uniqSupply (CmmProc info ident params blocks) = cps_procs +-- The plan is this: +-- +-- * Introduce a stack-check block as the first block +-- * The first blocks gets a FunctionEntry; the rest are ControlEntry +-- * Now break each block into a bunch of blocks (at call sites); +-- all but the first will be ContinuationEntry +-- +cpsProc uniqSupply (CmmProc info ident params (ListGraph blocks)) = cps_procs where -- We need to be generating uniques for several things. -- We could make this function monadic to handle that @@ -111,12 +114,11 @@ cpsProc uniqSupply (CmmProc info ident params blocks) = cps_procs (uniqSupply1, uniqSupply2) = splitUniqSupply uniqSupply uniques :: [[Unique]] uniques = map uniqsFromSupply $ listSplitUniqSupply uniqSupply1 - (stack_check_block_unique:stack_use_unique:info_uniques) : - adaptor_uniques : + (stack_check_block_unique:stack_use_unique:adaptor_uniques) : block_uniques = uniques - proc_uniques = map (map uniqsFromSupply . listSplitUniqSupply) $ listSplitUniqSupply uniqSupply2 + proc_uniques = map (map (map uniqsFromSupply . listSplitUniqSupply) . listSplitUniqSupply) $ listSplitUniqSupply uniqSupply2 - stack_use = CmmLocal (LocalReg stack_use_unique (cmmRegRep spReg) KindPtr) + stack_use = CmmLocal (LocalReg stack_use_unique (cmmRegRep spReg) GCKindPtr) stack_check_block_id = BlockId stack_check_block_unique stack_check_block = make_stack_check stack_check_block_id info stack_use (blockId $ head blocks) @@ -169,7 +171,7 @@ cpsProc uniqSupply (CmmProc info ident params blocks) = cps_procs -- This is an association list instead of a UniqFM because -- CLabel's don't have a 'Uniqueable' instance. formats :: [(CLabel, -- key - (CmmFormals, -- arguments + (CmmFormalsWithoutKinds, -- arguments Maybe CLabel, -- label in top slot [Maybe LocalReg]))] -- slots formats = selectContinuationFormat live continuations @@ -188,6 +190,23 @@ cpsProc uniqSupply (CmmProc info ident params blocks) = cps_procs cps_procs :: [CmmTop] cps_procs = zipWith (continuationToProc formats' stack_use) proc_uniques continuations' +make_stack_check stack_check_block_id info stack_use next_block_id = + BasicBlock stack_check_block_id $ + check_stmts ++ [CmmBranch next_block_id] + where + check_stmts = + case info of + -- If we are given a stack check handler, + -- then great, well check the stack. + CmmInfo (Just gc_block) _ _ + -> [CmmCondBranch + (CmmMachOp (MO_U_Lt $ cmmRegRep spReg) + [CmmReg stack_use, CmmReg spLimReg]) + gc_block] + -- If we aren't given a stack check handler, + -- then humph! we just won't check the stack for them. + CmmInfo Nothing _ _ + -> [] ----------------------------------------------------------------------------- collectNonProcPointTargets :: @@ -258,7 +277,7 @@ gatherBlocksIntoContinuation live proc_points blocks start = selectContinuationFormat :: BlockEnv CmmLive -> [Continuation (Either C_SRT CmmInfo)] - -> [(CLabel, (CmmFormals, Maybe CLabel, [Maybe LocalReg]))] + -> [(CLabel, (CmmFormalsWithoutKinds, Maybe CLabel, [Maybe LocalReg]))] selectContinuationFormat live continuations = map (\c -> (continuationLabel c, selectContinuationFormat' c)) continuations where @@ -282,7 +301,7 @@ selectContinuationFormat live continuations = unknown_block = panic "unknown BlockId in selectContinuationFormat" -processFormats :: [(CLabel, (CmmFormals, Maybe CLabel, [Maybe LocalReg]))] +processFormats :: [(CLabel, (CmmFormalsWithoutKinds, Maybe CLabel, [Maybe LocalReg]))] -> Maybe UpdateFrame -> [Continuation (Either C_SRT CmmInfo)] -> (WordOff, WordOff, [(CLabel, ContinuationFormat)]) @@ -341,14 +360,14 @@ continuationMaxStack formats (Continuation _ label _ False blocks) = map stmt_arg_size (brokenBlockStmts block)) final_arg_size (FinalReturn args) = - argumentsSize (cmmExprRep . fst) args + argumentsSize (cmmExprRep . kindlessCmm) args final_arg_size (FinalJump _ args) = - argumentsSize (cmmExprRep . fst) args - final_arg_size (FinalCall next _ _ args _ True) = 0 - final_arg_size (FinalCall next _ _ args _ False) = + argumentsSize (cmmExprRep . kindlessCmm) args + final_arg_size (FinalCall next _ _ args _ _ True) = 0 + final_arg_size (FinalCall next _ _ args _ _ False) = -- We have to account for the stack used when we build a frame -- for the *next* continuation from *this* continuation - argumentsSize (cmmExprRep . fst) args + + argumentsSize (cmmExprRep . kindlessCmm) args + continuation_frame_size next_format where next_format = maybe unknown_format id $ lookup next' formats @@ -357,8 +376,8 @@ continuationMaxStack formats (Continuation _ label _ False blocks) = final_arg_size _ = 0 stmt_arg_size (CmmJump _ args) = - argumentsSize (cmmExprRep . fst) args - stmt_arg_size (CmmCall _ _ _ (CmmSafe _)) = + argumentsSize (cmmExprRep . kindlessCmm) args + stmt_arg_size (CmmCall _ _ _ (CmmSafe _) _) = panic "Safe call in processFormats" stmt_arg_size (CmmReturn _) = panic "CmmReturn in processFormats"