From patchwork Tue Jul 11 15:39:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?556/5LuZ5re8?= X-Patchwork-Id: 118614 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp570080vqm; Tue, 11 Jul 2023 08:40:44 -0700 (PDT) X-Google-Smtp-Source: APBJJlEpkmG3vd6RM2P/5NSkDnnbb6FeMlf25jYbauV/Jca6ReviE5GHNbgRJxeL+M8+0VsJCviC X-Received: by 2002:a5d:52c3:0:b0:313:eadf:b82d with SMTP id r3-20020a5d52c3000000b00313eadfb82dmr13593757wrv.69.1689090044345; Tue, 11 Jul 2023 08:40:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689090044; cv=none; d=google.com; s=arc-20160816; b=y7xuSZwnkOe92q7ADi33ISiWqXo3rHvGqBFjEmNnagmi0liB6zunQtFM9sfrnvRqQN ITxHFbGc93iHD+AddSbqxxfl8ie1rKe15tZEbEPa21FBh+Ov3jGD8rF9jMjXypGnLM0C FWal9GAgLlNx8LJXKPcD6xE7d6niOHfOSgr7nLb/ep3xNOSVkQRj8RkMiBDPUUScxSq8 XtHjdPK39UUHn68o53ajYelCpJTKkyei1W5tLfSbYMV+Ej5vU8fDHS++nBcs17WgCH18 MWK+G9QXBVitM5vrjKADycX3l64S0ns8QcpWiovVTwwy4CdW46KVMNPun2bwnhlVofyg W/FQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=F64S3Qeysy5k6CN369tEZL3GWtGKhc+tKYHcnKU/LOM=; fh=nShF4yi7pAcKafp000aF3eJ8xupzVWhEMo/sfGcFmfM=; b=sZTBiTSTXmmG1G3NlqFDqZ+7BkEEfMNMVvAxILMIDxzefj2b0j91N42JBD93BymQyJ hyG4TAfHc8AF81ZqkF3tLMCOpyaYQ12bfWtvDjT1VjlLBSukh4gMIqI8ne6TXiCHhxrA 7zdxul95UHQlVRv+JVVQQSkNP57S3VDC/atugZrS4nDig9ZF7WVk2+hGP2ZXL7IlBLxH hBmhRj1XO2FrMB/H0GDSZKQsnz7y/5Da8pJHZ2GfunFdmqxpSgGGeuhtUHpw4ZXmI/0R UqEJ69ZICbP8PvwIns4vngje7TExBnl3aSFSJgjZLlEwNchYwO6y1t6l9hzHaHW6b7Xh R+tw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=lpdTBjo4; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id b9-20020aa7c909000000b0051e0f0b46d9si2249203edt.688.2023.07.11.08.40.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 08:40:44 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=lpdTBjo4; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 382533857716 for ; Tue, 11 Jul 2023 15:40:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 382533857716 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1689090043; bh=F64S3Qeysy5k6CN369tEZL3GWtGKhc+tKYHcnKU/LOM=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=lpdTBjo4NnSW1gGdpKeG9krm2ozZkuyyOwsm9uPdbm3W24BqsBAgv9uBwQZwp2bcd njkwBFtvERhMIE81lcTD8H2935qucgfB7E/tGJ8puMYvoBPl3HjZbtdxo0p2VfdbqW Aw4Pixw3fxqOltUz3HByUdUTOop6igM4OpZ4jdRQ= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from out30-131.freemail.mail.aliyun.com (out30-131.freemail.mail.aliyun.com [115.124.30.131]) by sourceware.org (Postfix) with ESMTPS id 92C403858D20 for ; Tue, 11 Jul 2023 15:40:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 92C403858D20 X-Alimail-AntiSpam: AC=PASS; BC=-1|-1; BR=01201311R951e4; CH=green; DM=||false|; DS=||; FP=0|-1|-1|-1|0|-1|-1|-1; HT=ay29a033018045170; MF=cooper.qu@linux.alibaba.com; NM=1; PH=DS; RN=5; SR=0; TI=SMTPD_---0Vn9XlvG_1689089993; Received: from localhost(mailfrom:cooper.qu@linux.alibaba.com fp:SMTPD_---0Vn9XlvG_1689089993) by smtp.aliyun-inc.com; Tue, 11 Jul 2023 23:39:54 +0800 To: gcc-patches@gcc.gnu.org, christoph.muellner@vrull.eu, jeffreyalaw@gmail.com, kito.cheng@sifive.com Cc: Xianmiao Qu Subject: [PATCH 1/1] riscv: thead: Fix ICE when enable XTheadMemPair ISA extension. Date: Tue, 11 Jul 2023 23:39:49 +0800 Message-Id: <20230711153949.6676-1-cooper.qu@linux.alibaba.com> X-Mailer: git-send-email 2.32.1 (Apple Git-133) MIME-Version: 1.0 X-Spam-Status: No, score=-19.7 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_SHORT, LIKELY_SPAM_BODY, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY, USER_IN_DEF_SPF_WL, WEIRD_PORT 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Xianmiao Qu via Gcc-patches From: =?utf-8?b?556/5LuZ5re8?= Reply-To: Xianmiao Qu Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771139282371196096 X-GMAIL-MSGID: 1771139282371196096 The frame related load/store instructions should not been scheduled bewteen echo other, and the REG_FRAME_RELATED_EXPR expression note should should be added to those instructions to prevent this. This bug cause ICE during GCC bootstap, and it will also ICE in the simplified case mempair-4.c, compilation fails with: during RTL pass: dwarf2 theadmempair-4.c:20:1: internal compiler error: in dwarf2out_frame_debug_cfa_offset, at dwarf2cfi.cc:1376 0xa8c017 dwarf2out_frame_debug_cfa_offset ../../../gcc/gcc/dwarf2cfi.cc:1376 0xa8c017 dwarf2out_frame_debug ../../../gcc/gcc/dwarf2cfi.cc:2285 0xa8c017 scan_insn_after ../../../gcc/gcc/dwarf2cfi.cc:2726 0xa8cc97 scan_trace ../../../gcc/gcc/dwarf2cfi.cc:2893 0xa8d84d create_cfi_notes ../../../gcc/gcc/dwarf2cfi.cc:2933 0xa8d84d execute_dwarf2_frame ../../../gcc/gcc/dwarf2cfi.cc:3309 0xa8d84d execute ../../../gcc/gcc/dwarf2cfi.cc:3799 gcc/ChangeLog: * config/riscv/thead.cc (th_mempair_save_regs): Add REG_FRAME_RELATED_EXPR note for mempair instuctions. gcc/testsuite/ChangeLog: * gcc.target/riscv/xtheadmempair-4.c: New test. --- gcc/config/riscv/thead.cc | 6 +++-- .../gcc.target/riscv/xtheadmempair-4.c | 26 +++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.target/riscv/xtheadmempair-4.c diff --git a/gcc/config/riscv/thead.cc b/gcc/config/riscv/thead.cc index 75203805310..2df709226f9 100644 --- a/gcc/config/riscv/thead.cc +++ b/gcc/config/riscv/thead.cc @@ -366,10 +366,12 @@ th_mempair_save_regs (rtx operands[4]) { rtx set1 = gen_rtx_SET (operands[0], operands[1]); rtx set2 = gen_rtx_SET (operands[2], operands[3]); + rtx dwarf = gen_rtx_SEQUENCE (VOIDmode, rtvec_alloc (2)); rtx insn = emit_insn (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, set1, set2))); RTX_FRAME_RELATED_P (insn) = 1; - add_reg_note (insn, REG_CFA_OFFSET, copy_rtx (set1)); - add_reg_note (insn, REG_CFA_OFFSET, copy_rtx (set2)); + XVECEXP (dwarf, 0, 0) = copy_rtx (set1); + XVECEXP (dwarf, 0, 1) = copy_rtx (set2); + add_reg_note (insn, REG_FRAME_RELATED_EXPR, dwarf); } /* Similar like riscv_restore_reg, but restores two registers from memory diff --git a/gcc/testsuite/gcc.target/riscv/xtheadmempair-4.c b/gcc/testsuite/gcc.target/riscv/xtheadmempair-4.c new file mode 100644 index 00000000000..d653f056ef4 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/xtheadmempair-4.c @@ -0,0 +1,26 @@ +/* { dg-do compile } */ +/* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-g" "-Oz" "-Os" "-flto" } } */ +/* { dg-options "-march=rv64gc_xtheadmempair -O2 -g -mtune=thead-c906" { target { rv64 } } } */ +/* { dg-options "-march=rv32gc_xtheadmempair -O2 -g -mtune=thead-c906" { target { rv32 } } } */ + +void a(); +void b(char *); +void m_fn1(int); +int e; + +int foo(int ee, int f, int g) { + char *h = (char *)__builtin_alloca(1); + b(h); + b(""); + int i = ee; + e = g; + m_fn1(f); + a(); + e = i; +} + +/* { dg-final { scan-assembler-times "th.ldd\t" 3 { target { rv64 } } } } */ +/* { dg-final { scan-assembler-times "th.sdd\t" 3 { target { rv64 } } } } */ + +/* { dg-final { scan-assembler-times "th.lwd\t" 3 { target { rv32 } } } } */ +/* { dg-final { scan-assembler-times "th.swd\t" 3 { target { rv32 } } } } */