DPH: update command line options of DPH tests

testsuite/tests/ghc-regress/dph/diophantine/dph-diophantine.T

@@ -7,7 +7,7 @@ test    ('dph-diophantine-opt'
           , only_ways(['normal', 'threaded1', 'threaded2']) ] 
         , multimod_compile_and_run 
         , [ 'Main'
-          , '-Odph -fcpr-off -package dph-par -package dph-prim-par'])
+          , '-Odph -fdph-par'])
 
 test    ('dph-diophantine-fast' 
         , [ reqlib('dph-par')
@@ -15,5 +15,5 @@ test    ('dph-diophantine-fast'
           , only_ways(['normal', 'threaded1', 'threaded2']) ] 
         , multimod_compile_and_run 
         , [ 'Main'
-          , '-O -fno-rewrite-rules -package dph-par -package dph-prim-par'])
+          , '-O -fno-enable-rewrite-rules -fdph-par'])
 

testsuite/tests/ghc-regress/dph/dotp/dph-dotp.T

@@ -7,7 +7,7 @@ test    ('dph-dotp-opt'
           , only_ways(['normal', 'threaded1', 'threaded2']) ] 
         , multimod_compile_and_run 
         , [ 'Main'
-          , '-Odph -funbox-strict-fields -fcpr-off -package dph-par -package dph-prim-par'])
+          , '-Odph -fdph-par'])
 
 test    ('dph-dotp-fast' 
         , [ reqlib('dph-par')
@@ -15,6 +15,6 @@ test    ('dph-dotp-fast'
           , only_ways(['normal', 'threaded1', 'threaded2']) ] 
         , multimod_compile_and_run 
         , [ 'Main'
-          , '-O -fno-rewrite-rules -package dph-par -package dph-prim-par'])
+          , '-O -fno-enable-rewrite-rules -fdph-par'])
 
 

testsuite/tests/ghc-regress/dph/primespj/dph-primespj.T

@@ -7,7 +7,7 @@ test    ('dph-primespj-opt'
           , only_ways(['normal', 'threaded1', 'threaded2']) ] 
         , multimod_compile_and_run 
         , [ 'Main'
-          , '-Odph -funbox-strict-fields -fcpr-off -package dph-par -package dph-prim-par'])
+          , '-Odph -fdph-par'])
 
 test    ('dph-primespj-fast' 
         , [ reqlib('dph-par')
@@ -15,6 +15,6 @@ test    ('dph-primespj-fast'
           , only_ways(['normal', 'threaded1', 'threaded2']) ] 
         , multimod_compile_and_run 
         , [ 'Main'
-          , '-O -fno-rewrite-rules -package dph-par -package dph-prim-par'])
+          , '-O -fno-enable-rewrite-rules -fdph-par'])
 
 

testsuite/tests/ghc-regress/dph/quickhull/dph-quickhull.T

@@ -7,8 +7,7 @@ test    ('dph-quickhull-opt'
           , only_ways(['normal', 'threaded1', 'threaded2']) ] 
         , multimod_compile_and_run 
         , [ 'Main'
-          , '-Odph -funfolding-use-threshold30 -funbox-strict-fields -fcpr-off -package dph-par -package dph-prim-par'])
-
+          , '-Odph -funfolding-use-threshold30 -fdph-par'])
 
 test    ('dph-quickhull-fast' 
         , [ reqlib('dph-par')
@@ -16,6 +15,6 @@ test    ('dph-quickhull-fast'
           , only_ways(['normal', 'threaded1', 'threaded2']) ] 
         , multimod_compile_and_run 
         , [ 'Main'
-          , '-O -fno-rewrite-rules -package dph-par -package dph-prim-par'])
+          , '-O -fno-enable-rewrite-rules -fdph-par'])
 
 

testsuite/tests/ghc-regress/dph/smvm/dph-smvm.T

@@ -25,6 +25,6 @@ if testFile != 'nothing':
           ] 
         , multimod_compile_and_run 
         , [ 'Main'
-          , '-Odph -package dph-par -package dph-prim-par'])
+          , '-Odph -fdph-par'])
 
 

testsuite/tests/ghc-regress/dph/sumnats/dph-sumnats.T

@@ -5,6 +5,6 @@ test    ('dph-sumnats'
           , only_ways(['normal', 'threaded1', 'threaded2']) ] 
         , multimod_compile_and_run 
         , [ 'Main'
-          , '-Odph -funbox-strict-fields -fcpr-off -package dph-par -package dph-prim-par'])
+          , '-Odph -fdph-par'])
 
 

testsuite/tests/ghc-regress/dph/words/dph-words.T

@@ -7,7 +7,7 @@ test    ('dph-words-opt'
           , only_ways(['normal']) ] 
         , multimod_compile_and_run 
         , [ 'Main'
-          , '-Odph -funbox-strict-fields -fcpr-off -package dph-par -package dph-prim-par'])
+          , '-Odph -fdph-par'])
 
 
 test    ('dph-words-fast' 
@@ -16,6 +16,6 @@ test    ('dph-words-fast'
           , only_ways(['normal']) ] 
         , multimod_compile_and_run 
         , [ 'Main'
-          , '-O -fno-rewrite-rules -package dph-par -package dph-prim-par'])
+          , '-O -fno-enable-rewrite-rules -fdph-par'])