diff --git a/collects/tests/typed-scheme/optimizer/tests/nested-let-loop.rkt b/collects/tests/typed-scheme/optimizer/tests/nested-let-loop.rkt index 2e4bd4ac..6169996e 100644 --- a/collects/tests/typed-scheme/optimizer/tests/nested-let-loop.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/nested-let-loop.rkt @@ -1,35 +1,33 @@ #; ( -TR opt: nested-let-loop.rkt 39:0 (let: loop1 : Float-Complex ((x : (Listof Float-Complex) (quote (1.0+2.0i 2.0+4.0i))) (r : Float-Complex 0.0+0.0i)) (if (null? x) r (let: loop2 : Float-Complex ((y : (Listof Float-Complex) (quote (3.0+6.0i 4.0+8.0i))) (s : Float-Complex 0.0+0.0i)) (if (null? y) (loop1 (cdr x) (+ r s)) (loop2 (cdr y) (+ s (car x) (car y))))))) -- unboxed call site -TR opt: nested-let-loop.rkt 39:6 loop1 -- unboxed let loop -TR opt: nested-let-loop.rkt 39:6 loop1 -- fun -> unboxed fun -TR opt: nested-let-loop.rkt 39:6 loop1 -- unboxed function -> table -TR opt: nested-let-loop.rkt 41:8 r -- unboxed var -> table -TR opt: nested-let-loop.rkt 41:28 0.0+0.0i -- unboxed literal -TR opt: nested-let-loop.rkt 43:10 r -- unboxed complex variable -TR opt: nested-let-loop.rkt 44:10 (let: loop2 : Float-Complex ((y : (Listof Float-Complex) (quote (3.0+6.0i 4.0+8.0i))) (s : Float-Complex 0.0+0.0i)) (if (null? y) (loop1 (cdr x) (+ r s)) (loop2 (cdr y) (+ s (car x) (car y))))) -- unboxed call site -TR opt: nested-let-loop.rkt 44:16 loop2 -- unboxed let loop -TR opt: nested-let-loop.rkt 44:16 loop2 -- fun -> unboxed fun -TR opt: nested-let-loop.rkt 44:16 loop2 -- unboxed function -> table -TR opt: nested-let-loop.rkt 46:18 s -- unboxed var -> table -TR opt: nested-let-loop.rkt 46:38 0.0+0.0i -- unboxed literal -TR opt: nested-let-loop.rkt 48:20 (loop1 (cdr x) (+ r s)) -- call to fun with unboxed args -TR opt: nested-let-loop.rkt 48:20 (loop1 (cdr x) (+ r s)) -- unboxed call site -TR opt: nested-let-loop.rkt 48:27 (cdr x) -- pair -TR opt: nested-let-loop.rkt 48:35 (+ r s) -- unboxed binary float complex -TR opt: nested-let-loop.rkt 48:38 r -- leave var unboxed -TR opt: nested-let-loop.rkt 48:38 r -- unbox float-complex -TR opt: nested-let-loop.rkt 48:40 s -- leave var unboxed -TR opt: nested-let-loop.rkt 48:40 s -- unbox float-complex -TR opt: nested-let-loop.rkt 49:20 (loop2 (cdr y) (+ s (car x) (car y))) -- call to fun with unboxed args -TR opt: nested-let-loop.rkt 49:20 (loop2 (cdr y) (+ s (car x) (car y))) -- unboxed call site -TR opt: nested-let-loop.rkt 49:27 (cdr y) -- pair -TR opt: nested-let-loop.rkt 49:35 (+ s (car x) (car y)) -- unboxed binary float complex -TR opt: nested-let-loop.rkt 49:38 s -- leave var unboxed -TR opt: nested-let-loop.rkt 49:40 (car x) -- unbox float-complex -TR opt: nested-let-loop.rkt 49:40 (car x) -- pair -TR opt: nested-let-loop.rkt 49:48 (car y) -- unbox float-complex -TR opt: nested-let-loop.rkt 49:48 (car y) -- pair +TR opt: nested-let-loop.rkt 37:0 (let: loop1 : Float-Complex ((x : (Listof Float-Complex) (quote (1.0+2.0i 2.0+4.0i))) (r : Float-Complex 0.0+0.0i)) (if (null? x) r (let: loop2 : Float-Complex ((y : (Listof Float-Complex) (quote (3.0+6.0i 4.0+8.0i))) (s : Float-Complex 0.0+0.0i)) (if (null? y) (loop1 (cdr x) (+ r s)) (loop2 (cdr y) (+ s (car x) (car y))))))) -- unboxed call site +TR opt: nested-let-loop.rkt 37:6 loop1 -- unboxed let loop +TR opt: nested-let-loop.rkt 37:6 loop1 -- fun -> unboxed fun +TR opt: nested-let-loop.rkt 39:8 r -- unboxed var -> table +TR opt: nested-let-loop.rkt 39:28 0.0+0.0i -- unboxed literal +TR opt: nested-let-loop.rkt 41:10 r -- unboxed complex variable +TR opt: nested-let-loop.rkt 42:10 (let: loop2 : Float-Complex ((y : (Listof Float-Complex) (quote (3.0+6.0i 4.0+8.0i))) (s : Float-Complex 0.0+0.0i)) (if (null? y) (loop1 (cdr x) (+ r s)) (loop2 (cdr y) (+ s (car x) (car y))))) -- unboxed call site +TR opt: nested-let-loop.rkt 42:16 loop2 -- unboxed let loop +TR opt: nested-let-loop.rkt 42:16 loop2 -- fun -> unboxed fun +TR opt: nested-let-loop.rkt 44:18 s -- unboxed var -> table +TR opt: nested-let-loop.rkt 44:38 0.0+0.0i -- unboxed literal +TR opt: nested-let-loop.rkt 46:20 (loop1 (cdr x) (+ r s)) -- call to fun with unboxed args +TR opt: nested-let-loop.rkt 46:20 (loop1 (cdr x) (+ r s)) -- unboxed call site +TR opt: nested-let-loop.rkt 46:27 (cdr x) -- pair +TR opt: nested-let-loop.rkt 46:35 (+ r s) -- unboxed binary float complex +TR opt: nested-let-loop.rkt 46:38 r -- leave var unboxed +TR opt: nested-let-loop.rkt 46:38 r -- unbox float-complex +TR opt: nested-let-loop.rkt 46:40 s -- leave var unboxed +TR opt: nested-let-loop.rkt 46:40 s -- unbox float-complex +TR opt: nested-let-loop.rkt 47:20 (loop2 (cdr y) (+ s (car x) (car y))) -- call to fun with unboxed args +TR opt: nested-let-loop.rkt 47:20 (loop2 (cdr y) (+ s (car x) (car y))) -- unboxed call site +TR opt: nested-let-loop.rkt 47:27 (cdr y) -- pair +TR opt: nested-let-loop.rkt 47:35 (+ s (car x) (car y)) -- unboxed binary float complex +TR opt: nested-let-loop.rkt 47:38 s -- leave var unboxed +TR opt: nested-let-loop.rkt 47:40 (car x) -- unbox float-complex +TR opt: nested-let-loop.rkt 47:40 (car x) -- pair +TR opt: nested-let-loop.rkt 47:48 (car y) -- unbox float-complex +TR opt: nested-let-loop.rkt 47:48 (car y) -- pair 20.0+40.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/real-part-loop.rkt b/collects/tests/typed-scheme/optimizer/tests/real-part-loop.rkt index 164c9308..ab763b1d 100644 --- a/collects/tests/typed-scheme/optimizer/tests/real-part-loop.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/real-part-loop.rkt @@ -1,22 +1,21 @@ #; ( -TR opt: real-part-loop.rkt 29:1 (let loop ((v 0.0+1.0i)) (if (> (real-part v) 70000.2) 0 (loop (+ v 3.6)))) -- unboxed call site -TR opt: real-part-loop.rkt 29:6 loop -- unboxed let loop -TR opt: real-part-loop.rkt 29:6 loop -- fun -> unboxed fun -TR opt: real-part-loop.rkt 29:6 loop -- unboxed function -> table -TR opt: real-part-loop.rkt 29:13 v -- unboxed var -> table -TR opt: real-part-loop.rkt 29:15 0.0+1.0i -- unboxed literal -TR opt: real-part-loop.rkt 30:6 (> (real-part v) 70000.2) -- binary float comp -TR opt: real-part-loop.rkt 30:9 (real-part v) -- complex accessor elimination -TR opt: real-part-loop.rkt 30:9 (real-part v) -- unboxed unary float complex -TR opt: real-part-loop.rkt 30:20 v -- leave var unboxed -TR opt: real-part-loop.rkt 30:20 v -- unboxed complex variable -TR opt: real-part-loop.rkt 30:20 v -- unbox float-complex -TR opt: real-part-loop.rkt 32:6 (loop (+ v 3.6)) -- call to fun with unboxed args -TR opt: real-part-loop.rkt 32:6 (loop (+ v 3.6)) -- unboxed call site -TR opt: real-part-loop.rkt 32:12 (+ v 3.6) -- unboxed binary float complex -TR opt: real-part-loop.rkt 32:15 v -- leave var unboxed -TR opt: real-part-loop.rkt 32:17 3.6 -- float-arg-expr in complex ops +TR opt: real-part-loop.rkt 28:1 (let loop ((v 0.0+1.0i)) (if (> (real-part v) 70000.2) 0 (loop (+ v 3.6)))) -- unboxed call site +TR opt: real-part-loop.rkt 28:6 loop -- unboxed let loop +TR opt: real-part-loop.rkt 28:6 loop -- fun -> unboxed fun +TR opt: real-part-loop.rkt 28:13 v -- unboxed var -> table +TR opt: real-part-loop.rkt 28:15 0.0+1.0i -- unboxed literal +TR opt: real-part-loop.rkt 29:6 (> (real-part v) 70000.2) -- binary float comp +TR opt: real-part-loop.rkt 29:9 (real-part v) -- complex accessor elimination +TR opt: real-part-loop.rkt 29:9 (real-part v) -- unboxed unary float complex +TR opt: real-part-loop.rkt 29:20 v -- leave var unboxed +TR opt: real-part-loop.rkt 29:20 v -- unboxed complex variable +TR opt: real-part-loop.rkt 29:20 v -- unbox float-complex +TR opt: real-part-loop.rkt 31:6 (loop (+ v 3.6)) -- call to fun with unboxed args +TR opt: real-part-loop.rkt 31:6 (loop (+ v 3.6)) -- unboxed call site +TR opt: real-part-loop.rkt 31:12 (+ v 3.6) -- unboxed binary float complex +TR opt: real-part-loop.rkt 31:15 v -- leave var unboxed +TR opt: real-part-loop.rkt 31:17 3.6 -- float-arg-expr in complex ops 0 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/unboxed-for.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-for.rkt index 08e524e0..9a397111 100644 --- a/collects/tests/typed-scheme/optimizer/tests/unboxed-for.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/unboxed-for.rkt @@ -1,29 +1,28 @@ #; ( -TR opt: unboxed-for.rkt 33:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed let loop -TR opt: unboxed-for.rkt 33:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- call to fun with unboxed args -TR opt: unboxed-for.rkt 33:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed let bindings -TR opt: unboxed-for.rkt 33:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed let bindings -TR opt: unboxed-for.rkt 33:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- fun -> unboxed fun -TR opt: unboxed-for.rkt 33:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed function -> table -TR opt: unboxed-for.rkt 33:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed call site -TR opt: unboxed-for.rkt 33:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unbox float-complex -TR opt: unboxed-for.rkt 30:0 #%module-begin -- in-list -TR opt: unboxed-for.rkt 33:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed call site -TR opt: unboxed-for.rkt 33:31 sum -- unboxed var -> table -TR opt: unboxed-for.rkt 33:31 sum -- unboxed complex variable -TR opt: unboxed-for.rkt 33:31 sum -- unboxed complex variable -TR opt: unboxed-for.rkt 33:31 sum -- unbox float-complex -TR opt: unboxed-for.rkt 33:31 sum -- leave var unboxed -TR opt: unboxed-for.rkt 33:31 sum -- unboxed complex variable -TR opt: unboxed-for.rkt 33:53 0.0+0.0i -- unboxed literal -TR opt: unboxed-for.rkt 34:13 i -- unboxed complex variable -TR opt: unboxed-for.rkt 34:13 i -- unboxed complex variable -TR opt: unboxed-for.rkt 35:6 (+ i sum) -- unboxed binary float complex -TR opt: unboxed-for.rkt 35:9 i -- leave var unboxed -TR opt: unboxed-for.rkt 35:9 i -- unbox float-complex -TR opt: unboxed-for.rkt 35:11 sum -- leave var unboxed -TR opt: unboxed-for.rkt 35:11 sum -- unbox float-complex +TR opt: unboxed-for.rkt 32:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed let loop +TR opt: unboxed-for.rkt 32:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- call to fun with unboxed args +TR opt: unboxed-for.rkt 32:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed let bindings +TR opt: unboxed-for.rkt 32:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed let bindings +TR opt: unboxed-for.rkt 32:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- fun -> unboxed fun +TR opt: unboxed-for.rkt 32:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed call site +TR opt: unboxed-for.rkt 32:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unbox float-complex +TR opt: unboxed-for.rkt 29:0 #%module-begin -- in-list +TR opt: unboxed-for.rkt 32:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed call site +TR opt: unboxed-for.rkt 32:31 sum -- unboxed var -> table +TR opt: unboxed-for.rkt 32:31 sum -- unboxed complex variable +TR opt: unboxed-for.rkt 32:31 sum -- unboxed complex variable +TR opt: unboxed-for.rkt 32:31 sum -- unbox float-complex +TR opt: unboxed-for.rkt 32:31 sum -- leave var unboxed +TR opt: unboxed-for.rkt 32:31 sum -- unboxed complex variable +TR opt: unboxed-for.rkt 32:53 0.0+0.0i -- unboxed literal +TR opt: unboxed-for.rkt 33:13 i -- unboxed complex variable +TR opt: unboxed-for.rkt 33:13 i -- unboxed complex variable +TR opt: unboxed-for.rkt 34:6 (+ i sum) -- unboxed binary float complex +TR opt: unboxed-for.rkt 34:9 i -- leave var unboxed +TR opt: unboxed-for.rkt 34:9 i -- unbox float-complex +TR opt: unboxed-for.rkt 34:11 sum -- leave var unboxed +TR opt: unboxed-for.rkt 34:11 sum -- unbox float-complex 3.0+6.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions1.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions1.rkt index e5242846..72abe58d 100644 --- a/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions1.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions1.rkt @@ -1,17 +1,16 @@ #; ( -TR opt: unboxed-let-functions1.rkt 22:7 f -- fun -> unboxed fun -TR opt: unboxed-let-functions1.rkt 22:7 f -- unboxed function -> table -TR opt: unboxed-let-functions1.rkt 22:20 x -- unboxed var -> table -TR opt: unboxed-let-functions1.rkt 22:42 (+ x 3.0+6.0i) -- unboxed binary float complex -TR opt: unboxed-let-functions1.rkt 22:45 x -- leave var unboxed -TR opt: unboxed-let-functions1.rkt 22:45 x -- unbox float-complex -TR opt: unboxed-let-functions1.rkt 22:47 3.0+6.0i -- unboxed literal -TR opt: unboxed-let-functions1.rkt 23:2 (f (+ 1.0+2.0i 2.0+4.0i)) -- call to fun with unboxed args -TR opt: unboxed-let-functions1.rkt 23:2 (f (+ 1.0+2.0i 2.0+4.0i)) -- unboxed call site -TR opt: unboxed-let-functions1.rkt 23:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex -TR opt: unboxed-let-functions1.rkt 23:8 1.0+2.0i -- unboxed literal -TR opt: unboxed-let-functions1.rkt 23:17 2.0+4.0i -- unboxed literal +TR opt: unboxed-let-functions1.rkt 21:7 f -- fun -> unboxed fun +TR opt: unboxed-let-functions1.rkt 21:20 x -- unboxed var -> table +TR opt: unboxed-let-functions1.rkt 21:42 (+ x 3.0+6.0i) -- unboxed binary float complex +TR opt: unboxed-let-functions1.rkt 21:45 x -- leave var unboxed +TR opt: unboxed-let-functions1.rkt 21:45 x -- unbox float-complex +TR opt: unboxed-let-functions1.rkt 21:47 3.0+6.0i -- unboxed literal +TR opt: unboxed-let-functions1.rkt 22:2 (f (+ 1.0+2.0i 2.0+4.0i)) -- call to fun with unboxed args +TR opt: unboxed-let-functions1.rkt 22:2 (f (+ 1.0+2.0i 2.0+4.0i)) -- unboxed call site +TR opt: unboxed-let-functions1.rkt 22:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex +TR opt: unboxed-let-functions1.rkt 22:8 1.0+2.0i -- unboxed literal +TR opt: unboxed-let-functions1.rkt 22:17 2.0+4.0i -- unboxed literal 6.0+12.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions2.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions2.rkt index e206c009..e4f28266 100644 --- a/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions2.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions2.rkt @@ -1,20 +1,19 @@ #; ( -TR opt: unboxed-let-functions2.rkt 25:7 f -- fun -> unboxed fun -TR opt: unboxed-let-functions2.rkt 25:7 f -- unboxed function -> table -TR opt: unboxed-let-functions2.rkt 25:20 x -- unboxed var -> table -TR opt: unboxed-let-functions2.rkt 25:42 y -- unboxed var -> table -TR opt: unboxed-let-functions2.rkt 26:18 (+ x y) -- unboxed binary float complex -TR opt: unboxed-let-functions2.rkt 26:21 x -- leave var unboxed -TR opt: unboxed-let-functions2.rkt 26:21 x -- unbox float-complex -TR opt: unboxed-let-functions2.rkt 26:23 y -- leave var unboxed -TR opt: unboxed-let-functions2.rkt 26:23 y -- unbox float-complex -TR opt: unboxed-let-functions2.rkt 27:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0+6.0i) -- call to fun with unboxed args -TR opt: unboxed-let-functions2.rkt 27:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0+6.0i) -- unboxed call site -TR opt: unboxed-let-functions2.rkt 27:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex -TR opt: unboxed-let-functions2.rkt 27:8 1.0+2.0i -- unboxed literal -TR opt: unboxed-let-functions2.rkt 27:17 2.0+4.0i -- unboxed literal -TR opt: unboxed-let-functions2.rkt 28:5 3.0+6.0i -- unboxed literal +TR opt: unboxed-let-functions2.rkt 24:7 f -- fun -> unboxed fun +TR opt: unboxed-let-functions2.rkt 24:20 x -- unboxed var -> table +TR opt: unboxed-let-functions2.rkt 24:42 y -- unboxed var -> table +TR opt: unboxed-let-functions2.rkt 25:18 (+ x y) -- unboxed binary float complex +TR opt: unboxed-let-functions2.rkt 25:21 x -- leave var unboxed +TR opt: unboxed-let-functions2.rkt 25:21 x -- unbox float-complex +TR opt: unboxed-let-functions2.rkt 25:23 y -- leave var unboxed +TR opt: unboxed-let-functions2.rkt 25:23 y -- unbox float-complex +TR opt: unboxed-let-functions2.rkt 26:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0+6.0i) -- call to fun with unboxed args +TR opt: unboxed-let-functions2.rkt 26:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0+6.0i) -- unboxed call site +TR opt: unboxed-let-functions2.rkt 26:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex +TR opt: unboxed-let-functions2.rkt 26:8 1.0+2.0i -- unboxed literal +TR opt: unboxed-let-functions2.rkt 26:17 2.0+4.0i -- unboxed literal +TR opt: unboxed-let-functions2.rkt 27:5 3.0+6.0i -- unboxed literal 6.0+12.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions3.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions3.rkt index 8da15d41..bab51d83 100644 --- a/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions3.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions3.rkt @@ -1,17 +1,16 @@ #; ( -TR opt: unboxed-let-functions3.rkt 22:7 f -- fun -> unboxed fun -TR opt: unboxed-let-functions3.rkt 22:7 f -- unboxed function -> table -TR opt: unboxed-let-functions3.rkt 22:20 x -- unboxed var -> table -TR opt: unboxed-let-functions3.rkt 23:18 (+ x y) -- unboxed binary float complex -TR opt: unboxed-let-functions3.rkt 23:21 x -- leave var unboxed -TR opt: unboxed-let-functions3.rkt 23:21 x -- unbox float-complex -TR opt: unboxed-let-functions3.rkt 23:23 y -- float-arg-expr in complex ops -TR opt: unboxed-let-functions3.rkt 24:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0) -- call to fun with unboxed args -TR opt: unboxed-let-functions3.rkt 24:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0) -- unboxed call site -TR opt: unboxed-let-functions3.rkt 24:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex -TR opt: unboxed-let-functions3.rkt 24:8 1.0+2.0i -- unboxed literal -TR opt: unboxed-let-functions3.rkt 24:17 2.0+4.0i -- unboxed literal +TR opt: unboxed-let-functions3.rkt 21:7 f -- fun -> unboxed fun +TR opt: unboxed-let-functions3.rkt 21:20 x -- unboxed var -> table +TR opt: unboxed-let-functions3.rkt 22:18 (+ x y) -- unboxed binary float complex +TR opt: unboxed-let-functions3.rkt 22:21 x -- leave var unboxed +TR opt: unboxed-let-functions3.rkt 22:21 x -- unbox float-complex +TR opt: unboxed-let-functions3.rkt 22:23 y -- float-arg-expr in complex ops +TR opt: unboxed-let-functions3.rkt 23:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0) -- call to fun with unboxed args +TR opt: unboxed-let-functions3.rkt 23:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0) -- unboxed call site +TR opt: unboxed-let-functions3.rkt 23:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex +TR opt: unboxed-let-functions3.rkt 23:8 1.0+2.0i -- unboxed literal +TR opt: unboxed-let-functions3.rkt 23:17 2.0+4.0i -- unboxed literal 6.0+6.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions4.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions4.rkt index 5b927425..36e30a5e 100644 --- a/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions4.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions4.rkt @@ -1,17 +1,16 @@ #; ( -TR opt: unboxed-let-functions4.rkt 22:7 f -- fun -> unboxed fun -TR opt: unboxed-let-functions4.rkt 22:7 f -- unboxed function -> table -TR opt: unboxed-let-functions4.rkt 22:32 x -- unboxed var -> table -TR opt: unboxed-let-functions4.rkt 23:18 (+ x y) -- unboxed binary float complex -TR opt: unboxed-let-functions4.rkt 23:21 x -- leave var unboxed -TR opt: unboxed-let-functions4.rkt 23:21 x -- unbox float-complex -TR opt: unboxed-let-functions4.rkt 23:23 y -- float-arg-expr in complex ops -TR opt: unboxed-let-functions4.rkt 24:2 (f 3.0 (+ 1.0+2.0i 2.0+4.0i)) -- call to fun with unboxed args -TR opt: unboxed-let-functions4.rkt 24:2 (f 3.0 (+ 1.0+2.0i 2.0+4.0i)) -- unboxed call site -TR opt: unboxed-let-functions4.rkt 25:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex -TR opt: unboxed-let-functions4.rkt 25:8 1.0+2.0i -- unboxed literal -TR opt: unboxed-let-functions4.rkt 25:17 2.0+4.0i -- unboxed literal +TR opt: unboxed-let-functions4.rkt 21:7 f -- fun -> unboxed fun +TR opt: unboxed-let-functions4.rkt 21:32 x -- unboxed var -> table +TR opt: unboxed-let-functions4.rkt 22:18 (+ x y) -- unboxed binary float complex +TR opt: unboxed-let-functions4.rkt 22:21 x -- leave var unboxed +TR opt: unboxed-let-functions4.rkt 22:21 x -- unbox float-complex +TR opt: unboxed-let-functions4.rkt 22:23 y -- float-arg-expr in complex ops +TR opt: unboxed-let-functions4.rkt 23:2 (f 3.0 (+ 1.0+2.0i 2.0+4.0i)) -- call to fun with unboxed args +TR opt: unboxed-let-functions4.rkt 23:2 (f 3.0 (+ 1.0+2.0i 2.0+4.0i)) -- unboxed call site +TR opt: unboxed-let-functions4.rkt 24:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex +TR opt: unboxed-let-functions4.rkt 24:8 1.0+2.0i -- unboxed literal +TR opt: unboxed-let-functions4.rkt 24:17 2.0+4.0i -- unboxed literal 6.0+6.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions6.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions6.rkt index fcb47672..0e811fef 100644 --- a/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions6.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions6.rkt @@ -1,22 +1,21 @@ #; ( -TR opt: unboxed-let-functions6.rkt 26:0 (let: loop : Float-Complex ((z : Float-Complex 0.0+0.0i) (l : (Listof Integer) (quote (1 2 3)))) (if (null? l) (+ z 0.0+1.0i) (loop (+ z (car l)) (cdr l)))) -- unboxed call site -TR opt: unboxed-let-functions6.rkt 26:6 loop -- unboxed let loop -TR opt: unboxed-let-functions6.rkt 26:6 loop -- fun -> unboxed fun -TR opt: unboxed-let-functions6.rkt 26:6 loop -- unboxed function -> table -TR opt: unboxed-let-functions6.rkt 26:31 z -- unboxed var -> table -TR opt: unboxed-let-functions6.rkt 26:51 0.0+0.0i -- unboxed literal -TR opt: unboxed-let-functions6.rkt 29:10 (+ z 0.0+1.0i) -- unboxed binary float complex -TR opt: unboxed-let-functions6.rkt 29:13 z -- leave var unboxed -TR opt: unboxed-let-functions6.rkt 29:13 z -- unbox float-complex -TR opt: unboxed-let-functions6.rkt 29:15 0.0+1.0i -- unboxed literal -TR opt: unboxed-let-functions6.rkt 30:10 (loop (+ z (car l)) (cdr l)) -- call to fun with unboxed args -TR opt: unboxed-let-functions6.rkt 30:10 (loop (+ z (car l)) (cdr l)) -- unboxed call site -TR opt: unboxed-let-functions6.rkt 30:16 (+ z (car l)) -- unboxed binary float complex -TR opt: unboxed-let-functions6.rkt 30:19 z -- leave var unboxed -TR opt: unboxed-let-functions6.rkt 30:21 (car l) -- float-arg-expr in complex ops -TR opt: unboxed-let-functions6.rkt 30:21 (car l) -- pair -TR opt: unboxed-let-functions6.rkt 31:16 (cdr l) -- pair +TR opt: unboxed-let-functions6.rkt 25:0 (let: loop : Float-Complex ((z : Float-Complex 0.0+0.0i) (l : (Listof Integer) (quote (1 2 3)))) (if (null? l) (+ z 0.0+1.0i) (loop (+ z (car l)) (cdr l)))) -- unboxed call site +TR opt: unboxed-let-functions6.rkt 25:6 loop -- unboxed let loop +TR opt: unboxed-let-functions6.rkt 25:6 loop -- fun -> unboxed fun +TR opt: unboxed-let-functions6.rkt 25:31 z -- unboxed var -> table +TR opt: unboxed-let-functions6.rkt 25:51 0.0+0.0i -- unboxed literal +TR opt: unboxed-let-functions6.rkt 28:10 (+ z 0.0+1.0i) -- unboxed binary float complex +TR opt: unboxed-let-functions6.rkt 28:13 z -- leave var unboxed +TR opt: unboxed-let-functions6.rkt 28:13 z -- unbox float-complex +TR opt: unboxed-let-functions6.rkt 28:15 0.0+1.0i -- unboxed literal +TR opt: unboxed-let-functions6.rkt 29:10 (loop (+ z (car l)) (cdr l)) -- call to fun with unboxed args +TR opt: unboxed-let-functions6.rkt 29:10 (loop (+ z (car l)) (cdr l)) -- unboxed call site +TR opt: unboxed-let-functions6.rkt 29:16 (+ z (car l)) -- unboxed binary float complex +TR opt: unboxed-let-functions6.rkt 29:19 z -- leave var unboxed +TR opt: unboxed-let-functions6.rkt 29:21 (car l) -- float-arg-expr in complex ops +TR opt: unboxed-let-functions6.rkt 29:21 (car l) -- pair +TR opt: unboxed-let-functions6.rkt 30:16 (cdr l) -- pair 6.0+1.0i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions7.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions7.rkt index 54dc0c30..e6db1b9e 100644 --- a/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions7.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions7.rkt @@ -1,20 +1,19 @@ #; ( -TR opt: unboxed-let-functions7.rkt 25:0 (let: loop : Float-Complex ((z : Float-Complex 0.0+0.0i) (l : (Listof Integer) (quote (1 2 3)))) (if (null? l) z (loop (+ z (car l)) (cdr l)))) -- unboxed call site -TR opt: unboxed-let-functions7.rkt 25:6 loop -- unboxed let loop -TR opt: unboxed-let-functions7.rkt 25:6 loop -- fun -> unboxed fun -TR opt: unboxed-let-functions7.rkt 25:6 loop -- unboxed function -> table -TR opt: unboxed-let-functions7.rkt 25:31 z -- unboxed var -> table -TR opt: unboxed-let-functions7.rkt 25:51 0.0+0.0i -- unboxed literal -TR opt: unboxed-let-functions7.rkt 28:6 z -- unboxed complex variable -TR opt: unboxed-let-functions7.rkt 29:6 (loop (+ z (car l)) (cdr l)) -- call to fun with unboxed args -TR opt: unboxed-let-functions7.rkt 29:6 (loop (+ z (car l)) (cdr l)) -- unboxed call site -TR opt: unboxed-let-functions7.rkt 29:12 (+ z (car l)) -- unboxed binary float complex -TR opt: unboxed-let-functions7.rkt 29:15 z -- leave var unboxed -TR opt: unboxed-let-functions7.rkt 29:15 z -- unbox float-complex -TR opt: unboxed-let-functions7.rkt 29:17 (car l) -- float-arg-expr in complex ops -TR opt: unboxed-let-functions7.rkt 29:17 (car l) -- pair -TR opt: unboxed-let-functions7.rkt 30:12 (cdr l) -- pair +TR opt: unboxed-let-functions7.rkt 24:0 (let: loop : Float-Complex ((z : Float-Complex 0.0+0.0i) (l : (Listof Integer) (quote (1 2 3)))) (if (null? l) z (loop (+ z (car l)) (cdr l)))) -- unboxed call site +TR opt: unboxed-let-functions7.rkt 24:6 loop -- unboxed let loop +TR opt: unboxed-let-functions7.rkt 24:6 loop -- fun -> unboxed fun +TR opt: unboxed-let-functions7.rkt 24:31 z -- unboxed var -> table +TR opt: unboxed-let-functions7.rkt 24:51 0.0+0.0i -- unboxed literal +TR opt: unboxed-let-functions7.rkt 27:6 z -- unboxed complex variable +TR opt: unboxed-let-functions7.rkt 28:6 (loop (+ z (car l)) (cdr l)) -- call to fun with unboxed args +TR opt: unboxed-let-functions7.rkt 28:6 (loop (+ z (car l)) (cdr l)) -- unboxed call site +TR opt: unboxed-let-functions7.rkt 28:12 (+ z (car l)) -- unboxed binary float complex +TR opt: unboxed-let-functions7.rkt 28:15 z -- leave var unboxed +TR opt: unboxed-let-functions7.rkt 28:15 z -- unbox float-complex +TR opt: unboxed-let-functions7.rkt 28:17 (car l) -- float-arg-expr in complex ops +TR opt: unboxed-let-functions7.rkt 28:17 (car l) -- pair +TR opt: unboxed-let-functions7.rkt 29:12 (cdr l) -- pair 6.0+0.0i ) diff --git a/collects/typed-scheme/optimizer/unboxed-let.rkt b/collects/typed-scheme/optimizer/unboxed-let.rkt index b1b875e8..8892ddaa 100644 --- a/collects/typed-scheme/optimizer/unboxed-let.rkt +++ b/collects/typed-scheme/optimizer/unboxed-let.rkt @@ -105,11 +105,6 @@ ;; if so, add to the table of functions with ;; unboxed params, so we can modify its call ;; sites, its body and its header - (begin (log-optimization - "unboxed function -> table" - arity-raising-opt-msg - fun-name) - #t) (dict-set! unboxed-funs-table fun-name (list (reverse unboxed) (reverse boxed))))]