AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-11 03:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

PowerPC: multiarch wordcopy routines for PowerPC32

Browse Source
This commit is contained in:
Adhemerval Zanella 2013-10-14 09:59:59 -05:00
parent 93be09e725
commit ea5a72f882
10 changed files with 224 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ChangeLog
View File

@ -1,3 +1,24 @@
2013-12-06 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
* sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-power6.c: New
file.
* sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-power7.c: New
file.
* sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-ppc32.c: New
file.
* sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy.c: New file:
multiarch wordcopy for PPC32.
* sysdeps/powerpc/powerpc32/power4/multiarch/Makefile: Added wcscpy
wordcopy objects.
* sysdeps/powerpc/powerpc32/power4/multiarch/ifunc-impl-list
(__libc_ifunc_impl_list): Likewise.
* sysdeps/powerpc/powerpc32/power4/wordcopy.c: Move ...
* sysdeps/powerpc/power4/wordcopy.c: ... to here.
* sysdeps/powerpc/powerpc32/power6/wordcopy.c: Move ...
* sysdeps/powerpc/power6/wordcopy.c: ... to here.
* sysdeps/powerpc/powerpc64/power6/wordcopy.c: Remove uneeded file.
* sysdeps/powerpc/powerpc64/power4/wordcopy.c: Likewise.
2013-12-06 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
* wcsmbs/wcscpy.c (wcscpy): Using macro to redefine symbol name

36
sysdeps/powerpc/powerpc32/power4/wordcopy.c → sysdeps/powerpc/power4/wordcopy.c
View File

