From 1ac3f6905fc95d459e4621a85be61cb625069d8d Mon Sep 17 00:00:00 2001 From: Vincent St-Amour Date: Wed, 12 May 2010 15:15:49 -0400 Subject: [PATCH] Changed the typed benchmarks and the benchmark harness to use wrapper modules to turn typed Scheme's optimization on and off. --- collects/tests/racket/benchmarks/common/auto.rkt | 16 ++++++++++++++-- .../common/cpstack-typed-non-optimizing.rkt | 2 ++ .../common/cpstack-typed-optimizing.rkt | 2 ++ .../racket/benchmarks/common/cpstack-typed.rkt | 2 -- .../common/ctak-typed-non-optimizing.rkt | 2 ++ .../benchmarks/common/ctak-typed-optimizing.rkt | 2 ++ .../racket/benchmarks/common/ctak-typed.rkt | 2 -- .../common/dderiv-typed-non-optimizing.rkt | 2 ++ .../common/dderiv-typed-optimizing.rkt | 2 ++ .../racket/benchmarks/common/dderiv-typed.rkt | 2 -- .../common/deriv-typed-non-optimizing.rkt | 2 ++ .../benchmarks/common/deriv-typed-optimizing.rkt | 2 ++ .../racket/benchmarks/common/deriv-typed.rkt | 2 -- .../common/div-typed-non-optimizing.rkt | 2 ++ .../benchmarks/common/div-typed-optimizing.rkt | 2 ++ .../tests/racket/benchmarks/common/div-typed.rkt | 2 -- .../common/fft-typed-non-optimizing.rkt | 2 ++ .../benchmarks/common/fft-typed-optimizing.rkt | 2 ++ .../tests/racket/benchmarks/common/fft-typed.rkt | 2 -- .../common/graphs-typed-non-optimizing.rkt | 2 ++ .../common/graphs-typed-optimizing.rkt | 2 ++ .../racket/benchmarks/common/graphs-typed.rkt | 2 -- .../common/lattice2-typed-non-optimizing.rkt | 2 ++ .../common/lattice2-typed-optimizing.rkt | 2 ++ .../racket/benchmarks/common/lattice2-typed.rkt | 2 -- .../common/mazefun-typed-non-optimizing.rkt | 2 ++ .../common/mazefun-typed-optimizing.rkt | 2 ++ .../racket/benchmarks/common/mazefun-typed.rkt | 2 -- .../common/nestedloop-typed-non-optimizing.rkt | 2 ++ .../common/nestedloop-typed-optimizing.rkt | 2 ++ .../benchmarks/common/nestedloop-typed.rkt | 2 -- .../common/nfa-typed-non-optimizing.rkt | 2 ++ .../benchmarks/common/nfa-typed-optimizing.rkt | 2 ++ .../tests/racket/benchmarks/common/nfa-typed.rkt | 2 -- .../common/nothing-typed-non-optimizing.rkt | 2 ++ .../common/nothing-typed-optimizing.rkt | 2 ++ .../racket/benchmarks/common/nothing-typed.rkt | 2 -- .../common/nqueens-typed-non-optimizing.rkt | 2 ++ .../common/nqueens-typed-optimizing.rkt | 2 ++ .../racket/benchmarks/common/nqueens-typed.rkt | 1 - .../common/paraffins-typed-non-optimizing.rkt | 2 ++ .../common/paraffins-typed-optimizing.rkt | 2 ++ .../racket/benchmarks/common/paraffins-typed.rkt | 2 -- .../common/puzzle-typed-non-optimizing.rkt | 2 ++ .../common/puzzle-typed-optimizing.rkt | 2 ++ .../racket/benchmarks/common/puzzle-typed.rkt | 2 -- .../common/tak-typed-non-optimizing.rkt | 2 ++ .../benchmarks/common/tak-typed-optimizing.rkt | 2 ++ .../tests/racket/benchmarks/common/tak-typed.rkt | 2 -- .../common/takl-typed-non-optimizing.rkt | 2 ++ .../benchmarks/common/takl-typed-optimizing.rkt | 2 ++ .../racket/benchmarks/common/takl-typed.rkt | 2 -- .../common/takr-typed-non-optimizing.rkt | 2 ++ .../benchmarks/common/takr-typed-optimizing.rkt | 2 ++ .../racket/benchmarks/common/takr-typed.rkt | 2 -- .../common/takr2-typed-non-optimizing.rkt | 2 ++ .../benchmarks/common/takr2-typed-optimizing.rkt | 2 ++ .../racket/benchmarks/common/takr2-typed.rkt | 2 -- .../common/triangle-typed-non-optimizing.rkt | 2 ++ .../common/triangle-typed-optimizing.rkt | 2 ++ .../racket/benchmarks/common/triangle-typed.rkt | 2 -- .../common/wrap-typed-non-optimizing.rkt | 15 +++++++++++++++ .../benchmarks/common/wrap-typed-optimizing.rkt | 15 +++++++++++++++ 63 files changed, 124 insertions(+), 41 deletions(-) create mode 100644 collects/tests/racket/benchmarks/common/cpstack-typed-non-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/cpstack-typed-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/ctak-typed-non-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/ctak-typed-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/dderiv-typed-non-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/dderiv-typed-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/deriv-typed-non-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/deriv-typed-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/div-typed-non-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/div-typed-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/fft-typed-non-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/fft-typed-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/graphs-typed-non-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/graphs-typed-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/lattice2-typed-non-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/lattice2-typed-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/mazefun-typed-non-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/mazefun-typed-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/nestedloop-typed-non-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/nestedloop-typed-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/nfa-typed-non-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/nfa-typed-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/nothing-typed-non-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/nothing-typed-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/nqueens-typed-non-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/nqueens-typed-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/paraffins-typed-non-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/paraffins-typed-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/puzzle-typed-non-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/puzzle-typed-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/tak-typed-non-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/tak-typed-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/takl-typed-non-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/takl-typed-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/takr-typed-non-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/takr-typed-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/takr2-typed-non-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/takr2-typed-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/triangle-typed-non-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/triangle-typed-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/wrap-typed-non-optimizing.rkt create mode 100644 collects/tests/racket/benchmarks/common/wrap-typed-optimizing.rkt diff --git a/collects/tests/racket/benchmarks/common/auto.rkt b/collects/tests/racket/benchmarks/common/auto.rkt index b8dcadf784..2bdf46f7fa 100755 --- a/collects/tests/racket/benchmarks/common/auto.rkt +++ b/collects/tests/racket/benchmarks/common/auto.rkt @@ -401,10 +401,22 @@ exec racket -qu "$0" ${1+"$@"} void mk-racket (lambda (bm) - (system (format "racket -u ~a-typed.rkt" bm))) + (system (format "racket -u ~a-typed-non-optimizing.rkt" bm))) extract-racket-times clean-up-zo - mutable-pair-progs) + (append mutable-pair-progs + '(dynamic2 earley maze2 nboyer nucleic2 sboyer + scheme2))) + (make-impl 'typed-scheme-optimizing + void + mk-racket + (lambda (bm) + (system (format "racket -u ~a-typed-optimizing.rkt" bm))) + extract-racket-times + clean-up-zo + (append mutable-pair-progs + '(dynamic2 earley maze2 nboyer nucleic2 sboyer + scheme2))) (make-impl 'chicken void (run-mk "mk-chicken.rktl") diff --git a/collects/tests/racket/benchmarks/common/cpstack-typed-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/cpstack-typed-non-optimizing.rkt new file mode 100644 index 0000000000..f8728a067c --- /dev/null +++ b/collects/tests/racket/benchmarks/common/cpstack-typed-non-optimizing.rkt @@ -0,0 +1,2 @@ + +(module cpstack-typed-non-optimizing "wrap-typed-non-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/cpstack-typed-optimizing.rkt b/collects/tests/racket/benchmarks/common/cpstack-typed-optimizing.rkt new file mode 100644 index 0000000000..dd95a3748f --- /dev/null +++ b/collects/tests/racket/benchmarks/common/cpstack-typed-optimizing.rkt @@ -0,0 +1,2 @@ + +(module cpstack-typed-optimizing "wrap-typed-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/cpstack-typed.rkt b/collects/tests/racket/benchmarks/common/cpstack-typed.rkt index 9f2a03b6e8..2de0f2587e 100644 --- a/collects/tests/racket/benchmarks/common/cpstack-typed.rkt +++ b/collects/tests/racket/benchmarks/common/cpstack-typed.rkt @@ -11,8 +11,6 @@ ;;; CPSTAK -- A continuation-passing version of the TAK benchmark. ;;; A good test of first class procedures and tail recursion. -#lang typed/scheme/base - (: cpstak (Integer Integer Integer -> Integer)) (define (cpstak x y z) (: tak (Integer Integer Integer (Integer -> Integer) -> Integer)) diff --git a/collects/tests/racket/benchmarks/common/ctak-typed-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/ctak-typed-non-optimizing.rkt new file mode 100644 index 0000000000..2f3bc265c2 --- /dev/null +++ b/collects/tests/racket/benchmarks/common/ctak-typed-non-optimizing.rkt @@ -0,0 +1,2 @@ + +(module ctak-typed-non-optimizing "wrap-typed-non-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/ctak-typed-optimizing.rkt b/collects/tests/racket/benchmarks/common/ctak-typed-optimizing.rkt new file mode 100644 index 0000000000..44981326b3 --- /dev/null +++ b/collects/tests/racket/benchmarks/common/ctak-typed-optimizing.rkt @@ -0,0 +1,2 @@ + +(module ctak-typed-optimizing "wrap-typed-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/ctak-typed.rkt b/collects/tests/racket/benchmarks/common/ctak-typed.rkt index f035a40ca3..0cc47a9104 100644 --- a/collects/tests/racket/benchmarks/common/ctak-typed.rkt +++ b/collects/tests/racket/benchmarks/common/ctak-typed.rkt @@ -21,8 +21,6 @@ ;;; CTAK -- A version of the TAK function that uses the CATCH/THROW facility. -#lang typed/scheme/base - (: ctak (Integer Integer Integer -> Integer)) (define (ctak x y z) ((inst call-with-current-continuation Integer Integer) diff --git a/collects/tests/racket/benchmarks/common/dderiv-typed-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/dderiv-typed-non-optimizing.rkt new file mode 100644 index 0000000000..7aa50d46bd --- /dev/null +++ b/collects/tests/racket/benchmarks/common/dderiv-typed-non-optimizing.rkt @@ -0,0 +1,2 @@ + +(module dderiv-typed-non-optimizing "wrap-typed-non-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/dderiv-typed-optimizing.rkt b/collects/tests/racket/benchmarks/common/dderiv-typed-optimizing.rkt new file mode 100644 index 0000000000..bfe807aec0 --- /dev/null +++ b/collects/tests/racket/benchmarks/common/dderiv-typed-optimizing.rkt @@ -0,0 +1,2 @@ + +(module dderiv-typed-optimizing "wrap-typed-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/dderiv-typed.rkt b/collects/tests/racket/benchmarks/common/dderiv-typed.rkt index f57f8a61dc..ea45247791 100644 --- a/collects/tests/racket/benchmarks/common/dderiv-typed.rkt +++ b/collects/tests/racket/benchmarks/common/dderiv-typed.rkt @@ -35,8 +35,6 @@ ; Returns the wrong answer for quotients. ; Fortunately these aren't used in the benchmark. -#lang typed/scheme/base - (define-type Plist (Listof (Pair Symbol ((Listof Deriv) -> Deriv)))) (: pg-alist Plist) diff --git a/collects/tests/racket/benchmarks/common/deriv-typed-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/deriv-typed-non-optimizing.rkt new file mode 100644 index 0000000000..b2a4370715 --- /dev/null +++ b/collects/tests/racket/benchmarks/common/deriv-typed-non-optimizing.rkt @@ -0,0 +1,2 @@ + +(module deriv-typed-non-optimizing "wrap-typed-non-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/deriv-typed-optimizing.rkt b/collects/tests/racket/benchmarks/common/deriv-typed-optimizing.rkt new file mode 100644 index 0000000000..cd1ce4f8d8 --- /dev/null +++ b/collects/tests/racket/benchmarks/common/deriv-typed-optimizing.rkt @@ -0,0 +1,2 @@ + +(module deriv-typed-optimizing "wrap-typed-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/deriv-typed.rkt b/collects/tests/racket/benchmarks/common/deriv-typed.rkt index 5a59f15a94..a2516a07fd 100644 --- a/collects/tests/racket/benchmarks/common/deriv-typed.rkt +++ b/collects/tests/racket/benchmarks/common/deriv-typed.rkt @@ -18,8 +18,6 @@ ; Returns the wrong answer for quotients. ; Fortunately these aren't used in the benchmark. -#lang typed/scheme/base - (define-type Deriv (Rec Deriv (U Number Symbol (Pair (U '+ '- '* '/) diff --git a/collects/tests/racket/benchmarks/common/div-typed-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/div-typed-non-optimizing.rkt new file mode 100644 index 0000000000..d512d62316 --- /dev/null +++ b/collects/tests/racket/benchmarks/common/div-typed-non-optimizing.rkt @@ -0,0 +1,2 @@ + +(module div-typed-non-optimizing "wrap-typed-non-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/div-typed-optimizing.rkt b/collects/tests/racket/benchmarks/common/div-typed-optimizing.rkt new file mode 100644 index 0000000000..a117f7b4bb --- /dev/null +++ b/collects/tests/racket/benchmarks/common/div-typed-optimizing.rkt @@ -0,0 +1,2 @@ + +(module div-typed-optimizing "wrap-typed-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/div-typed.rkt b/collects/tests/racket/benchmarks/common/div-typed.rkt index bcc5a05b3e..20cf415ed5 100644 --- a/collects/tests/racket/benchmarks/common/div-typed.rkt +++ b/collects/tests/racket/benchmarks/common/div-typed.rkt @@ -13,8 +13,6 @@ ;;; DIV2 -- Benchmark which divides by 2 using lists of n ()'s. ;;; This file contains a recursive as well as an iterative test. -#lang typed/scheme/base - (: create-n (Integer -> (Listof Any))) (define (create-n n) (do ((n n (- n 1)) diff --git a/collects/tests/racket/benchmarks/common/fft-typed-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/fft-typed-non-optimizing.rkt new file mode 100644 index 0000000000..f4e4e8bd4f --- /dev/null +++ b/collects/tests/racket/benchmarks/common/fft-typed-non-optimizing.rkt @@ -0,0 +1,2 @@ + +(module fft-typed-non-optimizing "wrap-typed-non-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/fft-typed-optimizing.rkt b/collects/tests/racket/benchmarks/common/fft-typed-optimizing.rkt new file mode 100644 index 0000000000..de9dfe52cb --- /dev/null +++ b/collects/tests/racket/benchmarks/common/fft-typed-optimizing.rkt @@ -0,0 +1,2 @@ + +(module fft-typed-optimizing "wrap-typed-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/fft-typed.rkt b/collects/tests/racket/benchmarks/common/fft-typed.rkt index d29c308cc3..ebecbf2b58 100644 --- a/collects/tests/racket/benchmarks/common/fft-typed.rkt +++ b/collects/tests/racket/benchmarks/common/fft-typed.rkt @@ -10,8 +10,6 @@ ; Status: Public Domain ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -#lang typed/scheme/base - (: pi Complex) (define pi (atan 0 -1)) diff --git a/collects/tests/racket/benchmarks/common/graphs-typed-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/graphs-typed-non-optimizing.rkt new file mode 100644 index 0000000000..e8004a5014 --- /dev/null +++ b/collects/tests/racket/benchmarks/common/graphs-typed-non-optimizing.rkt @@ -0,0 +1,2 @@ + +(module graphs-typed-non-optimizing "wrap-typed-non-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/graphs-typed-optimizing.rkt b/collects/tests/racket/benchmarks/common/graphs-typed-optimizing.rkt new file mode 100644 index 0000000000..b57371d950 --- /dev/null +++ b/collects/tests/racket/benchmarks/common/graphs-typed-optimizing.rkt @@ -0,0 +1,2 @@ + +(module graphs-typed-optimizing "wrap-typed-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/graphs-typed.rkt b/collects/tests/racket/benchmarks/common/graphs-typed.rkt index b9b01477dc..97a6054f9b 100644 --- a/collects/tests/racket/benchmarks/common/graphs-typed.rkt +++ b/collects/tests/racket/benchmarks/common/graphs-typed.rkt @@ -12,8 +12,6 @@ ; End of new code. -#lang typed/scheme/base - ;;; ==== std.ss ==== ; (define-syntax assert diff --git a/collects/tests/racket/benchmarks/common/lattice2-typed-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/lattice2-typed-non-optimizing.rkt new file mode 100644 index 0000000000..1cedcd7a44 --- /dev/null +++ b/collects/tests/racket/benchmarks/common/lattice2-typed-non-optimizing.rkt @@ -0,0 +1,2 @@ + +(module lattice2-typed-non-optimizing "wrap-typed-non-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/lattice2-typed-optimizing.rkt b/collects/tests/racket/benchmarks/common/lattice2-typed-optimizing.rkt new file mode 100644 index 0000000000..d5f256aecb --- /dev/null +++ b/collects/tests/racket/benchmarks/common/lattice2-typed-optimizing.rkt @@ -0,0 +1,2 @@ + +(module lattice2-typed-optimizing "wrap-typed-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/lattice2-typed.rkt b/collects/tests/racket/benchmarks/common/lattice2-typed.rkt index 5dffdc6a5c..fe53429bc3 100644 --- a/collects/tests/racket/benchmarks/common/lattice2-typed.rkt +++ b/collects/tests/racket/benchmarks/common/lattice2-typed.rkt @@ -3,8 +3,6 @@ ;;; LATTICE -- Obtained from Andrew Wright. -#lang typed/scheme/base - (define-type Verdict (U 'less 'more 'equal 'uncomparable)) ;; Given a comparison routine that returns one of diff --git a/collects/tests/racket/benchmarks/common/mazefun-typed-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/mazefun-typed-non-optimizing.rkt new file mode 100644 index 0000000000..bc21830e18 --- /dev/null +++ b/collects/tests/racket/benchmarks/common/mazefun-typed-non-optimizing.rkt @@ -0,0 +1,2 @@ + +(module mazefun-typed-non-optimizing "wrap-typed-non-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/mazefun-typed-optimizing.rkt b/collects/tests/racket/benchmarks/common/mazefun-typed-optimizing.rkt new file mode 100644 index 0000000000..9797f8f3e8 --- /dev/null +++ b/collects/tests/racket/benchmarks/common/mazefun-typed-optimizing.rkt @@ -0,0 +1,2 @@ + +(module mazefun-typed-optimizing "wrap-typed-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/mazefun-typed.rkt b/collects/tests/racket/benchmarks/common/mazefun-typed.rkt index f98b64bf00..f01610dbb1 100644 --- a/collects/tests/racket/benchmarks/common/mazefun-typed.rkt +++ b/collects/tests/racket/benchmarks/common/mazefun-typed.rkt @@ -1,8 +1,6 @@ ;;; MAZEFUN -- Constructs a maze in a purely functional way, ;;; written by Marc Feeley. -#lang typed/scheme/base - (: iota (Integer -> (Listof Integer))) (define iota (lambda (n) diff --git a/collects/tests/racket/benchmarks/common/nestedloop-typed-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/nestedloop-typed-non-optimizing.rkt new file mode 100644 index 0000000000..70b143e8ea --- /dev/null +++ b/collects/tests/racket/benchmarks/common/nestedloop-typed-non-optimizing.rkt @@ -0,0 +1,2 @@ + +(module nestedloop-typed-non-optimizing "wrap-typed-non-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/nestedloop-typed-optimizing.rkt b/collects/tests/racket/benchmarks/common/nestedloop-typed-optimizing.rkt new file mode 100644 index 0000000000..74cd8a3f5f --- /dev/null +++ b/collects/tests/racket/benchmarks/common/nestedloop-typed-optimizing.rkt @@ -0,0 +1,2 @@ + +(module nestedloop-typed-optimizing "wrap-typed-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/nestedloop-typed.rkt b/collects/tests/racket/benchmarks/common/nestedloop-typed.rkt index 9d30b46fdc..b2061b310e 100644 --- a/collects/tests/racket/benchmarks/common/nestedloop-typed.rkt +++ b/collects/tests/racket/benchmarks/common/nestedloop-typed.rkt @@ -1,5 +1,3 @@ -#lang typed/scheme/base - ;; Imperative body: (: loops (Integer -> Integer)) (define (loops n) diff --git a/collects/tests/racket/benchmarks/common/nfa-typed-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/nfa-typed-non-optimizing.rkt new file mode 100644 index 0000000000..785571093b --- /dev/null +++ b/collects/tests/racket/benchmarks/common/nfa-typed-non-optimizing.rkt @@ -0,0 +1,2 @@ + +(module nfa-typed-non-optimizing "wrap-typed-non-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/nfa-typed-optimizing.rkt b/collects/tests/racket/benchmarks/common/nfa-typed-optimizing.rkt new file mode 100644 index 0000000000..3c8a6e16aa --- /dev/null +++ b/collects/tests/racket/benchmarks/common/nfa-typed-optimizing.rkt @@ -0,0 +1,2 @@ + +(module nfa-typed-optimizing "wrap-typed-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/nfa-typed.rkt b/collects/tests/racket/benchmarks/common/nfa-typed.rkt index bbf5b8ba74..527d470349 100644 --- a/collects/tests/racket/benchmarks/common/nfa-typed.rkt +++ b/collects/tests/racket/benchmarks/common/nfa-typed.rkt @@ -3,8 +3,6 @@ ;; Changed by Matthew 2006/08/21 to move string->list out of the loop ;; Changed by Vincent 2010/04/05 to convert to typed Scheme -#lang typed/scheme/base - (define-type Result (U 'state2 'state4 #f)) (: recursive-nfa ((Listof Char) -> (U 'state2 'state4 'fail))) diff --git a/collects/tests/racket/benchmarks/common/nothing-typed-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/nothing-typed-non-optimizing.rkt new file mode 100644 index 0000000000..356243ab25 --- /dev/null +++ b/collects/tests/racket/benchmarks/common/nothing-typed-non-optimizing.rkt @@ -0,0 +1,2 @@ + +(module nothing-typed-non-optimizing "wrap-typed-non-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/nothing-typed-optimizing.rkt b/collects/tests/racket/benchmarks/common/nothing-typed-optimizing.rkt new file mode 100644 index 0000000000..a6c59af357 --- /dev/null +++ b/collects/tests/racket/benchmarks/common/nothing-typed-optimizing.rkt @@ -0,0 +1,2 @@ + +(module nothing-typed-optimizing "wrap-typed-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/nothing-typed.rkt b/collects/tests/racket/benchmarks/common/nothing-typed.rkt index acada135b8..d3cd072131 100644 --- a/collects/tests/racket/benchmarks/common/nothing-typed.rkt +++ b/collects/tests/racket/benchmarks/common/nothing-typed.rkt @@ -1,3 +1 @@ -#lang typed/scheme/base - (time 1) diff --git a/collects/tests/racket/benchmarks/common/nqueens-typed-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/nqueens-typed-non-optimizing.rkt new file mode 100644 index 0000000000..23b33c9bfa --- /dev/null +++ b/collects/tests/racket/benchmarks/common/nqueens-typed-non-optimizing.rkt @@ -0,0 +1,2 @@ + +(module nqueens-typed-non-optimizing "wrap-typed-non-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/nqueens-typed-optimizing.rkt b/collects/tests/racket/benchmarks/common/nqueens-typed-optimizing.rkt new file mode 100644 index 0000000000..b646040b04 --- /dev/null +++ b/collects/tests/racket/benchmarks/common/nqueens-typed-optimizing.rkt @@ -0,0 +1,2 @@ + +(module nqueens-typed-optimizing "wrap-typed-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/nqueens-typed.rkt b/collects/tests/racket/benchmarks/common/nqueens-typed.rkt index 5cb71d2cc9..b6741da3f7 100644 --- a/collects/tests/racket/benchmarks/common/nqueens-typed.rkt +++ b/collects/tests/racket/benchmarks/common/nqueens-typed.rkt @@ -3,7 +3,6 @@ ;; 2010/04 -- got rid of the one-armed id (stamourv) ;; 2010/05 -- ported to typed Scheme (stamourv) -#lang typed/scheme/base (define trace? #f) (: nqueens (Integer -> Integer)) diff --git a/collects/tests/racket/benchmarks/common/paraffins-typed-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/paraffins-typed-non-optimizing.rkt new file mode 100644 index 0000000000..514a7efa94 --- /dev/null +++ b/collects/tests/racket/benchmarks/common/paraffins-typed-non-optimizing.rkt @@ -0,0 +1,2 @@ + +(module paraffins-typed-non-optimizing "wrap-typed-non-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/paraffins-typed-optimizing.rkt b/collects/tests/racket/benchmarks/common/paraffins-typed-optimizing.rkt new file mode 100644 index 0000000000..ecb03b8ae2 --- /dev/null +++ b/collects/tests/racket/benchmarks/common/paraffins-typed-optimizing.rkt @@ -0,0 +1,2 @@ + +(module paraffins-typed-optimizing "wrap-typed-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/paraffins-typed.rkt b/collects/tests/racket/benchmarks/common/paraffins-typed.rkt index 6f5af48a5f..70161b6e23 100644 --- a/collects/tests/racket/benchmarks/common/paraffins-typed.rkt +++ b/collects/tests/racket/benchmarks/common/paraffins-typed.rkt @@ -1,7 +1,5 @@ ;;; PARAFFINS -- Compute how many paraffins exist with N carbon atoms. -#lang typed/scheme/base - (require/typed scheme/base (collect-garbage ( -> Void))) (define-type Radical (Rec Radical (U 'C 'H 'BCP 'CCP (Vectorof Radical)))) diff --git a/collects/tests/racket/benchmarks/common/puzzle-typed-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/puzzle-typed-non-optimizing.rkt new file mode 100644 index 0000000000..41212328f6 --- /dev/null +++ b/collects/tests/racket/benchmarks/common/puzzle-typed-non-optimizing.rkt @@ -0,0 +1,2 @@ + +(module puzzle-typed-non-optimizing "wrap-typed-non-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/puzzle-typed-optimizing.rkt b/collects/tests/racket/benchmarks/common/puzzle-typed-optimizing.rkt new file mode 100644 index 0000000000..b4e712ca0b --- /dev/null +++ b/collects/tests/racket/benchmarks/common/puzzle-typed-optimizing.rkt @@ -0,0 +1,2 @@ + +(module puzzle-typed-optimizing "wrap-typed-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/puzzle-typed.rkt b/collects/tests/racket/benchmarks/common/puzzle-typed.rkt index 76feb4f858..d667ed50d0 100644 --- a/collects/tests/racket/benchmarks/common/puzzle-typed.rkt +++ b/collects/tests/racket/benchmarks/common/puzzle-typed.rkt @@ -10,8 +10,6 @@ ; Status: Public Domain ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -#lang typed/scheme/base - (: iota (Integer -> (Listof Integer))) (define (iota n) (do: : (Listof Integer) diff --git a/collects/tests/racket/benchmarks/common/tak-typed-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/tak-typed-non-optimizing.rkt new file mode 100644 index 0000000000..fe9ce2dfef --- /dev/null +++ b/collects/tests/racket/benchmarks/common/tak-typed-non-optimizing.rkt @@ -0,0 +1,2 @@ + +(module tak-typed-non-optimizing "wrap-typed-non-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/tak-typed-optimizing.rkt b/collects/tests/racket/benchmarks/common/tak-typed-optimizing.rkt new file mode 100644 index 0000000000..352cca77ee --- /dev/null +++ b/collects/tests/racket/benchmarks/common/tak-typed-optimizing.rkt @@ -0,0 +1,2 @@ + +(module tak-typed-optimizing "wrap-typed-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/tak-typed.rkt b/collects/tests/racket/benchmarks/common/tak-typed.rkt index 13ceb314de..3b68854990 100644 --- a/collects/tests/racket/benchmarks/common/tak-typed.rkt +++ b/collects/tests/racket/benchmarks/common/tak-typed.rkt @@ -12,8 +12,6 @@ ;;; TAK -- A vanilla version of the TAKeuchi function -#lang typed/scheme/base - (: tak (Integer Integer Integer -> Integer)) (define (tak x y z) (if (not (< y x)) diff --git a/collects/tests/racket/benchmarks/common/takl-typed-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/takl-typed-non-optimizing.rkt new file mode 100644 index 0000000000..c8db055bb9 --- /dev/null +++ b/collects/tests/racket/benchmarks/common/takl-typed-non-optimizing.rkt @@ -0,0 +1,2 @@ + +(module takl-typed-non-optimizing "wrap-typed-non-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/takl-typed-optimizing.rkt b/collects/tests/racket/benchmarks/common/takl-typed-optimizing.rkt new file mode 100644 index 0000000000..07809b96c8 --- /dev/null +++ b/collects/tests/racket/benchmarks/common/takl-typed-optimizing.rkt @@ -0,0 +1,2 @@ + +(module takl-typed-optimizing "wrap-typed-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/takl-typed.rkt b/collects/tests/racket/benchmarks/common/takl-typed.rkt index 1b26e969db..31248b3c5b 100644 --- a/collects/tests/racket/benchmarks/common/takl-typed.rkt +++ b/collects/tests/racket/benchmarks/common/takl-typed.rkt @@ -12,8 +12,6 @@ ;;; TAKL -- The TAKeuchi function using lists as counters. -#lang typed/scheme/base - (: listn (Integer -> (Listof Integer))) (define (listn n) (if (not (= 0 n)) diff --git a/collects/tests/racket/benchmarks/common/takr-typed-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/takr-typed-non-optimizing.rkt new file mode 100644 index 0000000000..9ebff9df95 --- /dev/null +++ b/collects/tests/racket/benchmarks/common/takr-typed-non-optimizing.rkt @@ -0,0 +1,2 @@ + +(module takr-typed-non-optimizing "wrap-typed-non-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/takr-typed-optimizing.rkt b/collects/tests/racket/benchmarks/common/takr-typed-optimizing.rkt new file mode 100644 index 0000000000..95cc95abdf --- /dev/null +++ b/collects/tests/racket/benchmarks/common/takr-typed-optimizing.rkt @@ -0,0 +1,2 @@ + +(module takr-typed-optimizing "wrap-typed-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/takr-typed.rkt b/collects/tests/racket/benchmarks/common/takr-typed.rkt index fac26304c6..5cc264a035 100644 --- a/collects/tests/racket/benchmarks/common/takr-typed.rkt +++ b/collects/tests/racket/benchmarks/common/takr-typed.rkt @@ -14,8 +14,6 @@ ;;; memory effects. Results should be the same as for TAK on stack machines. ;;; Distribution of calls is not completely flat. -#lang typed/scheme/base - (: tak0 (Integer Integer Integer -> Integer)) (define (tak0 x y z) (cond ((not (< y x)) z) diff --git a/collects/tests/racket/benchmarks/common/takr2-typed-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/takr2-typed-non-optimizing.rkt new file mode 100644 index 0000000000..04f3058453 --- /dev/null +++ b/collects/tests/racket/benchmarks/common/takr2-typed-non-optimizing.rkt @@ -0,0 +1,2 @@ + +(module takr2-typed-non-optimizing "wrap-typed-non-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/takr2-typed-optimizing.rkt b/collects/tests/racket/benchmarks/common/takr2-typed-optimizing.rkt new file mode 100644 index 0000000000..a1e2923f6c --- /dev/null +++ b/collects/tests/racket/benchmarks/common/takr2-typed-optimizing.rkt @@ -0,0 +1,2 @@ + +(module takr2-typed-optimizing "wrap-typed-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/takr2-typed.rkt b/collects/tests/racket/benchmarks/common/takr2-typed.rkt index 19ec9a915f..da7fa8440d 100644 --- a/collects/tests/racket/benchmarks/common/takr2-typed.rkt +++ b/collects/tests/racket/benchmarks/common/takr2-typed.rkt @@ -14,8 +14,6 @@ ;;; memory effects. Results should be the same as for TAK on stack machines. ;;; Distribution of calls is not completely flat. -#lang typed/scheme/base - (: tak (Integer Integer Integer -> Integer)) (define (tak x y z) (: tak0 (Integer Integer Integer -> Integer)) diff --git a/collects/tests/racket/benchmarks/common/triangle-typed-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/triangle-typed-non-optimizing.rkt new file mode 100644 index 0000000000..7239a98d2d --- /dev/null +++ b/collects/tests/racket/benchmarks/common/triangle-typed-non-optimizing.rkt @@ -0,0 +1,2 @@ + +(module triangle-typed-non-optimizing "wrap-typed-non-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/triangle-typed-optimizing.rkt b/collects/tests/racket/benchmarks/common/triangle-typed-optimizing.rkt new file mode 100644 index 0000000000..7c0873b835 --- /dev/null +++ b/collects/tests/racket/benchmarks/common/triangle-typed-optimizing.rkt @@ -0,0 +1,2 @@ + +(module triangle-typed-optimizing "wrap-typed-optimizing.ss") diff --git a/collects/tests/racket/benchmarks/common/triangle-typed.rkt b/collects/tests/racket/benchmarks/common/triangle-typed.rkt index e8b8fd3838..0531e417bd 100644 --- a/collects/tests/racket/benchmarks/common/triangle-typed.rkt +++ b/collects/tests/racket/benchmarks/common/triangle-typed.rkt @@ -13,8 +13,6 @@ ;;; TRIANG -- Board game benchmark. -#lang typed/scheme/base - (: *board* (Vectorof Integer)) (define *board* (make-vector 16 1)) (: *sequence* (Vectorof Integer)) diff --git a/collects/tests/racket/benchmarks/common/wrap-typed-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/wrap-typed-non-optimizing.rkt new file mode 100644 index 0000000000..620935ab4d --- /dev/null +++ b/collects/tests/racket/benchmarks/common/wrap-typed-non-optimizing.rkt @@ -0,0 +1,15 @@ + +(module wrap-typed-non-optimizing racket + (provide (rename-out (module-begin #%module-begin))) + (require (lib "include.ss")) + (require (prefix-in ts: typed/scheme/base)) + (require typed/scheme/base) + (define-syntax (module-begin stx) + (let ([name (symbol->string (syntax-property stx 'enclosing-module-name))]) + #`(ts:#%module-begin + (include #,(format "~a.rkt" + (substring name + 0 + (caar (regexp-match-positions + #rx"-non-optimizing" + name))))))))) diff --git a/collects/tests/racket/benchmarks/common/wrap-typed-optimizing.rkt b/collects/tests/racket/benchmarks/common/wrap-typed-optimizing.rkt new file mode 100644 index 0000000000..60a604e757 --- /dev/null +++ b/collects/tests/racket/benchmarks/common/wrap-typed-optimizing.rkt @@ -0,0 +1,15 @@ + +(module wrap-typed-optimizing racket + (provide (rename-out (module-begin #%module-begin))) + (require (lib "include.ss")) + (require (prefix-in ts: typed/scheme/base)) + (require typed/scheme/base) + (define-syntax (module-begin stx) + (let ([name (symbol->string (syntax-property stx 'enclosing-module-name))]) + #`(ts:#%module-begin #:optimize + (include #,(format "~a.rkt" + (substring name + 0 + (caar (regexp-match-positions + #rx"-optimizing" + name)))))))))