From: "Martin Liška" <mliska@suse.cz>
To: Nathan Sidwell <nathan@acm.org>, Jeff Law <law@redhat.com>,
Andi Kleen <andi@firstfloor.org>
Cc: gcc-patches@gcc.gnu.org, jh@suse.cz, David Edelsohn <dje.gcc@gmail.com>
Subject: [PATCH] Introduce -fprofile-update=maybe-atomic
Date: Thu, 13 Oct 2016 15:34:00 -0000 [thread overview]
Message-ID: <2419555f-7271-d64d-94ac-ac97ee7cb953@suse.cz> (raw)
In-Reply-To: <9aca1f7c-e7eb-e101-249e-8b5edd21cd48@suse.cz>
[-- Attachment #1: Type: text/plain, Size: 510 bytes --]
Hello.
As it's very hard to guess from GCC driver whether a target supports atomic updates
for GCOV counter or not, I decided to come up with a new option value (maybe-atomic),
that would be transformed in a corresponding value (single or atomic) in tree-profile.c.
The GCC driver selects the option when -pthread is present in the command line.
That should fix all tests failures seen on AIX target.
Patch can bootstrap on ppc64le-redhat-linux and survives regression tests.
Ready to be installed?
Martin
[-- Attachment #2: 0001-Introduce-fprofile-update-maybe-atomic.patch --]
[-- Type: text/x-patch, Size: 7389 bytes --]
From 1d00b7b4d42d080fe4d6cd51a03829b0fe525c9d Mon Sep 17 00:00:00 2001
From: marxin <mliska@suse.cz>
Date: Wed, 12 Oct 2016 15:05:49 +0200
Subject: [PATCH] Introduce -fprofile-update=maybe-atomic
gcc/ChangeLog:
2016-10-12 Martin Liska <mliska@suse.cz>
* common.opt: Add maybe-atomic as a new enum value for
-fprofile-update.
* coretypes.h: Likewise.
* doc/invoke.texi: Document the new option value.
* gcc.c: Replace atomic with maybe-atomic. Remove warning.
* tree-profile.c (tree_profiling): Select default value
of -fprofile-update when 'maybe-atomic' is selected.
gcc/testsuite/ChangeLog:
2016-10-12 Martin Liska <mliska@suse.cz>
* gcc.dg/no_profile_instrument_function-attr-1.c: Update test
to match scanned pattern.
* gcc.dg/tree-ssa/ssa-lim-11.c: Likewise.
---
gcc/common.opt | 5 +++-
gcc/coretypes.h | 3 +-
gcc/doc/invoke.texi | 11 +++++--
gcc/gcc.c | 6 +---
.../gcc.dg/no_profile_instrument_function-attr-1.c | 2 +-
gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-11.c | 2 +-
gcc/tree-profile.c | 35 +++++++++++-----------
7 files changed, 35 insertions(+), 29 deletions(-)
diff --git a/gcc/common.opt b/gcc/common.opt
index 15679c5..d6c5acd 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -1937,7 +1937,7 @@ Enable correction of flow inconsistent profile data input.
fprofile-update=
Common Joined RejectNegative Enum(profile_update) Var(flag_profile_update) Init(PROFILE_UPDATE_SINGLE)
--fprofile-update=[single|atomic] Set the profile update method.
+-fprofile-update=[single|atomic|maybe-atomic] Set the profile update method.
Enum
Name(profile_update) Type(enum profile_update) UnknownError(unknown profile update method %qs)
@@ -1948,6 +1948,9 @@ Enum(profile_update) String(single) Value(PROFILE_UPDATE_SINGLE)
EnumValue
Enum(profile_update) String(atomic) Value(PROFILE_UPDATE_ATOMIC)
+EnumValue
+Enum(profile_update) String(maybe-atomic) Value(PROFILE_UPDATE_MAYBE_ATOMIC)
+
fprofile-generate
Common
Enable common options for generating profile info for profile feedback directed optimizations.
diff --git a/gcc/coretypes.h b/gcc/coretypes.h
index fe1e984..aec2a6e 100644
--- a/gcc/coretypes.h
+++ b/gcc/coretypes.h
@@ -177,7 +177,8 @@ enum offload_abi {
/* Types of profile update methods. */
enum profile_update {
PROFILE_UPDATE_SINGLE,
- PROFILE_UPDATE_ATOMIC
+ PROFILE_UPDATE_ATOMIC,
+ PROFILE_UPDATE_MAYBE_ATOMIC
};
/* Types of unwind/exception handling info that can be generated. */
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index c11f1d5..eb6cae3 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -10315,13 +10315,18 @@ To optimize the program based on the collected profile information, use
Alter the update method for an application instrumented for profile
feedback based optimization. The @var{method} argument should be one of
-@samp{single} or @samp{atomic}. The first one is useful for single-threaded
-applications, while the second one prevents profile corruption by emitting
-thread-safe code.
+@samp{single}, @samp{atomic} or @samp{maybe-atomic}.
+The first one is useful for single-threaded applications,
+while the second one prevents profile corruption by emitting thread-safe code.
@strong{Warning:} When an application does not properly join all threads
(or creates an detached thread), a profile file can be still corrupted.
+Using @samp{maybe-atomic} would be transformed either to @samp{atomic},
+when supported by a target, or to @samp{single} otherwise. The GCC driver
+automatically selects @samp{maybe-atomic} when @option{-pthread}
+is present in the command line.
+
@item -fsanitize=address
@opindex fsanitize=address
Enable AddressSanitizer, a fast memory error detector.
diff --git a/gcc/gcc.c b/gcc/gcc.c
index 5213cb0..1959fc7 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -1144,11 +1144,7 @@ static const char *cc1_options =
%{coverage:-fprofile-arcs -ftest-coverage}\
%{fprofile-arcs|fprofile-generate*|coverage:\
%{!fprofile-update=single:\
- %{pthread:-fprofile-update=atomic}}}\
- %{fprofile-update=single:\
- %{fprofile-arcs|fprofile-generate*|coverage:\
- %{pthread:%n-fprofile-update=atomic should be used\
- for a multithreaded application}}}";
+ %{pthread:-fprofile-update=maybe-atomic}}}";
static const char *asm_options =
"%{-target-help:%:print-asm-header()} "
diff --git a/gcc/testsuite/gcc.dg/no_profile_instrument_function-attr-1.c b/gcc/testsuite/gcc.dg/no_profile_instrument_function-attr-1.c
index c93d171..29bffd90 100644
--- a/gcc/testsuite/gcc.dg/no_profile_instrument_function-attr-1.c
+++ b/gcc/testsuite/gcc.dg/no_profile_instrument_function-attr-1.c
@@ -1,4 +1,4 @@
-/* { dg-options "-O2 -fprofile-generate -fdump-tree-optimized" } */
+/* { dg-options "-O2 -fprofile-generate -fprofile-update=single -fdump-tree-optimized" } */
__attribute__ ((no_profile_instrument_function))
int foo()
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-11.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-11.c
index e4c11aa..4c38982 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-11.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-11.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O -fprofile-arcs -fdump-tree-lim2-details" } */
+/* { dg-options "-O -fprofile-arcs -fprofile-update=single -fdump-tree-lim2-details" } */
/* { dg-require-profiling "-fprofile-generate" } */
struct thread_param
diff --git a/gcc/tree-profile.c b/gcc/tree-profile.c
index 1f45b99..fcef2e5 100644
--- a/gcc/tree-profile.c
+++ b/gcc/tree-profile.c
@@ -534,25 +534,26 @@ tree_profiling (void)
struct cgraph_node *node;
/* Verify whether we can utilize atomic update operations. */
- if (flag_profile_update == PROFILE_UPDATE_ATOMIC)
+ bool can_support_atomic = false;
+ unsigned HOST_WIDE_INT gcov_type_size
+ = tree_to_uhwi (TYPE_SIZE_UNIT (get_gcov_type ()));
+ if (gcov_type_size == 4)
+ can_support_atomic
+ = HAVE_sync_compare_and_swapsi || HAVE_atomic_compare_and_swapsi;
+ else if (gcov_type_size == 8)
+ can_support_atomic
+ = HAVE_sync_compare_and_swapdi || HAVE_atomic_compare_and_swapdi;
+
+ if (flag_profile_update == PROFILE_UPDATE_ATOMIC
+ && !can_support_atomic)
{
- bool can_support = false;
- unsigned HOST_WIDE_INT gcov_type_size
- = tree_to_uhwi (TYPE_SIZE_UNIT (get_gcov_type ()));
- if (gcov_type_size == 4)
- can_support
- = HAVE_sync_compare_and_swapsi || HAVE_atomic_compare_and_swapsi;
- else if (gcov_type_size == 8)
- can_support
- = HAVE_sync_compare_and_swapdi || HAVE_atomic_compare_and_swapdi;
-
- if (!can_support)
- {
- warning (0, "target does not support atomic profile update, "
- "single mode is selected");
- flag_profile_update = PROFILE_UPDATE_SINGLE;
- }
+ warning (0, "target does not support atomic profile update, "
+ "single mode is selected");
+ flag_profile_update = PROFILE_UPDATE_SINGLE;
}
+ else if (flag_profile_update == PROFILE_UPDATE_MAYBE_ATOMIC)
+ flag_profile_update = can_support_atomic
+ ? PROFILE_UPDATE_ATOMIC : PROFILE_UPDATE_SINGLE;
/* This is a small-ipa pass that gets called only once, from
cgraphunit.c:ipa_passes(). */
--
2.9.2
next prev parent reply other threads:[~2016-10-13 15:34 UTC|newest]
Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-01 8:50 [PATCH 0/4] Various GCOV/PGO improvements marxin
2016-08-01 8:49 ` [PATCH 3/4] Fix typo in gcov.texi marxin
2016-08-01 8:50 ` [PATCH 4/4] Add tests for __gcov_dump and __gcov_reset marxin
2016-08-01 8:50 ` [PATCH 2/4] Remove __gcov_indirect_call_profiler marxin
2016-08-01 8:50 ` [PATCH 1/4] Cherry-pick fprofile-generate-atomic from google/gcc-4_9 branch marxin
2016-08-01 12:22 ` Nathan Sidwell
2016-08-01 13:29 ` Martin Liška
2016-08-04 14:48 ` Nathan Sidwell
2016-08-04 15:34 ` Martin Liška
2016-08-04 16:43 ` Nathan Sidwell
2016-08-04 17:03 ` Nathan Sidwell
2016-08-05 8:55 ` Martin Liška
2016-08-05 12:38 ` Nathan Sidwell
2016-08-05 12:48 ` Martin Liška
2016-08-05 13:14 ` Nathan Sidwell
2016-08-05 13:43 ` Martin Liška
2016-08-08 13:59 ` [PATCH 5/N] Add new *_atomic counter update function, (-fprofile-update=atomic) Martin Liška
2016-08-08 15:24 ` Nathan Sidwell
2016-08-08 16:51 ` Martin Liška
2016-08-08 17:03 ` Martin Liška
2016-08-09 12:36 ` Nathan Sidwell
2016-08-08 16:56 ` [PATCH] Fix POW2 histogram Martin Liška
2016-08-09 8:41 ` [PATCH 2/N] Fix usage of " Martin Liška
2016-08-09 12:37 ` Nathan Sidwell
2016-08-09 12:34 ` [PATCH] Fix " Nathan Sidwell
2016-08-09 11:24 ` [PATCH] Set -fprofile-update=atomic when -pthread is present Martin Liška
2016-08-09 12:40 ` Nathan Sidwell
2016-08-09 19:04 ` Andi Kleen
2016-08-12 13:31 ` Martin Liška
2016-08-18 3:16 ` Jeff Law
2016-08-18 11:02 ` Nathan Sidwell
2016-08-18 15:51 ` Andi Kleen
2016-08-18 15:53 ` Jeff Law
2016-10-03 12:13 ` Martin Liška
2016-10-03 12:26 ` Nathan Sidwell
2016-10-03 16:46 ` Jeff Law
2016-10-03 17:52 ` Andi Kleen
2016-10-04 12:05 ` Martin Liška
2016-10-05 17:54 ` Jeff Law
2016-10-13 15:34 ` Martin Liška [this message]
2016-10-31 9:13 ` [PATCH] Introduce -fprofile-update=maybe-atomic Martin Liška
2016-11-10 13:19 ` Martin Liška
2016-11-10 15:43 ` Nathan Sidwell
2016-11-10 15:55 ` David Edelsohn
2016-11-10 16:18 ` Nathan Sidwell
2016-11-10 15:58 ` Martin Liška
2016-11-10 16:17 ` David Edelsohn
2016-11-10 16:24 ` Martin Liška
2016-11-10 17:31 ` Nathan Sidwell
2016-11-11 10:48 ` Martin Liška
2016-11-11 15:11 ` Nathan Sidwell
2016-11-10 16:14 ` Nathan Sidwell
2016-11-10 16:16 ` David Edelsohn
2016-08-18 15:54 ` [PATCH] Set -fprofile-update=atomic when -pthread is present Jakub Jelinek
2016-08-18 16:06 ` Richard Biener
2016-09-07 11:41 ` Martin Liška
[not found] ` <CAFiYyc0UaSzXhZmyG9QRkHGT4JFowxBfE2yb-NvXE=hR1xafdA@mail.gmail.com>
2016-09-15 10:18 ` [RFC] Speed-up -fprofile-update=atomic Martin Liška
2016-10-04 9:45 ` Richard Biener
2016-10-12 13:53 ` Martin Liška
2016-10-13 9:43 ` Richard Biener
2016-10-17 11:47 ` Martin Liška
[not found] ` <CAFiYyc3eDT4g926PPZuktz5fEW=k-PibAcxhigx4GBcxoXNJFQ@mail.gmail.com>
2016-10-24 12:09 ` Martin Liška
[not found] ` <CAFiYyc1tSdTdqqkHcMp+dgE43+8tHL6kY8E07TCHoZBeUT-ggQ@mail.gmail.com>
2016-10-25 14:32 ` Martin Liška
2016-10-26 9:29 ` Richard Biener
2016-10-26 9:32 ` Richard Biener
2016-08-18 16:04 ` [PATCH] Set -fprofile-update=atomic when -pthread is present Richard Biener
2016-08-10 12:57 ` [PATCH 1/4] Cherry-pick fprofile-generate-atomic from google/gcc-4_9 branch Nathan Sidwell
2016-08-13 12:14 ` [BUILDROBOT] avr broken (was: [PATCH 1/4] Cherry-pick fprofile-generate-atomic from google/gcc-4_9 branch) Jan-Benedict Glaw
[not found] ` <4455937b-eba7-fe66-fe1a-3172567dd1e4@suse.cz>
2016-08-16 13:36 ` [BUILDROBOT] avr broken Nathan Sidwell
[not found] ` <617e8799-b7db-fefd-b3a3-842e9a7decfd@suse.cz>
2016-08-16 14:31 ` Nathan Sidwell
2016-08-16 17:05 ` Jan-Benedict Glaw
2016-08-16 18:26 ` Nathan Sidwell
2016-08-17 7:21 ` Denis Chertykov
2016-08-17 7:22 ` Martin Liška
2016-08-17 8:11 ` Jan-Benedict Glaw
2016-08-16 12:56 ` [PATCH] Detect whether target can use -fprofile-update=atomic Martin Liška
2016-08-16 14:31 ` Nathan Sidwell
2016-09-06 10:57 ` Martin Liška
2016-09-06 11:17 ` David Edelsohn
2016-09-06 12:15 ` Nathan Sidwell
2016-09-06 12:39 ` Jakub Jelinek
2016-09-06 12:43 ` David Edelsohn
2016-09-06 12:41 ` David Edelsohn
2016-09-06 12:51 ` Martin Liška
2016-09-06 13:13 ` Jakub Jelinek
2016-09-06 13:15 ` Martin Liška
2016-09-06 13:45 ` Jakub Jelinek
2016-09-06 13:50 ` Martin Liška
2016-09-06 14:06 ` Jakub Jelinek
2016-09-07 7:52 ` Christophe Lyon
2016-09-07 9:35 ` Martin Liška
2016-09-07 16:06 ` Christophe Lyon
2016-09-12 20:20 ` Jeff Law
2016-09-29 8:31 ` Rainer Orth
2016-08-01 12:11 ` [PATCH 0/4] Various GCOV/PGO improvements Nathan Sidwell
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=2419555f-7271-d64d-94ac-ac97ee7cb953@suse.cz \
--to=mliska@suse.cz \
--cc=andi@firstfloor.org \
--cc=dje.gcc@gmail.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=jh@suse.cz \
--cc=law@redhat.com \
--cc=nathan@acm.org \
/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).