X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fvm-tran.lisp;h=37fdb8712db1be80c7b1bb7739e1d0dbf1ab3fdc;hb=403bacffd903f8c5787a182f4133cffc69b55dc0;hp=0d5849eb162b3df6a35bdea8cf87121dea709dd8;hpb=2695f20cc74e0693f184fa5c7327d4c557e5537f;p=sbcl.git diff --git a/src/compiler/generic/vm-tran.lisp b/src/compiler/generic/vm-tran.lisp index 0d5849e..37fdb87 100644 --- a/src/compiler/generic/vm-tran.lisp +++ b/src/compiler/generic/vm-tran.lisp @@ -11,46 +11,49 @@ (in-package "SB!C") -;;; FIXME: It would be good to implement SB!XC:DEFCONSTANT, and use -;;; use that here, so that the compiler is born knowing this value. -;;; FIXME: Add a comment telling whether this holds for all vectors -;;; or only for vectors based on simple arrays (non-adjustable, etc.). -(defconstant vector-data-bit-offset - (* sb!vm:vector-data-offset sb!vm:word-bits)) - ;;; We need to define these predicates, since the TYPEP source ;;; transform picks whichever predicate was defined last when there ;;; are multiple predicates for equivalent types. -(def-source-transform short-float-p (x) `(single-float-p ,x)) +(define-source-transform short-float-p (x) `(single-float-p ,x)) #!-long-float -(def-source-transform long-float-p (x) `(double-float-p ,x)) +(define-source-transform long-float-p (x) `(double-float-p ,x)) -(def-source-transform compiled-function-p (x) +(define-source-transform compiled-function-p (x) `(functionp ,x)) -(def-source-transform char-int (x) +(define-source-transform char-int (x) `(char-code ,x)) (deftransform abs ((x) (rational)) '(if (< x 0) (- x) x)) ;;; The layout is stored in slot 0. -(def-source-transform %instance-layout (x) +(define-source-transform %instance-layout (x) `(truly-the layout (%instance-ref ,x 0))) -(def-source-transform %set-instance-layout (x val) +(define-source-transform %set-instance-layout (x val) `(%instance-set ,x 0 (the layout ,val))) ;;;; character support ;;; In our implementation there are really only BASE-CHARs. -(def-source-transform characterp (obj) +(define-source-transform characterp (obj) `(base-char-p ,obj)) ;;;; simplifying HAIRY-DATA-VECTOR-REF and HAIRY-DATA-VECTOR-SET +(deftransform hairy-data-vector-ref ((string index) (simple-string t)) + (let ((ctype (continuation-type string))) + (if (array-type-p ctype) + ;; the other transform will kick in, so that's OK + (give-up-ir1-transform) + `(typecase string + ((simple-array character (*)) (data-vector-ref string index)) + ((simple-array nil (*)) (data-vector-ref string index)))))) + (deftransform hairy-data-vector-ref ((array index) (array t) * :important t) "avoid runtime dispatch on array element type" - (let ((element-ctype (extract-upgraded-element-type array))) + (let ((element-ctype (extract-upgraded-element-type array)) + (declared-element-ctype (extract-declared-element-type array))) (declare (type ctype element-ctype)) (when (eq *wild-type* element-ctype) (give-up-ir1-transform @@ -61,22 +64,13 @@ ;; to hand-expand it ourselves.) (let ((element-type-specifier (type-specifier element-ctype))) `(multiple-value-bind (array index) - ;; FIXME: All this noise should move into a - ;; %DATA-VECTOR-AND-INDEX function, and there should be - ;; DEFTRANSFORMs for %DATA-VECTOR-AND-INDEX to optimize the - ;; function call away when the array is known to be simple, - ;; and to specialize to - ;; %DATA-VECTOR-AND-INDEX-IN-VECTOR-CASE when the array is - ;; known to have only one dimension. - (if (array-header-p array) - (%with-array-data array index nil) - (let ((array array)) - (declare (type (simple-array ,element-type-specifier 1) - array)) - (%check-bound array 0 index) - (values array index))) + (%data-vector-and-index array index) (declare (type (simple-array ,element-type-specifier 1) array)) - (data-vector-ref array index))))) + ,(let ((bare-form '(data-vector-ref array index))) + (if (type= element-ctype declared-element-ctype) + bare-form + `(the ,(type-specifier declared-element-ctype) + ,bare-form))))))) (deftransform data-vector-ref ((array index) (simple-array t)) @@ -86,7 +80,7 @@ (let ((dims (array-type-dimensions array-type))) (when (or (atom dims) (= (length dims) 1)) (give-up-ir1-transform)) - (let ((el-type (array-type-element-type array-type)) + (let ((el-type (array-type-specialized-element-type array-type)) (total-size (if (member '* dims) '* (reduce #'* dims)))) @@ -95,36 +89,40 @@ (%array-data-vector array)) index))))) +(deftransform hairy-data-vector-set ((string index new-value) + (simple-string t t)) + (let ((ctype (continuation-type string))) + (if (array-type-p ctype) + ;; the other transform will kick in, so that's OK + (give-up-ir1-transform) + `(typecase string + ((simple-array character (*)) + (data-vector-set string index new-value)) + ((simple-array nil (*)) + (data-vector-set string index new-value)))))) + (deftransform hairy-data-vector-set ((array index new-value) (array t t) * :important t) "avoid runtime dispatch on array element type" - (let ((element-ctype (extract-upgraded-element-type array))) + (let ((element-ctype (extract-upgraded-element-type array)) + (declared-element-ctype (extract-declared-element-type array))) (declare (type ctype element-ctype)) (when (eq *wild-type* element-ctype) (give-up-ir1-transform "Upgraded element type of array is not known at compile time.")) (let ((element-type-specifier (type-specifier element-ctype))) `(multiple-value-bind (array index) - ;; FIXME: All this noise should move into a - ;; %DATA-VECTOR-AND-INDEX function, and there should be - ;; DEFTRANSFORMs for %DATA-VECTOR-AND-INDEX to optimize the - ;; function call away when the array is known to be simple, - ;; and to specialize to - ;; %DATA-VECTOR-AND-INDEX-IN-VECTOR-CASE when the array is - ;; known to have only one dimension. - (if (array-header-p array) - (%with-array-data array index nil) - (let ((array array)) - (declare (type (simple-array ,element-type-specifier 1) - array)) - (%check-bound array 0 index) - (values array index))) - (data-vector-set (truly-the (simple-array ,element-type-specifier 1) - array) - index - new-value))))) + (%data-vector-and-index array index) + (declare (type (simple-array ,element-type-specifier 1) array) + (type ,element-type-specifier new-value)) + ,(if (type= element-ctype declared-element-ctype) + '(data-vector-set array index new-value) + `(truly-the ,(type-specifier declared-element-ctype) + (data-vector-set array index + (the ,(type-specifier declared-element-ctype) + new-value)))))))) (deftransform data-vector-set ((array index new-value) (simple-array t t)) @@ -134,7 +132,7 @@ (let ((dims (array-type-dimensions array-type))) (when (or (atom dims) (= (length dims) 1)) (give-up-ir1-transform)) - (let ((el-type (array-type-element-type array-type)) + (let ((el-type (array-type-specialized-element-type array-type)) (total-size (if (member '* dims) '* (reduce #'* dims)))) @@ -144,6 +142,39 @@ index new-value))))) +(defoptimizer (%data-vector-and-index derive-type) ((array index)) + (let ((atype (continuation-type array))) + (when (array-type-p atype) + (values-specifier-type + `(values (simple-array ,(type-specifier + (array-type-specialized-element-type atype)) + (*)) + index))))) + +(deftransform %data-vector-and-index ((%array %index) + (simple-array t) + * + :important t) + ;; KLUDGE: why the percent signs? Well, ARRAY and INDEX are + ;; respectively exported from the CL and SB!INT packages, which + ;; means that they're visible to all sorts of things. If the + ;; compiler can prove that the call to ARRAY-HEADER-P, below, either + ;; returns T or NIL, it will delete the irrelevant branch. However, + ;; user code might have got here with a variable named CL:ARRAY, and + ;; quite often compiler code with a variable named SB!INT:INDEX, so + ;; this can generate code deletion notes for innocuous user code: + ;; (DEFUN F (ARRAY I) (DECLARE (SIMPLE-VECTOR ARRAY)) (AREF ARRAY I)) + ;; -- CSR, 2003-04-01 + + ;; We do this solely for the -OR-GIVE-UP side effect, since we want + ;; to know that the type can be figured out in the end before we + ;; proceed, but we don't care yet what the type will turn out to be. + (upgraded-element-type-specifier-or-give-up %array) + + '(if (array-header-p %array) + (values (%array-data-vector %array) %index) + (values %array %index))) + ;;; transforms for getting at simple arrays of (UNSIGNED-BYTE N) when (< N 8) ;;; ;;; FIXME: In CMU CL, these were commented out with #+NIL. Why? Should @@ -153,7 +184,7 @@ #+nil (macrolet ((frob (type bits) - (let ((elements-per-word (truncate sb!vm:word-bits bits))) + (let ((elements-per-word (truncate sb!vm:n-word-bits bits))) `(progn (deftransform data-vector-ref ((vector index) (,type *)) @@ -161,7 +192,7 @@ (floor index ,',elements-per-word) (ldb ,(ecase sb!vm:target-byte-order (:little-endian '(byte ,bits (* bit ,bits))) - (:big-endian '(byte ,bits (- sb!vm:word-bits + (:big-endian '(byte ,bits (- sb!vm:n-word-bits (* (1+ bit) ,bits))))) (%raw-bits vector (+ word sb!vm:vector-data-offset))))) (deftransform data-vector-set ((vector index new-value) @@ -171,7 +202,7 @@ (setf (ldb ,(ecase sb!vm:target-byte-order (:little-endian '(byte ,bits (* bit ,bits))) (:big-endian - '(byte ,bits (- sb!vm:word-bits + '(byte ,bits (- sb!vm:n-word-bits (* (1+ bit) ,bits))))) (%raw-bits vector (+ word sb!vm:vector-data-offset))) new-value))))))) @@ -179,47 +210,66 @@ (frob (simple-array (unsigned-byte 2) (*)) 2) (frob (simple-array (unsigned-byte 4) (*)) 4)) -;;;; bit vector hackery +;;;; BIT-VECTOR hackery -;;; SIMPLE-BIT-VECTOR bit-array operations are transformed to a word loop that -;;; does 32 bits at a time. +;;; SIMPLE-BIT-VECTOR bit-array operations are transformed to a word +;;; loop that does 32 bits at a time. ;;; -;;; FIXME: This is a lot of repeatedly macroexpanded code. It should be a -;;; function call instead. And do it with DEF-FROB instead of DOLIST. -(dolist (x '((bit-and 32bit-logical-and) - (bit-ior 32bit-logical-or) - (bit-xor 32bit-logical-xor) - (bit-eqv 32bit-logical-eqv) - (bit-nand 32bit-logical-nand) - (bit-nor 32bit-logical-nor) - (bit-andc1 32bit-logical-andc1) - (bit-andc2 32bit-logical-andc2) - (bit-orc1 32bit-logical-orc1) - (bit-orc2 32bit-logical-orc2))) - (destructuring-bind (bitfun wordfun) x - (deftransform bitfun - ((bit-array-1 bit-array-2 result-bit-array) - '(simple-bit-vector simple-bit-vector simple-bit-vector) '* - :eval-name t :node node :policy (>= speed space)) - `(progn - ,@(unless (policy node (zerop safety)) - '((unless (= (length bit-array-1) (length bit-array-2) - (length result-bit-array)) - (error "Argument and/or result bit arrays are not the same length:~ +;;; FIXME: This is a lot of repeatedly macroexpanded code. It should +;;; be a function call instead. +(macrolet ((def (bitfun wordfun) + `(deftransform ,bitfun ((bit-array-1 bit-array-2 result-bit-array) + (simple-bit-vector + simple-bit-vector + simple-bit-vector) + * + :node node :policy (>= speed space)) + `(progn + ,@(unless (policy node (zerop safety)) + '((unless (= (length bit-array-1) + (length bit-array-2) + (length result-bit-array)) + (error "Argument and/or result bit arrays are not the same length:~ ~% ~S~% ~S ~% ~S" - bit-array-1 bit-array-2 result-bit-array)))) - (do ((index sb!vm:vector-data-offset (1+ index)) - (end (+ sb!vm:vector-data-offset - (truncate (the index - (+ (length bit-array-1) - sb!vm:word-bits -1)) - sb!vm:word-bits)))) - ((= index end) result-bit-array) - (declare (optimize (speed 3) (safety 0)) - (type index index end)) - (setf (%raw-bits result-bit-array index) - (,wordfun (%raw-bits bit-array-1 index) - (%raw-bits bit-array-2 index)))))))) + bit-array-1 + bit-array-2 + result-bit-array)))) + (let ((length (length result-bit-array))) + (if (= length 0) + ;; We avoid doing anything to 0-length + ;; bit-vectors, or rather, the memory that + ;; follows them. Other divisible-by-32 cases + ;; are handled by the (1- length), below. + ;; CSR, 2002-04-24 + result-bit-array + (do ((index sb!vm:vector-data-offset (1+ index)) + (end-1 (+ sb!vm:vector-data-offset + ;; bit-vectors of length 1-32 + ;; need precisely one (SETF + ;; %RAW-BITS), done here in the + ;; epilogue. - CSR, 2002-04-24 + (truncate (truly-the index (1- length)) + sb!vm:n-word-bits)))) + ((= index end-1) + (setf (%raw-bits result-bit-array index) + (,',wordfun (%raw-bits bit-array-1 index) + (%raw-bits bit-array-2 index))) + result-bit-array) + (declare (optimize (speed 3) (safety 0)) + (type index index end-1)) + (setf (%raw-bits result-bit-array index) + (,',wordfun (%raw-bits bit-array-1 index) + (%raw-bits bit-array-2 index)))))))))) + (def bit-and 32bit-logical-and) + (def bit-ior 32bit-logical-or) + (def bit-xor 32bit-logical-xor) + (def bit-eqv 32bit-logical-eqv) + (def bit-nand 32bit-logical-nand) + (def bit-nor 32bit-logical-nor) + (def bit-andc1 32bit-logical-andc1) + (def bit-andc2 32bit-logical-andc2) + (def bit-orc1 32bit-logical-orc1) + (def bit-orc2 32bit-logical-orc2)) (deftransform bit-not ((bit-array result-bit-array) @@ -232,17 +282,64 @@ (error "Argument and result bit arrays are not the same length:~ ~% ~S~% ~S" bit-array result-bit-array)))) - (do ((index sb!vm:vector-data-offset (1+ index)) - (end (+ sb!vm:vector-data-offset - (truncate (the index - (+ (length bit-array) - (1- sb!vm:word-bits))) - sb!vm:word-bits)))) - ((= index end) result-bit-array) - (declare (optimize (speed 3) (safety 0)) - (type index index end)) - (setf (%raw-bits result-bit-array index) - (32bit-logical-not (%raw-bits bit-array index)))))) + (let ((length (length result-bit-array))) + (if (= length 0) + ;; We avoid doing anything to 0-length bit-vectors, or + ;; rather, the memory that follows them. Other + ;; divisible-by-32 cases are handled by the (1- length), + ;; below. CSR, 2002-04-24 + result-bit-array + (do ((index sb!vm:vector-data-offset (1+ index)) + (end-1 (+ sb!vm:vector-data-offset + ;; bit-vectors of length 1-32 need precisely + ;; one (SETF %RAW-BITS), done here in the + ;; epilogue. - CSR, 2002-04-24 + (truncate (truly-the index (1- length)) + sb!vm:n-word-bits)))) + ((= index end-1) + (setf (%raw-bits result-bit-array index) + (32bit-logical-not (%raw-bits bit-array index))) + result-bit-array) + (declare (optimize (speed 3) (safety 0)) + (type index index end-1)) + (setf (%raw-bits result-bit-array index) + (32bit-logical-not (%raw-bits bit-array index)))))))) + +(deftransform bit-vector-= ((x y) (simple-bit-vector simple-bit-vector)) + `(and (= (length x) (length y)) + (let ((length (length x))) + (or (= length 0) + (do* ((i sb!vm:vector-data-offset (+ i 1)) + (end-1 (+ sb!vm:vector-data-offset + (floor (1- length) sb!vm:n-word-bits)))) + ((= i end-1) + (let* ((extra (mod length sb!vm:n-word-bits)) + (mask (1- (ash 1 extra))) + (numx + (logand + (ash mask + ,(ecase sb!c:*backend-byte-order* + (:little-endian 0) + (:big-endian + '(- sb!vm:n-word-bits extra)))) + (%raw-bits x i))) + (numy + (logand + (ash mask + ,(ecase sb!c:*backend-byte-order* + (:little-endian 0) + (:big-endian + '(- sb!vm:n-word-bits extra)))) + (%raw-bits y i)))) + (declare (type (integer 0 31) extra) + (type (unsigned-byte 32) mask numx numy)) + (= numx numy))) + (declare (type index i end-1)) + (let ((numx (%raw-bits x i)) + (numy (%raw-bits y i))) + (declare (type (unsigned-byte 32) numx numy)) + (unless (= numx numy) + (return nil)))))))) ;;;; %BYTE-BLT @@ -281,7 +378,7 @@ (memmove (sap+ (sapify dst) dst-start) (sap+ (sapify src) src-start) (- dst-end dst-start))) - nil)) + (values))) ;;;; transforms for EQL of floating point values