From patchwork Fri Dec 8 20:53:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Makarov X-Patchwork-Id: 176030 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp5713569vqy; Fri, 8 Dec 2023 12:54:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IHcZ7xH2Z+HF9bDVyQmVvrhBBeaxFZU9aMZlMCbxhQs5eFKjRmZ0gGENOmK7aLBl0JZ6oqw X-Received: by 2002:a05:6214:411b:b0:67a:a721:721c with SMTP id kc27-20020a056214411b00b0067aa721721cmr1138465qvb.57.1702068851898; Fri, 08 Dec 2023 12:54:11 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702068851; cv=pass; d=google.com; s=arc-20160816; b=a7MRv+7nFf6tijjVJx4r7oghlQ5Fv773Ma6ABTonDG1W6rQ/VpLdBliuUXDLD0x1af ukpQlARZ5UrvtPkWhYjqdJQCDipWHb7OdY0F0xSJ92BXtcMsIBVGK9s9c40mW6ZtpMN4 seq4X0fQQ0adIGj/71gENW4ye5Ftx+agDByC28KemDzK7kQNNZhmm3grqHPKDLjMuSSa 9+jJ3jJBCoo9wEsPalQreyq2NGfYah4tp/aRWnn7cf44xXF3E5YMLkj0ErjSiqrYv13n QbOhUmPyBLnyHlBC/jxAxBLXYBg0yUKVJvrSeDYR+ibX365m6XNwLshk9/6+G7QX/PNH uikw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-language:subject:from :to:user-agent:mime-version:date:message-id:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=Uu5IrSBBEuhNJVtEp7FNBzGX5+B9tKKwrjBapl4CEns=; fh=XNn3asQvIblazGK92GBt13dVv+YmGV3pBS0JC29ZQco=; b=au5qOYY2SQ3RwHRLkx2DqeYvrWXqu1OmC58Zrgpue0/dfCOUapBaigrTXPyPFEDbeX YEwXkLor9a48bAfcgpGOFMBb7+7xDYzXR2ZcgwPTrnLWRO7CqY8L/q0BFLrwJYy5oAl/ ra0DGooIllk0/9SJfVUk2fYOIeh/2XvLo73A/KvLJr367xnOJyikYXkJ2ey4/hChovva BU3JbJlo0TuhSB1HuoN2/YI+jXlDqtTkk53kB+4XjdX9SBhnfsNQ0/yfmB+v/B7coIhn Zp6sLFsrydop1QnuGuHe0tN0JRm9SVsfd66xIvhvCQ2HCxDZYDZrjpJxIU/V2UiTIauY HzMQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=iEDXDngb; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id u18-20020a0ced32000000b0067acf30dc1asi2678037qvq.445.2023.12.08.12.54.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 12:54:11 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=iEDXDngb; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A8C29385841E for ; Fri, 8 Dec 2023 20:54:11 +0000 (GMT) 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 [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 807B23858C30 for ; Fri, 8 Dec 2023 20:53:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 807B23858C30 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 807B23858C30 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702068812; cv=none; b=N4fhsF4rv3vF2KUM8POWSMSTnUrQhDzM5CLl18viqoptnnLYCmH5am31rbPK9aSNSJ9woXhA0SqFRkk1kGGBhbUcmZPfRSNaybeu21fN4x4UjEl+oxlpAKGxxVJLqQeDOymK3W7yTBVVdXZ2bO0VwKmJIZjMPZ912zo6D7WdWeg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702068812; c=relaxed/simple; bh=Uu5IrSBBEuhNJVtEp7FNBzGX5+B9tKKwrjBapl4CEns=; h=DKIM-Signature:Message-ID:Date:MIME-Version:To:From:Subject; b=R0/i1AgwgMTjvV1Weu3BnIWgki/k+la9DHNetz6T64HW8jNEWbcoouc9j5Yp4gwpup6Par7yYJhyH8GWWjn/PVF2Ac2aM1XmaGOChgFLnKGBd+Wf900ergSU/Gu10GaWYQLOIFkj2sJK3YZgTL4RYBmnAKdbwoPpyvGLRp84SXs= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702068811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=Uu5IrSBBEuhNJVtEp7FNBzGX5+B9tKKwrjBapl4CEns=; b=iEDXDngb2y5HBPYC+hsbv2qtdHuQwn1a41Eamep1Zgqqe0xouRd7dK57BQT3zckRKYCTjS 33FNmcidiou5kJ19a7sdIfd6zgaNts4Uv3ryzUkql5AodZbq3d5eZ214Os+5Z21tTsUiqi 8o3nzmWElOcjhsP0lxnCq7K79QXePG0= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-549-u2TN4wXGN92p5cSlo-8nNw-1; Fri, 08 Dec 2023 15:53:29 -0500 X-MC-Unique: u2TN4wXGN92p5cSlo-8nNw-1 Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-42592a3a6c9so31093251cf.1 for ; Fri, 08 Dec 2023 12:53:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702068808; x=1702673608; h=subject:from:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=SlnGDI55Q2IkQWfwH9i/jJ6t4HUeCs4IR1ZI8NStNyA=; b=BO97b2c8AqaqEIm4xMa48A3K5XEs0G5Q9VKIWqSd2jjH7DZ6+KvyAzNV7JVXF7gXa/ IGB76Vi/LgeSQmNPic3Cf3+UT9BgHqbtV6m6Ldj6oI9pAgNip59OOOATwkHgXL3rTAlA 8T1zou84f5m9TZAD/RO8UDpOmi3/k6YPhWDRUNR2uQ6z8YShG+lDvbusPo/jqfZBXiMR N/xlsj5yjQpV9a423SUs/club1VViZMFo2rQ4Ny/t1UO6QBAtZdvCtHRLCtp91RgWEL3 YJWdZwTiYyNkmXDpRAJFOwZhsh8M3PkabKPYEJH8gdWIl8hyVTw9cbTlln+4A07HfVtw lppg== X-Gm-Message-State: AOJu0YxslXZ05zixElKxWSxt5dyTxEALA2/HLW/jKIBeb4tfZvAJhywq LaeskblAeK3GaC6cCI5IkFLqoHz2xe9wd09LSQtFMt9DOrmsFtFTad+mUEbCDwMKKKKVuVdrhMt k0Ql9Qqv/6+NybcAxewDdjobwUGcdsXgV/brKnzkM/H5JL204w+PWBYR4N8VLKGZBNsNRZiQIgT v89Q== X-Received: by 2002:a05:622a:1828:b0:418:11c9:ddb5 with SMTP id t40-20020a05622a182800b0041811c9ddb5mr2173642qtc.25.1702068807993; Fri, 08 Dec 2023 12:53:27 -0800 (PST) X-Received: by 2002:a05:622a:1828:b0:418:11c9:ddb5 with SMTP id t40-20020a05622a182800b0041811c9ddb5mr2173629qtc.25.1702068807664; Fri, 08 Dec 2023 12:53:27 -0800 (PST) Received: from [192.168.1.88] (23-233-12-249.cpe.pppoe.ca. [23.233.12.249]) by smtp.gmail.com with ESMTPSA id q17-20020ac87351000000b00419b9b1b0b0sm1079883qtp.56.2023.12.08.12.53.27 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 08 Dec 2023 12:53:27 -0800 (PST) Message-ID: <85356fe6-9331-b089-6b0f-3ef8ddd77365@redhat.com> Date: Fri, 8 Dec 2023 15:53:26 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 To: "gcc-patches@gcc.gnu.org" From: Vladimir Makarov Subject: [pushed][PR112875][LRA]: Fix an assert in lra elimination code X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, LIKELY_SPAM_BODY, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784748548441251834 X-GMAIL-MSGID: 1784748548441251834 The following patch fixes https://gcc.gnu.org/bugzilla/show_bug.cgi?id=112875 The patch was successfully tested and bootstrapped on x86-64 and ppc64le. commit 48cb51827c9eb991b92014a3f59d31eb237ce03f Author: Vladimir N. Makarov Date: Fri Dec 8 15:37:42 2023 -0500 [PR112875][LRA]: Fix an assert in lra elimination code PR112875 test ran into a wrong assert (gcc_unreachable) in elimination in a debug insn. The insn seems ok. So I change the assertion. To be more accurate I made it the same as analogous reload pass code. gcc/ChangeLog: PR rtl-optimization/112875 * lra-eliminations.cc (lra_eliminate_regs_1): Change an assert. Add ASM_OPERANDS case. gcc/testsuite/ChangeLog: PR rtl-optimization/112875 * gcc.target/i386/pr112875.c: New test. diff --git a/gcc/lra-eliminations.cc b/gcc/lra-eliminations.cc index f3b75e08390..cf229b402da 100644 --- a/gcc/lra-eliminations.cc +++ b/gcc/lra-eliminations.cc @@ -666,6 +666,10 @@ lra_eliminate_regs_1 (rtx_insn *insn, rtx x, machine_mode mem_mode, return x; case CLOBBER: + case ASM_OPERANDS: + gcc_assert (insn && DEBUG_INSN_P (insn)); + break; + case SET: gcc_unreachable (); diff --git a/gcc/testsuite/gcc.target/i386/pr112875.c b/gcc/testsuite/gcc.target/i386/pr112875.c new file mode 100644 index 00000000000..b704404b248 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr112875.c @@ -0,0 +1,33 @@ +/* { dg-do compile } */ +/* { dg-options "-Oz -frounding-math -fno-dce -fno-trapping-math -fno-tree-dce -fno-tree-dse -g" } */ +long a, f; +int b, c, d, g, h, i, j; +char e; +void k(long, int l, char t) { + char m = b, n = g, o = 0; + int p, q, r = h; + long s = g; + if (f) { + q = t + (float)16777217; + o = ~0; + } + if (e) { + d = g + a; + if (d % (a % l)) { + p = d; + n = b; + } + if (l) { + i = b; + r = a; + p = h; + } + if (s) + s = q; + c = f; + e += t; + a = p; + } + j = r % n; + s += g / 0xc000000000000000 + !o; +}