Commit fe4e3c46 authored by simonmar's avatar simonmar

[project @ 2002-11-07 13:39:55 by simonmar]

Changes for 'make mode=fast': I've picked on some of the
longest-running programs, but left most of them alone.  Most runtimes
are <1s, but a few are 2-3s.
parent 1e167cc1
......@@ -4,7 +4,7 @@ include $(TOP)/mk/boilerplate.mk
SSUBDIRS = \
ansi atom awards banner boyer boyer2 calendar cichelli circsim clausify \
constraints cryptarithm1 cryptarithm2 cse eliza expert fibheaps fish \
fft2 gcd hartel integer last-piece life knights mandel mandel2 minimax multiplier para \
fft2 gcd hartel integer life knights mandel mandel2 minimax multiplier para \
power pretty primetest puzzle rewrite scc simple sorting sphere treejoin
# compreals no suitable test data
......@@ -24,6 +24,11 @@ NOT_THESE =
endif
endif
# Some tests can't be speeded up very well
ifeq "$(mode)" "fast"
NOT_THESE += cryptarithm1
endif
SUBDIRS = $(filter-out $(NOT_THESE), $(SSUBDIRS))
include $(TOP)/mk/target.mk
......
......@@ -18,10 +18,15 @@
module Main where
import System
infixl 9 .*
infix 9 <*>
main = putStr (show (take 1000 test))
main = do
[arg] <- getArgs
let n = read arg :: Int
putStr (show (take n test))
test :: StateStream
test = runExperiment testforce 0.02 [1.0] (State [1.0] [0.0])
......
TOP = ../..
include $(TOP)/mk/boilerplate.mk
-include opts.mk
include $(TOP)/mk/target.mk
FAST_OPTS = 400
NORM_OPTS = 1000
SLOW_OPTS = 1000
include $(TOP)/mk/target.mk
1.0
1.0
0.9996
0.9988
0.99760014
0.99600077
0.99400234
0.9916055
0.98881114
0.9856201
0.9820335
0.9780527
0.97367907
0.9689142
0.9637599
0.95821804
0.95229065
0.94597995
0.9392884
0.9322184
0.9247727
0.9169541
0.9087656
0.9002103
0.89129156
0.88201267
0.8723773
0.8623891
0.852052
0.84136987
0.83034694
0.8189875
0.80729586
0.79527664
0.78293455
0.77027434
0.7573009
0.7440194
0.73043495
0.7165529
0.7023787
0.6879178
0.67317605
0.6581591
0.64287287
0.6273234
0.6115168
0.5954592
0.57915705
0.5626167
0.5458447
0.52884763
0.5116322
0.49420527
0.47657368
0.4587444
0.4407245
0.42252108
0.4041414
0.3855927
0.36688232
0.34801772
0.32900637
0.30985582
0.29057366
0.27116755
0.2516452
0.23201442
0.21228296
0.19245869
0.17254952
0.15256336
0.13250819
0.112391986
9.222278e-2
7.200862e-2
5.1757567e-2
3.1477712e-2
1.1177158e-2
-9.135988e-3
-2.9453604e-2
-4.9767565e-2
-7.0069745e-2
-9.035201e-2
-0.11060626
-0.13082436
-0.15099822
-0.17111975
-0.19118088
-0.21117356
-0.23108977
-0.25092152
-0.27066082
-0.29029974
-0.30983043
-0.32924497
-0.3485356
-0.36769453
-0.38671404
-0.40558648
-0.42430422
-0.44285974
-0.46124554
-0.4794542
-0.49747834
-0.5153107
-0.5329441
-0.55037135
-0.5675854
-0.58457935
-0.60134625
-0.61787933
-0.63417184
-0.65021724
-0.66600895
-0.68154055
-0.6968058
-0.71179837
-0.72651225
-0.7409414
-0.7550799
-0.7689221
-0.78246224
-0.7956948
-0.80861443
-0.82121575
-0.8334936
-0.84544295
-0.85705894
-0.86833674
-0.8792717
-0.8898593
-0.9000952
-0.90997523
-0.91949517
-0.9286511
-0.93743926
-0.945856
-0.9538977
-0.9615611
-0.9688429
-0.97574013
-0.9822498
-0.98836917
-0.9940956
-0.9994267
-1.0043602
-1.008894
-1.0130259
-1.0167543
-1.0200775
-1.0229939
-1.0255024
-1.0276017
-1.0292908
-1.0305688
-1.0314351
-1.0318892
-1.0319307
-1.0315595
-1.0307754
-1.0295788
-1.0279698
-1.025949
-1.023517
-1.0206747
-1.0174229
-1.0137628
-1.0096959
-1.0052234
-1.000347
-0.99506855
-0.98938996
-0.9833133
-0.9768409
-0.9699752
-0.9627187
-0.95507425
-0.94704473
-0.93863314
-0.92984277
-0.92067695
-0.9111392
-0.90123314
-0.89096266
-0.8803317
-0.8693443
-0.8580048
-0.8463176
-0.83428717
-0.8219182
-0.8092155
-0.796184
-0.78282887
-0.76915526
-0.7551685
-0.7408741
-0.72627765
-0.71138483
-0.6962015
-0.6807336
-0.66498727
-0.6489686
-0.63268393
-0.6161397
-0.5993424
-0.58229864
-0.56501514
-0.5474987
-0.52975625
-0.5117948
-0.49362147
-0.47524342
-0.4566679
-0.4379023
-0.418954
-0.39983058
-0.38053957
-0.3610886
-0.34148544
-0.32173783
-0.30185363
-0.28184074
-0.2617071
-0.24146073
-0.22110967
-0.20066203
-0.18012595
-0.1595096
-0.1388212
-0.118069
-9.726127e-2
-7.6406315e-2
-5.5512458e-2
-3.4588035e-2
-1.364141e-2
7.319052e-3
2.828497e-2
4.924796e-2
7.019964e-2
9.113162e-2
0.11203552
0.13290296
0.1537256
0.17449507
0.19520305
0.21584123
0.23640133
0.2568751
0.2772543
0.29753077
0.31769633
0.33774287
0.35766232
0.37744668
0.397088
0.41657832
0.4359098
0.45507467
0.47406515
0.4928736
0.51149243
0.52991414
0.5481312
0.56613636
0.5839222
0.6014816
0.61880744
0.6358927
0.6527304
0.6693138
0.68563604
0.7016906
0.71747094
0.7329706
0.74818325
0.7631027
0.7777229
0.79203784
0.8060417
0.81972873
0.83309335
0.8461301
0.85883355
0.8711986
0.8832201
0.8948931
0.90621287
0.91717464
0.92777395
0.9380064
0.9478677
0.95735383
0.96646076
0.9751848
0.98352224
0.9914696
0.99902356
1.0061809
1.0129386
1.0192939
1.025244
1.0307864
1.0359187
1.0406387
1.0449443
1.0488336
1.052305
1.0553569
1.0579878
1.0601966
1.0619823
1.0633438
1.0642805
1.0647919
1.0648776
1.0645374
1.0637712
1.0625793
1.0609617
1.0589192
1.0564523
1.0535618
1.0502487
1.0465143
1.0423597
1.0377865
1.0327963
1.027391
1.0215726
1.0153432
1.0087053
1.0016612
0.9942136
0.9863653
0.9781194
0.96947885
0.9604471
0.9510275
0.9412238
0.9310397
0.92047906
0.909546
0.8982448
0.88657975
0.8745554
0.8621764
0.8494476
0.8363739
0.8229605
0.8092125
0.7951353
0.7807345
0.7660156
0.7509844
0.7356467
0.72000873
0.70407647
0.6878562
0.6713543
0.65457726
0.63753164
0.62022424
0.6026618
0.58485126
0.5667997
0.5485142
0.53000194
0.5112703
0.49232662
0.47317845
0.45383334
0.434299
0.4145831
0.39469346
0.37463802
0.3544247
0.3340615
0.31355655
0.29291797
0.27215397
0.2512728
0.23028277
0.20919223
0.18800958
0.16674325
0.14540172
0.123993486
0.1025271
8.10111e-2
5.94541e-2
3.7864693e-2
1.6251504e-2
-5.376829e-3
-2.7011665e-2
-4.864435e-2
-7.026623e-2
-9.1868654e-2
-0.11344297
-0.13498054
TOP = ../..
circsim_RUNTEST_OPTS = 8 1000 +RTS -H30m -RTS
FAST_OPTS = 8 100
NORM_OPTS = 8 1000
SLOW_OPTS = 8 1000
SRC_RUNTEST_OPTS += +RTS -H30m -RTS
include $(TOP)/mk/boilerplate.mk
include $(TOP)/mk/target.mk
[[F,F,F,F,F,F,F,F],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T],[T,T,T,T,T,T,T,T]]
......@@ -5,14 +5,18 @@
import Prelude hiding (Maybe(Just,Nothing))
import List
import System
-----------------------------
-- The main program
-----------------------------
main = sequence_ (map try [bt, bm, bjbt, bjbt', fc])
where
try algorithm = print (length (search algorithm (queens 10)))
main = do
[arg] <- getArgs
let
n = read arg :: Int
try algorithm = print (length (search algorithm (queens n)))
sequence_ (map try [bt, bm, bjbt, bjbt', fc])
-----------------------------
-- Figure 1. CSPs in Haskell.
......
TOP = ../..
include $(TOP)/mk/boilerplate.mk
FAST_OPTS = 7
# NORM_OPTS should probably be 8 or 9
NORM_OPTS = 10
SLOW_OPTS = 10
include $(TOP)/mk/target.mk
TOP = ../..
include $(TOP)/mk/boilerplate.mk
-include opts.mk
include $(TOP)/mk/target.mk
......@@ -5,10 +5,10 @@ import System
main = do
--runalltests 1 20 10000 1 20 10000
--runalltests (-1000000) 4001 1000000 (-1000000) 4001 1000000
runalltests (-2100000000) 4000001 2100000000 (-2100000000) 4000001 2100000000
--[_1,_2,_3] <- getArgs
--let astart = read _1; astep = read _2; alim = read _3
--runalltests astart astep alim astart astep alim
--runalltests (-2100000000) 4000001 2100000000 (-2100000000) 4000001 2100000000
[_1,_2,_3] <- getArgs
let astart = read _1; astep = read _2; alim = read _3
runalltests astart astep alim astart astep alim
runalltests
:: Integer -> Integer -> Integer
......
# -----------------------------------------------------------------------------
# $Id: Makefile,v 1.1 2001/03/02 11:44:24 simonmar Exp $
TOP = ../..
include $(TOP)/mk/boilerplate.mk
-include opts.mk
FAST_OPTS = -2100000000 40000001 2100000000
NORM_OPTS = -2100000000 4000001 2100000000
SLOW_OPTS = -2100000000 4000001 2100000000
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