From patchwork Fri Aug 11 15:38:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 800622 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-460235-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="VH+Y3/8B"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xTTh44mD7z9sDB for ; Sat, 12 Aug 2017 01:39:15 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:in-reply-to:references:date:message-id:mime-version :content-type:content-transfer-encoding; q=dns; s=default; b=SJa 2FDQbUF4XVWapsi2EZheo5QSnwKfukO+HbJMegdD9Ti1J7mEbJ4VohYTFe/zPyyf KwJ9XKZYoADu8Vwi+LpVBLbLA8yznP27l1guh3qYjCIGWV+/Hm/N2XhM0DJ/j9Im 0aLpH+EZe7qCCtP7m/QxmJ43ghqxX0GcmXdIknOw= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:in-reply-to:references:date:message-id:mime-version :content-type:content-transfer-encoding; s=default; bh=92OzoRN/h bTvEpker4Z5rzETwgQ=; b=VH+Y3/8BdVDNVCtLRAwfmaIF8lgSG347RYYwg0FS7 VLANAxT45dPU3klgGohgItMSRP7cFApDE8EWzxjerE2RA7KFOd6runW2mIh059Uz 4A8nSkNlk5Bs+EwE+SgLR/6TByI2XL5SEkfPcCl9JNhTIyLDY7XoRoTCfIqw/DN1 2s= Received: (qmail 8847 invoked by alias); 11 Aug 2017 15:38:52 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 8614 invoked by uid 89); 11 Aug 2017 15:38:50 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy= X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 11 Aug 2017 15:38:47 +0000 Received: from svr-orw-fem-03.mgc.mentorg.com ([147.34.97.39]) by relay1.mentorg.com with esmtp id 1dgC1N-0002L6-Gp from Thomas_Schwinge@mentor.com for gcc-patches@gcc.gnu.org; Fri, 11 Aug 2017 08:38:45 -0700 Received: from tftp-cs (147.34.91.1) by svr-orw-fem-03.mgc.mentorg.com (147.34.97.39) with Microsoft SMTP Server id 14.3.224.2; Fri, 11 Aug 2017 08:38:40 -0700 Received: by tftp-cs (Postfix, from userid 49978) id C21A5C2301; Fri, 11 Aug 2017 08:38:39 -0700 (PDT) From: Thomas Schwinge To: Tom de Vries , GCC Patches Subject: Re: [committed, nvptx] Add nvptx_override_options_after_change In-Reply-To: <6661dd7d-f22e-b043-5b74-792b3c74f08f@mentor.com> References: <767255ef-911c-d89c-3569-785c30354166@mentor.com> <65b84334-0d77-2507-fb65-f94c87ce8d1c@mentor.com> <87shh230t1.fsf@euler.schwinge.homeip.net> <6661dd7d-f22e-b043-5b74-792b3c74f08f@mentor.com> User-Agent: Notmuch/0.9-125-g4686d11 (http://notmuchmail.org) Emacs/25.2.1 (x86_64-pc-linux-gnu) Date: Fri, 11 Aug 2017 17:38:31 +0200 Message-ID: <87k22a2jyg.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 Hi! On Tue, 8 Aug 2017 10:58:12 +0200, Tom de Vries wrote: > On 08/08/2017 10:45 AM, Thomas Schwinge wrote: > > On Fri, 21 Jul 2017 11:49:11 +0200, Tom de Vries 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 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(-) Grüße Thomas diff --git gcc/ChangeLog gcc/ChangeLog index 2975655..295b4c9 100644 --- gcc/ChangeLog +++ gcc/ChangeLog @@ -1,3 +1,10 @@ +2017-08-11 Thomas Schwinge + + 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 * config/aarch64/aarch64.md (mov): 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