AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-22 13:00:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

powerpc: Use generic wcschr optimization

Browse Source 
This patch removes the power6 wcschr optimization and uses generic
implementation instead.  Currently, both power6 and power7 IFUNC variant
resulting binary are essentially the same and the generic implementation
with unrolling loop set to 8 also results in similar performance.

Checked on powerpc64-linux-gnu.

	* sysdeps/powerpc/Makefile [$(subdir) == wcsmbs] (CFLAGS-wcschr.c):
	New rule.
	* sysdeps/powerpc/power6/wcschr.c: Remove file.
	* sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-power6.c:
	Likewise.
	* sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-power7.c:
	Likewise.
	* sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c:
	Likewise.
	* sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/wcschr-power6.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/wcschr-power7.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/wcschr-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/wcschr.c: Likewise.
	* sysdeps/powerpc/powerpc64/power6/wcschr.c: Likewise.
	* sysdeps/powerpc/powerpc32/power4/multiarch/Makefile
	[$(subdir) == wcsmbs] (sysdeps_routines): Remove wcschr-power6 and
	wcschr-power7.
	(CFLAGS-wcschr-power7.c, CFLAGS-wcschr-power6.c): Remove rule.
	* sysdeps/powerpc/powerpc64/multiarch/Makefile: Likewise.
	* sysdeps/powerpc/powerpc32/power4/multiarch/ifunc-impl-list.c:
	Remove wcschr optimizations.
	* sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c: Likewise.
This commit is contained in:
Adhemerval Zanella 2019-02-27 15:15:51 -03:00
parent 7ba0100c6a
commit 421e3005ca
16 changed files with 27 additions and 362 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ChangeLog
View File

@ -1,5 +1,29 @@
2019-04-04 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* sysdeps/powerpc/Makefile [$(subdir) == wcsmbs] (CFLAGS-wcschr.c):
New rule.
* sysdeps/powerpc/power6/wcschr.c: Remove file.
* sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-power6.c:
Likewise.
* sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-power7.c:
Likewise.
* sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c:
Likewise.
* sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c: Likewise.
* sysdeps/powerpc/powerpc64/multiarch/wcschr-power6.c: Likewise.
* sysdeps/powerpc/powerpc64/multiarch/wcschr-power7.c: Likewise.
* sysdeps/powerpc/powerpc64/multiarch/wcschr-ppc64.c: Likewise.
* sysdeps/powerpc/powerpc64/multiarch/wcschr.c: Likewise.
* sysdeps/powerpc/powerpc64/power6/wcschr.c: Likewise.
* sysdeps/powerpc/powerpc32/power4/multiarch/Makefile
[$(subdir) == wcsmbs] (sysdeps_routines): Remove wcschr-power6 and
wcschr-power7.
(CFLAGS-wcschr-power7.c, CFLAGS-wcschr-power6.c): Remove rule.
* sysdeps/powerpc/powerpc64/multiarch/Makefile: Likewise.
* sysdeps/powerpc/powerpc32/power4/multiarch/ifunc-impl-list.c:
Remove wcschr optimizations.
* sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c: Likewise.
* wcsmbs/wcschr.c (WCSCHR): Use loop_unroll.h to parametrize
the loop unroll.

1
sysdeps/powerpc/Makefile
View File

@ -49,4 +49,5 @@ endif
ifeq ($(subdir),wcsmbs)
CFLAGS-wcscpy.c += -DUNROLL_NTIMES=8
CFLAGS-wcschr.c += -DUNROLL_NTIMES=8
endif

96
sysdeps/powerpc/power6/wcschr.c
View File

@ -1,96 +0,0 @@
/* wcschr.c - Wide Character Search for POWER6+.
Copyright (C) 2012-2019 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; see the file COPYING.LIB. If
not, see <http://www.gnu.org/licenses/>. */
#include <wchar.h>
#ifndef WCSCHR
# define WCSCHR __wcschr
# define DEFAULT_WCSCHR
#endif
/* Find the first occurrence of WC in WCS. */
wchar_t *
WCSCHR (const wchar_t *wcs, const wchar_t wc)
{
const wchar_t *wcs2 = wcs + 1;
if (*wcs == wc)
return (wchar_t *) wcs;
if (*wcs == L'\0')
return NULL;
do
{
wcs += 2;
if (*wcs2 == wc)
return (wchar_t *) wcs2;
if (*wcs2 == L'\0')
return NULL;
wcs2 += 2;
if (*wcs == wc)
return (wchar_t *) wcs;
if (*wcs == L'\0')
return NULL;
wcs += 2;
if (*wcs2 == wc)
return (wchar_t *) wcs2;
if (*wcs2 == L'\0')
return NULL;
wcs2 += 2;
if (*wcs == wc)
return (wchar_t *) wcs;
if (*wcs == L'\0')
return NULL;
wcs += 2;
if (*wcs2 == wc)
return (wchar_t *) wcs2;
if (*wcs2 == L'\0')
return NULL;
wcs2 += 2;
if (*wcs == wc)
return (wchar_t *) wcs;
if (*wcs == L'\0')
return NULL;
wcs += 2;
if (*wcs2 == wc)
return (wchar_t *) wcs2;
if (*wcs2 == L'\0')
return NULL;
wcs2 += 2;
if (*wcs == wc)
return (wchar_t *) wcs;
}
while (*wcs != L'\0');
return NULL;
}
#ifdef DEFAULT_WCSCHR
libc_hidden_def (__wcschr)
weak_alias (__wcschr, wcschr)
libc_hidden_weak (wcschr)
#else
libc_hidden_def (wcschr)
#endif

