mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-23 20:05:32 +02:00
Refactor number specialization to reduce duplication
* module/language/cps/specialize-numbers.scm (specialize-operations): Factor out specialize-primcall and specialize-branch operations.
This commit is contained in:
Andy Wingo
parent
bcfadf099a
commit
8c37cf083f
1 changed files with 210 additions and 256 deletions
|
|
@ -451,13 +451,7 @@ BITS indicating the significant bits needed for a variable. BITS may be
|
|||
(define (box-f64 result)
|
||||
f64->scm)
|
||||
|
||||
(match cont
|
||||
(($ $kfun)
|
||||
(let ((types (infer-types cps label)))
|
||||
(values cps types (compute-significant-bits cps types label))))
|
||||
|
||||
(($ $kargs names vars ($ $continue k src ($ $primcall op param args)))
|
||||
(values
|
||||
(define (specialize-primcall cps k src op param args)
|
||||
(match (intmap-ref cps k)
|
||||
(($ $kargs (_) (result))
|
||||
(match (cons* op result param args)
|
||||
|
|
@ -465,12 +459,8 @@ BITS indicating the significant bits needed for a variable. BITS may be
|
|||
(? f64-result?) #f a b)
|
||||
(let ((op (match op
|
||||
('add 'fadd) ('sub 'fsub) ('mul 'fmul) ('div 'fdiv))))
|
||||
(with-cps cps
|
||||
(let$ body (specialize-binop
|
||||
k src op a b
|
||||
(unbox-f64 a) (unbox-f64 b) (box-f64 result)))
|
||||
;; FIXME: Remove this repetition.
|
||||
(setk label ($kargs names vars ,body)))))
|
||||
(specialize-binop cps k src op a b
|
||||
(unbox-f64 a) (unbox-f64 b) (box-f64 result))))
|
||||
|
||||
(((or 'add 'sub 'mul 'logand 'logior 'logxor 'logsub)
|
||||
(? u64-result?) #f (? u64-operand? a) (? u64-operand? b))
|
||||
|
|
@ -478,11 +468,8 @@ BITS indicating the significant bits needed for a variable. BITS may be
|
|||
('add 'uadd) ('sub 'usub) ('mul 'umul)
|
||||
('logand 'ulogand) ('logior 'ulogior)
|
||||
('logxor 'ulogxor) ('logsub 'ulogsub))))
|
||||
(with-cps cps
|
||||
(let$ body (specialize-binop
|
||||
k src op a b
|
||||
(unbox-u64 a) (unbox-u64 b) (box-u64 result)))
|
||||
(setk label ($kargs names vars ,body)))))
|
||||
(specialize-binop cps k src op a b
|
||||
(unbox-u64 a) (unbox-u64 b) (box-u64 result))))
|
||||
|
||||
(((or 'logand 'logior 'logxor 'logsub)
|
||||
(? u64-result?) #f (? s64-operand? a) (? s64-operand? b))
|
||||
|
|
@ -498,40 +485,28 @@ BITS indicating the significant bits needed for a variable. BITS may be
|
|||
($continue k src
|
||||
($primcall 's64->u64 #f (s64)))))
|
||||
($ (unbox-s64 k src x))))))
|
||||
(with-cps cps
|
||||
(let$ body (specialize-binop
|
||||
k src op a b
|
||||
(unbox-u64* a) (unbox-u64* b) (box-u64 result)))
|
||||
(setk label ($kargs names vars ,body)))))
|
||||
(specialize-binop cps k src op a b
|
||||
(unbox-u64* a) (unbox-u64* b) (box-u64 result))))
|
||||
|
||||
(((or 'add 'sub 'mul)
|
||||
(? s64-result?) #f (? s64-operand? a) (? s64-operand? b))
|
||||
(let ((op (match op
|
||||
('add 'sadd) ('sub 'ssub) ('mul 'smul))))
|
||||
(with-cps cps
|
||||
(let$ body (specialize-binop
|
||||
k src op a b
|
||||
(unbox-s64 a) (unbox-s64 b) (box-s64 result)))
|
||||
(setk label ($kargs names vars ,body)))))
|
||||
(specialize-binop cps k src op a b
|
||||
(unbox-s64 a) (unbox-s64 b) (box-s64 result))))
|
||||
|
||||
(('sub/immediate
|
||||
(? f64-result?) param a)
|
||||
(with-cps cps
|
||||
(let$ body (specialize-unop
|
||||
k src 'fadd/immediate (- param) a
|
||||
(specialize-unop cps k src 'fadd/immediate (- param) a
|
||||
(unbox-f64 a) (box-f64 result)))
|
||||
(setk label ($kargs names vars ,body))))
|
||||
|
||||
(((or 'add/immediate 'mul/immediate)
|
||||
(? f64-result?) param a)
|
||||
(let ((op (match op
|
||||
('add/immediate 'fadd/immediate)
|
||||
('mul/immediate 'fmul/immediate))))
|
||||
(with-cps cps
|
||||
(let$ body (specialize-unop
|
||||
k src op param a
|
||||
(unbox-f64 a) (box-f64 result)))
|
||||
(setk label ($kargs names vars ,body)))))
|
||||
(specialize-unop cps k src op param a
|
||||
(unbox-f64 a) (box-f64 result))))
|
||||
|
||||
(((or 'add/immediate 'sub/immediate 'mul/immediate)
|
||||
(? u64-result?) (? u64-parameter?) (? u64-operand? a))
|
||||
|
|
@ -539,11 +514,8 @@ BITS indicating the significant bits needed for a variable. BITS may be
|
|||
('add/immediate 'uadd/immediate)
|
||||
('sub/immediate 'usub/immediate)
|
||||
('mul/immediate 'umul/immediate))))
|
||||
(with-cps cps
|
||||
(let$ body (specialize-unop
|
||||
k src op param a
|
||||
(unbox-u64 a) (box-u64 result)))
|
||||
(setk label ($kargs names vars ,body)))))
|
||||
(specialize-unop cps k src op param a
|
||||
(unbox-u64 a) (box-u64 result))))
|
||||
|
||||
(((or 'add/immediate 'sub/immediate 'mul/immediate)
|
||||
(? s64-result?) (? s64-parameter?) (? s64-operand? a))
|
||||
|
|
@ -551,11 +523,8 @@ BITS indicating the significant bits needed for a variable. BITS may be
|
|||
('add/immediate 'sadd/immediate)
|
||||
('sub/immediate 'ssub/immediate)
|
||||
('mul/immediate 'smul/immediate))))
|
||||
(with-cps cps
|
||||
(let$ body (specialize-unop
|
||||
k src op param a
|
||||
(unbox-s64 a) (box-s64 result)))
|
||||
(setk label ($kargs names vars ,body)))))
|
||||
(specialize-unop cps k src op param a
|
||||
(unbox-s64 a) (box-s64 result))))
|
||||
|
||||
(((or 'lsh 'rsh)
|
||||
(? u64-result?) #f (? u64-operand? a) (? u6-operand? b))
|
||||
|
|
@ -563,11 +532,8 @@ BITS indicating the significant bits needed for a variable. BITS may be
|
|||
(define (pass-u64 cps k src b)
|
||||
(with-cps cps
|
||||
(build-term ($continue k src ($values (b))))))
|
||||
(with-cps cps
|
||||
(let$ body (specialize-binop
|
||||
k src op a b
|
||||
(unbox-u64 a) pass-u64 (box-u64 result)))
|
||||
(setk label ($kargs names vars ,body)))))
|
||||
(specialize-binop cps k src op a b
|
||||
(unbox-u64 a) pass-u64 (box-u64 result))))
|
||||
|
||||
(((or 'lsh 'rsh)
|
||||
(? s64-result?) #f (? s64-operand? a) (? u6-operand? b))
|
||||
|
|
@ -575,100 +541,68 @@ BITS indicating the significant bits needed for a variable. BITS may be
|
|||
(define (pass-u64 cps k src b)
|
||||
(with-cps cps
|
||||
(build-term ($continue k src ($values (b))))))
|
||||
(with-cps cps
|
||||
(let$ body (specialize-binop
|
||||
k src op a b
|
||||
(unbox-s64 a) pass-u64 (box-s64 result)))
|
||||
(setk label ($kargs names vars ,body)))))
|
||||
(specialize-binop cps k src op a b
|
||||
(unbox-s64 a) pass-u64 (box-s64 result))))
|
||||
|
||||
(((or 'lsh/immediate 'rsh/immediate)
|
||||
(? u64-result?) (? u6-parameter?) (? u64-operand? a))
|
||||
(let ((op (match op
|
||||
('lsh/immediate 'ulsh/immediate)
|
||||
('rsh/immediate 'ursh/immediate))))
|
||||
(with-cps cps
|
||||
(let$ body (specialize-unop
|
||||
k src op param a
|
||||
(unbox-u64 a) (box-u64 result)))
|
||||
(setk label ($kargs names vars ,body)))))
|
||||
(specialize-unop cps k src op param a
|
||||
(unbox-u64 a) (box-u64 result))))
|
||||
|
||||
(((or 'lsh/immediate 'rsh/immediate)
|
||||
(? s64-result?) (? u6-parameter?) (? s64-operand? a))
|
||||
(let ((op (match op
|
||||
('lsh/immediate 'slsh/immediate)
|
||||
('rsh/immediate 'srsh/immediate))))
|
||||
(with-cps cps
|
||||
(let$ body (specialize-unop
|
||||
k src op param a
|
||||
(unbox-s64 a) (box-s64 result)))
|
||||
(setk label ($kargs names vars ,body)))))
|
||||
(specialize-unop cps k src op param a
|
||||
(unbox-s64 a) (box-s64 result))))
|
||||
|
||||
(_ cps)))
|
||||
(_ cps))
|
||||
types
|
||||
sigbits))
|
||||
(_ (with-cps cps #f))))
|
||||
(_ (with-cps cps #f))))
|
||||
|
||||
(($ $kargs names vars
|
||||
($ $continue kf src
|
||||
($ $branch kt ($ $primcall (and op (or '< '=)) #f (a b)))))
|
||||
(values
|
||||
(define (specialize-branch cps kf kt src op param args)
|
||||
(match (cons op args)
|
||||
(((or '< '=) a b)
|
||||
(cond
|
||||
((f64-operands? a b)
|
||||
(let ((op (match op ('= 'f64-=) ('< 'f64-<))))
|
||||
(with-cps cps
|
||||
(let$ body (specialize-comparison kf kt src op a b
|
||||
(unbox-f64 a) (unbox-f64 b)))
|
||||
(setk label ($kargs names vars ,body)))))
|
||||
(specialize-comparison cps kf kt src op a b
|
||||
(unbox-f64 a) (unbox-f64 b))))
|
||||
((and (s64-operand? a) (s64-operand? b))
|
||||
(cond
|
||||
((constant-arg a)
|
||||
=> (lambda (a)
|
||||
(let ((op (match op ('= 's64-imm-=) ('< 'imm-s64-<))))
|
||||
(with-cps cps
|
||||
(let$ body (specialize-comparison/immediate
|
||||
kf kt src op b a
|
||||
(unbox-s64 b)))
|
||||
(setk label ($kargs names vars ,body))))))
|
||||
(specialize-comparison/immediate cps kf kt src op b a
|
||||
(unbox-s64 b)))))
|
||||
((constant-arg b)
|
||||
=> (lambda (b)
|
||||
(let ((op (match op ('= 's64-imm-=) ('< 's64-imm-<))))
|
||||
(with-cps cps
|
||||
(let$ body (specialize-comparison/immediate
|
||||
kf kt src op a b
|
||||
(unbox-s64 a)))
|
||||
(setk label ($kargs names vars ,body))))))
|
||||
(specialize-comparison/immediate cps kf kt src op a b
|
||||
(unbox-s64 a)))))
|
||||
(else
|
||||
(let ((op (match op ('= 's64-=) ('< 's64-<))))
|
||||
(with-cps cps
|
||||
(let$ body (specialize-comparison
|
||||
kf kt src op a b
|
||||
(unbox-s64 a) (unbox-s64 b)))
|
||||
(setk label ($kargs names vars ,body)))))))
|
||||
(specialize-comparison cps kf kt src op a b
|
||||
(unbox-s64 a) (unbox-s64 b))))))
|
||||
((and (u64-operand? a) (u64-operand? b))
|
||||
(cond
|
||||
((constant-arg a)
|
||||
=> (lambda (a)
|
||||
(let ((op (match op ('= 'u64-imm-=) ('< 'imm-u64-<))))
|
||||
(with-cps cps
|
||||
(let$ body (specialize-comparison/immediate
|
||||
kf kt src op b a
|
||||
(unbox-u64 b)))
|
||||
(setk label ($kargs names vars ,body))))))
|
||||
(specialize-comparison/immediate cps kf kt src op b a
|
||||
(unbox-u64 b)))))
|
||||
((constant-arg b)
|
||||
=> (lambda (b)
|
||||
(let ((op (match op ('= 'u64-imm-=) ('< 'u64-imm-<))))
|
||||
(with-cps cps
|
||||
(let$ body (specialize-comparison/immediate
|
||||
kf kt src op a b
|
||||
(unbox-u64 a)))
|
||||
(setk label ($kargs names vars ,body))))))
|
||||
(specialize-comparison/immediate cps kf kt src op a b
|
||||
(unbox-u64 a)))))
|
||||
(else
|
||||
(let ((op (match op ('= 'u64-=) ('< 'u64-<))))
|
||||
(with-cps cps
|
||||
(let$ body (specialize-comparison
|
||||
kf kt src op a b
|
||||
(unbox-u64 a) (unbox-u64 b)))
|
||||
(setk label ($kargs names vars ,body)))))))
|
||||
(specialize-comparison cps kf kt src op a b
|
||||
(unbox-u64 a) (unbox-u64 b))))))
|
||||
((and (exact-integer-operand? a) (exact-integer-operand? b))
|
||||
(cond
|
||||
((s64-operand? a)
|
||||
|
|
@ -676,41 +610,61 @@ BITS indicating the significant bits needed for a variable. BITS may be
|
|||
((constant-arg a)
|
||||
=> (lambda (a)
|
||||
(let ((imm-op (match op ('= 's64-imm-=) ('< 'imm-s64-<))))
|
||||
(with-cps cps
|
||||
(let$ body (specialize-comparison/immediate-s64-integer
|
||||
kf kt src imm-op a b
|
||||
(specialize-comparison/immediate-s64-integer
|
||||
cps kf kt src imm-op a b
|
||||
(lambda (cps a)
|
||||
(with-cps cps
|
||||
(build-exp ($primcall op #f (a b)))))))
|
||||
(setk label ($kargs names vars ,body))))))
|
||||
(build-exp ($primcall op #f (a b)))))))))
|
||||
(else
|
||||
(with-cps cps
|
||||
(let$ body (specialize-comparison/s64-integer
|
||||
kf kt src op a b
|
||||
(unbox-s64 a) (rebox-s64 a)))
|
||||
(setk label ($kargs names vars ,body))))))
|
||||
(specialize-comparison/s64-integer cps kf kt src op a b
|
||||
(unbox-s64 a)
|
||||
(rebox-s64 a)))))
|
||||
((s64-operand? b)
|
||||
(cond
|
||||
((constant-arg b)
|
||||
=> (lambda (b)
|
||||
(let ((imm-op (match op ('= 's64-imm-=) ('< 's64-imm-<))))
|
||||
(with-cps cps
|
||||
(let$ body (specialize-comparison/immediate-s64-integer
|
||||
kf kt src imm-op b a
|
||||
(specialize-comparison/immediate-s64-integer
|
||||
cps kf kt src imm-op b a
|
||||
(lambda (cps b)
|
||||
(with-cps cps
|
||||
(build-exp ($primcall op #f (a b)))))))
|
||||
(setk label ($kargs names vars ,body))))))
|
||||
(build-exp ($primcall op #f (a b)))))))))
|
||||
(else
|
||||
(specialize-comparison/integer-s64 cps kf kt src op a b
|
||||
(unbox-s64 b)
|
||||
(rebox-s64 b)))))
|
||||
(else (with-cps cps #f))))
|
||||
(else (with-cps cps #f))))
|
||||
(_ (with-cps cps #f))))
|
||||
|
||||
(match cont
|
||||
(($ $kfun)
|
||||
(let* ((types (infer-types cps label))
|
||||
(sigbits (compute-significant-bits cps types label)))
|
||||
(values cps types sigbits)))
|
||||
|
||||
(($ $kargs names vars
|
||||
($ $continue k src ($ $primcall op param args)))
|
||||
(call-with-values
|
||||
(lambda () (specialize-primcall cps k src op param args))
|
||||
(lambda (cps term)
|
||||
(values (if term
|
||||
(with-cps cps
|
||||
(let$ body (specialize-comparison/integer-s64
|
||||
kf kt src op a b
|
||||
(unbox-s64 b) (rebox-s64 b)))
|
||||
(setk label ($kargs names vars ,body))))))
|
||||
(else cps)))
|
||||
(else cps))
|
||||
types
|
||||
sigbits))
|
||||
(setk label ($kargs names vars ,term)))
|
||||
cps)
|
||||
types sigbits))))
|
||||
|
||||
(($ $kargs names vars
|
||||
($ $continue kf src ($ $branch kt ($ $primcall op param args))))
|
||||
(call-with-values
|
||||
(lambda () (specialize-branch cps kf kt src op param args))
|
||||
(lambda (cps term)
|
||||
(values (if term
|
||||
(with-cps cps
|
||||
(setk label ($kargs names vars ,term)))
|
||||
cps)
|
||||
types sigbits))))
|
||||
|
||||
(_ (values cps types sigbits))))
|
||||
|
||||
(values (intmap-fold visit-cont cps cps #f #f)))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue