Move tests from tests/ghc-regress/* to just tests/*

6 files changed, 84 insertions, 0 deletions

diff --git a/testsuite/tests/dph/primespj/Main.hs b/testsuite/tests/dph/primespj/Main.hs
new file mode 100644
index 0000000000..049e6a3e04
--- /dev/null
+++ b/testsuite/tests/dph/primespj/Main.hs
@@ -0,0 +1,30 @@
+import Control.Exception (evaluate)
+import System.Console.GetOpt
+
+import Data.Array.Parallel.PArray (PArray)
+import qualified Data.Array.Parallel.PArray as P
+
+import PrimesVect (primesVect)
+import Debug.Trace
+
+
+primesList :: Int -> [Int]
+primesList 1 = []
+primesList n = sps ++ [ i | i <- [sq+1..n], multiple sps i ]
+  where
+    sps = primesList sq 
+    sq  = floor $ sqrt $ fromIntegral n
+
+    multiple :: [Int] -> Int -> Bool
+    multiple ps i = and [i `mod` p /= 0 | p <- ps]
+
+
+main 
+ = do	let n			= 1000
+	let resultViaNDP	= P.toList $ primesVect n
+	let resultViaLists	= primesList n
+	
+	print resultViaNDP
+	print resultViaLists
+	print $ resultViaNDP == resultViaLists
+	
diff --git a/testsuite/tests/dph/primespj/Makefile b/testsuite/tests/dph/primespj/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/dph/primespj/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/dph/primespj/PrimesVect.hs b/testsuite/tests/dph/primespj/PrimesVect.hs
new file mode 100644
index 0000000000..34b3a568b7
--- /dev/null
+++ b/testsuite/tests/dph/primespj/PrimesVect.hs
@@ -0,0 +1,25 @@
+{-# LANGUAGE ParallelArrays #-}
+{-# OPTIONS -fvectorise #-}
+module PrimesVect (primesVect)
+
+where
+import Data.Array.Parallel
+import Data.Array.Parallel.Prelude.Int 
+import qualified Prelude
+
+primesVect:: Int -> PArray Int
+primesVect n = toPArrayP (primesVect' n)
+
+primesVect':: Int -> [:Int:]
+primesVect' n  
+  | n == 1    = emptyP 
+  | n == 2    = singletonP 2
+  | otherwise = sps +:+ [: i | i <- enumFromToP (sq+1) n, notMultiple sps i:] 
+  where
+
+    sps = primesVect' sq
+    sq =  sqrt n
+
+    notMultiple :: [:Int:] -> Int -> Bool
+    notMultiple ps i = andP [: mod i p /= 0 | p <- ps:]
+
diff --git a/testsuite/tests/dph/primespj/dph-primespj-fast.stdout b/testsuite/tests/dph/primespj/dph-primespj-fast.stdout
new file mode 100644
index 0000000000..d935f68b11
--- /dev/null
+++ b/testsuite/tests/dph/primespj/dph-primespj-fast.stdout
@@ -0,0 +1,3 @@
+[2,3,5,7,11,13,17,19,23,29,31,37,41,43,47,53,59,61,67,71,73,79,83,89,97,101,103,107,109,113,127,131,137,139,149,151,157,163,167,173,179,181,191,193,197,199,211,223,227,229,233,239,241,251,257,263,269,271,277,281,283,293,307,311,313,317,331,337,347,349,353,359,367,373,379,383,389,397,401,409,419,421,431,433,439,443,449,457,461,463,467,479,487,491,499,503,509,521,523,541,547,557,563,569,571,577,587,593,599,601,607,613,617,619,631,641,643,647,653,659,661,673,677,683,691,701,709,719,727,733,739,743,751,757,761,769,773,787,797,809,811,821,823,827,829,839,853,857,859,863,877,881,883,887,907,911,919,929,937,941,947,953,967,971,977,983,991,997]
+[2,3,5,7,11,13,17,19,23,29,31,37,41,43,47,53,59,61,67,71,73,79,83,89,97,101,103,107,109,113,127,131,137,139,149,151,157,163,167,173,179,181,191,193,197,199,211,223,227,229,233,239,241,251,257,263,269,271,277,281,283,293,307,311,313,317,331,337,347,349,353,359,367,373,379,383,389,397,401,409,419,421,431,433,439,443,449,457,461,463,467,479,487,491,499,503,509,521,523,541,547,557,563,569,571,577,587,593,599,601,607,613,617,619,631,641,643,647,653,659,661,673,677,683,691,701,709,719,727,733,739,743,751,757,761,769,773,787,797,809,811,821,823,827,829,839,853,857,859,863,877,881,883,887,907,911,919,929,937,941,947,953,967,971,977,983,991,997]
+True
diff --git a/testsuite/tests/dph/primespj/dph-primespj-opt.stdout b/testsuite/tests/dph/primespj/dph-primespj-opt.stdout
new file mode 100644
index 0000000000..d935f68b11
--- /dev/null
+++ b/testsuite/tests/dph/primespj/dph-primespj-opt.stdout
@@ -0,0 +1,3 @@
+[2,3,5,7,11,13,17,19,23,29,31,37,41,43,47,53,59,61,67,71,73,79,83,89,97,101,103,107,109,113,127,131,137,139,149,151,157,163,167,173,179,181,191,193,197,199,211,223,227,229,233,239,241,251,257,263,269,271,277,281,283,293,307,311,313,317,331,337,347,349,353,359,367,373,379,383,389,397,401,409,419,421,431,433,439,443,449,457,461,463,467,479,487,491,499,503,509,521,523,541,547,557,563,569,571,577,587,593,599,601,607,613,617,619,631,641,643,647,653,659,661,673,677,683,691,701,709,719,727,733,739,743,751,757,761,769,773,787,797,809,811,821,823,827,829,839,853,857,859,863,877,881,883,887,907,911,919,929,937,941,947,953,967,971,977,983,991,997]
+[2,3,5,7,11,13,17,19,23,29,31,37,41,43,47,53,59,61,67,71,73,79,83,89,97,101,103,107,109,113,127,131,137,139,149,151,157,163,167,173,179,181,191,193,197,199,211,223,227,229,233,239,241,251,257,263,269,271,277,281,283,293,307,311,313,317,331,337,347,349,353,359,367,373,379,383,389,397,401,409,419,421,431,433,439,443,449,457,461,463,467,479,487,491,499,503,509,521,523,541,547,557,563,569,571,577,587,593,599,601,607,613,617,619,631,641,643,647,653,659,661,673,677,683,691,701,709,719,727,733,739,743,751,757,761,769,773,787,797,809,811,821,823,827,829,839,853,857,859,863,877,881,883,887,907,911,919,929,937,941,947,953,967,971,977,983,991,997]
+True
diff --git a/testsuite/tests/dph/primespj/dph-primespj.T b/testsuite/tests/dph/primespj/dph-primespj.T
new file mode 100644
index 0000000000..458490456b
--- /dev/null
+++ b/testsuite/tests/dph/primespj/dph-primespj.T
@@ -0,0 +1,20 @@
+
+test    ('dph-primespj-opt' 
+        , [ alone
+          , skip_if_fast
+          , reqlib('dph-par')
+          , reqlib('dph-prim-par')
+          , only_ways(['normal', 'threaded1', 'threaded2']) ] 
+        , multimod_compile_and_run 
+        , [ 'Main'
+          , '-Odph -fdph-par'])
+
+test    ('dph-primespj-fast' 
+        , [ reqlib('dph-par')
+          , reqlib('dph-prim-par')
+          , only_ways(['normal', 'threaded1', 'threaded2']) ] 
+        , multimod_compile_and_run 
+        , [ 'Main'
+          , '-O -fno-enable-rewrite-rules -fdph-par'])
+
+