summaryrefslogtreecommitdiff
path: root/compiler/vectorise
diff options
context:
space:
mode:
Diffstat (limited to 'compiler/vectorise')
-rw-r--r--compiler/vectorise/Vectorise.hs2
-rw-r--r--compiler/vectorise/Vectorise/Builtins/Base.hs2
-rw-r--r--compiler/vectorise/Vectorise/Builtins/Initialise.hs2
-rw-r--r--compiler/vectorise/Vectorise/Convert.hs5
-rw-r--r--compiler/vectorise/Vectorise/Env.hs2
-rw-r--r--compiler/vectorise/Vectorise/Exp.hs2
-rw-r--r--compiler/vectorise/Vectorise/Generic/Description.hs2
-rw-r--r--compiler/vectorise/Vectorise/Generic/PADict.hs2
-rw-r--r--compiler/vectorise/Vectorise/Generic/PAMethods.hs2
-rw-r--r--compiler/vectorise/Vectorise/Generic/PData.hs2
-rw-r--r--compiler/vectorise/Vectorise/Monad.hs2
-rw-r--r--compiler/vectorise/Vectorise/Monad/Base.hs2
-rw-r--r--compiler/vectorise/Vectorise/Monad/Global.hs2
-rw-r--r--compiler/vectorise/Vectorise/Monad/InstEnv.hs2
-rw-r--r--compiler/vectorise/Vectorise/Monad/Local.hs2
-rw-r--r--compiler/vectorise/Vectorise/Monad/Naming.hs2
-rw-r--r--compiler/vectorise/Vectorise/Type/Classify.hs2
-rw-r--r--compiler/vectorise/Vectorise/Type/Env.hs2
-rw-r--r--compiler/vectorise/Vectorise/Type/TyConDecl.hs2
-rw-r--r--compiler/vectorise/Vectorise/Type/Type.hs4
-rw-r--r--compiler/vectorise/Vectorise/Utils.hs2
-rw-r--r--compiler/vectorise/Vectorise/Utils/Base.hs2
-rw-r--r--compiler/vectorise/Vectorise/Utils/Closure.hs2
-rw-r--r--compiler/vectorise/Vectorise/Utils/Hoisting.hs4
-rw-r--r--compiler/vectorise/Vectorise/Utils/PADict.hs2
-rw-r--r--compiler/vectorise/Vectorise/Utils/Poly.hs2
-rw-r--r--compiler/vectorise/Vectorise/Var.hs4
-rw-r--r--compiler/vectorise/Vectorise/Vect.hs2
28 files changed, 56 insertions, 9 deletions
diff --git a/compiler/vectorise/Vectorise.hs b/compiler/vectorise/Vectorise.hs
index 2e09adbbbe..0181c6cdd1 100644
--- a/compiler/vectorise/Vectorise.hs
+++ b/compiler/vectorise/Vectorise.hs
@@ -8,6 +8,8 @@
module Vectorise ( vectorise )
where
+import GhcPrelude
+
import Vectorise.Type.Env
import Vectorise.Type.Type
import Vectorise.Convert
diff --git a/compiler/vectorise/Vectorise/Builtins/Base.hs b/compiler/vectorise/Vectorise/Builtins/Base.hs
index 4837bde208..ba61a8b548 100644
--- a/compiler/vectorise/Vectorise/Builtins/Base.hs
+++ b/compiler/vectorise/Vectorise/Builtins/Base.hs
@@ -30,6 +30,8 @@ module Vectorise.Builtins.Base (
closureCtrFun
) where
+import GhcPrelude
+
import TysPrim
import BasicTypes
import Class
diff --git a/compiler/vectorise/Vectorise/Builtins/Initialise.hs b/compiler/vectorise/Vectorise/Builtins/Initialise.hs
index 73cedc4c53..0772e5be43 100644
--- a/compiler/vectorise/Vectorise/Builtins/Initialise.hs
+++ b/compiler/vectorise/Vectorise/Builtins/Initialise.hs
@@ -5,6 +5,8 @@ module Vectorise.Builtins.Initialise (
initBuiltins, initBuiltinVars
) where
+import GhcPrelude
+
import Vectorise.Builtins.Base
import BasicTypes
diff --git a/compiler/vectorise/Vectorise/Convert.hs b/compiler/vectorise/Vectorise/Convert.hs
index b3b70986e5..dda724ff5a 100644
--- a/compiler/vectorise/Vectorise/Convert.hs
+++ b/compiler/vectorise/Vectorise/Convert.hs
@@ -3,6 +3,8 @@ module Vectorise.Convert
)
where
+import GhcPrelude
+
import Vectorise.Monad
import Vectorise.Builtins
import Vectorise.Type.Type
@@ -15,9 +17,6 @@ import NameSet
import FastString
import Outputable
-import Control.Applicative
-import Prelude -- avoid redundant import warning due to AMP
-
-- |Convert a vectorised expression such that it computes the non-vectorised equivalent of its
-- value.
--
diff --git a/compiler/vectorise/Vectorise/Env.hs b/compiler/vectorise/Vectorise/Env.hs
index 8f1a0a0662..8ae35896e1 100644
--- a/compiler/vectorise/Vectorise/Env.hs
+++ b/compiler/vectorise/Vectorise/Env.hs
@@ -15,6 +15,8 @@ module Vectorise.Env (
modVectInfo
) where
+import GhcPrelude
+
import HscTypes
import InstEnv
import FamInstEnv
diff --git a/compiler/vectorise/Vectorise/Exp.hs b/compiler/vectorise/Vectorise/Exp.hs
index 9224aeac4f..c5de9c4250 100644
--- a/compiler/vectorise/Vectorise/Exp.hs
+++ b/compiler/vectorise/Vectorise/Exp.hs
@@ -13,6 +13,8 @@ where
#include "HsVersions.h"
+import GhcPrelude
+
import Vectorise.Type.Type
import Vectorise.Var
import Vectorise.Convert
diff --git a/compiler/vectorise/Vectorise/Generic/Description.hs b/compiler/vectorise/Vectorise/Generic/Description.hs
index 78a8f2c192..483e96f712 100644
--- a/compiler/vectorise/Vectorise/Generic/Description.hs
+++ b/compiler/vectorise/Vectorise/Generic/Description.hs
@@ -16,6 +16,8 @@ module Vectorise.Generic.Description
)
where
+import GhcPrelude
+
import Vectorise.Utils
import Vectorise.Monad
import Vectorise.Builtins
diff --git a/compiler/vectorise/Vectorise/Generic/PADict.hs b/compiler/vectorise/Vectorise/Generic/PADict.hs
index 5b7748a499..d24f989161 100644
--- a/compiler/vectorise/Vectorise/Generic/PADict.hs
+++ b/compiler/vectorise/Vectorise/Generic/PADict.hs
@@ -3,6 +3,8 @@ module Vectorise.Generic.PADict
( buildPADict
) where
+import GhcPrelude
+
import Vectorise.Monad
import Vectorise.Builtins
import Vectorise.Generic.Description
diff --git a/compiler/vectorise/Vectorise/Generic/PAMethods.hs b/compiler/vectorise/Vectorise/Generic/PAMethods.hs
index d480ea926b..34163d17f6 100644
--- a/compiler/vectorise/Vectorise/Generic/PAMethods.hs
+++ b/compiler/vectorise/Vectorise/Generic/PAMethods.hs
@@ -9,6 +9,8 @@ module Vectorise.Generic.PAMethods
, buildPAScAndMethods
) where
+import GhcPrelude
+
import Vectorise.Utils
import Vectorise.Monad
import Vectorise.Builtins
diff --git a/compiler/vectorise/Vectorise/Generic/PData.hs b/compiler/vectorise/Vectorise/Generic/PData.hs
index 4560c83e8b..c0a7e1cc5a 100644
--- a/compiler/vectorise/Vectorise/Generic/PData.hs
+++ b/compiler/vectorise/Vectorise/Generic/PData.hs
@@ -8,6 +8,8 @@ module Vectorise.Generic.PData
, buildPDatasTyCon )
where
+import GhcPrelude
+
import Vectorise.Monad
import Vectorise.Builtins
import Vectorise.Generic.Description
diff --git a/compiler/vectorise/Vectorise/Monad.hs b/compiler/vectorise/Vectorise/Monad.hs
index ac8b87a0dc..bcfb8deadf 100644
--- a/compiler/vectorise/Vectorise/Monad.hs
+++ b/compiler/vectorise/Vectorise/Monad.hs
@@ -18,6 +18,8 @@ module Vectorise.Monad (
addGlobalParallelTyCon,
) where
+import GhcPrelude
+
import Vectorise.Monad.Base
import Vectorise.Monad.Naming
import Vectorise.Monad.Local
diff --git a/compiler/vectorise/Vectorise/Monad/Base.hs b/compiler/vectorise/Vectorise/Monad/Base.hs
index a612a9c1cc..eb648710a9 100644
--- a/compiler/vectorise/Vectorise/Monad/Base.hs
+++ b/compiler/vectorise/Vectorise/Monad/Base.hs
@@ -26,6 +26,8 @@ module Vectorise.Monad.Base (
fixV,
) where
+import GhcPrelude
+
import Vectorise.Builtins
import Vectorise.Env
diff --git a/compiler/vectorise/Vectorise/Monad/Global.hs b/compiler/vectorise/Vectorise/Monad/Global.hs
index cd642f37b6..9abeb59dcb 100644
--- a/compiler/vectorise/Vectorise/Monad/Global.hs
+++ b/compiler/vectorise/Vectorise/Monad/Global.hs
@@ -33,6 +33,8 @@ module Vectorise.Monad.Global (
lookupTyConPR
) where
+import GhcPrelude
+
import Vectorise.Monad.Base
import Vectorise.Env
diff --git a/compiler/vectorise/Vectorise/Monad/InstEnv.hs b/compiler/vectorise/Vectorise/Monad/InstEnv.hs
index 64b7441235..68d70a46b6 100644
--- a/compiler/vectorise/Vectorise/Monad/InstEnv.hs
+++ b/compiler/vectorise/Vectorise/Monad/InstEnv.hs
@@ -7,6 +7,8 @@ module Vectorise.Monad.InstEnv
)
where
+import GhcPrelude
+
import Vectorise.Monad.Global
import Vectorise.Monad.Base
import Vectorise.Env
diff --git a/compiler/vectorise/Vectorise/Monad/Local.hs b/compiler/vectorise/Vectorise/Monad/Local.hs
index 61f55ccd43..1f0da7ebd2 100644
--- a/compiler/vectorise/Vectorise/Monad/Local.hs
+++ b/compiler/vectorise/Vectorise/Monad/Local.hs
@@ -13,6 +13,8 @@ module Vectorise.Monad.Local
)
where
+import GhcPrelude
+
import Vectorise.Monad.Base
import Vectorise.Env
diff --git a/compiler/vectorise/Vectorise/Monad/Naming.hs b/compiler/vectorise/Vectorise/Monad/Naming.hs
index 0b46416ddb..b1a8cb4092 100644
--- a/compiler/vectorise/Vectorise/Monad/Naming.hs
+++ b/compiler/vectorise/Vectorise/Monad/Naming.hs
@@ -14,6 +14,8 @@ module Vectorise.Monad.Naming
)
where
+import GhcPrelude
+
import Vectorise.Monad.Base
import DsMonad
diff --git a/compiler/vectorise/Vectorise/Type/Classify.hs b/compiler/vectorise/Vectorise/Type/Classify.hs
index ffe95f3cc4..5532c40ee1 100644
--- a/compiler/vectorise/Vectorise/Type/Classify.hs
+++ b/compiler/vectorise/Vectorise/Type/Classify.hs
@@ -18,6 +18,8 @@ module Vectorise.Type.Classify
)
where
+import GhcPrelude
+
import NameSet
import UniqSet
import UniqFM
diff --git a/compiler/vectorise/Vectorise/Type/Env.hs b/compiler/vectorise/Vectorise/Type/Env.hs
index 9526feddaf..a70e166aa2 100644
--- a/compiler/vectorise/Vectorise/Type/Env.hs
+++ b/compiler/vectorise/Vectorise/Type/Env.hs
@@ -11,6 +11,8 @@ module Vectorise.Type.Env (
#include "HsVersions.h"
+import GhcPrelude
+
import Vectorise.Env
import Vectorise.Vect
import Vectorise.Monad
diff --git a/compiler/vectorise/Vectorise/Type/TyConDecl.hs b/compiler/vectorise/Vectorise/Type/TyConDecl.hs
index 684754684b..0828250363 100644
--- a/compiler/vectorise/Vectorise/Type/TyConDecl.hs
+++ b/compiler/vectorise/Vectorise/Type/TyConDecl.hs
@@ -3,6 +3,8 @@ module Vectorise.Type.TyConDecl (
vectTyConDecls
) where
+import GhcPrelude
+
import Vectorise.Type.Type
import Vectorise.Monad
import Vectorise.Env( GlobalEnv( global_fam_inst_env ) )
diff --git a/compiler/vectorise/Vectorise/Type/Type.hs b/compiler/vectorise/Vectorise/Type/Type.hs
index 88d3f565f3..270f130123 100644
--- a/compiler/vectorise/Vectorise/Type/Type.hs
+++ b/compiler/vectorise/Vectorise/Type/Type.hs
@@ -7,6 +7,8 @@ module Vectorise.Type.Type
)
where
+import GhcPrelude
+
import Vectorise.Utils
import Vectorise.Monad
import Vectorise.Builtins
@@ -15,10 +17,8 @@ import Type
import TyCoRep
import TyCon
import Control.Monad
-import Control.Applicative
import Data.Maybe
import Outputable
-import Prelude -- avoid redundant import warning due to AMP
-- |Vectorise a type constructor. Unless there is a vectorised version (stripped of embedded
-- parallel arrays), the vectorised version is the same as the original.
diff --git a/compiler/vectorise/Vectorise/Utils.hs b/compiler/vectorise/Vectorise/Utils.hs
index 733eeb9cfd..6467bf9e7a 100644
--- a/compiler/vectorise/Vectorise/Utils.hs
+++ b/compiler/vectorise/Vectorise/Utils.hs
@@ -23,6 +23,8 @@ module Vectorise.Utils (
newLocalVar
) where
+import GhcPrelude
+
import Vectorise.Utils.Base
import Vectorise.Utils.Closure
import Vectorise.Utils.Hoisting
diff --git a/compiler/vectorise/Vectorise/Utils/Base.hs b/compiler/vectorise/Vectorise/Utils/Base.hs
index 88058e22d9..72ee0bed1e 100644
--- a/compiler/vectorise/Vectorise/Utils/Base.hs
+++ b/compiler/vectorise/Vectorise/Utils/Base.hs
@@ -27,6 +27,8 @@ module Vectorise.Utils.Base
, preprFamInst
) where
+import GhcPrelude
+
import Vectorise.Monad
import Vectorise.Vect
import Vectorise.Builtins
diff --git a/compiler/vectorise/Vectorise/Utils/Closure.hs b/compiler/vectorise/Vectorise/Utils/Closure.hs
index 118f34dfbf..49ef127975 100644
--- a/compiler/vectorise/Vectorise/Utils/Closure.hs
+++ b/compiler/vectorise/Vectorise/Utils/Closure.hs
@@ -7,6 +7,8 @@ module Vectorise.Utils.Closure
)
where
+import GhcPrelude
+
import Vectorise.Builtins
import Vectorise.Vect
import Vectorise.Monad
diff --git a/compiler/vectorise/Vectorise/Utils/Hoisting.hs b/compiler/vectorise/Vectorise/Utils/Hoisting.hs
index 05883457bf..e1d208590d 100644
--- a/compiler/vectorise/Vectorise/Utils/Hoisting.hs
+++ b/compiler/vectorise/Vectorise/Utils/Hoisting.hs
@@ -11,6 +11,8 @@ module Vectorise.Utils.Hoisting
)
where
+import GhcPrelude
+
import Vectorise.Monad
import Vectorise.Env
import Vectorise.Vect
@@ -24,8 +26,6 @@ import Id
import BasicTypes (Arity)
import FastString
import Control.Monad
-import Control.Applicative
-import Prelude -- avoid redundant import warning due to AMP
-- Inline ---------------------------------------------------------------------
diff --git a/compiler/vectorise/Vectorise/Utils/PADict.hs b/compiler/vectorise/Vectorise/Utils/PADict.hs
index 4d32f5df74..1176b78e54 100644
--- a/compiler/vectorise/Vectorise/Utils/PADict.hs
+++ b/compiler/vectorise/Vectorise/Utils/PADict.hs
@@ -6,6 +6,8 @@ module Vectorise.Utils.PADict (
prDictOfPReprInstTyCon
) where
+import GhcPrelude
+
import Vectorise.Monad
import Vectorise.Builtins
import Vectorise.Utils.Base
diff --git a/compiler/vectorise/Vectorise/Utils/Poly.hs b/compiler/vectorise/Vectorise/Utils/Poly.hs
index d9f657f950..6d7a4112da 100644
--- a/compiler/vectorise/Vectorise/Utils/Poly.hs
+++ b/compiler/vectorise/Vectorise/Utils/Poly.hs
@@ -8,6 +8,8 @@ module Vectorise.Utils.Poly
)
where
+import GhcPrelude
+
import Vectorise.Vect
import Vectorise.Monad
import Vectorise.Utils.PADict
diff --git a/compiler/vectorise/Vectorise/Var.hs b/compiler/vectorise/Vectorise/Var.hs
index 5cfc8415f7..b107354899 100644
--- a/compiler/vectorise/Vectorise/Var.hs
+++ b/compiler/vectorise/Vectorise/Var.hs
@@ -13,6 +13,8 @@ module Vectorise.Var
)
where
+import GhcPrelude
+
import Vectorise.Utils
import Vectorise.Monad
import Vectorise.Env
@@ -23,8 +25,6 @@ import Type
import VarEnv
import Id
import FastString
-import Control.Applicative
-import Prelude -- avoid redundant import warning due to AMP
-- Binders ----------------------------------------------------------------------------------------
diff --git a/compiler/vectorise/Vectorise/Vect.hs b/compiler/vectorise/Vectorise/Vect.hs
index 03492291d6..1b0e57167c 100644
--- a/compiler/vectorise/Vectorise/Vect.hs
+++ b/compiler/vectorise/Vectorise/Vect.hs
@@ -20,6 +20,8 @@ module Vectorise.Vect
)
where
+import GhcPrelude
+
import CoreSyn
import Type ( Type )
import Var
View Lorry Controller Status