From patchwork Mon Feb 5 03:20:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Monk Chiang X-Patchwork-Id: 196622 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp645053dyb; Sun, 4 Feb 2024 19:21:35 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVFPHJQYbQSjv+MFk/BZjsDNP7NGwgWrTWVgRHxQGHtU3cFHfX9SrpVTWn4fol43b9b6625fRRCfDKSYpAK0qVFf+kkLA== X-Google-Smtp-Source: AGHT+IHMSGqWcwjpQayTb13DPTdfBcCREYsuWStaWA1J1t0AXBC6DR84iu4L+zZ5+Pb594ZzOoQw X-Received: by 2002:a05:6214:b61:b0:68c:61c0:f77c with SMTP id ey1-20020a0562140b6100b0068c61c0f77cmr9545624qvb.16.1707103295352; Sun, 04 Feb 2024 19:21:35 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707103295; cv=pass; d=google.com; s=arc-20160816; b=x5IQctR5WmZI2lPMr98ofHEsR+LCWi9h5KgEfac1TSSejuft/lRbomy5AR2/t61lTG /+/WH6xoTvBHQNeSbgSRY2R3UXk4myoQlcb1OTuTFUcTG0xV7NQQ0Wqb4MfMjxTyO4Pp Iiz356r8lkQbNUsOYZPJwlpj7bdsomgOgwrL1Ojxi5GpKAbVRqk6Ch5RhMG2VpL0mK3r 76djPEp6YSQwdbOa7V9aodn3sKVDM11uE16oEz4QhraeJdxKw8eNUuHXn0ejoIL2c4XL AldhPrppScHVlQZw72fq6NDMEmyw/WvjdSTsEiOBAeynm1DDWM9hMHqRNYr7mFc5/Am1 Ii9w== 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-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=KtcaajEw53tEbdto969VuBTF92NPVpuoQYYpW+zHgg4=; fh=m/2Vg8xcG1/vLraFVkipvQujgNkh4KIUuwfYno6iUcY=; b=R497x7pCSAQQ6nz1sO7Zx3aSFdj/yN58pvVn2DSpisWGNFumslNK6owxRPA7STobcZ Rd2vJLhij5nEKfavMEuwrKmOqTWJE18RqCPUhjkLU6oIWAz5g2svPOylM3hrqFKourAt +AIJkCZIEZOCiHz98GszKf5prwjetOG16k0zeEhyjBrX9O9SkOvCGxPGPC63XR7J4wIe EmVVuUFO5VcZ0gkNzWp4jjRoFWmh81yCI4/vj9Akq74jGOmRmH6BkRcq5eMPregUSISL q6FQOhKkqC1ucU2LgSGnmnbBED9U/1orrPGcHFVrajAbUDN69LLigRH+CnpB2wXagN4T UNxQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@sifive.com header.s=google header.b=LOEEToHg; 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=REJECT sp=REJECT dis=NONE) header.from=sifive.com X-Forwarded-Encrypted: i=1; AJvYcCVQ70nx7S5wBkFdcjRU1+3mkfkSWtOiqQd/IzFcV18J4q2FdF+aW0TsREi3t7fPL+pf47DIjppBWgsCl/77e6GEq0luVg== Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id u10-20020a0cf1ca000000b0068177d8f440si7710190qvl.229.2024.02.04.19.21.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Feb 2024 19:21:35 -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=@sifive.com header.s=google header.b=LOEEToHg; 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=REJECT sp=REJECT dis=NONE) header.from=sifive.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 155ED385841B for ; Mon, 5 Feb 2024 03:21:35 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by sourceware.org (Postfix) with ESMTPS id D8CB23858CDB for ; Mon, 5 Feb 2024 03:20:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D8CB23858CDB Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=sifive.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=sifive.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D8CB23858CDB Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::436 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707103260; cv=none; b=ZQohSLuGL4B/j1w9BrLDoEn1stEO8kTPUuPxH2bd/VLk1iVeHBL/InJhkSupjTCz8tGunhhTSMlj0MKvSHVJ/uL1QaJ3UQlDBH9gGT3EvRpoUMtwH4Zu5JzJ0De4zVnhWR4lCsLJaid+YoFy9N0r/YGeCc8clUmyeTsddn2Qmps= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707103260; c=relaxed/simple; bh=KDEc2fHEzb5ofjgeEW3CcNOEa5B2tCDckKCeZip1lIg=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=hbVYIMldBNepupg77dwvrk24LZ/iQUrC//qdk3tWxs/gJjv0bC/E6lhyTRKkY1JocN+HBWpqCxbr1NZfwrLZ2BJTbhMjcdYzHGgOfeme8TeCx5GAx2ni7ZJZu3LCQySLJM8EZtdjLB62twYDF2c0AiORCZ3k4r/e9ORz7LGhvMI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-6e034066152so631169b3a.1 for ; Sun, 04 Feb 2024 19:20:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1707103257; x=1707708057; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=KtcaajEw53tEbdto969VuBTF92NPVpuoQYYpW+zHgg4=; b=LOEEToHgAA+yuDAdOyDyeWbCLdpFur9VhlO09ZjjIJcvn1uFa5JHMd4oRzcDtg4crf TNcRALaaHkJi1rO+3lc5edzdFGS9JLNgWbIiQjC5O1gkaq2Ovk68+9c+2ys1hpuhfyr6 rs6Ruz+lcG9Tq9TY4n8BTHyWNYNwP68rmVDFfrMlognLajNfqdba6TmRKWvngC9YpsYj Iyc/Bafz67iKDCCmcb8QXWknX/AtHizU4WKMMVuZt8+/nOiXBIh83FUlXQ8znOyPAj8p CTDXvjdO0U1TM9flY60GWk5iYjzPK3bk0nM9pQZ7ctSA435UfREZvMXSscQmoYxXYZYE GPkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707103257; x=1707708057; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=KtcaajEw53tEbdto969VuBTF92NPVpuoQYYpW+zHgg4=; b=UWOsDo2nOMu0wrAP2T5R45PueiOpO5qKu3Z2fOK+f6GwR1YRIi2GxNkONzIF/e6J0t 2VGY6+53AREEOjpgv2UF21VPvF5Dm6W0hTIzgnnG0BbjtAQ11mRvT+5XdE7QXQ2hqHjK 3sw+7o02PL5Jq9M3O5kxCQGtcUxPLQ3UD6QxC5/Bz5sfz1plumQWnlSrJj15zH2drKKW 9vk6eP8cLraQh86wDntZhV1ja5G8vGdzao0wodA2ch/z/GUUnW3w5OLiQ3ocEjaarTuc YiT7zZQ0LrrpxMHfufZEf1PmriUvxgEyKRFRJCEyB7AWMEJKnPytCsiVic2SnwTjCKmI cCdA== X-Gm-Message-State: AOJu0YwWUuPmV04WbSwchJVuxlJDXyNI0KtIbTng/R9aqqldku8jekFV 887pGgCoLxJFttYWuIOTIC+zqC3AtD0YqSInUym8qAr5bsgw/gq76egB6PmB17OIrGy2CadOafZ 1Sk7OK+ztVRm5wJc2O4bkCDyGrEXiYOovLO3CWJX62hXInz1GpbBkIBhqK8D5SnybfOp4TqckJ8 /gRq3EM5oENphMzGke+0Ju1mHL29yFIiv6CHXWs25ZaA== X-Received: by 2002:a05:6a00:2d18:b0:6e0:4d50:f108 with SMTP id fa24-20020a056a002d1800b006e04d50f108mr215186pfb.15.1707103256376; Sun, 04 Feb 2024 19:20:56 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCVRsvdMhx9yHlXUZX0YxAkiIBhgnMCL31zYFNJY1S0cUb4cGIyOxejK5TWq1YOxiiB+jJ46m5YTUypMBayI3a8zL/pLKuyisJG7LrGMEUdP5EQHsnFMItXgfd3nKu4IjSgTLMiWInaM0P4IQJafCNLDaw== Received: from hsinchu02.internal.sifive.com (59-124-168-89.hinet-ip.hinet.net. [59.124.168.89]) by smtp.gmail.com with ESMTPSA id t23-20020a056a00139700b006e042b50c39sm988940pfg.144.2024.02.04.19.20.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Feb 2024 19:20:56 -0800 (PST) From: Monk Chiang To: gcc-patches@gcc.gnu.org, kito.cheng@sifive.com, philipp.tomsich@vrull.eu, zsojka@seznam.cz Cc: Monk Chiang Subject: [PATCH] RISC-V: Fix macro fusion for auipc+add, when identifying UNSPEC_AUIPC. [PR113742] Date: Mon, 5 Feb 2024 11:20:52 +0800 Message-Id: <20240205032052.15528-1-monk.chiang@sifive.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=-13.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, 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: 1790027544765935465 X-GMAIL-MSGID: 1790027544765935465 gcc/ChangeLog: PR target/113742 * config/riscv/riscv.cc (riscv_macro_fusion_pair_p): Fix recognizes UNSPEC_AUIPC for RISCV_FUSE_LUI_ADDI. gcc/testsuite/ChangeLog: * gcc.target/riscv/pr113742.c: New test. --- gcc/config/riscv/riscv.cc | 2 +- gcc/testsuite/gcc.target/riscv/pr113742.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.target/riscv/pr113742.c diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc index 799d7919a4a..4100abc9dd1 100644 --- a/gcc/config/riscv/riscv.cc +++ b/gcc/config/riscv/riscv.cc @@ -8434,7 +8434,7 @@ riscv_macro_fusion_pair_p (rtx_insn *prev, rtx_insn *curr) (lo_sum:DI (reg:DI rD) (const_int IMM12))) */ if (GET_CODE (SET_SRC (prev_set)) == UNSPEC - && XINT (prev_set, 1) == UNSPEC_AUIPC + && XINT (SET_SRC (prev_set), 1) == UNSPEC_AUIPC && (GET_CODE (SET_SRC (curr_set)) == LO_SUM || (GET_CODE (SET_SRC (curr_set)) == PLUS && SMALL_OPERAND (INTVAL (XEXP (SET_SRC (curr_set), 1)))))) diff --git a/gcc/testsuite/gcc.target/riscv/pr113742.c b/gcc/testsuite/gcc.target/riscv/pr113742.c new file mode 100644 index 00000000000..ab8934c2a8a --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/pr113742.c @@ -0,0 +1,4 @@ +//* { dg-do compile } */ +/* { dg-options "-O2 -finstrument-functions -mabi=lp64d -mcpu=sifive-p670" } */ + +void foo(void) {}