[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] 01/06: Factor out compute-effects/elide-type-checks from
From: |
Andy Wingo |
Subject: |
[Guile-commits] 01/06: Factor out compute-effects/elide-type-checks from dce.scm |
Date: |
Fri, 24 Jul 2015 15:13:38 +0000 |
wingo pushed a commit to branch master
in repository guile.
commit b40fac1e983007e0b5f4312c1717858e966c0198
Author: Andy Wingo <address@hidden>
Date: Fri Jul 24 11:39:18 2015 +0200
Factor out compute-effects/elide-type-checks from dce.scm
* module/language/cps/type-checks.scm: New module.
* module/language/cps/dce.scm: Use new module.
* module/Makefile.am: Add new module.
---
module/Makefile.am | 1 +
module/language/cps/dce.scm | 38 +------------------
module/language/cps/type-checks.scm | 72 +++++++++++++++++++++++++++++++++++
3 files changed, 74 insertions(+), 37 deletions(-)
diff --git a/module/Makefile.am b/module/Makefile.am
index b29a4bf..e4b088b 100644
--- a/module/Makefile.am
+++ b/module/Makefile.am
@@ -142,6 +142,7 @@ CPS_LANG_SOURCES =
\
language/cps/spec.scm \
language/cps/specialize-primcalls.scm \
language/cps/split-rec.scm \
+ language/cps/type-checks.scm \
language/cps/type-fold.scm \
language/cps/types.scm \
language/cps/utils.scm \
diff --git a/module/language/cps/dce.scm b/module/language/cps/dce.scm
index 5463f5b..52bd708 100644
--- a/module/language/cps/dce.scm
+++ b/module/language/cps/dce.scm
@@ -32,48 +32,12 @@
#:use-module (language cps)
#:use-module (language cps effects-analysis)
#:use-module (language cps renumber)
- #:use-module (language cps types)
+ #:use-module (language cps type-checks)
#:use-module (language cps utils)
#:use-module (language cps intmap)
#:use-module (language cps intset)
#:export (eliminate-dead-code))
-(define (elide-type-checks conts kfun effects)
- "Elide &type-check effects from EFFECTS for the function starting at
-KFUN where we can prove that no assertion will be raised at run-time."
- (let ((types (infer-types conts kfun)))
- (define (visit-primcall effects fx label name args)
- (if (primcall-types-check? types label name args)
- (intmap-replace! effects label (logand fx (lognot &type-check)))
- effects))
- (persistent-intmap
- (intmap-fold (lambda (label types effects)
- (let ((fx (intmap-ref effects label)))
- (cond
- ((causes-all-effects? fx) effects)
- ((causes-effect? fx &type-check)
- (match (intmap-ref conts label)
- (($ $kargs _ _ exp)
- (match exp
- (($ $continue k src ($ $primcall name args))
- (visit-primcall effects fx label name args))
- (($ $continue k src
- ($ $branch _ ($primcall name args)))
- (visit-primcall effects fx label name args))
- (_ effects)))
- (_ effects)))
- (else effects))))
- types
- effects))))
-
-(define (compute-effects/elide-type-checks conts)
- (intmap-fold (lambda (label cont effects)
- (match cont
- (($ $kfun) (elide-type-checks conts label effects))
- (_ effects)))
- conts
- (compute-effects conts)))
-
(define (fold-local-conts proc conts label seed)
(match (intmap-ref conts label)
(($ $kfun src meta self tail clause)
diff --git a/module/language/cps/type-checks.scm
b/module/language/cps/type-checks.scm
new file mode 100644
index 0000000..864371d
--- /dev/null
+++ b/module/language/cps/type-checks.scm
@@ -0,0 +1,72 @@
+;;; Continuation-passing style (CPS) intermediate language (IL)
+
+;; Copyright (C) 2013, 2014, 2015 Free Software Foundation, Inc.
+
+;;;; This library is free software; you can redistribute it and/or
+;;;; modify it under the terms of the GNU Lesser General Public
+;;;; License as published by the Free Software Foundation; either
+;;;; version 3 of the License, or (at your option) any later version.
+;;;;
+;;;; This library is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;;;; Lesser General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU Lesser General Public
+;;;; License along with this library; if not, write to the Free Software
+;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
+
+;;; Commentary:
+;;;
+;;; This pass kills dead expressions: code that has no side effects, and
+;;; whose value is unused. It does so by marking all live values, and
+;;; then discarding other values as dead. This happens recursively
+;;; through procedures, so it should be possible to elide dead
+;;; procedures as well.
+;;;
+;;; Code:
+
+(define-module (language cps type-checks)
+ #:use-module (ice-9 match)
+ #:use-module (language cps)
+ #:use-module (language cps effects-analysis)
+ #:use-module (language cps types)
+ #:use-module (language cps intmap)
+ #:export (elide-type-checks
+ compute-effects/elide-type-checks))
+
+(define (elide-type-checks conts kfun effects)
+ "Elide &type-check effects from EFFECTS for the function starting at
+KFUN where we can prove that no assertion will be raised at run-time."
+ (let ((types (infer-types conts kfun)))
+ (define (visit-primcall effects fx label name args)
+ (if (primcall-types-check? types label name args)
+ (intmap-replace! effects label (logand fx (lognot &type-check)))
+ effects))
+ (persistent-intmap
+ (intmap-fold (lambda (label types effects)
+ (let ((fx (intmap-ref effects label)))
+ (cond
+ ((causes-all-effects? fx) effects)
+ ((causes-effect? fx &type-check)
+ (match (intmap-ref conts label)
+ (($ $kargs _ _ exp)
+ (match exp
+ (($ $continue k src ($ $primcall name args))
+ (visit-primcall effects fx label name args))
+ (($ $continue k src
+ ($ $branch _ ($primcall name args)))
+ (visit-primcall effects fx label name args))
+ (_ effects)))
+ (_ effects)))
+ (else effects))))
+ types
+ effects))))
+
+(define (compute-effects/elide-type-checks conts)
+ (intmap-fold (lambda (label cont effects)
+ (match cont
+ (($ $kfun) (elide-type-checks conts label effects))
+ (_ effects)))
+ conts
+ (compute-effects conts)))
- [Guile-commits] branch master updated (4aabc20 -> ee85e29), Andy Wingo, 2015/07/24
- [Guile-commits] 01/06: Factor out compute-effects/elide-type-checks from dce.scm,
Andy Wingo <=
- [Guile-commits] 04/06: Small expression-effects tweak, Andy Wingo, 2015/07/24
- [Guile-commits] 02/06: Move solve-flow-equations to utils, Andy Wingo, 2015/07/24
- [Guile-commits] 05/06: Eliminate trampoline gotos when possible in compile-bytecode, Andy Wingo, 2015/07/24
- [Guile-commits] 03/06: Loop-invariant code motion, Andy Wingo, 2015/07/24
- [Guile-commits] 06/06: Rotate comparisons down to loop back-edges, Andy Wingo, 2015/07/24