5
sysdeps/powerpc/powerpc32/power4/multiarch/Makefile
View File

@ -17,11 +17,8 @@ CFLAGS-strncase_l-power7.c += -mcpu=power7 -funroll-loops
endif
ifeq ($(subdir),wcsmbs)
sysdep_routines += wcschr-power7 wcschr-power6 wcschr-ppc32 \
wcsrchr-power7 wcsrchr-power6 wcsrchr-ppc32
sysdep_routines += wcsrchr-power7 wcsrchr-power6 wcsrchr-ppc32
CFLAGS-wcschr-power7.c += -mcpu=power7
CFLAGS-wcschr-power6.c += -mcpu=power6
CFLAGS-wcsrchr-power7.c += -mcpu=power7
CFLAGS-wcsrchr-power6.c += -mcpu=power6
endif

11
sysdeps/powerpc/powerpc32/power4/multiarch/ifunc-impl-list.c
View File

@ -187,17 +187,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
IFUNC_IMPL_ADD (array, i, strchr, 1,
__strchr_ppc))
/* Support sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c. */
IFUNC_IMPL (i, name, wcschr,
IFUNC_IMPL_ADD (array, i, wcschr,
hwcap & PPC_FEATURE_HAS_VSX,
__wcschr_power7)
IFUNC_IMPL_ADD (array, i, wcschr,
hwcap & PPC_FEATURE_ARCH_2_05,
__wcschr_power6)
IFUNC_IMPL_ADD (array, i, wcschr, 1,
__wcschr_ppc))
/* Support sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr.c. */
IFUNC_IMPL (i, name, wcsrchr,
IFUNC_IMPL_ADD (array, i, wcsrchr,

26
sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-power6.c
View File

@ -1,26 +0,0 @@
/* wcschr.c - Wide Character Search for powerpc32/power6.
Copyright (C) 2013-2019 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; see the file COPYING.LIB. If
not, see <http://www.gnu.org/licenses/>. */
#include <wchar.h>
#define WCSCHR __wcschr_power6
#undef libc_hidden_def
#define libc_hidden_def(name)
#include <sysdeps/powerpc/power6/wcschr.c>

26
sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-power7.c
View File

@ -1,26 +0,0 @@
/* wcschr.c - Wide Character Search for powerpc32/power7.
Copyright (C) 2013-2019 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; see the file COPYING.LIB. If
not, see <http://www.gnu.org/licenses/>. */
#include <wchar.h>
#define WCSCHR __wcschr_power7
#undef libc_hidden_def
#define libc_hidden_def(name)
#include <sysdeps/powerpc/power6/wcschr.c>

43
sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c
View File

@ -1,43 +0,0 @@
/* Copyright (C) 2013-2019 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, see
<http://www.gnu.org/licenses/>. */
#include <wchar.h>
#if IS_IN (libc)
# undef libc_hidden_weak
# define libc_hidden_weak(name)
# undef weak_alias
# undef libc_hidden_def
# ifdef SHARED
# define libc_hidden_def(name) \
__hidden_ver1 (__wcschr_ppc, __GI_wcschr, __wcschr_ppc); \
strong_alias (__wcschr_ppc, __wcschr_ppc_1); \
__hidden_ver1 (__wcschr_ppc_1, __GI___wcschr, __wcschr_ppc_1);
# define weak_alias(name,alias)
# else
# define weak_alias(name, alias) \
_weak_alias(__wcschr_ppc, __wcschr)
# define libc_hidden_def(name)
# endif /* SHARED */
#endif
extern __typeof (wcschr) __wcschr_ppc;
#define WCSCHR __wcschr_ppc
#include <wcsmbs/wcschr.c>

41
sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c
View File

@ -1,41 +0,0 @@
/* Multiple versions of wcschr
Copyright (C) 2013-2019 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, see
<http://www.gnu.org/licenses/>. */
#if IS_IN (libc)
# define wcschr __redirect_wcschr
# include <wchar.h>
# include <shlib-compat.h>
# include "init-arch.h"
extern __typeof (__redirect_wcschr) __wcschr_ppc attribute_hidden;
extern __typeof (__redirect_wcschr) __wcschr_power6 attribute_hidden;
extern __typeof (__redirect_wcschr) __wcschr_power7 attribute_hidden;
extern __typeof (__redirect_wcschr) __libc_wcschr;
libc_ifunc (__libc_wcschr,
(hwcap & PPC_FEATURE_HAS_VSX)
? __wcschr_power7 :
(hwcap & PPC_FEATURE_ARCH_2_05)
? __wcschr_power6
: __wcschr_ppc);
#undef wcschr
weak_alias (__libc_wcschr, wcschr)
#else
#include <wcsmbs/wcschr.c>
#endif

5
sysdeps/powerpc/powerpc64/multiarch/Makefile
View File

@ -39,11 +39,8 @@ CFLAGS-strncase_l-power7.c += -mcpu=power7 -funroll-loops
endif
ifeq ($(subdir),wcsmbs)
sysdep_routines += wcschr-power7 wcschr-power6 wcschr-ppc64 \
wcsrchr-power7 wcsrchr-power6 wcsrchr-ppc64
sysdep_routines += wcsrchr-power7 wcsrchr-power6 wcsrchr-ppc64
CFLAGS-wcschr-power7.c += -mcpu=power7
CFLAGS-wcschr-power6.c += -mcpu=power6
CFLAGS-wcsrchr-power7.c += -mcpu=power7
CFLAGS-wcsrchr-power6.c += -mcpu=power6
endif

11
sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
View File

@ -260,17 +260,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
IFUNC_IMPL_ADD (array, i, strncasecmp_l, 1,
__strncasecmp_l_ppc))
/* Support sysdeps/powerpc/powerpc64/multiarch/wcschr.c. */
IFUNC_IMPL (i, name, wcschr,
IFUNC_IMPL_ADD (array, i, wcschr,
hwcap & PPC_FEATURE_HAS_VSX,
__wcschr_power7)
IFUNC_IMPL_ADD (array, i, wcschr,
hwcap & PPC_FEATURE_ARCH_2_05,
__wcschr_power6)
IFUNC_IMPL_ADD (array, i, wcschr, 1,
__wcschr_ppc))
/* Support sysdeps/powerpc/powerpc64/multiarch/wcschr.c. */
IFUNC_IMPL (i, name, wcsrchr,
IFUNC_IMPL_ADD (array, i, wcsrchr,

19
sysdeps/powerpc/powerpc64/multiarch/wcschr-power6.c
View File

@ -1,19 +0,0 @@
/* wcschr.c - Wide Character Search for powerpc64/power6.
Copyright (C) 2013-2019 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; see the file COPYING.LIB. If
not, see <http://www.gnu.org/licenses/>. */
#include <sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-power6.c>

19
sysdeps/powerpc/powerpc64/multiarch/wcschr-power7.c
View File

@ -1,19 +0,0 @@
/* wcschr.c - Wide Character Search for powerpc64/power7.
Copyright (C) 2013-2019 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; see the file COPYING.LIB. If
not, see <http://www.gnu.org/licenses/>. */
#include <sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-power7.c>

18
sysdeps/powerpc/powerpc64/multiarch/wcschr-ppc64.c
View File

@ -1,18 +0,0 @@
/* Copyright (C) 2013-2019 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, see
<http://www.gnu.org/licenses/>. */
#include <sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c>

43
sysdeps/powerpc/powerpc64/multiarch/wcschr.c
View File

@ -1,43 +0,0 @@
/* Multiple versions of wcschr
Copyright (C) 2013-2019 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, see
<http://www.gnu.org/licenses/>. */
#if IS_IN (libc)
# define wcschr __redirect_wcschr
# define __wcschr __redirect___wcschr
# include <wchar.h>
# include <shlib-compat.h>
# include "init-arch.h"
extern __typeof (wcschr) __wcschr_ppc attribute_hidden;
extern __typeof (wcschr) __wcschr_power6 attribute_hidden;
extern __typeof (wcschr) __wcschr_power7 attribute_hidden;
# undef wcschr
# undef __wcschr
libc_ifunc_redirected (__redirect___wcschr, __wcschr,
(hwcap & PPC_FEATURE_HAS_VSX)
? __wcschr_power7
: (hwcap & PPC_FEATURE_ARCH_2_05)
? __wcschr_power6
: __wcschr_ppc);
weak_alias (__wcschr, wcschr)
#else
#undef libc_hidden_def
#define libc_hidden_def(a)
#include <wcsmbs/wcschr.c>
#endif

1
sysdeps/powerpc/powerpc64/power6/wcschr.c
View File

@ -1 +0,0 @@
#include <sysdeps/powerpc/power6/wcschr.c>