Come up with hook libc_has_fast_function (PR middle-end/90263).

2019-05-20  Martin Liska  <mliska@suse.cz>

	PR middle-end/90263
	* builtins.c (expand_builtin_memory_copy_args): When having a
	target with fast mempcpy implementation do now use memcpy.
	* config/i386/i386.c (ix86_libc_has_fast_function): New.
	(TARGET_LIBC_HAS_FAST_FUNCTION): Likewise.
	* doc/tm.texi: Likewise.
	* doc/tm.texi.in: Likewise.
	* target.def:
	* expr.c (emit_block_move_hints): Add 2 new arguments.
	* expr.h (emit_block_move_hints): Bail out when libcall
	to memcpy would be used.
2019-05-20  Martin Liska  <mliska@suse.cz>

	PR middle-end/90263
	* gcc.c-torture/compile/pr90263.c: New test.
	* lib/target-supports.exp: Add check_effective_target_glibc.

From-SVN: r271400

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a4f0e2d0ffaf45cd23a7b7a2903bca930d120c88..68564af3dcac0f16903d29c603934e023788fff9 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,17 @@
+2019-05-20  Martin Liska  <mliska@suse.cz>
+
+       PR middle-end/90263
+       * builtins.c (expand_builtin_memory_copy_args): When having a
+       target with fast mempcpy implementation do now use memcpy.
+       * config/i386/i386.c (ix86_libc_has_fast_function): New.
+       (TARGET_LIBC_HAS_FAST_FUNCTION): Likewise.
+       * doc/tm.texi: Likewise.
+       * doc/tm.texi.in: Likewise.
+       * target.def:
+       * expr.c (emit_block_move_hints): Add 2 new arguments.
+       * expr.h (emit_block_move_hints): Bail out when libcall
+       to memcpy would be used.
+
 2019-05-20  Martin Liska  <mliska@suse.cz>
 
        * profile-count.c: Add vertical spacing in order

