The following changes since commit 40c67636f67c2a89745f2e698522fe917326a952:

Merge remote-tracking branch 'remotes/kraxel/tags/usb-20200317-pull-request' into staging (2020-03-17 14:00:56 +0000)

https://github.com/rth7680/qemu.git tags/pull-tcg-20200317

for you to fetch changes up to 0270bd503e3699b7202200a2d693ad1feb57473f:

tcg: Remove tcg-runtime-gvec.c DO_CMP0 (2020-03-17 08:41:07 -0700)

Fix tcg/i386 bug vs sari_vec.

Fix tcg-runtime-gvec.c vs i386 without avx.

Richard Henderson (5):

tcg/i386: Bound shift count expanding sari_vec

tcg: Remove CONFIG_VECTOR16

tcg: Tidy tcg-runtime-gvec.c types

tcg: Tidy tcg-runtime-gvec.c DUP*

tcg: Remove tcg-runtime-gvec.c DO_CMP0

configure | 56 --------

accel/tcg/tcg-runtime-gvec.c | 298 +++++++++++++++++--------------------------

tcg/i386/tcg-target.inc.c | 9 +-

3 files changed, 122 insertions(+), 241 deletions(-)

A given RISU testcase for SVE can produce

tcg-op-vec.c:511: do_shifti: Assertion `i >= 0 && i < (8 << vece)' failed.

because expand_vec_sari gave a shift count of 32 to a MO_32

vector shift.

In 44f1441dbe1, we changed from direct expansion of vector opcodes

to re-use of the tcg expanders. So while the comment correctly notes

that the hw will handle such a shift count, we now have to take our

own sanity checks into account. Which is easy in this particular case.

Fixes: 44f1441dbe1

tcg/i386/tcg-target.inc.c | 9 ++++++---

1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tcg/i386/tcg-target.inc.c b/tcg/i386/tcg-target.inc.c

--- a/tcg/i386/tcg-target.inc.c

+++ b/tcg/i386/tcg-target.inc.c

@@ -XXX,XX +XXX,XX @@ static void expand_vec_sari(TCGType type, unsigned vece,

case MO_64:

if (imm <= 32) {

- /* We can emulate a small sign extend by performing an arithmetic

+ /*

+ * We can emulate a small sign extend by performing an arithmetic

* 32-bit shift and overwriting the high half of a 64-bit logical

- * shift (note that the ISA says shift of 32 is valid).

+ * shift. Note that the ISA says shift of 32 is valid, but TCG

+ * does not, so we have to bound the smaller shift -- we get the

+ * same result in the high half either way.

*/

t1 = tcg_temp_new_vec(type);

- tcg_gen_sari_vec(MO_32, t1, v1, imm);

+ tcg_gen_sari_vec(MO_32, t1, v1, MIN(imm, 31));

tcg_gen_shri_vec(MO_64, v0, v1, imm);

vec_gen_4(INDEX_op_x86_blend_vec, type, MO_32,

tcgv_vec_arg(v0), tcgv_vec_arg(v0),

2.20.1

The comment in tcg-runtime-gvec.c about CONFIG_VECTOR16 says that

tcg-op-gvec.c has eliminated size 8 vectors, and only passes on

multiples of 16. This may have been true of the first few operations,

but is not true of all operations.

In particular, multiply, shift by scalar, and compare of 8- and 16-bit

elements are not expanded inline if host vector operations are not

supported.

For an x86_64 host that does not support AVX, this means that we will

fall back to the helper, which will attempt to use SSE instructions,

which will SEGV on an invalid 8-byte aligned memory operation.

This patch simply removes the CONFIG_VECTOR16 code and configuration

without further simplification.

Buglink: https://bugs.launchpad.net/bugs/1863508

configure | 56 ------------------------------------

accel/tcg/tcg-runtime-gvec.c | 35 +---------------------

2 files changed, 1 insertion(+), 90 deletions(-)

diff --git a/configure b/configure

index XXXXXXX..XXXXXXX 100755

--- a/configure

+++ b/configure

@@ -XXX,XX +XXX,XX @@ if test "$plugins" = "yes" &&

"for this purpose. You can't build with --static."

fi

-########################################

-# See if 16-byte vector operations are supported.

-# Even without a vector unit the compiler may expand these.

-# There is a bug in old GCC for PPC that crashes here.

-# Unfortunately it's the system compiler for Centos 7.

-

-cat > $TMPC << EOF

-typedef unsigned char U1 __attribute__((vector_size(16)));

-typedef unsigned short U2 __attribute__((vector_size(16)));

-typedef unsigned int U4 __attribute__((vector_size(16)));

-typedef unsigned long long U8 __attribute__((vector_size(16)));

-typedef signed char S1 __attribute__((vector_size(16)));

-typedef signed short S2 __attribute__((vector_size(16)));

-typedef signed int S4 __attribute__((vector_size(16)));

-typedef signed long long S8 __attribute__((vector_size(16)));

-static U1 a1, b1;

-static U2 a2, b2;

-static U4 a4, b4;

-static U8 a8, b8;

-static S1 c1;

-static S2 c2;

-static S4 c4;

-static S8 c8;

-static int i;

-void helper(void *d, void *a, int shift, int i);

-void helper(void *d, void *a, int shift, int i)

-{

- *(U1 *)(d + i) = *(U1 *)(a + i) << shift;

- *(U2 *)(d + i) = *(U2 *)(a + i) << shift;

- *(U4 *)(d + i) = *(U4 *)(a + i) << shift;

- *(U8 *)(d + i) = *(U8 *)(a + i) << shift;

-}

-int main(void)

-{

- a1 += b1; a2 += b2; a4 += b4; a8 += b8;

- a1 -= b1; a2 -= b2; a4 -= b4; a8 -= b8;

- a1 *= b1; a2 *= b2; a4 *= b4; a8 *= b8;

- a1 &= b1; a2 &= b2; a4 &= b4; a8 &= b8;

- a1 |= b1; a2 |= b2; a4 |= b4; a8 |= b8;

- a1 ^= b1; a2 ^= b2; a4 ^= b4; a8 ^= b8;

- a1 <<= i; a2 <<= i; a4 <<= i; a8 <<= i;

- a1 >>= i; a2 >>= i; a4 >>= i; a8 >>= i;

- c1 >>= i; c2 >>= i; c4 >>= i; c8 >>= i;

- return 0;

-}

-EOF

-

-vector16=no

-if compile_prog "" "" ; then

- vector16=yes

-fi

-

########################################

# See if __attribute__((alias)) is supported.

# This false for Xcode 9, but has been remedied for Xcode 10.

@@ -XXX,XX +XXX,XX @@ if test "$atomic64" = "yes" ; then

echo "CONFIG_ATOMIC64=y" >> $config_host_mak

fi

-if test "$vector16" = "yes" ; then

- echo "CONFIG_VECTOR16=y" >> $config_host_mak

-fi

-

if test "$attralias" = "yes" ; then

echo "CONFIG_ATTRIBUTE_ALIAS=y" >> $config_host_mak

fi

diff --git a/accel/tcg/tcg-runtime-gvec.c b/accel/tcg/tcg-runtime-gvec.c

--- a/accel/tcg/tcg-runtime-gvec.c

+++ b/accel/tcg/tcg-runtime-gvec.c

#include "tcg/tcg-gvec-desc.h"

-/* Virtually all hosts support 16-byte vectors. Those that don't can emulate

- * them via GCC's generic vector extension. This turns out to be simpler and

- * more reliable than getting the compiler to autovectorize.

- *

- * In tcg-op-gvec.c, we asserted that both the size and alignment of the data

- * are multiples of 16.

- *

- * When the compiler does not support all of the operations we require, the

- * loops are written so that we can always fall back on the base types.

- */

-#ifdef CONFIG_VECTOR16

-typedef uint8_t vec8 __attribute__((vector_size(16)));

-typedef uint16_t vec16 __attribute__((vector_size(16)));

-typedef uint32_t vec32 __attribute__((vector_size(16)));

-typedef uint64_t vec64 __attribute__((vector_size(16)));

-

-typedef int8_t svec8 __attribute__((vector_size(16)));

-typedef int16_t svec16 __attribute__((vector_size(16)));

-typedef int32_t svec32 __attribute__((vector_size(16)));

-typedef int64_t svec64 __attribute__((vector_size(16)));

-

-#define DUP16(X) { X, X, X, X, X, X, X, X, X, X, X, X, X, X, X, X }

-#define DUP8(X) { X, X, X, X, X, X, X, X }

-#define DUP4(X) { X, X, X, X }

-#define DUP2(X) { X, X }

-#else

typedef uint8_t vec8;

typedef uint16_t vec16;

typedef uint32_t vec32;

@@ -XXX,XX +XXX,XX @@ typedef int64_t svec64;

#define DUP8(X) X

#define DUP4(X) X

#define DUP2(X) X

-#endif /* CONFIG_VECTOR16 */

static inline void clear_high(void *d, intptr_t oprsz, uint32_t desc)

{

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_sar64v)(void *d, void *a, void *b, uint32_t desc)

clear_high(d, oprsz, desc);

}

-/* If vectors are enabled, the compiler fills in -1 for true.

- Otherwise, we must take care of this by hand. */

-#ifdef CONFIG_VECTOR16

-# define DO_CMP0(X) X

-#else

-# define DO_CMP0(X) -(X)

-#endif

+#define DO_CMP0(X) -(X)

#define DO_CMP1(NAME, TYPE, OP) \

void HELPER(NAME)(void *d, void *a, void *b, uint32_t desc) \

2.20.1

Partial cleanup from the CONFIG_VECTOR16 removal.

Replace the vec* types with their scalar expansions.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

accel/tcg/tcg-runtime-gvec.c | 270 +++++++++++++++++------------------

1 file changed, 130 insertions(+), 140 deletions(-)

diff --git a/accel/tcg/tcg-runtime-gvec.c b/accel/tcg/tcg-runtime-gvec.c

--- a/accel/tcg/tcg-runtime-gvec.c

+++ b/accel/tcg/tcg-runtime-gvec.c

#include "tcg/tcg-gvec-desc.h"

-typedef uint8_t vec8;

-typedef uint16_t vec16;

-typedef uint32_t vec32;

-typedef uint64_t vec64;

-

-typedef int8_t svec8;

-typedef int16_t svec16;

-typedef int32_t svec32;

-typedef int64_t svec64;

-

#define DUP16(X) X

#define DUP8(X) X

#define DUP4(X) X

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_add8)(void *d, void *a, void *b, uint32_t desc)

intptr_t oprsz = simd_oprsz(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec8)) {

- *(vec8 *)(d + i) = *(vec8 *)(a + i) + *(vec8 *)(b + i);

+ for (i = 0; i < oprsz; i += sizeof(uint8_t)) {

+ *(uint8_t *)(d + i) = *(uint8_t *)(a + i) + *(uint8_t *)(b + i);

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_add16)(void *d, void *a, void *b, uint32_t desc)

intptr_t oprsz = simd_oprsz(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec16)) {

- *(vec16 *)(d + i) = *(vec16 *)(a + i) + *(vec16 *)(b + i);

+ for (i = 0; i < oprsz; i += sizeof(uint16_t)) {

+ *(uint16_t *)(d + i) = *(uint16_t *)(a + i) + *(uint16_t *)(b + i);

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_add32)(void *d, void *a, void *b, uint32_t desc)

intptr_t oprsz = simd_oprsz(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec32)) {

- *(vec32 *)(d + i) = *(vec32 *)(a + i) + *(vec32 *)(b + i);

+ for (i = 0; i < oprsz; i += sizeof(uint32_t)) {

+ *(uint32_t *)(d + i) = *(uint32_t *)(a + i) + *(uint32_t *)(b + i);

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_add64)(void *d, void *a, void *b, uint32_t desc)

intptr_t oprsz = simd_oprsz(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec64)) {

- *(vec64 *)(d + i) = *(vec64 *)(a + i) + *(vec64 *)(b + i);

+ for (i = 0; i < oprsz; i += sizeof(uint64_t)) {

+ *(uint64_t *)(d + i) = *(uint64_t *)(a + i) + *(uint64_t *)(b + i);

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_add64)(void *d, void *a, void *b, uint32_t desc)

void HELPER(gvec_adds8)(void *d, void *a, uint64_t b, uint32_t desc)

{

intptr_t oprsz = simd_oprsz(desc);

- vec8 vecb = (vec8)DUP16(b);

+ uint8_t vecb = (uint8_t)DUP16(b);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec8)) {

- *(vec8 *)(d + i) = *(vec8 *)(a + i) + vecb;

+ for (i = 0; i < oprsz; i += sizeof(uint8_t)) {

+ *(uint8_t *)(d + i) = *(uint8_t *)(a + i) + vecb;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_adds8)(void *d, void *a, uint64_t b, uint32_t desc)

void HELPER(gvec_adds16)(void *d, void *a, uint64_t b, uint32_t desc)

{

intptr_t oprsz = simd_oprsz(desc);

- vec16 vecb = (vec16)DUP8(b);

+ uint16_t vecb = (uint16_t)DUP8(b);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec16)) {

- *(vec16 *)(d + i) = *(vec16 *)(a + i) + vecb;

+ for (i = 0; i < oprsz; i += sizeof(uint16_t)) {

+ *(uint16_t *)(d + i) = *(uint16_t *)(a + i) + vecb;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_adds16)(void *d, void *a, uint64_t b, uint32_t desc)

void HELPER(gvec_adds32)(void *d, void *a, uint64_t b, uint32_t desc)

{

intptr_t oprsz = simd_oprsz(desc);

- vec32 vecb = (vec32)DUP4(b);

+ uint32_t vecb = (uint32_t)DUP4(b);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec32)) {

- *(vec32 *)(d + i) = *(vec32 *)(a + i) + vecb;

+ for (i = 0; i < oprsz; i += sizeof(uint32_t)) {

+ *(uint32_t *)(d + i) = *(uint32_t *)(a + i) + vecb;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_adds32)(void *d, void *a, uint64_t b, uint32_t desc)

void HELPER(gvec_adds64)(void *d, void *a, uint64_t b, uint32_t desc)

{

intptr_t oprsz = simd_oprsz(desc);

- vec64 vecb = (vec64)DUP2(b);

+ uint64_t vecb = (uint64_t)DUP2(b);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec64)) {

- *(vec64 *)(d + i) = *(vec64 *)(a + i) + vecb;

+ for (i = 0; i < oprsz; i += sizeof(uint64_t)) {

+ *(uint64_t *)(d + i) = *(uint64_t *)(a + i) + vecb;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_sub8)(void *d, void *a, void *b, uint32_t desc)

intptr_t oprsz = simd_oprsz(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec8)) {

- *(vec8 *)(d + i) = *(vec8 *)(a + i) - *(vec8 *)(b + i);

+ for (i = 0; i < oprsz; i += sizeof(uint8_t)) {

+ *(uint8_t *)(d + i) = *(uint8_t *)(a + i) - *(uint8_t *)(b + i);

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_sub16)(void *d, void *a, void *b, uint32_t desc)

intptr_t oprsz = simd_oprsz(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec16)) {

- *(vec16 *)(d + i) = *(vec16 *)(a + i) - *(vec16 *)(b + i);

+ for (i = 0; i < oprsz; i += sizeof(uint16_t)) {

+ *(uint16_t *)(d + i) = *(uint16_t *)(a + i) - *(uint16_t *)(b + i);

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_sub32)(void *d, void *a, void *b, uint32_t desc)

intptr_t oprsz = simd_oprsz(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec32)) {

- *(vec32 *)(d + i) = *(vec32 *)(a + i) - *(vec32 *)(b + i);

+ for (i = 0; i < oprsz; i += sizeof(uint32_t)) {

+ *(uint32_t *)(d + i) = *(uint32_t *)(a + i) - *(uint32_t *)(b + i);

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_sub64)(void *d, void *a, void *b, uint32_t desc)

intptr_t oprsz = simd_oprsz(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec64)) {

- *(vec64 *)(d + i) = *(vec64 *)(a + i) - *(vec64 *)(b + i);

+ for (i = 0; i < oprsz; i += sizeof(uint64_t)) {

+ *(uint64_t *)(d + i) = *(uint64_t *)(a + i) - *(uint64_t *)(b + i);

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_sub64)(void *d, void *a, void *b, uint32_t desc)

void HELPER(gvec_subs8)(void *d, void *a, uint64_t b, uint32_t desc)

{

intptr_t oprsz = simd_oprsz(desc);

- vec8 vecb = (vec8)DUP16(b);

+ uint8_t vecb = (uint8_t)DUP16(b);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec8)) {

- *(vec8 *)(d + i) = *(vec8 *)(a + i) - vecb;

+ for (i = 0; i < oprsz; i += sizeof(uint8_t)) {

+ *(uint8_t *)(d + i) = *(uint8_t *)(a + i) - vecb;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_subs8)(void *d, void *a, uint64_t b, uint32_t desc)

void HELPER(gvec_subs16)(void *d, void *a, uint64_t b, uint32_t desc)

{

intptr_t oprsz = simd_oprsz(desc);

- vec16 vecb = (vec16)DUP8(b);

+ uint16_t vecb = (uint16_t)DUP8(b);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec16)) {

- *(vec16 *)(d + i) = *(vec16 *)(a + i) - vecb;

+ for (i = 0; i < oprsz; i += sizeof(uint16_t)) {

+ *(uint16_t *)(d + i) = *(uint16_t *)(a + i) - vecb;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_subs16)(void *d, void *a, uint64_t b, uint32_t desc)

void HELPER(gvec_subs32)(void *d, void *a, uint64_t b, uint32_t desc)

{

intptr_t oprsz = simd_oprsz(desc);

- vec32 vecb = (vec32)DUP4(b);

+ uint32_t vecb = (uint32_t)DUP4(b);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec32)) {

- *(vec32 *)(d + i) = *(vec32 *)(a + i) - vecb;

+ for (i = 0; i < oprsz; i += sizeof(uint32_t)) {

+ *(uint32_t *)(d + i) = *(uint32_t *)(a + i) - vecb;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_subs32)(void *d, void *a, uint64_t b, uint32_t desc)

void HELPER(gvec_subs64)(void *d, void *a, uint64_t b, uint32_t desc)

{

intptr_t oprsz = simd_oprsz(desc);

- vec64 vecb = (vec64)DUP2(b);

+ uint64_t vecb = (uint64_t)DUP2(b);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec64)) {

- *(vec64 *)(d + i) = *(vec64 *)(a + i) - vecb;

+ for (i = 0; i < oprsz; i += sizeof(uint64_t)) {

+ *(uint64_t *)(d + i) = *(uint64_t *)(a + i) - vecb;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_mul8)(void *d, void *a, void *b, uint32_t desc)

intptr_t oprsz = simd_oprsz(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec8)) {

- *(vec8 *)(d + i) = *(vec8 *)(a + i) * *(vec8 *)(b + i);

+ for (i = 0; i < oprsz; i += sizeof(uint8_t)) {

+ *(uint8_t *)(d + i) = *(uint8_t *)(a + i) * *(uint8_t *)(b + i);

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_mul16)(void *d, void *a, void *b, uint32_t desc)

intptr_t oprsz = simd_oprsz(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec16)) {

- *(vec16 *)(d + i) = *(vec16 *)(a + i) * *(vec16 *)(b + i);

+ for (i = 0; i < oprsz; i += sizeof(uint16_t)) {

+ *(uint16_t *)(d + i) = *(uint16_t *)(a + i) * *(uint16_t *)(b + i);

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_mul32)(void *d, void *a, void *b, uint32_t desc)

intptr_t oprsz = simd_oprsz(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec32)) {

- *(vec32 *)(d + i) = *(vec32 *)(a + i) * *(vec32 *)(b + i);

+ for (i = 0; i < oprsz; i += sizeof(uint32_t)) {

+ *(uint32_t *)(d + i) = *(uint32_t *)(a + i) * *(uint32_t *)(b + i);

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_mul64)(void *d, void *a, void *b, uint32_t desc)

intptr_t oprsz = simd_oprsz(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec64)) {

- *(vec64 *)(d + i) = *(vec64 *)(a + i) * *(vec64 *)(b + i);

+ for (i = 0; i < oprsz; i += sizeof(uint64_t)) {

+ *(uint64_t *)(d + i) = *(uint64_t *)(a + i) * *(uint64_t *)(b + i);

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_mul64)(void *d, void *a, void *b, uint32_t desc)

void HELPER(gvec_muls8)(void *d, void *a, uint64_t b, uint32_t desc)

{

intptr_t oprsz = simd_oprsz(desc);

- vec8 vecb = (vec8)DUP16(b);

+ uint8_t vecb = (uint8_t)DUP16(b);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec8)) {

- *(vec8 *)(d + i) = *(vec8 *)(a + i) * vecb;

+ for (i = 0; i < oprsz; i += sizeof(uint8_t)) {

+ *(uint8_t *)(d + i) = *(uint8_t *)(a + i) * vecb;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_muls8)(void *d, void *a, uint64_t b, uint32_t desc)

void HELPER(gvec_muls16)(void *d, void *a, uint64_t b, uint32_t desc)

{

intptr_t oprsz = simd_oprsz(desc);

- vec16 vecb = (vec16)DUP8(b);

+ uint16_t vecb = (uint16_t)DUP8(b);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec16)) {

- *(vec16 *)(d + i) = *(vec16 *)(a + i) * vecb;

+ for (i = 0; i < oprsz; i += sizeof(uint16_t)) {

+ *(uint16_t *)(d + i) = *(uint16_t *)(a + i) * vecb;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_muls16)(void *d, void *a, uint64_t b, uint32_t desc)

void HELPER(gvec_muls32)(void *d, void *a, uint64_t b, uint32_t desc)

{

intptr_t oprsz = simd_oprsz(desc);

- vec32 vecb = (vec32)DUP4(b);

+ uint32_t vecb = (uint32_t)DUP4(b);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec32)) {

- *(vec32 *)(d + i) = *(vec32 *)(a + i) * vecb;

+ for (i = 0; i < oprsz; i += sizeof(uint32_t)) {

+ *(uint32_t *)(d + i) = *(uint32_t *)(a + i) * vecb;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_muls32)(void *d, void *a, uint64_t b, uint32_t desc)

void HELPER(gvec_muls64)(void *d, void *a, uint64_t b, uint32_t desc)

{

intptr_t oprsz = simd_oprsz(desc);

- vec64 vecb = (vec64)DUP2(b);

+ uint64_t vecb = (uint64_t)DUP2(b);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec64)) {

- *(vec64 *)(d + i) = *(vec64 *)(a + i) * vecb;

+ for (i = 0; i < oprsz; i += sizeof(uint64_t)) {

+ *(uint64_t *)(d + i) = *(uint64_t *)(a + i) * vecb;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_neg8)(void *d, void *a, uint32_t desc)

intptr_t oprsz = simd_oprsz(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec8)) {

- *(vec8 *)(d + i) = -*(vec8 *)(a + i);

+ for (i = 0; i < oprsz; i += sizeof(uint8_t)) {

+ *(uint8_t *)(d + i) = -*(uint8_t *)(a + i);

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_neg16)(void *d, void *a, uint32_t desc)

intptr_t oprsz = simd_oprsz(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec16)) {

- *(vec16 *)(d + i) = -*(vec16 *)(a + i);

+ for (i = 0; i < oprsz; i += sizeof(uint16_t)) {

+ *(uint16_t *)(d + i) = -*(uint16_t *)(a + i);

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_neg32)(void *d, void *a, uint32_t desc)

intptr_t oprsz = simd_oprsz(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec32)) {

- *(vec32 *)(d + i) = -*(vec32 *)(a + i);

+ for (i = 0; i < oprsz; i += sizeof(uint32_t)) {

+ *(uint32_t *)(d + i) = -*(uint32_t *)(a + i);

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_neg64)(void *d, void *a, uint32_t desc)

intptr_t oprsz = simd_oprsz(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec64)) {

- *(vec64 *)(d + i) = -*(vec64 *)(a + i);

+ for (i = 0; i < oprsz; i += sizeof(uint64_t)) {

+ *(uint64_t *)(d + i) = -*(uint64_t *)(a + i);

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_not)(void *d, void *a, uint32_t desc)

intptr_t oprsz = simd_oprsz(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec64)) {

- *(vec64 *)(d + i) = ~*(vec64 *)(a + i);

+ for (i = 0; i < oprsz; i += sizeof(uint64_t)) {

+ *(uint64_t *)(d + i) = ~*(uint64_t *)(a + i);

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_and)(void *d, void *a, void *b, uint32_t desc)

intptr_t oprsz = simd_oprsz(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec64)) {

- *(vec64 *)(d + i) = *(vec64 *)(a + i) & *(vec64 *)(b + i);

+ for (i = 0; i < oprsz; i += sizeof(uint64_t)) {

+ *(uint64_t *)(d + i) = *(uint64_t *)(a + i) & *(uint64_t *)(b + i);

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_or)(void *d, void *a, void *b, uint32_t desc)

intptr_t oprsz = simd_oprsz(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec64)) {

- *(vec64 *)(d + i) = *(vec64 *)(a + i) | *(vec64 *)(b + i);

+ for (i = 0; i < oprsz; i += sizeof(uint64_t)) {

+ *(uint64_t *)(d + i) = *(uint64_t *)(a + i) | *(uint64_t *)(b + i);

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_xor)(void *d, void *a, void *b, uint32_t desc)

intptr_t oprsz = simd_oprsz(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec64)) {

- *(vec64 *)(d + i) = *(vec64 *)(a + i) ^ *(vec64 *)(b + i);

+ for (i = 0; i < oprsz; i += sizeof(uint64_t)) {

+ *(uint64_t *)(d + i) = *(uint64_t *)(a + i) ^ *(uint64_t *)(b + i);

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_andc)(void *d, void *a, void *b, uint32_t desc)

intptr_t oprsz = simd_oprsz(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec64)) {

- *(vec64 *)(d + i) = *(vec64 *)(a + i) &~ *(vec64 *)(b + i);

+ for (i = 0; i < oprsz; i += sizeof(uint64_t)) {

+ *(uint64_t *)(d + i) = *(uint64_t *)(a + i) &~ *(uint64_t *)(b + i);

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_orc)(void *d, void *a, void *b, uint32_t desc)

intptr_t oprsz = simd_oprsz(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec64)) {

- *(vec64 *)(d + i) = *(vec64 *)(a + i) |~ *(vec64 *)(b + i);

+ for (i = 0; i < oprsz; i += sizeof(uint64_t)) {

+ *(uint64_t *)(d + i) = *(uint64_t *)(a + i) |~ *(uint64_t *)(b + i);

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_nand)(void *d, void *a, void *b, uint32_t desc)

intptr_t oprsz = simd_oprsz(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec64)) {

- *(vec64 *)(d + i) = ~(*(vec64 *)(a + i) & *(vec64 *)(b + i));

+ for (i = 0; i < oprsz; i += sizeof(uint64_t)) {

+ *(uint64_t *)(d + i) = ~(*(uint64_t *)(a + i) & *(uint64_t *)(b + i));

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_nor)(void *d, void *a, void *b, uint32_t desc)

intptr_t oprsz = simd_oprsz(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec64)) {

- *(vec64 *)(d + i) = ~(*(vec64 *)(a + i) | *(vec64 *)(b + i));

+ for (i = 0; i < oprsz; i += sizeof(uint64_t)) {

+ *(uint64_t *)(d + i) = ~(*(uint64_t *)(a + i) | *(uint64_t *)(b + i));

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_eqv)(void *d, void *a, void *b, uint32_t desc)

intptr_t oprsz = simd_oprsz(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec64)) {

- *(vec64 *)(d + i) = ~(*(vec64 *)(a + i) ^ *(vec64 *)(b + i));

+ for (i = 0; i < oprsz; i += sizeof(uint64_t)) {

+ *(uint64_t *)(d + i) = ~(*(uint64_t *)(a + i) ^ *(uint64_t *)(b + i));

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_eqv)(void *d, void *a, void *b, uint32_t desc)

void HELPER(gvec_ands)(void *d, void *a, uint64_t b, uint32_t desc)

{

intptr_t oprsz = simd_oprsz(desc);

- vec64 vecb = (vec64)DUP2(b);

+ uint64_t vecb = (uint64_t)DUP2(b);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec64)) {

- *(vec64 *)(d + i) = *(vec64 *)(a + i) & vecb;

+ for (i = 0; i < oprsz; i += sizeof(uint64_t)) {

+ *(uint64_t *)(d + i) = *(uint64_t *)(a + i) & vecb;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_ands)(void *d, void *a, uint64_t b, uint32_t desc)

void HELPER(gvec_xors)(void *d, void *a, uint64_t b, uint32_t desc)

{

intptr_t oprsz = simd_oprsz(desc);

- vec64 vecb = (vec64)DUP2(b);

+ uint64_t vecb = (uint64_t)DUP2(b);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec64)) {

- *(vec64 *)(d + i) = *(vec64 *)(a + i) ^ vecb;

+ for (i = 0; i < oprsz; i += sizeof(uint64_t)) {

+ *(uint64_t *)(d + i) = *(uint64_t *)(a + i) ^ vecb;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_xors)(void *d, void *a, uint64_t b, uint32_t desc)

void HELPER(gvec_ors)(void *d, void *a, uint64_t b, uint32_t desc)

{

intptr_t oprsz = simd_oprsz(desc);

- vec64 vecb = (vec64)DUP2(b);

+ uint64_t vecb = (uint64_t)DUP2(b);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec64)) {

- *(vec64 *)(d + i) = *(vec64 *)(a + i) | vecb;

+ for (i = 0; i < oprsz; i += sizeof(uint64_t)) {

+ *(uint64_t *)(d + i) = *(uint64_t *)(a + i) | vecb;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_shl8i)(void *d, void *a, uint32_t desc)

int shift = simd_data(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec8)) {

- *(vec8 *)(d + i) = *(vec8 *)(a + i) << shift;

+ for (i = 0; i < oprsz; i += sizeof(uint8_t)) {

+ *(uint8_t *)(d + i) = *(uint8_t *)(a + i) << shift;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_shl16i)(void *d, void *a, uint32_t desc)

int shift = simd_data(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec16)) {

- *(vec16 *)(d + i) = *(vec16 *)(a + i) << shift;

+ for (i = 0; i < oprsz; i += sizeof(uint16_t)) {

+ *(uint16_t *)(d + i) = *(uint16_t *)(a + i) << shift;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_shl32i)(void *d, void *a, uint32_t desc)

int shift = simd_data(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec32)) {

- *(vec32 *)(d + i) = *(vec32 *)(a + i) << shift;

+ for (i = 0; i < oprsz; i += sizeof(uint32_t)) {

+ *(uint32_t *)(d + i) = *(uint32_t *)(a + i) << shift;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_shl64i)(void *d, void *a, uint32_t desc)

int shift = simd_data(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec64)) {

- *(vec64 *)(d + i) = *(vec64 *)(a + i) << shift;

+ for (i = 0; i < oprsz; i += sizeof(uint64_t)) {

+ *(uint64_t *)(d + i) = *(uint64_t *)(a + i) << shift;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_shr8i)(void *d, void *a, uint32_t desc)

int shift = simd_data(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec8)) {

- *(vec8 *)(d + i) = *(vec8 *)(a + i) >> shift;

+ for (i = 0; i < oprsz; i += sizeof(uint8_t)) {

+ *(uint8_t *)(d + i) = *(uint8_t *)(a + i) >> shift;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_shr16i)(void *d, void *a, uint32_t desc)

int shift = simd_data(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec16)) {

- *(vec16 *)(d + i) = *(vec16 *)(a + i) >> shift;

+ for (i = 0; i < oprsz; i += sizeof(uint16_t)) {

+ *(uint16_t *)(d + i) = *(uint16_t *)(a + i) >> shift;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_shr32i)(void *d, void *a, uint32_t desc)

int shift = simd_data(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec32)) {

- *(vec32 *)(d + i) = *(vec32 *)(a + i) >> shift;

+ for (i = 0; i < oprsz; i += sizeof(uint32_t)) {

+ *(uint32_t *)(d + i) = *(uint32_t *)(a + i) >> shift;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_shr64i)(void *d, void *a, uint32_t desc)

int shift = simd_data(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec64)) {

- *(vec64 *)(d + i) = *(vec64 *)(a + i) >> shift;

+ for (i = 0; i < oprsz; i += sizeof(uint64_t)) {

+ *(uint64_t *)(d + i) = *(uint64_t *)(a + i) >> shift;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_sar8i)(void *d, void *a, uint32_t desc)

int shift = simd_data(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec8)) {

- *(svec8 *)(d + i) = *(svec8 *)(a + i) >> shift;

+ for (i = 0; i < oprsz; i += sizeof(uint8_t)) {

+ *(int8_t *)(d + i) = *(int8_t *)(a + i) >> shift;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_sar16i)(void *d, void *a, uint32_t desc)

int shift = simd_data(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec16)) {

- *(svec16 *)(d + i) = *(svec16 *)(a + i) >> shift;

+ for (i = 0; i < oprsz; i += sizeof(uint16_t)) {

+ *(int16_t *)(d + i) = *(int16_t *)(a + i) >> shift;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_sar32i)(void *d, void *a, uint32_t desc)

int shift = simd_data(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec32)) {

- *(svec32 *)(d + i) = *(svec32 *)(a + i) >> shift;

+ for (i = 0; i < oprsz; i += sizeof(uint32_t)) {

+ *(int32_t *)(d + i) = *(int32_t *)(a + i) >> shift;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_sar64i)(void *d, void *a, uint32_t desc)

int shift = simd_data(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec64)) {

- *(svec64 *)(d + i) = *(svec64 *)(a + i) >> shift;

+ for (i = 0; i < oprsz; i += sizeof(uint64_t)) {

+ *(int64_t *)(d + i) = *(int64_t *)(a + i) >> shift;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(NAME)(void *d, void *a, void *b, uint32_t desc) \

}

#define DO_CMP2(SZ) \

- DO_CMP1(gvec_eq##SZ, vec##SZ, ==) \

- DO_CMP1(gvec_ne##SZ, vec##SZ, !=) \

- DO_CMP1(gvec_lt##SZ, svec##SZ, <) \

- DO_CMP1(gvec_le##SZ, svec##SZ, <=) \

- DO_CMP1(gvec_ltu##SZ, vec##SZ, <) \

- DO_CMP1(gvec_leu##SZ, vec##SZ, <=)

+ DO_CMP1(gvec_eq##SZ, uint##SZ##_t, ==) \

+ DO_CMP1(gvec_ne##SZ, uint##SZ##_t, !=) \

+ DO_CMP1(gvec_lt##SZ, int##SZ##_t, <) \

+ DO_CMP1(gvec_le##SZ, int##SZ##_t, <=) \

+ DO_CMP1(gvec_ltu##SZ, uint##SZ##_t, <) \

+ DO_CMP1(gvec_leu##SZ, uint##SZ##_t, <=)

DO_CMP2(8)

DO_CMP2(16)

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_bitsel)(void *d, void *a, void *b, void *c, uint32_t desc)

intptr_t oprsz = simd_oprsz(desc);

intptr_t i;

- for (i = 0; i < oprsz; i += sizeof(vec64)) {

- vec64 aa = *(vec64 *)(a + i);

- vec64 bb = *(vec64 *)(b + i);

- vec64 cc = *(vec64 *)(c + i);

- *(vec64 *)(d + i) = (bb & aa) | (cc & ~aa);

+ for (i = 0; i < oprsz; i += sizeof(uint64_t)) {

+ uint64_t aa = *(uint64_t *)(a + i);

+ uint64_t bb = *(uint64_t *)(b + i);

+ uint64_t cc = *(uint64_t *)(c + i);

+ *(uint64_t *)(d + i) = (bb & aa) | (cc & ~aa);

}

clear_high(d, oprsz, desc);

}

2.20.1

Partial cleanup from the CONFIG_VECTOR16 removal.

Replace the DUP* expansions with the scalar argument.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

---

accel/tcg/tcg-runtime-gvec.c | 50 +++++++++++-------------------------

1 file changed, 15 insertions(+), 35 deletions(-)

diff --git a/accel/tcg/tcg-runtime-gvec.c b/accel/tcg/tcg-runtime-gvec.c

index XXXXXXX..XXXXXXX 100644

--- a/accel/tcg/tcg-runtime-gvec.c

+++ b/accel/tcg/tcg-runtime-gvec.c

@@ -XXX,XX +XXX,XX @@

#include "tcg/tcg-gvec-desc.h"

-#define DUP16(X) X

-#define DUP8(X) X

-#define DUP4(X) X

-#define DUP2(X) X

-

static inline void clear_high(void *d, intptr_t oprsz, uint32_t desc)

{

intptr_t maxsz = simd_maxsz(desc);

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_add64)(void *d, void *a, void *b, uint32_t desc)

void HELPER(gvec_adds8)(void *d, void *a, uint64_t b, uint32_t desc)

{

intptr_t oprsz = simd_oprsz(desc);

- uint8_t vecb = (uint8_t)DUP16(b);

intptr_t i;

for (i = 0; i < oprsz; i += sizeof(uint8_t)) {

- *(uint8_t *)(d + i) = *(uint8_t *)(a + i) + vecb;

+ *(uint8_t *)(d + i) = *(uint8_t *)(a + i) + (uint8_t)b;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_adds8)(void *d, void *a, uint64_t b, uint32_t desc)

void HELPER(gvec_adds16)(void *d, void *a, uint64_t b, uint32_t desc)

{

intptr_t oprsz = simd_oprsz(desc);

- uint16_t vecb = (uint16_t)DUP8(b);

intptr_t i;

for (i = 0; i < oprsz; i += sizeof(uint16_t)) {

- *(uint16_t *)(d + i) = *(uint16_t *)(a + i) + vecb;

+ *(uint16_t *)(d + i) = *(uint16_t *)(a + i) + (uint16_t)b;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_adds16)(void *d, void *a, uint64_t b, uint32_t desc)

void HELPER(gvec_adds32)(void *d, void *a, uint64_t b, uint32_t desc)

{

intptr_t oprsz = simd_oprsz(desc);

- uint32_t vecb = (uint32_t)DUP4(b);

intptr_t i;

for (i = 0; i < oprsz; i += sizeof(uint32_t)) {

- *(uint32_t *)(d + i) = *(uint32_t *)(a + i) + vecb;

+ *(uint32_t *)(d + i) = *(uint32_t *)(a + i) + (uint32_t)b;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_adds32)(void *d, void *a, uint64_t b, uint32_t desc)

void HELPER(gvec_adds64)(void *d, void *a, uint64_t b, uint32_t desc)

{

intptr_t oprsz = simd_oprsz(desc);

- uint64_t vecb = (uint64_t)DUP2(b);

intptr_t i;

for (i = 0; i < oprsz; i += sizeof(uint64_t)) {

- *(uint64_t *)(d + i) = *(uint64_t *)(a + i) + vecb;

+ *(uint64_t *)(d + i) = *(uint64_t *)(a + i) + b;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_sub64)(void *d, void *a, void *b, uint32_t desc)

void HELPER(gvec_subs8)(void *d, void *a, uint64_t b, uint32_t desc)

{

intptr_t oprsz = simd_oprsz(desc);

- uint8_t vecb = (uint8_t)DUP16(b);

intptr_t i;

for (i = 0; i < oprsz; i += sizeof(uint8_t)) {

- *(uint8_t *)(d + i) = *(uint8_t *)(a + i) - vecb;

+ *(uint8_t *)(d + i) = *(uint8_t *)(a + i) - (uint8_t)b;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_subs8)(void *d, void *a, uint64_t b, uint32_t desc)

void HELPER(gvec_subs16)(void *d, void *a, uint64_t b, uint32_t desc)

{

intptr_t oprsz = simd_oprsz(desc);

- uint16_t vecb = (uint16_t)DUP8(b);

intptr_t i;

for (i = 0; i < oprsz; i += sizeof(uint16_t)) {

- *(uint16_t *)(d + i) = *(uint16_t *)(a + i) - vecb;

+ *(uint16_t *)(d + i) = *(uint16_t *)(a + i) - (uint16_t)b;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_subs16)(void *d, void *a, uint64_t b, uint32_t desc)

void HELPER(gvec_subs32)(void *d, void *a, uint64_t b, uint32_t desc)

{

intptr_t oprsz = simd_oprsz(desc);

- uint32_t vecb = (uint32_t)DUP4(b);

intptr_t i;

for (i = 0; i < oprsz; i += sizeof(uint32_t)) {

- *(uint32_t *)(d + i) = *(uint32_t *)(a + i) - vecb;

+ *(uint32_t *)(d + i) = *(uint32_t *)(a + i) - (uint32_t)b;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_subs32)(void *d, void *a, uint64_t b, uint32_t desc)

void HELPER(gvec_subs64)(void *d, void *a, uint64_t b, uint32_t desc)

{

intptr_t oprsz = simd_oprsz(desc);

- uint64_t vecb = (uint64_t)DUP2(b);

intptr_t i;

for (i = 0; i < oprsz; i += sizeof(uint64_t)) {

- *(uint64_t *)(d + i) = *(uint64_t *)(a + i) - vecb;

+ *(uint64_t *)(d + i) = *(uint64_t *)(a + i) - b;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_mul64)(void *d, void *a, void *b, uint32_t desc)

void HELPER(gvec_muls8)(void *d, void *a, uint64_t b, uint32_t desc)

{

intptr_t oprsz = simd_oprsz(desc);

- uint8_t vecb = (uint8_t)DUP16(b);

intptr_t i;

for (i = 0; i < oprsz; i += sizeof(uint8_t)) {

- *(uint8_t *)(d + i) = *(uint8_t *)(a + i) * vecb;

+ *(uint8_t *)(d + i) = *(uint8_t *)(a + i) * (uint8_t)b;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_muls8)(void *d, void *a, uint64_t b, uint32_t desc)

void HELPER(gvec_muls16)(void *d, void *a, uint64_t b, uint32_t desc)

{

intptr_t oprsz = simd_oprsz(desc);

- uint16_t vecb = (uint16_t)DUP8(b);

intptr_t i;

for (i = 0; i < oprsz; i += sizeof(uint16_t)) {

- *(uint16_t *)(d + i) = *(uint16_t *)(a + i) * vecb;

+ *(uint16_t *)(d + i) = *(uint16_t *)(a + i) * (uint16_t)b;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_muls16)(void *d, void *a, uint64_t b, uint32_t desc)

void HELPER(gvec_muls32)(void *d, void *a, uint64_t b, uint32_t desc)

{

intptr_t oprsz = simd_oprsz(desc);

- uint32_t vecb = (uint32_t)DUP4(b);

intptr_t i;

for (i = 0; i < oprsz; i += sizeof(uint32_t)) {

- *(uint32_t *)(d + i) = *(uint32_t *)(a + i) * vecb;

+ *(uint32_t *)(d + i) = *(uint32_t *)(a + i) * (uint32_t)b;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_muls32)(void *d, void *a, uint64_t b, uint32_t desc)

void HELPER(gvec_muls64)(void *d, void *a, uint64_t b, uint32_t desc)

{

intptr_t oprsz = simd_oprsz(desc);

- uint64_t vecb = (uint64_t)DUP2(b);

intptr_t i;

for (i = 0; i < oprsz; i += sizeof(uint64_t)) {

- *(uint64_t *)(d + i) = *(uint64_t *)(a + i) * vecb;

+ *(uint64_t *)(d + i) = *(uint64_t *)(a + i) * b;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_eqv)(void *d, void *a, void *b, uint32_t desc)

void HELPER(gvec_ands)(void *d, void *a, uint64_t b, uint32_t desc)

{

intptr_t oprsz = simd_oprsz(desc);

- uint64_t vecb = (uint64_t)DUP2(b);

intptr_t i;

for (i = 0; i < oprsz; i += sizeof(uint64_t)) {

- *(uint64_t *)(d + i) = *(uint64_t *)(a + i) & vecb;

+ *(uint64_t *)(d + i) = *(uint64_t *)(a + i) & b;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_ands)(void *d, void *a, uint64_t b, uint32_t desc)

void HELPER(gvec_xors)(void *d, void *a, uint64_t b, uint32_t desc)

{

intptr_t oprsz = simd_oprsz(desc);

- uint64_t vecb = (uint64_t)DUP2(b);

intptr_t i;

for (i = 0; i < oprsz; i += sizeof(uint64_t)) {

- *(uint64_t *)(d + i) = *(uint64_t *)(a + i) ^ vecb;

+ *(uint64_t *)(d + i) = *(uint64_t *)(a + i) ^ b;

}

clear_high(d, oprsz, desc);

}

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_xors)(void *d, void *a, uint64_t b, uint32_t desc)

void HELPER(gvec_ors)(void *d, void *a, uint64_t b, uint32_t desc)

{

intptr_t oprsz = simd_oprsz(desc);

- uint64_t vecb = (uint64_t)DUP2(b);

intptr_t i;

for (i = 0; i < oprsz; i += sizeof(uint64_t)) {

- *(uint64_t *)(d + i) = *(uint64_t *)(a + i) | vecb;

+ *(uint64_t *)(d + i) = *(uint64_t *)(a + i) | b;

}

clear_high(d, oprsz, desc);

}

--

2.20.1

Partial cleanup from the CONFIG_VECTOR16 removal.

Replace DO_CMP0 with its scalar expansion, a simple negation.

accel/tcg/tcg-runtime-gvec.c | 5 +----

1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/accel/tcg/tcg-runtime-gvec.c b/accel/tcg/tcg-runtime-gvec.c

--- a/accel/tcg/tcg-runtime-gvec.c

+++ b/accel/tcg/tcg-runtime-gvec.c

@@ -XXX,XX +XXX,XX @@ void HELPER(gvec_sar64v)(void *d, void *a, void *b, uint32_t desc)

clear_high(d, oprsz, desc);

}

-#define DO_CMP0(X) -(X)

-

#define DO_CMP1(NAME, TYPE, OP) \

void HELPER(NAME)(void *d, void *a, void *b, uint32_t desc) \

{ \

intptr_t oprsz = simd_oprsz(desc); \

intptr_t i; \

for (i = 0; i < oprsz; i += sizeof(TYPE)) { \

- *(TYPE *)(d + i) = DO_CMP0(*(TYPE *)(a + i) OP *(TYPE *)(b + i)); \

+ *(TYPE *)(d + i) = -(*(TYPE *)(a + i) OP *(TYPE *)(b + i)); \

} \

clear_high(d, oprsz, desc); \

}

@@ -XXX,XX +XXX,XX @@ DO_CMP2(16)

DO_CMP2(32)

DO_CMP2(64)

-#undef DO_CMP0

#undef DO_CMP1

#undef DO_CMP2

2.20.1