diff options
| author | Manuel M T Chakravarty <chak@cse.unsw.edu.au> | 2013-02-04 17:54:16 +1100 |
|---|---|---|
| committer | Manuel M T Chakravarty <chak@cse.unsw.edu.au> | 2013-02-04 17:54:16 +1100 |
| commit | 5389b2a8e28e2fe306c67b4c348c769c9661478e (patch) | |
| tree | 77a302b0937564352637158f5128a713325aa043 | |
| parent | ad45b9f8781aa5350d8ecd45eef179064713ff38 (diff) | |
| download | haskell-5389b2a8e28e2fe306c67b4c348c769c9661478e.tar.gz | |
Vectoriser: avoid producing (\v -> v) v in liftSimple
| -rw-r--r-- | compiler/vectorise/Vectorise/Exp.hs | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/compiler/vectorise/Vectorise/Exp.hs b/compiler/vectorise/Vectorise/Exp.hs index eeee0a828e..d4eee26553 100644 --- a/compiler/vectorise/Vectorise/Exp.hs +++ b/compiler/vectorise/Vectorise/Exp.hs @@ -162,7 +162,7 @@ encapsulateScalars :: CoreExprWithVectInfo -> VM CoreExprWithVectInfo encapsulateScalars ce@(_, AnnType _ty) = return ce encapsulateScalars ce@((_, VISimple), AnnVar _v) - -- NB: diverts from the paper: encapsulate variables with scalar type (includes functions) + -- NB: diverts from the paper: encapsulate scalar variables (including functions) = liftSimpleAndCase ce encapsulateScalars ce@(_, AnnVar _v) = return ce @@ -265,6 +265,10 @@ liftSimpleAndCase aexpr@((fvs, _vi), AnnCase expr bndr t alts) liftSimpleAndCase aexpr = liftSimple aexpr liftSimple :: CoreExprWithVectInfo -> VM CoreExprWithVectInfo +liftSimple ((fvs, vi), AnnVar v) + | v `elemVarSet` fvs -- special case to avoid producing: (\v -> v) v + && not (isToplevel v) -- NB: if 'v' not free or is toplevel, we must get the 'VIEncaps' + = return $ ((fvs, vi), AnnVar v) liftSimple aexpr@((fvs_orig, VISimple), expr) = do { let liftedExpr = mkAnnApps (mkAnnLams (reverse vars) fvs expr) vars @@ -277,13 +281,6 @@ liftSimple aexpr@((fvs_orig, VISimple), expr) vars = varSetElems fvs fvs = filterVarSet (not . isToplevel) fvs_orig -- only include 'Id's that are not toplevel - isToplevel v | isId v = case realIdUnfolding v of - NoUnfolding -> False - OtherCon {} -> True - DFunUnfolding {} -> True - CoreUnfolding {uf_is_top = top} -> top - | otherwise = False - mkAnnLams :: [Var] -> VarSet -> AnnExpr' Var (VarSet, VectAvoidInfo) -> CoreExprWithVectInfo mkAnnLams [] fvs expr = ASSERT(isEmptyVarSet fvs) ((emptyVarSet, VIEncaps), expr) @@ -299,6 +296,13 @@ liftSimple aexpr@((fvs_orig, VISimple), expr) liftSimple aexpr = pprPanic "Vectorise.Exp.liftSimple: not simple" $ ppr (deAnnotate aexpr) +isToplevel :: Var -> Bool +isToplevel v | isId v = case realIdUnfolding v of + NoUnfolding -> False + OtherCon {} -> True + DFunUnfolding {} -> True + CoreUnfolding {uf_is_top = top} -> top + | otherwise = False -- |Vectorise an expression. -- |