From 47ad14d789ecc3f3e16fdc1d6c7f727637f4d055 Mon Sep 17 00:00:00 2001 From: Wilco Dijkstra Date: Wed, 10 Mar 2021 12:41:47 +0000 Subject: math: Remove mpa files [BZ #15267] Finally remove all mpa related files, headers, declarations, probes, unused tables and update makefiles. Reviewed-By: Paul Zimmermann --- sysdeps/x86_64/fpu/multiarch/Makefile | 30 +++------------------------- sysdeps/x86_64/fpu/multiarch/doasin-fma.c | 4 ---- sysdeps/x86_64/fpu/multiarch/doasin-fma4.c | 4 ---- sysdeps/x86_64/fpu/multiarch/dosincos-fma.c | 6 ------ sysdeps/x86_64/fpu/multiarch/dosincos-fma4.c | 6 ------ sysdeps/x86_64/fpu/multiarch/mpa-avx.c | 14 ------------- sysdeps/x86_64/fpu/multiarch/mpa-fma.c | 14 ------------- sysdeps/x86_64/fpu/multiarch/mpa-fma4.c | 14 ------------- sysdeps/x86_64/fpu/multiarch/mpatan-fma.c | 10 ---------- sysdeps/x86_64/fpu/multiarch/mpatan-fma4.c | 10 ---------- sysdeps/x86_64/fpu/multiarch/mpatan2-fma.c | 9 --------- sysdeps/x86_64/fpu/multiarch/mpatan2-fma4.c | 9 --------- sysdeps/x86_64/fpu/multiarch/mpsqrt-fma.c | 8 -------- sysdeps/x86_64/fpu/multiarch/mpsqrt-fma4.c | 8 -------- sysdeps/x86_64/fpu/multiarch/mptan-fma.c | 7 ------- sysdeps/x86_64/fpu/multiarch/mptan-fma4.c | 7 ------- sysdeps/x86_64/fpu/multiarch/sincos32-fma.c | 13 ------------ sysdeps/x86_64/fpu/multiarch/sincos32-fma4.c | 13 ------------ 18 files changed, 3 insertions(+), 183 deletions(-) delete mode 100644 sysdeps/x86_64/fpu/multiarch/doasin-fma.c delete mode 100644 sysdeps/x86_64/fpu/multiarch/doasin-fma4.c delete mode 100644 sysdeps/x86_64/fpu/multiarch/dosincos-fma.c delete mode 100644 sysdeps/x86_64/fpu/multiarch/dosincos-fma4.c delete mode 100644 sysdeps/x86_64/fpu/multiarch/mpa-avx.c delete mode 100644 sysdeps/x86_64/fpu/multiarch/mpa-fma.c delete mode 100644 sysdeps/x86_64/fpu/multiarch/mpa-fma4.c delete mode 100644 sysdeps/x86_64/fpu/multiarch/mpatan-fma.c delete mode 100644 sysdeps/x86_64/fpu/multiarch/mpatan-fma4.c delete mode 100644 sysdeps/x86_64/fpu/multiarch/mpatan2-fma.c delete mode 100644 sysdeps/x86_64/fpu/multiarch/mpatan2-fma4.c delete mode 100644 sysdeps/x86_64/fpu/multiarch/mpsqrt-fma.c delete mode 100644 sysdeps/x86_64/fpu/multiarch/mpsqrt-fma4.c delete mode 100644 sysdeps/x86_64/fpu/multiarch/mptan-fma.c delete mode 100644 sysdeps/x86_64/fpu/multiarch/mptan-fma4.c delete mode 100644 sysdeps/x86_64/fpu/multiarch/sincos32-fma.c delete mode 100644 sysdeps/x86_64/fpu/multiarch/sincos32-fma4.c (limited to 'sysdeps/x86_64/fpu') diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile index 3836574f48..57892c56bb 100644 --- a/sysdeps/x86_64/fpu/multiarch/Makefile +++ b/sysdeps/x86_64/fpu/multiarch/Makefile @@ -9,25 +9,14 @@ libm-sysdep_routines += s_ceil-sse4_1 s_ceilf-sse4_1 s_floor-sse4_1 \ s_trunc-sse4_1 s_truncf-sse4_1 libm-sysdep_routines += e_exp-fma e_log-fma e_pow-fma s_atan-fma \ - e_asin-fma e_atan2-fma s_sin-fma s_tan-fma \ - mpa-fma \ - sincos32-fma doasin-fma dosincos-fma \ - mpatan2-fma mpatan-fma mpsqrt-fma mptan-fma + e_asin-fma e_atan2-fma s_sin-fma s_tan-fma -CFLAGS-doasin-fma.c = -mfma -mavx2 -CFLAGS-dosincos-fma.c = -mfma -mavx2 CFLAGS-e_asin-fma.c = -mfma -mavx2 CFLAGS-e_atan2-fma.c = -mfma -mavx2 CFLAGS-e_exp-fma.c = -mfma -mavx2 CFLAGS-e_log-fma.c = -mfma -mavx2 CFLAGS-e_pow-fma.c = -mfma -mavx2 -CFLAGS-mpa-fma.c = -mfma -mavx2 -CFLAGS-mpatan-fma.c = -mfma -mavx2 -CFLAGS-mpatan2-fma.c = -mfma -mavx2 -CFLAGS-mpsqrt-fma.c = -mfma -mavx2 -CFLAGS-mptan-fma.c = -mfma -mavx2 CFLAGS-s_atan-fma.c = -mfma -mavx2 -CFLAGS-sincos32-fma.c = -mfma -mavx2 CFLAGS-s_sin-fma.c = -mfma -mavx2 CFLAGS-s_tan-fma.c = -mfma -mavx2 @@ -46,36 +35,23 @@ CFLAGS-s_cosf-fma.c = -mfma -mavx2 CFLAGS-s_sincosf-fma.c = -mfma -mavx2 libm-sysdep_routines += e_exp-fma4 e_log-fma4 e_pow-fma4 s_atan-fma4 \ - e_asin-fma4 e_atan2-fma4 s_sin-fma4 s_tan-fma4 \ - mpa-fma4 \ - sincos32-fma4 doasin-fma4 dosincos-fma4 \ - mpatan2-fma4 mpatan-fma4 mpsqrt-fma4 mptan-fma4 + e_asin-fma4 e_atan2-fma4 s_sin-fma4 s_tan-fma4 -CFLAGS-doasin-fma4.c = -mfma4 -CFLAGS-dosincos-fma4.c = -mfma4 CFLAGS-e_asin-fma4.c = -mfma4 CFLAGS-e_atan2-fma4.c = -mfma4 CFLAGS-e_exp-fma4.c = -mfma4 CFLAGS-e_log-fma4.c = -mfma4 CFLAGS-e_pow-fma4.c = -mfma4 -CFLAGS-mpa-fma4.c = -mfma4 -CFLAGS-mpatan-fma4.c = -mfma4 -CFLAGS-mpatan2-fma4.c = -mfma4 -CFLAGS-mpsqrt-fma4.c = -mfma4 -CFLAGS-mptan-fma4.c = -mfma4 CFLAGS-s_atan-fma4.c = -mfma4 -CFLAGS-sincos32-fma4.c = -mfma4 CFLAGS-s_sin-fma4.c = -mfma4 CFLAGS-s_tan-fma4.c = -mfma4 libm-sysdep_routines += e_exp-avx e_log-avx s_atan-avx \ - e_atan2-avx s_sin-avx s_tan-avx \ - mpa-avx + e_atan2-avx s_sin-avx s_tan-avx CFLAGS-e_atan2-avx.c = -msse2avx -DSSE2AVX CFLAGS-e_exp-avx.c = -msse2avx -DSSE2AVX CFLAGS-e_log-avx.c = -msse2avx -DSSE2AVX -CFLAGS-mpa-avx.c = -msse2avx -DSSE2AVX CFLAGS-s_atan-avx.c = -msse2avx -DSSE2AVX CFLAGS-s_sin-avx.c = -msse2avx -DSSE2AVX CFLAGS-s_tan-avx.c = -msse2avx -DSSE2AVX diff --git a/sysdeps/x86_64/fpu/multiarch/doasin-fma.c b/sysdeps/x86_64/fpu/multiarch/doasin-fma.c deleted file mode 100644 index 7a09865fca..0000000000 --- a/sysdeps/x86_64/fpu/multiarch/doasin-fma.c +++ /dev/null @@ -1,4 +0,0 @@ -#define __doasin __doasin_fma -#define SECTION __attribute__ ((section (".text.fma"))) - -#include diff --git a/sysdeps/x86_64/fpu/multiarch/doasin-fma4.c b/sysdeps/x86_64/fpu/multiarch/doasin-fma4.c deleted file mode 100644 index 53eb419472..0000000000 --- a/sysdeps/x86_64/fpu/multiarch/doasin-fma4.c +++ /dev/null @@ -1,4 +0,0 @@ -#define __doasin __doasin_fma4 -#define SECTION __attribute__ ((section (".text.fma4"))) - -#include diff --git a/sysdeps/x86_64/fpu/multiarch/dosincos-fma.c b/sysdeps/x86_64/fpu/multiarch/dosincos-fma.c deleted file mode 100644 index 5744586bdb..0000000000 --- a/sysdeps/x86_64/fpu/multiarch/dosincos-fma.c +++ /dev/null @@ -1,6 +0,0 @@ -#define __docos __docos_fma -#define __dubcos __dubcos_fma -#define __dubsin __dubsin_fma -#define SECTION __attribute__ ((section (".text.fma"))) - -#include diff --git a/sysdeps/x86_64/fpu/multiarch/dosincos-fma4.c b/sysdeps/x86_64/fpu/multiarch/dosincos-fma4.c deleted file mode 100644 index 1578b2fce0..0000000000 --- a/sysdeps/x86_64/fpu/multiarch/dosincos-fma4.c +++ /dev/null @@ -1,6 +0,0 @@ -#define __docos __docos_fma4 -#define __dubcos __dubcos_fma4 -#define __dubsin __dubsin_fma4 -#define SECTION __attribute__ ((section (".text.fma4"))) - -#include diff --git a/sysdeps/x86_64/fpu/multiarch/mpa-avx.c b/sysdeps/x86_64/fpu/multiarch/mpa-avx.c deleted file mode 100644 index 366b0b7134..0000000000 --- a/sysdeps/x86_64/fpu/multiarch/mpa-avx.c +++ /dev/null @@ -1,14 +0,0 @@ -#define __add __add_avx -#define __mul __mul_avx -#define __sqr __sqr_avx -#define __sub __sub_avx -#define __dbl_mp __dbl_mp_avx -#define __dvd __dvd_avx - -#define NO___CPY 1 -#define NO___MP_DBL 1 -#define NO___ACR 1 -#define NO__CONST 1 -#define SECTION __attribute__ ((section (".text.avx"))) - -#include diff --git a/sysdeps/x86_64/fpu/multiarch/mpa-fma.c b/sysdeps/x86_64/fpu/multiarch/mpa-fma.c deleted file mode 100644 index 177cc2517f..0000000000 --- a/sysdeps/x86_64/fpu/multiarch/mpa-fma.c +++ /dev/null @@ -1,14 +0,0 @@ -#define __add __add_fma -#define __mul __mul_fma -#define __sqr __sqr_fma -#define __sub __sub_fma -#define __dbl_mp __dbl_mp_fma -#define __dvd __dvd_fma - -#define NO___CPY 1 -#define NO___MP_DBL 1 -#define NO___ACR 1 -#define NO__CONST 1 -#define SECTION __attribute__ ((section (".text.fma"))) - -#include diff --git a/sysdeps/x86_64/fpu/multiarch/mpa-fma4.c b/sysdeps/x86_64/fpu/multiarch/mpa-fma4.c deleted file mode 100644 index a4a759407e..0000000000 --- a/sysdeps/x86_64/fpu/multiarch/mpa-fma4.c +++ /dev/null @@ -1,14 +0,0 @@ -#define __add __add_fma4 -#define __mul __mul_fma4 -#define __sqr __sqr_fma4 -#define __sub __sub_fma4 -#define __dbl_mp __dbl_mp_fma4 -#define __dvd __dvd_fma4 - -#define NO___CPY 1 -#define NO___MP_DBL 1 -#define NO___ACR 1 -#define NO__CONST 1 -#define SECTION __attribute__ ((section (".text.fma4"))) - -#include diff --git a/sysdeps/x86_64/fpu/multiarch/mpatan-fma.c b/sysdeps/x86_64/fpu/multiarch/mpatan-fma.c deleted file mode 100644 index d216f9142d..0000000000 --- a/sysdeps/x86_64/fpu/multiarch/mpatan-fma.c +++ /dev/null @@ -1,10 +0,0 @@ -#define __mpatan __mpatan_fma -#define __add __add_fma -#define __dvd __dvd_fma -#define __mpsqrt __mpsqrt_fma -#define __mul __mul_fma -#define __sub __sub_fma -#define AVOID_MPATAN_H 1 -#define SECTION __attribute__ ((section (".text.fma"))) - -#include diff --git a/sysdeps/x86_64/fpu/multiarch/mpatan-fma4.c b/sysdeps/x86_64/fpu/multiarch/mpatan-fma4.c deleted file mode 100644 index fbd3bd49a2..0000000000 --- a/sysdeps/x86_64/fpu/multiarch/mpatan-fma4.c +++ /dev/null @@ -1,10 +0,0 @@ -#define __mpatan __mpatan_fma4 -#define __add __add_fma4 -#define __dvd __dvd_fma4 -#define __mpsqrt __mpsqrt_fma4 -#define __mul __mul_fma4 -#define __sub __sub_fma4 -#define AVOID_MPATAN_H 1 -#define SECTION __attribute__ ((section (".text.fma4"))) - -#include diff --git a/sysdeps/x86_64/fpu/multiarch/mpatan2-fma.c b/sysdeps/x86_64/fpu/multiarch/mpatan2-fma.c deleted file mode 100644 index 98df336f79..0000000000 --- a/sysdeps/x86_64/fpu/multiarch/mpatan2-fma.c +++ /dev/null @@ -1,9 +0,0 @@ -#define __mpatan2 __mpatan2_fma -#define __add __add_fma -#define __dvd __dvd_fma -#define __mpatan __mpatan_fma -#define __mpsqrt __mpsqrt_fma -#define __mul __mul_fma -#define SECTION __attribute__ ((section (".text.fma"))) - -#include diff --git a/sysdeps/x86_64/fpu/multiarch/mpatan2-fma4.c b/sysdeps/x86_64/fpu/multiarch/mpatan2-fma4.c deleted file mode 100644 index e6e44d49b0..0000000000 --- a/sysdeps/x86_64/fpu/multiarch/mpatan2-fma4.c +++ /dev/null @@ -1,9 +0,0 @@ -#define __mpatan2 __mpatan2_fma4 -#define __add __add_fma4 -#define __dvd __dvd_fma4 -#define __mpatan __mpatan_fma4 -#define __mpsqrt __mpsqrt_fma4 -#define __mul __mul_fma4 -#define SECTION __attribute__ ((section (".text.fma4"))) - -#include diff --git a/sysdeps/x86_64/fpu/multiarch/mpsqrt-fma.c b/sysdeps/x86_64/fpu/multiarch/mpsqrt-fma.c deleted file mode 100644 index 44d7a23ae3..0000000000 --- a/sysdeps/x86_64/fpu/multiarch/mpsqrt-fma.c +++ /dev/null @@ -1,8 +0,0 @@ -#define __mpsqrt __mpsqrt_fma -#define __dbl_mp __dbl_mp_fma -#define __mul __mul_fma -#define __sub __sub_fma -#define AVOID_MPSQRT_H 1 -#define SECTION __attribute__ ((section (".text.fma"))) - -#include diff --git a/sysdeps/x86_64/fpu/multiarch/mpsqrt-fma4.c b/sysdeps/x86_64/fpu/multiarch/mpsqrt-fma4.c deleted file mode 100644 index f8a1ba2d92..0000000000 --- a/sysdeps/x86_64/fpu/multiarch/mpsqrt-fma4.c +++ /dev/null @@ -1,8 +0,0 @@ -#define __mpsqrt __mpsqrt_fma4 -#define __dbl_mp __dbl_mp_fma4 -#define __mul __mul_fma4 -#define __sub __sub_fma4 -#define AVOID_MPSQRT_H 1 -#define SECTION __attribute__ ((section (".text.fma4"))) - -#include diff --git a/sysdeps/x86_64/fpu/multiarch/mptan-fma.c b/sysdeps/x86_64/fpu/multiarch/mptan-fma.c deleted file mode 100644 index d1a691413c..0000000000 --- a/sysdeps/x86_64/fpu/multiarch/mptan-fma.c +++ /dev/null @@ -1,7 +0,0 @@ -#define __mptan __mptan_fma -#define __c32 __c32_fma -#define __dvd __dvd_fma -#define __mpranred __mpranred_fma -#define SECTION __attribute__ ((section (".text.fma"))) - -#include diff --git a/sysdeps/x86_64/fpu/multiarch/mptan-fma4.c b/sysdeps/x86_64/fpu/multiarch/mptan-fma4.c deleted file mode 100644 index fb4a9d48ca..0000000000 --- a/sysdeps/x86_64/fpu/multiarch/mptan-fma4.c +++ /dev/null @@ -1,7 +0,0 @@ -#define __mptan __mptan_fma4 -#define __c32 __c32_fma4 -#define __dvd __dvd_fma4 -#define __mpranred __mpranred_fma4 -#define SECTION __attribute__ ((section (".text.fma4"))) - -#include diff --git a/sysdeps/x86_64/fpu/multiarch/sincos32-fma.c b/sysdeps/x86_64/fpu/multiarch/sincos32-fma.c deleted file mode 100644 index 4152b84835..0000000000 --- a/sysdeps/x86_64/fpu/multiarch/sincos32-fma.c +++ /dev/null @@ -1,13 +0,0 @@ -#define __c32 __c32_fma -#define __mpsin __mpsin_fma -#define __mpsin1 __mpsin1_fma -#define __mpcos __mpcos_fma -#define __mpcos1 __mpcos1_fma -#define __mpranred __mpranred_fma -#define __add __add_fma -#define __dbl_mp __dbl_mp_fma -#define __mul __mul_fma -#define __sub __sub_fma -#define SECTION __attribute__ ((section (".text.fma"))) - -#include diff --git a/sysdeps/x86_64/fpu/multiarch/sincos32-fma4.c b/sysdeps/x86_64/fpu/multiarch/sincos32-fma4.c deleted file mode 100644 index 643eedf138..0000000000 --- a/sysdeps/x86_64/fpu/multiarch/sincos32-fma4.c +++ /dev/null @@ -1,13 +0,0 @@ -#define __c32 __c32_fma4 -#define __mpsin __mpsin_fma4 -#define __mpsin1 __mpsin1_fma4 -#define __mpcos __mpcos_fma4 -#define __mpcos1 __mpcos1_fma4 -#define __mpranred __mpranred_fma4 -#define __add __add_fma4 -#define __dbl_mp __dbl_mp_fma4 -#define __mul __mul_fma4 -#define __sub __sub_fma4 -#define SECTION __attribute__ ((section (".text.fma4"))) - -#include -- cgit 1.4.1