Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Activate nbody_plusplus in the bench script. Reactivate spmd2 variati…
…on. update submodule to flip cpugpu to use Cilk
  • Loading branch information
rrnewton committed Jul 8, 2014
1 parent 9b73559 commit 933c4a4
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 4 deletions.
21 changes: 18 additions & 3 deletions accelerate/run-accelerate-benchmark.hs
Expand Up @@ -125,6 +125,8 @@ bls_desktop =
| arg <- blackscholes_args ]

allNBodies = concat [ allvariants (nbody (show arg))
| arg <- nbody_args ] ++
concat [ allvariants (nbody_plusplus (show arg))
| arg <- nbody_args ]

-- Vary the size of the big arithmetic expression generated:
Expand Down Expand Up @@ -153,6 +155,14 @@ bls_desktop =
target= root++"nbody", -- Just the root
progname= Just "accelerate-nbody-float" }

nbody_plusplus size var =
baseline { cmdargs=[size],
configs= And[ Set (Variant var)
(RuntimeEnv "ACCELERATE_INPUT_FILE"
(root++"nbody_plusplus/makefile_based/uniform.3dpts"))],
target= root++"nbody_plusplus", -- Just the root
progname= Just "accelerate-nbody_plusplus-float" }

blackscholes size var =
baseline { cmdargs=[size],
configs= And[ -- Set (Variant var) (RuntimeEnv "IGNORE_THIS" ""),
Expand Down Expand Up @@ -190,10 +200,9 @@ bls_desktop =
, (fn "cuda") { target= dirroot++"/cuda/" }

, varyCilkThreads threadSelection $ (fn "cilk") { target= dirroot++"/cilk/" }
, varyFission (tail threadSelection) $ (fn "fission1") { target= dirroot++"/fission1/" }
, varyFission fissionSelection $ (fn "fission1") { target= dirroot++"/fission1/" }
, (fn "fission2") { target= dirroot++"/fission2/" }
-- , varyFission threadSelection $ (fn "spmd2") { target= dirroot++"/spmd2/" }
, (fn "spmd2") { target= dirroot++"/spmd2/" }
, varyFission fissionSelection $ (fn "spmd2") { target= dirroot++"/spmd2/" }

-- TODO: Vary threads for CPU/GPU:
, (fn "cpugpu") { target= dirroot++"/cpugpu/" }
Expand Down Expand Up @@ -232,6 +241,12 @@ threadSelection = unsafePerformIO $ do
| p <= 16 -> return [1 .. p]
| otherwise -> return$ 1 : [2,4 .. p]

fissionSelection :: [Int]
fissionSelection = unsafePerformIO $ do
p <- getNumProcessors
return $ takeWhile (<p) [ 2^n | n <- [1..]] ++
[p, 2*p, 4*p]

varyCilkThreads :: [Int] -> Benchmark DefaultParamMeaning -> Benchmark DefaultParamMeaning
varyCilkThreads settings bench@Benchmark{configs} =
bench { configs= And [configs,
Expand Down
1 change: 1 addition & 0 deletions accelerate/run-accelerate-benchmark.sh
Expand Up @@ -72,6 +72,7 @@ function add_all() {
DIRS+=" $HERE/$b/2gpu"
}
add_all nbody
add_all nbody_plusplus
add_all blackscholes

# More individual benchmark directories:
Expand Down
2 changes: 1 addition & 1 deletion accelerate_src

0 comments on commit 933c4a4

Please sign in to comment.