Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changes for ghc 9.4.7 #27

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Changes for ghc 9.4.7 #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions repa-algorithms/repa-algorithms.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Synopsis:
Library
Build-Depends:
base >= 4.8 && < 5
, vector >= 0.11 && < 0.13
, vector >= 0.11
, repa == 3.4.1.*

ghc-options:
Expand All @@ -30,7 +30,6 @@ Library
-funbox-strict-fields
-fno-liberate-case
-fno-warn-missing-signatures
-funfolding-keeness-factor=1000
-funfolding-use-threshold=1000

if impl(ghc >= 8.0)
Expand Down
44 changes: 13 additions & 31 deletions repa-examples/repa-examples.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Flag llvm

Executable repa-canny
Build-depends:
base >= 4.8 && < 4.15
base >= 4.8
, repa == 3.4.1.*
, repa-algorithms == 3.4.1.*

Expand All @@ -34,7 +34,6 @@ Executable repa-canny
ghc-options:
-rtsopts
-threaded
-eventlog
-O2
-fmax-simplifier-iterations=20
-fsimplifier-phases=3
Expand All @@ -46,8 +45,8 @@ Executable repa-canny

Executable repa-mmult
Build-depends:
base >= 4.8 && < 4.15
, random == 1.1.*
base >= 4.8
, random == 1.2.*
, repa == 3.4.1.*
, repa-algorithms == 3.4.1.*
, repa-io == 3.4.1.*
Expand All @@ -58,21 +57,19 @@ Executable repa-mmult
ghc-options:
-rtsopts
-threaded
-eventlog
-O2
-fmax-simplifier-iterations=20
-fsimplifier-phases=3
-fno-liberate-case
-funfolding-use-threshold100
-funfolding-keeness-factor100
if flag(llvm)
ghc-options:
-fllvm -optlo-O3


Executable repa-laplace
Build-depends:
base >= 4.8 && < 4.15
base >= 4.8
, repa == 3.4.1.*
, repa-io == 3.4.1.*
, template-haskell
Expand All @@ -83,7 +80,6 @@ Executable repa-laplace
ghc-options:
-rtsopts
-threaded
-eventlog
-O2
-fmax-simplifier-iterations=20
-fsimplifier-phases=3
Expand All @@ -95,7 +91,7 @@ Executable repa-laplace

Executable repa-fft2d
Build-depends:
base >= 4.8 && < 4.15
base >= 4.8
, repa == 3.4.1.*
, repa-algorithms == 3.4.1.*
, repa-io == 3.4.1.*
Expand All @@ -105,21 +101,19 @@ Executable repa-fft2d
ghc-options:
-rtsopts
-threaded
-eventlog
-O2
-fmax-simplifier-iterations=20
-fsimplifier-phases=3
-fno-liberate-case
-funfolding-use-threshold100
-funfolding-keeness-factor100
if flag(llvm)
ghc-options:
-fllvm -optlo-O3


Executable repa-fft2d-highpass
Build-depends:
base >= 4.8 && < 4.15
base >= 4.8
, repa == 3.4.1.*
, repa-algorithms == 3.4.1.*
, repa-io == 3.4.1.*
Expand All @@ -129,21 +123,19 @@ Executable repa-fft2d-highpass
ghc-options:
-rtsopts
-threaded
-eventlog
-O2
-fmax-simplifier-iterations=20
-fsimplifier-phases=3
-fno-liberate-case
-funfolding-use-threshold100
-funfolding-keeness-factor100
if flag(llvm)
ghc-options:
-fllvm -optlo-O3


Executable repa-fft3d-highpass
Build-depends:
base >= 4.8 && < 4.15
base >= 4.8
, repa == 3.4.1.*
, repa-algorithms == 3.4.1.*

Expand All @@ -152,45 +144,41 @@ Executable repa-fft3d-highpass
ghc-options:
-rtsopts
-threaded
-eventlog
-O2
-fmax-simplifier-iterations=20
-fsimplifier-phases=3
-fno-liberate-case
-funfolding-use-threshold100
-funfolding-keeness-factor100
if flag(llvm)
ghc-options:
-fllvm -optlo-O3


Executable repa-blur
Build-depends:
base >= 4.8 && < 4.15
base >= 4.8
, repa == 3.4.1.*
, repa-algorithms == 3.4.1.*
, vector >= 0.11 && < 0.13
, vector >= 0.11

Main-is: examples/Blur/src-repa/Main.hs
hs-source-dirs: examples/Blur/src-repa .
ghc-options:
-rtsopts
-threaded
-eventlog
-O2
-fmax-simplifier-iterations=20
-fsimplifier-phases=3
-fno-liberate-case
-funfolding-use-threshold100
-funfolding-keeness-factor100
if flag(llvm)
ghc-options:
-fllvm -optlo-O3


Executable repa-sobel
Build-depends:
base >= 4.8 && < 4.15
base >= 4.8
, repa == 3.4.1.*
, repa-algorithms == 3.4.1.*

