X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Farray-tran.lisp;h=0d47738a46502b66a9186a93b796680f2cb56e56;hb=906ecd4ef2d10aca23e1081f03c13fe2f932ed89;hp=0af3b83c80e1262ad1dc471e39f531ce81738b54;hpb=c2431e2d0d0222a3cf20cfdfa48201bdcc65cd76;p=sbcl.git diff --git a/src/compiler/array-tran.lisp b/src/compiler/array-tran.lisp index 0af3b83..0d47738 100644 --- a/src/compiler/array-tran.lisp +++ b/src/compiler/array-tran.lisp @@ -28,18 +28,33 @@ ;;; type is going to be the array upgraded element type. (defun extract-upgraded-element-type (array) (let ((type (lvar-type array))) - ;; Note that this IF mightn't be satisfied even if the runtime - ;; value is known to be a subtype of some specialized ARRAY, because - ;; we can have values declared e.g. (AND SIMPLE-VECTOR UNKNOWN-TYPE), - ;; which are represented in the compiler as INTERSECTION-TYPE, not - ;; array type. - (if (array-type-p type) - (array-type-specialized-element-type type) - ;; KLUDGE: there is no good answer here, but at least - ;; *wild-type* won't cause HAIRY-DATA-VECTOR-{REF,SET} to be - ;; erroneously optimized (see generic/vm-tran.lisp) -- CSR, - ;; 2002-08-21 - *wild-type*))) + (cond + ;; Note that this IF mightn't be satisfied even if the runtime + ;; value is known to be a subtype of some specialized ARRAY, because + ;; we can have values declared e.g. (AND SIMPLE-VECTOR UNKNOWN-TYPE), + ;; which are represented in the compiler as INTERSECTION-TYPE, not + ;; array type. + ((array-type-p type) (array-type-specialized-element-type type)) + ;; fix for bug #396. This type logic corresponds to the special + ;; case for strings in HAIRY-DATA-VECTOR-REF + ;; (generic/vm-tran.lisp) + ((csubtypep type (specifier-type 'simple-string)) + (cond + ((csubtypep type (specifier-type '(simple-array character (*)))) + (specifier-type 'character)) + #!+sb-unicode + ((csubtypep type (specifier-type '(simple-array base-char (*)))) + (specifier-type 'base-char)) + ((csubtypep type (specifier-type '(simple-array nil (*)))) + *empty-type*) + ;; see KLUDGE below. + (t *wild-type*))) + (t + ;; KLUDGE: there is no good answer here, but at least + ;; *wild-type* won't cause HAIRY-DATA-VECTOR-{REF,SET} to be + ;; erroneously optimized (see generic/vm-tran.lisp) -- CSR, + ;; 2002-08-21 + *wild-type*)))) (defun extract-declared-element-type (array) (let ((type (lvar-type array))) @@ -97,14 +112,26 @@ (assert-array-rank array (1- (length stuff))) (assert-new-value-type (car (last stuff)) array)) -(defoptimizer (hairy-data-vector-ref derive-type) ((array index)) - (extract-upgraded-element-type array)) -(defoptimizer (data-vector-ref derive-type) ((array index)) +(macrolet ((define (name) + `(defoptimizer (,name derive-type) ((array index)) + (extract-upgraded-element-type array)))) + (define hairy-data-vector-ref) + (define hairy-data-vector-ref/check-bounds) + (define data-vector-ref)) + +#!+(or x86 x86-64) +(defoptimizer (data-vector-ref-with-offset derive-type) ((array index offset)) (extract-upgraded-element-type array)) -(defoptimizer (data-vector-set derive-type) ((array index new-value)) - (assert-new-value-type new-value array)) -(defoptimizer (hairy-data-vector-set derive-type) ((array index new-value)) +(macrolet ((define (name) + `(defoptimizer (,name derive-type) ((array index new-value)) + (assert-new-value-type new-value array)))) + (define hairy-data-vector-set) + (define hairy-data-vector-set/check-bounds) + (define data-vector-set)) + +#!+(or x86 x86-64) +(defoptimizer (data-vector-set-with-offset derive-type) ((array index offset new-value)) (assert-new-value-type new-value array)) ;;; Figure out the type of the data vector if we know the argument @@ -188,8 +215,7 @@ ,@(mapcar (lambda (el) (once-only ((n-val el)) `(locally (declare (optimize (safety 0))) - (setf (svref ,n-vec ,(incf n)) - ,n-val)))) + (setf (svref ,n-vec ,(incf n)) ,n-val)))) elements) ,n-vec)))) @@ -528,7 +554,7 @@ ;;; compile-time or we are generating unsafe code, don't bother with ;;; the VOP. (deftransform %check-bound ((array dimension index) * * :node node) - (cond ((policy node (and (> speed safety) (= safety 0))) + (cond ((policy node (= insert-array-bounds-checks 0)) 'index) ((not (constant-lvar-p dimension)) (give-up-ir1-transform)) @@ -727,11 +753,69 @@ (deftransform aref ((array &rest indices)) (with-row-major-index (array indices index) (hairy-data-vector-ref array index))) + (deftransform %aset ((array &rest stuff)) (let ((indices (butlast stuff))) (with-row-major-index (array indices index new-value) (hairy-data-vector-set array index new-value))))) +;; For AREF of vectors we do the bounds checking in the callee. This +;; lets us do a significantly more efficient check for simple-arrays +;; without bloating the code. +(deftransform aref ((array index) (t t) * :node node) + (if (policy node (zerop insert-array-bounds-checks)) + `(hairy-data-vector-ref array index) + `(hairy-data-vector-ref/check-bounds array index))) + +(deftransform %aset ((array index new-value) (t t t) * :node node) + (if (policy node (zerop insert-array-bounds-checks)) + `(hairy-data-vector-set array index new-value) + `(hairy-data-vector-set/check-bounds array index new-value))) + +;;; But if we find out later that there's some useful type information +;;; available, switch back to the normal one to give other transforms +;;; a stab at it. +(macrolet ((define (name transform-to extra extra-type) + `(deftransform ,name ((array index ,@extra)) + (let ((type (lvar-type array)) + (element-type (extract-upgraded-element-type array))) + ;; If an element type has been declared, we want to + ;; use that information it for type checking (even + ;; if the access can't be optimized due to the array + ;; not being simple). + (when (and (eql element-type *wild-type*) + ;; This type logic corresponds to the special + ;; case for strings in HAIRY-DATA-VECTOR-REF + ;; (generic/vm-tran.lisp) + (not (csubtypep type (specifier-type 'simple-string)))) + (when (or (not (array-type-p type)) + ;; If it's a simple array, we might be able + ;; to inline the access completely. + (not (null (array-type-complexp type)))) + (give-up-ir1-transform + "Upgraded element type of array is not known at compile time.")))) + `(,',transform-to array + (%check-bound array + (array-dimension array 0) + index) + ,@',extra)))) + (define hairy-data-vector-ref/check-bounds + hairy-data-vector-ref nil nil) + (define hairy-data-vector-set/check-bounds + hairy-data-vector-set (new-value) (*))) + +(deftransform aref ((array index) ((or simple-vector + (simple-unboxed-array 1)) + index)) + (let ((type (lvar-type array))) + (unless (array-type-p type) + ;; Not an exactly specified one-dimensional simple array -> punt + ;; to the complex version. + (give-up-ir1-transform))) + `(data-vector-ref array (%check-bound array + (array-dimension array 0) + index))) + ;;; Just convert into a HAIRY-DATA-VECTOR-REF (or ;;; HAIRY-DATA-VECTOR-SET) after checking that the index is inside the ;;; array total size.