X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fvectorise%2FVectorise.hs;h=83f048046026d79614da646eccc8c4ee8037a6cd;hb=d23792e484bb086ec45f13527b7cdb34ebcaba4c;hp=fa771d215a80a05b34a29ef99c9d0c5cdd909017;hpb=63f16bfb20d33a841b57e25b664e82bb5e5969ef;p=ghc-hetmet.git

diff --git a/compiler/vectorise/Vectorise.hs b/compiler/vectorise/Vectorise.hs
index fa771d2..83f0480 100644
--- a/compiler/vectorise/Vectorise.hs
+++ b/compiler/vectorise/Vectorise.hs
@@ -122,7 +122,7 @@ vectBndr v
       updLEnv (mapTo vv lv)
       return (vv, lv)
   where
-    mapTo vv lv env = env { local_vars = extendVarEnv (local_vars env) v (Var vv, Var lv) }
+    mapTo vv lv env = env { local_vars = extendVarEnv (local_vars env) v (vv, lv) }
 
 vectBndrIn :: Var -> VM a -> VM (Var, Var, a)
 vectBndrIn v p
@@ -159,28 +159,28 @@ vectVar lc v
   = do
       r <- lookupVar v
       case r of
-        Local es     -> return es
-        Global vexpr -> do
-                          lexpr <- replicatePA vexpr lc
-                          return (vexpr, lexpr)
+        Local (vv,lv) -> return (Var vv, Var lv)
+        Global vv     -> do
+                           let vexpr = Var vv
+                           lexpr <- replicatePA vexpr lc
+                           return (vexpr, lexpr)
 
 vectPolyVar :: CoreExpr -> Var -> [Type] -> VM (CoreExpr, CoreExpr)
 vectPolyVar lc v tys
   = do
+      vtys <- mapM vectType tys
       r <- lookupVar v
       case r of
-        Local (vexpr, lexpr) -> liftM2 (,) (mk_app vexpr) (mk_app lexpr)
-        Global poly          -> do
-                                  vexpr <- mk_app poly
-                                  lexpr <- replicatePA vexpr lc
-                                  return (vexpr, lexpr)
-  where
-    mk_app e = applyToTypes e =<< mapM vectType tys
+        Local (vv, lv) -> liftM2 (,) (polyApply (Var vv) vtys)
+                                     (polyApply (Var lv) vtys)
+        Global poly    -> do
+                            vexpr <- polyApply (Var poly) vtys
+                            lexpr <- replicatePA vexpr lc
+                            return (vexpr, lexpr)
 
 vectPolyExpr :: CoreExpr -> CoreExprWithFVs -> VM (CoreExpr, CoreExpr)
 vectPolyExpr lc expr
-  = localV
-  . abstractOverTyVars tvs $ \mk_lams ->
+  = polyAbstract tvs $ \mk_lams ->
     -- FIXME: shadowing (tvs in lc)
     do
       (vmono, lmono) <- vectExpr lc mono
@@ -264,8 +264,8 @@ vectExpr lc (fvs, AnnLam bndr body)
       res_ty <- vectType (exprType $ deAnnotate body)
 
       -- FIXME: move the functions to the top level
-      mono_vfn <- applyToTypes (Var vfn_var) (mkTyVarTys tyvars)
-      mono_lfn <- applyToTypes (Var lfn_var) (mkTyVarTys tyvars)
+      mono_vfn <- polyApply (Var vfn_var) (mkTyVarTys tyvars)
+      mono_lfn <- polyApply (Var lfn_var) (mkTyVarTys tyvars)
 
       mk_clo <- builtin mkClosureVar
       mk_cloP <- builtin mkClosurePVar
@@ -277,7 +277,6 @@ vectExpr lc (fvs, AnnLam bndr body)
                              `mkApps`   [pa_dict, mono_vfn, mono_lfn, lenv]
 
       return (vclo, lclo)
-       
 
 data CEnvInfo = CEnvInfo {
                cenv_vars         :: [Var]
@@ -295,8 +294,8 @@ mkCEnvInfo fvs arg body
       locals <- readLEnv local_vars
       let
           (vars, vals) = unzip
-                 [(var, val) | var      <- varSetElems fvs
-                             , Just val <- [lookupVarEnv locals var]]
+                 [(var, (Var v, Var v')) | var      <- varSetElems fvs
+                                         , Just (v,v') <- [lookupVarEnv locals var]]
       vtys <- mapM (vectType . varType) vars
 
       (vty, repr_tycon, repr_tyargs, repr_datacon) <- mk_env_ty vtys
@@ -348,7 +347,7 @@ mkClosureFns :: CEnvInfo -> [TyVar] -> Var -> CoreExprWithFVs
              -> VM (CoreExpr, CoreExpr)
 mkClosureFns info tyvars arg body
   = closedV
-  . abstractOverTyVars tyvars
+  . polyAbstract tyvars
   $ \mk_tlams ->
   do
     (vfn, lfn) <- mkClosureMonoFns info arg body