summaryrefslogtreecommitdiff
path: root/compiler/GHC/CmmToAsm/Reg
diff options
context:
space:
mode:
Diffstat (limited to 'compiler/GHC/CmmToAsm/Reg')
-rw-r--r--compiler/GHC/CmmToAsm/Reg/Graph.hs6
-rw-r--r--compiler/GHC/CmmToAsm/Reg/Graph/Base.hs6
-rw-r--r--compiler/GHC/CmmToAsm/Reg/Graph/Coalesce.hs6
-rw-r--r--compiler/GHC/CmmToAsm/Reg/Graph/Spill.hs8
-rw-r--r--compiler/GHC/CmmToAsm/Reg/Graph/SpillClean.hs6
-rw-r--r--compiler/GHC/CmmToAsm/Reg/Graph/SpillCost.hs4
-rw-r--r--compiler/GHC/CmmToAsm/Reg/Graph/Stats.hs4
-rw-r--r--compiler/GHC/CmmToAsm/Reg/Graph/TrivColorable.hs2
-rw-r--r--compiler/GHC/CmmToAsm/Reg/Graph/X86.hs2
-rw-r--r--compiler/GHC/CmmToAsm/Reg/Linear.hs8
-rw-r--r--compiler/GHC/CmmToAsm/Reg/Linear/Base.hs6
-rw-r--r--compiler/GHC/CmmToAsm/Reg/Linear/JoinToTargets.hs6
-rw-r--r--compiler/GHC/CmmToAsm/Reg/Linear/StackMap.hs4
-rw-r--r--compiler/GHC/CmmToAsm/Reg/Linear/State.hs4
-rw-r--r--compiler/GHC/CmmToAsm/Reg/Linear/Stats.hs2
-rw-r--r--compiler/GHC/CmmToAsm/Reg/Liveness.hs6
-rw-r--r--compiler/GHC/CmmToAsm/Reg/Target.hs2
17 files changed, 41 insertions, 41 deletions
diff --git a/compiler/GHC/CmmToAsm/Reg/Graph.hs b/compiler/GHC/CmmToAsm/Reg/Graph.hs
index 7f0cacfcb4..443072b246 100644
--- a/compiler/GHC/CmmToAsm/Reg/Graph.hs
+++ b/compiler/GHC/CmmToAsm/Reg/Graph.hs
@@ -23,9 +23,9 @@ import GHC.Platform.Reg
import Bag
import Outputable
import GHC.Platform
-import UniqFM
-import UniqSet
-import UniqSupply
+import GHC.Types.Unique.FM
+import GHC.Types.Unique.Set
+import GHC.Types.Unique.Supply
import Util (seqList)
import GHC.CmmToAsm.CFG
diff --git a/compiler/GHC/CmmToAsm/Reg/Graph/Base.hs b/compiler/GHC/CmmToAsm/Reg/Graph/Base.hs
index 95fa174415..ba3f825149 100644
--- a/compiler/GHC/CmmToAsm/Reg/Graph/Base.hs
+++ b/compiler/GHC/CmmToAsm/Reg/Graph/Base.hs
@@ -24,9 +24,9 @@ module GHC.CmmToAsm.Reg.Graph.Base (
import GhcPrelude
-import UniqSet
-import UniqFM
-import Unique
+import GHC.Types.Unique.Set
+import GHC.Types.Unique.FM
+import GHC.Types.Unique
import MonadUtils (concatMapM)
diff --git a/compiler/GHC/CmmToAsm/Reg/Graph/Coalesce.hs b/compiler/GHC/CmmToAsm/Reg/Graph/Coalesce.hs
index d223137dd0..dd28981261 100644
--- a/compiler/GHC/CmmToAsm/Reg/Graph/Coalesce.hs
+++ b/compiler/GHC/CmmToAsm/Reg/Graph/Coalesce.hs
@@ -12,9 +12,9 @@ import GHC.Platform.Reg
import GHC.Cmm
import Bag
import Digraph
-import UniqFM
-import UniqSet
-import UniqSupply
+import GHC.Types.Unique.FM
+import GHC.Types.Unique.Set
+import GHC.Types.Unique.Supply
-- | Do register coalescing on this top level thing
diff --git a/compiler/GHC/CmmToAsm/Reg/Graph/Spill.hs b/compiler/GHC/CmmToAsm/Reg/Graph/Spill.hs
index a0e11433f7..5ae55334a2 100644
--- a/compiler/GHC/CmmToAsm/Reg/Graph/Spill.hs
+++ b/compiler/GHC/CmmToAsm/Reg/Graph/Spill.hs
@@ -18,10 +18,10 @@ import GHC.Cmm.Dataflow.Collections
import MonadUtils
import State
-import Unique
-import UniqFM
-import UniqSet
-import UniqSupply
+import GHC.Types.Unique
+import GHC.Types.Unique.FM
+import GHC.Types.Unique.Set
+import GHC.Types.Unique.Supply
import Outputable
import GHC.Platform
diff --git a/compiler/GHC/CmmToAsm/Reg/Graph/SpillClean.hs b/compiler/GHC/CmmToAsm/Reg/Graph/SpillClean.hs
index 6d14c7194b..ac784582e7 100644
--- a/compiler/GHC/CmmToAsm/Reg/Graph/SpillClean.hs
+++ b/compiler/GHC/CmmToAsm/Reg/Graph/SpillClean.hs
@@ -37,9 +37,9 @@ import GHC.Platform.Reg
import GHC.Cmm.BlockId
import GHC.Cmm
-import UniqSet
-import UniqFM
-import Unique
+import GHC.Types.Unique.Set
+import GHC.Types.Unique.FM
+import GHC.Types.Unique
import State
import Outputable
import GHC.Platform
diff --git a/compiler/GHC/CmmToAsm/Reg/Graph/SpillCost.hs b/compiler/GHC/CmmToAsm/Reg/Graph/SpillCost.hs
index e3e456e98d..6484a38d79 100644
--- a/compiler/GHC/CmmToAsm/Reg/Graph/SpillCost.hs
+++ b/compiler/GHC/CmmToAsm/Reg/Graph/SpillCost.hs
@@ -25,8 +25,8 @@ import GraphBase
import GHC.Cmm.Dataflow.Collections (mapLookup)
import GHC.Cmm.Dataflow.Label
import GHC.Cmm
-import UniqFM
-import UniqSet
+import GHC.Types.Unique.FM
+import GHC.Types.Unique.Set
import Digraph (flattenSCCs)
import Outputable
import GHC.Platform
diff --git a/compiler/GHC/CmmToAsm/Reg/Graph/Stats.hs b/compiler/GHC/CmmToAsm/Reg/Graph/Stats.hs
index 2285d3e908..a06a22fa05 100644
--- a/compiler/GHC/CmmToAsm/Reg/Graph/Stats.hs
+++ b/compiler/GHC/CmmToAsm/Reg/Graph/Stats.hs
@@ -30,8 +30,8 @@ import GHC.CmmToAsm.Reg.Target
import GHC.Platform
import Outputable
-import UniqFM
-import UniqSet
+import GHC.Types.Unique.FM
+import GHC.Types.Unique.Set
import State
-- | Holds interesting statistics from the register allocator.
diff --git a/compiler/GHC/CmmToAsm/Reg/Graph/TrivColorable.hs b/compiler/GHC/CmmToAsm/Reg/Graph/TrivColorable.hs
index ec7c5ad13e..4cf3d98eb1 100644
--- a/compiler/GHC/CmmToAsm/Reg/Graph/TrivColorable.hs
+++ b/compiler/GHC/CmmToAsm/Reg/Graph/TrivColorable.hs
@@ -15,7 +15,7 @@ import GHC.Platform.Reg
import GraphBase
-import UniqSet
+import GHC.Types.Unique.Set
import GHC.Platform
import Panic
diff --git a/compiler/GHC/CmmToAsm/Reg/Graph/X86.hs b/compiler/GHC/CmmToAsm/Reg/Graph/X86.hs
index 0d4c56ba21..c673c69c1d 100644
--- a/compiler/GHC/CmmToAsm/Reg/Graph/X86.hs
+++ b/compiler/GHC/CmmToAsm/Reg/Graph/X86.hs
@@ -18,7 +18,7 @@ module GHC.CmmToAsm.Reg.Graph.X86 (
import GhcPrelude
import GHC.CmmToAsm.Reg.Graph.Base (Reg(..), RegSub(..), RegClass(..))
-import UniqSet
+import GHC.Types.Unique.Set
import qualified Data.Array as A
diff --git a/compiler/GHC/CmmToAsm/Reg/Linear.hs b/compiler/GHC/CmmToAsm/Reg/Linear.hs
index 155d67c2c2..a093bad83a 100644
--- a/compiler/GHC/CmmToAsm/Reg/Linear.hs
+++ b/compiler/GHC/CmmToAsm/Reg/Linear.hs
@@ -127,10 +127,10 @@ import GHC.Cmm.Dataflow.Collections
import GHC.Cmm hiding (RegSet)
import Digraph
-import Unique
-import UniqSet
-import UniqFM
-import UniqSupply
+import GHC.Types.Unique
+import GHC.Types.Unique.Set
+import GHC.Types.Unique.FM
+import GHC.Types.Unique.Supply
import Outputable
import GHC.Platform
diff --git a/compiler/GHC/CmmToAsm/Reg/Linear/Base.hs b/compiler/GHC/CmmToAsm/Reg/Linear/Base.hs
index 92b3ee19a3..95036adb26 100644
--- a/compiler/GHC/CmmToAsm/Reg/Linear/Base.hs
+++ b/compiler/GHC/CmmToAsm/Reg/Linear/Base.hs
@@ -25,9 +25,9 @@ import GHC.CmmToAsm.Config
import GHC.Platform.Reg
import Outputable
-import Unique
-import UniqFM
-import UniqSupply
+import GHC.Types.Unique
+import GHC.Types.Unique.FM
+import GHC.Types.Unique.Supply
import GHC.Cmm.BlockId
diff --git a/compiler/GHC/CmmToAsm/Reg/Linear/JoinToTargets.hs b/compiler/GHC/CmmToAsm/Reg/Linear/JoinToTargets.hs
index 0874cd0dbf..55735913d4 100644
--- a/compiler/GHC/CmmToAsm/Reg/Linear/JoinToTargets.hs
+++ b/compiler/GHC/CmmToAsm/Reg/Linear/JoinToTargets.hs
@@ -24,9 +24,9 @@ import GHC.Cmm.BlockId
import GHC.Cmm.Dataflow.Collections
import Digraph
import Outputable
-import Unique
-import UniqFM
-import UniqSet
+import GHC.Types.Unique
+import GHC.Types.Unique.FM
+import GHC.Types.Unique.Set
-- | For a jump instruction at the end of a block, generate fixup code so its
-- vregs are in the correct regs for its destination.
diff --git a/compiler/GHC/CmmToAsm/Reg/Linear/StackMap.hs b/compiler/GHC/CmmToAsm/Reg/Linear/StackMap.hs
index 00fcfd91c8..c2477fc18f 100644
--- a/compiler/GHC/CmmToAsm/Reg/Linear/StackMap.hs
+++ b/compiler/GHC/CmmToAsm/Reg/Linear/StackMap.hs
@@ -22,8 +22,8 @@ where
import GhcPrelude
-import UniqFM
-import Unique
+import GHC.Types.Unique.FM
+import GHC.Types.Unique
-- | Identifier for a stack slot.
diff --git a/compiler/GHC/CmmToAsm/Reg/Linear/State.hs b/compiler/GHC/CmmToAsm/Reg/Linear/State.hs
index 5a1e3a4c3f..cf8913e211 100644
--- a/compiler/GHC/CmmToAsm/Reg/Linear/State.hs
+++ b/compiler/GHC/CmmToAsm/Reg/Linear/State.hs
@@ -50,8 +50,8 @@ import GHC.Platform.Reg
import GHC.Cmm.BlockId
import GHC.Platform
-import Unique
-import UniqSupply
+import GHC.Types.Unique
+import GHC.Types.Unique.Supply
import Control.Monad (ap)
diff --git a/compiler/GHC/CmmToAsm/Reg/Linear/Stats.hs b/compiler/GHC/CmmToAsm/Reg/Linear/Stats.hs
index 1176b220a3..84acc3a417 100644
--- a/compiler/GHC/CmmToAsm/Reg/Linear/Stats.hs
+++ b/compiler/GHC/CmmToAsm/Reg/Linear/Stats.hs
@@ -12,7 +12,7 @@ import GHC.CmmToAsm.Reg.Linear.Base
import GHC.CmmToAsm.Reg.Liveness
import GHC.CmmToAsm.Instr
-import UniqFM
+import GHC.Types.Unique.FM
import Outputable
import State
diff --git a/compiler/GHC/CmmToAsm/Reg/Liveness.hs b/compiler/GHC/CmmToAsm/Reg/Liveness.hs
index d1c4c8f498..5f5d4c8ff3 100644
--- a/compiler/GHC/CmmToAsm/Reg/Liveness.hs
+++ b/compiler/GHC/CmmToAsm/Reg/Liveness.hs
@@ -53,9 +53,9 @@ import Digraph
import MonadUtils
import Outputable
import GHC.Platform
-import UniqSet
-import UniqFM
-import UniqSupply
+import GHC.Types.Unique.Set
+import GHC.Types.Unique.FM
+import GHC.Types.Unique.Supply
import Bag
import State
diff --git a/compiler/GHC/CmmToAsm/Reg/Target.hs b/compiler/GHC/CmmToAsm/Reg/Target.hs
index a45d70c826..183d329790 100644
--- a/compiler/GHC/CmmToAsm/Reg/Target.hs
+++ b/compiler/GHC/CmmToAsm/Reg/Target.hs
@@ -28,7 +28,7 @@ import GHC.Platform.Reg.Class
import GHC.CmmToAsm.Format
import Outputable
-import Unique
+import GHC.Types.Unique
import GHC.Platform
import qualified GHC.CmmToAsm.X86.Regs as X86
View Lorry Controller Status