From patchwork Mon Dec 4 07:48:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kito Cheng X-Patchwork-Id: 81260 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E1DEE385E00D for ; Mon, 4 Dec 2023 07:49:11 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by sourceware.org (Postfix) with ESMTPS id 86E1D3857BB7 for ; Mon, 4 Dec 2023 07:48:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 86E1D3857BB7 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 86E1D3857BB7 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::435 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701676137; cv=none; b=tSzcjs8Hpg2/O6zpn9LHUBJlaeMIeUUlt499XWQOL78YpsJXgfj3ViOJl5PM7zXR71T35oySQ0317xMxUIeFMSmSjm31Ft2m155Wd7q10e4h9nsiMZ0s/sgJN+lOZLdR+AqQtRqC4dBZ57s4YTwIAE06Kj0fIHUER+RL0DwlZdM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701676137; c=relaxed/simple; bh=44Y0tDVNpYcI2tu7EMC5IOJikpSq1JeH5dQ7jfqJ64M=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=S7Fp19jdr3pk3vpZ3ccxcP/+m7CSWDOu/E0x7oTMABRXaZzF2OwV2pJZb5+hVI0v3AIptSGWYz7QmmNHQAT0zLkjvJsIZ5IiicOKz544oIamkqJtRFtpqjhCXtFOuZ6UW7zLZ3XxNiSqUq4jE9oidX+Sf0uv6i01gIMEUTQvVME= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-6cde4aeea29so2663566b3a.2 for ; Sun, 03 Dec 2023 23:48:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1701676133; x=1702280933; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=VUH8ya/+W320gGvmGa/rKS4rHKlTErWaU9l4QQY438Y=; b=kVjAF2P1TRVS2DrH2UdKFLhDufaYduINRybluVBndT7WPpw7f8F37edW1WM5X9El/b OhqBJgles5lTtKVhAm03jjhQDUvOSygNBQQY2eciNi1yioQwPv++SLX9BJN33MZUwEyB cNB4zgkL1zYDB3kkY6UK0S6BLUgj/o+i9kSf1wGtiT3MzaBh5r0qFitgdoV0oG34PZ+I t9pudMbRblZkDRxSXkA/pwpWf1dDqf03nCpah7qNOcbORqyf4w+7GlRr/l4Sy42Vodq4 8Cokv35uoCn92kJzQczcmmuqv6XAi8dkdB75sbelUvh13oTPR3f57VA/mjnUoe9EvbXM qg5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701676133; x=1702280933; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=VUH8ya/+W320gGvmGa/rKS4rHKlTErWaU9l4QQY438Y=; b=nonBKKO11S0ca76Dz3WWMRCzndFFgdlRZfyJmeO1je0A3p6AwBefPIOxRRd5dHc9K1 nOdI04JJkdn+4fjqQQmknb4XPpt/kOZ7a8LvdvsEghP5De6EX4xx4VqhBUdFtONimiJF yM48//p4fTBD25zum/6Vpa0w7qk5/M7pq7bqqS+Wb+5OdRlqwcdps3RrDlMypivb9EW1 KYuAvOJQ5Eo5sYQhGcpaat1b6HrUMfb5dQQShfVf3EQ3wVNdYOB95hrGyT2snqhoiI+q +s6zbP/u3MTyVQ36LsUCGNoe9lJqAMN6bdQeWozd/Uc6VF5j259qnPvslr8oEI3LACAH BvBw== X-Gm-Message-State: AOJu0Yy6860ydEfpCWHnaAAkmv6i0DgjMg3KTLkGVX9OaKUnuRZy3Xt+ mqcaJiD7d9jNLMq6cWoXH01HwwDLS2RlgD3qMKF4Wo2gjKGwAFckd5v/AS9CTHfUjgSp+d66X5w zzjtbOeVCJOUpIBYeE/7BA2IFEZoXRXjydAMJMpSiNtRNDIwVfyNH0AhCfph6sMOaAp0/DDfWsl Rd8Go= X-Google-Smtp-Source: AGHT+IFsVtzbH6njzaZF2/h0OTYIoJuE71hOpRA0qvOHxJ+8oKkcEB+cPlPFnNFUJTRmtVr3OsyPKQ== X-Received: by 2002:a05:6a00:2d20:b0:6cd:e2c2:13dd with SMTP id fa32-20020a056a002d2000b006cde2c213ddmr1253285pfb.34.1701676132863; Sun, 03 Dec 2023 23:48:52 -0800 (PST) Received: from hsinchu02.internal.sifive.com (59-124-168-89.hinet-ip.hinet.net. [59.124.168.89]) by smtp.gmail.com with ESMTPSA id t189-20020a6281c6000000b00690c0cf97c9sm7304387pfd.73.2023.12.03.23.48.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Dec 2023 23:48:52 -0800 (PST) From: Kito Cheng To: gcc-patches@gcc.gnu.org, palmer@dabbelt.com, kito.cheng@gmail.com, christoph.muellner@vrull.eu, jeffreyalaw@gmail.com Cc: Kito Cheng Subject: [PATCH] RISC-V: Check if zcd conflicts with zcmt and zcmp Date: Mon, 4 Dec 2023 15:48:23 +0800 Message-Id: <20231204074823.17970-1-kito.cheng@sifive.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=-12.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 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+patchwork=sourceware.org@gcc.gnu.org gcc/ChangeLog: * common/config/riscv/riscv-common.cc (riscv_subset_list::check_conflict_ext): Check zcd 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=%s%>: h extension requires i extension", m_arch); + + if (lookup ("zcd")) + { + if (lookup ("zcmt")) + error_at (m_loc, "%<-march=%s%>: zcd conflicts with zcmt", m_arch); + if (lookup ("zcmp")) + error_at (m_loc, "%<-march=%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/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=rv64id_zcd_zcmt -mabi=lp64d" } */ +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=rv64id_zcd_zcmp -mabi=lp64d" } */ +int foo() +{ +} + +/* { dg-error "zcd conflicts with zcmp" "" { target *-*-* } 0 } */