diff options
Diffstat (limited to 'testsuite')
18 files changed, 19 insertions, 19 deletions
diff --git a/testsuite/tests/callarity/unittest/CallArity1.hs b/testsuite/tests/callarity/unittest/CallArity1.hs index c42232b5dd..fec7a1fe64 100644 --- a/testsuite/tests/callarity/unittest/CallArity1.hs +++ b/testsuite/tests/callarity/unittest/CallArity1.hs @@ -4,7 +4,7 @@ import GHC.Core.Utils import GHC.Types.Id import GHC.Core.Type import GHC.Core.Make -import GHC.Core.Op.CallArity (callArityRHS) +import GHC.Core.Opt.CallArity (callArityRHS) import GHC.Types.Id.Make import SysTools import GHC.Driver.Session diff --git a/testsuite/tests/codeGen/should_run/T16449_2.hs b/testsuite/tests/codeGen/should_run/T16449_2.hs index 0a08ffde23..de461ab438 100644 --- a/testsuite/tests/codeGen/should_run/T16449_2.hs +++ b/testsuite/tests/codeGen/should_run/T16449_2.hs @@ -7,7 +7,7 @@ import GHC.Int -- Test that large unchecked shifts, which constitute undefined behavior, do -- not crash the compiler and instead evaluate to 0. --- See Note [Guarding against silly shifts] in GHC.Core.Op.ConstantFold. +-- See Note [Guarding against silly shifts] in GHC.Core.Opt.ConstantFold. -- Shift should be larger than the word size (e.g. 64 on 64-bit) for this test. main = print (I# (uncheckedIShiftL# 1# 1000#)) diff --git a/testsuite/tests/determinism/determ014/A.hs b/testsuite/tests/determinism/determ014/A.hs index 91d874cde7..f1eaa2dbd7 100644 --- a/testsuite/tests/determinism/determ014/A.hs +++ b/testsuite/tests/determinism/determ014/A.hs @@ -7,7 +7,7 @@ , PolyKinds -- Comment out PolyKinds and the bug goes away. #-} {-# OPTIONS_GHC -O #-} - -- The bug is in GHC.Core.Op.Simplify.Utils.abstractFloats, so we need -O to trigger it + -- The bug is in GHC.Core.Opt.Simplify.Utils.abstractFloats, so we need -O to trigger it module KeyValue where diff --git a/testsuite/tests/eyeball/inline4.hs b/testsuite/tests/eyeball/inline4.hs index bf7cf7382c..5119134b01 100644 --- a/testsuite/tests/eyeball/inline4.hs +++ b/testsuite/tests/eyeball/inline4.hs @@ -15,7 +15,7 @@ Reason: 'a' is inline (not pre/post unconditionally; just ordinary inlining) Then, since ($dm>>) has arity 3, the rhs of (>>) is a PAP, so the arg is floated out, past the big lambdas. -See Note [Unsaturated functions] in GHC.Core.Op.Simplify.Utils +See Note [Unsaturated functions] in GHC.Core.Opt.Simplify.Utils ------------------------------------------------------------ a_s9f{v} [lid] = diff --git a/testsuite/tests/ghc-api/T4891/T4891.hs b/testsuite/tests/ghc-api/T4891/T4891.hs index 2ee3126642..9c897f7e10 100644 --- a/testsuite/tests/ghc-api/T4891/T4891.hs +++ b/testsuite/tests/ghc-api/T4891/T4891.hs @@ -2,7 +2,7 @@ module Main where import GHC.ByteCode.Linker -import GHC.Core.Op.Monad +import GHC.Core.Opt.Monad import Data.Array import GHC.Core.DataCon import GHC diff --git a/testsuite/tests/perf/join_points/join005.hs b/testsuite/tests/perf/join_points/join005.hs index de8a50b967..611a3de4ae 100644 --- a/testsuite/tests/perf/join_points/join005.hs +++ b/testsuite/tests/perf/join_points/join005.hs @@ -17,7 +17,7 @@ It's hard to test for this, but what should happen is that go gets W/W'd and the worker is a join point (else Core Lint will complain). Interestingly, go is *not* CPR'd, because then the worker couldn't be a join point, but once the simplifier runs, the worker ends up returning Int# anyway. See Note [Don't CPR -join points] in GHC.Core.Op.WorkWrap. +join points] in GHC.Core.Opt.WorkWrap. -} main = print $ sumOfMultiplesOf 2 [1..10] diff --git a/testsuite/tests/perf/should_run/MethSharing.hs b/testsuite/tests/perf/should_run/MethSharing.hs index 2c6b0857bd..6177151ff7 100644 --- a/testsuite/tests/perf/should_run/MethSharing.hs +++ b/testsuite/tests/perf/should_run/MethSharing.hs @@ -91,7 +91,7 @@ Main.loop [InlPrag=NOINLINE (sat-args=2), Occ=LoopBreaker] This is a bit disappointing. I would have expected GHC to float out the application of (^) to the two dictionaries during full laziness (note that (^) has arity 2 so the application is oversaturated). Why -doesn't that happen? GHC.Core.Op.SetLevels (if this is the right place to look) +doesn't that happen? GHC.Core.Opt.SetLevels (if this is the right place to look) has this: -} diff --git a/testsuite/tests/perf/should_run/T15226.hs b/testsuite/tests/perf/should_run/T15226.hs index 0704b77284..6f68bde0b2 100644 --- a/testsuite/tests/perf/should_run/T15226.hs +++ b/testsuite/tests/perf/should_run/T15226.hs @@ -6,7 +6,7 @@ import Prelude hiding (repeat) -- We want to be sure that the compiler *doesn't* know that -- all the elements of the list are in WHNF, because if it --- does, GHC.Core.Op.ConstantFold may erase the seq#'s altogether. +-- does, GHC.Core.Opt.ConstantFold may erase the seq#'s altogether. repeat :: a -> [a] repeat a = res where res = a : res diff --git a/testsuite/tests/perf/should_run/T15226a.hs b/testsuite/tests/perf/should_run/T15226a.hs index 3f1937627f..faaa530de9 100644 --- a/testsuite/tests/perf/should_run/T15226a.hs +++ b/testsuite/tests/perf/should_run/T15226a.hs @@ -7,7 +7,7 @@ import Data.Coerce -- We want to be sure that the compiler *doesn't* know that -- all the elements of the list are in WHNF, because if it --- does, GHC.Core.Op.ConstantFold may erase the seq#'s altogether. +-- does, GHC.Core.Opt.ConstantFold may erase the seq#'s altogether. repeat :: a -> [a] repeat a = res where res = a : res diff --git a/testsuite/tests/polykinds/T10934.hs b/testsuite/tests/polykinds/T10934.hs index 91d874cde7..f1eaa2dbd7 100644 --- a/testsuite/tests/polykinds/T10934.hs +++ b/testsuite/tests/polykinds/T10934.hs @@ -7,7 +7,7 @@ , PolyKinds -- Comment out PolyKinds and the bug goes away. #-} {-# OPTIONS_GHC -O #-} - -- The bug is in GHC.Core.Op.Simplify.Utils.abstractFloats, so we need -O to trigger it + -- The bug is in GHC.Core.Opt.Simplify.Utils.abstractFloats, so we need -O to trigger it module KeyValue where diff --git a/testsuite/tests/simplCore/should_compile/T14270a.hs b/testsuite/tests/simplCore/should_compile/T14270a.hs index 1f90993d5d..b69de35eec 100644 --- a/testsuite/tests/simplCore/should_compile/T14270a.hs +++ b/testsuite/tests/simplCore/should_compile/T14270a.hs @@ -1,6 +1,6 @@ {-# LANGUAGE TypeApplications, ScopedTypeVariables, GADTs, RankNTypes, PolyKinds, KindSignatures #-} -{-# OPTIONS_GHC -O2 #-} -- We are provoking a bug in GHC.Core.Op.SpecConstr +{-# OPTIONS_GHC -O2 #-} -- We are provoking a bug in GHC.Core.Opt.SpecConstr module T14270a where @@ -25,4 +25,4 @@ g kv x = case kv of -- The point here is that the call to f looks like -- f @(a |> co) (T2 @(a |> co)) -- where 'co' is bound by the pattern match on K1 --- See Note [SpecConstr and casts] in GHC.Core.Op.SpecConstr +-- See Note [SpecConstr and casts] in GHC.Core.Opt.SpecConstr diff --git a/testsuite/tests/simplCore/should_compile/T3831.hs b/testsuite/tests/simplCore/should_compile/T3831.hs index 163f610a2e..554e786cf2 100644 --- a/testsuite/tests/simplCore/should_compile/T3831.hs +++ b/testsuite/tests/simplCore/should_compile/T3831.hs @@ -2,7 +2,7 @@ {-# LANGUAGE ScopedTypeVariables, FlexibleInstances #-} -- This test has a deep nest of join points, which led to --- an exponential blow-up in GHC.Core.Op.SpecConstr +-- an exponential blow-up in GHC.Core.Opt.SpecConstr module T3831(setAttributes) where diff --git a/testsuite/tests/simplCore/should_compile/simpl018.hs b/testsuite/tests/simplCore/should_compile/simpl018.hs index 75d19b9d8c..a0e940fe13 100644 --- a/testsuite/tests/simplCore/should_compile/simpl018.hs +++ b/testsuite/tests/simplCore/should_compile/simpl018.hs @@ -1,6 +1,6 @@ {-# LANGUAGE UnboxedTuples #-} --- See Note [Float coercions (unlifted)] in GHC.Core.Op.Simplify +-- See Note [Float coercions (unlifted)] in GHC.Core.Opt.Simplify -- This one gave a CoreLint error when compiled optimised -- -- See also #1718, of which this is a simplified version diff --git a/testsuite/tests/simplCore/should_compile/spec002.hs b/testsuite/tests/simplCore/should_compile/spec002.hs index 619bf274c7..915f32960f 100644 --- a/testsuite/tests/simplCore/should_compile/spec002.hs +++ b/testsuite/tests/simplCore/should_compile/spec002.hs @@ -1,6 +1,6 @@ {-# OPTIONS_GHC -O2 #-} --- Ths one fooled the rule-matching in GHC.Core.Op.SpecConstr, and gave a CoreLint error +-- Ths one fooled the rule-matching in GHC.Core.Opt.SpecConstr, and gave a CoreLint error module Foo where diff --git a/testsuite/tests/simplCore/should_run/simplrun007.hs b/testsuite/tests/simplCore/should_run/simplrun007.hs index 6940e8d546..36bab7788b 100644 --- a/testsuite/tests/simplCore/should_run/simplrun007.hs +++ b/testsuite/tests/simplCore/should_run/simplrun007.hs @@ -1,6 +1,6 @@ {-# LANGUAGE MagicHash #-} --- Actually, this exercises GHC.Core.Op.ConstantFold, but this is the closest +-- Actually, this exercises GHC.Core.Opt.ConstantFold, but this is the closest -- place I could find to put it... import GHC.Exts diff --git a/testsuite/tests/simplCore/should_run/simplrun009.hs b/testsuite/tests/simplCore/should_run/simplrun009.hs index 4ae0d2f255..0eb42914b6 100644 --- a/testsuite/tests/simplCore/should_run/simplrun009.hs +++ b/testsuite/tests/simplCore/should_run/simplrun009.hs @@ -6,7 +6,7 @@ -- It produces a nested unfold that should look something -- like the code below. Note the 'lvl1_shW'. It is BAD -- if this is a lambda instead; you get a lot more allocation --- See Note [Escaping a value lambda] in GHC.Core.Op.SetLevels +-- See Note [Escaping a value lambda] in GHC.Core.Opt.SetLevels {- diff --git a/testsuite/tests/stranal/should_compile/T10482a.hs b/testsuite/tests/stranal/should_compile/T10482a.hs index b9e5351587..a3d70f25fc 100644 --- a/testsuite/tests/stranal/should_compile/T10482a.hs +++ b/testsuite/tests/stranal/should_compile/T10482a.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-unbox-small-strict-fields #-} -- Makes f2 a bit more challenging --- Tests inspired by Note [CPR examples] in GHC.Core.Op.DmdAnal, and #10482 +-- Tests inspired by Note [CPR examples] in GHC.Core.Opt.DmdAnal, and #10482 module Foo where diff --git a/testsuite/tests/stranal/should_run/strun003.hs b/testsuite/tests/stranal/should_run/strun003.hs index 90594a5c40..893847aa72 100644 --- a/testsuite/tests/stranal/should_run/strun003.hs +++ b/testsuite/tests/stranal/should_run/strun003.hs @@ -2,7 +2,7 @@ -- But it won't if the strictness analyser thinks that 'len' is use -- strictly, which was the case in GHC 6.0 --- See the io_hack_reqd in GHC.Core.Op.DmdAnal +-- See the io_hack_reqd in GHC.Core.Opt.DmdAnal module Main where |