From patchwork Mon Dec 4 06:43:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feng Wang X-Patchwork-Id: 81251 X-Patchwork-Delegate: kito.cheng@gmail.com 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 32B77385801C for ; Mon, 4 Dec 2023 06:44:36 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from zg8tmtu5ljg5lje1ms4xmtka.icoremail.net (zg8tmtu5ljg5lje1ms4xmtka.icoremail.net [159.89.151.119]) by sourceware.org (Postfix) with ESMTP id 89C3538582AC for ; Mon, 4 Dec 2023 06:44:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 89C3538582AC Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=eswincomputing.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=eswincomputing.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 89C3538582AC Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=159.89.151.119 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701672261; cv=none; b=dluRgE2wzuCofWml9ehGTp2Ca1pMqLDc8GkUIHkTacX3PtJt7w5z8DGpnZuhL+/yTQts9PrwAg5WKGTdUYiQA3oUEr5G4pX4uPGFjwEAxWLrMZNV61Yk4rnJZzokm150Umf1a0vOPuVG0cb3A6EHtFp/qNZTQflzFZvbwL7J7qU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701672261; c=relaxed/simple; bh=bRH0w1yHsZCgncsoilSuxBRP2FCn1rz049OGz8/owl4=; h=From:To:Subject:Date:Message-Id; b=rjp1zbOX9F4mZuGhgddroQI+YPvkViUUh5JoViI2kTiUT2ATwM8utgyeI1d64iQzcsclRvte9deKdeSRso5pp95htzTXG66stvinHgF5001Xk7vTRWq3otbvjTdhmkoF+E5e6CE1hDnKCwdUBRGWScDyYCUik/mFAlGC9eU3dr4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from localhost.localdomain (unknown [10.12.130.31]) by app2 (Coremail) with SMTP id TQJkCgD3hdT8dG1lpRwAAA--.1568S4; Mon, 04 Dec 2023 14:43:09 +0800 (CST) From: Feng Wang To: gcc-patches@gcc.gnu.org Cc: kito.cheng@gmail.com, jeffreyalaw@gmail.com, gaofei@eswincomputing.com, Feng Wang Subject: [PATCH v2] RISC-V: Update crypto vector ISA info with latest spec Date: Mon, 4 Dec 2023 06:43:19 +0000 Message-Id: <20231204064319.30859-1-wangfeng@eswincomputing.com> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: TQJkCgD3hdT8dG1lpRwAAA--.1568S4 X-Coremail-Antispam: 1UD129KBjvAXoW3tr4kGw1kWw4fCF15ZF4Utwb_yoW8XrWkJo Z7Krs5Ca1fWw1ayw47ur13u3ykZ3sFgw4SqFZFkF4kGay2gr1rC3y7t397Zr17XryfXFyY 9F4UAFWDXF98J34Dn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73VFW2AGmfu7bjvjm3 AaLaJ3UjIYCTnIWjp_UUUY07AC8VAFwI0_Gr0_Xr1l1xkIjI8I6I8E6xAIw20EY4v20xva j40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2 x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8 Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26r xl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj 6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr 0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7MxkIecxEwVCm-wCF 04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r 18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vI r41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr 1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F4UMIIF0xvE x4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0JUdHUDUUUUU= X-CM-SenderInfo: pzdqwwxhqjqvxvzl0uprps33xlqjhudrp/ X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_VALIDITY_RPBL, 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 Rebase and resend this patch due to it was not added into patchwork before. Kito had already reviewed it. Please refer to https://www.mail-archive.com/gcc-patches@gcc.gnu.org/msg327499.html This patch add the Zvkb subset of crypto vector extension. The corresponding test cases have aslo been modified. gcc/ChangeLog: * common/config/riscv/riscv-common.cc: Add zvkb ISA info. * config/riscv/riscv.opt: Add Mask(ZVKB) gcc/testsuite/ChangeLog: * gcc.target/riscv/zvkn-1.c: Replace zvbb with zvkb. * gcc.target/riscv/zvkn.c: Ditto. * gcc.target/riscv/zvknc-1.c:Ditto. * gcc.target/riscv/zvknc-2.c:Ditto. * gcc.target/riscv/zvknc.c: Ditto. * gcc.target/riscv/zvkng-1.c:Ditto. * gcc.target/riscv/zvkng-2.c:Ditto. * gcc.target/riscv/zvkng.c: Ditto. * gcc.target/riscv/zvks-1.c: Ditto. * gcc.target/riscv/zvks.c: Ditto. * gcc.target/riscv/zvksc-1.c:Ditto. * gcc.target/riscv/zvksc-2.c:Ditto. * gcc.target/riscv/zvksc.c: Ditto. * gcc.target/riscv/zvksg-1.c:Ditto. * gcc.target/riscv/zvksg-2.c:Ditto. * gcc.target/riscv/zvksg.c: Ditto. --- gcc/common/config/riscv/riscv-common.cc | 6 ++++-- gcc/config/riscv/riscv.opt | 2 ++ gcc/testsuite/gcc.target/riscv/zvkn-1.c | 8 ++++---- gcc/testsuite/gcc.target/riscv/zvkn.c | 4 ++-- gcc/testsuite/gcc.target/riscv/zvknc-1.c | 8 ++++---- gcc/testsuite/gcc.target/riscv/zvknc-2.c | 4 ++-- gcc/testsuite/gcc.target/riscv/zvknc.c | 4 ++-- gcc/testsuite/gcc.target/riscv/zvkng-1.c | 8 ++++---- gcc/testsuite/gcc.target/riscv/zvkng-2.c | 4 ++-- gcc/testsuite/gcc.target/riscv/zvkng.c | 4 ++-- gcc/testsuite/gcc.target/riscv/zvks-1.c | 8 ++++---- gcc/testsuite/gcc.target/riscv/zvks.c | 4 ++-- gcc/testsuite/gcc.target/riscv/zvksc-1.c | 8 ++++---- gcc/testsuite/gcc.target/riscv/zvksc-2.c | 4 ++-- gcc/testsuite/gcc.target/riscv/zvksc.c | 4 ++-- gcc/testsuite/gcc.target/riscv/zvksg-1.c | 8 ++++---- gcc/testsuite/gcc.target/riscv/zvksg-2.c | 4 ++-- gcc/testsuite/gcc.target/riscv/zvksg.c | 4 ++-- 18 files changed, 50 insertions(+), 46 deletions(-) diff --git a/gcc/common/config/riscv/riscv-common.cc b/gcc/common/config/riscv/riscv-common.cc index ded85b4c578..6c210412515 100644 --- a/gcc/common/config/riscv/riscv-common.cc +++ b/gcc/common/config/riscv/riscv-common.cc @@ -106,7 +106,7 @@ static const riscv_implied_info_t riscv_implied_info[] = {"zvkn", "zvkned"}, {"zvkn", "zvknhb"}, - {"zvkn", "zvbb"}, + {"zvkn", "zvkb"}, {"zvkn", "zvkt"}, {"zvknc", "zvkn"}, {"zvknc", "zvbc"}, @@ -114,7 +114,7 @@ static const riscv_implied_info_t riscv_implied_info[] = {"zvkng", "zvkg"}, {"zvks", "zvksed"}, {"zvks", "zvksh"}, - {"zvks", "zvbb"}, + {"zvks", "zvkb"}, {"zvks", "zvkt"}, {"zvksc", "zvks"}, {"zvksc", "zvbc"}, @@ -253,6 +253,7 @@ static const struct riscv_ext_version riscv_ext_version_table[] = {"zvbb", ISA_SPEC_CLASS_NONE, 1, 0}, {"zvbc", ISA_SPEC_CLASS_NONE, 1, 0}, + {"zvkb", ISA_SPEC_CLASS_NONE, 1, 0}, {"zvkg", ISA_SPEC_CLASS_NONE, 1, 0}, {"zvkned", ISA_SPEC_CLASS_NONE, 1, 0}, {"zvknha", ISA_SPEC_CLASS_NONE, 1, 0}, @@ -1624,6 +1625,7 @@ static const riscv_ext_flag_table_t riscv_ext_flag_table[] = {"zvbb", &gcc_options::x_riscv_zvb_subext, MASK_ZVBB}, {"zvbc", &gcc_options::x_riscv_zvb_subext, MASK_ZVBC}, + {"zvkb", &gcc_options::x_riscv_zvb_subext, MASK_ZVKB}, {"zvkg", &gcc_options::x_riscv_zvk_subext, MASK_ZVKG}, {"zvkned", &gcc_options::x_riscv_zvk_subext, MASK_ZVKNED}, {"zvknha", &gcc_options::x_riscv_zvk_subext, MASK_ZVKNHA}, diff --git a/gcc/config/riscv/riscv.opt b/gcc/config/riscv/riscv.opt index 0c6517bdc8b..78186fff6c5 100644 --- a/gcc/config/riscv/riscv.opt +++ b/gcc/config/riscv/riscv.opt @@ -319,6 +319,8 @@ Mask(ZVBB) Var(riscv_zvb_subext) Mask(ZVBC) Var(riscv_zvb_subext) +Mask(ZVKB) Var(riscv_zvb_subext) + TargetVariable int riscv_zvk_subext diff --git a/gcc/testsuite/gcc.target/riscv/zvkn-1.c b/gcc/testsuite/gcc.target/riscv/zvkn-1.c index 23b255b4779..069a8f66c92 100644 --- a/gcc/testsuite/gcc.target/riscv/zvkn-1.c +++ b/gcc/testsuite/gcc.target/riscv/zvkn-1.c @@ -1,6 +1,6 @@ /* { dg-do compile } */ -/* { dg-options "-march=rv64gc_zvkned_zvknhb_zvbb_zvkt" { target { rv64 } } } */ -/* { dg-options "-march=rv32gc_zvkned_zvknhb_zvbb_zvkt" { target { rv32 } } } */ +/* { dg-options "-march=rv64gc_zvkned_zvknhb_zvkb_zvkt" { target { rv64 } } } */ +/* { dg-options "-march=rv32gc_zvkned_zvknhb_zvkb_zvkt" { target { rv32 } } } */ #ifndef __riscv_zvkn #error "Feature macro for `Zvkn' not defined" @@ -14,8 +14,8 @@ #error "Feature macro for `Zvknhb' not defined" #endif -#ifndef __riscv_zvbb -#error "Feature macro for `Zvbb' not defined" +#ifndef __riscv_zvkb +#error "Feature macro for `Zvkb' not defined" #endif #ifndef __riscv_zvkt diff --git a/gcc/testsuite/gcc.target/riscv/zvkn.c b/gcc/testsuite/gcc.target/riscv/zvkn.c index 0047ebdede6..bcecbcc7e77 100644 --- a/gcc/testsuite/gcc.target/riscv/zvkn.c +++ b/gcc/testsuite/gcc.target/riscv/zvkn.c @@ -14,8 +14,8 @@ #error "Feature macro for `Zvknhb' not defined" #endif -#ifndef __riscv_zvbb -#error "Feature macro for `Zvbb' not defined" +#ifndef __riscv_zvkb +#error "Feature macro for `Zvkb' not defined" #endif #ifndef __riscv_zvkt diff --git a/gcc/testsuite/gcc.target/riscv/zvknc-1.c b/gcc/testsuite/gcc.target/riscv/zvknc-1.c index d8a84c02118..64cae2bfe83 100644 --- a/gcc/testsuite/gcc.target/riscv/zvknc-1.c +++ b/gcc/testsuite/gcc.target/riscv/zvknc-1.c @@ -1,6 +1,6 @@ /* { dg-do compile } */ -/* { dg-options "-march=rv64gc_zvkned_zvknhb_zvbb_zvkt_zvbc" { target { rv64 } } } */ -/* { dg-options "-march=rv32gc_zvkned_zvknhb_zvbb_zvkt_zvbc" { target { rv32 } } } */ +/* { dg-options "-march=rv64gc_zvkned_zvknhb_zvkb_zvkt_zvbc" { target { rv64 } } } */ +/* { dg-options "-march=rv32gc_zvkned_zvknhb_zvkb_zvkt_zvbc" { target { rv32 } } } */ #ifndef __riscv_zvknc #error "Feature macro for `Zvknc' not defined" @@ -18,8 +18,8 @@ #error "Feature macro for `Zvknhb' not defined" #endif -#ifndef __riscv_zvbb -#error "Feature macro for `Zvbb' not defined" +#ifndef __riscv_zvkb +#error "Feature macro for `ZvKb' not defined" #endif #ifndef __riscv_zvkt diff --git a/gcc/testsuite/gcc.target/riscv/zvknc-2.c b/gcc/testsuite/gcc.target/riscv/zvknc-2.c index 36cc6335d13..1f8b510bfd1 100644 --- a/gcc/testsuite/gcc.target/riscv/zvknc-2.c +++ b/gcc/testsuite/gcc.target/riscv/zvknc-2.c @@ -18,8 +18,8 @@ #error "Feature macro for `Zvknhb' not defined" #endif -#ifndef __riscv_zvbb -#error "Feature macro for `Zvbb' not defined" +#ifndef __riscv_zvkb +#error "Feature macro for `Zvkb' not defined" #endif #ifndef __riscv_zvkt diff --git a/gcc/testsuite/gcc.target/riscv/zvknc.c b/gcc/testsuite/gcc.target/riscv/zvknc.c index a177f17fbd7..64dda5fdf1f 100644 --- a/gcc/testsuite/gcc.target/riscv/zvknc.c +++ b/gcc/testsuite/gcc.target/riscv/zvknc.c @@ -18,8 +18,8 @@ #error "Feature macro for `Zvknhb' not defined" #endif -#ifndef __riscv_zvbb -#error "Feature macro for `Zvbb' not defined" +#ifndef __riscv_zvkb +#error "Feature macro for `Zvkb' not defined" #endif #ifndef __riscv_zvkt diff --git a/gcc/testsuite/gcc.target/riscv/zvkng-1.c b/gcc/testsuite/gcc.target/riscv/zvkng-1.c index d996b42af00..5419585f4de 100644 --- a/gcc/testsuite/gcc.target/riscv/zvkng-1.c +++ b/gcc/testsuite/gcc.target/riscv/zvkng-1.c @@ -1,6 +1,6 @@ /* { dg-do compile } */ -/* { dg-options "-march=rv64gc_zvkned_zvknhb_zvbb_zvkt_zvkg" { target { rv64 } } } */ -/* { dg-options "-march=rv32gc_zvkned_zvknhb_zvbb_zvkt_zvkg" { target { rv32 } } } */ +/* { dg-options "-march=rv64gc_zvkned_zvknhb_zvkb_zvkt_zvkg" { target { rv64 } } } */ +/* { dg-options "-march=rv32gc_zvkned_zvknhb_zvkb_zvkt_zvkg" { target { rv32 } } } */ #ifndef __riscv_zvkng #error "Feature macro for `Zvkng' not defined" @@ -18,8 +18,8 @@ #error "Feature macro for `Zvknhb' not defined" #endif -#ifndef __riscv_zvbb -#error "Feature macro for `Zvbb' not defined" +#ifndef __riscv_zvkb +#error "Feature macro for `Zvkb' not defined" #endif #ifndef __riscv_zvkt diff --git a/gcc/testsuite/gcc.target/riscv/zvkng-2.c b/gcc/testsuite/gcc.target/riscv/zvkng-2.c index 00199992d5c..6c7b239e831 100644 --- a/gcc/testsuite/gcc.target/riscv/zvkng-2.c +++ b/gcc/testsuite/gcc.target/riscv/zvkng-2.c @@ -18,8 +18,8 @@ #error "Feature macro for `Zvknhb' not defined" #endif -#ifndef __riscv_zvbb -#error "Feature macro for `Zvbb' not defined" +#ifndef __riscv_zvkb +#error "Feature macro for `Zvkb' not defined" #endif #ifndef __riscv_zvkt diff --git a/gcc/testsuite/gcc.target/riscv/zvkng.c b/gcc/testsuite/gcc.target/riscv/zvkng.c index 4605faf3c6c..6c516a4ae13 100644 --- a/gcc/testsuite/gcc.target/riscv/zvkng.c +++ b/gcc/testsuite/gcc.target/riscv/zvkng.c @@ -18,8 +18,8 @@ #error "Feature macro for `Zvknhb' not defined" #endif -#ifndef __riscv_zvbb -#error "Feature macro for `Zvbb' not defined" +#ifndef __riscv_zvkb +#error "Feature macro for `Zvkb' not defined" #endif #ifndef __riscv_zvkt diff --git a/gcc/testsuite/gcc.target/riscv/zvks-1.c b/gcc/testsuite/gcc.target/riscv/zvks-1.c index a576cdb0476..180b3f3c2a9 100644 --- a/gcc/testsuite/gcc.target/riscv/zvks-1.c +++ b/gcc/testsuite/gcc.target/riscv/zvks-1.c @@ -1,6 +1,6 @@ /* { dg-do compile } */ -/* { dg-options "-march=rv64gc_zvksed_zvksh_zvbb_zvkt" { target { rv64 } } } */ -/* { dg-options "-march=rv32gc_zvksed_zvksh_zvbb_zvkt" { target { rv32 } } } */ +/* { dg-options "-march=rv64gc_zvksed_zvksh_zvkb_zvkt" { target { rv64 } } } */ +/* { dg-options "-march=rv32gc_zvksed_zvksh_zvkb_zvkt" { target { rv32 } } } */ #ifndef __riscv_zvks #error "Feature macro for `Zvks' not defined" @@ -14,8 +14,8 @@ #error "Feature macro for `Zvksh' not defined" #endif -#ifndef __riscv_zvbb -#error "Feature macro for `Zvbb' not defined" +#ifndef __riscv_zvkb +#error "Feature macro for `Zvkb' not defined" #endif #ifndef __riscv_zvkt diff --git a/gcc/testsuite/gcc.target/riscv/zvks.c b/gcc/testsuite/gcc.target/riscv/zvks.c index d31b2610c20..2022d168ec1 100644 --- a/gcc/testsuite/gcc.target/riscv/zvks.c +++ b/gcc/testsuite/gcc.target/riscv/zvks.c @@ -14,8 +14,8 @@ #error "Feature macro for `Zvksh' not defined" #endif -#ifndef __riscv_zvbb -#error "Feature macro for `Zvbb' not defined" +#ifndef __riscv_zvkb +#error "Feature macro for `Zvkb' not defined" #endif #ifndef __riscv_zvkt diff --git a/gcc/testsuite/gcc.target/riscv/zvksc-1.c b/gcc/testsuite/gcc.target/riscv/zvksc-1.c index 3b76e6cea70..0c81b4ee93b 100644 --- a/gcc/testsuite/gcc.target/riscv/zvksc-1.c +++ b/gcc/testsuite/gcc.target/riscv/zvksc-1.c @@ -1,6 +1,6 @@ /* { dg-do compile } */ -/* { dg-options "-march=rv64gc_zvksed_zvksh_zvbb_zvkt_zvbc" { target { rv64 } } } */ -/* { dg-options "-march=rv32gc_zvksed_zvksh_zvbb_zvkt_zvbc" { target { rv32 } } } */ +/* { dg-options "-march=rv64gc_zvksed_zvksh_zvkb_zvkt_zvbc" { target { rv64 } } } */ +/* { dg-options "-march=rv32gc_zvksed_zvksh_zvkb_zvkt_zvbc" { target { rv32 } } } */ #ifndef __riscv_zvksc #error "Feature macro for `Zvksc' not defined" @@ -18,8 +18,8 @@ #error "Feature macro for `Zvksh' not defined" #endif -#ifndef __riscv_zvbb -#error "Feature macro for `Zvbb' not defined" +#ifndef __riscv_zvkb +#error "Feature macro for `Zvkb' not defined" #endif #ifndef __riscv_zvkt diff --git a/gcc/testsuite/gcc.target/riscv/zvksc-2.c b/gcc/testsuite/gcc.target/riscv/zvksc-2.c index b95e34ec6e4..0cee3586390 100644 --- a/gcc/testsuite/gcc.target/riscv/zvksc-2.c +++ b/gcc/testsuite/gcc.target/riscv/zvksc-2.c @@ -18,8 +18,8 @@ #error "Feature macro for `Zvksh' not defined" #endif -#ifndef __riscv_zvbb -#error "Feature macro for `Zvbb' not defined" +#ifndef __riscv_zvkb +#error "Feature macro for `Zvkb' not defined" #endif #ifndef __riscv_zvkt diff --git a/gcc/testsuite/gcc.target/riscv/zvksc.c b/gcc/testsuite/gcc.target/riscv/zvksc.c index 983f1aa89ec..6c33a86aa2e 100644 --- a/gcc/testsuite/gcc.target/riscv/zvksc.c +++ b/gcc/testsuite/gcc.target/riscv/zvksc.c @@ -18,8 +18,8 @@ #error "Feature macro for `Zvksh' not defined" #endif -#ifndef __riscv_zvbb -#error "Feature macro for `Zvbb' not defined" +#ifndef __riscv_zvkb +#error "Feature macro for `Zvkb' not defined" #endif #ifndef __riscv_zvkt diff --git a/gcc/testsuite/gcc.target/riscv/zvksg-1.c b/gcc/testsuite/gcc.target/riscv/zvksg-1.c index e6b30552e4c..a81c8faf302 100644 --- a/gcc/testsuite/gcc.target/riscv/zvksg-1.c +++ b/gcc/testsuite/gcc.target/riscv/zvksg-1.c @@ -1,6 +1,6 @@ /* { dg-do compile } */ -/* { dg-options "-march=rv64gc_zvksed_zvksh_zvbb_zvkt_zvkg" { target { rv64 } } } */ -/* { dg-options "-march=rv32gc_zvksed_zvksh_zvbb_zvkt_zvkg" { target { rv32 } } } */ +/* { dg-options "-march=rv64gc_zvksed_zvksh_zvkb_zvkt_zvkg" { target { rv64 } } } */ +/* { dg-options "-march=rv32gc_zvksed_zvksh_zvkb_zvkt_zvkg" { target { rv32 } } } */ #ifndef __riscv_zvksg #error "Feature macro for `Zvksg' not defined" @@ -18,8 +18,8 @@ #error "Feature macro for `Zvksh' not defined" #endif -#ifndef __riscv_zvbb -#error "Feature macro for `Zvbb' not defined" +#ifndef __riscv_zvkb +#error "Feature macro for `ZvKb' not defined" #endif #ifndef __riscv_zvkt diff --git a/gcc/testsuite/gcc.target/riscv/zvksg-2.c b/gcc/testsuite/gcc.target/riscv/zvksg-2.c index 2475e8bba1a..f6aa06bfbbe 100644 --- a/gcc/testsuite/gcc.target/riscv/zvksg-2.c +++ b/gcc/testsuite/gcc.target/riscv/zvksg-2.c @@ -18,8 +18,8 @@ #error "Feature macro for `Zvksh' not defined" #endif -#ifndef __riscv_zvbb -#error "Feature macro for `Zvbb' not defined" +#ifndef __riscv_zvkb +#error "Feature macro for `Zvkb' not defined" #endif #ifndef __riscv_zvkt diff --git a/gcc/testsuite/gcc.target/riscv/zvksg.c b/gcc/testsuite/gcc.target/riscv/zvksg.c index 4db9b5d6b9b..af2cd6e26ac 100644 --- a/gcc/testsuite/gcc.target/riscv/zvksg.c +++ b/gcc/testsuite/gcc.target/riscv/zvksg.c @@ -18,8 +18,8 @@ #error "Feature macro for `Zvksh' not defined" #endif -#ifndef __riscv_zvbb -#error "Feature macro for `Zvbb' not defined" +#ifndef __riscv_zvkb +#error "Feature macro for `Zvkb' not defined" #endif #ifndef __riscv_zvkt