projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Trac #2111: improve error handling for 'rec' in do-notation
[ghc-hetmet.git]
/
compiler
/
vectorise
/
VectBuiltIn.hs
diff --git
a/compiler/vectorise/VectBuiltIn.hs
b/compiler/vectorise/VectBuiltIn.hs
index
4ea1295
..
7dc84ee
100644
(file)
--- a/
compiler/vectorise/VectBuiltIn.hs
+++ b/
compiler/vectorise/VectBuiltIn.hs
@@
-1,12
+1,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/Commentary/CodingStyle#Warnings
--- for details
-
module VectBuiltIn (
module VectBuiltIn (
- Builtins(..), sumTyCon, prodTyCon, combinePAVar,
+ Builtins(..), sumTyCon, prodTyCon, uarrTy, intPrimArrayTy,
+ combinePAVar,
initBuiltins, initBuiltinVars, initBuiltinTyCons, initBuiltinDataCons,
initBuiltinPAs, initBuiltinPRs,
initBuiltinBoxedTyCons,
initBuiltins, initBuiltinVars, initBuiltinTyCons, initBuiltinDataCons,
initBuiltinPAs, initBuiltinPRs,
initBuiltinBoxedTyCons,
@@
-19,7
+13,7
@@
module VectBuiltIn (
import DsMonad
import IfaceEnv ( lookupOrig )
import DsMonad
import IfaceEnv ( lookupOrig )
-import Module ( Module )
+import Module
import DataCon ( DataCon, dataConName, dataConWorkId )
import TyCon ( TyCon, tyConName, tyConDataCons )
import Var ( Var )
import DataCon ( DataCon, dataConName, dataConWorkId )
import TyCon ( TyCon, tyConName, tyConDataCons )
import Var ( Var )
@@
-29,16
+23,15
@@
import NameEnv
import OccName
import TypeRep ( funTyCon )
import OccName
import TypeRep ( funTyCon )
-import Type ( Type )
+import Type ( Type, mkTyConApp )
import TysPrim
import TysWiredIn ( unitTyCon, unitDataCon,
tupleTyCon,
import TysPrim
import TysWiredIn ( unitTyCon, unitDataCon,
tupleTyCon,
- intTyCon, intTyConName,
+ intTyCon, intTyConName, intTy,
doubleTyCon, doubleTyConName,
boolTyCon, boolTyConName, trueDataCon, falseDataCon,
doubleTyCon, doubleTyConName,
boolTyCon, boolTyConName, trueDataCon, falseDataCon,
- parrTyCon, parrTyConName )
+ parrTyConName )
import PrelNames ( gHC_PARR )
import PrelNames ( gHC_PARR )
-import Module
import BasicTypes ( Boxity(..) )
import FastString
import BasicTypes ( Boxity(..) )
import FastString
@@
-60,6
+53,10
@@
mAX_NDP_COMBINE = 2
mkNDPModule :: FastString -> Module
mkNDPModule m = mkModule ndpPackageId (mkModuleNameFS m)
mkNDPModule :: FastString -> Module
mkNDPModule m = mkModule ndpPackageId (mkModuleNameFS m)
+nDP_UARR, nDP_PARRAY, nDP_REPR, nDP_CLOSURE, nDP_UNBOXED, nDP_INSTANCES, nDP_COMBINATORS,
+ nDP_PRELUDE_PARR, nDP_PRELUDE_INT, nDP_PRELUDE_DOUBLE :: Module
+
+nDP_UARR = mkNDPModule FSLIT("Data.Array.Parallel.Unlifted.Flat.UArr")
nDP_PARRAY = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.PArray")
nDP_REPR = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Repr")
nDP_CLOSURE = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Closure")
nDP_PARRAY = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.PArray")
nDP_REPR = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Repr")
nDP_CLOSURE = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Closure")
@@
-78,8
+75,7
@@
data Builtins = Builtins {
, preprTyCon :: TyCon
, prTyCon :: TyCon
, prDataCon :: DataCon
, preprTyCon :: TyCon
, prTyCon :: TyCon
, prDataCon :: DataCon
- , parrayIntPrimTyCon :: TyCon
- , parrayBoolPrimTyCon :: TyCon
+ , uarrTyCon :: TyCon
, voidTyCon :: TyCon
, wrapTyCon :: TyCon
, enumerationTyCon :: TyCon
, voidTyCon :: TyCon
, wrapTyCon :: TyCon
, enumerationTyCon :: TyCon
@@
-103,6
+99,12
@@
data Builtins = Builtins {
, liftingContext :: Var
}
, liftingContext :: Var
}
+uarrTy :: Type -> Builtins -> Type
+uarrTy ty bi = mkTyConApp (uarrTyCon bi) [ty]
+
+intPrimArrayTy :: Builtins -> Type
+intPrimArrayTy = uarrTy intTy
+
sumTyCon :: Int -> Builtins -> TyCon
sumTyCon n bi
| n >= 2 && n <= mAX_NDP_SUM = sumTyCons bi ! n
sumTyCon :: Int -> Builtins -> TyCon
sumTyCon n bi
| n >= 2 && n <= mAX_NDP_SUM = sumTyCons bi ! n
@@
-128,8
+130,7
@@
initBuiltins
preprTyCon <- externalTyCon nDP_PARRAY FSLIT("PRepr")
prTyCon <- externalTyCon nDP_PARRAY FSLIT("PR")
let [prDataCon] = tyConDataCons prTyCon
preprTyCon <- externalTyCon nDP_PARRAY FSLIT("PRepr")
prTyCon <- externalTyCon nDP_PARRAY FSLIT("PR")
let [prDataCon] = tyConDataCons prTyCon
- parrayIntPrimTyCon <- externalTyCon nDP_UNBOXED FSLIT("PArray_Int#")
- parrayBoolPrimTyCon <- externalTyCon nDP_UNBOXED FSLIT("PArray_Bool#")
+ uarrTyCon <- externalTyCon nDP_UARR FSLIT("UArr")
closureTyCon <- externalTyCon nDP_CLOSURE FSLIT(":->")
voidTyCon <- externalTyCon nDP_REPR FSLIT("Void")
closureTyCon <- externalTyCon nDP_CLOSURE FSLIT(":->")
voidTyCon <- externalTyCon nDP_REPR FSLIT("Void")
@@
-170,8
+171,7
@@
initBuiltins
, preprTyCon = preprTyCon
, prTyCon = prTyCon
, prDataCon = prDataCon
, preprTyCon = preprTyCon
, prTyCon = prTyCon
, prDataCon = prDataCon
- , parrayIntPrimTyCon = parrayIntPrimTyCon
- , parrayBoolPrimTyCon = parrayBoolPrimTyCon
+ , uarrTyCon = uarrTyCon
, voidTyCon = voidTyCon
, wrapTyCon = wrapTyCon
, enumerationTyCon = enumerationTyCon
, voidTyCon = voidTyCon
, wrapTyCon = wrapTyCon
, enumerationTyCon = enumerationTyCon
@@
-196,7
+196,7
@@
initBuiltins
}
initBuiltinVars :: Builtins -> DsM [(Var, Var)]
}
initBuiltinVars :: Builtins -> DsM [(Var, Var)]
-initBuiltinVars bi
+initBuiltinVars _
= do
uvars <- zipWithM externalVar umods ufs
vvars <- zipWithM externalVar vmods vfs
= do
uvars <- zipWithM externalVar umods ufs
vvars <- zipWithM externalVar vmods vfs
@@
-276,7
+276,7
@@
defaultTyCons :: [TyCon]
defaultTyCons = [intTyCon, boolTyCon, doubleTyCon]
initBuiltinDataCons :: Builtins -> [(Name, DataCon)]
defaultTyCons = [intTyCon, boolTyCon, doubleTyCon]
initBuiltinDataCons :: Builtins -> [(Name, DataCon)]
-initBuiltinDataCons bi = [(dataConName dc, dc)| dc <- defaultDataCons]
+initBuiltinDataCons _ = [(dataConName dc, dc)| dc <- defaultDataCons]
defaultDataCons :: [DataCon]
defaultDataCons = [trueDataCon, falseDataCon, unitDataCon]
defaultDataCons :: [DataCon]
defaultDataCons = [trueDataCon, falseDataCon, unitDataCon]
@@
-289,6
+289,7
@@
initBuiltinDicts ps
where
(tcs, mods, fss) = unzip3 ps
where
(tcs, mods, fss) = unzip3 ps
+initBuiltinPAs :: Builtins -> DsM [(Name, Var)]
initBuiltinPAs = initBuiltinDicts . builtinPAs
builtinPAs :: Builtins -> [(Name, Module, FastString)]
initBuiltinPAs = initBuiltinDicts . builtinPAs
builtinPAs :: Builtins -> [(Name, Module, FastString)]
@@
-312,6
+313,7
@@
builtinPAs bi
nDP_INSTANCES
(mkFastString $ "dPA_" ++ show n)
nDP_INSTANCES
(mkFastString $ "dPA_" ++ show n)
+initBuiltinPRs :: Builtins -> DsM [(Name, Var)]
initBuiltinPRs = initBuiltinDicts . builtinPRs
builtinPRs :: Builtins -> [(Name, Module, FastString)]
initBuiltinPRs = initBuiltinDicts . builtinPRs
builtinPRs :: Builtins -> [(Name, Module, FastString)]
@@
-343,7
+345,7
@@
initBuiltinBoxedTyCons :: Builtins -> DsM [(Name, TyCon)]
initBuiltinBoxedTyCons = return . builtinBoxedTyCons
builtinBoxedTyCons :: Builtins -> [(Name, TyCon)]
initBuiltinBoxedTyCons = return . builtinBoxedTyCons
builtinBoxedTyCons :: Builtins -> [(Name, TyCon)]
-builtinBoxedTyCons bi =
+builtinBoxedTyCons _ =
[(tyConName intPrimTyCon, intTyCon)]
externalVar :: Module -> FastString -> DsM Var
[(tyConName intPrimTyCon, intTyCon)]
externalVar :: Module -> FastString -> DsM Var
@@
-354,6
+356,7
@@
externalTyCon :: Module -> FastString -> DsM TyCon
externalTyCon mod fs
= dsLookupTyCon =<< lookupOrig mod (mkOccNameFS tcName fs)
externalTyCon mod fs
= dsLookupTyCon =<< lookupOrig mod (mkOccNameFS tcName fs)
+unitTyConName :: Name
unitTyConName = tyConName unitTyCon
unitTyConName = tyConName unitTyCon
@@
-373,6
+376,8
@@
primPArray tycon
| otherwise = return Nothing
| otherwise = return Nothing
+prim_ty_cons :: NameEnv String
prim_ty_cons = mkNameEnv [mk_prim intPrimTyCon]
where
mk_prim tycon = (tyConName tycon, '_' : getOccString tycon)
prim_ty_cons = mkNameEnv [mk_prim intPrimTyCon]
where
mk_prim tycon = (tyConName tycon, '_' : getOccString tycon)
+