From 8d4f46c613c4397c5531b959744541862cf09ad0 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 20 Oct 2011 21:55:41 -0400 Subject: Move fma routines to right place --- sysdeps/x86_64/fpu/multiarch/s_fma.c | 43 +++++++++++++++++++++++++++++++++++ sysdeps/x86_64/fpu/multiarch/s_fmaf.c | 42 ++++++++++++++++++++++++++++++++++ sysdeps/x86_64/multiarch/s_fma.c | 43 ----------------------------------- sysdeps/x86_64/multiarch/s_fmaf.c | 42 ---------------------------------- 4 files changed, 85 insertions(+), 85 deletions(-) create mode 100644 sysdeps/x86_64/fpu/multiarch/s_fma.c create mode 100644 sysdeps/x86_64/fpu/multiarch/s_fmaf.c delete mode 100644 sysdeps/x86_64/multiarch/s_fma.c delete mode 100644 sysdeps/x86_64/multiarch/s_fmaf.c (limited to 'sysdeps/x86_64') diff --git a/sysdeps/x86_64/fpu/multiarch/s_fma.c b/sysdeps/x86_64/fpu/multiarch/s_fma.c new file mode 100644 index 0000000000..9a680c68fc --- /dev/null +++ b/sysdeps/x86_64/fpu/multiarch/s_fma.c @@ -0,0 +1,43 @@ +/* FMA version of fma. + Copyright (C) 2009, 2010 Free Software Foundation, Inc. + Contributed by Intel Corporation. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include +#include +#include + +#ifdef HAVE_AVX_SUPPORT + +extern double __fma_sse2 (double x, double y, double z) attribute_hidden; + + +static double +__fma_fma (double x, double y, double z) +{ + asm ("vfmadd213sd %3, %2, %0" : "=x" (x) : "0" (x), "x" (y), "xm" (z)); + return x; +} + +libm_ifunc (__fma, HAS_FMA ? __fma_fma : __fma_sse2); +weak_alias (__fma, fma) + +# define __fma __fma_sse2 +#endif + +#include diff --git a/sysdeps/x86_64/fpu/multiarch/s_fmaf.c b/sysdeps/x86_64/fpu/multiarch/s_fmaf.c new file mode 100644 index 0000000000..85ef65a50e --- /dev/null +++ b/sysdeps/x86_64/fpu/multiarch/s_fmaf.c @@ -0,0 +1,42 @@ +/* FMA version of fmaf. + Copyright (C) 2009, 2010 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include +#include +#include + +#ifdef HAVE_AVX_SUPPORT + +extern float __fmaf_sse2 (float x, float y, float z) attribute_hidden; + + +static float +__fmaf_fma (float x, float y, float z) +{ + asm ("vfmadd213ss %3, %2, %0" : "=x" (x) : "0" (x), "x" (y), "xm" (z)); + return x; +} + +libm_ifunc (__fmaf, HAS_FMA ? __fmaf_fma : __fmaf_sse2); +weak_alias (__fmaf, fmaf) + +# define __fmaf __fmaf_sse2 +#endif + +#include diff --git a/sysdeps/x86_64/multiarch/s_fma.c b/sysdeps/x86_64/multiarch/s_fma.c deleted file mode 100644 index 9a680c68fc..0000000000 --- a/sysdeps/x86_64/multiarch/s_fma.c +++ /dev/null @@ -1,43 +0,0 @@ -/* FMA version of fma. - Copyright (C) 2009, 2010 Free Software Foundation, Inc. - Contributed by Intel Corporation. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -#include -#include -#include - -#ifdef HAVE_AVX_SUPPORT - -extern double __fma_sse2 (double x, double y, double z) attribute_hidden; - - -static double -__fma_fma (double x, double y, double z) -{ - asm ("vfmadd213sd %3, %2, %0" : "=x" (x) : "0" (x), "x" (y), "xm" (z)); - return x; -} - -libm_ifunc (__fma, HAS_FMA ? __fma_fma : __fma_sse2); -weak_alias (__fma, fma) - -# define __fma __fma_sse2 -#endif - -#include diff --git a/sysdeps/x86_64/multiarch/s_fmaf.c b/sysdeps/x86_64/multiarch/s_fmaf.c deleted file mode 100644 index 85ef65a50e..0000000000 --- a/sysdeps/x86_64/multiarch/s_fmaf.c +++ /dev/null @@ -1,42 +0,0 @@ -/* FMA version of fmaf. - Copyright (C) 2009, 2010 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -#include -#include -#include - -#ifdef HAVE_AVX_SUPPORT - -extern float __fmaf_sse2 (float x, float y, float z) attribute_hidden; - - -static float -__fmaf_fma (float x, float y, float z) -{ - asm ("vfmadd213ss %3, %2, %0" : "=x" (x) : "0" (x), "x" (y), "xm" (z)); - return x; -} - -libm_ifunc (__fmaf, HAS_FMA ? __fmaf_fma : __fmaf_sse2); -weak_alias (__fmaf, fmaf) - -# define __fmaf __fmaf_sse2 -#endif - -#include -- cgit v1.2.3