target/i386: Rewrite simple integer vector helpers

Rewrite the "simple" vector integer helpers in preperation for AVX support.

While the current code is able to use the same prototype for unary
(a = F(b)) and binary (a = F(b, c)) operations, future changes will cause
them to diverge.

No functional changes to existing helpers

Signed-off-by: Paul Brook <paul@nowt.org>
Message-Id: <20220424220204.2493824-12-paul@nowt.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paul Brook 2022-04-24 23:01:33 +01:00 committed by Paolo Bonzini
parent 18592d2ec2
commit ee04a3c86d

View File

@ -229,63 +229,36 @@ void glue(helper_pslldq, SUFFIX)(CPUX86State *env, Reg *d, Reg *c)
} }
#endif #endif
#define SSE_HELPER_B(name, F) \ #define SSE_HELPER_1(name, elem, num, F) \
void glue(name, SUFFIX)(CPUX86State *env, Reg *d, Reg *s) \ void glue(name, SUFFIX)(CPUX86State *env, Reg *d, Reg *s) \
{ \ { \
d->B(0) = F(d->B(0), s->B(0)); \ int n = num; \
d->B(1) = F(d->B(1), s->B(1)); \ for (int i = 0; i < n; i++) { \
d->B(2) = F(d->B(2), s->B(2)); \ d->elem(i) = F(s->elem(i)); \
d->B(3) = F(d->B(3), s->B(3)); \ } \
d->B(4) = F(d->B(4), s->B(4)); \ }
d->B(5) = F(d->B(5), s->B(5)); \
d->B(6) = F(d->B(6), s->B(6)); \ #define SSE_HELPER_2(name, elem, num, F) \
d->B(7) = F(d->B(7), s->B(7)); \ void glue(name, SUFFIX)(CPUX86State *env, Reg *d, Reg *s) \
XMM_ONLY( \ { \
d->B(8) = F(d->B(8), s->B(8)); \ Reg *v = d; \
d->B(9) = F(d->B(9), s->B(9)); \ int n = num; \
d->B(10) = F(d->B(10), s->B(10)); \ for (int i = 0; i < n; i++) { \
d->B(11) = F(d->B(11), s->B(11)); \ d->elem(i) = F(v->elem(i), s->elem(i)); \
d->B(12) = F(d->B(12), s->B(12)); \ } \
d->B(13) = F(d->B(13), s->B(13)); \ }
d->B(14) = F(d->B(14), s->B(14)); \
d->B(15) = F(d->B(15), s->B(15)); \ #define SSE_HELPER_B(name, F) \
) \ SSE_HELPER_2(name, B, 8 << SHIFT, F)
}
#define SSE_HELPER_W(name, F) \ #define SSE_HELPER_W(name, F) \
void glue(name, SUFFIX)(CPUX86State *env, Reg *d, Reg *s) \ SSE_HELPER_2(name, W, 4 << SHIFT, F)
{ \
d->W(0) = F(d->W(0), s->W(0)); \
d->W(1) = F(d->W(1), s->W(1)); \
d->W(2) = F(d->W(2), s->W(2)); \
d->W(3) = F(d->W(3), s->W(3)); \
XMM_ONLY( \
d->W(4) = F(d->W(4), s->W(4)); \
d->W(5) = F(d->W(5), s->W(5)); \
d->W(6) = F(d->W(6), s->W(6)); \
d->W(7) = F(d->W(7), s->W(7)); \
) \
}
#define SSE_HELPER_L(name, F) \ #define SSE_HELPER_L(name, F) \
void glue(name, SUFFIX)(CPUX86State *env, Reg *d, Reg *s) \ SSE_HELPER_2(name, L, 2 << SHIFT, F)
{ \
d->L(0) = F(d->L(0), s->L(0)); \
d->L(1) = F(d->L(1), s->L(1)); \
XMM_ONLY( \
d->L(2) = F(d->L(2), s->L(2)); \
d->L(3) = F(d->L(3), s->L(3)); \
) \
}
#define SSE_HELPER_Q(name, F) \ #define SSE_HELPER_Q(name, F) \
void glue(name, SUFFIX)(CPUX86State *env, Reg *d, Reg *s) \ SSE_HELPER_2(name, Q, 1 << SHIFT, F)
{ \
d->Q(0) = F(d->Q(0), s->Q(0)); \
XMM_ONLY( \
d->Q(1) = F(d->Q(1), s->Q(1)); \
) \
}
#if SHIFT == 0 #if SHIFT == 0
static inline int satub(int x) static inline int satub(int x)
@ -1544,12 +1517,12 @@ void glue(helper_phsubsw, SUFFIX)(CPUX86State *env, Reg *d, Reg *s)
MOVE(*d, r); MOVE(*d, r);
} }
#define FABSB(_, x) (x > INT8_MAX ? -(int8_t)x : x) #define FABSB(x) (x > INT8_MAX ? -(int8_t)x : x)
#define FABSW(_, x) (x > INT16_MAX ? -(int16_t)x : x) #define FABSW(x) (x > INT16_MAX ? -(int16_t)x : x)
#define FABSL(_, x) (x > INT32_MAX ? -(int32_t)x : x) #define FABSL(x) (x > INT32_MAX ? -(int32_t)x : x)
SSE_HELPER_B(helper_pabsb, FABSB) SSE_HELPER_1(helper_pabsb, B, 8 << SHIFT, FABSB)
SSE_HELPER_W(helper_pabsw, FABSW) SSE_HELPER_1(helper_pabsw, W, 4 << SHIFT, FABSW)
SSE_HELPER_L(helper_pabsd, FABSL) SSE_HELPER_1(helper_pabsd, L, 2 << SHIFT, FABSL)
#define FMULHRSW(d, s) (((int16_t) d * (int16_t)s + 0x4000) >> 15) #define FMULHRSW(d, s) (((int16_t) d * (int16_t)s + 0x4000) >> 15)
SSE_HELPER_W(helper_pmulhrsw, FMULHRSW) SSE_HELPER_W(helper_pmulhrsw, FMULHRSW)