s390: Assorted BFP testsuite tweaks

Rename rounding-1 to bfp-306054 because that was the corresponding BZ.
Rename bfp-3 to bfp-muldiv as it is more expressive.
Only compile testcases for 128-bit BFP if the compiler supports -mlong-double-128.
Add -mlong-double-128 to the compile flags for the files that need it.

This concludes fixing https://bugs.kde.org/show_bug.cgi?id=509572

diff --git a/.gitignore b/.gitignore
index 53e2a0f83dc53542e01e476cdf661afcb3e07120..645f261bcd22a582485be54c6c0a613d7455cbe0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2184,12 +2184,12 @@
 /none/tests/s390x/ecag
 /none/tests/s390x/fpext_warn
 /none/tests/s390x/fpext_fail
-/none/tests/s390x/rounding-1
+/none/tests/s390x/bfp-306054
 /none/tests/s390x/bfp-arith
 /none/tests/s390x/bfp-load
 /none/tests/s390x/bfp-fpc
 /none/tests/s390x/bfp-tdc
-/none/tests/s390x/bfp-3
+/none/tests/s390x/bfp-muldiv
 /none/tests/s390x/bfp-compare
 /none/tests/s390x/bfp-convert
 /none/tests/s390x/comp-1

diff --git a/NEWS b/NEWS
index d7f0cb3ba218990926d1f744c7d5a57fedbd0ccd..147f4f56f54e415aab4b00039c3107531a6252d0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -139,6 +139,7 @@ are not entered into bugzilla tend to get forgotten about or ignored.
 509139  Update BadSize error messages
 509258  FreeBSD: add jail_attach_jd and jail_remove_jd syscall wrappers
 509517  s390x: Even/odd lane confusion in various vector insns
+509572  s390x: Overhaul BFP testsuite
 509566  Wrap amd64-linux syscall: 442 (mount_setattr)
 509590  Run the LTP tests with LTP_QUIET
 509567  unhandled amd64-linux syscall: 443 (quotactl_fd)

diff --git a/none/tests/s390x/Makefile.am b/none/tests/s390x/Makefile.am
index abe71570fb70015afaf8d2602d6df8f941de868d..66254c3bbfa33c6f69fe5799a4155e322d5a8ba5 100644 (file)
--- a/none/tests/s390x/Makefile.am
+++ b/none/tests/s390x/Makefile.am
@@ -9,8 +9,8 @@ INSN_TESTS = clc clcle cvb cvd icm lpr lam_stam xc mvst add sub mul \
              trto trot trtt tr tre cij cgij clij clgij crj cgrj clrj clgrj \
              cs csg cds cdsg cu21 cu21_1 cu24 cu24_1 cu42 cu12 cu12_1 \
              ex_sig ex_clone cu14 cu14_1 cu41 ecag fpext_warn fpext_fail \
-             bfp-tdc bfp-load bfp-fpc bfp-convert rounding-1 bfp-arith \
-             bfp-3 bfp-compare comp-1 comp-2 exrl tmll tm stmg \
+             bfp-fpc bfp-306054 \
+             bfp-muldiv comp-1 comp-2 exrl tmll tm stmg \
             ex clst mvc test_fork test_sig rxsbg popcnt \
             high-word traps \
             spechelper-alr spechelper-algr \
@@ -24,6 +24,10 @@ INSN_TESTS = clc clcle cvb cvd icm lpr lam_stam xc mvst add sub mul \
             dfp-1 dfp-2 dfp-3 dfp-4 dfpconv dfpext dfptest pfpo srnmt \
             hfp
 
+if HAS_MLONG_DOUBLE_128
+INSN_TESTS += bfp-arith bfp-compare bfp-convert bfp-load bfp-tdc
+endif
+
 check_PROGRAMS = $(INSN_TESTS) \
                 allexec \
                 op00
@@ -34,6 +38,11 @@ EXTRA_DIST = \
        $(addsuffix .stderr.exp,$(INSN_TESTS)) \
        $(addsuffix .stdout.exp,$(INSN_TESTS)) \
        $(addsuffix .vgtest,$(INSN_TESTS)) \
