| Message ID | 1515588482-15744-14-git-send-email-adhemerval.zanella@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Improve generic string routines | expand |
On Wed, 10 Jan 2018, Adhemerval Zanella wrote: > +extern void link_error(void); Missing space before '('. > +static inline op_t > +MERGE(op_t w0, int shl, op_t w1, int shr) Likewise. > + if (OPSIZ == 4) > + asm("shrpw %1,%2,%%sar,%0" : "=r"(res) : "r"(w0), "r"(w1), "q"(shr)); > + else if (OPSIZ == 8) > + asm("shrpd %1,%2,%%sar,%0" : "=r"(res) : "r"(w0), "r"(w1), "q"(shr)); > + else > + link_error(), res = 0; Likewise, after asm, and after link_error, and after strings in asm. -- Joseph S. Myers joseph@codesourcery.com
On 11/01/2018 11:36, Joseph Myers wrote: > On Wed, 10 Jan 2018, Adhemerval Zanella wrote: > >> +extern void link_error(void); > > Missing space before '('. > >> +static inline op_t >> +MERGE(op_t w0, int shl, op_t w1, int shr) > > Likewise. > >> + if (OPSIZ == 4) >> + asm("shrpw %1,%2,%%sar,%0" : "=r"(res) : "r"(w0), "r"(w1), "q"(shr)); >> + else if (OPSIZ == 8) >> + asm("shrpd %1,%2,%%sar,%0" : "=r"(res) : "r"(w0), "r"(w1), "q"(shr)); >> + else >> + link_error(), res = 0; > > Likewise, after asm, and after link_error, and after strings in asm. > I fixed all locally.
On Fri, 12 Jan 2018, Adhemerval Zanella wrote: > >> + if (OPSIZ == 4) > >> + asm("shrpw %1,%2,%%sar,%0" : "=r"(res) : "r"(w0), "r"(w1), "q"(shr)); > >> + else if (OPSIZ == 8) > >> + asm("shrpd %1,%2,%%sar,%0" : "=r"(res) : "r"(w0), "r"(w1), "q"(shr)); > >> + else > >> + link_error(), res = 0; > > > > Likewise, after asm, and after link_error, and after strings in asm. > > > > I fixed all locally. (Some of the other patches were also similarly missing spaces after asm constraint strings.) -- Joseph S. Myers joseph@codesourcery.com
On 12/01/2018 16:17, Joseph Myers wrote: > On Fri, 12 Jan 2018, Adhemerval Zanella wrote: > >>>> + if (OPSIZ == 4) >>>> + asm("shrpw %1,%2,%%sar,%0" : "=r"(res) : "r"(w0), "r"(w1), "q"(shr)); >>>> + else if (OPSIZ == 8) >>>> + asm("shrpd %1,%2,%%sar,%0" : "=r"(res) : "r"(w0), "r"(w1), "q"(shr)); >>>> + else >>>> + link_error(), res = 0; >>> >>> Likewise, after asm, and after link_error, and after strings in asm. >>> >> >> I fixed all locally. > > (Some of the other patches were also similarly missing spaces after asm > constraint strings.) > Thanks, I will double check it (I used Richard's version unchanged).
diff --git a/sysdeps/hppa/memcopy.h b/sysdeps/hppa/memcopy.h new file mode 100644 index 0000000..4dcade7 --- /dev/null +++ b/sysdeps/hppa/memcopy.h @@ -0,0 +1,44 @@ +/* Definitions for memory copy functions, PA-RISC version. + Copyright (C) 2018 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/generic/memcopy.h> + +/* Use a single double-word shift instead of two shifts and an ior. + If the uses of MERGE were close to the computation of shl/shr, + the compiler might have been able to create this itself. + But instead that computation is well separated. + + Using an inline function instead of a macro is the easiest way + to ensure that the types are correct. */ + +#undef MERGE + +extern void link_error(void); + +static inline op_t +MERGE(op_t w0, int shl, op_t w1, int shr) +{ + op_t res; + if (OPSIZ == 4) + asm("shrpw %1,%2,%%sar,%0" : "=r"(res) : "r"(w0), "r"(w1), "q"(shr)); + else if (OPSIZ == 8) + asm("shrpd %1,%2,%%sar,%0" : "=r"(res) : "r"(w0), "r"(w1), "q"(shr)); + else + link_error(), res = 0; + return res; +}
From: Richard Henderson <rth@twiddle.net> GCC's combine pass cannot merge (x >> c | y << (32 - c)) into a double-word shift unless (1) the subtract is in the same basic block and (2) the result of the subtract is used exactly once. Neither condition is true for any use of MERGE. By forcing the use of a double-word shift, we not only reduce contention on SAR, but also allow the setting of SAR to be hoisted outside of a loop. Checked on hppa-linux-gnu. Richard Henderson <rth@twiddle.net> * sysdeps/hppa/memcopy.h: New file. --- sysdeps/hppa/memcopy.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 sysdeps/hppa/memcopy.h -- 2.7.4