X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86-64%2Ftype-vops.lisp;h=0727ca69052e43f5c706c6aa4f0225565d1bcf75;hb=3d544b84f2b7ecd617d220145a775079df6c7919;hp=58e88548cd9ce0005c38555acc4905c636b2f785;hpb=2936871808ba75ff33a6c199c23985373e5735ac;p=sbcl.git diff --git a/src/compiler/x86-64/type-vops.lisp b/src/compiler/x86-64/type-vops.lisp index 58e8854..0727ca6 100644 --- a/src/compiler/x86-64/type-vops.lisp +++ b/src/compiler/x86-64/type-vops.lisp @@ -13,6 +13,14 @@ ;;;; test generation utilities +;;; Optimize the case of moving a 64-bit value into RAX when not caring +;;; about the upper 32 bits: often the REX prefix can be spared. +(defun move-qword-to-eax (value) + (if (and (sc-is value any-reg descriptor-reg) + (< (tn-offset value) r8-offset)) + (move eax-tn (make-dword-tn value)) + (move rax-tn value))) + (defun generate-fixnum-test (value) "zero flag set if VALUE is fixnum" (inst test @@ -72,18 +80,15 @@ (%test-headers value target not-p nil headers drop-through)) (defun %test-lowtag (value target not-p lowtag) - (if (and (sc-is value any-reg descriptor-reg) - (< (tn-offset value) r8-offset)) - (move eax-tn (make-dword-tn value)) ; shorter encoding (no REX prefix) - (move rax-tn value)) - (inst and al-tn lowtag-mask) - (inst cmp al-tn lowtag) - (inst jmp (if not-p :ne :e) target)) + (inst lea eax-tn (make-ea :dword :base value :disp (- lowtag))) + (inst test al-tn lowtag-mask) + (inst jmp (if not-p :nz :z) target)) (defun %test-headers (value target not-p function-p headers &optional (drop-through (gen-label))) (let ((lowtag (if function-p fun-pointer-lowtag other-pointer-lowtag))) - (multiple-value-bind (equal less-or-equal greater-or-equal when-true when-false) + (multiple-value-bind (equal less-or-equal greater-or-equal when-true + when-false) ;; EQUAL, LESS-OR-EQUAL, and GREATER-OR-EQUAL are the conditions ;; for branching to TARGET. WHEN-TRUE and WHEN-FALSE are the ;; labels to branch to when we know it's true and when we know @@ -92,14 +97,30 @@ (values :ne :a :b drop-through target) (values :e :na :nb target drop-through)) (%test-lowtag value when-false t lowtag) - (inst mov al-tn (make-ea :byte :base value :disp (- lowtag))) - (do ((remaining headers (cdr remaining))) + (do ((remaining headers (cdr remaining)) + ;; It is preferable (smaller and faster code) to directly + ;; compare the value in memory instead of loading it into + ;; a register first. Find out if this is possible and set + ;; WIDETAG-TN accordingly. If impossible, generate the + ;; register load. + ;; Compared to x86 we additionally optimize the cases of a + ;; range starting with BIGNUM-WIDETAG or ending with + ;; COMPLEX-ARRAY-WIDETAG. + (widetag-tn (if (and (null (cdr headers)) + (or (atom (car headers)) + (= (caar headers) bignum-widetag) + (= (cdar headers) complex-array-widetag))) + (make-ea :byte :base value :disp (- lowtag)) + (progn + (inst mov eax-tn (make-ea :dword :base value + :disp (- lowtag))) + al-tn)))) ((null remaining)) (let ((header (car remaining)) (last (null (cdr remaining)))) (cond ((atom header) - (inst cmp al-tn header) + (inst cmp widetag-tn header) (if last (inst jmp equal target) (inst jmp :e when-true))) @@ -108,12 +129,12 @@ (end (cdr header))) (cond ((= start bignum-widetag) - (inst cmp al-tn end) + (inst cmp widetag-tn end) (if last (inst jmp less-or-equal target) (inst jmp :be when-true))) ((= end complex-array-widetag) - (inst cmp al-tn start) + (inst cmp widetag-tn start) (if last (inst jmp greater-or-equal target) (inst jmp :b when-false))) @@ -121,9 +142,7 @@ (inst cmp al-tn start) (inst jmp :b when-false) (inst cmp al-tn end) - (if last - (inst jmp less-or-equal target) - (inst jmp :be when-true))) + (inst jmp :be when-true)) (t (inst sub al-tn start) (inst cmp al-tn (- end start)) @@ -164,34 +183,33 @@ (:info target not-p) (:policy :fast-safe)) -(defun cost-to-test-types (type-codes) - (+ (* 2 (length type-codes)) - (if (> (apply #'max type-codes) lowtag-limit) 7 2))) - (defmacro !define-type-vops (pred-name check-name ptype error-code (&rest type-codes) &key (variant nil variant-p) &allow-other-keys) ;; KLUDGE: UGH. Why do we need this eval? Can't we put this in the ;; expansion? - (let* ((cost (cost-to-test-types (mapcar #'eval type-codes))) - (prefix (if variant-p - (concatenate 'string (string variant) "-") - ""))) - `(progn - ,@(when pred-name - `((define-vop (,pred-name ,(intern (concatenate 'string prefix "TYPE-PREDICATE"))) - (:translate ,pred-name) - (:generator ,cost - (test-type value target not-p (,@type-codes)))))) - ,@(when check-name - `((define-vop (,check-name ,(intern (concatenate 'string prefix "CHECK-TYPE"))) - (:generator ,cost - (let ((err-lab - (generate-error-code vop ',error-code value))) - (test-type value err-lab t (,@type-codes)) - (move result value)))))) - ,@(when ptype - `((primitive-type-vop ,check-name (:check) ,ptype)))))) + (flet ((cost-to-test-types (type-codes) + (+ (* 2 (length type-codes)) + (if (> (apply #'max type-codes) lowtag-limit) 7 2)))) + (let* ((cost (cost-to-test-types (mapcar #'eval type-codes))) + (prefix (if variant-p + (concatenate 'string (string variant) "-") + ""))) + `(progn + ,@(when pred-name + `((define-vop (,pred-name ,(intern (concatenate 'string prefix "TYPE-PREDICATE"))) + (:translate ,pred-name) + (:generator ,cost + (test-type value target not-p (,@type-codes)))))) + ,@(when check-name + `((define-vop (,check-name ,(intern (concatenate 'string prefix "CHECK-TYPE"))) + (:generator ,cost + (let ((err-lab + (generate-error-code vop ',error-code value))) + (test-type value err-lab t (,@type-codes)) + (move result value)))))) + ,@(when ptype + `((primitive-type-vop ,check-name (:check) ,ptype))))))) ;;;; other integer ranges @@ -199,17 +217,19 @@ (:args (value :scs (unsigned-reg))) (:arg-types unsigned-num) (:translate fixnump) - (:temporary (:sc unsigned-reg) tmp) + (:temporary (:sc unsigned-reg :from (:argument 0)) tmp) (:info) (:conditional :z) (:generator 5 - (inst mov tmp value) + (move tmp value) (inst shr tmp n-positive-fixnum-bits))) -(define-vop (fixnump/signed-byte-64 type-predicate) +#-#.(cl:if (cl:= sb!vm:n-fixnum-tag-bits 1) '(:and) '(:or)) +(define-vop (fixnump/signed-byte-64 simple-type-predicate) (:args (value :scs (signed-reg))) (:info) (:conditional :z) + (:temporary (:sc unsigned-reg :offset eax-offset) eax) (:arg-types signed-num) (:translate fixnump) (:generator 5 @@ -219,8 +239,20 @@ ;; ((x-a) >> n) = 0 (inst mov rax-tn #.(- sb!xc:most-negative-fixnum)) (inst add rax-tn value) - (inst shr rax-tn #.(integer-length (- sb!xc:most-positive-fixnum - sb!xc:most-negative-fixnum))))) + (inst shr rax-tn n-fixnum-bits))) + +#+#.(cl:if (cl:= sb!vm:n-fixnum-tag-bits 1) '(:and) '(:or)) +(define-vop (fixnump/signed-byte-64 simple-type-predicate) + (:args (value :scs (signed-reg) :target temp)) + (:info) + (:conditional :no) + (:temporary (:sc unsigned-reg :from (:argument 0)) temp) + (:arg-types signed-num) + (:translate fixnump) + (:generator 5 + (move temp value) + ;; The overflow flag will be set if the reg's sign bit changes. + (inst shl temp 1))) ;;; A (SIGNED-BYTE 64) can be represented with either fixnum or a bignum with ;;; exactly one digit. @@ -232,9 +264,10 @@ (if not-p (values not-target target) (values target not-target)) - (generate-fixnum-test value) + (move-qword-to-eax value) + (inst test al-tn fixnum-tag-mask) (inst jmp :e yep) - (move rax-tn value) + (inst and al-tn lowtag-mask) (inst cmp al-tn other-pointer-lowtag) (inst jmp :ne nope) @@ -250,7 +283,7 @@ value))) (generate-fixnum-test value) (inst jmp :e yep) - (move rax-tn value) + (move-qword-to-eax value) (inst and al-tn lowtag-mask) (inst cmp al-tn other-pointer-lowtag) (inst jmp :ne nope) @@ -274,13 +307,13 @@ (values not-target target) (values target not-target)) ;; Is it a fixnum? - (generate-fixnum-test value) (move rax-tn value) + (inst test al-tn fixnum-tag-mask) (inst jmp :e fixnum) ;; If not, is it an other pointer? - (inst and rax-tn lowtag-mask) - (inst cmp rax-tn other-pointer-lowtag) + (inst and al-tn lowtag-mask) + (inst cmp al-tn other-pointer-lowtag) (inst jmp :ne nope) ;; Get the header. (loadw rax-tn value 0 other-pointer-lowtag) @@ -293,7 +326,7 @@ ;; Get the second digit. (loadw rax-tn value (1+ bignum-digits-offset) other-pointer-lowtag) ;; All zeros, its an (unsigned-byte 64). - (inst or rax-tn rax-tn) + (inst test rax-tn rax-tn) (inst jmp :z yep) (inst jmp nope) @@ -303,7 +336,7 @@ ;; positive implies (unsigned-byte 64). (emit-label fixnum) - (inst or rax-tn rax-tn) + (inst test rax-tn rax-tn) (inst jmp (if not-p :s :ns) target) (emit-label not-target))))) @@ -322,8 +355,8 @@ (inst jmp :e fixnum) ;; If not, is it an other pointer? - (inst and rax-tn lowtag-mask) - (inst cmp rax-tn other-pointer-lowtag) + (inst and al-tn lowtag-mask) + (inst cmp al-tn other-pointer-lowtag) (inst jmp :ne nope) ;; Get the header. (loadw rax-tn value 0 other-pointer-lowtag) @@ -336,7 +369,7 @@ ;; Get the second digit. (loadw rax-tn value (1+ bignum-digits-offset) other-pointer-lowtag) ;; All zeros, its an (unsigned-byte 64). - (inst or rax-tn rax-tn) + (inst test rax-tn rax-tn) (inst jmp :z yep) (inst jmp nope) @@ -346,11 +379,68 @@ ;; positive implies (unsigned-byte 64). (emit-label fixnum) - (inst or rax-tn rax-tn) + (inst test rax-tn rax-tn) (inst jmp :s nope) (emit-label yep) (move result value)))) + +(defun power-of-two-limit-p (x) + (and (fixnump x) + (= (logcount (1+ x)) 1))) + +(define-vop (test-fixnum-mod-power-of-two) + (:args (value :scs (any-reg descriptor-reg + unsigned-reg signed-reg + immediate))) + (:arg-types * + (:constant (satisfies power-of-two-limit-p))) + (:translate fixnum-mod-p) + (:conditional :e) + (:info hi) + (:save-p :compute-only) + (:policy :fast-safe) + (:generator 4 + (aver (not (sc-is value immediate))) + (let* ((fixnum-hi (if (sc-is value unsigned-reg signed-reg) + hi + (fixnumize hi)))) + (inst test value (constantize (lognot fixnum-hi)))))) + +(define-vop (test-fixnum-mod-tagged-unsigned) + (:args (value :scs (any-reg descriptor-reg + unsigned-reg signed-reg + immediate))) + (:arg-types (:or tagged-num unsigned-num signed-num) + (:constant fixnum)) + (:translate fixnum-mod-p) + (:conditional :be) + (:info hi) + (:save-p :compute-only) + (:policy :fast-safe) + (:generator 5 + (aver (not (sc-is value immediate))) + (let ((fixnum-hi (if (sc-is value unsigned-reg signed-reg) + hi + (fixnumize hi)))) + (inst cmp value (constantize fixnum-hi))))) + +(define-vop (test-fixnum-mod-*) + (:args (value :scs (any-reg descriptor-reg))) + (:arg-types * (:constant fixnum)) + (:translate fixnum-mod-p) + (:conditional) + (:info target not-p hi) + (:save-p :compute-only) + (:policy :fast-safe) + (:generator 6 + (let* ((fixnum-hi (fixnumize hi)) + (skip (gen-label))) + (generate-fixnum-test value) + (inst jmp :ne (if not-p target skip)) + (inst cmp value (constantize fixnum-hi)) + (inst jmp (if not-p :a :be) target) + (emit-label skip)))) ;;;; list/symbol types ;;; @@ -391,3 +481,66 @@ (inst jmp :e error) (test-type value error t (list-pointer-lowtag)) (move result value)))) + +#!+sb-simd-pack +(progn + (!define-type-vops simd-pack-p nil nil nil (simd-pack-widetag)) + + (define-vop (check-simd-pack check-type) + (:args (value :target result + :scs (any-reg descriptor-reg + int-sse-reg single-sse-reg double-sse-reg + int-sse-stack single-sse-stack double-sse-stack))) + (:results (result :scs (any-reg descriptor-reg + int-sse-reg single-sse-reg double-sse-reg))) + (:temporary (:sc unsigned-reg :offset eax-offset :to (:result 0)) eax) + (:ignore eax) + (:vop-var vop) + (:node-var node) + (:save-p :compute-only) + (:generator 50 + (sc-case value + ((int-sse-reg single-sse-reg double-sse-reg + int-sse-stack single-sse-stack double-sse-stack) + (sc-case result + ((int-sse-reg single-sse-reg double-sse-reg) + (move result value)) + ((any-reg descriptor-reg) + (with-fixed-allocation (result + simd-pack-widetag + simd-pack-size + node) + ;; see *simd-pack-element-types* + (storew (fixnumize + (sc-case value + ((int-sse-reg int-sse-stack) 0) + ((single-sse-reg single-sse-stack) 1) + ((double-sse-reg double-sse-stack) 2))) + result simd-pack-tag-slot other-pointer-lowtag) + (let ((ea (make-ea-for-object-slot + result simd-pack-lo-value-slot other-pointer-lowtag))) + (if (float-simd-pack-p value) + (inst movaps ea value) + (inst movdqa ea value))))))) + ((any-reg descriptor-reg) + (let ((leaf (sb!c::tn-leaf value))) + (unless (and (sb!c::lvar-p leaf) + (csubtypep (sb!c::lvar-type leaf) + (specifier-type 'simd-pack))) + (test-type + value + (generate-error-code vop 'object-not-simd-pack-error value) + t (simd-pack-widetag)))) + (sc-case result + ((int-sse-reg) + (let ((ea (make-ea-for-object-slot + value simd-pack-lo-value-slot other-pointer-lowtag))) + (inst movdqa result ea))) + ((single-sse-reg double-sse-reg) + (let ((ea (make-ea-for-object-slot + value simd-pack-lo-value-slot other-pointer-lowtag))) + (inst movaps result ea))) + ((any-reg descriptor-reg) + (move result value))))))) + + (primitive-type-vop check-simd-pack (:check) simd-pack-int simd-pack-single simd-pack-double))