Changed the typed benchmark harness to reflect optimization on by default.
This commit is contained in:
parent
d39cb530cf
commit
3ec9503da9
|
@ -50,7 +50,7 @@ exec racket -qu "$0" ${1+"$@"}
|
|||
(when (directory-exists? "compiled")
|
||||
(delete-directory/files "compiled")))
|
||||
|
||||
(define (mk-typed-scheme bm)
|
||||
(define (mk-typed-racket-non-optimizing bm)
|
||||
(unless (directory-exists? "typed/compiled")
|
||||
(make-directory "typed/compiled"))
|
||||
(parameterize ([current-namespace (make-base-namespace)]
|
||||
|
@ -58,7 +58,7 @@ exec racket -qu "$0" ${1+"$@"}
|
|||
(let ([name (format "~a-non-optimizing.rkt" bm)])
|
||||
(compile-file (format "typed/~a" name)
|
||||
(build-path "typed/compiled" (path-add-suffix name #".zo"))))))
|
||||
(define (mk-typed-scheme-optimizing bm)
|
||||
(define (mk-typed-racket bm)
|
||||
(unless (directory-exists? "typed/compiled")
|
||||
(make-directory "typed/compiled"))
|
||||
(parameterize ([current-namespace (make-base-namespace)]
|
||||
|
@ -417,18 +417,18 @@ exec racket -qu "$0" ${1+"$@"}
|
|||
clean-up-zo
|
||||
(append '(nucleic2)
|
||||
mutable-pair-progs))
|
||||
(make-impl 'typed-scheme
|
||||
(make-impl 'typed-racket-non-optimizing
|
||||
void
|
||||
mk-typed-scheme
|
||||
mk-typed-racket-non-optimizing
|
||||
(lambda (bm)
|
||||
(system (format "racket -u typed/~a-non-optimizing.rkt" bm)))
|
||||
extract-racket-times
|
||||
clean-up-typed
|
||||
(append mutable-pair-progs
|
||||
'(dynamic2 earley nboyer nucleic2 sboyer scheme2)))
|
||||
(make-impl 'typed-scheme-optimizing
|
||||
(make-impl 'typed-racket
|
||||
void
|
||||
mk-typed-scheme-optimizing
|
||||
mk-typed-racket
|
||||
(lambda (bm)
|
||||
(system (format "racket -u typed/~a-optimizing.rkt" bm)))
|
||||
extract-racket-times
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
(caar (regexp-match-positions
|
||||
(if opt? opt-re non-opt-re)
|
||||
name)))]
|
||||
[option (if opt? (list #'#:optimize) '())]
|
||||
[option (if opt? '() (list #'#:no-optimize))]
|
||||
[fname (format "~a.rktl" base-name)])
|
||||
#`(ts:#%module-begin
|
||||
#,@option
|
||||
|
|
|
@ -45,7 +45,7 @@ exec racket -qu "$0" ${1+"$@"}
|
|||
(when (directory-exists? "compiled")
|
||||
(delete-directory/files "compiled")))
|
||||
|
||||
(define (mk-typed-scheme bm)
|
||||
(define (mk-typed-racket-non-optimizing bm)
|
||||
(unless (directory-exists? "typed/compiled")
|
||||
(make-directory "typed/compiled"))
|
||||
(parameterize ([current-namespace (make-base-namespace)]
|
||||
|
@ -53,7 +53,7 @@ exec racket -qu "$0" ${1+"$@"}
|
|||
(let ([name (format "~a-non-optimizing.rkt" bm)])
|
||||
(compile-file (format "typed/~a" name)
|
||||
(build-path "typed/compiled" (path-add-suffix name #".zo"))))))
|
||||
(define (mk-typed-scheme-optimizing bm)
|
||||
(define (mk-typed-racket bm)
|
||||
(unless (directory-exists? "typed/compiled")
|
||||
(make-directory "typed/compiled"))
|
||||
(parameterize ([current-namespace (make-base-namespace)]
|
||||
|
@ -84,19 +84,19 @@ exec racket -qu "$0" ${1+"$@"}
|
|||
extract-racket-times
|
||||
clean-up-zo
|
||||
'())
|
||||
(make-impl 'typed-scheme
|
||||
(make-impl 'typed-racket-non-optimizing
|
||||
void
|
||||
mk-typed-scheme
|
||||
mk-typed-racket-non-optimizing
|
||||
(lambda (bm)
|
||||
(system (format "racket run.rkt ~a typed-scheme" bm)))
|
||||
(system (format "racket run.rkt ~a typed-racket-non-optimizing" bm)))
|
||||
extract-racket-times
|
||||
clean-up-typed
|
||||
'())
|
||||
(make-impl 'typed-scheme-optimizing
|
||||
(make-impl 'typed-racket
|
||||
void
|
||||
mk-typed-scheme-optimizing
|
||||
mk-typed-racket
|
||||
(lambda (bm)
|
||||
(system (format "racket run.rkt ~a typed-scheme-optimizing" bm)))
|
||||
(system (format "racket run.rkt ~a typed-racket" bm)))
|
||||
extract-racket-times
|
||||
clean-up-typed
|
||||
'())
|
||||
|
|
|
@ -138,9 +138,9 @@
|
|||
(vector-ref (current-command-line-arguments) 1))]
|
||||
[bench (vector-ref (current-command-line-arguments) 0)]
|
||||
[prog (cond
|
||||
((string=? version "racket") (format "~a.rkt" bench))
|
||||
((string=? version "typed-scheme") (format "typed/~a-non-optimizing.rkt" bench))
|
||||
((string=? version "typed-scheme-optimizing") (format "typed/~a-optimizing.rkt" bench))
|
||||
((string=? version "racket") (format "~a.rkt" bench))
|
||||
((string=? version "typed-racket-non-optimizing") (format "typed/~a-non-optimizing.rkt" bench))
|
||||
((string=? version "typed-racket") (format "typed/~a-optimizing.rkt" bench))
|
||||
(else (error 'run "unknown version ~a" version)))])
|
||||
(let ([m (assoc bench input-map)])
|
||||
(unless m
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
(caar (regexp-match-positions
|
||||
(if opt? opt-re non-opt-re)
|
||||
name)))]
|
||||
[option (if opt? (list #'#:optimize) '())]
|
||||
[option (if opt? '() (list #'#:no-optimize))]
|
||||
[fname (format "~a.rktl" base-name)])
|
||||
#`(ts:#%module-begin #,@option
|
||||
(define OPTIMIZED? #,opt?)
|
||||
|
|
Loading…
Reference in New Issue
Block a user