From: Jan Hubicka <hubicka@ucw.cz>
To: "Martin Liška" <mliska@suse.cz>
Cc: gcc-patches@gcc.gnu.org, Nick Desaulniers <ndesaulniers@google.com>
Subject: Re: [PATCH] inline: do not inline when no_profile_instrument_function is different
Date: Wed, 23 Jun 2021 14:38:41 +0200 [thread overview]
Message-ID: <20210623123841.GC65660@kam.mff.cuni.cz> (raw)
In-Reply-To: <4a46257d-91cd-427e-1b11-7599ad36d07f@suse.cz>
> Hello.
>
> Similarly to e.g. sanitizer attributes, we sould prevent inlining when one function
> is marked as not instrumented. We should do that with -fprofile-generate only.
>
> Patch can bootstrap on x86_64-linux-gnu and survives regression tests.
>
> Ready to be installed?
> Thanks,
> Martin
>
> Adds test-case for:
> PR gcov-profile/80223
>
> gcc/ChangeLog:
>
> * ipa-inline.c (can_inline_edge_p): Similarly to sanitizer
> options, do not inline when no_profile_instrument_function
> attributes are different.
>
> gcc/testsuite/ChangeLog:
>
> * gcc.dg/no_profile_instrument_function-attr-2.c: New test.
> ---
> gcc/ipa-inline.c | 10 ++++++++++
> .../no_profile_instrument_function-attr-2.c | 15 +++++++++++++++
> 2 files changed, 25 insertions(+)
> create mode 100644 gcc/testsuite/gcc.dg/no_profile_instrument_function-attr-2.c
>
> diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c
> index 9d896beb2ac..786ab2e7f7f 100644
> --- a/gcc/ipa-inline.c
> +++ b/gcc/ipa-inline.c
> @@ -396,6 +396,16 @@ can_inline_edge_p (struct cgraph_edge *e, bool report,
> e->inline_failed = CIF_SANITIZE_ATTRIBUTE_MISMATCH;
> inlinable = false;
> }
> + else if (profile_arc_flag
> + && lookup_attribute ("no_profile_instrument_function",
> + DECL_ATTRIBUTES (caller->decl))
> + != lookup_attribute ("no_profile_instrument_function",
> + DECL_ATTRIBUTES (callee->decl)))
> + {
> + e->inline_failed = CIF_UNSPECIFIED;
> + inlinable = false;
> + }
Is there reason to prevent the inlining once instrumentation is done?
I think you can just block it for early inliner.
Honza
> +
> if (!inlinable && report)
> report_inline_failed_reason (e);
> return inlinable;
> diff --git a/gcc/testsuite/gcc.dg/no_profile_instrument_function-attr-2.c b/gcc/testsuite/gcc.dg/no_profile_instrument_function-attr-2.c
> new file mode 100644
> index 00000000000..586962a1c76
> --- /dev/null
> +++ b/gcc/testsuite/gcc.dg/no_profile_instrument_function-attr-2.c
> @@ -0,0 +1,15 @@
> +/* { dg-require-effective-target global_constructor } */
> +/* { dg-options "-O2 -fprofile-generate -fprofile-update=single -fdump-tree-optimized" } */
> +
> +__attribute__ ((no_profile_instrument_function))
> +int foo()
> +{
> + return 0;
> +}
> +
> +int bar()
> +{
> + return foo();
> +}
> +
> +/* { dg-final { scan-tree-dump-times " = foo \\(\\)" 1 "optimized"} } */
> --
> 2.32.0
>
next prev parent reply other threads:[~2021-06-23 12:38 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-23 11:53 Martin Liška
2021-06-23 12:38 ` Jan Hubicka [this message]
2021-06-23 13:15 ` Martin Liška
2021-06-25 19:00 ` Nick Desaulniers
2021-08-18 8:38 ` Martin Liška
2021-09-06 17:06 ` Jeff Law
2021-09-07 20:41 ` [Committed] Fix fatal typo in gcc.dg/no_profile_instrument_function-attr-2.c Hans-Peter Nilsson
2021-09-08 7:29 ` Martin Liška
2021-09-08 11:25 ` Hans-Peter Nilsson
2021-09-08 11:31 ` Rainer Orth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210623123841.GC65660@kam.mff.cuni.cz \
--to=hubicka@ucw.cz \
--cc=gcc-patches@gcc.gnu.org \
--cc=mliska@suse.cz \
--cc=ndesaulniers@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).