From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) by sourceware.org (Postfix) with ESMTPS id 0B4803858D28 for ; Tue, 5 Dec 2023 09:53:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0B4803858D28 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 0B4803858D28 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::430 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701769997; cv=none; b=fB2BOQWtL0t/2aEqPJt2UB5BmAX+pwhj2xRCefDerZlHhDg9ulMpX6HKDeuNT8ErEtrE2mMUlZe/8xnrSu2IiEps7FlgHp3yRO0p9SZwBenP2+qNxlD/x8AOPgFgYmmpH4jb2JOBR6Rc9Bd8R+X2hhtX6TLMHAatb6WGF2gmxBU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701769997; c=relaxed/simple; bh=SLNMrCjuBv5wqW+nM8pfyJRVvGQUQ+pO9SUtRwTKpKU=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=E/FDoJIRa9/mrp+Y3aV0f0MZW6t6NUz3cfHo8za05hSblVFLNbCyOZRu+/SheAW/0BX/5QhXNGM4ipl0PMMeZINq+ErqSfLH5P4e2mrgcgXIGloR3FsQJC04d/xTsBBnRGmlAZqQhq+hvmXVK0jmC6eEQWTEsn8/2/CuKFc8XOQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-6cdd214bce1so5738833b3a.3 for ; Tue, 05 Dec 2023 01:53:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1701769994; x=1702374794; darn=gcc.gnu.org; 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=VDUKWg3y7eeod2R3wAJ5jVvtAhv78aIexW4eRCIv7Vk=; b=j1RmpCpm0MWecjina+cm8ehlxLg9zB8mg819nUBvdjHYgSB/6kUSkaAcLSuzkQnRNg xh7UiPMNHCTEE09ZLjmoo0va/f+scjRTQHR0rpJT6f+5pMJdlTz/L3/OYXcSHW78ggpw jRO8BClDd5t+iNnucKXxZ6zmpPse9ia300DtKYrdlW9GJ5HGz5Y5BVG7OXLjpxYqYYwM ntDRMXRmuO3sM0qFLYZqsxc7fzmej6u09g01W4Fd70MSGRa66G0vl/yC09Kt10mTw6IS AFhIoUsxIDu5c00p69WZiic6pnYpyu/D+PAkELfHd9duA46Wvglm3EfB4IY+6ecuee7L +snA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701769994; x=1702374794; 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=VDUKWg3y7eeod2R3wAJ5jVvtAhv78aIexW4eRCIv7Vk=; b=k0iVrCHO5xKPu5smBry8AlefV+MxMaTOHejIaSl/oEQpNTPPjIm5Daxrr2Gkhgvjyk vP1U0f9XrP0Y72RmZeVs6jjSAmFNWz0O2U5HmNWq0Tp6I2aDuc15rKSefwJOtd1L+ot5 oUbgnt5BVbSiH764AJQWJQ1tnSTT4cdj82Yi/V4wL4GajHBG47bdvRUQ7BXE8bNXRQ4m DJ+fCKvtd6BNxVkphgdQcIWp5f1nxqVW0xbycF1n3NG5zMkmTBILO2Ov3dU/SQcHueOP 0NmSPvttzCWNDT3eJaBNq9YU3jb3Eu2p2Mz4YP6sJAkmql1m9pHk4hnf0ekOWBZ2G/Dm OaKg== X-Gm-Message-State: AOJu0Yw9MJaW9CYpRVis0jnb3cCQT29NqiPtmlLNfBotStVrDgHK3yO4 ypNqPA4niJfFtlS9GWXO+n0DmG0SI3pJid8/AORpkQ== X-Google-Smtp-Source: AGHT+IFTIs8bXH1QxkLjePyfgUAxPpX4hO/7HWro4sZx4mNYzHhL2dLuV08lZi593J8B9w2+Wyw3EpihVVkmrqjj2gk= X-Received: by 2002:a05:6a00:1902:b0:6cb:913d:2cc6 with SMTP id y2-20020a056a00190200b006cb913d2cc6mr1243798pfi.15.1701769993890; Tue, 05 Dec 2023 01:53:13 -0800 (PST) MIME-Version: 1.0 References: <20231204074823.17970-1-kito.cheng@sifive.com> In-Reply-To: From: Kito Cheng Date: Tue, 5 Dec 2023 17:53:02 +0800 Message-ID: Subject: Re: [PATCH] RISC-V: Check if zcd conflicts with zcmt and zcmp To: =?UTF-8?Q?Christoph_M=C3=BCllner?= Cc: gcc-patches@gcc.gnu.org, palmer@dabbelt.com, kito.cheng@gmail.com, jeffreyalaw@gmail.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-9.9 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 List-Id: committed to trunk, thanks :) On Mon, Dec 4, 2023 at 5:21=E2=80=AFPM Christoph M=C3=BCllner wrote: > > On Mon, Dec 4, 2023 at 8:48=E2=80=AFAM Kito Cheng = wrote: > > LGTM > > I've double-checked this in the Zc-1.0.4-3.pdf: > * Zcmp is incompatible with Zcd > * Zcmp depends on Zca > * Zcmt is incompatible with Zcd > * Zcmt depends on Zca and Zicsr > > The implies-relations are already implemented. > This patch enforces the incompatibility-relations. > > > > > gcc/ChangeLog: > > > > * common/config/riscv/riscv-common.cc > > (riscv_subset_list::check_conflict_ext): Check and conflicts > > with zcmt and zcmp. > > > > gcc/testsuite/ChangeLog: > > > > * gcc.target/riscv/arch-29.c: New test. > > * gcc.target/riscv/arch-30.c: New test. > > --- > > gcc/common/config/riscv/riscv-common.cc | 8 ++++++++ > > gcc/testsuite/gcc.target/riscv/arch-29.c | 7 +++++++ > > gcc/testsuite/gcc.target/riscv/arch-30.c | 7 +++++++ > > 3 files changed, 22 insertions(+) > > create mode 100644 gcc/testsuite/gcc.target/riscv/arch-29.c > > create mode 100644 gcc/testsuite/gcc.target/riscv/arch-30.c > > > > diff --git a/gcc/common/config/riscv/riscv-common.cc b/gcc/common/confi= g/riscv/riscv-common.cc > > index aecb342b164..bfb41827f7a 100644 > > --- a/gcc/common/config/riscv/riscv-common.cc > > +++ b/gcc/common/config/riscv/riscv-common.cc > > @@ -1230,6 +1230,14 @@ riscv_subset_list::check_conflict_ext () > > /* 'H' hypervisor extension requires base ISA with 32 registers. */ > > if (lookup ("e") && lookup ("h")) > > error_at (m_loc, "%<-march=3D%s%>: h extension requires i extensio= n", m_arch); > > + > > + if (lookup ("zcd")) > > + { > > + if (lookup ("zcmt")) > > + error_at (m_loc, "%<-march=3D%s%>: zcd conflicts with zcmt", m_= arch); > > + if (lookup ("zcmp")) > > + error_at (m_loc, "%<-march=3D%s%>: zcd conflicts with zcmp", m_= arch); > > + } > > } > > > > /* Parsing function for multi-letter extensions. > > diff --git a/gcc/testsuite/gcc.target/riscv/arch-29.c b/gcc/testsuite/g= cc.target/riscv/arch-29.c > > new file mode 100644 > > index 00000000000..f8281275878 > > --- /dev/null > > +++ b/gcc/testsuite/gcc.target/riscv/arch-29.c > > @@ -0,0 +1,7 @@ > > +/* { dg-do compile } */ > > +/* { dg-options "-march=3Drv64id_zcd_zcmt -mabi=3Dlp64d" } */ > > +int foo() > > +{ > > +} > > + > > +/* { dg-error "zcd conflicts with zcmt" "" { target *-*-* } 0 } */ > > diff --git a/gcc/testsuite/gcc.target/riscv/arch-30.c b/gcc/testsuite/g= cc.target/riscv/arch-30.c > > new file mode 100644 > > index 00000000000..3e67ea0bb06 > > --- /dev/null > > +++ b/gcc/testsuite/gcc.target/riscv/arch-30.c > > @@ -0,0 +1,7 @@ > > +/* { dg-do compile } */ > > +/* { dg-options "-march=3Drv64id_zcd_zcmp -mabi=3Dlp64d" } */ > > +int foo() > > +{ > > +} > > + > > +/* { dg-error "zcd conflicts with zcmp" "" { target *-*-* } 0 } */ > > -- > > 2.40.1 > >