X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fvectorise%2FVectorise.hs;h=70e69b7e90a0386742baad289a214ccee71ad962;hp=89ee166dd43aad1fd624570461d33edf70932cdf;hb=cc67e20f5c6355919b54f82c2620515fa28269a8;hpb=6326f92d3f33f1d40d2ffa66021197fd84960742 diff --git a/compiler/vectorise/Vectorise.hs b/compiler/vectorise/Vectorise.hs index 89ee166..70e69b7 100644 --- a/compiler/vectorise/Vectorise.hs +++ b/compiler/vectorise/Vectorise.hs @@ -1,16 +1,16 @@ + module Vectorise( vectorise ) where -#include "HsVersions.h" - import VectMonad import VectUtils import VectType import VectCore import DynFlags -import HscTypes +import HscTypes hiding ( MonadThings(..) ) +import Module ( dphSeqPackageId, dphParPackageId ) import CoreLint ( showPass, endPass ) import CoreSyn import CoreUtils @@ -21,59 +21,53 @@ import DataCon import TyCon import Type import FamInstEnv ( extendFamInstEnvList ) -import InstEnv ( extendInstEnvList ) import Var import VarEnv import VarSet -import Name ( mkSysTvName, getName ) -import NameEnv import Id -import MkId ( unwrapFamInstScrut ) import OccName -import DsMonad hiding (mapAndUnzipM) -import DsUtils ( mkCoreTup, mkCoreTupTy ) +import DsMonad -import Literal ( Literal ) -import PrelNames +import Literal ( Literal, mkMachInt ) import TysWiredIn -import TysPrim ( intPrimTy ) -import BasicTypes ( Boxity(..) ) import Outputable import FastString -import Control.Monad ( liftM, liftM2, mapAndUnzipM ) +import Control.Monad ( liftM, liftM2, zipWithM ) +import Data.List ( sortBy, unzip4 ) -vectorise :: HscEnv -> UniqSupply -> RuleBase -> ModGuts +vectorise :: DPHBackend -> HscEnv -> UniqSupply -> RuleBase -> ModGuts -> IO (SimplCount, ModGuts) -vectorise hsc_env _ _ guts +vectorise backend hsc_env _ _ guts = do showPass dflags "Vectorisation" eps <- hscEPS hsc_env let info = hptVectInfo hsc_env `plusVectInfo` eps_vect_info eps - Just (info', guts') <- initV hsc_env guts info (vectModule guts) + Just (info', guts') <- initV (backendPackage backend) hsc_env guts info + (vectModule guts) endPass dflags "Vectorisation" Opt_D_dump_vect (mg_binds guts') return (zeroSimplCount dflags, guts' { mg_vect_info = info' }) where dflags = hsc_dflags hsc_env + backendPackage DPHSeq = dphSeqPackageId + backendPackage DPHPar = dphParPackageId + vectModule :: ModGuts -> VM ModGuts vectModule guts = do - (types', fam_insts, pa_insts) <- vectTypeEnv (mg_types guts) - - let insts = map painstInstance pa_insts - fam_inst_env' = extendFamInstEnvList (mg_fam_inst_env guts) fam_insts - inst_env' = extendInstEnvList (mg_inst_env guts) insts - updGEnv (setInstEnvs inst_env' fam_inst_env') - - dicts <- mapM buildPADict pa_insts - binds' <- mapM vectTopBind (mg_binds guts) + (types', fam_insts, tc_binds) <- vectTypeEnv (mg_types guts) + + let fam_inst_env' = extendFamInstEnvList (mg_fam_inst_env guts) fam_insts + updGEnv (setFamInstEnv fam_inst_env') + + -- dicts <- mapM buildPADict pa_insts + -- workers <- mapM vectDataConWorkers pa_insts + binds' <- mapM vectTopBind (mg_binds guts) return $ guts { mg_types = types' - , mg_binds = Rec (concat dicts) : binds' - , mg_inst_env = inst_env' + , mg_binds = Rec tc_binds : binds' , mg_fam_inst_env = fam_inst_env' - , mg_insts = mg_insts guts ++ insts , mg_fam_insts = mg_fam_insts guts ++ fam_insts } @@ -81,18 +75,20 @@ vectTopBind :: CoreBind -> VM CoreBind vectTopBind b@(NonRec var expr) = do var' <- vectTopBinder var - expr' <- vectTopRhs expr + expr' <- vectTopRhs var expr hs <- takeHoisted - return . Rec $ (var, expr) : (var', expr') : hs + cexpr <- tryConvert var var' expr + return . Rec $ (var, cexpr) : (var', expr') : hs `orElseV` return b vectTopBind b@(Rec bs) = do vars' <- mapM vectTopBinder vars - exprs' <- mapM vectTopRhs exprs + exprs' <- zipWithM vectTopRhs vars exprs hs <- takeHoisted - return . Rec $ bs ++ zip vars' exprs' ++ hs + cexprs <- sequence $ zipWith3 tryConvert vars vars' exprs + return . Rec $ zip vars cexprs ++ zip vars' exprs' ++ hs `orElseV` return b where @@ -101,19 +97,21 @@ vectTopBind b@(Rec bs) vectTopBinder :: Var -> VM Var vectTopBinder var = do - vty <- vectType (idType var) - name <- cloneName mkVectOcc (getName var) - let var' | isExportedId var = Id.mkExportedLocalId name vty - | otherwise = Id.mkLocalId name vty + vty <- vectType (idType var) + var' <- cloneId mkVectOcc var vty defGlobalVar var var' return var' - -vectTopRhs :: CoreExpr -> VM CoreExpr -vectTopRhs expr + +vectTopRhs :: Var -> CoreExpr -> VM CoreExpr +vectTopRhs var expr = do - lc <- newLocalVar FSLIT("lc") intPrimTy closedV . liftM vectorised - $ vectPolyExpr lc (freeVars expr) + . inBind var + $ vectPolyExpr (freeVars expr) + +tryConvert :: Var -> Var -> CoreExpr -> VM CoreExpr +tryConvert var vect_var rhs + = fromVect (idType var) (Var vect_var) `orElseV` return rhs -- ---------------------------------------------------------------------------- -- Bindings @@ -121,8 +119,7 @@ vectTopRhs expr vectBndr :: Var -> VM VVar vectBndr v = do - vty <- vectType (idType v) - lty <- mkPArrayType vty + (vty, lty) <- vectAndLiftType (idType v) let vv = v `Id.setIdType` vty lv = v `Id.setIdType` lty updLEnv (mapTo vv lv) @@ -130,6 +127,16 @@ vectBndr v where mapTo vv lv env = env { local_vars = extendVarEnv (local_vars env) v (vv, lv) } +vectBndrNew :: Var -> FastString -> VM VVar +vectBndrNew v fs + = do + vty <- vectType (idType v) + vv <- newLocalVVar fs vty + updLEnv (upd vv) + return vv + where + upd vv env = env { local_vars = extendVarEnv (local_vars env) v vv } + vectBndrIn :: Var -> VM a -> VM (VVar, a) vectBndrIn v p = localV @@ -138,6 +145,14 @@ vectBndrIn v p x <- p return (vv, x) +vectBndrNewIn :: Var -> FastString -> VM a -> VM (VVar, a) +vectBndrNewIn v fs p + = localV + $ do + vv <- vectBndrNew v fs + x <- p + return (vv, x) + vectBndrsIn :: [Var] -> VM a -> VM ([VVar], a) vectBndrsIn vs p = localV @@ -149,30 +164,19 @@ vectBndrsIn vs p -- ---------------------------------------------------------------------------- -- Expressions -capply :: VExpr -> VExpr -> VM VExpr -capply (vfn, lfn) (varg, larg) - = do - apply <- builtin applyClosureVar - applyP <- builtin applyClosurePVar - return (mkApps (Var apply) [Type arg_ty, Type res_ty, vfn, varg], - mkApps (Var applyP) [Type arg_ty, Type res_ty, lfn, larg]) - where - fn_ty = exprType vfn - (arg_ty, res_ty) = splitClosureTy fn_ty - -vectVar :: Var -> Var -> VM VExpr -vectVar lc v +vectVar :: Var -> VM VExpr +vectVar v = do r <- lookupVar v case r of Local (vv,lv) -> return (Var vv, Var lv) Global vv -> do let vexpr = Var vv - lexpr <- replicatePA vexpr (Var lc) + lexpr <- liftPA vexpr return (vexpr, lexpr) -vectPolyVar :: Var -> Var -> [Type] -> VM VExpr -vectPolyVar lc v tys +vectPolyVar :: Var -> [Type] -> VM VExpr +vectPolyVar v tys = do vtys <- mapM vectType tys r <- lookupVar v @@ -181,75 +185,100 @@ vectPolyVar lc v tys (polyApply (Var lv) vtys) Global poly -> do vexpr <- polyApply (Var poly) vtys - lexpr <- replicatePA vexpr (Var lc) + lexpr <- liftPA vexpr return (vexpr, lexpr) -vectLiteral :: Var -> Literal -> VM VExpr -vectLiteral lc lit +vectLiteral :: Literal -> VM VExpr +vectLiteral lit = do - lexpr <- replicatePA (Lit lit) (Var lc) + lexpr <- liftPA (Lit lit) return (Lit lit, lexpr) -vectPolyExpr :: Var -> CoreExprWithFVs -> VM VExpr -vectPolyExpr lc expr +vectPolyExpr :: CoreExprWithFVs -> VM VExpr +vectPolyExpr (_, AnnNote note expr) + = liftM (vNote note) $ vectPolyExpr expr +vectPolyExpr expr = polyAbstract tvs $ \abstract -> - -- FIXME: shadowing (tvs in lc) do - mono' <- vectExpr lc mono + mono' <- vectExpr mono return $ mapVect abstract mono' where - (tvs, mono) = collectAnnTypeBinders expr - -vectExpr :: Var -> CoreExprWithFVs -> VM VExpr -vectExpr lc (_, AnnType ty) + (tvs, mono) = collectAnnTypeBinders expr + +vectExpr :: CoreExprWithFVs -> VM VExpr +vectExpr (_, AnnType ty) = liftM vType (vectType ty) -vectExpr lc (_, AnnVar v) = vectVar lc v +vectExpr (_, AnnVar v) = vectVar v -vectExpr lc (_, AnnLit lit) = vectLiteral lc lit +vectExpr (_, AnnLit lit) = vectLiteral lit -vectExpr lc (_, AnnNote note expr) - = liftM (vNote note) (vectExpr lc expr) +vectExpr (_, AnnNote note expr) + = liftM (vNote note) (vectExpr expr) -vectExpr lc e@(_, AnnApp _ arg) +vectExpr e@(_, AnnApp _ arg) | isAnnTypeArg arg - = vectTyAppExpr lc fn tys + = vectTyAppExpr fn tys where (fn, tys) = collectAnnTypeArgs e -vectExpr lc (_, AnnApp fn arg) +vectExpr (_, AnnApp (_, AnnVar v) (_, AnnLit lit)) + | Just con <- isDataConId_maybe v + , is_special_con con + = do + let vexpr = App (Var v) (Lit lit) + lexpr <- liftPA vexpr + return (vexpr, lexpr) + where + is_special_con con = con `elem` [intDataCon, floatDataCon, doubleDataCon] + + +vectExpr (_, AnnApp fn arg) = do - fn' <- vectExpr lc fn - arg' <- vectExpr lc arg - capply fn' arg' + arg_ty' <- vectType arg_ty + res_ty' <- vectType res_ty + fn' <- vectExpr fn + arg' <- vectExpr arg + mkClosureApp arg_ty' res_ty' fn' arg' + where + (arg_ty, res_ty) = splitFunTy . exprType $ deAnnotate fn -vectExpr lc (_, AnnCase expr bndr ty alts) - = panic "vectExpr: case" +vectExpr (_, AnnCase scrut bndr ty alts) + | Just (tycon, ty_args) <- splitTyConApp_maybe scrut_ty + , isAlgTyCon tycon + = vectAlgCase tycon ty_args scrut bndr ty alts + where + scrut_ty = exprType (deAnnotate scrut) -vectExpr lc (_, AnnLet (AnnNonRec bndr rhs) body) +vectExpr (_, AnnLet (AnnNonRec bndr rhs) body) = do - vrhs <- vectPolyExpr lc rhs - (vbndr, vbody) <- vectBndrIn bndr (vectExpr lc body) + vrhs <- localV . inBind bndr $ vectPolyExpr rhs + (vbndr, vbody) <- vectBndrIn bndr (vectExpr body) return $ vLet (vNonRec vbndr vrhs) vbody -vectExpr lc (_, AnnLet (AnnRec bs) body) +vectExpr (_, AnnLet (AnnRec bs) body) = do (vbndrs, (vrhss, vbody)) <- vectBndrsIn bndrs $ liftM2 (,) - (mapM (vectExpr lc) rhss) - (vectPolyExpr lc body) + (zipWithM vect_rhs bndrs rhss) + (vectPolyExpr body) return $ vLet (vRec vbndrs vrhss) vbody where (bndrs, rhss) = unzip bs -vectExpr lc e@(fvs, AnnLam bndr _) - | not (isId bndr) = pprPanic "vectExpr" (ppr $ deAnnotate e) - | otherwise = vectLam lc fvs bs body + vect_rhs bndr rhs = localV + . inBind bndr + $ vectExpr rhs + +vectExpr e@(fvs, AnnLam bndr _) + | isId bndr = vectLam fvs bs body where (bs,body) = collectAnnValBinders e -vectLam :: Var -> VarSet -> [Var] -> CoreExprWithFVs -> VM VExpr -vectLam lc fvs bs body +vectExpr e = traceNoV "vectExpr: can't vectorise" (ppr $ deAnnotate e) + +vectLam :: VarSet -> [Var] -> CoreExprWithFVs -> VM VExpr +vectLam fvs bs body = do tyvars <- localTyVars (vs, vvs) <- readLEnv $ \env -> @@ -259,15 +288,181 @@ vectLam lc fvs bs body arg_tys <- mapM (vectType . idType) bs res_ty <- vectType (exprType $ deAnnotate body) - buildClosures tyvars lc vvs arg_tys res_ty - . hoistPolyVExpr FSLIT("fn") tyvars + buildClosures tyvars vvs arg_tys res_ty + . hoistPolyVExpr tyvars $ do - new_lc <- newLocalVar FSLIT("lc") intPrimTy + lc <- builtin liftingContext (vbndrs, vbody) <- vectBndrsIn (vs ++ bs) - (vectExpr new_lc body) - return $ vLams new_lc vbndrs vbody - -vectTyAppExpr :: Var -> CoreExprWithFVs -> [Type] -> VM (CoreExpr, CoreExpr) -vectTyAppExpr lc (_, AnnVar v) tys = vectPolyVar lc v tys -vectTyAppExpr lc e tys = pprPanic "vectTyAppExpr" (ppr $ deAnnotate e) + (vectExpr body) + return $ vLams lc vbndrs vbody + +vectTyAppExpr :: CoreExprWithFVs -> [Type] -> VM VExpr +vectTyAppExpr (_, AnnVar v) tys = vectPolyVar v tys +vectTyAppExpr e _ = traceNoV "vectTyAppExpr: can't vectorise" (ppr $ deAnnotate e) + +-- We convert +-- +-- case e :: t of v { ... } +-- +-- to +-- +-- V: let v' = e in case v' of _ { ... } +-- L: let v' = e in case v' `cast` ... of _ { ... } +-- +-- When lifting, we have to do it this way because v must have the type +-- [:V(T):] but the scrutinee must be cast to the representation type. We also +-- have to handle the case where v is a wild var correctly. +-- + +-- FIXME: this is too lazy +vectAlgCase :: TyCon -> [Type] -> CoreExprWithFVs -> Var -> Type + -> [(AltCon, [Var], CoreExprWithFVs)] + -> VM VExpr +vectAlgCase _tycon _ty_args scrut bndr ty [(DEFAULT, [], body)] + = do + vscrut <- vectExpr scrut + (vty, lty) <- vectAndLiftType ty + (vbndr, vbody) <- vectBndrIn bndr (vectExpr body) + return $ vCaseDEFAULT vscrut vbndr vty lty vbody + +vectAlgCase _tycon _ty_args scrut bndr ty [(DataAlt _, [], body)] + = do + vscrut <- vectExpr scrut + (vty, lty) <- vectAndLiftType ty + (vbndr, vbody) <- vectBndrIn bndr (vectExpr body) + return $ vCaseDEFAULT vscrut vbndr vty lty vbody + +vectAlgCase tycon _ty_args scrut bndr ty [(DataAlt dc, bndrs, body)] + = do + vect_tc <- maybeV (lookupTyCon tycon) + (vty, lty) <- vectAndLiftType ty + vexpr <- vectExpr scrut + (vbndr, (vbndrs, vbody)) <- vect_scrut_bndr + . vectBndrsIn bndrs + $ vectExpr body + + (vscrut, arr_tc, _arg_tys) <- mkVScrut (vVar vbndr) + vect_dc <- maybeV (lookupDataCon dc) + let [arr_dc] = tyConDataCons arr_tc + repr <- mkRepr vect_tc + shape_bndrs <- arrShapeVars repr + return . vLet (vNonRec vbndr vexpr) + $ vCaseProd vscrut vty lty vect_dc arr_dc shape_bndrs vbndrs vbody + where + vect_scrut_bndr | isDeadBinder bndr = vectBndrNewIn bndr (fsLit "scrut") + | otherwise = vectBndrIn bndr + +vectAlgCase tycon _ty_args scrut bndr ty alts + = do + vect_tc <- maybeV (lookupTyCon tycon) + (vty, lty) <- vectAndLiftType ty + repr <- mkRepr vect_tc + shape_bndrs <- arrShapeVars repr + (len, sel, indices) <- arrSelector repr (map Var shape_bndrs) + + (vbndr, valts) <- vect_scrut_bndr $ mapM (proc_alt sel vty lty) alts' + let (vect_dcs, vect_bndrss, lift_bndrss, vbodies) = unzip4 valts + + vexpr <- vectExpr scrut + (vscrut, arr_tc, _arg_tys) <- mkVScrut (vVar vbndr) + let [arr_dc] = tyConDataCons arr_tc + + let (vect_scrut, lift_scrut) = vscrut + (vect_bodies, lift_bodies) = unzip vbodies + + vdummy <- newDummyVar (exprType vect_scrut) + ldummy <- newDummyVar (exprType lift_scrut) + let vect_case = Case vect_scrut vdummy vty + (zipWith3 mk_vect_alt vect_dcs vect_bndrss vect_bodies) + + lbody <- combinePA vty len sel indices lift_bodies + let lift_case = Case lift_scrut ldummy lty + [(DataAlt arr_dc, shape_bndrs ++ concat lift_bndrss, + lbody)] + + return . vLet (vNonRec vbndr vexpr) + $ (vect_case, lift_case) + where + vect_scrut_bndr | isDeadBinder bndr = vectBndrNewIn bndr (fsLit "scrut") + | otherwise = vectBndrIn bndr + + alts' = sortBy (\(alt1, _, _) (alt2, _, _) -> cmp alt1 alt2) alts + + cmp (DataAlt dc1) (DataAlt dc2) = dataConTag dc1 `compare` dataConTag dc2 + cmp DEFAULT DEFAULT = EQ + cmp DEFAULT _ = LT + cmp _ DEFAULT = GT + cmp _ _ = panic "vectAlgCase/cmp" + + proc_alt sel vty lty (DataAlt dc, bndrs, body) + = do + vect_dc <- maybeV (lookupDataCon dc) + let tag = mkDataConTag vect_dc + fvs = freeVarsOf body `delVarSetList` bndrs + (vect_bndrs, lift_bndrs, vbody) + <- vect_alt_bndrs bndrs + $ \len -> packLiftingContext len sel tag fvs vty lty + $ vectExpr body + + return (vect_dc, vect_bndrs, lift_bndrs, vbody) + proc_alt _ _ _ _ = panic "vectAlgCase/proc_alt" + + vect_alt_bndrs [] p + = do + void_tc <- builtin voidTyCon + let void_ty = mkTyConApp void_tc [] + arr_ty <- mkPArrayType void_ty + bndr <- newLocalVar (fsLit "voids") arr_ty + len <- lengthPA void_ty (Var bndr) + e <- p len + return ([], [bndr], e) + + vect_alt_bndrs bndrs p + = localV + $ do + vbndrs <- mapM vectBndr bndrs + let (vect_bndrs, lift_bndrs) = unzip vbndrs + vv : _ = vect_bndrs + lv : _ = lift_bndrs + len <- lengthPA (idType vv) (Var lv) + e <- p len + return (vect_bndrs, lift_bndrs, e) + + mk_vect_alt vect_dc bndrs body = (DataAlt vect_dc, bndrs, body) + +packLiftingContext :: CoreExpr -> CoreExpr -> CoreExpr -> VarSet + -> Type -> Type -> VM VExpr -> VM VExpr +packLiftingContext len shape tag fvs vty lty p + = do + select <- builtin selectPAIntPrimVar + let sel_expr = mkApps (Var select) [shape, tag] + sel_var <- newLocalVar (fsLit "sel#") (exprType sel_expr) + lc_var <- builtin liftingContext + localV $ + do + bnds <- mapM (packFreeVar (Var lc_var) (Var sel_var)) + . filter isLocalId + $ varSetElems fvs + (vexpr, lexpr) <- p + empty <- emptyPA vty + return (vexpr, Let (NonRec sel_var sel_expr) + $ Case len lc_var lty + [(DEFAULT, [], mkLets (concat bnds) lexpr), + (LitAlt (mkMachInt 0), [], empty)]) + +packFreeVar :: CoreExpr -> CoreExpr -> Var -> VM [CoreBind] +packFreeVar len sel v + = do + r <- lookupVar v + case r of + Local (vv,lv) -> + do + lv' <- cloneVar lv + expr <- packPA (idType vv) (Var lv) len sel + updLEnv (upd vv lv') + return [(NonRec lv' expr)] + + _ -> return [] + where + upd vv lv' env = env { local_vars = extendVarEnv (local_vars env) v (vv, lv') }