From patchwork Wed Oct 4 07:49:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?556/5LuZ5re8?= X-Patchwork-Id: 148167 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2590548vqb; Wed, 4 Oct 2023 00:49:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFS31AdWlqQ0qQhfc1Xnygw++n5EelwF3hICw8n5BVtDqGEsvukgGyjnDNByIThcYG7GJt2 X-Received: by 2002:a17:907:6c14:b0:9ae:588e:142 with SMTP id rl20-20020a1709076c1400b009ae588e0142mr1137186ejc.67.1696405791814; Wed, 04 Oct 2023 00:49:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696405791; cv=none; d=google.com; s=arc-20160816; b=UtWWXmLxow4cr5DZsFNMGAYvqsPIx6mrAVhxz1DYG44rxm2YUFVh/qBxvz6gv53rU9 FAWASzUU8QWUi3+XOduaChuEjJc+clBYBL+CmsqICVTg4Ws+nYZ+pdGlL9O4WIz5NrSs lAolhK8rTWvhr+7SXNFaFKRmK9dgx7+QiNz7tauYxnxo7mF5nxoeGwUL+K9K8U6h9Y4p bOCniqNYXBaUThQ9vMTCtuSYg9C1HkC+fvzOBYdJ49zun9N+7Qdc0cFx2IXburBj/4SO ctyEbPh1em2IGDmGTTrmyA+Z1xazMRA8efq1YeThDAjqxc/Eu1cHhcC7uLuGEHx2j56K Plpg== ARC-Message-Signature: i=1; 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:dmarc-filter :delivered-to; bh=xK0ChiJ+PGvgnO6p3q/wUlsqbAJL4UOiuttj9s4b3pY=; fh=TT1oToT6ouYrSl3Bwj6T3YNp1POEiZegFDMcwFa7fb4=; b=tsAqzxWy2Phe6SA3iczYG+VrmNIaydtNhLSM3xi2es1jvwzPWBWt0KVN3IckXnqkjc kKbJ8eYDtzuJ0ZVGCZckgGcVwxdfFcphpx4+cordsRo7G54JIAYS3Aks1OXKOLMkWtMC MmOCY5ZcuQ51Tp363+cXrtN76nz/0bGPEc8mplcmJ2dgcO9mYCbs8EImCQYVivi9P0ST TbNmDZyVp5EW69zqCI1OaiGv3nWsSbFEuZhJG+dzdLu9rLCZysaN0EiBtAEC0nIX4Jm2 NrxxCVMmFWx4HpSlYlIgoEt0ZEzyMb77I1humzVk/KJcSv35O/HNd+IfFWfgWftiMGjP ZKWA== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from server2.sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id rv17-20020a17090710d100b00992b6f26c0esi1503433ejb.672.2023.10.04.00.49.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 00:49:51 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6A1EF385696A for ; Wed, 4 Oct 2023 07:49:46 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from out30-112.freemail.mail.aliyun.com (out30-112.freemail.mail.aliyun.com [115.124.30.112]) by sourceware.org (Postfix) with ESMTPS id 68BB53858402 for ; Wed, 4 Oct 2023 07:49:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 68BB53858402 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linux.alibaba.com X-Alimail-AntiSpam: AC=PASS; BC=-1|-1; BR=01201311R211e4; CH=green; DM=||false|; DS=||; FP=0|-1|-1|-1|0|-1|-1|-1; HT=ay29a033018045176; MF=cooper.qu@linux.alibaba.com; NM=1; PH=DS; RN=5; SR=0; TI=SMTPD_---0VtMWgvO_1696405754; Received: from localhost(mailfrom:cooper.qu@linux.alibaba.com fp:SMTPD_---0VtMWgvO_1696405754) by smtp.aliyun-inc.com; Wed, 04 Oct 2023 15:49:14 +0800 From: Xianmiao Qu To: gcc-patches@gcc.gnu.org, christoph.muellner@vrull.eu, jeffreyalaw@gmail.com, kito.cheng@sifive.com Cc: quxm Subject: [PATCH] RISC-V: THead: Fix missing CFI directives for th.sdd in prologue. Date: Wed, 4 Oct 2023 15:49:06 +0800 Message-Id: <20231004074906.15805-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, UNPARSEABLE_RELAY, USER_IN_DEF_SPF_WL 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: 1778810399722155446 X-GMAIL-MSGID: 1778810399722155446 From: quxm When generating CFI directives for the store-pair instruction, if we add two parallel REG_FRAME_RELATED_EXPR expr_lists like (expr_list:REG_FRAME_RELATED_EXPR (set (mem/c:DI (plus:DI (reg/f:DI 2 sp) (const_int 8 [0x8])) [1 S8 A64]) (reg:DI 1 ra)) (expr_list:REG_FRAME_RELATED_EXPR (set (mem/c:DI (reg/f:DI 2 sp) [1 S8 A64]) (reg:DI 8 s0)) only the first expr_list will be recognized by dwarf2out_frame_debug funciton. So, here we generate a SEQUENCE expression of REG_FRAME_RELATED_EXPR, which includes two sub-expressions of RTX_FRAME_RELATED_P. Then the dwarf2out_frame_debug_expr function will iterate through all the sub-expressions and generate the corresponding CFI directives. gcc/ * config/riscv/thead.cc (th_mempair_save_regs): Fix missing CFI directives for store-pair instruction. gcc/testsuite/ * gcc.target/riscv/xtheadmempair-4.c: New test. Reviewed-by: Christoph Müllner Tested-by: Christoph Müllner --- gcc/config/riscv/thead.cc | 11 +++---- .../gcc.target/riscv/xtheadmempair-4.c | 29 +++++++++++++++++++ 2 files changed, 35 insertions(+), 5 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 507c912bc39..be0cd7c1276 100644 --- a/gcc/config/riscv/thead.cc +++ b/gcc/config/riscv/thead.cc @@ -366,14 +366,15 @@ 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; - REG_NOTES (insn) = alloc_EXPR_LIST (REG_FRAME_RELATED_EXPR, - copy_rtx (set1), REG_NOTES (insn)); - - REG_NOTES (insn) = alloc_EXPR_LIST (REG_FRAME_RELATED_EXPR, - copy_rtx (set2), REG_NOTES (insn)); + XVECEXP (dwarf, 0, 0) = copy_rtx (set1); + XVECEXP (dwarf, 0, 1) = copy_rtx (set2); + RTX_FRAME_RELATED_P (XVECEXP (dwarf, 0, 0)) = 1; + RTX_FRAME_RELATED_P (XVECEXP (dwarf, 0, 1)) = 1; + 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..9aef4e15f8d --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/xtheadmempair-4.c @@ -0,0 +1,29 @@ +/* { dg-do compile } */ +/* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-g" "-Oz" "-Os" "-flto" } } */ +/* { dg-options "-march=rv64gc_xtheadmempair -mtune=thead-c906 -funwind-tables" { target { rv64 } } } */ +/* { dg-options "-march=rv32gc_xtheadmempair -mtune=thead-c906 -funwind-tables" { target { rv32 } } } */ + +extern void bar (void); + +void foo (void) +{ + asm volatile (";my clobber list" + : : : "s0"); + bar (); + asm volatile (";my clobber list" + : : : "s0"); +} + +/* { dg-final { scan-assembler-times "th.sdd\t" 1 { target { rv64 } } } } */ +/* { dg-final { scan-assembler ".cfi_offset 8, -16" { target { rv64 } } } } */ +/* { dg-final { scan-assembler ".cfi_offset 1, -8" { target { rv64 } } } } */ + +/* { dg-final { scan-assembler-times "th.swd\t" 1 { target { rv32 } } } } */ +/* { dg-final { scan-assembler ".cfi_offset 8, -8" { target { rv32 } } } } */ +/* { dg-final { scan-assembler ".cfi_offset 1, -4" { target { rv32 } } } } */ + +/* { dg-final { scan-assembler ".cfi_restore 1" } } */ +/* { dg-final { scan-assembler ".cfi_restore 8" } } */ + +/* { dg-final { scan-assembler-times "th.ldd\t" 1 { target { rv64 } } } } */ +/* { dg-final { scan-assembler-times "th.lwd\t" 1 { target { rv32 } } } } */