diff options
author | Andy Wingo <wingo@pobox.com> | 2020-08-03 21:49:50 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2020-08-03 22:19:18 +0200 |
commit | d238566d0e6b36706c33d22c19b5c86d2e60640f (patch) | |
tree | a2f84e3721ae724d4ebd3ec20b62e2385abc542d /module/system/vm | |
parent | 1ee99d97db342ab6c8e3f81f697ebe6caf38478b (diff) | |
download | guile-d238566d0e6b36706c33d22c19b5c86d2e60640f.tar.gz |
CPS compiler reduces eq? on constant to eq-constant?
* module/language/cps/compile-bytecode.scm (compile-function): Expect
eq-constant? instead of eq-null?, etc.
* module/language/cps/effects-analysis.scm: Likewise.
* module/language/cps/reify-primitives.scm (reify-primitives): For
eq-constant?, reify a $const unless the constant is an immediate whose
encoding fits in 16 bits.
* module/language/cps/type-fold.scm (materialize-constant): Helper to
make a constant from a type, min, and max.
(fold-eq-constant?): New helper.
(eq-constant?): New folder.
(undefined?): Define specifically.
(define-nullish-predicate-folder): Renamd from
define-special-immediate-predicate-folder. Use only for null?, false,
and nil?.
(*branch-reducers*): New mechanism. Reduce eq? to eq-constant? if
possible.
(local-type-fold): Refactor to use materialize-constant, and to allow
reducing branches.
* module/language/cps/types.scm (constant-type): Return three values
instead of a type entry.
(constant-type-entry): New function that returns a type entry. Adapt
callers.
(infer-constant-comparison): New helper.
(eq-constant?): New inferrer.
(undefined?): New inferrer.
* module/language/tree-il/compile-bytecode.scm (eq-constant?): Fix
truncate-bits signed arg.
(define-immediate-type-predicate): Adapt to visit-immediate-tags
change.
* module/language/tree-il/compile-cps.scm (convert): Convert eq? to
constant to eq-constant?. Advantaged is that it gets fixnums and
chars in addition to special immediates.
* module/language/tree-il/cps-primitives.scm (define-immediate-type-predicate):
Adapt to allow #f as pred.
* module/system/base/types/internal.scm (immediate-tags): Use #f as pred
for false, nil, etc.
(immediate-bits->scm): Adapt.
* module/system/vm/assembler.scm (emit-eq-null?, emit-eq-nil?)
(emit-eq-false?, emit-eq-true?, emit-unspecified?, emit-eof-object?):
Remove specialized emitters.
* module/system/vm/assembler.scm (define-immediate-tag=?-macro-assembler):
Allow for pred to be #f.
* module/system/vm/disassembler.scm (define-immediate-tag-annotation):
Adapt to pred being #f.
Diffstat (limited to 'module/system/vm')
-rw-r--r-- | module/system/vm/assembler.scm | 16 | ||||
-rw-r--r-- | module/system/vm/disassembler.scm | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/module/system/vm/assembler.scm b/module/system/vm/assembler.scm index 8f67cac51..698d44dac 100644 --- a/module/system/vm/assembler.scm +++ b/module/system/vm/assembler.scm @@ -95,14 +95,7 @@ emit-fixnum? emit-heap-object? emit-char? - emit-eq-null? - emit-eq-nil? - emit-eq-false? - emit-eq-true? - emit-unspecified? emit-undefined? - emit-eof-object? - emit-null? emit-false? emit-nil? @@ -1390,9 +1383,12 @@ returned instead." (let ((loc (intern-constant asm (make-static-procedure label)))) (emit-make-non-immediate asm dst loc))) -(define-syntax-rule (define-immediate-tag=?-macro-assembler name pred mask tag) - (define-macro-assembler (pred asm slot) - (emit-immediate-tag=? asm slot mask tag))) +(define-syntax define-immediate-tag=?-macro-assembler + (syntax-rules () + ((_ name #f mask tag) #f) + ((_ name pred mask tag) + (define-macro-assembler (pred asm slot) + (emit-immediate-tag=? asm slot mask tag))))) (visit-immediate-tags define-immediate-tag=?-macro-assembler) diff --git a/module/system/vm/disassembler.scm b/module/system/vm/disassembler.scm index 28f4338d6..cc055491d 100644 --- a/module/system/vm/disassembler.scm +++ b/module/system/vm/disassembler.scm @@ -195,7 +195,11 @@ address of that offset." (define immediate-tag-annotations '()) (define-syntax-rule (define-immediate-tag-annotation name pred mask tag) (set! immediate-tag-annotations - (cons `((,mask ,tag) ,(symbol->string 'pred)) immediate-tag-annotations))) + (cons `((,mask ,tag) + ,(cond + ('pred => symbol->string) + (else (string-append "eq-" (symbol->string 'name) "?")))) + immediate-tag-annotations))) (visit-immediate-tags define-immediate-tag-annotation) (define heap-tag-annotations '()) |