+       bfp-arith.vgtest bfp-arith.stdout.exp bfp-arith.stderr.exp \
+       bfp-compare.vgtest bfp-compare.stdout.exp bfp-compare.stderr.exp \
+       bfp-convert.vgtest bfp-convert.stdout.exp bfp-convert.stderr.exp \
+       bfp-load.vgtest bfp-load.stdout.exp bfp-load.stderr.exp \
+       bfp-tdc.vgtest bfp-tdc.stdout.exp bfp-tdc.stderr.exp \
        bfp-emit.vgtest bfp-emit.stderr.exp bfp-emit.post.exp \
        ecag.stdout.exp-z10ec ecag.stdout.exp-z196 ecag.stdout.exp-zec12 \
        ecag.stdout.exp-z13 ecag.stdout.exp-z14 ecag.stdout.exp-z15 \
@@ -69,3 +78,8 @@ vector_integer_CFLAGS    = $(AM_CFLAGS) -march=z13 -DS390_TEST_COUNT=4
 vector_float_CFLAGS    = $(AM_CFLAGS) -march=z13 -DS390_TEST_COUNT=4
 vec2_CFLAGS      = $(AM_CFLAGS) -march=z13
 vec2_float_CFLAGS = $(AM_CFLAGS) -march=z13
+bfp_arith_CFLAGS   = $(AM_CFLAGS) -mlong-double-128
+bfp_compare_CFLAGS = $(AM_CFLAGS) -mlong-double-128
+bfp_convert_CFLAGS = $(AM_CFLAGS) -mlong-double-128
+bfp_load_CFLAGS    = $(AM_CFLAGS) -mlong-double-128
+bfp_tdc_CFLAGS     = $(AM_CFLAGS) -mlong-double-128

diff --git a/none/tests/s390x/bfp-3.vgtest b/none/tests/s390x/bfp-3.vgtest
deleted file mode 100644 (file)
index 8088d7d..0000000
--- a/none/tests/s390x/bfp-3.vgtest
+++ /dev/null
@@ -1 +0,0 @@
-prog: bfp-3

diff --git a/none/tests/s390x/rounding-1.c b/none/tests/s390x/bfp-306054.c
similarity index 100%
rename from none/tests/s390x/rounding-1.c
rename to none/tests/s390x/bfp-306054.c

diff --git a/none/tests/s390x/bfp-3.stderr.exp b/none/tests/s390x/bfp-306054.stderr.exp
similarity index 100%
rename from none/tests/s390x/bfp-3.stderr.exp
rename to none/tests/s390x/bfp-306054.stderr.exp

diff --git a/none/tests/s390x/rounding-1.stdout.exp b/none/tests/s390x/bfp-306054.stdout.exp
similarity index 100%
rename from none/tests/s390x/rounding-1.stdout.exp
rename to none/tests/s390x/bfp-306054.stdout.exp

diff --git a/none/tests/s390x/bfp-306054.vgtest b/none/tests/s390x/bfp-306054.vgtest
new file mode 100644 (file)
index 0000000..3948f34
--- /dev/null
+++ b/none/tests/s390x/bfp-306054.vgtest
@@ -0,0 +1 @@
+prog: bfp-306054

diff --git a/none/tests/s390x/bfp-3.c b/none/tests/s390x/bfp-muldiv.c
similarity index 100%
rename from none/tests/s390x/bfp-3.c
rename to none/tests/s390x/bfp-muldiv.c

diff --git a/none/tests/s390x/rounding-1.stderr.exp b/none/tests/s390x/bfp-muldiv.stderr.exp
similarity index 100%
rename from none/tests/s390x/rounding-1.stderr.exp
rename to none/tests/s390x/bfp-muldiv.stderr.exp

diff --git a/none/tests/s390x/bfp-3.stdout.exp b/none/tests/s390x/bfp-muldiv.stdout.exp
similarity index 100%
rename from none/tests/s390x/bfp-3.stdout.exp
rename to none/tests/s390x/bfp-muldiv.stdout.exp

diff --git a/none/tests/s390x/bfp-muldiv.vgtest b/none/tests/s390x/bfp-muldiv.vgtest
new file mode 100644 (file)
index 0000000..df1275f
--- /dev/null
+++ b/none/tests/s390x/bfp-muldiv.vgtest
@@ -0,0 +1 @@
+prog: bfp-muldiv

diff --git a/none/tests/s390x/rounding-1.vgtest b/none/tests/s390x/rounding-1.vgtest
deleted file mode 100644 (file)
index 4c1e45b..0000000
--- a/none/tests/s390x/rounding-1.vgtest
+++ /dev/null
@@ -1 +0,0 @@
-prog: rounding-1