mirror of https://github.com/proxmox/mirror_qemu
* Fixes for s390x floating point vector instructions
-----BEGIN PGP SIGNATURE----- iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmLXq2oRHHRodXRoQHJl ZGhhdC5jb20ACgkQLtnXdP5wLbVZXA//TPtsWHVXe27FW4nKDXSVspOKZspTl625 u8412cqv6YVcAkwechNhI96kO5UsjQplkqC/TuSxbqv+zoNicUWe7gm7uF8h8qJI D7PkKolBNXrJ+U304x2LyWLaXvFW5hnJQneaALzsQYfI07i6RV0t8FZ4KfYBHFVu cmQ3MN5y/lmYBcN1bX+mTwgG5nuKKg78dIRiSFKa3CbT1F83LCQQEPNnOUSDIYnJ 8kQ+lOs3mRakPlsK4O91f+C2oP3z5ke6xst5Z37w76/V+jMNXIcoAaW09s0DUY+9 ycO+9iqCGGzVQlu+m3sLSbhNFqtiA/EhyRVOu+JpeZD3fV5HEzGhocXjtQgox7N6 1gu00Q+blMJXd1uKsWOOpZEluIhdfseiU218YKh02ckxxSPG2OrnJHve8hpUqYv3 z4ZNCG5N8LfMOJlx5A8xgV2Q0OZiwDgeSINQQcyVkfpXGQJxVbdHfjr+VWVHRp22 UdoCzxuDF8PQDj73V9bvq/8cBppxPcHaNpgHQ8dO2VOQSs1RN+c04TkUcy5loVrh F13AU0pGGuaIRwGN8917kNoJlKGKV5jhoKcU/lZQUsq8AwAuRtFmsKXYJkOOKVxI 8NrOIBdMNrOtNBuxU6IglLQHUD38JMBwzZAO5+SMQqNHXKwfu3Z8tfImXDZyfKbX 1qidiHLY8WM= =9wL6 -----END PGP SIGNATURE----- Merge tag 'pull-request-2022-07-20' of https://gitlab.com/thuth/qemu into staging * Fixes for s390x floating point vector instructions # gpg: Signature made Wed 20 Jul 2022 08:14:50 BST # gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5 # gpg: issuer "thuth@redhat.com" # gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full] # gpg: aka "Thomas Huth <thuth@redhat.com>" [full] # gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full] # gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown] # Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5 * tag 'pull-request-2022-07-20' of https://gitlab.com/thuth/qemu: tests/tcg/s390x: test signed vfmin/vfmax target/s390x: fix NaN propagation rules target/s390x: fix handling of zeroes in vfmin/vfmax Signed-off-by: Peter Maydell <peter.maydell@linaro.org> # Conflicts: # fpu/softfloat-specialize.c.incmaster
Peter Maydell
commit
f45fd24c90
|
|
@ -390,8 +390,8 @@ bool float32_is_signaling_nan(float32 a_, float_status *status)
|
|||
static int pickNaN(FloatClass a_cls, FloatClass b_cls,
|
||||
bool aIsLargerSignificand, float_status *status)
|
||||
{
|
||||
#if defined(TARGET_ARM) || defined(TARGET_MIPS) || defined(TARGET_HPPA) \
|
||||
|| defined(TARGET_LOONGARCH64)
|
||||
#if defined(TARGET_ARM) || defined(TARGET_MIPS) || defined(TARGET_HPPA) || \
|
||||
defined(TARGET_LOONGARCH64) || defined(TARGET_S390X)
|
||||
/* ARM mandated NaN propagation rules (see FPProcessNaNs()), take
|
||||
* the first of:
|
||||
* 1. A if it is signaling
|
||||
|
|
|
|||
|
|
@ -824,7 +824,7 @@ static S390MinMaxRes vfmin_res(uint16_t dcmask_a, uint16_t dcmask_b,
|
|||
default:
|
||||
g_assert_not_reached();
|
||||
}
|
||||
} else if (unlikely(dcmask_a & dcmask_b & DCMASK_ZERO)) {
|
||||
} else if (unlikely((dcmask_a & DCMASK_ZERO) && (dcmask_b & DCMASK_ZERO))) {
|
||||
switch (type) {
|
||||
case S390_MINMAX_TYPE_JAVA:
|
||||
return neg_a ? S390_MINMAX_RES_A : S390_MINMAX_RES_B;
|
||||
|
|
@ -874,7 +874,7 @@ static S390MinMaxRes vfmax_res(uint16_t dcmask_a, uint16_t dcmask_b,
|
|||
default:
|
||||
g_assert_not_reached();
|
||||
}
|
||||
} else if (unlikely(dcmask_a & dcmask_b & DCMASK_ZERO)) {
|
||||
} else if (unlikely((dcmask_a & DCMASK_ZERO) && (dcmask_b & DCMASK_ZERO))) {
|
||||
const bool neg_a = dcmask_a & DCMASK_NEGATIVE;
|
||||
|
||||
switch (type) {
|
||||
|
|
|
|||
|
|
@ -17,6 +17,13 @@ TESTS+=trap
|
|||
TESTS+=signals-s390x
|
||||
TESTS+=branch-relative-long
|
||||
|
||||
Z14_TESTS=vfminmax
|
||||
vfminmax: LDFLAGS+=-lm
|
||||
$(Z14_TESTS): CFLAGS+=-march=z14 -O2
|
||||
|
||||
TESTS+=$(if $(shell $(CC) -march=z14 -S -o /dev/null -xc /dev/null \
|
||||
>/dev/null 2>&1 && echo OK),$(Z14_TESTS))
|
||||
|
||||
VECTOR_TESTS=vxeh2_vs
|
||||
VECTOR_TESTS+=vxeh2_vcvt
|
||||
VECTOR_TESTS+=vxeh2_vlstr
|
||||
|
|
|
|||
|
|
@ -0,0 +1,411 @@
|
|||
#define _GNU_SOURCE
|
||||
#include <fenv.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
/*
|
||||
* vfmin/vfmax instruction execution.
|
||||
*/
|
||||
#define VFMIN 0xEE
|
||||
#define VFMAX 0xEF
|
||||
|
||||
extern char insn[6];
|
||||
asm(".pushsection .rwx,\"awx\",@progbits\n"
|
||||
".globl insn\n"
|
||||
/* e7 89 a0 00 2e ef */
|
||||
"insn: vfmaxsb %v24,%v25,%v26,0\n"
|
||||
".popsection\n");
|
||||
|
||||
static void vfminmax(unsigned int op,
|
||||
unsigned int m4, unsigned int m5, unsigned int m6,
|
||||
void *v1, const void *v2, const void *v3)
|
||||
{
|
||||
insn[3] = (m6 << 4) | m5;
|
||||
insn[4] = (m4 << 4) | 0x0e;
|
||||
insn[5] = op;
|
||||
|
||||
asm("vl %%v25,%[v2]\n"
|
||||
"vl %%v26,%[v3]\n"
|
||||
"ex 0,%[insn]\n"
|
||||
"vst %%v24,%[v1]\n"
|
||||
: [v1] "=m" (*(char (*)[16])v1)
|
||||
: [v2] "m" (*(char (*)[16])v2)
|
||||
, [v3] "m" (*(char (*)[16])v3)
|
||||
, [insn] "m"(insn)
|
||||
: "v24", "v25", "v26");
|
||||
}
|
||||
|
||||
/*
|
||||
* Floating-point value classes.
|
||||
*/
|
||||
#define N_FORMATS 3
|
||||
#define N_SIGNED_CLASSES 8
|
||||
static const size_t float_sizes[N_FORMATS] = {
|
||||
/* M4 == 2: short */ 4,
|
||||
/* M4 == 3: long */ 8,
|
||||
/* M4 == 4: extended */ 16,
|
||||
};
|
||||
static const size_t e_bits[N_FORMATS] = {
|
||||
/* M4 == 2: short */ 8,
|
||||
/* M4 == 3: long */ 11,
|
||||
/* M4 == 4: extended */ 15,
|
||||
};
|
||||
static const unsigned char signed_floats[N_FORMATS][N_SIGNED_CLASSES][2][16] = {
|
||||
/* M4 == 2: short */
|
||||
{
|
||||
/* -inf */ {{0xff, 0x80, 0x00, 0x00},
|
||||
{0xff, 0x80, 0x00, 0x00}},
|
||||
/* -Fn */ {{0xc2, 0x28, 0x00, 0x00},
|
||||
{0xc2, 0x29, 0x00, 0x00}},
|
||||
/* -0 */ {{0x80, 0x00, 0x00, 0x00},
|
||||
{0x80, 0x00, 0x00, 0x00}},
|
||||
/* +0 */ {{0x00, 0x00, 0x00, 0x00},
|
||||
{0x00, 0x00, 0x00, 0x00}},
|
||||
/* +Fn */ {{0x42, 0x28, 0x00, 0x00},
|
||||
{0x42, 0x2a, 0x00, 0x00}},
|
||||
/* +inf */ {{0x7f, 0x80, 0x00, 0x00},
|
||||
{0x7f, 0x80, 0x00, 0x00}},
|
||||
/* QNaN */ {{0x7f, 0xff, 0xff, 0xff},
|
||||
{0x7f, 0xff, 0xff, 0xfe}},
|
||||
/* SNaN */ {{0x7f, 0xbf, 0xff, 0xff},
|
||||
{0x7f, 0xbf, 0xff, 0xfd}},
|
||||
},
|
||||
|
||||
/* M4 == 3: long */
|
||||
{
|
||||
/* -inf */ {{0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
|
||||
{0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}},
|
||||
/* -Fn */ {{0xc0, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
|
||||
{0xc0, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}},
|
||||
/* -0 */ {{0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
|
||||
{0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}},
|
||||
/* +0 */ {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
|
||||
{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}},
|
||||
/* +Fn */ {{0x40, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
|
||||
{0x40, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}},
|
||||
/* +inf */ {{0x7f, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
|
||||
{0x7f, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}},
|
||||
/* QNaN */ {{0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
|
||||
{0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe}},
|
||||
/* SNaN */ {{0x7f, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
|
||||
{0x7f, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd}},
|
||||
},
|
||||
|
||||
/* M4 == 4: extended */
|
||||
{
|
||||
/* -inf */ {{0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
|
||||
{0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}},
|
||||
/* -Fn */ {{0xc0, 0x04, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
|
||||
{0xc0, 0x04, 0x51, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}},
|
||||
/* -0 */ {{0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
|
||||
{0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}},
|
||||
/* +0 */ {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
|
||||
{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}},
|
||||
/* +Fn */ {{0x40, 0x04, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
|
||||
{0x40, 0x04, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}},
|
||||
/* +inf */ {{0x7f, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
|
||||
{0x7f, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}},
|
||||
/* QNaN */ {{0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
|
||||
{0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe}},
|
||||
/* SNaN */ {{0x7f, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
|
||||
{0x7f, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd}},
|
||||
},
|
||||
};
|
||||
|
||||
/*
|
||||
* PoP tables as close to the original as possible.
|
||||
*/
|
||||
struct signed_test {
|
||||
int op;
|
||||
int m6;
|
||||
const char *m6_desc;
|
||||
const char *table[N_SIGNED_CLASSES][N_SIGNED_CLASSES];
|
||||
} signed_tests[] = {
|
||||
{
|
||||
.op = VFMIN,
|
||||
.m6 = 0,
|
||||
.m6_desc = "IEEE MinNum",
|
||||
.table = {
|
||||
/* -inf -Fn -0 +0 +Fn +inf QNaN SNaN */
|
||||
{/* -inf */ "T(a)", "T(a)", "T(a)", "T(a)", "T(a)", "T(a)", "T(a)", "Xi: T(b*)"},
|
||||
{/* -Fn */ "T(b)", "T(M(a,b))", "T(a)", "T(a)", "T(a)", "T(a)", "T(a)", "Xi: T(b*)"},
|
||||
{/* -0 */ "T(b)", "T(b)", "T(a)", "T(a)", "T(a)", "T(a)", "T(a)", "Xi: T(b*)"},
|
||||
{/* +0 */ "T(b)", "T(b)", "T(b)", "T(a)", "T(a)", "T(a)", "T(a)", "Xi: T(b*)"},
|
||||
{/* +Fn */ "T(b)", "T(b)", "T(b)", "T(b)", "T(M(a,b))", "T(a)", "T(a)", "Xi: T(b*)"},
|
||||
{/* +inf */ "T(b)", "T(b)", "T(b)", "T(b)", "T(b)", "T(a)", "T(a)", "Xi: T(b*)"},
|
||||
{/* QNaN */ "T(b)", "T(b)", "T(b)", "T(b)", "T(b)", "T(b)", "T(a)", "Xi: T(b*)"},
|
||||
{/* SNaN */ "Xi: T(a*)", "Xi: T(a*)", "Xi: T(a*)", "Xi: T(a*)", "Xi: T(a*)", "Xi: T(a*)", "Xi: T(a*)", "Xi: T(a*)"},
|
||||
},
|
||||
},
|
||||
{
|
||||
.op = VFMIN,
|
||||
.m6 = 1,
|
||||
.m6_desc = "JAVA Math.Min()",
|
||||
.table = {
|
||||
/* -inf -Fn -0 +0 +Fn +inf QNaN SNaN */
|
||||
{/* -inf */ "T(b)", "T(a)", "T(a)", "T(a)", "T(a)", "T(a)", "T(b)", "Xi: T(b*)"},
|
||||
{/* -Fn */ "T(b)", "T(M(a,b))", "T(a)", "T(a)", "T(a)", "T(a)", "T(b)", "Xi: T(b*)"},
|
||||
{/* -0 */ "T(b)", "T(b)", "T(b)", "T(a)", "T(a)", "T(a)", "T(b)", "Xi: T(b*)"},
|
||||
{/* +0 */ "T(b)", "T(b)", "T(b)", "T(b)", "T(a)", "T(a)", "T(b)", "Xi: T(b*)"},
|
||||
{/* +Fn */ "T(b)", "T(b)", "T(b)", "T(b)", "T(M(a,b))", "T(a)", "T(b)", "Xi: T(b*)"},
|
||||
{/* +inf */ "T(b)", "T(b)", "T(b)", "T(b)", "T(b)", "T(b)", "T(b)", "Xi: T(b*)"},
|
||||
{/* QNaN */ "T(a)", "T(a)", "T(a)", "T(a)", "T(a)", "T(a)", "T(a)", "Xi: T(b*)"},
|
||||
{/* SNaN */ "Xi: T(a*)", "Xi: T(a*)", "Xi: T(a*)", "Xi: T(a*)", "Xi: T(a*)", "Xi: T(a*)", "Xi: T(a*)", "Xi: T(a*)"},
|
||||
},
|
||||
},
|
||||
{
|
||||
.op = VFMIN,
|
||||
.m6 = 2,
|
||||
.m6_desc = "C-style Min Macro",
|
||||
.table = {
|
||||
/* -inf -Fn -0 +0 +Fn +inf QNaN SNaN */
|
||||
{/* -inf */ "T(b)", "T(a)", "T(a)", "T(a)", "T(a)", "T(a)", "Xi: T(b)", "Xi: T(b)"},
|
||||
{/* -Fn */ "T(b)", "T(M(a,b))", "T(a)", "T(a)", "T(a)", "T(a)", "Xi: T(b)", "Xi: T(b)"},
|
||||
{/* -0 */ "T(b)", "T(b)", "T(b)", "T(b)", "T(a)", "T(a)", "Xi: T(b)", "Xi: T(b)"},
|
||||
{/* +0 */ "T(b)", "T(b)", "T(b)", "T(b)", "T(a)", "T(a)", "Xi: T(b)", "Xi: T(b)"},
|
||||
{/* +Fn */ "T(b)", "T(b)", "T(b)", "T(b)", "T(M(a,b))", "T(a)", "Xi: T(b)", "Xi: T(b)"},
|
||||
{/* +inf */ "T(b)", "T(b)", "T(b)", "T(b)", "T(b)", "T(a)", "Xi: T(b)", "Xi: T(b)"},
|
||||
{/* QNaN */ "Xi: T(b)", "Xi: T(b)", "Xi: T(b)", "Xi: T(b)", "Xi: T(b)", "Xi: T(b)", "Xi: T(b)", "Xi: T(b)"},
|
||||
{/* SNaN */ "Xi: T(b)", "Xi: T(b)", "Xi: T(b)", "Xi: T(b)", "Xi: T(b)", "Xi: T(b)", "Xi: T(b)", "Xi: T(b)"},
|
||||
},
|
||||
},
|
||||
{
|
||||
.op = VFMIN,
|
||||
.m6 = 3,
|
||||
.m6_desc = "C++ algorithm.min()",
|
||||
.table = {
|
||||
/* -inf -Fn -0 +0 +Fn +inf QNaN SNaN */
|
||||
{/* -inf */ "T(b)", "T(a)", "T(a)", "T(a)", "T(a)", "T(a)", "Xi: T(a)", "Xi: T(a)"},
|
||||
{/* -Fn */ "T(b)", "T(M(a,b))", "T(a)", "T(a)", "T(a)", "T(a)", "Xi: T(a)", "Xi: T(a)"},
|
||||
{/* -0 */ "T(b)", "T(b)", "T(a)", "T(a)", "T(a)", "T(a)", "Xi: T(a)", "Xi: T(a)"},
|
||||
{/* +0 */ "T(b)", "T(b)", "T(a)", "T(a)", "T(a)", "T(a)", "Xi: T(a)", "Xi: T(a)"},
|
||||
{/* +Fn */ "T(b)", "T(b)", "T(b)", "T(b)", "T(M(a,b))", "T(a)", "Xi: T(a)", "Xi: T(a)"},
|
||||
{/* +inf */ "T(b)", "T(b)", "T(b)", "T(b)", "T(b)", "T(a)", "Xi: T(a)", "Xi: T(a)"},
|
||||
{/* QNaN */ "Xi: T(a)", "Xi: T(a)", "Xi: T(a)", "Xi: T(a)", "Xi: T(a)", "Xi: T(a)", "Xi: T(a)", "Xi: T(a)"},
|
||||
{/* SNaN */ "Xi: T(a)", "Xi: T(a)", "Xi: T(a)", "Xi: T(a)", "Xi: T(a)", "Xi: T(a)", "Xi: T(a)", "Xi: T(a)"},
|
||||
},
|
||||
},
|
||||
{
|
||||
.op = VFMIN,
|
||||
.m6 = 4,
|
||||
.m6_desc = "fmin()",
|
||||
.table = {
|
||||
/* -inf -Fn -0 +0 +Fn +inf QNaN SNaN */
|
||||
{/* -inf */ "T(a)", "T(a)", "T(a)", "T(a)", "T(a)", "T(a)", "T(a)", "Xi: T(a)"},
|
||||
{/* -Fn */ "T(b)", "T(M(a,b))", "T(a)", "T(a)", "T(a)", "T(a)", "T(a)", "Xi: T(a)"},
|
||||
{/* -0 */ "T(b)", "T(b)", "T(a)", "T(a)", "T(a)", "T(a)", "T(a)", "Xi: T(a)"},
|
||||
{/* +0 */ "T(b)", "T(b)", "T(b)", "T(a)", "T(a)", "T(a)", "T(a)", "Xi: T(a)"},
|
||||
{/* +Fn */ "T(b)", "T(b)", "T(b)", "T(b)", "T(M(a,b))", "T(a)", "T(a)", "Xi: T(a)"},
|
||||
{/* +inf */ "T(b)", "T(b)", "T(b)", "T(b)", "T(b)", "T(a)", "T(a)", "Xi: T(a)"},
|
||||
{/* QNaN */ "T(b)", "T(b)", "T(b)", "T(b)", "T(b)", "T(b)", "T(a)", "Xi: T(a)"},
|
||||
{/* SNaN */ "Xi: T(b)", "Xi: T(b)", "Xi: T(b)", "Xi: T(b)", "Xi: T(b)", "Xi: T(b)", "Xi: T(a)", "Xi: T(a)"},
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
.op = VFMAX,
|
||||
.m6 = 0,
|
||||
.m6_desc = "IEEE MaxNum",
|
||||
.table = {
|
||||
/* -inf -Fn -0 +0 +Fn +inf QNaN SNaN */
|
||||
{/* -inf */ "T(a)", "T(b)", "T(b)", "T(b)", "T(b)", "T(b)", "T(a)", "Xi: T(b*)"},
|
||||
{/* -Fn */ "T(a)", "T(M(a,b))", "T(b)", "T(b)", "T(b)", "T(b)", "T(a)", "Xi: T(b*)"},
|
||||
{/* -0 */ "T(a)", "T(a)", "T(a)", "T(b)", "T(b)", "T(b)", "T(a)", "Xi: T(b*)"},
|
||||
{/* +0 */ "T(a)", "T(a)", "T(a)", "T(a)", "T(b)", "T(b)", "T(a)", "Xi: T(b*)"},
|
||||
{/* +Fn */ "T(a)", "T(a)", "T(a)", "T(a)", "T(M(a,b))", "T(b)", "T(a)", "Xi: T(b*)"},
|
||||
{/* +inf */ "T(a)", "T(a)", "T(a)", "T(a)", "T(a)", "T(a)", "T(a)", "Xi: T(b*)"},
|
||||
{/* QNaN */ "T(b)", "T(b)", "T(b)", "T(b)", "T(b)", "T(b)", "T(a)", "Xi: T(b*)"},
|
||||
{/* SNaN */ "Xi: T(a*)", "Xi: T(a*)", "Xi: T(a*)", "Xi: T(a*)", "Xi: T(a*)", "Xi: T(a*)", "Xi: T(a*)", "Xi: T(a*)"},
|
||||
},
|
||||
},
|
||||
{
|
||||
.op = VFMAX,
|
||||
.m6 = 1,
|
||||
.m6_desc = "JAVA Math.Max()",
|
||||
.table = {
|
||||
/* -inf -Fn -0 +0 +Fn +inf QNaN SNaN */
|
||||
{/* -inf */ "T(a)", "T(b)", "T(b)", "T(b)", "T(b)", "T(b)", "T(b)", "Xi: T(b*)"},
|
||||
{/* -Fn */ "T(a)", "T(M(a,b))", "T(b)", "T(b)", "T(b)", "T(b)", "T(b)", "Xi: T(b*)"},
|
||||
{/* -0 */ "T(a)", "T(a)", "T(a)", "T(b)", "T(b)", "T(b)", "T(b)", "Xi: T(b*)"},
|
||||
{/* +0 */ "T(a)", "T(a)", "T(a)", "T(a)", "T(b)", "T(b)", "T(b)", "Xi: T(b*)"},
|
||||
{/* +Fn */ "T(a)", "T(a)", "T(a)", "T(a)", "T(M(a,b))", "T(b)", "T(b)", "Xi: T(b*)"},
|
||||
{/* +inf */ "T(a)", "T(a)", "T(a)", "T(a)", "T(a)", "T(a)", "T(b)", "Xi: T(b*)"},
|
||||
{/* QNaN */ "T(a)", "T(a)", "T(a)", "T(a)", "T(a)", "T(a)", "T(a)", "Xi: T(b*)"},
|
||||
{/* SNaN */ "Xi: T(a*)", "Xi: T(a*)", "Xi: T(a*)", "Xi: T(a*)", "Xi: T(a*)", "Xi: T(a*)", "Xi: T(a*)", "Xi: T(a*)"},
|
||||
},
|
||||
},
|
||||
{
|
||||
.op = VFMAX,
|
||||
.m6 = 2,
|
||||
.m6_desc = "C-style Max Macro",
|
||||
.table = {
|
||||
/* -inf -Fn -0 +0 +Fn +inf QNaN SNaN */
|
||||
{/* -inf */ "T(b)", "T(b)", "T(b)", "T(b)", "T(b)", "T(b)", "Xi: T(b)", "Xi: T(b)"},
|
||||
{/* -Fn */ "T(a)", "T(M(a,b))", "T(b)", "T(b)", "T(b)", "T(b)", "Xi: T(b)", "Xi: T(b)"},
|
||||
{/* -0 */ "T(a)", "T(a)", "T(b)", "T(b)", "T(b)", "T(b)", "Xi: T(b)", "Xi: T(b)"},
|
||||
{/* +0 */ "T(a)", "T(a)", "T(b)", "T(b)", "T(b)", "T(b)", "Xi: T(b)", "Xi: T(b)"},
|
||||
{/* +Fn */ "T(a)", "T(a)", "T(a)", "T(a)", "T(M(a,b))", "T(b)", "Xi: T(b)", "Xi: T(b)"},
|
||||
{/* +inf */ "T(a)", "T(a)", "T(a)", "T(a)", "T(a)", "T(b)", "Xi: T(b)", "Xi: T(b)"},
|
||||
{/* QNaN */ "Xi: T(b)", "Xi: T(b)", "Xi: T(b)", "Xi: T(b)", "Xi: T(b)", "Xi: T(b)", "Xi: T(b)", "Xi: T(b)"},
|
||||
{/* SNaN */ "Xi: T(b)", "Xi: T(b)", "Xi: T(b)", "Xi: T(b)", "Xi: T(b)", "Xi: T(b)", "Xi: T(b)", "Xi: T(b)"},
|
||||
},
|
||||
},
|
||||
{
|
||||
.op = VFMAX,
|
||||
.m6 = 3,
|
||||
.m6_desc = "C++ algorithm.max()",
|
||||
.table = {
|
||||
/* -inf -Fn -0 +0 +Fn +inf QNaN SNaN */
|
||||
{/* -inf */ "T(a)", "T(b)", "T(b)", "T(b)", "T(b)", "T(b)", "Xi: T(a)", "Xi: T(a)"},
|
||||
{/* -Fn */ "T(a)", "T(M(a,b))", "T(b)", "T(b)", "T(b)", "T(b)", "Xi: T(a)", "Xi: T(a)"},
|
||||
{/* -0 */ "T(a)", "T(a)", "T(a)", "T(a)", "T(b)", "T(b)", "Xi: T(a)", "Xi: T(a)"},
|
||||
{/* +0 */ "T(a)", "T(a)", "T(a)", "T(a)", "T(b)", "T(b)", "Xi: T(a)", "Xi: T(a)"},
|
||||
{/* +Fn */ "T(a)", "T(a)", "T(a)", "T(a)", "T(M(a,b))", "T(b)", "Xi: T(a)", "Xi: T(a)"},
|
||||
{/* +inf */ "T(a)", "T(a)", "T(a)", "T(a)", "T(a)", "T(a)", "Xi: T(a)", "Xi: T(a)"},
|
||||
{/* QNaN */ "Xi: T(a)", "Xi: T(a)", "Xi: T(a)", "Xi: T(a)", "Xi: T(a)", "Xi: T(a)", "Xi: T(a)", "Xi: T(a)"},
|
||||
{/* SNaN */ "Xi: T(a)", "Xi: T(a)", "Xi: T(a)", "Xi: T(a)", "Xi: T(a)", "Xi: T(a)", "Xi: T(a)", "Xi: T(a)"},
|
||||
},
|
||||
},
|
||||
{
|
||||
.op = VFMAX,
|
||||
.m6 = 4,
|
||||
.m6_desc = "fmax()",
|
||||
.table = {
|
||||
/* -inf -Fn -0 +0 +Fn +inf QNaN SNaN */
|
||||
{/* -inf */ "T(a)", "T(b)", "T(b)", "T(b)", "T(b)", "T(b)", "T(a)", "Xi: T(a)"},
|
||||
{/* -Fn */ "T(a)", "T(M(a,b))", "T(b)", "T(b)", "T(b)", "T(b)", "T(a)", "Xi: T(a)"},
|
||||
{/* -0 */ "T(a)", "T(a)", "T(a)", "T(b)", "T(b)", "T(b)", "T(a)", "Xi: T(a)"},
|
||||
{/* +0 */ "T(a)", "T(a)", "T(a)", "T(a)", "T(b)", "T(b)", "T(a)", "Xi: T(a)"},
|
||||
{/* +Fn */ "T(a)", "T(a)", "T(a)", "T(a)", "T(M(a,b))", "T(b)", "T(a)", "Xi: T(a)"},
|
||||
{/* +inf */ "T(a)", "T(a)", "T(a)", "T(a)", "T(a)", "T(a)", "T(a)", "Xi: T(a)"},
|
||||
{/* QNaN */ "T(b)", "T(b)", "T(b)", "T(b)", "T(b)", "T(b)", "T(a)", "Xi: T(a)"},
|
||||
{/* SNaN */ "Xi: T(b)", "Xi: T(b)", "Xi: T(b)", "Xi: T(b)", "Xi: T(b)", "Xi: T(b)", "Xi: T(a)", "Xi: T(a)"},
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
static void dump_v(FILE *f, const void *v, size_t n)
|
||||
{
|
||||
for (int i = 0; i < n; i++) {
|
||||
fprintf(f, "%02x", ((const unsigned char *)v)[i]);
|
||||
}
|
||||
}
|
||||
|
||||
static int signed_test(struct signed_test *test, int m4, int m5,
|
||||
const void *v1_exp, bool xi_exp,
|
||||
const void *v2, const void *v3)
|
||||
{
|
||||
size_t n = (m5 & 8) ? float_sizes[m4 - 2] : 16;
|
||||
char v1[16];
|
||||
bool xi;
|
||||
|
||||
feclearexcept(FE_ALL_EXCEPT);
|
||||
vfminmax(test->op, m4, m5, test->m6, v1, v2, v3);
|
||||
xi = fetestexcept(FE_ALL_EXCEPT) == FE_INVALID;
|
||||
|
||||
if (memcmp(v1, v1_exp, n) != 0 || xi != xi_exp) {
|
||||
fprintf(stderr, "[ FAILED ] %s ", test->m6_desc);
|
||||
dump_v(stderr, v2, n);
|
||||
fprintf(stderr, ", ");
|
||||
dump_v(stderr, v3, n);
|
||||
fprintf(stderr, ", %d, %d, %d: actual=", m4, m5, test->m6);
|
||||
dump_v(stderr, v1, n);
|
||||
fprintf(stderr, "/%d, expected=", (int)xi);
|
||||
dump_v(stderr, v1_exp, n);
|
||||
fprintf(stderr, "/%d\n", (int)xi_exp);
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void snan_to_qnan(char *v, int m4)
|
||||
{
|
||||
size_t bit = 1 + e_bits[m4 - 2];
|
||||
v[bit / 8] |= 1 << (7 - (bit % 8));
|
||||
}
|
||||
|
||||
int main(void)
|
||||
{
|
||||
int ret = 0;
|
||||
size_t i;
|
||||
|
||||
for (i = 0; i < sizeof(signed_tests) / sizeof(signed_tests[0]); i++) {
|
||||
struct signed_test *test = &signed_tests[i];
|
||||
int m4;
|
||||
|
||||
for (m4 = 2; m4 <= 4; m4++) {
|
||||
const unsigned char (*floats)[2][16] = signed_floats[m4 - 2];
|
||||
size_t float_size = float_sizes[m4 - 2];
|
||||
int m5;
|
||||
|
||||
for (m5 = 0; m5 <= 8; m5 += 8) {
|
||||
char v1_exp[16], v2[16], v3[16];
|
||||
bool xi_exp = false;
|
||||
int pos = 0;
|
||||
int i2;
|
||||
|
||||
for (i2 = 0; i2 < N_SIGNED_CLASSES * 2; i2++) {
|
||||
int i3;
|
||||
|
||||
for (i3 = 0; i3 < N_SIGNED_CLASSES * 2; i3++) {
|
||||
const char *spec = test->table[i2 / 2][i3 / 2];
|
||||
|
||||
memcpy(&v2[pos], floats[i2 / 2][i2 % 2], float_size);
|
||||
memcpy(&v3[pos], floats[i3 / 2][i3 % 2], float_size);
|
||||
if (strcmp(spec, "T(a)") == 0 ||
|
||||
strcmp(spec, "Xi: T(a)") == 0) {
|
||||
memcpy(&v1_exp[pos], &v2[pos], float_size);
|
||||
} else if (strcmp(spec, "T(b)") == 0 ||
|
||||
strcmp(spec, "Xi: T(b)") == 0) {
|
||||
memcpy(&v1_exp[pos], &v3[pos], float_size);
|
||||
} else if (strcmp(spec, "Xi: T(a*)") == 0) {
|
||||
memcpy(&v1_exp[pos], &v2[pos], float_size);
|
||||
snan_to_qnan(&v1_exp[pos], m4);
|
||||
} else if (strcmp(spec, "Xi: T(b*)") == 0) {
|
||||
memcpy(&v1_exp[pos], &v3[pos], float_size);
|
||||
snan_to_qnan(&v1_exp[pos], m4);
|
||||
} else if (strcmp(spec, "T(M(a,b))") == 0) {
|
||||
/*
|
||||
* Comparing floats is risky, since the compiler
|
||||
* might generate the same instruction that we are
|
||||
* testing. Compare ints instead. This works,
|
||||
* because we get here only for +-Fn, and the
|
||||
* corresponding test values have identical
|
||||
* exponents.
|
||||
*/
|
||||
int v2_int = *(int *)&v2[pos];
|
||||
int v3_int = *(int *)&v3[pos];
|
||||
|
||||
if ((v2_int < v3_int) ==
|
||||
((test->op == VFMIN) != (v2_int < 0))) {
|
||||
memcpy(&v1_exp[pos], &v2[pos], float_size);
|
||||
} else {
|
||||
memcpy(&v1_exp[pos], &v3[pos], float_size);
|
||||
}
|
||||
} else {
|
||||
fprintf(stderr, "Unexpected spec: %s\n", spec);
|
||||
return 1;
|
||||
}
|
||||
xi_exp |= spec[0] == 'X';
|
||||
pos += float_size;
|
||||
|
||||
if ((m5 & 8) || pos == 16) {
|
||||
ret |= signed_test(test, m4, m5,
|
||||
v1_exp, xi_exp, v2, v3);
|
||||
pos = 0;
|
||||
xi_exp = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (pos != 0) {
|
||||
ret |= signed_test(test, m4, m5, v1_exp, xi_exp, v2, v3);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
Loading…
Reference in New Issue