Commit ce0a64b2 authored by Ben Gamari's avatar Ben Gamari 🐢

Use PROG_ARGS instead of SRC_RUNTEST_OPTS

parent 1b86a204
...@@ -2,10 +2,10 @@ TOP = ../.. ...@@ -2,10 +2,10 @@ TOP = ../..
include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/boilerplate.mk
ifeq "$(HEAP)" "LARGE" ifeq "$(HEAP)" "LARGE"
SRC_RUNTEST_OPTS += +RTS -H16m -RTS PROG_ARGS += +RTS -H16m -RTS
endif endif
ifeq "$(HEAP)" "OLD" ifeq "$(HEAP)" "OLD"
SRC_RUNTEST_OPTS += +RTS -H10m -RTS PROG_ARGS += +RTS -H10m -RTS
endif endif
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
......
...@@ -7,10 +7,10 @@ NORM_OPTS = 8 3000 ...@@ -7,10 +7,10 @@ NORM_OPTS = 8 3000
SLOW_OPTS = 8 5000 SLOW_OPTS = 8 5000
ifeq "$(HEAP)" "LARGE" ifeq "$(HEAP)" "LARGE"
SRC_RUNTEST_OPTS += +RTS -H256m -RTS PROG_ARGS += +RTS -H256m -RTS
endif endif
ifeq "$(HEAP)" "OLD" ifeq "$(HEAP)" "OLD"
SRC_RUNTEST_OPTS += +RTS -H30m -RTS PROG_ARGS += +RTS -H30m -RTS
endif endif
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
...@@ -7,10 +7,10 @@ NORM_OPTS = 10 ...@@ -7,10 +7,10 @@ NORM_OPTS = 10
SLOW_OPTS = 11 SLOW_OPTS = 11
ifeq "$(HEAP)" "LARGE" ifeq "$(HEAP)" "LARGE"
SRC_RUNTEST_OPTS += +RTS -H330m -RTS PROG_ARGS += +RTS -H330m -RTS
endif endif
ifeq "$(HEAP)" "OLD" ifeq "$(HEAP)" "OLD"
SRC_RUNTEST_OPTS += +RTS -H10m -RTS PROG_ARGS += +RTS -H10m -RTS
endif endif
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
...@@ -4,13 +4,13 @@ include $(TOP)/mk/boilerplate.mk ...@@ -4,13 +4,13 @@ include $(TOP)/mk/boilerplate.mk
NORM_OPTS = 300000 NORM_OPTS = 300000
SRC_HC_OPTS += -package array SRC_HC_OPTS += -package array
SRC_RUNTEST_OPTS += +RTS -K64m -RTS PROG_ARGS += +RTS -K64m -RTS
ifeq "$(HEAP)" "LARGE" ifeq "$(HEAP)" "LARGE"
SRC_RUNTEST_OPTS += +RTS -H128m -RTS PROG_ARGS += +RTS -H128m -RTS
endif endif
ifeq "$(HEAP)" "OLD" ifeq "$(HEAP)" "OLD"
SRC_RUNTEST_OPTS += +RTS -H10m -RTS PROG_ARGS += +RTS -H10m -RTS
endif endif
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
...@@ -11,10 +11,10 @@ NORM_OPTS = 9 ...@@ -11,10 +11,10 @@ NORM_OPTS = 9
SLOW_OPTS = 9 SLOW_OPTS = 9
ifeq "$(HEAP)" "LARGE" ifeq "$(HEAP)" "LARGE"
SRC_RUNTEST_OPTS += +RTS -H160m -RTS PROG_ARGS += +RTS -H160m -RTS
endif endif
ifeq "$(HEAP)" "OLD" ifeq "$(HEAP)" "OLD"
SRC_RUNTEST_OPTS += +RTS -H10m -RTS PROG_ARGS += +RTS -H10m -RTS
endif endif
SRC_RUNTEST_OPTS += -stdout-binary SRC_RUNTEST_OPTS += -stdout-binary
......
...@@ -13,7 +13,7 @@ NORM_OPTS = 18 500000 4 19 ...@@ -13,7 +13,7 @@ NORM_OPTS = 18 500000 4 19
SLOW_OPTS = 19 500000 5 22 SLOW_OPTS = 19 500000 5 22
ifeq "$(HEAP)" "LARGE" ifeq "$(HEAP)" "LARGE"
SRC_RUNTEST_OPTS += +RTS -H180m -RTS PROG_ARGS += +RTS -H180m -RTS
endif endif
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
......
...@@ -7,10 +7,10 @@ SRC_HC_OPTS += -cpp -package containers ...@@ -7,10 +7,10 @@ SRC_HC_OPTS += -cpp -package containers
EXCLUDED_SRCS += TestInput.hs EXCLUDED_SRCS += TestInput.hs
ifeq "$(HEAP)" "LARGE" ifeq "$(HEAP)" "LARGE"
SRC_RUNTEST_OPTS += +RTS -H128m -RTS PROG_ARGS += +RTS -H128m -RTS
endif endif
ifeq "$(HEAP)" "OLD" ifeq "$(HEAP)" "OLD"
SRC_RUNTEST_OPTS += +RTS -H10m -RTS PROG_ARGS += +RTS -H10m -RTS
endif endif
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
...@@ -6,7 +6,7 @@ NORM_OPTS = 5000000 ...@@ -6,7 +6,7 @@ NORM_OPTS = 5000000
SLOW_OPTS = 100000000 SLOW_OPTS = 100000000
ifeq "$(HEAP)" "LARGE" ifeq "$(HEAP)" "LARGE"
SRC_RUNTEST_OPTS += +RTS -H430m -RTS PROG_ARGS += +RTS -H430m -RTS
endif endif
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
...@@ -6,7 +6,7 @@ NORM_OPTS = 1 2 2000 1000 1001 4000 ...@@ -6,7 +6,7 @@ NORM_OPTS = 1 2 2000 1000 1001 4000
SLOW_OPTS = 1 2 4000 1000 1001 4000 SLOW_OPTS = 1 2 4000 1000 1001 4000
ifeq "$(HEAP)" "LARGE" ifeq "$(HEAP)" "LARGE"
SRC_RUNTEST_OPTS += +RTS -H256m -RTS PROG_ARGS += +RTS -H256m -RTS
endif endif
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
...@@ -5,10 +5,10 @@ include $(TOP)/mk/boilerplate.mk ...@@ -5,10 +5,10 @@ include $(TOP)/mk/boilerplate.mk
NORM_OPTS = 14 NORM_OPTS = 14
ifeq "$(HEAP)" "LARGE" ifeq "$(HEAP)" "LARGE"
SRC_RUNTEST_OPTS += +RTS -H8m -RTS PROG_ARGS += +RTS -H8m -RTS
endif endif
ifeq "$(HEAP)" "OLD" ifeq "$(HEAP)" "OLD"
SRC_RUNTEST_OPTS += +RTS -H10m -RTS PROG_ARGS += +RTS -H10m -RTS
endif endif
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
...@@ -8,8 +8,8 @@ NORM_OPTS = 80 ...@@ -8,8 +8,8 @@ NORM_OPTS = 80
SLOW_OPTS = 90 SLOW_OPTS = 90
ifeq "$(HEAP)" "LARGE" ifeq "$(HEAP)" "LARGE"
SRC_RUNTEST_OPTS += +RTS -H16m -RTS PROG_ARGS += +RTS -H16m -RTS
endif endif
ifeq "$(HEAP)" "OLD" ifeq "$(HEAP)" "OLD"
SRC_RUNTEST_OPTS += +RTS -H10m -RTS PROG_ARGS += +RTS -H10m -RTS
endif endif
...@@ -11,10 +11,10 @@ SRC_HC_OPTS += -package containers ...@@ -11,10 +11,10 @@ SRC_HC_OPTS += -package containers
NORM_OPTS = words input NORM_OPTS = words input
ifeq "$(HEAP)" "LARGE" ifeq "$(HEAP)" "LARGE"
SRC_RUNTEST_OPTS += +RTS -H32m -RTS PROG_ARGS += +RTS -H32m -RTS
endif endif
ifeq "$(HEAP)" "OLD" ifeq "$(HEAP)" "OLD"
SRC_RUNTEST_OPTS += +RTS -H10m -RTS PROG_ARGS += +RTS -H10m -RTS
endif endif
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
...@@ -5,10 +5,10 @@ include $(TOP)/mk/boilerplate.mk ...@@ -5,10 +5,10 @@ include $(TOP)/mk/boilerplate.mk
PROG_ARGS = 27000.1 27000.2 PROG_ARGS = 27000.1 27000.2
ifeq "$(HEAP)" "LARGE" ifeq "$(HEAP)" "LARGE"
SRC_RUNTEST_OPTS += +RTS -H32m -RTS PROG_ARGS += +RTS -H32m -RTS
endif endif
ifeq "$(HEAP)" "OLD" ifeq "$(HEAP)" "OLD"
SRC_RUNTEST_OPTS += +RTS -H24m -RTS PROG_ARGS += +RTS -H24m -RTS
endif endif
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
TOP = ../.. TOP = ../..
include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/boilerplate.mk
SRC_RUNTEST_OPTS += +RTS -K20m -H100m -RTS PROG_ARGS += +RTS -K20m -H100m -RTS
-include opts.mk -include opts.mk
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
......
...@@ -4,7 +4,7 @@ include $(TOP)/mk/boilerplate.mk ...@@ -4,7 +4,7 @@ include $(TOP)/mk/boilerplate.mk
# Override default SRCS; the default is all source files, but # Override default SRCS; the default is all source files, but
# we don't want to include paraffins.c # we don't want to include paraffins.c
SRCS=Main.hs SRCS=Main.hs
SRC_RUNTEST_OPTS += +RTS -H20m -RTS PROG_ARGS += +RTS -H20m -RTS
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
......
...@@ -3,7 +3,7 @@ include $(TOP)/mk/boilerplate.mk ...@@ -3,7 +3,7 @@ include $(TOP)/mk/boilerplate.mk
-include opts.mk -include opts.mk
# Seems to be a real memory hog, this one # Seems to be a real memory hog, this one
SRC_RUNTEST_OPTS += +RTS -M300m -RTS PROG_ARGS += +RTS -M300m -RTS
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
......
TOP = ../.. TOP = ../..
include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/boilerplate.mk
SRC_RUNTEST_OPTS += 8400 PROG_ARGS += 8400
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
...@@ -4,7 +4,7 @@ include $(TOP)/mk/boilerplate.mk ...@@ -4,7 +4,7 @@ include $(TOP)/mk/boilerplate.mk
# Override default SRCS; the default is all source files # Override default SRCS; the default is all source files
SRCS=parfact.hs SRCS=parfact.hs
SRC_RUNTEST_OPTS += 8000000 1000 PROG_ARGS += 8000000 1000
SRC_HC_OPTS += -package concurrent SRC_HC_OPTS += -package concurrent
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
......
...@@ -3,7 +3,7 @@ include $(TOP)/mk/boilerplate.mk ...@@ -3,7 +3,7 @@ include $(TOP)/mk/boilerplate.mk
# Override default SRCS; the default is all source files # Override default SRCS; the default is all source files
SRCS=Main.hs SRCS=Main.hs
SRC_RUNTEST_OPTS += 20 PROG_ARGS += 20
SRC_HC_OPTS += -cpp -package concurrent SRC_HC_OPTS += -cpp -package concurrent
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
......
...@@ -2,10 +2,10 @@ TOP = ../.. ...@@ -2,10 +2,10 @@ TOP = ../..
include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/boilerplate.mk
# This version just counts the results, and runs in constant space: # This version just counts the results, and runs in constant space:
# SRC_RUNTEST_OPTS += 7 1163 # PROG_ARGS += 7 1163
# This version builds a list of the results, and needs a lot of memory: # This version builds a list of the results, and needs a lot of memory:
SRC_RUNTEST_OPTS += 3 873 PROG_ARGS += 3 873
SRC_HC_OPTS += -package parallel SRC_HC_OPTS += -package parallel
......
...@@ -5,7 +5,7 @@ SRC_HC_OPTS += -cpp -DSTRATEGIES -package random -package parallel ...@@ -5,7 +5,7 @@ SRC_HC_OPTS += -cpp -DSTRATEGIES -package random -package parallel
# 28 = version # 28 = version
# 83 = input # 83 = input
PROG_ARGS = 28 83 PROG_ARGS += 28 83
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
TOP = ../.. TOP = ../..
include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/boilerplate.mk
SRC_RUNTEST_OPTS += -2.0 -2.0 2.0 2.0 1024 1024 256 PROG_ARGS += -2.0 -2.0 2.0 2.0 1024 1024 256
SRC_RUNTEST_OPTS += -stdout-binary SRC_RUNTEST_OPTS += -stdout-binary
SRC_HC_OPTS += -package parallel SRC_HC_OPTS += -package parallel
......
...@@ -9,7 +9,7 @@ SRCS = Board.hs \ ...@@ -9,7 +9,7 @@ SRCS = Board.hs \
Main.hs Main.hs
SRC_HC_OPTS += -package parallel -package random SRC_HC_OPTS += -package parallel -package random
PROG_ARGS = 4 6 PROG_ARGS += 4 6
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
TOP = ../.. TOP = ../..
include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/boilerplate.mk
PROG_ARGS = 3000 PROG_ARGS += 3000
SRC_HC_OPTS += -package parallel SRC_HC_OPTS += -package parallel
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
......
TOP = ../.. TOP = ../..
include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/boilerplate.mk
SRC_RUNTEST_OPTS += 43 11 PROG_ARGS += 43 11
SRC_HC_OPTS += -package parallel SRC_HC_OPTS += -package parallel
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
TOP = ../.. TOP = ../..
include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/boilerplate.mk
PROG_ARGS = 300 100 PROG_ARGS += 300 100
SRC_HC_OPTS += -package parallel SRC_HC_OPTS += -package parallel
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
......
TOP = ../.. TOP = ../..
include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/boilerplate.mk
PROG_ARGS = 500000 PROG_ARGS += 500000
SRC_HC_OPTS += -package parallel SRC_HC_OPTS += -package parallel
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
......
TOP = ../.. TOP = ../..
include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/boilerplate.mk
SRC_RUNTEST_OPTS += 13 PROG_ARGS += 13
SRC_HC_OPTS += -package parallel SRC_HC_OPTS += -package parallel
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
TOP = ../.. TOP = ../..
include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/boilerplate.mk
PROG_ARGS = 1000 PROG_ARGS += 1000
SRC_HC_OPTS += -package parallel SRC_HC_OPTS += -package parallel
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
......
TOP = ../.. TOP = ../..
include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/boilerplate.mk
PROG_ARGS = 38 8000 100 PROG_ARGS += 38 8000 100
SRC_HC_OPTS += -package parallel SRC_HC_OPTS += -package parallel
# FAST_OPTS = # FAST_OPTS =
......
...@@ -13,7 +13,7 @@ SRC_HC_OPTS += -O0 ...@@ -13,7 +13,7 @@ SRC_HC_OPTS += -O0
# 10 is about optimal for 7.1, greater degrades perf (less so for local-gc) # 10 is about optimal for 7.1, greater degrades perf (less so for local-gc)
# dummy = 999 (always) # dummy = 999 (always)
# delay = larger for # delay = larger for
PROG_ARGS = 4 10 10 999 24 PROG_ARGS += 4 10 10 999 24
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
TOP = ../.. TOP = ../..
include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/boilerplate.mk
SRC_RUNTEST_OPTS += 400 400 PROG_ARGS += 400 400
SRC_HC_OPTS += -package parallel SRC_HC_OPTS += -package parallel
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
TOP = ../.. TOP = ../..
include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/boilerplate.mk
SRC_RUNTEST_OPTS += -stdout-binary PROG_ARGS += -stdout-binary
SRC_HC_OPTS += -fglasgow-exts SRC_HC_OPTS += -fglasgow-exts
SRC_RUNTEST_OPTS += +RTS -H100m -RTS PROG_ARGS += +RTS -H100m -RTS
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
......
TOP = ../.. TOP = ../..
include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/boilerplate.mk
SRC_RUNTEST_OPTS += +RTS -K1m -RTS PROG_ARGS += +RTS -K1m -RTS
PROG_ARGS = runtime_files/four.plate PROG_ARGS = runtime_files/four.plate
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
......
TOP = ../.. TOP = ../..
include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/boilerplate.mk
SRC_RUNTEST_OPTS += +RTS -H50m -RTS PROG_ARGS += +RTS -H50m -RTS
FAST_OPTS = -nt 8 -dt 6 -nv 15 -dv 8 -de 8 FAST_OPTS = -nt 8 -dt 6 -nv 15 -dv 8 -de 8
NORM_OPTS = -nt 80 -dt 10 -nv 100 -dv 10 -de 10 NORM_OPTS = -nt 80 -dt 10 -nv 100 -dv 10 -de 10
......
...@@ -6,6 +6,6 @@ FAST_OPTS = 8 100 ...@@ -6,6 +6,6 @@ FAST_OPTS = 8 100
NORM_OPTS = 8 3000 NORM_OPTS = 8 3000
SLOW_OPTS = 8 5000 SLOW_OPTS = 8 5000
SRC_RUNTEST_OPTS += +RTS -H30m -RTS PROG_ARGS += +RTS -H30m -RTS
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
...@@ -7,6 +7,6 @@ SRCS = Main.hs ...@@ -7,6 +7,6 @@ SRCS = Main.hs
# Main is rather big # Main is rather big
Main_HC_OPTS = -H110m Main_HC_OPTS = -H110m
SRC_RUNTEST_OPTS += +RTS -K3m -H20m -RTS PROG_ARGS += +RTS -K3m -H20m -RTS
include $(TOP)/mk/target.mk include $(TOP)/mk/target.mk
...@@ -2,7 +2,7 @@ TOP = ../.. ...@@ -2,7 +2,7 @@ TOP = ../..
include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/boilerplate.mk
# Arguments to test program # Arguments to test program
SRC_RUNTEST_OPTS += +RTS -K3m -H24m -RTS PROG_ARGS += +RTS -K3m -H24m -RTS
PROG_ARGS = runtime_files/27000.1 runtime_files/27000.2 PROG_ARGS = runtime_files/27000.1 runtime_files/27000.2
include $(TOP)/mk/target.mk 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