From 85c2e6110c9a01ec817c30f1b7e20549d7229987 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Thu, 20 Jun 2013 19:40:55 -0500 Subject: [PATCH] Fix loop construction to functions calls Check wheter the compiler has the option -fno-tree-loop-distribute-patterns to inhibit loop transformation to library calls and uses it on memset and memmove default implementation to avoid recursive calls. --- ChangeLog | 16 ++++++++++++++++ benchtests/bench-memmove.c | 1 + benchtests/bench-memset.c | 1 + config.h.in | 3 +++ configure | 33 +++++++++++++++++++++++++++++++++ configure.in | 18 ++++++++++++++++++ include/libc-symbols.h | 10 ++++++++++ string/memmove.c | 1 + string/memset.c | 1 + string/test-memmove.c | 1 + string/test-memset.c | 1 + 11 files changed, 86 insertions(+) diff --git a/ChangeLog b/ChangeLog index 314a563e6a..6c65453eb4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2013-06-20 Adhemerval Zanella + + * config.h.in (HAVE_CC_INHIBIT_LOOP_TO_LIBCALL): New define. + * configure.in (libc_cv_cc_loop_to_function): Check if compiler + accepts -fno-tree-loop-distribute-patterns. + * include/libc-symbols.h (inhibit_loop_to_libcall): New macro. + * string/memmove.c (MEMMOVE): Disable loop transformation to avoid + recursive call. + * string/memset.c (memset): Likewise. + * string/test-memmove.c (simple_memmove): Disable loop transformation + to library calls. + * string/test-memset.c (simple_memset): Likewise. + * benchtests/bench-memmove.c (simple_memmove): Likewise. + * benchtests/bench-memset.c (simple_memset): Likewise. + * configure: Regenerated. + 2013-06-20 Joseph Myers * math/test-misc.c (main): Ignore fesetround failure when failures diff --git a/benchtests/bench-memmove.c b/benchtests/bench-memmove.c index dccde5d14e..8925606af8 100644 --- a/benchtests/bench-memmove.c +++ b/benchtests/bench-memmove.c @@ -46,6 +46,7 @@ IMPL (memmove, 1) #endif char * +inhibit_loop_to_libcall simple_memmove (char *dst, const char *src, size_t n) { char *ret = dst; diff --git a/benchtests/bench-memset.c b/benchtests/bench-memset.c index 92e34f0d61..ea29cf37fc 100644 --- a/benchtests/bench-memset.c +++ b/benchtests/bench-memset.c @@ -63,6 +63,7 @@ builtin_memset (char *s, int c, size_t n) #endif char * +inhibit_loop_to_libcall simple_memset (char *s, int c, size_t n) { char *r = s, *end = s + n; diff --git a/config.h.in b/config.h.in index 8c2479ef48..b5c6f163a7 100644 --- a/config.h.in +++ b/config.h.in @@ -69,6 +69,9 @@ /* Define if the compiler supports __builtin_memset. */ #undef HAVE_BUILTIN_MEMSET +/* Define if compiler accepts -ftree-loop-distribute-patterns. */ +#undef HAVE_CC_INHIBIT_LOOP_TO_LIBCALL + /* Define if the regparm attribute shall be used for local functions (gcc on ix86 only). */ #undef USE_REGPARMS diff --git a/configure b/configure index 09d8336f10..14bff72a3d 100755 --- a/configure +++ b/configure @@ -598,6 +598,7 @@ have_selinux have_libcap have_libaudit LIBGD +libc_cv_cc_loop_to_function libc_cv_cc_submachine libc_cv_cc_nofma exceptions @@ -6933,6 +6934,38 @@ $as_echo "$libc_cv_cc_submachine" >&6; } fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -fno-tree-loop-distribute-patterns with \ +__attribute__ ((__optimize__))" >&5 +$as_echo_n "checking if $CC accepts -fno-tree-loop-distribute-patterns with \ +__attribute__ ((__optimize__))... " >&6; } +if ${libc_cv_cc_loop_to_function+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat > conftest.c <&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } +then + libc_cv_cc_loop_to_function=yes +fi +rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_cc_loop_to_function" >&5 +$as_echo "$libc_cv_cc_loop_to_function" >&6; } +if test $libc_cv_cc_loop_to_function = yes; then + $as_echo "#define HAVE_CC_INHIBIT_LOOP_TO_LIBCALL 1" >>confdefs.h + +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgd" >&5 $as_echo_n "checking for libgd... " >&6; } if test "$with_gd" != "no"; then diff --git a/configure.in b/configure.in index 8b110817bc..56cd61c171 100644 --- a/configure.in +++ b/configure.in @@ -1964,6 +1964,24 @@ if test -n "$submachine"; then fi AC_SUBST(libc_cv_cc_submachine) +AC_CACHE_CHECK(if $CC accepts -fno-tree-loop-distribute-patterns with \ +__attribute__ ((__optimize__)), libc_cv_cc_loop_to_function, [dnl +cat > conftest.c <