test repairs for DrDr

svn: r16694
This commit is contained in:
Matthew Flatt 2009-11-11 14:01:18 +00:00
parent 2389cc6647
commit 8845e870cb
4 changed files with 61 additions and 98 deletions

View File

@ -12,7 +12,8 @@ exec mzscheme -qu "$0" ${1+"$@"}
mzlib/inflate
mzlib/date
dynext/file
syntax/toplevel)
syntax/toplevel
scheme/runtime-path)
;; Implementaton-specific control functions ------------------------------
@ -343,19 +344,23 @@ exec mzscheme -qu "$0" ${1+"$@"}
(process-command-line benchmarks
(map impl-name impls) obsolte-impls
3))
(define-runtime-path bm-directory ".")
;; Benchmark-specific setup --------------------
(when (memq 'dynamic actual-benchmarks-to-run )
(unless (file-exists? "dynamic-input.txt")
(gunzip "dynamic-input.txt.gz")))
(parameterize ([current-directory bm-directory])
(when (memq 'dynamic actual-benchmarks-to-run)
(unless (file-exists? "dynamic-input.txt")
(gunzip "dynamic-input.txt.gz"))))
;; Run benchmarks -------------------------------
(rprintf "; ~a\n" (date->string (seconds->date (current-seconds)) #t))
(for-each (lambda (impl)
(map (lambda (bm)
(run-benchmark impl bm))
actual-benchmarks-to-run))
actual-implementations-to-run))
(parameterize ([current-directory bm-directory])
(for-each (lambda (impl)
(map (lambda (bm)
(run-benchmark impl bm))
actual-benchmarks-to-run))
actual-implementations-to-run)))

View File

@ -1,44 +0,0 @@
#lang scheme/base
(require (planet schematics/schemeunit:3)
(planet schematics/benchmark:2))
;; Test that comprehensions are as fast as hand-written
;; loops
;;
;; Vector comprehensions
;;
(define big-vector (make-vector 65536 1))
(test-case
"simplest vector comprehension"
(check-as-fast
"comprehension"
(lambda ()
(for/fold ([sum 0]) ([x (in-vector big-vector)])
(+ sum x)))
"hand-written loop"
(lambda ()
(let ([end (vector-length big-vector)])
(let loop ([i 0] [sum 0])
(if (= i end)
sum
(loop (add1 i) (+ (vector-ref big-vector i) sum))))))))
(test-case
"vector comprehension with step"
(check-as-fast
"comprehension"
(lambda ()
(for/fold ([sum 0]) ([x (in-vector big-vector 0 (vector-length big-vector) 2)])
(+ sum x)))
"hand-written loop"
(lambda ()
(let ([end (vector-length big-vector)])
(let loop ([i 0] [sum 0])
(if (= i end)
sum
(loop (+ i 2) (+ (vector-ref big-vector i) sum))))))))

View File

@ -13,53 +13,54 @@
(let ((num (string->number line)))
(set! sum (+ num sum))
(loop (read-line) (cons num numlist))))))))
(let ((n (length numlist)))
(let ((mean (/ sum n))
(average_deviation 0.0)
(standard_deviation 0.0)
(variance 0.0)
(skew 0.0)
(kurtosis 0.0)
(median 0.0)
(deviation 0.0))
(let loop ((nums numlist))
(if (not (null? nums))
(begin
(set! deviation (- (car nums) mean))
(set! average_deviation (+ average_deviation (abs deviation)))
(set! variance (+ variance (expt deviation 2.0)))
(set! skew (+ skew (expt deviation 3.0)))
(set! kurtosis (+ kurtosis (expt deviation 4)))
(loop (cdr nums)))))
(unless (null? numlist)
(let ((n (length numlist)))
(let ((mean (/ sum n))
(average_deviation 0.0)
(standard_deviation 0.0)
(variance 0.0)
(skew 0.0)
(kurtosis 0.0)
(median 0.0)
(deviation 0.0))
(let loop ((nums numlist))
(if (not (null? nums))
(begin
(set! deviation (- (car nums) mean))
(set! average_deviation (+ average_deviation (abs deviation)))
(set! variance (+ variance (expt deviation 2.0)))
(set! skew (+ skew (expt deviation 3.0)))
(set! kurtosis (+ kurtosis (expt deviation 4)))
(loop (cdr nums)))))
(set! average_deviation (/ average_deviation (exact->inexact n)))
(set! variance (/ variance (- n 1)))
(set! standard_deviation (sqrt variance))
(set! average_deviation (/ average_deviation (exact->inexact n)))
(set! variance (/ variance (- n 1)))
(set! standard_deviation (sqrt variance))
(cond ((> variance 0.0)
(set! skew (/ skew (* n variance standard_deviation)))
(set! kurtosis (- (/ kurtosis (* n variance variance))
3.0))))
(cond ((> variance 0.0)
(set! skew (/ skew (* n variance standard_deviation)))
(set! kurtosis (- (/ kurtosis (* n variance variance))
3.0))))
(set! numlist (sort numlist (lambda (x y) (< x y))))
(set! numlist (sort numlist (lambda (x y) (< x y))))
(let ((mid (quotient n 2)))
(if (zero? (modulo n 2))
(set! median (/ (+ (car (list-tail numlist mid))
(car (list-tail numlist (- mid 1))))
2.0))
(set! median (car (list-tail numlist mid)))))
(let ((mid (quotient n 2)))
(if (zero? (modulo n 2))
(set! median (/ (+ (car (list-tail numlist mid))
(car (list-tail numlist (- mid 1))))
2.0))
(set! median (car (list-tail numlist mid)))))
(set! standard_deviation (/ (round (* standard_deviation 1000000))
1000000))
(set! standard_deviation (/ (round (* standard_deviation 1000000))
1000000))
(for-each display
`("n: " ,n "\n"
"median: " ,(to-str median) "\n"
"mean: " ,(to-str mean) "\n"
"average_deviation: " ,(to-str average_deviation ) "\n"
"standard_deviation: " ,(to-str standard_deviation) "\n"
"variance: " ,(to-str variance)"\n"
"skew: " ,(to-str skew) "\n"
"kurtosis: " ,(to-str kurtosis)"\n" ))))))
(for-each display
`("n: " ,n "\n"
"median: " ,(to-str median) "\n"
"mean: " ,(to-str mean) "\n"
"average_deviation: " ,(to-str average_deviation ) "\n"
"standard_deviation: " ,(to-str standard_deviation) "\n"
"variance: " ,(to-str variance)"\n"
"skew: " ,(to-str skew) "\n"
"kurtosis: " ,(to-str kurtosis)"\n" )))))))

View File

@ -85,8 +85,9 @@
(define iters
(let ([len (vector-length (current-command-line-arguments))])
(unless (<= 1 len 2)
(error 'run "provide ~athe name of a benchmark on the command line and an optional iteration count"
(if (zero? len) "" "ONLY ")))
(printf "provide ~athe name of a benchmark on the command line and an optional iteration count\n"
(if (zero? len) "" "ONLY "))
(exit))
(if (= len 2)
(string->number (vector-ref (current-command-line-arguments) 1))
1)))