mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-11 22:31:12 +02:00
Code Activity

Beginnings of first-order CPS optimization

Browse source 
* module/language/cps2/optimize.scm (optimize-higher-order-cps): Renamed
  from "optimize".
  (optimize-first-order-cps): New function.

* module/language/cps2/compile-cps.scm: Adapt.
This commit is contained in:
Andy Wingo 2015-07-14 14:12:00 +02:00
parent 363d6498e5
commit e0ef087ceb
2 changed files with 42 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
module/language/cps2/compile-cps.scm
View file

@ -100,5 +100,5 @@
(convert-fun 0)) (convert-fun 0))
(define (compile-cps exp env opts) (define (compile-cps exp env opts)
(let ((exp (renumber (optimize exp opts)))) (let ((exp (renumber (optimize-higher-order-cps exp opts))))
(values (conts->fun exp) env env))) (values (conts->fun exp) env env)))

76
module/language/cps2/optimize.scm
View file

@ -37,7 +37,8 @@
#:use-module (language cps2 split-rec) #:use-module (language cps2 split-rec)
#:use-module (language cps2 type-fold) #:use-module (language cps2 type-fold)
#:use-module (language cps2 verify) #:use-module (language cps2 verify)
#:export (optimize)) #:export (optimize-higher-order-cps
optimize-first-order-cps))
(define (kw-arg-ref args kw default) (define (kw-arg-ref args kw default)
(match (memq kw args) (match (memq kw args)
@ -51,40 +52,45 @@
(verify program) (verify program)
program)) program))
(define* (optimize program #:optional (opts '())) (define-syntax-rule (define-optimizer optimize (pass kw default) ...)
(define (run-pass! pass kw default) (define* (optimize program #:optional (opts '()))
;; This series of assignments to `program' used to be a series of
;; let* bindings of `program', as you would imagine. In compiled
;; code this is fine because the compiler is able to allocate all
;; let*-bound variable to the same slot, which also means that the
;; garbage collector doesn't have to retain so many copies of the
;; term being optimized. However during bootstrap, the interpreter
;; doesn't do this optimization, leading to excessive data retention
;; as the terms are rewritten. To marginally improve bootstrap
;; memory usage, here we use set! instead. The compiler should
;; produce the same code in any case, though currently it does not
;; because it doesn't do escape analysis on the box created for the
;; set!.
(maybe-verify program)
(set! program (set! program
(if (kw-arg-ref opts kw default) (if (kw-arg-ref opts kw default)
(maybe-verify (pass program)) (maybe-verify (pass program))
program))) program))
...
(verify program)
program))
(maybe-verify program) (define-optimizer optimize-higher-order-cps
(split-rec #:split-rec? #t)
(eliminate-dead-code #:eliminate-dead-code? #t)
(prune-top-level-scopes #:prune-top-level-scopes? #t)
(simplify #:simplify? #t)
(contify #:contify? #t)
(inline-constructors #:inline-constructors? #t)
(specialize-primcalls #:specialize-primcalls? #t)
(elide-values #:elide-values? #t)
(prune-bailouts #:prune-bailouts? #t)
(eliminate-common-subexpressions #:cse? #t)
(type-fold #:type-fold? #t)
(resolve-self-references #:resolve-self-references? #t)
(eliminate-dead-code #:eliminate-dead-code? #t)
(simplify #:simplify? #t))
;; This series of assignments to `program' used to be a series of let* (define-optimizer optimize-first-order-cps
;; bindings of `program', as you would imagine. In compiled code this (eliminate-dead-code #:eliminate-dead-code? #t)
;; is fine because the compiler is able to allocate all let*-bound (simplify #:simplify? #t))
;; variable to the same slot, which also means that the garbage
;; collector doesn't have to retain so many copies of the term being
;; optimized. However during bootstrap, the interpreter doesn't do
;; this optimization, leading to excessive data retention as the terms
;; are rewritten. To marginally improve bootstrap memory usage, here
;; we use set! instead. The compiler should produce the same code in
;; any case, though currently it does not because it doesn't do escape
;; analysis on the box created for the set!.
(run-pass! split-rec #:split-rec? #t)
(run-pass! eliminate-dead-code #:eliminate-dead-code? #t)
(run-pass! prune-top-level-scopes #:prune-top-level-scopes? #t)
(run-pass! simplify #:simplify? #t)
(run-pass! contify #:contify? #t)
(run-pass! inline-constructors #:inline-constructors? #t)
(run-pass! specialize-primcalls #:specialize-primcalls? #t)
(run-pass! elide-values #:elide-values? #t)
(run-pass! prune-bailouts #:prune-bailouts? #t)
(run-pass! eliminate-common-subexpressions #:cse? #t)
(run-pass! type-fold #:type-fold? #t)
(run-pass! resolve-self-references #:resolve-self-references? #t)
(run-pass! eliminate-dead-code #:eliminate-dead-code? #t)
(run-pass! simplify #:simplify? #t)
(verify program))