Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

split up x862-aset2 #495

Merged
merged 4 commits into from
Jun 6, 2024
Merged

split up x862-aset2 #495

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
400b89e
Naively split x862-aset into two cases
xrme Jun 5, 2024
cb41d10
Remove needs-memoization cases from x862-aset2
xrme Jun 5, 2024
6342511
Use more flexible register assignment in x862-aset2
xrme Jun 6, 2024
477674e
x862-aset2-via-gvset: handle needs-memoization case only
xrme Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
211 changes: 135 additions & 76 deletions compiler/X86/x862.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2274,6 +2274,59 @@



(defun x862-aset2-via-gvset (seg vreg xfer array i j new safe type-keyword constval &optional (simple t))
(with-x86-local-vinsn-macros (seg target)
(let* ((i-known-fixnum (acode-fixnum-form-p i))
(j-known-fixnum (acode-fixnum-form-p j))
(src ($ x8664::temp0))
(unscaled-i ($ x8664::arg_x))
(unscaled-j ($ x8664::arg_y))
(val-reg ($ x8664::arg_z))
(continue-label (backend-get-next-label)))
(x862-four-targeted-reg-forms seg
array src
i unscaled-i
j unscaled-j
new val-reg)
(when safe
(when (typep safe 'fixnum)
(if simple
(! trap-unless-simple-array-2
src
(dpb safe target::arrayH.flags-cell-subtag-byte
(ash 1 $arh_simple_bit))
(nx-error-for-simple-2d-array-type type-keyword))
(with-crf-target () crf
(! set-z-if-typed-array crf src safe 2)
(x862-branch seg (x862-make-compound-cd continue-label 0)
x86::x86-e-bits t)
(x862-copy-register seg ($ x8664::arg_y) src)
(! ref-constant ($ x8664::arg_z)
(x86-immediate-label `(array ,(element-subtype-type safe)
(* *))))
(x862-absolute-natural seg($ x8664::arg_x) nil
(ash $xwrongtype x8664::fixnumshift))
(! set-nargs 3)
(! call-subprim-no-return (subprim-name->offset '.SPksignalerr))
(@ continue-label))))
(unless i-known-fixnum
(! trap-unless-fixnum unscaled-i))
(unless j-known-fixnum
(! trap-unless-fixnum unscaled-j)))
(with-imm-target () dim1
(let* ((idx-reg ($ x8664::arg_y)))
(if safe
(! check-2d-bound dim1 unscaled-i unscaled-j src)
(! 2d-dim1 dim1 src))
(! 2d-unscaled-index idx-reg dim1 unscaled-i unscaled-j)
(let* ((v ($ x8664::arg_x)))
(if simple
(! array-data-vector-ref v src)
(progn
(x862-copy-register seg v src)
(! deref-vector-header v idx-reg)))
(x862-vset1 seg vreg xfer type-keyword v idx-reg nil val-reg (x862-unboxed-reg-for-aset seg type-keyword val-reg safe constval) constval t)))))))

(defun x862-aset2 (seg vreg xfer array i j new safe type-keyword dim0 dim1 &optional (simple t))
(target-arch-case
(:x8632 (error "not for x8632 yet")))
Expand All @@ -2282,82 +2335,88 @@
(j-known-fixnum (acode-fixnum-form-p j))
(arch (backend-target-arch *target-backend*))
(is-node (member type-keyword (arch::target-gvector-types arch)))
(constval (x862-constant-value-ok-for-type-keyword type-keyword new))
(needs-memoization (and is-node (x862-acode-needs-memoization new)))
(src)
(continue-label (backend-get-next-label))
(unscaled-i)
(unscaled-j)
(val-reg (x862-target-reg-for-aset vreg type-keyword))
(constidx
(and dim0 dim1 i-known-fixnum j-known-fixnum
(>= i-known-fixnum 0)
(>= j-known-fixnum 0)
(< i-known-fixnum dim0)
(< j-known-fixnum dim1)
(+ (* i-known-fixnum dim1) j-known-fixnum))))
(progn
(if constidx
(multiple-value-setq (src val-reg)
(x862-two-targeted-reg-forms seg array ($ *x862-temp0*) new val-reg))
(multiple-value-setq (src unscaled-i unscaled-j val-reg)
(if needs-memoization
(progn
(x862-four-targeted-reg-forms seg
array ($ *x862-temp0*)
i ($ x8664::arg_x)
j ($ *x862-arg-y*)
new val-reg)
(values ($ *x862-temp0*) ($ x8664::arg_x) ($ *x862-arg-y*) ($ *x862-arg-z*)))
(x862-four-untargeted-reg-forms seg
array ($ *x862-temp0*)
i ($ x8664::arg_x)
j ($ *x862-arg-y*)
new val-reg))))
(let* ((*available-backend-imm-temps* *available-backend-imm-temps*))
(when (and (= (hard-regspec-class val-reg) hard-reg-class-gpr)
(logbitp (hard-regspec-value val-reg)
*backend-imm-temps*))
(use-imm-temp (hard-regspec-value val-reg)))
(when safe
(when (typep safe 'fixnum)
(if simple
(! trap-unless-simple-array-2
src
(dpb safe target::arrayH.flags-cell-subtag-byte
(ash 1 $arh_simple_bit))
(nx-error-for-simple-2d-array-type type-keyword))
(with-crf-target () crf
(! set-z-if-typed-array crf src safe 2)
(x862-branch seg (x862-make-compound-cd continue-label 0) x86::x86-e-bits t)
(x862-copy-register seg ($ x8664::arg_y) src)
(! ref-constant ($ x8664::arg_z) (x86-immediate-label
`(array ,(element-subtype-type safe) (* *))))
(x862-absolute-natural seg($ x8664::arg_x) nil (ash $xwrongtype x8664::fixnumshift))
(! set-nargs 3)
(! call-subprim-no-return (subprim-name->offset '.SPksignalerr))
(@ continue-label))))
(unless i-known-fixnum
(! trap-unless-fixnum unscaled-i))
(unless j-known-fixnum
(! trap-unless-fixnum unscaled-j)))
(with-imm-target () dim1
(let* ((idx-reg ($ *x862-arg-y*)))
(if constidx
(if needs-memoization
(x862-lri seg *x862-arg-y* (ash constidx *x862-target-fixnum-shift*)))
(progn
(if safe
(! check-2d-bound dim1 unscaled-i unscaled-j src)
(! 2d-dim1 dim1 src))
(! 2d-unscaled-index idx-reg dim1 unscaled-i unscaled-j)))
(let* ((v ($ x8664::arg_x)))
(if simple
(! array-data-vector-ref v src)
(progn
(x862-copy-register seg v src)
(! deref-vector-header v idx-reg)))
(x862-vset1 seg vreg xfer type-keyword v idx-reg constidx val-reg (x862-unboxed-reg-for-aset seg type-keyword val-reg safe constval) constval needs-memoization)))))))))
(constval (x862-constant-value-ok-for-type-keyword type-keyword
new))
(needs-memoization (and is-node
(x862-acode-needs-memoization new))))
(if needs-memoization
(x862-aset2-via-gvset seg vreg xfer array i j new safe type-keyword
constval simple)
(let* ((constidx
(and dim0 dim1 i-known-fixnum j-known-fixnum
(>= i-known-fixnum 0)
(>= j-known-fixnum 0)
(< i-known-fixnum dim0)
(< j-known-fixnum dim1)
(+ (* i-known-fixnum dim1) j-known-fixnum)))
(val-reg (x862-target-reg-for-aset vreg type-keyword))
(node-val (if (node-reg-p val-reg) val-reg))
(imm-val (if (imm-reg-p val-reg) val-reg))
(continue-label (backend-get-next-label)))
(with-node-target (node-val) src
(with-node-target (node-val src) unscaled-i
(with-node-target (node-val src unscaled-i) unscaled-j
(if constidx
(multiple-value-setq (src val-reg)
(x862-two-untargeted-reg-forms seg array ($ x8664::temp0)
new val-reg))
(multiple-value-setq (src unscaled-i unscaled-j val-reg)
(x862-four-untargeted-reg-forms seg
array src
i unscaled-i
j unscaled-j
new val-reg)))
(if (node-reg-p val-reg) (setq node-val val-reg))
(if (imm-reg-p val-reg) (setq imm-val val-reg))
(let* ((*available-backend-imm-temps*
*available-backend-imm-temps*))
(when (and (= (hard-regspec-class val-reg)
hard-reg-class-gpr)
(logbitp (hard-regspec-value val-reg)
*backend-imm-temps*))
(use-imm-temp (hard-regspec-value val-reg)))
(when safe
(when (typep safe 'fixnum)
(if simple
(! trap-unless-simple-array-2 src
(dpb safe target::arrayH.flags-cell-subtag-byte
(ash 1 $arh_simple_bit))
(nx-error-for-simple-2d-array-type type-keyword))
(with-crf-target () crf
(! set-z-if-typed-array crf src safe 2)
(x862-branch seg
(x862-make-compound-cd continue-label 0)
x86::x86-e-bits t)
(x862-copy-register seg ($ x8664::arg_y) src)
(! ref-constant ($ x8664::arg_z)
(x86-immediate-label
`(array ,(element-subtype-type safe) (* *))))
(x862-absolute-natural seg ($ x8664::arg_x) nil
(ash $xwrongtype
x8664::fixnumshift))
(! set-nargs 3)
(! call-subprim-no-return (subprim-name->offset
'.SPksignalerr))
(@ continue-label))))
(unless i-known-fixnum
(! trap-unless-fixnum unscaled-i))
(unless j-known-fixnum
(! trap-unless-fixnum unscaled-j)))
(with-imm-target (imm-val) dim1
(with-node-target (src node-val) idx-reg
(unless constidx
(if safe
(! check-2d-bound dim1 unscaled-i unscaled-j src)
(! 2d-dim1 dim1 src))
(! 2d-unscaled-index idx-reg dim1
unscaled-i unscaled-j))
(with-node-target (idx-reg node-val) v
(if simple
(! array-data-vector-ref v src)
(progn
(x862-copy-register seg v src)
(! deref-vector-header v idx-reg)))
(x862-vset1 seg vreg xfer type-keyword v idx-reg constidx val-reg (x862-unboxed-reg-for-aset seg type-keyword val-reg safe constval) constval needs-memoization)))))))))))))


(defun x862-aset3 (seg vreg xfer array i j k new safe type-keyword dim0 dim1 dim2 &optional (simple t))
Expand Down