X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FcodeGen%2FCgParallel.hs;h=cfef25c161bbeac94e6c22fad85217e0a420252a;hp=e340a47f83aba99e5277f491bad7bf19e9f04900;hb=cbbee4e8727c583daf32d9bf17f00afaa839ef10;hpb=ad94d40948668032189ad22a0ad741ac1f645f50 diff --git a/compiler/codeGen/CgParallel.hs b/compiler/codeGen/CgParallel.hs index e340a47..cfef25c 100644 --- a/compiler/codeGen/CgParallel.hs +++ b/compiler/codeGen/CgParallel.hs @@ -8,13 +8,6 @@ -- ----------------------------------------------------------------------------- -{-# 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/CodingStyle#Warnings --- for details - module CgParallel( staticGranHdr,staticParHdr, granFetchAndReschedule, granYield, @@ -27,6 +20,7 @@ import Id import Cmm import StaticFlags import Outputable +import SMRep staticParHdr :: [CmmLit] -- Parallel header words in a static closure @@ -42,7 +36,7 @@ staticGranHdr = [] doGranAllocate :: CmmExpr -> Code -- macro DO_GRAN_ALLOCATE -doGranAllocate hp +doGranAllocate _hp | not opt_GranMacros = nopC | otherwise = panic "doGranAllocate" @@ -62,12 +56,14 @@ granFetchAndReschedule regs node_reqd where liveness = mkRegLiveness regs 0 0 +fetch :: FCode () fetch = panic "granFetch" -- Was: absC (CMacroStmt GRAN_FETCH []) --HWL: generate GRAN_FETCH macro for GrAnSim -- currently GRAN_FETCH and GRAN_FETCH_AND_RESCHEDULE are miai -reschedule liveness node_reqd = panic "granReschedule" +reschedule :: StgWord -> Bool -> Code +reschedule _liveness _node_reqd = panic "granReschedule" -- Was: absC (CMacroStmt GRAN_RESCHEDULE [ -- mkIntCLit (I# (word2Int# liveness_mask)), -- mkIntCLit (if node_reqd then 1 else 0)]) @@ -96,7 +92,8 @@ granYield regs node_reqd where liveness = mkRegLiveness regs 0 0 -yield liveness = panic "granYield" +yield :: StgWord -> Code +yield _liveness = panic "granYield" -- Was : absC (CMacroStmt GRAN_YIELD -- [mkIntCLit (I# (word2Int# liveness_mask))])