From 0ac109b5a135aeac95b2ad42e7fbbd241197a931 Mon Sep 17 00:00:00 2001 From: krebbel Date: Mon, 5 May 2014 07:55:26 +0000 Subject: [PATCH] 2014-05-05 Andreas Krebbel * target.def: Add new target hook. * doc/tm.texi: Regenerate. * targhooks.h (default_keep_leaf_when_profiled): Add prototype. * targhooks.c (default_keep_leaf_when_profiled): New function. * config/s390/s390.c (s390_keep_leaf_when_profiled): New function. (TARGET_KEEP_LEAF_WHEN_PROFILED): Define. 2014-05-05 Andreas Krebbel * gcc.target/s390/leaf-profile.c: New testcase. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@210061 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 10 ++++++++++ gcc/config/s390/s390.c | 11 +++++++++++ gcc/doc/tm.texi | 4 ++++ gcc/doc/tm.texi.in | 2 ++ gcc/final.c | 4 +++- gcc/target.def | 12 ++++++++++++ gcc/targhooks.c | 9 +++++++++ gcc/targhooks.h | 1 + gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gcc.target/s390/leaf-profile.c | 10 ++++++++++ 10 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.target/s390/leaf-profile.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index cd6aa9d7f01..66068c3baad 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2014-05-05 Andreas Krebbel + + * target.def: Add new target hook. + * doc/tm.texi: Regenerate. + * targhooks.h (default_keep_leaf_when_profiled): Add prototype. + * targhooks.c (default_keep_leaf_when_profiled): New function. + + * config/s390/s390.c (s390_keep_leaf_when_profiled): New function. + (TARGET_KEEP_LEAF_WHEN_PROFILED): Define. + 2014-05-05 Bin Cheng PR tree-optimization/60363 diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c index cc8f32e169c..557f0dbc6e5 100644 --- a/gcc/config/s390/s390.c +++ b/gcc/config/s390/s390.c @@ -10160,6 +10160,14 @@ s390_expand_builtin (tree exp, rtx target, rtx subtarget ATTRIBUTE_UNUSED, return const0_rtx; } +/* We call mcount before the function prologue. So a profiled leaf + function should stay a leaf function. */ + +static bool +s390_keep_leaf_when_profiled () +{ + return true; +} /* Output assembly code for the trampoline template to stdio stream FILE. @@ -12163,6 +12171,9 @@ s390_option_override (void) #undef TARGET_LIBCALL_VALUE #define TARGET_LIBCALL_VALUE s390_libcall_value +#undef TARGET_KEEP_LEAF_WHEN_PROFILED +#define TARGET_KEEP_LEAF_WHEN_PROFILED s390_keep_leaf_when_profiled + #undef TARGET_FIXED_CONDITION_CODE_REGS #define TARGET_FIXED_CONDITION_CODE_REGS s390_fixed_condition_code_regs diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi index ed35bcb2351..cdc272e0254 100644 --- a/gcc/doc/tm.texi +++ b/gcc/doc/tm.texi @@ -4953,6 +4953,10 @@ Define this macro if the code for function profiling should come before the function prologue. Normally, the profiling code comes after. @end defmac +@deftypefn {Target Hook} bool TARGET_KEEP_LEAF_WHEN_PROFILED (void) +This target hook returns true if the target wants the leaf flag for the current function to stay true even if it calls mcount. This might make sense for targets using the leaf flag only to determine whether a stack frame needs to be generated or not and for which the call to mcount is generated before the function prologue. +@end deftypefn + @node Tail Calls @subsection Permitting tail calls @cindex tail calls diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in index a5c37417927..efd49639848 100644 --- a/gcc/doc/tm.texi.in +++ b/gcc/doc/tm.texi.in @@ -3963,6 +3963,8 @@ Define this macro if the code for function profiling should come before the function prologue. Normally, the profiling code comes after. @end defmac +@hook TARGET_KEEP_LEAF_WHEN_PROFILED + @node Tail Calls @subsection Permitting tail calls @cindex tail calls diff --git a/gcc/final.c b/gcc/final.c index 8c6f6ee682b..cf649fbd155 100644 --- a/gcc/final.c +++ b/gcc/final.c @@ -4241,7 +4241,9 @@ leaf_function_p (void) { rtx insn; - if (crtl->profile || profile_arc_flag) + /* Some back-ends (e.g. s390) want leaf functions to stay leaf + functions even if they call mcount. */ + if (crtl->profile && !targetm.keep_leaf_when_profiled ()) return 0; for (insn = get_insns (); insn; insn = NEXT_INSN (insn)) diff --git a/gcc/target.def b/gcc/target.def index 3a64cd14302..793f12ddfe1 100644 --- a/gcc/target.def +++ b/gcc/target.def @@ -2658,6 +2658,18 @@ The default version of this hook use the target macro\n\ bool, (void), default_profile_before_prologue) +/* Return true if a leaf function should stay leaf even with profiling + enabled. */ +DEFHOOK +(keep_leaf_when_profiled, + "This target hook returns true if the target wants the leaf flag for\ + the current function to stay true even if it calls mcount. This might\ + make sense for targets using the leaf flag only to determine whether a\ + stack frame needs to be generated or not and for which the call to\ + mcount is generated before the function prologue.", + bool, (void), + default_keep_leaf_when_profiled) + /* Modify and return the identifier of a DECL's external name, originally identified by ID, as required by the target, (eg, append @nn to windows32 stdcall function names). diff --git a/gcc/targhooks.c b/gcc/targhooks.c index 79491c7c59b..0be1978aa5f 100644 --- a/gcc/targhooks.c +++ b/gcc/targhooks.c @@ -1447,6 +1447,15 @@ default_get_reg_raw_mode (int regno) return reg_raw_mode[regno]; } +/* Return true if a leaf function should stay leaf even with profiling + enabled. */ + +bool +default_keep_leaf_when_profiled () +{ + return false; +} + /* Return true if the state of option OPTION should be stored in PCH files and checked by default_pch_valid_p. Store the option's current state in STATE if so. */ diff --git a/gcc/targhooks.h b/gcc/targhooks.h index 9dd4c83d697..dbaa1dc5f5c 100644 --- a/gcc/targhooks.h +++ b/gcc/targhooks.h @@ -195,6 +195,7 @@ extern int default_jump_align_max_skip (rtx); extern section * default_function_section(tree decl, enum node_frequency freq, bool startup, bool exit); extern enum machine_mode default_get_reg_raw_mode (int); +extern bool default_keep_leaf_when_profiled (); extern void *default_get_pch_validity (size_t *); extern const char *default_pch_valid_p (const void *, size_t); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d64a06f60d9..ce105724f69 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2014-05-05 Andreas Krebbel + * gcc.target/s390/leaf-profile.c: New testcase. + +2014-05-05 Andreas Krebbel + * gcc.dg/hoist-register-pressure-1.c: Replace int with long. Disable asm scan for s390. * gcc.dg/hoist-register-pressure-2.c: Likewise. diff --git a/gcc/testsuite/gcc.target/s390/leaf-profile.c b/gcc/testsuite/gcc.target/s390/leaf-profile.c new file mode 100644 index 00000000000..60477400757 --- /dev/null +++ b/gcc/testsuite/gcc.target/s390/leaf-profile.c @@ -0,0 +1,10 @@ +/* { dg-do compile } */ +/* { dg-options "-O3 -march=z900 -pg" } */ + +int +foo () +{ +} +/* Make sure no stack frame is generated. */ +/* { dg-final { scan-assembler-not "ahi" { target s390-*-* } } } */ +/* { dg-final { scan-assembler-not "aghi" { target s390x-*-* } } } */ -- 2.11.4.GIT