mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-12-09 04:11:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

powerpc: Use generic wcscpy optimization

Browse Source 
This patch removes the power6 wcscpy 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-wcscpy.c):
	New rule.
	* sysdeps/powerpc/power6/wcscpy.c: Remove file.
	* sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-power6.c:
	Likewise.
	* sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-power7.c:
	Likewise.
	* sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-ppc32.c:
	Likewise.
	* sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/wcscpy-power6.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/wcscpy-power7.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/wcscpy-ppc64.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/wcscpy.c: Likewise.
	* sysdeps/powerpc/powerpc64/power6/wcscpy.c: Likewise.
	* sysdeps/powerpc/powerpc32/power4/multiarch/Makefile
	[$(subdir) == wcsmbs] (sysdeps_routines): Remove wcscpy-power6 and
	wcscpy-power7.
	(CFLAGS-wcscpy-power7.c, CFLAGS-wcscpy-power6.c): Remove rule.
	* sysdeps/powerpc/powerpc64/multiarch/Makefile: Likewise.
	* sysdeps/powerpc/powerpc32/power4/multiarch/ifunc-impl-list.c:
	Remove wcscpy optimizations.
	* sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c: Likewise.
This commit is contained in:
Adhemerval Zanella 2019-02-27 11:21:35 -03:00
parent e3fd0b0e93
commit 447a1306c3
16 changed files with 30 additions and 337 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-wcscpy.c):
New rule.
* sysdeps/powerpc/power6/wcscpy.c: Remove file.
* sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-power6.c:
Likewise.
* sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-power7.c:
Likewise.
* sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-ppc32.c:
Likewise.
* sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy.c: Likewise.
* sysdeps/powerpc/powerpc64/multiarch/wcscpy-power6.c: Likewise.
* sysdeps/powerpc/powerpc64/multiarch/wcscpy-power7.c: Likewise.
* sysdeps/powerpc/powerpc64/multiarch/wcscpy-ppc64.c: Likewise.
* sysdeps/powerpc/powerpc64/multiarch/wcscpy.c: Likewise.
* sysdeps/powerpc/powerpc64/power6/wcscpy.c: Likewise.
* sysdeps/powerpc/powerpc32/power4/multiarch/Makefile
[$(subdir) == wcsmbs] (sysdeps_routines): Remove wcscpy-power6 and
wcscpy-power7.
(CFLAGS-wcscpy-power7.c, CFLAGS-wcscpy-power6.c): Remove rule.
* sysdeps/powerpc/powerpc64/multiarch/Makefile: Likewise.
* sysdeps/powerpc/powerpc32/power4/multiarch/ifunc-impl-list.c:
Remove wcscpy optimizations.
* sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c: Likewise.
* include/loop_unroll.h: New file.
* wcsmbs/wcscpy (__wcscpy): Add option to use loop unrolling
besides generic implementation.

4
sysdeps/powerpc/Makefile
View File

@ -46,3 +46,7 @@ sysdep_headers += sys/platform/ppc.h
tests += test-gettimebase
tests += tst-set_ppr
endif
ifeq ($(subdir),wcsmbs)
CFLAGS-wcscpy.c += -DUNROLL_NTIMES=8
endif

105
sysdeps/powerpc/power6/wcscpy.c
View File

@ -1,105 +0,0 @@
/* wcscpy.c - Wide Character Copy 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 <stddef.h>
#include <wchar.h>
#ifndef WCSCPY
# define WCSCPY wcscpy
#endif
/* Copy SRC to DEST. */
wchar_t *
WCSCPY (wchar_t *dest, const wchar_t *src)
{
wint_t c,d;
wchar_t *wcp, *wcp2;
if (__alignof__ (wchar_t) >= sizeof (wchar_t))
{
const ptrdiff_t off = dest - src;
wcp = (wchar_t *) src;
wcp2 = wcp + 1 ;
do
{
d = *wcp;
wcp[off] = d;
if (d == L'\0')
return dest;
wcp += 2;
c = *wcp2;
wcp2[off] = c;
if (c == L'\0')
return dest;
wcp2 += 2;
d = *wcp;
wcp[off] = d;
if (d == L'\0')
return dest;
wcp += 2;
c = *wcp2;
wcp2[off] = c;
if (c == L'\0')
return dest;
wcp2 += 2;
d = *wcp;
wcp[off] = d;
if (d == L'\0')
return dest;
wcp += 2;
c = *wcp2;
wcp2[off] = c;
if (c == L'\0')
return dest;
wcp2 += 2;
d = *wcp;
wcp[off] = d;
if (d == L'\0')
return dest;
wcp += 2;
c = *wcp2;
wcp2[off] = c;
if (c == L'\0')
return dest;
wcp2 += 2;
}
while (c != L'\0');
}
else
{
wcp = dest;
do
{
c = *src++;
*wcp++ = c;
}
while (c != L'\0');
}
return dest;
}

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

@ -18,13 +18,10 @@ endif
ifeq ($(subdir),wcsmbs)
sysdep_routines += wcschr-power7 wcschr-power6 wcschr-ppc32 \
wcsrchr-power7 wcsrchr-power6 wcsrchr-ppc32 \
wcscpy-power7 wcscpy-power6 wcscpy-ppc32
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
CFLAGS-wcscpy-power7.c += -mcpu=power7
CFLAGS-wcscpy-power6.c += -mcpu=power6
endif

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

