Commit c6b91433 authored by Michal Terepeta's avatar Michal Terepeta Committed by Ben Gamari

Create runtime_files directory for some benchmarks

Summary:
This creates `runtime_files` subdirectory for benchmarks that need
some files at runtime. This make it clear what files are actually
needed to run the benchmarks and makes it much easier to support
building/running them out of separate build directory.

This affects the following benchmarks:
- real/anna
- real/cacheprof
- real/fluid
- real/hidden
- real/maillist
- real/prolog
- real/scs
- spectral/expert
- spectral/mate
- spectral/para
- spectral/treejoin
Signed-off-by: Michal Terepeta's avatarMichal Terepeta <michal.terepeta@gmail.com>

Test Plan: build & run

Reviewers: bgamari

Reviewed By: bgamari

Subscribers: snowleopard

Differential Revision: https://phabricator.haskell.org/D3411
parent 569d8eb5
......@@ -41,7 +41,7 @@ real/hidden/hidden
real/hpg/hpg
real/infer/infer
real/lift/lift
real/maillist/addresses.tex
real/maillist/runtime_files/addresses.tex
real/maillist/maillist
real/mkhprog/mkhprog
real/parser/parser
......
......@@ -158,7 +158,7 @@ main :: IO ()
main = do
raw_args <- getArgs
let cmd_line_args = maGetFlags raw_args
tableStr <- readFile ("anna_table")
tableStr <- readFile ("runtime_files/anna_table")
file_contents <- getContents
let table = rtReadTable tableStr
putStr (maStrictAn table cmd_line_args file_contents)
......
......@@ -1439,8 +1439,8 @@ main = seq stderr ( -- avoid bug in ghc-4.04
f <- getContents
aux <- case prof_level of
0 -> return ""
1 -> readFile "cacheprof_hooks1_x86.s"
2 -> readFile "cacheprof_hooks2_x86.s"
1 -> readFile "runtime_files/cacheprof_hooks1_x86.s"
2 -> readFile "runtime_files/cacheprof_hooks2_x86.s"
out <- doFile prof_level args f
putStr out
......
......@@ -32,7 +32,7 @@ POINTS p ...
1 2 3
FILENAMES:
DUMP RESTART VELVEC PRESSURE PATTERN INPUT
chan.dmp chan.rst chan.vec chan.pre chan.pat chan8.dat
chan.dmp chan.rst chan.vec chan.pre chan.pat runtime_files/chan8.dat
TEMPERTURE
chan.tpr
********************************************************************************
......@@ -2,7 +2,7 @@ TOP = ../..
include $(TOP)/mk/boilerplate.mk
SRC_RUNTEST_OPTS += +RTS -K1m -RTS
PROG_ARGS = objects/four.plate
PROG_ARGS = runtime_files/four.plate
include $(TOP)/mk/target.mk
addresses
runtime_files/addresses
......@@ -4,7 +4,7 @@ Welcome to the LaTex Mailing List Generator.
(Please type Cntrl-D at file prompt to exit.)
File to be converted:
Conversion completed; file addresses.tex written.
Conversion completed; file runtime_files/addresses.tex written.
File to be converted:
Goodbye!
......@@ -55,7 +55,7 @@ main = --echo False abort
interpreter clauses
stdlib :: String
stdlib = "stdlib"
stdlib = "runtime_files/stdlib"
interpreter :: [Clause] -> IO ()
interpreter lib = getContents >>= \ is ->
......
Mini Prolog Version 1.5 (stack based)
Reading stdlib........done
Reading runtime_files/stdlib........done
> ??
append(nil,X,X).
append(cons(X,Y),Z,cons(X,W)):==append(Y,Z,W).
......
TOP = ../..
include $(TOP)/mk/boilerplate.mk
PROG_ARGS = inverter 345 10n 4u 1
PROG_ARGS = runtime_files/inverter 345 10n 4u 1
include $(TOP)/mk/target.mk
......
......@@ -35,7 +35,7 @@ main = do
args <- getArgs
case args of
[filename] -> getData filename
[] -> getData "animals"
[] -> getData "runtime_files/animals"
_ -> hPutStr stderr ("Usage: " ++ prog ++ " datafile\n")
getData filename = do
......
TOP = ../..
include $(TOP)/mk/boilerplate.mk
PROG_ARGS = holzhausen.prob
# It's necessary to specify those manually so that the current make-based system
# compiles them in the right order.
# TODO(michalt): This should go away once we move to the Shake-based system.
HS_SRCS = Board.hs Move.hs Problem.hs Solution.hs Main.hs
PROG_ARGS = runtime_files/holzhausen.prob
# Other problems
# ellerman.prob heathcote3.prob kidson.prob marin.prob \
......
File: holzhausen.prob
File: runtime_files/holzhausen.prob
- - - - R - - K
- - - - - - - b
- b - - N - q -
......
TOP = ../..
include $(TOP)/mk/boilerplate.mk
PROG_ARGS = input-data
PROG_ARGS = runtime_files/input-data
include $(TOP)/mk/target.mk
......@@ -3,7 +3,7 @@ include $(TOP)/mk/boilerplate.mk
# Arguments to test program
SRC_RUNTEST_OPTS += +RTS -K3m -H24m -RTS
PROG_ARGS = 27000.1 27000.2
PROG_ARGS = runtime_files/27000.1 runtime_files/27000.2
include $(TOP)/mk/target.mk
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment