Hi!
On Tue, 8 Aug 2017 10:58:12 +0200, Tom de Vries <tom_devr...@mentor.com> wrote:
> On 08/08/2017 10:45 AM, Thomas Schwinge wrote:
> > On Fri, 21 Jul 2017 11:49:11 +0200, Tom de Vries <tom_devr...@mentor.com>
> > wrote:
> >> this patch adds nvptx_override_options_after_change, containing a
> >> workaround for PR81430.
> > Should this be reverted now that r250852 "Apply finish_options on
> > DECL_FUNCTION_SPECIFIC_OPTIMIZATION for ACCEL_COMPILER" has been
> > committed? (I'm confirming this works fine, thanks.)
>
> Indeed, it can be reverted.
Committed to trunk in r251053:
commit 5b005e86c8c45aa84c090064b2f789c802384fc5
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri Aug 11 15:37:14 2017 +0000
[PR lto/81430] Revert "Add nvptx_override_options_after_change"
This reverts r250421; properly fixed by r250852.
PR lto/81430
* config/nvptx/nvptx.c (nvptx_override_options_after_change):
Remove function.
(TARGET_OVERRIDE_OPTIONS_AFTER_CHANGE): Remove definition.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@251053
138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ChangeLog | 7 +++++++
gcc/config/nvptx/nvptx.c | 14 --------------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git gcc/ChangeLog gcc/ChangeLog
index 2975655..295b4c9 100644
--- gcc/ChangeLog
+++ gcc/ChangeLog
@@ -1,3 +1,10 @@
+2017-08-11 Thomas Schwinge <tho...@codesourcery.com>
+
+ PR lto/81430
+ * config/nvptx/nvptx.c (nvptx_override_options_after_change):
+ Remove function.
+ (TARGET_OVERRIDE_OPTIONS_AFTER_CHANGE): Remove definition.
+
2017-08-11 Tamar Christina <tamar.christ...@arm.com>
* config/aarch64/aarch64.md (mov<mode>): Change.
(*movhf_aarch64, *movsf_aarch64, *movdf_aarch64):
diff --git gcc/config/nvptx/nvptx.c gcc/config/nvptx/nvptx.c
index ffd50d7..8babac7 100644
--- gcc/config/nvptx/nvptx.c
+++ gcc/config/nvptx/nvptx.c
@@ -212,17 +212,6 @@ nvptx_option_override (void)
target_flags |= MASK_SOFT_STACK | MASK_UNIFORM_SIMT;
}
-/* Implement TARGET_OVERRIDE_OPTIONS_AFTER_CHANGE. */
-
-static void
-nvptx_override_options_after_change (void)
-{
- /* This is a workaround for PR81430 - nvptx acceleration compilation broken
- because of running pass_partition_blocks. This should be dealt with in
the
- common code, not in the target. */
- flag_reorder_blocks_and_partition = 0;
-}
-
/* Return a ptx type for MODE. If PROMOTE, then use .u32 for QImode to
deal with ptx ideosyncracies. */
@@ -5527,9 +5516,6 @@ nvptx_data_alignment (const_tree type, unsigned int
basic_align)
#undef TARGET_OPTION_OVERRIDE
#define TARGET_OPTION_OVERRIDE nvptx_option_override
-#undef TARGET_OVERRIDE_OPTIONS_AFTER_CHANGE
-#define TARGET_OVERRIDE_OPTIONS_AFTER_CHANGE
nvptx_override_options_after_change
-
#undef TARGET_ATTRIBUTE_TABLE
#define TARGET_ATTRIBUTE_TABLE nvptx_attribute_table
Grüße
Thomas