@ -26,11 +26,12 @@
block beginning at DSTP with LEN `op_t' words (not LEN bytes!).
Both SRCP and DSTP should be aligned for memory operations on `op_t's. */
#ifndef WORDCOPY_FWD_ALIGNED
# define WORDCOPY_FWD_ALIGNED _wordcopy_fwd_aligned
#endif
void
_wordcopy_fwd_aligned (dstp, srcp, len)
long int dstp;
long int srcp;
size_t len;
WORDCOPY_FWD_ALIGNED (long int dstp, long int srcp, size_t len)
{
op_t a0, a1;
@ -64,11 +65,12 @@ _wordcopy_fwd_aligned (dstp, srcp, len)
DSTP should be aligned for memory operations on `op_t's, but SRCP must
*not* be aligned. */
#ifndef WORDCOPY_FWD_DEST_ALIGNED
# define WORDCOPY_FWD_DEST_ALIGNED _wordcopy_fwd_dest_aligned
#endif
void
_wordcopy_fwd_dest_aligned (dstp, srcp, len)
long int dstp;
long int srcp;
size_t len;
WORDCOPY_FWD_DEST_ALIGNED (long int dstp, long int srcp, size_t len)
{
op_t a0, a1, a2;
int sh_1, sh_2;
@ -118,11 +120,12 @@ _wordcopy_fwd_dest_aligned (dstp, srcp, len)
(not LEN bytes!). Both SRCP and DSTP should be aligned for memory
operations on `op_t's. */
#ifndef WORDCOPY_BWD_ALIGNED
# define WORDCOPY_BWD_ALIGNED _wordcopy_bwd_aligned
#endif
void
_wordcopy_bwd_aligned (dstp, srcp, len)
long int dstp;
long int srcp;
size_t len;
WORDCOPY_BWD_ALIGNED (long int dstp, long int srcp, size_t len)
{
op_t a0, a1;
@ -157,11 +160,12 @@ _wordcopy_bwd_aligned (dstp, srcp, len)
words (not LEN bytes!). DSTP should be aligned for memory
operations on `op_t', but SRCP must *not* be aligned. */
#ifndef WORDCOPY_BWD_DEST_ALIGNED
# define WORDCOPY_BWD_DEST_ALIGNED _wordcopy_bwd_dest_aligned
#endif
void
_wordcopy_bwd_dest_aligned (dstp, srcp, len)
long int dstp;
long int srcp;
size_t len;
WORDCOPY_BWD_DEST_ALIGNED (long int dstp, long int srcp, size_t len)
{
op_t a0, a1, a2;
int sh_1, sh_2;

44
sysdeps/powerpc/powerpc32/power6/wordcopy.c → sysdeps/powerpc/power6/wordcopy.c
View File

@ -27,11 +27,12 @@
block beginning at DSTP with LEN `op_t' words (not LEN bytes!).
Both SRCP and DSTP should be aligned for memory operations on `op_t's. */
#ifndef WORDCOPY_FWD_ALIGNED
# define WORDCOPY_FWD_ALIGNED _wordcopy_fwd_aligned
#endif
void
_wordcopy_fwd_aligned (dstp, srcp, len)
long int dstp;
long int srcp;
size_t len;
WORDCOPY_FWD_ALIGNED (long int dstp, long int srcp, size_t len)
{
op_t a0, a1;
@ -70,8 +71,8 @@ _wordcopy_fwd_aligned (dstp, srcp, len)
{ \
a1 = ((op_t *) srcp)[1]; \
a2 = ((op_t *) srcp)[2]; \
((op_t *) dstp)[0] = MERGE (a0, align*8, a1, (32-align*8)); \
((op_t *) dstp)[1] = MERGE (a1, align*8, a2, (32-align*8)); \
((op_t *) dstp)[0] = MERGE (a0, align*8, a1, (__WORDSIZE-align*8)); \
((op_t *) dstp)[1] = MERGE (a1, align*8, a2, (__WORDSIZE-align*8)); \
a0 = a2; \
srcp += 2 * OPSIZ; \
dstp += 2 * OPSIZ; \
@ -79,11 +80,12 @@ _wordcopy_fwd_aligned (dstp, srcp, len)
} \
while (len != 0)
#ifndef WORDCOPY_FWD_DEST_ALIGNED
# define WORDCOPY_FWD_DEST_ALIGNED _wordcopy_fwd_dest_aligned
#endif
void
_wordcopy_fwd_dest_aligned (dstp, srcp, len)
long int dstp;
long int srcp;
size_t len;
WORDCOPY_FWD_DEST_ALIGNED (long int dstp, long int srcp, size_t len)
{
op_t a0, a1, a2;
int sh_1, sh_2;
@ -124,11 +126,12 @@ _wordcopy_fwd_dest_aligned (dstp, srcp, len)
(not LEN bytes!). Both SRCP and DSTP should be aligned for memory
operations on `op_t's. */
#ifndef WORDCOPY_BWD_ALIGNED
# define WORDCOPY_BWD_ALIGNED _wordcopy_bwd_aligned
#endif
void
_wordcopy_bwd_aligned (dstp, srcp, len)
long int dstp;
long int srcp;
size_t len;
WORDCOPY_BWD_ALIGNED (long int dstp, long int srcp, size_t len)
{
op_t a0, a1;
@ -165,8 +168,8 @@ _wordcopy_bwd_aligned (dstp, srcp, len)
dstp -= 2 * OPSIZ; \
a1 = ((op_t *) srcp)[1]; \
a0 = ((op_t *) srcp)[0]; \
((op_t *) dstp)[1] = MERGE (a1, align*8, a2, (32-align*8)); \
((op_t *) dstp)[0] = MERGE (a0, align*8, a1, (32-align*8)); \
((op_t *) dstp)[1] = MERGE (a1, align*8, a2, (__WORDSIZE-align*8)); \
((op_t *) dstp)[0] = MERGE (a0, align*8, a1, (__WORDSIZE-align*8)); \
a2 = a0; \
len -= 2; \
} \
@ -177,11 +180,12 @@ _wordcopy_bwd_aligned (dstp, srcp, len)
words (not LEN bytes!). DSTP should be aligned for memory
operations on `op_t', but SRCP must *not* be aligned. */
#ifndef WORDCOPY_BWD_DEST_ALIGNED
# define WORDCOPY_BWD_DEST_ALIGNED _wordcopy_bwd_dest_aligned
#endif
void
_wordcopy_bwd_dest_aligned (dstp, srcp, len)
long int dstp;
long int srcp;
size_t len;
WORDCOPY_BWD_DEST_ALIGNED (long int dstp, long int srcp, size_t len)
{
op_t a0, a1, a2;
int sh_1, sh_2;

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

@ -10,7 +10,8 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \
strncase_l-power7 strchrnul-power7 strchrnul-ppc32 \
strchr-power7 strchr-ppc32 wcschr-power7 wcschr-power6 \
wcschr-ppc32 wcsrchr-power7 wcsrchr-power6 wcsrchr-ppc32 \
wcscpy-power7 wcscpy-power6 wcscpy-ppc32
wcscpy-power7 wcscpy-power6 wcscpy-ppc32 wordcopy-power7 \
wordcopy-power6 wordcopy-ppc32
CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops
CFLAGS-strncase_l-power7.c += -mcpu=power7 -funroll-loops
@ -18,4 +19,6 @@ 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

23
sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-power6.c Normal file
View File

@ -0,0 +1,23 @@
/* Copyright (C) 2013 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 WORDCOPY_FWD_ALIGNED _wordcopy_fwd_aligned_power6
#define WORDCOPY_FWD_DEST_ALIGNED _wordcopy_fwd_dest_aligned_power6
#define WORDCOPY_BWD_ALIGNED _wordcopy_bwd_aligned_power6
#define WORDCOPY_BWD_DEST_ALIGNED _wordcopy_bwd_dest_aligned_power6
#include <sysdeps/powerpc/power6/wordcopy.c>

23
sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-power7.c Normal file
View File

@ -0,0 +1,23 @@
/* Copyright (C) 2013 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 WORDCOPY_FWD_ALIGNED _wordcopy_fwd_aligned_power7
#define WORDCOPY_FWD_DEST_ALIGNED _wordcopy_fwd_dest_aligned_power7
#define WORDCOPY_BWD_ALIGNED _wordcopy_bwd_aligned_power7
#define WORDCOPY_BWD_DEST_ALIGNED _wordcopy_bwd_dest_aligned_power7
#include <sysdeps/powerpc/power6/wordcopy.c>

23
sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-ppc32.c Normal file
View File

@ -0,0 +1,23 @@
/* Copyright (C) 2013 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 WORDCOPY_FWD_ALIGNED _wordcopy_fwd_aligned_ppc
#define WORDCOPY_FWD_DEST_ALIGNED _wordcopy_fwd_dest_aligned_ppc
#define WORDCOPY_BWD_ALIGNED _wordcopy_bwd_aligned_ppc
#define WORDCOPY_BWD_DEST_ALIGNED _wordcopy_bwd_dest_aligned_ppc
#include <sysdeps/powerpc/power4/wordcopy.c>

86
sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy.c Normal file
View File

@ -0,0 +1,86 @@
/* Multiple versions of wordcopy functions.
Copyright (C) 2013 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/>. */
#ifndef NOT_IN_libc
# include <stddef.h>
# include <memcopy.h>
# include <shlib-compat.h>
# include "init-arch.h"
extern __typeof (_wordcopy_fwd_aligned) _wordcopy_fwd_aligned_ppc
attribute_hidden;
extern __typeof (_wordcopy_fwd_aligned) _wordcopy_fwd_aligned_power6
attribute_hidden;
extern __typeof (_wordcopy_fwd_aligned) _wordcopy_fwd_aligned_power7
attribute_hidden;
libc_ifunc (_wordcopy_fwd_aligned,
(hwcap & PPC_FEATURE_HAS_VSX)
? _wordcopy_fwd_aligned_power7 :
(hwcap & PPC_FEATURE_ARCH_2_05)
? _wordcopy_fwd_aligned_power6
: _wordcopy_fwd_aligned_ppc);
extern __typeof (_wordcopy_fwd_dest_aligned) _wordcopy_fwd_dest_aligned_ppc
attribute_hidden;
extern __typeof (_wordcopy_fwd_dest_aligned) _wordcopy_fwd_dest_aligned_power6
attribute_hidden;
extern __typeof (_wordcopy_fwd_dest_aligned) _wordcopy_fwd_dest_aligned_power7
attribute_hidden;
libc_ifunc (_wordcopy_fwd_dest_aligned,
(hwcap & PPC_FEATURE_HAS_VSX)
? _wordcopy_fwd_dest_aligned_power7 :
(hwcap & PPC_FEATURE_ARCH_2_05)
? _wordcopy_fwd_dest_aligned_power6
: _wordcopy_fwd_dest_aligned_ppc);
extern __typeof (_wordcopy_bwd_aligned) _wordcopy_bwd_aligned_ppc
attribute_hidden;
extern __typeof (_wordcopy_bwd_aligned) _wordcopy_bwd_aligned_power6
attribute_hidden;
extern __typeof (_wordcopy_bwd_aligned) _wordcopy_bwd_aligned_power7
attribute_hidden;
libc_ifunc (_wordcopy_bwd_aligned,
(hwcap & PPC_FEATURE_HAS_VSX)
? _wordcopy_bwd_aligned_power7 :
(hwcap & PPC_FEATURE_ARCH_2_05)
? _wordcopy_bwd_aligned_power6
: _wordcopy_bwd_aligned_ppc);
extern __typeof (_wordcopy_bwd_dest_aligned) _wordcopy_bwd_dest_aligned_ppc
attribute_hidden;
extern __typeof (_wordcopy_bwd_dest_aligned) _wordcopy_bwd_dest_aligned_power6
attribute_hidden;
extern __typeof (_wordcopy_bwd_dest_aligned) _wordcopy_bwd_dest_aligned_power7
attribute_hidden;
libc_ifunc (_wordcopy_bwd_dest_aligned,
(hwcap & PPC_FEATURE_HAS_VSX)
? _wordcopy_bwd_dest_aligned_power7 :
(hwcap & PPC_FEATURE_ARCH_2_05)
? _wordcopy_bwd_dest_aligned_power6
: _wordcopy_bwd_dest_aligned_ppc);
#else
#include <sysdeps/powerpc/power4/wordcopy.c>
#endif

1
sysdeps/powerpc/powerpc64/power4/wordcopy.c
View File

@ -1 +0,0 @@
#include "../../powerpc32/power4/wordcopy.c"

217
sysdeps/powerpc/powerpc64/power6/wordcopy.c
View File

@ -1,217 +0,0 @@
/* _memcopy.c -- subroutines for memory copy functions.
Copyright (C) 1991-2013 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Torbjorn Granlund (tege@sics.se).
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/>. */
/* BE VERY CAREFUL IF YOU CHANGE THIS CODE...! */
#include <stddef.h>
#include <memcopy.h>
/* _wordcopy_fwd_aligned -- Copy block beginning at SRCP to
block beginning at DSTP with LEN `op_t' words (not LEN bytes!).
Both SRCP and DSTP should be aligned for memory operations on `op_t's. */
void
_wordcopy_fwd_aligned (dstp, srcp, len)
long int dstp;
long int srcp;
size_t len;
{
op_t a0, a1;
if (len & 1)
{
((op_t *) dstp)[0] = ((op_t *) srcp)[0];
if (len == 1)
return;
srcp += OPSIZ;
dstp += OPSIZ;
len -= 1;
}
do
{
a0 = ((op_t *) srcp)[0];
a1 = ((op_t *) srcp)[1];
((op_t *) dstp)[0] = a0;
((op_t *) dstp)[1] = a1;
srcp += 2 * OPSIZ;
dstp += 2 * OPSIZ;
len -= 2;
}
while (len != 0);
}
#define fwd_align_merge(align) \
do \
{ \
a1 = ((op_t *) srcp)[1]; \
a2 = ((op_t *) srcp)[2]; \
((op_t *) dstp)[0] = MERGE (a0, align*8, a1, (64-align*8)); \
((op_t *) dstp)[1] = MERGE (a1, align*8, a2, (64-align*8)); \
a0 = a2; \
srcp += 2 * OPSIZ; \
dstp += 2 * OPSIZ; \
len -= 2; \
} \
while (len != 0)
/* _wordcopy_fwd_dest_aligned -- Copy block beginning at SRCP to
block beginning at DSTP with LEN `op_t' words (not LEN bytes!).
DSTP should be aligned for memory operations on `op_t's, but SRCP must
*not* be aligned. */
void
_wordcopy_fwd_dest_aligned (dstp, srcp, len)
long int dstp;
long int srcp;
size_t len;
{
op_t a0, a1, a2;
int sh_1, sh_2;
int align;
/* Calculate how to shift a word read at the memory operation
aligned srcp to make it aligned for copy. */
align = srcp % OPSIZ;
sh_1 = 8 * (srcp % OPSIZ);
sh_2 = 8 * OPSIZ - sh_1;
/* Make SRCP aligned by rounding it down to the beginning of the `op_t'
it points in the middle of. */
srcp &= -OPSIZ;
a0 = ((op_t *) srcp)[0];
if (len & 1)
{
a1 = ((op_t *) srcp)[1];
((op_t *) dstp)[0] = MERGE (a0, sh_1, a1, sh_2);
if (len == 1)
return;
a0 = a1;
srcp += OPSIZ;
dstp += OPSIZ;
len -= 1;
}
fwd_align_merge (align);
}
/* _wordcopy_bwd_aligned -- Copy block finishing right before
SRCP to block finishing right before DSTP with LEN `op_t' words
(not LEN bytes!). Both SRCP and DSTP should be aligned for memory
operations on `op_t's. */
void
_wordcopy_bwd_aligned (dstp, srcp, len)
long int dstp;
long int srcp;
size_t len;
{
op_t a0, a1;
if (len & 1)
{
srcp -= OPSIZ;
dstp -= OPSIZ;
((op_t *) dstp)[0] = ((op_t *) srcp)[0];
if (len == 1)
return;
len -= 1;
}
do
{
srcp -= 2 * OPSIZ;
dstp -= 2 * OPSIZ;
a1 = ((op_t *) srcp)[1];
a0 = ((op_t *) srcp)[0];
((op_t *) dstp)[1] = a1;
((op_t *) dstp)[0] = a0;
len -= 2;
}
while (len != 0);
}
#define bwd_align_merge(align) \
do \
{ \
srcp -= 2 * OPSIZ; \
dstp -= 2 * OPSIZ; \
a1 = ((op_t *) srcp)[1]; \
a0 = ((op_t *) srcp)[0]; \
((op_t *) dstp)[1] = MERGE (a1, align*8, a2, (64-align*8)); \
((op_t *) dstp)[0] = MERGE (a0, align*8, a1, (64-align*8)); \
a2 = a0; \
len -= 2; \
} \
while (len != 0)
/* _wordcopy_bwd_dest_aligned -- Copy block finishing right
before SRCP to block finishing right before DSTP with LEN `op_t'
words (not LEN bytes!). DSTP should be aligned for memory
operations on `op_t', but SRCP must *not* be aligned. */
void
_wordcopy_bwd_dest_aligned (dstp, srcp, len)
long int dstp;
long int srcp;
size_t len;
{
op_t a0, a1, a2;
int sh_1, sh_2;
int align;
/* Calculate how to shift a word read at the memory operation
aligned srcp to make it aligned for copy. */
align = srcp % OPSIZ;
sh_1 = 8 * (srcp % OPSIZ);
sh_2 = 8 * OPSIZ - sh_1;
/* Make srcp aligned by rounding it down to the beginning of the op_t
it points in the middle of. */
srcp &= -OPSIZ;
a2 = ((op_t *) srcp)[0];
if (len & 1)
{
srcp -= OPSIZ;
dstp -= OPSIZ;
a1 = ((op_t *) srcp)[0];
((op_t *) dstp)[0] = MERGE (a1, sh_1, a2, sh_2);
if (len == 1)
return;
a2 = a1;
len -= 1;
}
bwd_align_merge (align);
}