Commit 88f2c218 authored by simonmar's avatar simonmar

[project @ 2005-04-28 13:34:25 by simonmar]

mode=slow

That completes the imaginary and spectral suites.  Most of the
programs in here will now run in 1-2s with mode=slow (on a 3GHz P4).
I had to modify the programs in a few places, so there will be some
slight discrepancies in the size of Main.o due to these changes.
parent 0c425780
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
a <=
......@@ -3,8 +3,9 @@ include $(TOP)/mk/boilerplate.mk
SRC_HC_OPTS += -cpp
# Arguments for the test program
PROG_ARGS = 8 3
FAST_OPTS = 8 3
NORM_OPTS = 8 3
SLOW_OPTS = 32 6
include $(TOP)/mk/target.mk
This diff is collapsed.
......@@ -4,5 +4,7 @@ include $(TOP)/mk/boilerplate.mk
# Override SRCS so that we don't link in MandelOld.hs
SRCS = Main.lhs Mandel.lhs PortablePixmap.lhs
# fast/norm/slow stuff done by separate stdin files.
include $(TOP)/mk/target.mk
-2.0
-2.0
2.0
2.0
150
150
256
......@@ -90,14 +90,17 @@ inputs.
module Main where
main = putStr go
import System.Environment
main = do
(n:_) <- getArgs
putStr (go (read n :: Int))
-------------------------------------------------------------------
-- Definition of the output and the simulation parameters
go =
go wordsize =
let
wordsize = 16 -- input size; product is twice this size
limit = 2000 -- how many clock cycles to run
verbose = True -- want lots of output?
width = 10 -- output Int field size (verbose only)
......
......@@ -3,3 +3,6 @@ include $(TOP)/mk/boilerplate.mk
-include opts.mk
include $(TOP)/mk/target.mk
FAST_OPTS = 16
NORM_OPTS = 16
SLOW_OPTS = 64
......@@ -7,16 +7,19 @@ module Main where
import IO
import Ratio
import System.Environment (getArgs)
infixl 7 .*
infixr 5 :+:
default (Integer, Rational, Double)
main = do { putStrLn (show (extract 50 (sinx - sqrt (1-cosx^2)))) ;
putStrLn (show (extract 50 (sinx/cosx - revert (integral (1/(1+x^2)))))) ;
putStrLn (show (extract 50 ts)) ;
putStrLn (show (extract 50 tree))
main = do { (n:_) <- getArgs ;
let { p = read n :: Int } ;
putStrLn (show (extract p (sinx - sqrt (1-cosx^2)))) ;
putStrLn (show (extract p (sinx/cosx - revert (integral (1/(1+x^2)))))) ;
putStrLn (show (extract p ts)) ;
putStrLn (show (extract p tree))
}
......
......@@ -3,3 +3,7 @@ include $(TOP)/mk/boilerplate.mk
-include opts.mk
include $(TOP)/mk/target.mk
FAST_OPTS = 50
NORM_OPTS = 50
SLOW_OPTS = 52
[0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1]
[0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1]
[1,1,2,5,14,42,132,429,1430,4862,16796,58786,208012,742900,2674440,9694845,35357670,129644790,477638700,1767263190,6564120420,24466267020,91482563640,343059613650,1289904147324,4861946401452,18367353072152,69533550916004,263747951750360,1002242216651368,3814986502092304,14544636039226909,55534064877048198,212336130412243110,812944042149730764,3116285494907301262,11959798385860453492,45950804324621742364,176733862787006701400,680425371729975800390,2622127042276492108820,10113918591637898134020,39044429911904443959240,150853479205085351660700,583300119592996693088040,2257117854077248073253720,8740328711533173390046320,33868773757191046886429490,131327898242169365477991900,509552245179617138054608572]
[0,1,1,2,5,14,42,132,429,1430,4862,16796,58786,208012,742900,2674440,9694845,35357670,129644790,477638700,1767263190,6564120420,24466267020,91482563640,343059613650,1289904147324,4861946401452,18367353072152,69533550916004,263747951750360,1002242216651368,3814986502092304,14544636039226909,55534064877048198,212336130412243110,812944042149730764,3116285494907301262,11959798385860453492,45950804324621742364,176733862787006701400,680425371729975800390,2622127042276492108820,10113918591637898134020,39044429911904443959240,150853479205085351660700,583300119592996693088040,2257117854077248073253720,8740328711533173390046320,33868773757191046886429490,131327898242169365477991900]
[0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1]
[0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1,0%1]
[1,1,2,5,14,42,132,429,1430,4862,16796,58786,208012,742900,2674440,9694845,35357670,129644790,477638700,1767263190,6564120420,24466267020,91482563640,343059613650,1289904147324,4861946401452,18367353072152,69533550916004,263747951750360,1002242216651368,3814986502092304,14544636039226909,55534064877048198,212336130412243110,812944042149730764,3116285494907301262,11959798385860453492,45950804324621742364,176733862787006701400,680425371729975800390,2622127042276492108820,10113918591637898134020,39044429911904443959240,150853479205085351660700,583300119592996693088040,2257117854077248073253720,8740328711533173390046320,33868773757191046886429490,131327898242169365477991900,509552245179617138054608572,1978261657756160653623774456,7684785670514316385230816156]
[0,1,1,2,5,14,42,132,429,1430,4862,16796,58786,208012,742900,2674440,9694845,35357670,129644790,477638700,1767263190,6564120420,24466267020,91482563640,343059613650,1289904147324,4861946401452,18367353072152,69533550916004,263747951750360,1002242216651368,3814986502092304,14544636039226909,55534064877048198,212336130412243110,812944042149730764,3116285494907301262,11959798385860453492,45950804324621742364,176733862787006701400,680425371729975800390,2622127042276492108820,10113918591637898134020,39044429911904443959240,150853479205085351660700,583300119592996693088040,2257117854077248073253720,8740328711533173390046320,33868773757191046886429490,131327898242169365477991900,509552245179617138054608572,1978261657756160653623774456]
......@@ -3,3 +3,4 @@ include $(TOP)/mk/boilerplate.mk
-include opts.mk
include $(TOP)/mk/target.mk
# fast/norm/slow stuff done with separate stdin files
531137992816767098689588206552468627329593117727031923199444138200403559860852242739162502265229285668889329486246501015346579337652707239409519978766587351943831270835393219031728127
531137992816767098689588206552468627329593117727031923199444138200403559860852242739162502265229285668889329486246501015346579337652707239409519978766587351943831270835393219031728127
Probably primeProbably prime
\ No newline at end of file
......@@ -49,6 +49,7 @@ implementation of rewriting.
- ----8<--------8<--------8<--------8<--------8<--------8<--------8<----
> import System.Environment (getArgs)
> infixr 1 ??
> infixr 1 |||
......@@ -626,6 +627,8 @@ BENCHMARK
> result (s1, s2) = (simplify (super_reduce group_completion) (parse s1)
> == parse s2)
> test = all result (take 2000 (repeat ("I(a * b)", "I(b) * I(a)")))
> test n = all result (take n (repeat ("I(a * b)", "I(b) * I(a)")))
> main = print test
> main = do
> (n:_) <- getArgs
> print (test (read n :: Int))
......@@ -3,3 +3,6 @@ include $(TOP)/mk/boilerplate.mk
-include opts.mk
include $(TOP)/mk/target.mk
FAST_OPTS = 2000
NORM_OPTS = 2000
SLOW_OPTS = 60000
TOP = ../..
FAST_OPTS = 100
SLOW_OPTS = 100
NORM_OPTS = 100
SLOW_OPTS = 200
ifeq "$(mode)" "slow"
SRC_RUNTEST_OPTS += -o1 spheres.slowppm
else
SRC_RUNTEST_OPTS += -o1 spheres.ppm
endif
include $(TOP)/mk/boilerplate.mk
include $(TOP)/mk/target.mk
......
This diff is collapsed.
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