suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The moments benchmark now gets floats as input.

Browse Source
This commit is contained in:
Vincent St-Amour 2010-06-21 13:42:37 -04:00
parent 61545c4e75
commit 5234809baf
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
collects/tests/racket/benchmarks/shootout/run.rkt
View File

@ -1,6 +1,8 @@
(module run mzscheme (module run mzscheme
(require (only scheme/runtime-path define-runtime-path) (require (only scheme/runtime-path define-runtime-path)
racket/port) racket/port
mzlib/kw
unstable/port)
(define input-map (define input-map
`( `(
("ackermann" "12") ("ackermann" "12")
@ -23,7 +25,7 @@
("mandelbrot-generic" "3000") ("mandelbrot-generic" "3000")
("matrix" "12000") ("matrix" "12000")
("meteor" "25000") ("meteor" "25000")
("moments" #f ,(lambda () (mk-sumcol-input 2000))) ("moments" #f ,(lambda () (mk-moments-input 2000)))
("nbody" "3000000") ("nbody" "3000000")
("nbody-generic" "3000000") ("nbody-generic" "3000000")
("nbody-vec" "3000000") ("nbody-vec" "3000000")
@ -96,17 +98,22 @@
(dynamic-require "fasta.rkt" #f))))) (dynamic-require "fasta.rkt" #f)))))
f)) f))
(define (mk-sumcol-input n) (define/kw (mk-sumcol-input n #:optional moments?)
(let ([f (build-path (find-system-path 'temp-dir) (string-append "sumcol-" (number->string n)))]) (let ([f (build-path (find-system-path 'temp-dir) (string-append (if moments? "moments-" "sumcol-")
(number->string n)))])
(unless (file-exists? f) (unless (file-exists? f)
(printf "Building sumcol ~a input: ~a\n" n f) (printf "Building ~a ~a input: ~a\n" (if moments? "moments" "sumcol") n f)
(let ([c (with-input-from-file (build-path (collection-path "tests") (let ([c (with-input-from-file (build-path (collection-path "tests")
"racket" "racket"
"benchmarks" "benchmarks"
"shootout" "shootout"
"sumcol-input.txt") "sumcol-input.txt")
(lambda () (lambda ()
(read-bytes 10000)))]) (if moments?
(apply string-append ; like sumcol, but with floats
(map (lambda (x) (string-append (number->string (exact->inexact x)) "\n"))
(read-all)))
(read-bytes 10000))))])
(with-output-to-file f (with-output-to-file f
(lambda () (lambda ()
(let loop ([n n]) (let loop ([n n])
@ -115,6 +122,9 @@
(loop (sub1 n)))))))) (loop (sub1 n))))))))
f)) f))
(define (mk-moments-input n)
(mk-sumcol-input n #t))
(define iters (define iters
(let ([len (vector-length (current-command-line-arguments))]) (let ([len (vector-length (current-command-line-arguments))])
(unless (<= 1 len 3) (unless (<= 1 len 3)

2
collects/tests/racket/benchmarks/shootout/typed/moments.rktl
View File

@ -12,7 +12,7 @@
(numlist : (Listof Float) '()) (numlist : (Listof Float) '())
(sum : Float 0.0)) (sum : Float 0.0))
(cond ((not (eof-object? line)) (cond ((not (eof-object? line))
(let ((num (exact->inexact (assert (string->number line) real?)))) (let ((num (assert (string->number line) inexact-real?)))
(loop (read-line) (cons num numlist) (+ num sum)))) (loop (read-line) (cons num numlist) (+ num sum))))
(else (else
(unless (null? numlist) (unless (null? numlist)