dph-examples: add specconstr back
authorBen Lippmeier <benl@ouroborus.net>
Thu, 15 Dec 2011 08:22:05 +0000 (19:22 +1100)
committerBen Lippmeier <benl@ouroborus.net>
Thu, 15 Dec 2011 08:22:05 +0000 (19:22 +1100)
dph-examples/Makefile
dph-examples/dph-examples.cabal

index 8d1b86c..15f7213 100644 (file)
@@ -2,28 +2,27 @@
 
 # Package dependencies for DPH examples.
 DPH_DEPENDS = \
-        base           == 4.4.*, \
-        vector         == 0.9.*, \
-        random         == 1.0.*, \
-        old-time       == 1.0.*, \
+       base            == 4.4.*, \
+       vector          == 0.9.*, \
+       random          == 1.0.*, \
+       old-time        == 1.0.*, \
        containers      == 0.4.*, \
-        dph-base       == 0.5.*, \
-        dph-prim-par   == 0.5.*, \
-        dph-lifted-vseg        == 0.5.*, \
+       dph-base        == 0.5.*, \
+       dph-prim-par    == 0.5.*, \
+       dph-lifted-vseg == 0.5.*, \
        HUnit           == 1.2.*
 
 
 # Options for compiling DPH examples.
 DPH_OPTIONS= \
-        -rtsopts \
-        -threaded \
+       -rtsopts \
+       -threaded \
        -fllvm \
-        -Odph \
-        -package dph-lifted-vseg \
-        -fcpr-off \
+       -Odph \
+       -package dph-lifted-vseg \
+       -fcpr-off \
        -fno-liberate-case \
-       -fno-spec-constr \
-        -fsimpl-tick-factor=1000 
+       -fsimpl-tick-factor=1000 
 
 
 .PHONY : all
@@ -39,4 +38,4 @@ dph-examples.cabal : dph-examples.template Makefile
                -DDPH_DEPENDS="$(DPH_DEPENDS)" \
                -DDPH_OPTIONS="$(DPH_OPTIONS)" \
                dph-examples.template dph-examples.cabal 
-       
\ No newline at end of file
+       
index 7bad628..3c028fd 100644 (file)
@@ -30,7 +30,7 @@ Executable dph-smoke-bool
   Main-is:        Main.hs
   other-modules:  Vectorised
   hs-source-dirs: examples/smoke/data/Bool
-  ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fno-spec-constr -fsimpl-tick-factor=1000
+  ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fsimpl-tick-factor=1000
 
 
 -- examples/smoke/prims
@@ -39,7 +39,7 @@ Executable dph-smoke-concat
   main-is:        Main.hs
   other-modules:  Vectorised
   hs-source-dirs: examples/smoke/prims/Concat
-  ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fno-spec-constr -fsimpl-tick-factor=1000
+  ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fsimpl-tick-factor=1000
 
 
 Executable dph-smoke-sumsq
@@ -49,7 +49,7 @@ Executable dph-smoke-sumsq
                   Vectorised
                   Timing Randomish
   hs-source-dirs: examples/smoke/prims/SumSquares/dph lib
-  ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fno-spec-constr -fsimpl-tick-factor=1000
+  ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fsimpl-tick-factor=1000
  
  
 Executable dph-smoke-evens
@@ -59,7 +59,7 @@ Executable dph-smoke-evens
                   Vectorised
                   Timing Randomish
   hs-source-dirs: examples/smoke/prims/Evens/dph lib
-  ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fno-spec-constr -fsimpl-tick-factor=1000
+  ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fsimpl-tick-factor=1000
 
 
 -- examples/smoke/sharing
@@ -68,7 +68,7 @@ Executable dph-smoke-indices
   Main-is:        Main.hs
   other-modules:  Vectorised
   hs-source-dirs: examples/smoke/sharing/Indices lib
-  ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fno-spec-constr -fsimpl-tick-factor=1000
+  ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fsimpl-tick-factor=1000
  
  
 Executable dph-smoke-rank
@@ -76,7 +76,7 @@ Executable dph-smoke-rank
   Main-is:        Main.hs
   other-modules:  Vectorised Util Timing Randomish
   hs-source-dirs: examples/smoke/sharing/Rank lib
-  ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fno-spec-constr -fsimpl-tick-factor=1000
+  ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fsimpl-tick-factor=1000
 
 
 Executable dph-smoke-reverse
@@ -84,7 +84,7 @@ Executable dph-smoke-reverse
   Main-is:        Main.hs
   other-modules:  Vectorised Randomish
   hs-source-dirs: examples/smoke/sharing/Reverse lib
