From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18957 invoked by alias); 23 Feb 2016 14:33:31 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 18936 invoked by uid 89); 23 Feb 2016 14:33:30 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.2 required=5.0 tests=AWL,BAYES_00,KAM_LAZY_DOMAIN_SECURITY,RP_MATCHES_RCVD autolearn=no version=3.3.2 spammy=met, Inline, xvec, GEN_INT X-HELO: e06smtp08.uk.ibm.com Received: from e06smtp08.uk.ibm.com (HELO e06smtp08.uk.ibm.com) (195.75.94.104) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (CAMELLIA256-SHA encrypted) ESMTPS; Tue, 23 Feb 2016 14:33:29 +0000 Received: from localhost by e06smtp08.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 23 Feb 2016 14:33:26 -0000 Received: from d06dlp02.portsmouth.uk.ibm.com (9.149.20.14) by e06smtp08.uk.ibm.com (192.168.101.138) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 23 Feb 2016 14:33:25 -0000 X-IBM-Helo: d06dlp02.portsmouth.uk.ibm.com X-IBM-MailFrom: krebbel@linux.vnet.ibm.com X-IBM-RcptTo: gcc-patches@gcc.gnu.org Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 5D8B72190056 for ; Tue, 23 Feb 2016 14:33:09 +0000 (GMT) Received: from d06av09.portsmouth.uk.ibm.com (d06av09.portsmouth.uk.ibm.com [9.149.37.250]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u1NEXOsC8061338 for ; Tue, 23 Feb 2016 14:33:24 GMT Received: from d06av09.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u1NEXO0M023521 for ; Tue, 23 Feb 2016 07:33:24 -0700 Received: from maggie.boeblingen.de.ibm.com (dyn-9-152-212-123.boeblingen.de.ibm.com [9.152.212.123]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u1NEXOE5023504 (version=TLSv1/SSLv3 cipher=AES256-SHA256 bits=256 verify=NO) for ; Tue, 23 Feb 2016 07:33:24 -0700 From: Andreas Krebbel To: gcc-patches@gcc.gnu.org Subject: [PATCH 1/9] gensupport: Fix define_subst operand renumbering. Date: Tue, 23 Feb 2016 14:33:00 -0000 Message-Id: <1456238004-21150-2-git-send-email-krebbel@linux.vnet.ibm.com> In-Reply-To: <1456238004-21150-1-git-send-email-krebbel@linux.vnet.ibm.com> References: <1456238004-21150-1-git-send-email-krebbel@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16022314-0033-0000-0000-000005DE9BE3 X-IsSubscribed: yes X-SW-Source: 2016-02/txt/msg01575.txt.bz2 When processing substitutions the operands are renumbered. To find a free operand number the array used_operands_numbers is used. Currently this array is used to assign new numbers before all the RTXes in the vector have been processed. I did run into problems with this for insns where a match_dup occurred in a later (use ...) operand referring to an earlier operand (e.g. s390.md "setmem_long"). The patch splits the loop doing the processing into two in order to have all the operand numbers collected already when assigning new numbers. Bootstrapped and regtested on s390, s390x, and x86_64. Ok for mainline? Bye, -Andreas- gcc/ChangeLog: * gensupport.c (process_substs_on_one_elem): Split loop to complete mark_operands_used_in_match_dup on all expressions in the vector first. (adjust_operands_numbers): Inline into process_substs_on_one_elem and remove function. --- gcc/gensupport.c | 45 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/gcc/gensupport.c b/gcc/gensupport.c index 8c5a1ab..de29579 100644 --- a/gcc/gensupport.c +++ b/gcc/gensupport.c @@ -126,7 +126,10 @@ static const char * duplicate_each_alternative (const char * str, int n_dup); typedef const char * (*constraints_handler_t) (const char *, int); static rtx alter_constraints (rtx, int, constraints_handler_t); -static rtx adjust_operands_numbers (rtx); + +static void mark_operands_used_in_match_dup (rtx); +static void renumerate_operands_in_pattern (rtx); + static rtx replace_duplicating_operands_in_pattern (rtx); /* Make a version of gen_rtx_CONST_INT so that GEN_INT can be used in @@ -1844,7 +1847,18 @@ process_substs_on_one_elem (struct queue_elem *elem, subst_pattern = alter_constraints (subst_pattern, alternatives, duplicate_each_alternative); - subst_pattern = adjust_operands_numbers (subst_pattern); + mark_operands_used_in_match_dup (subst_pattern); + RTVEC_ELT (subst_pattern_vec, j) = subst_pattern; + } + + for (j = 0; j < XVECLEN (subst_elem->data, 3); j++) + { + subst_pattern = RTVEC_ELT (subst_pattern_vec, j); + + /* The number of MATCH_OPERANDs in the output pattern might + change. This routine assigns new numbers to the + MATCH_OPERAND expressions to avoid collisions. */ + renumerate_operands_in_pattern (subst_pattern); /* Substitute match_dup and match_op_dup in the new pattern and duplicate constraints. */ @@ -1857,7 +1871,6 @@ process_substs_on_one_elem (struct queue_elem *elem, if (GET_CODE (elem->data) == DEFINE_EXPAND) remove_constraints (subst_pattern); - RTVEC_ELT (subst_pattern_vec, j) = subst_pattern; } XVEC (elem->data, 1) = subst_pattern_vec; @@ -1927,7 +1940,7 @@ mark_operands_from_match_dup (rtx pattern) } } -/* This is a subroutine of adjust_operands_numbers. +/* This is a subroutine of process_substs_on_one_elem. It goes through all expressions in PATTERN and when MATCH_DUP is met, all MATCH_OPERANDs inside it is marked as occupied. The process of marking is done by routin mark_operands_from_match_dup. */ @@ -1973,10 +1986,9 @@ find_first_unused_number_of_operand () return MAX_OPERANDS; } -/* This is subroutine of adjust_operands_numbers. - It visits all expressions in PATTERN and assigns not-occupied - operand indexes to MATCH_OPERANDs and MATCH_OPERATORs of this - PATTERN. */ +/* This is a subroutine of process_substs_on_one_elem. It visits all + expressions in PATTERN and assigns not-occupied operand indexes to + MATCH_OPERANDs and MATCH_OPERATORs of this PATTERN. */ static void renumerate_operands_in_pattern (rtx pattern) { @@ -2011,23 +2023,6 @@ renumerate_operands_in_pattern (rtx pattern) } } -/* If output pattern of define_subst contains MATCH_DUP, then this - expression would be replaced with the pattern, matched with - MATCH_OPERAND from input pattern. This pattern could contain any - number of MATCH_OPERANDs, MATCH_OPERATORs etc., so it's possible - that a MATCH_OPERAND from output_pattern (if any) would have the - same number, as MATCH_OPERAND from copied pattern. To avoid such - indexes overlapping, we assign new indexes to MATCH_OPERANDs, - laying in the output pattern outside of MATCH_DUPs. */ -static rtx -adjust_operands_numbers (rtx pattern) -{ - mark_operands_used_in_match_dup (pattern); - - renumerate_operands_in_pattern (pattern); - - return pattern; -} /* Generate RTL expression (match_dup OPNO) -- 1.9.1