Expand All @@ -200,58 +188,52 @@ Executable repa-sobel
ghc-options:
-rtsopts
-threaded
-eventlog
-O2
-fmax-simplifier-iterations=20
-fsimplifier-phases=3
-fno-liberate-case
-funfolding-use-threshold100
-funfolding-keeness-factor100
if flag(llvm)
ghc-options:
-fllvm -optlo-O3


Executable repa-volume
Build-depends:
base >= 4.8 && < 4.15
base >= 4.8
, repa == 3.4.1.*
, repa-io == 3.4.1.*

Main-is: examples/Volume/Main.hs
ghc-options:
-rtsopts
-threaded
-eventlog
-O2
-fmax-simplifier-iterations=20
-fsimplifier-phases=3
-fno-liberate-case
-funfolding-use-threshold100
-funfolding-keeness-factor100
if flag(llvm)
ghc-options:
-fllvm -optlo-O3


Executable repa-unit-test
Build-depends:
base >= 4.8 && < 4.15
base >= 4.8
, repa == 3.4.1.*
, QuickCheck >= 2.8 && < 2.14
, QuickCheck >= 2.8

Main-is: examples/UnitTesting/UnitTesting.hs
hs-source-dirs: examples/UnitTesting .
ghc-options:
-rtsopts
-threaded
-eventlog
-O2
-fmax-simplifier-iterations=20
-fsimplifier-phases=3
-fno-liberate-case
-funfolding-use-threshold100
-funfolding-keeness-factor100
if flag(llvm)
ghc-options:
-fllvm -optlo-O3
Expand Down
2 changes: 1 addition & 1 deletion repa-io/repa-io.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Library
, bytestring >= 0.10 && < 0.12
, old-time == 1.1.*
, repa == 3.4.*
, vector >= 0.11 && < 0.13
, vector >= 0.11

ghc-options:
-O2
Expand Down
25 changes: 12 additions & 13 deletions repa/Data/Array/Repa/Eval/Elt.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ module Data.Array.Repa.Eval.Elt
(Elt (..))
where
import GHC.Prim
import GHC.Exts
import GHC.Types
import GHC.Word
import GHC.Int
Expand Down Expand Up @@ -125,7 +124,7 @@ instance Elt Bool where
-- Floating -------------------------------------------------------------------
instance Elt Float where
{-# INLINE touch #-}
touch (F# f)
touch f
= IO (\state -> case touch# f state of
state' -> (# state', () #))

Expand All @@ -138,7 +137,7 @@ instance Elt Float where

instance Elt Double where
{-# INLINE touch #-}
touch (D# d)
touch d
= IO (\state -> case touch# d state of
state' -> (# state', () #))

Expand All @@ -152,7 +151,7 @@ instance Elt Double where
-- Int ------------------------------------------------------------------------
instance Elt Int where
{-# INLINE touch #-}
touch (I# i)
touch i
= IO (\state -> case touch# i state of
state' -> (# state', () #))

Expand All @@ -164,7 +163,7 @@ instance Elt Int where

instance Elt Int8 where
{-# INLINE touch #-}
touch (I8# w)
touch w
= IO (\state -> case touch# w state of
state' -> (# state', () #))

Expand All @@ -177,7 +176,7 @@ instance Elt Int8 where

instance Elt Int16 where
{-# INLINE touch #-}
touch (I16# w)
touch w
= IO (\state -> case touch# w state of
state' -> (# state', () #))

Expand All @@ -190,7 +189,7 @@ instance Elt Int16 where

instance Elt Int32 where
{-# INLINE touch #-}
touch (I32# w)
touch w
= IO (\state -> case touch# w state of
state' -> (# state', () #))

Expand All @@ -203,7 +202,7 @@ instance Elt Int32 where

instance Elt Int64 where
{-# INLINE touch #-}
touch (I64# w)
touch w
= IO (\state -> case touch# w state of
state' -> (# state', () #))

Expand All @@ -217,7 +216,7 @@ instance Elt Int64 where
-- Word -----------------------------------------------------------------------
instance Elt Word where
{-# INLINE touch #-}
touch (W# i)
touch i
= IO (\state -> case touch# i state of
state' -> (# state', () #))

Expand All @@ -230,7 +229,7 @@ instance Elt Word where

instance Elt Word8 where
{-# INLINE touch #-}
touch (W8# w)
touch w
= IO (\state -> case touch# w state of
state' -> (# state', () #))

Expand All @@ -243,7 +242,7 @@ instance Elt Word8 where

instance Elt Word16 where
{-# INLINE touch #-}
touch (W16# w)
touch w
= IO (\state -> case touch# w state of
state' -> (# state', () #))

Expand All @@ -256,7 +255,7 @@ instance Elt Word16 where

instance Elt Word32 where
{-# INLINE touch #-}
touch (W32# w)
touch w
= IO (\state -> case touch# w state of
state' -> (# state', () #))

Expand All @@ -269,7 +268,7 @@ instance Elt Word32 where

instance Elt Word64 where
{-# INLINE touch #-}
touch (W64# w)
touch w
= IO (\state -> case touch# w state of
state' -> (# state', () #))

Expand Down