X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fvectorise%2FVectType.hs;h=c6310544c17651273627168a98a44492b017f30f;hp=ba64d3bd05706caff6c23e3ff02304a065bf457b;hb=7fc749a43b4b6b85d234fa95d4928648259584f4;hpb=ee79af08084c320762b6b684e2ce8198395cf089 diff --git a/compiler/vectorise/VectType.hs b/compiler/vectorise/VectType.hs index ba64d3b..c631054 100644 --- a/compiler/vectorise/VectType.hs +++ b/compiler/vectorise/VectType.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 VectType ( vectTyCon, vectType, vectTypeEnv, PAInstance, buildPADict ) where @@ -26,12 +33,13 @@ import Var ( Var ) import Id ( mkWildId ) import Name ( Name, getOccName ) import NameEnv -import TysWiredIn ( unitTy, unitTyCon, intTy, intDataCon, unitDataConId ) +import TysWiredIn import TysPrim ( intPrimTy ) import Unique import UniqFM import UniqSet +import Util ( singleton ) import Digraph ( SCC(..), stronglyConnComp ) import Outputable @@ -224,8 +232,53 @@ data Repr = ProdRepr { , sum_arr_data_con :: DataCon } -mkProduct :: [Type] -> VM Repr -mkProduct tys + | IdRepr Type + + | VoidRepr { + void_tycon :: TyCon + , void_bottom :: CoreExpr + } + + | EnumRepr { + enum_tycon :: TyCon + , enum_data_con :: DataCon + , enum_arr_tycon :: TyCon + , enum_arr_data_con :: DataCon + } + +voidRepr :: VM Repr +voidRepr + = do + tycon <- builtin voidTyCon + var <- builtin voidVar + return $ VoidRepr { + void_tycon = tycon + , void_bottom = Var var + } + +enumRepr :: VM Repr +enumRepr + = do + (arr_tycon, _) <- parrayReprTyCon intTy + let [arr_data_con] = tyConDataCons arr_tycon + + return $ EnumRepr { + enum_tycon = tycon + , enum_data_con = data_con + , enum_arr_tycon = arr_tycon + , enum_arr_data_con = arr_data_con + } + where + tycon = intTyCon + data_con = intDataCon + +unboxedProductRepr :: [Type] -> VM Repr +unboxedProductRepr [] = voidRepr +unboxedProductRepr [ty] = return $ IdRepr ty +unboxedProductRepr tys = boxedProductRepr tys + +boxedProductRepr :: [Type] -> VM Repr +boxedProductRepr tys = do tycon <- builtin (prodTyCon arity) let [data_con] = tyConDataCons tycon @@ -243,9 +296,10 @@ mkProduct tys where arity = length tys -mkSum :: [Repr] -> VM Repr -mkSum [repr] = return repr -mkSum reprs +sumRepr :: [Repr] -> VM Repr +sumRepr [] = voidRepr +sumRepr [repr] = boxRepr repr +sumRepr reprs = do tycon <- builtin (sumTyCon arity) (arr_tycon, _) <- parrayReprTyCon @@ -263,34 +317,36 @@ mkSum reprs where arity = length reprs -reprProducts :: Repr -> [Repr] -reprProducts (SumRepr { sum_components = rs }) = rs -reprProducts repr = [repr] +splitSumRepr :: Repr -> [Repr] +splitSumRepr (SumRepr { sum_components = reprs }) = reprs +splitSumRepr repr = [repr] + +boxRepr :: Repr -> VM Repr +boxRepr (VoidRepr {}) = boxedProductRepr [] +boxRepr (IdRepr ty) = boxedProductRepr [ty] +boxRepr repr = return repr reprType :: Repr -> Type reprType (ProdRepr { prod_tycon = tycon, prod_components = tys }) = mkTyConApp tycon tys reprType (SumRepr { sum_tycon = tycon, sum_components = reprs }) = mkTyConApp tycon (map reprType reprs) +reprType (IdRepr ty) = ty +reprType (VoidRepr { void_tycon = tycon }) = mkTyConApp tycon [] +reprType (EnumRepr { enum_tycon = tycon }) = mkTyConApp tycon [] arrReprType :: Repr -> VM Type arrReprType = mkPArrayType . reprType -reprTys :: Repr -> [[Type]] -reprTys (SumRepr { sum_components = prods }) = map prodTys prods -reprTys prod = [prodTys prod] - -prodTys (ProdRepr { prod_components = tys }) = tys - -reprVars :: Repr -> VM [[Var]] -reprVars = mapM (mapM (newLocalVar FSLIT("r"))) . reprTys - arrShapeTys :: Repr -> VM [Type] arrShapeTys (SumRepr {}) = do int_arr <- builtin parrayIntPrimTyCon return [intPrimTy, mkTyConApp int_arr [], mkTyConApp int_arr []] -arrShapeTys repr = return [intPrimTy] +arrShapeTys (ProdRepr {}) = return [intPrimTy] +arrShapeTys (IdRepr _) = return [] +arrShapeTys (VoidRepr {}) = return [intPrimTy] +arrShapeTys (EnumRepr {}) = return [intPrimTy] arrShapeVars :: Repr -> VM [Var] arrShapeVars repr = mapM (newLocalVar FSLIT("sh")) =<< arrShapeTys repr @@ -302,29 +358,54 @@ replicateShape (SumRepr {}) len tag rep <- builtin replicatePAIntPrimVar up <- builtin upToPAIntPrimVar return [len, Var rep `mkApps` [len, tag], Var up `App` len] - -arrReprElemTys :: Repr -> [[Type]] -arrReprElemTys (SumRepr { sum_components = prods }) - = map arrProdElemTys prods -arrReprElemTys prod@(ProdRepr {}) - = [arrProdElemTys prod] - -arrProdElemTys (ProdRepr { prod_components = [] }) - = [unitTy] -arrProdElemTys (ProdRepr { prod_components = tys }) - = tys - -arrReprTys :: Repr -> VM [[Type]] -arrReprTys = mapM (mapM mkPArrayType) . arrReprElemTys +replicateShape (IdRepr _) _ _ = return [] +replicateShape (VoidRepr {}) len _ = return [len] +replicateShape (EnumRepr {}) len _ = return [len] + +emptyArrRepr :: Repr -> VM [CoreExpr] +emptyArrRepr (SumRepr { sum_components = prods }) + = liftM concat $ mapM emptyArrRepr prods +emptyArrRepr (ProdRepr { prod_components = [] }) + = return [Var unitDataConId] +emptyArrRepr (ProdRepr { prod_components = tys }) + = mapM emptyPA tys +emptyArrRepr (IdRepr ty) + = liftM singleton $ emptyPA ty +emptyArrRepr (VoidRepr { void_tycon = tycon }) + = liftM singleton $ emptyPA (mkTyConApp tycon []) +emptyArrRepr (EnumRepr { enum_tycon = tycon }) + = liftM singleton $ emptyPA (mkTyConApp tycon []) + +arrReprTys :: Repr -> VM [Type] +arrReprTys (SumRepr { sum_components = reprs }) + = liftM concat $ mapM arrReprTys reprs +arrReprTys (ProdRepr { prod_components = [] }) + = return [unitTy] +arrReprTys (ProdRepr { prod_components = tys }) + = mapM mkPArrayType tys +arrReprTys (IdRepr ty) + = liftM singleton $ mkPArrayType ty +arrReprTys (VoidRepr { void_tycon = tycon }) + = liftM singleton $ mkPArrayType (mkTyConApp tycon []) +arrReprTys (EnumRepr {}) + = liftM singleton $ mkPArrayType intPrimTy + +arrReprTys' :: Repr -> VM [[Type]] +arrReprTys' (SumRepr { sum_components = reprs }) + = mapM arrReprTys reprs +arrReprTys' repr = liftM singleton $ arrReprTys repr arrReprVars :: Repr -> VM [[Var]] arrReprVars repr - = mapM (mapM (newLocalVar FSLIT("rs"))) =<< arrReprTys repr + = mapM (mapM (newLocalVar FSLIT("rs"))) =<< arrReprTys' repr mkRepr :: TyCon -> VM Repr mkRepr vect_tc - = mkSum - =<< mapM mkProduct (map dataConRepArgTys $ tyConDataCons vect_tc) + | [tys] <- rep_tys = boxedProductRepr tys + | all null rep_tys = enumRepr + | otherwise = sumRepr =<< mapM unboxedProductRepr rep_tys + where + rep_tys = map dataConRepArgTys $ tyConDataCons vect_tc buildPReprType :: TyCon -> VM Type buildPReprType = liftM reprType . mkRepr @@ -350,7 +431,7 @@ buildToPRepr repr vect_tc prepr_tc _ , sum_tycon = tycon }) expr = do - (vars, bodies) <- mapAndUnzipM prod_alt prods + (vars, bodies) <- mapAndUnzipM to_unboxed prods return . Case expr (mkWildId (exprType expr)) res_ty $ zipWith4 mk_alt cons vars (tyConDataCons tycon) bodies where @@ -359,18 +440,33 @@ buildToPRepr repr vect_tc prepr_tc _ ty_args = map (Type . reprType) prods + to_repr (EnumRepr { enum_data_con = data_con }) expr + = return . Case expr (mkWildId (exprType expr)) res_ty + $ map mk_alt cons + where + mk_alt con = (DataAlt con, [], mkConApp data_con [mkDataConTag con]) + to_repr prod expr = do - (vars, body) <- prod_alt prod + (vars, body) <- to_unboxed prod return $ Case expr (mkWildId (exprType expr)) res_ty [(DataAlt con, vars, body)] - prod_alt (ProdRepr { prod_components = tys - , prod_data_con = data_con }) + to_unboxed (ProdRepr { prod_components = tys + , prod_data_con = data_con }) = do vars <- mapM (newLocalVar FSLIT("r")) tys return (vars, mkConApp data_con (map Type tys ++ map Var vars)) + to_unboxed (IdRepr ty) + = do + var <- newLocalVar FSLIT("y") ty + return ([var], Var var) + + to_unboxed (VoidRepr { void_bottom = bottom }) + = return ([], bottom) + + buildFromPRepr :: Repr -> TyCon -> TyCon -> TyCon -> VM CoreExpr buildFromPRepr repr vect_tc prepr_tc _ = do @@ -392,17 +488,34 @@ buildFromPRepr repr vect_tc prepr_tc _ expr = do vars <- mapM (newLocalVar FSLIT("x")) (map reprType prods) - bodies <- sequence . zipWith3 from_prod prods cons + bodies <- sequence . zipWith3 from_unboxed prods cons $ map Var vars return . Case expr (mkWildId (reprType repr)) res_ty $ zipWith3 sum_alt (tyConDataCons tycon) vars bodies where sum_alt data_con var body = (DataAlt data_con, [var], body) - from_repr repr expr = from_prod repr con expr + from_repr repr@(EnumRepr { enum_data_con = data_con }) expr + = do + var <- newLocalVar FSLIT("n") intPrimTy - from_prod prod@(ProdRepr { prod_components = tys - , prod_data_con = data_con }) + let res = Case (Var var) (mkWildId intPrimTy) res_ty + $ (DEFAULT, [], error_expr) + : zipWith mk_alt (tyConDataCons vect_tc) cons + + return $ Case expr (mkWildId (reprType repr)) res_ty + [(DataAlt data_con, [var], res)] + where + mk_alt data_con con = (LitAlt (mkDataConTagLit data_con), [], con) + + error_expr = mkRuntimeErrorApp rUNTIME_ERROR_ID res_ty + . showSDoc + $ sep [text "Invalid NDP representation of", ppr vect_tc] + + from_repr repr expr = from_unboxed repr con expr + + from_unboxed prod@(ProdRepr { prod_components = tys + , prod_data_con = data_con }) con expr = do @@ -410,6 +523,12 @@ buildFromPRepr repr vect_tc prepr_tc _ return $ Case expr (mkWildId (reprType prod)) res_ty [(DataAlt data_con, vars, con `mkVarApps` vars)] + from_unboxed (IdRepr _) con expr + = return $ con `App` expr + + from_unboxed (VoidRepr {}) con expr + = return con + buildToArrPRepr :: Repr -> TyCon -> TyCon -> TyCon -> VM CoreExpr buildToArrPRepr repr vect_tc prepr_tc arr_tc = do @@ -448,7 +567,7 @@ buildToArrPRepr repr vect_tc prepr_tc arr_tc , sum_arr_tycon = tycon , sum_arr_data_con = data_con }) = do - exprs <- zipWithM (to_prod len_var) repr_vars prods + exprs <- zipWithM to_prod repr_vars prods return . wrapFamInstBody tycon tys . mkConApp data_con @@ -456,16 +575,35 @@ buildToArrPRepr repr vect_tc prepr_tc arr_tc where tys = map reprType prods - to_repr [len_var] [repr_vars] prod = to_prod len_var repr_vars prod - - to_prod len_var - repr_vars + to_repr [len_var] + [repr_vars] (ProdRepr { prod_components = tys , prod_arr_tycon = tycon , prod_arr_data_con = data_con }) - = return . wrapFamInstBody tycon tys - . mkConApp data_con - $ map Type tys ++ map Var (len_var : repr_vars) + = return . wrapFamInstBody tycon tys + . mkConApp data_con + $ map Type tys ++ map Var (len_var : repr_vars) + + to_repr [len_var] + [[repr_var]] + (EnumRepr { enum_arr_tycon = tycon + , enum_arr_data_con = data_con }) + = return . wrapFamInstBody tycon [] + $ mkConApp data_con [Var len_var, Var repr_var] + + to_prod repr_vars@(r : _) + (ProdRepr { prod_components = tys@(ty : _) + , prod_arr_tycon = tycon + , prod_arr_data_con = data_con }) + = do + len <- lengthPA ty (Var r) + return . wrapFamInstBody tycon tys + . mkConApp data_con + $ map Type tys ++ len : map Var repr_vars + + to_prod [var] (IdRepr ty) = return (Var var) + to_prod [var] (VoidRepr {}) = return (Var var) + buildFromArrPRepr :: Repr -> TyCon -> TyCon -> TyCon -> VM CoreExpr buildFromArrPRepr repr vect_tc prepr_tc arr_tc @@ -544,7 +682,39 @@ buildFromArrPRepr repr vect_tc prepr_tc arr_tc return $ Case scrut (mkWildId scrut_ty) res_ty [(DataAlt data_con, shape_vars ++ repr_vars, body)] + from_prod (EnumRepr { enum_arr_tycon = tycon + , enum_arr_data_con = data_con }) + expr + [len_var] + [repr_var] + res_ty + body + = let scrut = unwrapFamInstScrut tycon [] expr + scrut_ty = mkTyConApp tycon [] + in + return $ Case scrut (mkWildId scrut_ty) res_ty + [(DataAlt data_con, [len_var, repr_var], body)] + + from_prod (IdRepr ty) + expr + shape_vars + [repr_var] + res_ty + body + = return $ Let (NonRec repr_var expr) body + + from_prod (VoidRepr {}) + expr + shape_vars + [repr_var] + res_ty + body + = return $ Let (NonRec repr_var expr) body + buildPRDictRepr :: Repr -> VM CoreExpr +buildPRDictRepr (VoidRepr { void_tycon = tycon }) + = prDFunOfTyCon tycon +buildPRDictRepr (IdRepr ty) = mkPR ty buildPRDictRepr (ProdRepr { prod_components = tys , prod_tycon = tycon @@ -562,6 +732,9 @@ buildPRDictRepr (SumRepr { dfun <- prDFunOfTyCon tycon return $ dfun `mkTyApps` map reprType prods `mkApps` prs +buildPRDictRepr (EnumRepr { enum_tycon = tycon }) + = prDFunOfTyCon tycon + buildPRDict :: Repr -> TyCon -> TyCon -> TyCon -> VM CoreExpr buildPRDict repr vect_tc prepr_tc _ = do @@ -614,7 +787,7 @@ buildPArrayDataCon orig_name vect_tc repr_tc shape_tys <- arrShapeTys repr repr_tys <- arrReprTys repr - let tys = shape_tys ++ concat repr_tys + let tys = shape_tys ++ repr_tys liftDs $ buildDataCon dc_name False -- not infix @@ -655,8 +828,8 @@ vectDataConWorkers repr orig_tc vect_tc arr_tc . zipWith3 def_worker (tyConDataCons orig_tc) rep_tys $ zipWith4 mk_data_con (tyConDataCons vect_tc) rep_tys - (inits arr_tys) - (tail $ tails arr_tys) + (inits reprs) + (tail $ tails reprs) mapM_ (uncurry hoistBinding) bs where tyvars = tyConTyVars vect_tc @@ -666,18 +839,16 @@ vectDataConWorkers repr orig_tc vect_tc arr_tc res_ty = mkTyConApp vect_tc var_tys rep_tys = map dataConRepArgTys $ tyConDataCons vect_tc - arr_tys = arrReprElemTys repr + reprs = splitSumRepr repr [arr_dc] = tyConDataCons arr_tc mk_data_con con tys pre post = liftM2 (,) (vect_data_con con) - (lift_data_con tys (concat pre) - (concat post) - (mkDataConTag con)) + (lift_data_con tys pre post (mkDataConTag con)) vect_data_con con = return $ mkConApp con ty_args - lift_data_con tys pre_tys post_tys tag + lift_data_con tys pre_reprs post_reprs tag = do len <- builtin liftingContext args <- mapM (newLocalVar FSLIT("xs")) @@ -686,8 +857,8 @@ vectDataConWorkers repr orig_tc vect_tc arr_tc shape <- replicateShape repr (Var len) tag repr <- mk_arr_repr (Var len) (map Var args) - pre <- mapM emptyPA pre_tys - post <- mapM emptyPA post_tys + pre <- liftM concat $ mapM emptyArrRepr pre_reprs + post <- liftM concat $ mapM emptyArrRepr post_reprs return . mkLams (len : args) . wrapFamInstBody arr_tc var_tys