diff --git a/gcc/builtins.c b/gcc/builtins.c
index 0456a9ef646b83f37d3d6dc3b09b1ef22df05c32..3f32754c4d35fc34af7c53156d2a356f69a94a8f 100644 (file)
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -3839,6 +3839,8 @@ expand_builtin_memory_copy_args (tree dest, tree src, tree len,
   unsigned HOST_WIDE_INT max_size;
   unsigned HOST_WIDE_INT probable_max_size;
 
+  bool is_move_done;
+
   /* If DEST is not a pointer type, call the normal function.  */
   if (dest_align == 0)
     return NULL_RTX;
@@ -3888,11 +3890,22 @@ expand_builtin_memory_copy_args (tree dest, tree src, tree len,
   if (CALL_EXPR_TAILCALL (exp)
       && (retmode == RETURN_BEGIN || target == const0_rtx))
     method = BLOCK_OP_TAILCALL;
-  if (retmode == RETURN_END && target != const0_rtx)
+  bool use_mempcpy_call = (targetm.libc_has_fast_function (BUILT_IN_MEMPCPY)
+                          && retmode == RETURN_END
+                          && target != const0_rtx);
+  if (use_mempcpy_call)
     method = BLOCK_OP_NO_LIBCALL_RET;
   dest_addr = emit_block_move_hints (dest_mem, src_mem, len_rtx, method,
                                     expected_align, expected_size,
-                                    min_size, max_size, probable_max_size);
+                                    min_size, max_size, probable_max_size,
+                                    use_mempcpy_call, &is_move_done);
+
+  /* Bail out when a mempcpy call would be expanded as libcall and when
+     we have a target that provides a fast implementation
+     of mempcpy routine.  */
+  if (!is_move_done)
+    return NULL_RTX;
+
   if (dest_addr == pc_rtx)
     return NULL_RTX;
 

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index d3eb7c8cb06f2fad85845ff1bba78491cdd25011..384c63385fd9b118d7b46ea2b7e05b6e6517c3c5 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -23063,6 +23063,21 @@ ix86_run_selftests (void)
 #define TARGET_GET_MULTILIB_ABI_NAME \
   ix86_get_multilib_abi_name
 
+static bool ix86_libc_has_fast_function (int fcode)
+{
+#ifdef OPTION_GLIBC
+  if (OPTION_GLIBC)
+    return (built_in_function)fcode == BUILT_IN_MEMPCPY;
+  else
+    return false;
+#else
+  return false;
+#endif
+}
+
+#undef TARGET_LIBC_HAS_FAST_FUNCTION
+#define TARGET_LIBC_HAS_FAST_FUNCTION ix86_libc_has_fast_function
+
 #if CHECKING_P
 #undef TARGET_RUN_TARGET_SELFTESTS
 #define TARGET_RUN_TARGET_SELFTESTS selftest::ix86_run_selftests

diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
index 8c8978bb13a7933b3ae6997de87a6b65edd6c842..0941039536bcf3eca52b8e911121b179d1e67c11 100644 (file)
--- a/gcc/doc/tm.texi
+++ b/gcc/doc/tm.texi
@@ -5594,6 +5594,11 @@ This hook determines whether a function from a class of functions
 @var{fn_class} is present at the runtime.
 @end deftypefn
 
+@deftypefn {Target Hook} bool TARGET_LIBC_HAS_FAST_FUNCTION (int @var{fcode})
+This hook determines whether a function from a class of functions
+@var{fn_class} has a fast implementation.
+@end deftypefn
+
 @defmac NEXT_OBJC_RUNTIME
 Set this macro to 1 to use the "NeXT" Objective-C message sending conventions
 by default.  This calling convention involves passing the object, the selector

diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in
index fe1194ef91ae3dc7a4de4976a306d33801b2a89e..17560fce6b7a2cb0148e4dbac565eca588d5302e 100644 (file)
--- a/gcc/doc/tm.texi.in
+++ b/gcc/doc/tm.texi.in
@@ -3991,6 +3991,8 @@ macro, a reasonable default is used.
 
 @hook TARGET_LIBC_HAS_FUNCTION
 
+@hook TARGET_LIBC_HAS_FAST_FUNCTION
+
 @defmac NEXT_OBJC_RUNTIME
 Set this macro to 1 to use the "NeXT" Objective-C message sending conventions
 by default.  This calling convention involves passing the object, the selector

diff --git a/gcc/expr.c b/gcc/expr.c
index fa15b7eceae9c49132fc7a46c0bd071bfd4107da..c78bc74c0d9f9005f284741863652852a295125b 100644 (file)
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -1561,12 +1561,16 @@ emit_block_move_hints (rtx x, rtx y, rtx size, enum block_op_methods method,
                       unsigned int expected_align, HOST_WIDE_INT expected_size,
                       unsigned HOST_WIDE_INT min_size,
                       unsigned HOST_WIDE_INT max_size,
-                      unsigned HOST_WIDE_INT probable_max_size)
+                      unsigned HOST_WIDE_INT probable_max_size,
+                      bool bail_out_libcall, bool *is_move_done)
 {
   int may_use_call;
   rtx retval = 0;
   unsigned int align;
 
+  if (is_move_done)
+    *is_move_done = true;
+
   gcc_assert (size);
   if (CONST_INT_P (size) && INTVAL (size) == 0)
     return 0;
@@ -1628,6 +1632,13 @@ emit_block_move_hints (rtx x, rtx y, rtx size, enum block_op_methods method,
           && ADDR_SPACE_GENERIC_P (MEM_ADDR_SPACE (x))
           && ADDR_SPACE_GENERIC_P (MEM_ADDR_SPACE (y)))
     {
+      if (bail_out_libcall)
+       {
+         if (is_move_done)
+           *is_move_done = false;
+         return retval;
+       }
+
       if (may_use_call < 0)
        return pc_rtx;
 

diff --git a/gcc/expr.h b/gcc/expr.h
index 17c3962436a53705676fd2e28787cb2e3eee5353..6eb70bf12f17ebe1dd8eb36fe5cc0145c9ecc6d6 100644 (file)
--- a/gcc/expr.h
+++ b/gcc/expr.h
@@ -114,7 +114,9 @@ extern rtx emit_block_move_hints (rtx, rtx, rtx, enum block_op_methods,
                                  unsigned int, HOST_WIDE_INT,
                                  unsigned HOST_WIDE_INT,
                                  unsigned HOST_WIDE_INT,
-                                 unsigned HOST_WIDE_INT);
+                                 unsigned HOST_WIDE_INT,
+                                 bool bail_out_libcall = false,
+                                 bool *is_move_done = NULL);
 extern rtx emit_block_cmp_hints (rtx, rtx, rtx, tree, rtx, bool,
                                 by_pieces_constfn, void *);
 extern bool emit_storent_insn (rtx to, rtx from);

diff --git a/gcc/target.def b/gcc/target.def
index 66cee075018b94fa9786a10f7cfe6ede8ead6b20..23e260cb53584e798847161d3191b87d0b9528ad 100644 (file)
--- a/gcc/target.def
+++ b/gcc/target.def
@@ -2547,6 +2547,13 @@ DEFHOOK
  bool, (enum function_class fn_class),
  default_libc_has_function)
 
