Fix bit/bif instructions.

sim/aarch64/
	* simulator.c (do_vec_bit): Change loop limits from 16 and 8 to 4 and
	2.  Move test_false if inside loop.  Fix logic for computing result
	stored to vd.

	sim/testsuite/sim/aarch64
	* bit.s: New.
This commit is contained in:
Jim Wilson 2017-02-14 14:35:57 -08:00
parent e8f42b5e36
commit bf25e9a0f1
4 changed files with 107 additions and 10 deletions

View File

@ -1,5 +1,9 @@
2017-02-14 Jim Wilson <jim.wilson@linaro.org>
* simulator.c (do_vec_bit): Change loop limits from 16 and 8 to 4 and
2. Move test_false if inside loop. Fix logic for computing result
stored to vd.
* simulator.c: (LDn_STn_SINGLE_LANE_AND_SIZE): New.
(do_vec_LDn_single, do_vec_STn_single): New.
(do_vec_LDnR): Add and set new nregs var. Replace switch on nregs with

View File

@ -4085,17 +4085,17 @@ do_vec_bit (sim_cpu *cpu)
NYI_assert (15, 10, 0x07);
TRACE_DECODE (cpu, "emulated at line %d", __LINE__);
if (test_false)
for (i = 0; i < (full ? 4 : 2); i++)
{
for (i = 0; i < (full ? 16 : 8); i++)
if (aarch64_get_vec_u32 (cpu, vn, i) == 0)
aarch64_set_vec_u32 (cpu, vd, i, aarch64_get_vec_u32 (cpu, vm, i));
}
else
{
for (i = 0; i < (full ? 16 : 8); i++)
if (aarch64_get_vec_u32 (cpu, vn, i) != 0)
aarch64_set_vec_u32 (cpu, vd, i, aarch64_get_vec_u32 (cpu, vm, i));
uint32_t vd_val = aarch64_get_vec_u32 (cpu, vd, i);
uint32_t vn_val = aarch64_get_vec_u32 (cpu, vn, i);
uint32_t vm_val = aarch64_get_vec_u32 (cpu, vm, i);
if (test_false)
aarch64_set_vec_u32 (cpu, vd, i,
(vd_val & vm_val) | (vn_val & ~vm_val));
else
aarch64_set_vec_u32 (cpu, vd, i,
(vd_val & ~vm_val) | (vn_val & vm_val));
}
}

View File

@ -1,5 +1,7 @@
2017-02-14 Jim Wilson <jim.wilson@linaro.org>
* bit.s: New.
* ldn_single.s: New.
* ldnr.s: New.
* stn_single.s: New.

View File

@ -0,0 +1,91 @@
# mach: aarch64
# Check the bitwise vector instructions: bif, bit, bsl, eor.
.include "testutils.inc"
.data
.align 4
inputa:
.word 0x04030201
.word 0x08070605
.word 0x0c0b0a09
.word 0x100f0e0d
inputb:
.word 0x40302010
.word 0x80706050
.word 0xc0b0a090
.word 0x01f0e0d0
mask:
.word 0xFF00FF00
.word 0x00FF00FF
.word 0xF0F0F0F0
.word 0x0F0F0F0F
start
adrp x0, inputa
ldr q0, [x0, #:lo12:inputa]
adrp x0, inputb
ldr q1, [x0, #:lo12:inputb]
adrp x0, mask
ldr q2, [x0, #:lo12:mask]
mov v3.8b, v0.8b
bif v3.8b, v1.8b, v2.8b
addv b4, v3.8b
mov x1, v4.d[0]
cmp x1, #306
bne .Lfailure
mov v3.16b, v0.16b
bif v3.16b, v1.16b, v2.16b
addv b4, v3.16b
mov x1, v4.d[0]
cmp x1, #1020
bne .Lfailure
mov v3.8b, v0.8b
bit v3.8b, v1.8b, v2.8b
addv b4, v3.8b
mov x1, v4.d[0]
cmp x1, #306
bne .Lfailure
mov v3.16b, v0.16b
bit v3.16b, v1.16b, v2.16b
addv b4, v3.16b
mov x1, v4.d[0]
cmp x1, #1037
bne .Lfailure
mov v3.8b, v2.8b
bsl v3.8b, v0.8b, v1.8b
addv b4, v3.8b
mov x1, v4.d[0]
cmp x1, #306
bne .Lfailure
mov v3.16b, v2.16b
bsl v3.16b, v0.16b, v1.16b
addv b4, v3.16b
mov x1, v4.d[0]
cmp x1, #1020
bne .Lfailure
mov v3.8b, v0.8b
eor v3.8b, v1.8b, v2.8b
addv b4, v3.8b
mov x1, v4.d[0]
cmp x1, #1020
bne .Lfailure
mov v3.16b, v0.16b
eor v3.16b, v1.16b, v2.16b
addv b4, v3.16b
mov x1, v4.d[0]
cmp x1, #2039
bne .Lfailure
pass
.Lfailure:
fail