From patchwork Thu Feb 4 21:10:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vladimir Makarov X-Patchwork-Id: 1436311 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@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.a=rsa-sha256 header.s=default header.b=czUsng5v; dkim-atps=neutral Received: from sourceware.org (unknown [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DWrmL5hJNz9sWT for ; Fri, 5 Feb 2021 08:10:10 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6164E3857829; Thu, 4 Feb 2021 21:10:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6164E3857829 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1612473008; bh=84wU3cbEVjlBRbwMk3ddnjWMSnv3FVoYLXcOP21RbZ0=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=czUsng5valDH0z/i0Tk+p8Ks0LDKM+3wxbmagJQ2YFPRYOAt4GXlLwkDcxaNY9Viw pyIEDNwvrtN4nQzSqit/8pk7EncFfU8SSFH1J9TRq2/S3Gd2648oN0TDMrHGzseI+O Fsj20TZ/71Q/FoE018o5jZ/Ld904PIvjm0egIGgo= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 74451393C86F for ; Thu, 4 Feb 2021 21:10:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 74451393C86F Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-375-MZNYBa3XOJC19dGCC0QX9A-1; Thu, 04 Feb 2021 16:10:03 -0500 X-MC-Unique: MZNYBa3XOJC19dGCC0QX9A-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AC001107ACF8 for ; Thu, 4 Feb 2021 21:10:02 +0000 (UTC) Received: from [10.10.112.237] (ovpn-112-237.rdu2.redhat.com [10.10.112.237]) by smtp.corp.redhat.com (Postfix) with ESMTP id 45823722EE for ; Thu, 4 Feb 2021 21:10:01 +0000 (UTC) To: "gcc-patches@gcc.gnu.org" Subject: [committed] [PR97701] LRA: Don't narrow class only for REG or MEM. A version modified for gcc 10 branch. Message-ID: <71258afa-6f7f-4544-682a-478c0937f74b@redhat.com> Date: Thu, 4 Feb 2021 16:10:00 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US X-Spam-Status: No, score=-13.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Vladimir Makarov via Gcc-patches From: Vladimir Makarov Reply-To: Vladimir Makarov Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" It seem that my recent patch for PR97701 for the trunk did not create new problems.  Therefore I am committing the following patch into gcc-10-branch. commit 4918937f4c76b05eaa331f8d6f2571e2fddcc22b (HEAD -> releases/gcc-10) Author: Vladimir N. Makarov Date: Thu Feb 4 15:57:55 2021 -0500 [PR97701] LRA: Don't narrow class only for REG or MEM. A version modified for gcc-10. This is modified version of the patch committed for the trunk. The modification for gcc-10 includes lra-constraint.c code and the test. gcc/ChangeLog: PR target/97701 * lra-constraints.c (in_class_p): Don't narrow class only for REG or MEM. gcc/testsuite/ChangeLog: PR target/97701 * gcc.target/aarch64/pr97701.c: New. diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c index 088208b9c6e..bf04eb48ba6 100644 --- a/gcc/lra-constraints.c +++ b/gcc/lra-constraints.c @@ -244,6 +244,7 @@ in_class_p (rtx reg, enum reg_class cl, enum reg_class *new_class) { enum reg_class rclass, common_class; machine_mode reg_mode; + rtx src; int class_size, hard_regno, nregs, i, j; int regno = REGNO (reg); @@ -259,6 +260,7 @@ in_class_p (rtx reg, enum reg_class cl, enum reg_class *new_class) } reg_mode = GET_MODE (reg); rclass = get_reg_class (regno); + src = curr_insn_set != NULL ? SET_SRC (curr_insn_set) : NULL; if (regno < new_regno_start /* Do not allow the constraints for reload instructions to influence the classes of new pseudos. These reloads are @@ -266,12 +268,10 @@ in_class_p (rtx reg, enum reg_class cl, enum reg_class *new_class) reload pseudos for one alternative may lead to situations where other reload pseudos are no longer allocatable. */ || (INSN_UID (curr_insn) >= new_insn_uid_start - && curr_insn_set != NULL - && ((OBJECT_P (SET_SRC (curr_insn_set)) - && ! CONSTANT_P (SET_SRC (curr_insn_set))) - || (GET_CODE (SET_SRC (curr_insn_set)) == SUBREG - && OBJECT_P (SUBREG_REG (SET_SRC (curr_insn_set))) - && ! CONSTANT_P (SUBREG_REG (SET_SRC (curr_insn_set))))))) + && src != NULL + && ((REG_P (src) || MEM_P (src)) + || (GET_CODE (src) == SUBREG + && (REG_P (SUBREG_REG (src)) || MEM_P (SUBREG_REG (src))))))) /* When we don't know what class will be used finally for reload pseudos, we use ALL_REGS. */ return ((regno >= new_regno_start && rclass == ALL_REGS) diff --git a/gcc/testsuite/gcc.target/aarch64/pr97701.c b/gcc/testsuite/gcc.target/aarch64/pr97701.c new file mode 100644 index 00000000000..ede3540c48d --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/pr97701.c @@ -0,0 +1,17 @@ +/* { dg-do compile } */ +/* { dg-options "-O3" } */ + +extern char a[][12][18][17][17]; +extern short b[][12][18][17][17]; +extern int c[][2][8][7]; +short *d; +void e(signed f, int g, char h, char i, char j) { + for (int k = 648; k; k += f) + for (short l; l < j; l += 9) + for (long m = f + 6LL; m < (h ? h : i); m += 2) + for (int n = 0; n < 16; n += 3LL) { + for (int o = g; o; o++) + a[k][l][m][n][o] = b[k][l][m][n][o] = d[k] ? 2 : 0; + c[k][l][m][0] = 0; + } +}