+DEFHOOK
+(libc_has_fast_function,
+ "This hook determines whether a function from a class of functions\n\
+@var{fn_class} has a fast implementation.",
+ bool, (int fcode),
+ default_libc_has_fast_function)
+
 /* True if new jumps cannot be created, to replace existing ones or
    not, at the current point in the compilation.  */
 DEFHOOK

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ecb4d68e59c4359b3fdad5fa5dc9c46524e987fe..7b3bf731f35e1dd5b0d1823e0679f7c43eacda6a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2019-05-20  Martin Liska  <mliska@suse.cz>
+
+       PR middle-end/90263
+       * gcc.c-torture/compile/pr90263.c: New test.
+       * lib/target-supports.exp: Add check_effective_target_glibc.
+
 2019-05-20  Richard Biener  <rguenther@suse.de>
 
        PR testsuite/90518

diff --git a/gcc/testsuite/gcc.c-torture/compile/pr90263.c b/gcc/testsuite/gcc.c-torture/compile/pr90263.c
new file mode 100644 (file)
index 0000000..df3ab0f
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr90263.c
@@ -0,0 +1,10 @@
+/* PR middle-end/90263 */
+/* { dg-require-effective-target glibc } */
+
+int *f (int *p, int *q, long n)
+{
+  return __builtin_mempcpy (p, q, n);
+}
+
+/* { dg-final { scan-assembler "mempcpy" { target { i?86-*-* x86_64-*-* } } } } */
+/* { dg-final { scan-assembler "memcpy" { target { ! { i?86-*-* x86_64-*-* } } } } } */

diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 63bc2cc4b235b3a8d70fd1f99c9efeb72f92cafa..3bd6e8157154b9663e85bf83bea2941deadb8f65 100644 (file)
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -9313,6 +9313,17 @@ proc check_effective_target_arm_v8_3a_complex_neon_hw { } {
     } [add_options_for_arm_v8_3a_complex_neon ""]]
 }
 
+# Returns 1 if the target is using glibc, 0 otherwise.
+
+proc check_effective_target_glibc { } {
+    return [check_no_compiler_messages glibc_object assembly {
+  #include <stdlib.h>
+       #if !defined(__GLIBC__)
+       #error undefined
+       #endif
+    }]
+}
+
 # Return 1 if the target plus current options supports a vector
 # complex addition with rotate of half and single float modes, 0 otherwise.
 #