X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fvectorise%2FVectBuiltIn.hs;h=cbcb47db76720104d258b7d992d1ce4768693fb4;hb=1353826e5159c9a5a81e75e0b7459271f27c08ea;hp=be7145985286b561c42db9d4f3d3f83d20ca7cdd;hpb=501db4a71483f4a6943008dd4c84e01fb9b55170;p=ghc-hetmet.git diff --git a/compiler/vectorise/VectBuiltIn.hs b/compiler/vectorise/VectBuiltIn.hs index be71459..cbcb47d 100644 --- a/compiler/vectorise/VectBuiltIn.hs +++ b/compiler/vectorise/VectBuiltIn.hs @@ -29,7 +29,7 @@ import TysWiredIn ( unitTyCon, unitDataCon, doubleTyCon, doubleTyConName, boolTyCon, boolTyConName, trueDataCon, falseDataCon, parrTyConName ) -import PrelNames ( gHC_PARR ) +import PrelNames ( word8TyConName, gHC_PARR ) import BasicTypes ( Boxity(..) ) import FastString @@ -57,6 +57,7 @@ data Modules = Modules { , dph_Combinators :: Module , dph_Prelude_PArr :: Module , dph_Prelude_Int :: Module + , dph_Prelude_Word8 :: Module , dph_Prelude_Double :: Module , dph_Prelude_Bool :: Module , dph_Prelude_Tuple :: Module @@ -73,6 +74,7 @@ dph_Modules pkg = Modules { , dph_Prelude_PArr = mk (fsLit "Data.Array.Parallel.Prelude.Base.PArr") , dph_Prelude_Int = mk (fsLit "Data.Array.Parallel.Prelude.Base.Int") + , dph_Prelude_Word8 = mk (fsLit "Data.Array.Parallel.Prelude.Base.Word8") , dph_Prelude_Double = mk (fsLit "Data.Array.Parallel.Prelude.Base.Double") , dph_Prelude_Bool = mk (fsLit "Data.Array.Parallel.Prelude.Base.Bool") , dph_Prelude_Tuple = mk (fsLit "Data.Array.Parallel.Prelude.Base.Tuple") @@ -240,6 +242,7 @@ preludeVars :: Modules -> [(Module, FastString, Module, FastString)] preludeVars (Modules { dph_Combinators = dph_Combinators , dph_PArray = dph_PArray , dph_Prelude_Int = dph_Prelude_Int + , dph_Prelude_Word8 = dph_Prelude_Word8 , dph_Prelude_Double = dph_Prelude_Double , dph_Prelude_Bool = dph_Prelude_Bool , dph_Prelude_PArr = dph_Prelude_PArr @@ -259,42 +262,31 @@ preludeVars (Modules { dph_Combinators = dph_Combinators , mk gHC_PARR (fsLit "+:+") dph_Combinators (fsLit "appPA") , mk gHC_PARR (fsLit "emptyP") dph_PArray (fsLit "emptyPA") - , mk dph_Prelude_Int (fsLit "plus") dph_Prelude_Int (fsLit "plusV") - , mk dph_Prelude_Int (fsLit "minus") dph_Prelude_Int (fsLit "minusV") - , mk dph_Prelude_Int (fsLit "mult") dph_Prelude_Int (fsLit "multV") - , mk dph_Prelude_Int (fsLit "intDiv") dph_Prelude_Int (fsLit "intDivV") - , mk dph_Prelude_Int (fsLit "intMod") dph_Prelude_Int (fsLit "intModV") - , mk dph_Prelude_Int (fsLit "intSquareRoot") dph_Prelude_Int (fsLit "intSquareRootV") - , mk dph_Prelude_Int (fsLit "intSumP") dph_Prelude_Int (fsLit "intSumPA") - , mk dph_Prelude_Int (fsLit "enumFromToP") dph_Prelude_Int (fsLit "enumFromToPA") - , mk dph_Prelude_Int (fsLit "upToP") dph_Prelude_Int (fsLit "upToPA") - - , mk dph_Prelude_Int (fsLit "eq") dph_Prelude_Int (fsLit "eqV") - , mk dph_Prelude_Int (fsLit "neq") dph_Prelude_Int (fsLit "neqV") - , mk dph_Prelude_Int (fsLit "le") dph_Prelude_Int (fsLit "leV") - , mk dph_Prelude_Int (fsLit "lt") dph_Prelude_Int (fsLit "ltV") - , mk dph_Prelude_Int (fsLit "ge") dph_Prelude_Int (fsLit "geV") - , mk dph_Prelude_Int (fsLit "gt") dph_Prelude_Int (fsLit "gtV") - - , mk dph_Prelude_Double (fsLit "plus") dph_Prelude_Double (fsLit "plusV") - , mk dph_Prelude_Double (fsLit "minus") dph_Prelude_Double (fsLit "minusV") - , mk dph_Prelude_Double (fsLit "mult") dph_Prelude_Double (fsLit "multV") - , mk dph_Prelude_Double (fsLit "divide") dph_Prelude_Double (fsLit "divideV") - , mk dph_Prelude_Double (fsLit "squareRoot") dph_Prelude_Double (fsLit "squareRootV") - , mk dph_Prelude_Double (fsLit "doubleSumP") dph_Prelude_Double (fsLit "doubleSumPA") - , mk dph_Prelude_Double (fsLit "minIndexP") - dph_Prelude_Double (fsLit "minIndexPA") - , mk dph_Prelude_Double (fsLit "maxIndexP") - dph_Prelude_Double (fsLit "maxIndexPA") - - , mk dph_Prelude_Double (fsLit "eq") dph_Prelude_Double (fsLit "eqV") - , mk dph_Prelude_Double (fsLit "neq") dph_Prelude_Double (fsLit "neqV") - , mk dph_Prelude_Double (fsLit "le") dph_Prelude_Double (fsLit "leV") - , mk dph_Prelude_Double (fsLit "lt") dph_Prelude_Double (fsLit "ltV") - , mk dph_Prelude_Double (fsLit "ge") dph_Prelude_Double (fsLit "geV") - , mk dph_Prelude_Double (fsLit "gt") dph_Prelude_Double (fsLit "gtV") - - , mk dph_Prelude_Bool (fsLit "andP") dph_Prelude_Bool (fsLit "andPA") + , mk' dph_Prelude_Int "div" "divV" + , mk' dph_Prelude_Int "mod" "modV" + , mk' dph_Prelude_Int "sqrt" "sqrtV" + , mk' dph_Prelude_Int "enumFromToP" "enumFromToPA" + , mk' dph_Prelude_Int "upToP" "upToPA" + ] + ++ vars_Ord dph_Prelude_Int + ++ vars_Num dph_Prelude_Int + + ++ vars_Ord dph_Prelude_Word8 + ++ vars_Num dph_Prelude_Word8 + ++ + [ mk' dph_Prelude_Word8 "div" "divV" + , mk' dph_Prelude_Word8 "mod" "modV" + , mk' dph_Prelude_Word8 "fromInt" "fromIntV" + , mk' dph_Prelude_Word8 "toInt" "toIntV" + ] + + ++ vars_Ord dph_Prelude_Double + ++ vars_Num dph_Prelude_Double + ++ vars_Fractional dph_Prelude_Double + ++ vars_Floating dph_Prelude_Double + ++ vars_RealFrac dph_Prelude_Double + ++ + [ mk dph_Prelude_Bool (fsLit "andP") dph_Prelude_Bool (fsLit "andPA") , mk dph_Prelude_Bool (fsLit "orP") dph_Prelude_Bool (fsLit "orPA") -- FIXME: temporary @@ -304,22 +296,81 @@ preludeVars (Modules { dph_Combinators = dph_Combinators , mk dph_Prelude_PArr (fsLit "combineP") dph_Combinators (fsLit "combine2PA") ] where - mk = (,,,) + mk = (,,,) + mk' mod v v' = mk mod (fsLit v) mod (fsLit v') + + vars_Ord mod = [mk' mod "==" "eqV" + ,mk' mod "/=" "neqV" + ,mk' mod "<=" "leV" + ,mk' mod "<" "ltV" + ,mk' mod ">=" "geV" + ,mk' mod ">" "gtV" + ,mk' mod "min" "minV" + ,mk' mod "max" "maxV" + ,mk' mod "minimumP" "minimumPA" + ,mk' mod "maximumP" "maximumPA" + ,mk' mod "minIndexP" "minIndexPA" + ,mk' mod "maxIndexP" "maxIndexPA" + ] + + vars_Num mod = [mk' mod "+" "plusV" + ,mk' mod "-" "minusV" + ,mk' mod "*" "multV" + ,mk' mod "negate" "negateV" + ,mk' mod "abs" "absV" + ,mk' mod "sumP" "sumPA" + ,mk' mod "productP" "productPA" + ] + + vars_Fractional mod = [mk' mod "/" "divideV" + ,mk' mod "recip" "recipV" + ] + + vars_Floating mod = [mk' mod "pi" "pi" + ,mk' mod "exp" "expV" + ,mk' mod "sqrt" "sqrtV" + ,mk' mod "log" "logV" + ,mk' mod "sin" "sinV" + ,mk' mod "tan" "tanV" + ,mk' mod "cos" "cosV" + ,mk' mod "asin" "asinV" + ,mk' mod "atan" "atanV" + ,mk' mod "acos" "acosV" + ,mk' mod "sinh" "sinhV" + ,mk' mod "tanh" "tanhV" + ,mk' mod "cosh" "coshV" + ,mk' mod "asinh" "asinhV" + ,mk' mod "atanh" "atanhV" + ,mk' mod "acosh" "acoshV" + ,mk' mod "**" "powV" + ,mk' mod "logBase" "logBaseV" + ] + + vars_RealFrac mod = [mk' mod "fromInt" "fromIntV" + ,mk' mod "truncate" "truncateV" + ,mk' mod "round" "roundV" + ,mk' mod "ceiling" "ceilingV" + ,mk' mod "floor" "floorV" + ] initBuiltinTyCons :: Builtins -> DsM [(Name, TyCon)] initBuiltinTyCons bi = do -- parr <- externalTyCon dph_Prelude_PArr (fsLit "PArr") + dft_tcs <- defaultTyCons return $ (tyConName funTyCon, closureTyCon bi) : (parrTyConName, parrayTyCon bi) -- FIXME: temporary : (tyConName $ parrayTyCon bi, parrayTyCon bi) - : [(tyConName tc, tc) | tc <- defaultTyCons] + : [(tyConName tc, tc) | tc <- dft_tcs] -defaultTyCons :: [TyCon] -defaultTyCons = [intTyCon, boolTyCon, doubleTyCon] +defaultTyCons :: DsM [TyCon] +defaultTyCons + = do + word8 <- dsLookupTyCon word8TyConName + return [intTyCon, boolTyCon, doubleTyCon, word8] initBuiltinDataCons :: Builtins -> [(Name, DataCon)] initBuiltinDataCons _ = [(dataConName dc, dc)| dc <- defaultDataCons] @@ -347,6 +398,7 @@ builtinPAs bi@(Builtins { dphModules = mods }) , mk unitTyConName (dph_Instances mods) (fsLit "dPA_Unit") , mk intTyConName (dph_Instances mods) (fsLit "dPA_Int") + , mk word8TyConName (dph_Instances mods) (fsLit "dPA_Word8") , mk doubleTyConName (dph_Instances mods) (fsLit "dPA_Double") , mk boolTyConName (dph_Instances mods) (fsLit "dPA_Bool") ] @@ -373,6 +425,7 @@ builtinPRs bi@(Builtins { dphModules = mods }) = -- temporary , mk intTyConName (dph_Instances mods) (fsLit "dPR_Int") + , mk word8TyConName (dph_Instances mods) (fsLit "dPR_Word8") , mk doubleTyConName (dph_Instances mods) (fsLit "dPR_Double") ] @@ -400,7 +453,7 @@ externalVar mod fs externalTyCon :: Module -> FastString -> DsM TyCon externalTyCon mod fs - = dsLookupTyCon =<< lookupOrig mod (mkOccNameFS tcName fs) + = dsLookupTyCon =<< lookupOrig mod (mkTcOccFS fs) externalType :: Module -> FastString -> DsM Type externalType mod fs @@ -426,7 +479,7 @@ primPArray tycon (Builtins { dphModules = mods }) | Just suffix <- lookupNameEnv prim_ty_cons (tyConName tycon) = liftM Just $ dsLookupTyCon =<< lookupOrig (dph_Unboxed mods) - (mkOccName tcName $ "PArray" ++ suffix) + (mkTcOcc $ "PArray" ++ suffix) | otherwise = return Nothing