@ -209,16 +209,5 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
IFUNC_IMPL_ADD (array, i, wcsrchr, 1,
__wcsrchr_ppc))
/* Support sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy.c. */
IFUNC_IMPL (i, name, wcscpy,
IFUNC_IMPL_ADD (array, i, wcscpy,
hwcap & PPC_FEATURE_HAS_VSX,
__wcscpy_power7)
IFUNC_IMPL_ADD (array, i, wcscpy,
hwcap & PPC_FEATURE_ARCH_2_05,
__wcscpy_power6)
IFUNC_IMPL_ADD (array, i, wcscpy, 1,
__wcscpy_ppc))
return i;
}

22
sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-power6.c
View File

@ -1,22 +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>
#define WCSCPY __wcscpy_power6
#include <sysdeps/powerpc/power6/wcscpy.c>

22
sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-power7.c
View File

@ -1,22 +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>
#define WCSCPY __wcscpy_power7
#include <sysdeps/powerpc/power6/wcscpy.c>

27
sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-ppc32.c
View File

@ -1,27 +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>
extern __typeof (wcscpy) __wcscpy_ppc;
#define WCSCPY __wcscpy_ppc
#include <wcsmbs/wcscpy.c>
#ifdef SHARED
__hidden_ver1 (__wcscpy_ppc, __GI___wcscpy, __wcscpy_ppc);
#endif

36
sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy.c
View File

@ -1,36 +0,0 @@
/* Multiple versions of wcscpy
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 __wcscpy __redirect_wcscpy
# include <wchar.h>
# undef __wcscpy
# include "init-arch.h"
extern __typeof (__redirect_wcscpy) __wcscpy_ppc attribute_hidden;
extern __typeof (__redirect_wcscpy) __wcscpy_power6 attribute_hidden;
extern __typeof (__redirect_wcscpy) __wcscpy_power7 attribute_hidden;
libc_ifunc_redirected (__redirect_wcscpy, __wcscpy,
(hwcap & PPC_FEATURE_HAS_VSX)
? __wcscpy_power7 :
(hwcap & PPC_FEATURE_ARCH_2_05)
? __wcscpy_power6
: __wcscpy_ppc);
weak_alias (__wcscpy, wcscpy)
#endif

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

@ -40,13 +40,10 @@ endif
ifeq ($(subdir),wcsmbs)
sysdep_routines += wcschr-power7 wcschr-power6 wcschr-ppc64 \
wcsrchr-power7 wcsrchr-power6 wcsrchr-ppc64 \
wcscpy-power7 wcscpy-power6 wcscpy-ppc64 \
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
CFLAGS-wcscpy-power7.c += -mcpu=power7
CFLAGS-wcscpy-power6.c += -mcpu=power6
endif

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

@ -282,17 +282,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
IFUNC_IMPL_ADD (array, i, wcsrchr, 1,
__wcsrchr_ppc))
/* Support sysdeps/powerpc/powerpc64/multiarch/wcscpy.c. */
IFUNC_IMPL (i, name, wcscpy,
IFUNC_IMPL_ADD (array, i, wcscpy,
hwcap & PPC_FEATURE_HAS_VSX,
__wcscpy_power7)
IFUNC_IMPL_ADD (array, i, wcscpy,
hwcap & PPC_FEATURE_ARCH_2_05,
__wcscpy_power6)
IFUNC_IMPL_ADD (array, i, wcscpy, 1,
__wcscpy_ppc))
/* Support sysdeps/powerpc/powerpc64/multiarch/strrchr.c. */
IFUNC_IMPL (i, name, strrchr,
IFUNC_IMPL_ADD (array, i, strrchr,

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

@ -1,19 +0,0 @@
/* wcscpy.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/wcscpy-power6.c>

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

@ -1,19 +0,0 @@
/* wcscpy.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/wcscpy-power7.c>

18
sysdeps/powerpc/powerpc64/multiarch/wcscpy-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/wcscpy-ppc32.c>

35
sysdeps/powerpc/powerpc64/multiarch/wcscpy.c
View File

@ -1,35 +0,0 @@
/* Multiple versions of wcscpy.
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/>. */
#define __wcscpy __redirect___wcscpy
#include <wchar.h>
#undef __wcscpy
#include <shlib-compat.h>
#include "init-arch.h"
extern __typeof (wcscpy) __wcscpy_ppc attribute_hidden;
extern __typeof (wcscpy) __wcscpy_power6 attribute_hidden;
extern __typeof (wcscpy) __wcscpy_power7 attribute_hidden;
libc_ifunc_redirected (__redirect___wcscpy, __wcscpy,
(hwcap & PPC_FEATURE_HAS_VSX)
? __wcscpy_power7 :
(hwcap & PPC_FEATURE_ARCH_2_05)
? __wcscpy_power6
: __wcscpy_ppc);
weak_alias (__wcscpy, wcscpy)

4
sysdeps/powerpc/powerpc64/power6/wcscpy.c
View File

@ -1,4 +0,0 @@
#define WCSCPY __wcscpy
#include <sysdeps/powerpc/power6/wcscpy.c>
libc_hidden_def (__wcscpy)
weak_alias (__wcscpy, wcscpy)