summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Leshchinskiy <rl@cse.unsw.edu.au>2007-06-29 05:19:43 +0000
committerRoman Leshchinskiy <rl@cse.unsw.edu.au>2007-06-29 05:19:43 +0000
commitf071ec8860dc3be9329808b8d41008c353dc91e8 (patch)
treecaf78108a925f9f5b6c93f5fcddcd42c0b8354eb
parentd9049898e07e957bd5c24fb4a0257709b8186959 (diff)
downloadhaskell-f071ec8860dc3be9329808b8d41008c353dc91e8.tar.gz
Include vectorisation into the simplifier pipeline
-rw-r--r--compiler/main/HscMain.lhs8
1 files changed, 5 insertions, 3 deletions
diff --git a/compiler/main/HscMain.lhs b/compiler/main/HscMain.lhs
index f0fd95da23..1abdbdc538 100644
--- a/compiler/main/HscMain.lhs
+++ b/compiler/main/HscMain.lhs
@@ -33,6 +33,7 @@ import CoreSyn ( CoreExpr )
import CoreTidy ( tidyExpr )
import CorePrep ( corePrepExpr )
import Flattening ( flattenExpr )
+import Vectorise ( vectorise )
import Desugar ( deSugarExpr )
import SimplCore ( simplifyExpr )
import TcRnDriver ( tcRnStmt, tcRnExpr, tcRnType )
@@ -66,6 +67,7 @@ import PrelInfo ( wiredInThings, basicKnownKeyNames )
import MkIface ( checkOldIface, mkIface, writeIfaceFile )
import Desugar ( deSugar )
import Flattening ( flatten )
+import Vectorise ( vectorise )
import SimplCore ( core2core )
import TidyPgm ( tidyProgram, mkBootModDetails )
import CorePrep ( corePrepPgm )
@@ -476,13 +478,13 @@ hscSimplify :: ModGuts -> Comp ModGuts
hscSimplify ds_result
= do hsc_env <- gets compHscEnv
liftIO $ do
- flat_result <- {-# SCC "Flattening" #-}
- flatten hsc_env ds_result
+ vect_result <- {-# SCC "Vectorisation" #-}
+ vectorise hsc_env ds_result
-------------------
-- SIMPLIFY
-------------------
simpl_result <- {-# SCC "Core2Core" #-}
- core2core hsc_env flat_result
+ core2core hsc_env vect_result
return simpl_result
--------------------------------------------------------------