From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oi1-x22c.google.com (mail-oi1-x22c.google.com [IPv6:2607:f8b0:4864:20::22c]) by sourceware.org (Postfix) with ESMTPS id 5C6523858D1E for ; Tue, 11 Jul 2023 16:02:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5C6523858D1E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=vrull.eu Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=vrull.eu Received: by mail-oi1-x22c.google.com with SMTP id 5614622812f47-3a3790a0a48so4490655b6e.1 for ; Tue, 11 Jul 2023 09:02:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vrull.eu; s=google; t=1689091350; x=1691683350; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=Ewn+d5+FUwlzhqmW3FVJ/zusepExNecrWXPaSO8LHFo=; b=PQjWk0O3YMY1NvFXExkhrwiAI+7GJzKKF8Ivm/zHgWk78/YzvMhgZezh7iDsNbUIk2 Bidpm8sX/ueML2p6gNNcLkq8lDgyj7bWwTBux3UsARnibQngkwFwfD4L/eXlW4sagcNp wjIuZg0VaM4R013WHr34vXH2SY2fJtVT/eTSafqzag2aINvnD5RPINdmolgNlom3qhVy L2J0OqAJ/Kq/dpDUjyqnkPxpq4/KeQzfIgQgBGnqPmkGhr/cwBDS1HuKy77XKhzOgDhX pW89VJBtjukQWUNyjFIaI1xh25KzGTQnPRl8afYu1txFRlUwOm8cd7eRSxJ8vSAhuKSE GSVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689091350; x=1691683350; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ewn+d5+FUwlzhqmW3FVJ/zusepExNecrWXPaSO8LHFo=; b=XW5dA7ztyybcC3nl9aCYBXrJTrp28KB9kt0c2f1s3i91Jdld5A4xC/0PYelkPGDxn+ 8IO2gFIuUvOmJXMpWCRLfW7uACvR/h1LPZ2ZF/dBN2NPRk0HLg7Pl+7+upRzme8Ievcn F1WjQsRb+ewZaf69hpyHnVtjhSlzCUz/pStfUOXbieuiUj7/wvF1C49bwfWwBgl7Byu1 o75VBjHIqPW3orQ9wZSJyoHw8ehL9quMT7jKezHzXzUXohF80ygxWOA9aQ/zm9FfstGn KQ8GnFhtGdnjoqZRgjKg8V43pqo66nUQLq+IkdsV0wRpoL9Ix98Nz2fPiyLprbihDuNS RzKQ== X-Gm-Message-State: ABy/qLZh1lZcq1T4P7WfDU04fuWrAc2ryR8X4uxCaCny0KTU8txVeZiZ qOSmzzY6WpeQqfYGjnHlbGuUW6gHlE5b2hjW7RmzUQ== X-Google-Smtp-Source: APBJJlGMQvWAtADGo7/GOtcxMgQEfkFk9r9A5wCAURB7fZ2n0qtxE43wKcUZqUKTWK22CzzBZ/mElP/U8J2Df7qVWOs= X-Received: by 2002:a05:6808:1241:b0:3a3:6113:ce6e with SMTP id o1-20020a056808124100b003a36113ce6emr15728682oiv.39.1689091350536; Tue, 11 Jul 2023 09:02:30 -0700 (PDT) MIME-Version: 1.0 References: <20230711153949.6676-1-cooper.qu@linux.alibaba.com> In-Reply-To: From: =?UTF-8?Q?Christoph_M=C3=BCllner?= Date: Tue, 11 Jul 2023 18:02:18 +0200 Message-ID: Subject: Re: [PATCH 1/1] riscv: thead: Fix ICE when enable XTheadMemPair ISA extension. To: Kito Cheng Cc: Xianmiao Qu , gcc-patches@gcc.gnu.org, jeffreyalaw@gmail.com, Philipp Tomsich Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-9.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_SHORT,LIKELY_SPAM_BODY,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE,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 List-Id: Hi Kito, I take some of the blame because I have sent a series that consisted of fixes followed by new features. You have ack'ed patches 1-9 from the series. The last two patches (for XTheadMemIdx and XTheadFMemIdx) were later reviewed by Jeff and need a bit rework and more testing. If it helps, you can find patches 1-9 rebased and retested here: https://github.com/cmuellner/gcc/tree/riscv-thead-improvements I have also sent out a fix for two failing T-Head tests earlier today: https://gcc.gnu.org/pipermail/gcc-patches/2023-July/624049.html It would be great if you could look at that and push that as well, if it is= ok. Thanks, Christoph On Tue, Jul 11, 2023 at 5:51=E2=80=AFPM Kito Cheng = wrote: > > Hi Christoph: > > Ooops, I thought Philipp will push those patches, does here any other > patches got approved but not committed? I can help to push those > patches tomorrow. > > On Tue, Jul 11, 2023 at 11:42=E2=80=AFPM Christoph M=C3=BCllner > wrote: > > > > Hi Cooper, > > > > I addressed this in April this year. > > It even got an "ok", but nobody pushed it: > > https://gcc.gnu.org/pipermail/gcc-patches/2023-April/616972.html > > > > BR > > Christoph > > > > On Tue, Jul 11, 2023 at 5:39=E2=80=AFPM Xianmiao Qu wrote: > > > > > > 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_de= bug_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 =3D gen_rtx_SET (operands[0], operands[1]); > > > rtx set2 =3D gen_rtx_SET (operands[2], operands[3]); > > > + rtx dwarf =3D gen_rtx_SEQUENCE (VOIDmode, rtvec_alloc (2)); > > > rtx insn =3D emit_insn (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, = set1, set2))); > > > RTX_FRAME_RELATED_P (insn) =3D 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) =3D copy_rtx (set1); > > > + XVECEXP (dwarf, 0, 1) =3D copy_rtx (set2); > > > + add_reg_note (insn, REG_FRAME_RELATED_EXPR, dwarf); > > > } > > > > > > /* Similar like riscv_restore_reg, but restores two registers from m= emory > > > diff --git a/gcc/testsuite/gcc.target/riscv/xtheadmempair-4.c b/gcc/t= estsuite/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=3Drv64gc_xtheadmempair -O2 -g -mtune=3Dthead= -c906" { target { rv64 } } } */ > > > +/* { dg-options "-march=3Drv32gc_xtheadmempair -O2 -g -mtune=3Dthead= -c906" { target { rv32 } } } */ > > > + > > > +void a(); > > > +void b(char *); > > > +void m_fn1(int); > > > +int e; > > > + > > > +int foo(int ee, int f, int g) { > > > + char *h =3D (char *)__builtin_alloca(1); > > > + b(h); > > > + b(""); > > > + int i =3D ee; > > > + e =3D g; > > > + m_fn1(f); > > > + a(); > > > + e =3D 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 } = } } } */ > > > -- > > > 2.17.1 > > >