X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fvectorise%2FVectType.hs;h=d5a1ba1281231a22ac6bb58bfd080948ee0eac4a;hp=dd77c126bed542be797ad64ff4d11adbc9ebe3a1;hb=6c63c674e5fa0ec8a445d9947584aaf6c2d3ac52;hpb=4ee5e14f8b27ec88d31a8a61c987a72eebe52c70

diff --git a/compiler/vectorise/VectType.hs b/compiler/vectorise/VectType.hs
index dd77c12..d5a1ba1 100644
--- a/compiler/vectorise/VectType.hs
+++ b/compiler/vectorise/VectType.hs
@@ -11,10 +11,13 @@ import DataCon
 import TyCon
 import Type
 import TypeRep
+import Coercion
 import OccName
 import MkId
 import BasicTypes        ( StrictnessMark(..), boolToRecFlag )
+import Name              ( Name )
 import NameEnv
+import TysWiredIn        ( intTy )
 
 import Unique
 import UniqFM
@@ -23,7 +26,7 @@ import Digraph           ( SCC(..), stronglyConnComp )
 
 import Outputable
 
-import Control.Monad  ( liftM2, zipWithM_ )
+import Control.Monad  ( liftM2, zipWithM, zipWithM_ )
 
 -- ----------------------------------------------------------------------------
 -- Types
@@ -71,7 +74,10 @@ vectTypeEnv env
           keep_dcs             = concatMap tyConDataCons keep_tcs
       zipWithM_ defTyCon   keep_tcs keep_tcs
       zipWithM_ defDataCon keep_dcs keep_dcs
-      new_tcs <- vectTyConDecls conv_tcs
+      vect_tcs <- vectTyConDecls conv_tcs
+      parr_tcs1 <- mapM (\tc -> buildPArrayTyCon (tyConName tc) tc) keep_tcs
+      parr_tcs2 <- zipWithM (buildPArrayTyCon . tyConName) conv_tcs vect_tcs
+      let new_tcs = vect_tcs ++ parr_tcs1 ++ parr_tcs2
       return $ extendTypeEnvList env
                  (map ATyCon new_tcs ++ [ADataCon dc | tc <- new_tcs
                                                      , dc <- tyConDataCons tc])
@@ -139,7 +145,7 @@ vectDataCon dc
       arg_tys  <- mapM vectType rep_arg_tys
       wrk_name <- cloneName mkDataConWorkerOcc name'
 
-      let ids      = mkDataConIds (panic "vectDataCon: wrapped id")
+      let ids      = mkDataConIds (panic "vectDataCon: wrapper id")
                                   wrk_name
                                   data_con
           data_con = mkDataCon name'
@@ -158,9 +164,84 @@ vectDataCon dc
   where
     name        = dataConName dc
     univ_tvs    = dataConUnivTyVars dc
-    rep_arg_tys = dataConOrigArgTys dc
+    rep_arg_tys = dataConRepArgTys dc
     tycon       = dataConTyCon dc
 
+buildPArrayTyCon :: Name -> TyCon -> VM TyCon
+buildPArrayTyCon orig_name vect_tc = fixV $ \repr_tc ->
+  do
+    name'  <- cloneName mkPArrayTyConOcc orig_name
+    parent <- buildPArrayParentInfo orig_name vect_tc repr_tc
+    rhs    <- buildPArrayTyConRhs orig_name vect_tc repr_tc
+
+    return $ mkAlgTyCon name'
+                        kind
+                        tyvars
+                        []              -- no stupid theta
+                        rhs
+                        []              -- no selector ids
+                        parent
+                        rec_flag        -- FIXME: is this ok?
+                        False           -- FIXME: no generics
+                        False           -- not GADT syntax
+  where
+    name   = tyConName vect_tc
+    kind   = tyConKind vect_tc
+    tyvars = tyConTyVars vect_tc
+    rec_flag = boolToRecFlag (isRecursiveTyCon vect_tc)
+    
+
+buildPArrayParentInfo :: Name -> TyCon -> TyCon -> VM TyConParent
+buildPArrayParentInfo orig_name vect_tc repr_tc
+  = do
+      parray_tc <- builtin parrayTyCon
+      co_name <- cloneName mkInstTyCoOcc orig_name
+
+      let inst_tys = [mkTyConApp vect_tc (map mkTyVarTy tyvars)]
+
+      return . FamilyTyCon parray_tc inst_tys
+             $ mkFamInstCoercion co_name
+                                 tyvars
+                                 parray_tc
+                                 inst_tys
+                                 repr_tc
+  where
+    tyvars = tyConTyVars vect_tc
+
+buildPArrayTyConRhs :: Name -> TyCon -> TyCon -> VM AlgTyConRhs
+buildPArrayTyConRhs orig_name vect_tc repr_tc
+  = do
+      data_con <- buildPArrayDataCon orig_name vect_tc repr_tc
+      return $ DataTyCon { data_cons = [data_con], is_enum = False }
+
+buildPArrayDataCon :: Name -> TyCon -> TyCon -> VM DataCon
+buildPArrayDataCon orig_name vect_tc repr_tc
+  = do
+      dc_name  <- cloneName mkPArrayDataConOcc orig_name
+      shape_ty <- mkPArrayType intTy   -- FIXME: we want to unbox this!
+      repr_tys <- mapM mkPArrayType types
+      wrk_name <- cloneName mkDataConWorkerOcc  dc_name
+      wrp_name <- cloneName mkDataConWrapperOcc dc_name
+
+      let ids      = mkDataConIds wrp_name wrk_name data_con
+          data_con = mkDataCon dc_name
+                               False
+                               (MarkedStrict : map (const NotMarkedStrict) repr_tys)
+                               []
+                               (tyConTyVars vect_tc)
+                               []
+                               []
+                               []
+                               (shape_ty : repr_tys)
+                               repr_tc
+                               []
+                               ids
+
+      return data_con
+  where
+    types = [ty | dc <- tyConDataCons vect_tc
+                , ty <- dataConRepArgTys dc]
+
 -- | Split the given tycons into two sets depending on whether they have to be
 -- converted (first list) or not (second list). The first argument contains
 -- information about the conversion status of external tycons:
@@ -209,7 +290,13 @@ tyConsOfType :: Type -> UniqSet TyCon
 tyConsOfType ty
   | Just ty' <- coreView ty    = tyConsOfType ty'
 tyConsOfType (TyVarTy v)       = emptyUniqSet
-tyConsOfType (TyConApp tc tys) = tyConsOfTypes tys `addOneToUniqSet` tc
+tyConsOfType (TyConApp tc tys) = extend (tyConsOfTypes tys)
+  where
+    extend | isUnLiftedTyCon tc
+           || isTupleTyCon   tc = id
+
+           | otherwise          = (`addOneToUniqSet` tc)
+
 tyConsOfType (AppTy a b)       = tyConsOfType a `unionUniqSets` tyConsOfType b
 tyConsOfType (FunTy a b)       = (tyConsOfType a `unionUniqSets` tyConsOfType b)
                                  `addOneToUniqSet` funTyCon