[commit: testsuite] master: Don't run opt versions of DPH tests at all (d02c1d6)
git at git.haskell.org
git at git.haskell.org
Wed Oct 23 05:44:16 UTC 2013
Repository : ssh://git@git.haskell.org/testsuite
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/d02c1d6f58c61b5642a93c2186dea871536a8b9e/testsuite
>---------------------------------------------------------------
commit d02c1d6f58c61b5642a93c2186dea871536a8b9e
Author: Ben Lippmeier <benl at ouroborus.net>
Date: Wed Oct 23 16:38:45 2013 +1100
Don't run opt versions of DPH tests at all
>---------------------------------------------------------------
d02c1d6f58c61b5642a93c2186dea871536a8b9e
tests/dph/classes/dph-classes.T | 1 +
tests/dph/diophantine/dph-diophantine.T | 9 ---------
tests/dph/dotp/dph-dotp.T | 19 -------------------
tests/dph/nbody/dph-nbody.T | 24 ------------------------
tests/dph/primespj/dph-primespj.T | 10 ----------
tests/dph/quickhull/dph-quickhull.T | 24 ------------------------
tests/dph/smvm/dph-smvm.T | 4 ++--
tests/dph/sumnats/dph-sumnats.T | 1 +
tests/dph/words/dph-words.T | 24 ------------------------
9 files changed, 4 insertions(+), 112 deletions(-)
diff --git a/tests/dph/classes/dph-classes.T b/tests/dph/classes/dph-classes.T
index de1ea83..f2acc88 100644
--- a/tests/dph/classes/dph-classes.T
+++ b/tests/dph/classes/dph-classes.T
@@ -1,3 +1,4 @@
+
test ('dph-classes-vseg-fast'
, [ normal
, extra_clean(['Main.o', 'Main.hi', 'DefsVect.hi', 'DefsVect.o'])
diff --git a/tests/dph/diophantine/dph-diophantine.T b/tests/dph/diophantine/dph-diophantine.T
index b051cd2..fbcf565 100644
--- a/tests/dph/diophantine/dph-diophantine.T
+++ b/tests/dph/diophantine/dph-diophantine.T
@@ -1,13 +1,4 @@
-test ('dph-diophantine-copy-opt'
- , [ when(fast(), skip)
- , outputdir('opt')
- , reqlib('dph-lifted-copy')
- , reqlib('dph-prim-par')
- , only_ways(['normal', 'threaded1', 'threaded2']) ]
- , multimod_compile_and_run
- , [ 'Main'
- , '-Odph -package dph-lifted-copy'])
test ('dph-diophantine-copy-fast'
, [ outputdir('fast')
diff --git a/tests/dph/dotp/dph-dotp.T b/tests/dph/dotp/dph-dotp.T
index 2bb95ba..e496442 100644
--- a/tests/dph/dotp/dph-dotp.T
+++ b/tests/dph/dotp/dph-dotp.T
@@ -1,23 +1,4 @@
-test ('dph-dotp-copy-opt'
- , [ outputdir('copy-opt')
- , when(fast(), skip)
- , reqlib('dph-lifted-copy')
- , reqlib('dph-prim-par')
- , only_ways(['normal', 'threaded1', 'threaded2']) ]
- , multimod_compile_and_run
- , [ 'Main'
- , '-Odph -package dph-lifted-copy -package dph-prim-par'])
-
-test ('dph-dotp-vseg-opt'
- , [ outputdir('vseg-opt')
- , when(fast(), skip)
- , reqlib('dph-lifted-vseg')
- , reqlib('dph-prim-par')
- , only_ways(['normal', 'threaded1', 'threaded2']) ]
- , multimod_compile_and_run
- , [ 'Main'
- , '-Odph -package dph-lifted-vseg -package dph-prim-par'])
test ('dph-dotp-copy-fast'
, [ outputdir('copy-fast')
diff --git a/tests/dph/nbody/dph-nbody.T b/tests/dph/nbody/dph-nbody.T
index 9c0031d..11ee313 100644
--- a/tests/dph/nbody/dph-nbody.T
+++ b/tests/dph/nbody/dph-nbody.T
@@ -1,28 +1,4 @@
-test ('dph-nbody-vseg-opt'
- , [ high_memory_usage
- , outputdir('vseg-opt')
- , when(fast(), skip)
- , reqlib('dph-lifted-vseg')
- , reqlib('dph-prim-par')
- , only_ways(['normal', 'threaded1', 'threaded2']) ]
- , multimod_compile_and_run
- , [ 'Main'
- , '-Odph -fno-liberate-case -package dph-lifted-vseg -package dph-prim-par'])
-
-
-test ('dph-nbody-copy-opt'
- , [ high_memory_usage
- , outputdir('copy-opt')
- , when(fast(), skip)
- , reqlib('dph-lifted-copy')
- , reqlib('dph-prim-par')
- , only_ways(['normal', 'threaded1', 'threaded2']) ]
- , multimod_compile_and_run
- , [ 'Main'
- , '-Odph -fno-vectorisation-avoidance -fno-liberate-case -package dph-lifted-copy -package dph-prim-par'])
-
-
test ('dph-nbody-vseg-fast'
, [ outputdir('vseg-fast')
, reqlib('dph-lifted-vseg')
diff --git a/tests/dph/primespj/dph-primespj.T b/tests/dph/primespj/dph-primespj.T
index fc09b8c..8b45cc8 100644
--- a/tests/dph/primespj/dph-primespj.T
+++ b/tests/dph/primespj/dph-primespj.T
@@ -1,14 +1,4 @@
-test ('dph-primespj-copy-opt'
- , [ outputdir('opt')
- , when(fast(), skip)
- , reqlib('dph-lifted-copy')
- , reqlib('dph-prim-par')
- , only_ways(['normal', 'threaded1', 'threaded2']) ]
- , multimod_compile_and_run
- , [ 'Main'
- , '-Odph -package dph-lifted-copy'])
-
test ('dph-primespj-copy-fast'
, [ outputdir('fast')
, reqlib('dph-lifted-copy')
diff --git a/tests/dph/quickhull/dph-quickhull.T b/tests/dph/quickhull/dph-quickhull.T
index bae6981..7d8cf32 100644
--- a/tests/dph/quickhull/dph-quickhull.T
+++ b/tests/dph/quickhull/dph-quickhull.T
@@ -1,28 +1,4 @@
-test ('dph-quickhull-copy-opt'
- , [ high_memory_usage
- , outputdir('copy-opt')
- , when(fast(), skip)
- , reqlib('dph-lifted-copy')
- , reqlib('dph-prim-par')
- , only_ways(['normal', 'threaded1', 'threaded2']) ]
- , multimod_compile_and_run
- , [ 'Main'
- , '-Odph -fno-vectorisation-avoidance -funfolding-use-threshold30 -package dph-lifted-copy -package dph-prim-par'])
-
-
-test ('dph-quickhull-vseg-opt'
- , [ high_memory_usage
- , outputdir('vseg-opt')
- , when(fast(), skip)
- , reqlib('dph-lifted-vseg')
- , reqlib('dph-prim-par')
- , only_ways(['normal', 'threaded1', 'threaded2']) ]
- , multimod_compile_and_run
- , [ 'Main'
- , '-Odph -package dph-lifted-vseg -package dph-prim-par'])
-
-
test ('dph-quickhull-copy-fast'
, [ outputdir('copy-fast')
, reqlib('dph-lifted-copy')
diff --git a/tests/dph/smvm/dph-smvm.T b/tests/dph/smvm/dph-smvm.T
index ae01eff..f2bf31a 100644
--- a/tests/dph/smvm/dph-smvm.T
+++ b/tests/dph/smvm/dph-smvm.T
@@ -25,7 +25,7 @@ if testFile != 'nothing':
]
, multimod_compile_and_run
, [ 'Main'
- , '-Odph -package dph-lifted-copy -package dph-prim-par'])
+ , '-O0 -package dph-lifted-copy -package dph-prim-par'])
test ('dph-smvm-vseg'
, [ outputdir('vseg')
@@ -37,5 +37,5 @@ if testFile != 'nothing':
]
, multimod_compile_and_run
, [ 'Main'
- , '-Odph -package dph-lifted-vseg -package dph-prim-par'])
+ , '-O0 -package dph-lifted-vseg -package dph-prim-par'])
diff --git a/tests/dph/sumnats/dph-sumnats.T b/tests/dph/sumnats/dph-sumnats.T
index 83b301b..66e4b40 100644
--- a/tests/dph/sumnats/dph-sumnats.T
+++ b/tests/dph/sumnats/dph-sumnats.T
@@ -8,6 +8,7 @@ test ('dph-sumnats-copy'
, [ 'Main'
, '-O0 -package dph-lifted-copy'])
+
test ('dph-sumnats-vseg'
, [ outputdir('vseg')
, reqlib('dph-lifted-vseg')
diff --git a/tests/dph/words/dph-words.T b/tests/dph/words/dph-words.T
index 5301f08..7173278 100644
--- a/tests/dph/words/dph-words.T
+++ b/tests/dph/words/dph-words.T
@@ -1,28 +1,4 @@
-test ('dph-words-copy-opt'
- , [ high_memory_usage
- , outputdir('copy-opt')
- , when(fast(), skip)
- , reqlib('dph-lifted-copy')
- , reqlib('dph-prim-par')
- , only_ways(['normal']) ]
- , multimod_compile_and_run
- , [ 'Main'
- , '-Odph -package dph-lifted-copy -package dph-prim-par -fno-liberate-case -fno-spec-constr'])
-
-
-test ('dph-words-vseg-opt'
- , [ high_memory_usage
- , outputdir('vseg-opt')
- , when(fast(), skip)
- , reqlib('dph-lifted-vseg')
- , reqlib('dph-prim-par')
- , only_ways(['normal']) ]
- , multimod_compile_and_run
- , [ 'Main'
- , '-Odph -package dph-lifted-vseg -package dph-prim-par -fno-liberate-case -fno-spec-constr'])
-
-
test ('dph-words-copy-fast'
, [ outputdir('copy-fast')
, reqlib('dph-lifted-copy')
More information about the ghc-commits
mailing list