From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-x52a.google.com (mail-pg1-x52a.google.com [IPv6:2607:f8b0:4864:20::52a]) by sourceware.org (Postfix) with ESMTPS id C4B4D3858C78 for ; Mon, 4 Dec 2023 09:21:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C4B4D3858C78 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=vrull.eu Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=vrull.eu ARC-Filter: OpenARC Filter v1.0.0 sourceware.org C4B4D3858C78 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::52a ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701681676; cv=none; b=BINj3Gu+DNf9M+GYfkaIeq3u8ZnCOPy5EZmXIxgSyZPHVQraMywOtsxutmblCmCtTJvzs0Z9rFImo89uqnn96i2AeNFzLKiRyk6VzAKpXSIx3yA1gXn4V3ZvABz/xcZKBC1QqNzIx3CCjREDxn6o+dMyqRDdXqYwObDmYbdFTIQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701681676; c=relaxed/simple; bh=JlbnsxQ+AuHyTnI5d7fR5Fzr7F7LI/bSYuEgVr+TwUc=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=CHP+2LhmIMw1ghiG6VZQZarPqVWkSRypJoLZzvNUJNXIKoSCfDUD2bssW4+E76VqYTGsAXc7D9q9ef1MEuLtbpUYMJGtVuHEnVsdrX5kEPNZPf5Af7GfPaAATOD5ddZYzk5D6pcNl0KRv99SizuwYGcK1lxxxPz9025cJ5a0lMU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pg1-x52a.google.com with SMTP id 41be03b00d2f7-5c229dabbb6so1327402a12.0 for ; Mon, 04 Dec 2023 01:21:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vrull.eu; s=google; t=1701681673; x=1702286473; 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=MBR6ATsHNZap8TbuAnHLZBFb9s4awwSondMZkZzMkfM=; b=Vk2/sHXy5fTayU6P/FAeCdcQIeJmuCAxkR6ZnHYyPfJcBYI2o+J9TW4XgoEwHBdNw7 ijyXVdO7JX2KJ1hvFCYJll063KmvxmIso1Dpp3A/eIgmjoP5RSTO1NkRCuToXUbwOtDm susLnNiyKs0IRl+MkTH1yOd4ZPhHL9Kg5wsPLTWWpeg+aWCF9HlB1aLNL89tH5yCaSVK pUvR4VIug+mXhhF0hodLkbo5elerWUqeFq4iKO9yx5v03D5MqoMR8SN8XgPmlXrVjvwm QiPE5anWINgteGqe3O46/Xb9ypOPbJtOFwcvTdpN7u57/6UPKgRA+X5CIKiUo5FYISk5 ng/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701681673; x=1702286473; 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=MBR6ATsHNZap8TbuAnHLZBFb9s4awwSondMZkZzMkfM=; b=AWrZnTAxYGSC+dqMapk14CtJcQc0klWksWcNlIxiISEPzo8R3Jhtrfndj17tml4M+U jlR3YyOJObKNqilEs06PR0rEjA1A//VRHnEEfc9LLAxvVpGMbIez+nGU2WxohECmF15V jBgpnCMH+M23e0LWdLLQ814sxJP33c2HQHH54xjPsc9kwwI6+rgVs4f7w6I9CKorGZl9 Jb6F1jMMLuc94abv2aYDiXvtgMYrJ56j1/tLiKPWNKESF4mIYPM5DhF1B24wrzbFlwMn PhnUt4NoLM7WPZAifFTJaUMbWIXnwrEl0ZqI07vFH25lJtNaGiVHCW369YK22gVo2TI8 CeqA== X-Gm-Message-State: AOJu0YwWi7CEAX6n26wLxCayHhjHwHR+Qy8bvgOnYlH4wfj5+LQw3eqo opiUs2LEqeQG0vUPqbDaA4TFP7k1s/Las7QVlhVyrdA5dXt9klm78VBPmw== X-Google-Smtp-Source: AGHT+IF8fhvqx3f8Hzf+lxYCR9rdDlHCjH2bnl5ern93Xl7tql8fTzFCHgVVt7GpWsIdgRPYXLblbQKoVM/1iuPJiWs= X-Received: by 2002:a17:90b:4a45:b0:286:86cf:313a with SMTP id lb5-20020a17090b4a4500b0028686cf313amr1198913pjb.10.1701681673692; Mon, 04 Dec 2023 01:21:13 -0800 (PST) MIME-Version: 1.0 References: <20231204074823.17970-1-kito.cheng@sifive.com> In-Reply-To: <20231204074823.17970-1-kito.cheng@sifive.com> From: =?UTF-8?Q?Christoph_M=C3=BCllner?= Date: Mon, 4 Dec 2023 10:21:02 +0100 Message-ID: Subject: Re: [PATCH] RISC-V: Check if zcd conflicts with zcmt and zcmp To: Kito Cheng 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=-10.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 List-Id: On Mon, Dec 4, 2023 at 8:48=E2=80=AFAM Kito Cheng w= rote: 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/config/= 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 extension"= , m_arch); > + > + if (lookup ("zcd")) > + { > + if (lookup ("zcmt")) > + error_at (m_loc, "%<-march=3D%s%>: zcd conflicts with zcmt", m_ar= ch); > + if (lookup ("zcmp")) > + error_at (m_loc, "%<-march=3D%s%>: zcd conflicts with zcmp", m_ar= ch); > + } > } > > /* Parsing function for multi-letter extensions. > diff --git a/gcc/testsuite/gcc.target/riscv/arch-29.c b/gcc/testsuite/gcc= .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/gcc= .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 >