-  ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fno-spec-constr -fsimpl-tick-factor=1000
+  ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fsimpl-tick-factor=1000
 
 
 -- Imaginary ------------------------------------------------------------------
@@ -93,14 +93,14 @@ Executable dph-smoke-reverse
 --   Main-is:        Main.hs
 --   other-modules:  Vectorised
 --   hs-source-dirs: examples/imaginary/Primes lib
---   ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fno-spec-constr -fsimpl-tick-factor=1000
+--   ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fsimpl-tick-factor=1000
 
 Executable dph-imaginary-words
   Build-depends:  base == 4.4.*, vector == 0.9.*, random == 1.0.*, old-time == 1.0.*, containers == 0.4.*, dph-base == 0.5.*, dph-prim-par == 0.5.*, dph-lifted-vseg == 0.5.*, HUnit == 1.2.*
   Main-is:        Main.hs
   other-modules:  Vectorised
   hs-source-dirs: examples/imaginary/Words lib
-  ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fno-spec-constr -fsimpl-tick-factor=1000
+  ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fsimpl-tick-factor=1000
 
 
 -- Spectral -------------------------------------------------------------------
@@ -111,7 +111,7 @@ Executable dph-spectral-dotp
                   Vectorised
                   Timing Randomish
   hs-source-dirs: examples/spectral/DotProduct/dph lib
-  ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fno-spec-constr -fsimpl-tick-factor=1000
+  ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fsimpl-tick-factor=1000
 
 
 Executable dph-spectral-smvm
@@ -120,7 +120,7 @@ Executable dph-spectral-smvm
   other-modules:  Vectorised
                   Timing
   hs-source-dirs: examples/spectral/SMVM/dph lib
-  ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fno-spec-constr -fsimpl-tick-factor=1000
+  ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fsimpl-tick-factor=1000
 
 
 Executable dph-spectral-quickhull
@@ -129,7 +129,7 @@ Executable dph-spectral-quickhull
   other-modules:  Vectorised
                   Timing Points2D.Types SVG
   hs-source-dirs: examples/spectral/QuickHull/dph examples/spectral/QuickHull/lib lib
-  ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fno-spec-constr -fsimpl-tick-factor=1000
+  ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fsimpl-tick-factor=1000
 
 
 Executable dph-spectral-quickhull-vector
@@ -140,7 +140,7 @@ Executable dph-spectral-quickhull-vector
                   QuickHullVector
                   Timing Points2D.Types SVG
   hs-source-dirs: examples/spectral/QuickHull/vector examples/spectral/QuickHull/lib lib
-  ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fno-spec-constr -fsimpl-tick-factor=1000
+  ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fsimpl-tick-factor=1000
 
 
 Executable dph-spectral-quicksort
@@ -149,7 +149,7 @@ Executable dph-spectral-quicksort
   other-modules:  Vectorised
                   Timing
   hs-source-dirs: examples/spectral/QuickSort/dph lib
-  ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fno-spec-constr -fsimpl-tick-factor=1000
+  ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fsimpl-tick-factor=1000
 
 
 -- Real -----------------------------------------------------------------------
@@ -164,7 +164,7 @@ Executable dph-spectral-quicksort
 --                     Gloss.MainArgs Gloss.Draw Gloss.Config
 --     Build-depends:  base == 4.4.*, vector == 0.9.*, random == 1.0.*, old-time == 1.0.*, containers == 0.4.*, dph-base == 0.5.*, dph-prim-par == 0.5.*, dph-lifted-vseg == 0.5.*, HUnit == 1.2.*, parseargs == 0.1.*, gloss == 1.3.*
 --     hs-source-dirs: lib real/NBody real/NBody/Gloss
---     ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fno-spec-constr -fsimpl-tick-factor=1000 -fno-liberate-case
+--     ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fsimpl-tick-factor=1000 -fno-liberate-case
 
 Executable dph-real-nbody
     Main-is:        MainBatch.hs
@@ -177,7 +177,7 @@ Executable dph-real-nbody
                     Batch.MainArgs Batch.Config
     Build-depends:  base == 4.4.*, vector == 0.9.*, random == 1.0.*, old-time == 1.0.*, containers == 0.4.*, dph-base == 0.5.*, dph-prim-par == 0.5.*, dph-lifted-vseg == 0.5.*, HUnit == 1.2.*
     hs-source-dirs: examples/real/NBody examples/real/NBody/Batch lib
-    ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fno-spec-constr -fsimpl-tick-factor=1000
+    ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fsimpl-tick-factor=1000
 
 -- dph-real-nbody is broken due to vectorisation error
 -- *** Vectorisation error ***