From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from cstnet.cn (smtp25.cstnet.cn [159.226.251.25]) by sourceware.org (Postfix) with ESMTP id 1225C385AC3D for ; Wed, 23 Feb 2022 09:44:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1225C385AC3D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=iscas.ac.cn Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=iscas.ac.cn Received: from localhost.localdomain (unknown [58.212.93.238]) by APP-05 (Coremail) with SMTP id zQCowADXD0L8ARZiCQpOAQ--.41254S7; Wed, 23 Feb 2022 17:44:33 +0800 (CST) From: shihua@iscas.ac.cn To: gcc-patches@gcc.gnu.org Cc: ben.marshall@pqshield.com, kito.cheng@sifive.com, cmuellner@ventanamicro.com, palmer@dabbelt.com, andrew@sifive.com, lazyparser@gmail.com, jiawei@iscas.ac.cn, mjos@iki.fi, LiaoShihua Subject: [PATCH 5/5 V1] RISC-V:Implement architecture extension test macros for Crypto extension Date: Wed, 23 Feb 2022 17:44:18 +0800 Message-Id: <20220223094418.3518-6-shihua@iscas.ac.cn> X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: <20220223094418.3518-1-shihua@iscas.ac.cn> References: <20220223094418.3518-1-shihua@iscas.ac.cn> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowADXD0L8ARZiCQpOAQ--.41254S7 X-Coremail-Antispam: 1UD129KBjvJXoW7tw4xurWkKw45ur4DWw45Wrg_yoW5JF1xpF 45GayYyFW8J3WxK34ftFy0vw1UJr1rKrWayrW3uryUXay3J3yxKrn8K3WYyrZ8XF4F9Fyf Cw1093Wa9r1jqw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUm014x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F 4UJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE 3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2I x0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r4j6F4UMcvjeVCFs4IE7xkEbVWUJVW8 JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lFIxGxcIEc7CjxVA2Y2 ka0xkIwI1lw4CEc2x0rVAKj4xxMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j 6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7 AF67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE 2Ix0cI8IcVCY1x0267AKxVWxJVW8Jr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0x vEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVj vjDU0xZFpf9x0JUTGQkUUUUU= X-Originating-IP: [58.212.93.238] X-CM-SenderInfo: xvklx33d6l2u1dvotugofq/1tbiBggGEV0Tf-zOSgAAsQ X-Spam-Status: No, score=-13.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2022 09:44:40 -0000 From: LiaoShihua gcc/ChangeLog: * config/riscv/riscv-c.cc (riscv_cpu_cpp_builtins):Add __riscv_zks, __riscv_zk, __riscv_zkn gcc/testsuite/ChangeLog: * gcc.target/riscv/predef-17.c: New test. --- gcc/config/riscv/riscv-c.cc | 9 ++++ gcc/testsuite/gcc.target/riscv/predef-17.c | 59 ++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 gcc/testsuite/gcc.target/riscv/predef-17.c diff --git a/gcc/config/riscv/riscv-c.cc b/gcc/config/riscv/riscv-c.cc index 73c62f41274..d6c153e8d7c 100644 --- a/gcc/config/riscv/riscv-c.cc +++ b/gcc/config/riscv/riscv-c.cc @@ -63,6 +63,15 @@ riscv_cpu_cpp_builtins (cpp_reader *pfile) builtin_define ("__riscv_fdiv"); builtin_define ("__riscv_fsqrt"); } + + if (TARGET_ZBKB && TARGET_ZBKC && TARGET_ZBKX && TARGET_ZKNE && TARGET_ZKND && TARGET_ZKNH) + { + builtin_define ("__riscv_zk"); + builtin_define ("__riscv_zkn"); + } + + if (TARGET_ZBKB && TARGET_ZBKC && TARGET_ZBKX && TARGET_ZKSED && TARGET_ZKSH) + builtin_define ("__riscv_zks"); switch (riscv_abi) { diff --git a/gcc/testsuite/gcc.target/riscv/predef-17.c b/gcc/testsuite/gcc.target/riscv/predef-17.c new file mode 100644 index 00000000000..4366dee1016 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/predef-17.c @@ -0,0 +1,59 @@ +/* { dg-do compile } */ +/* { dg-options "-march=rv64i_zbkb_zbkc_zbkx_zknd_zkne_zknh_zksed_zksh -mabi=lp64 -mcmodel=medlow -misa-spec=2.2" } */ + +int main () { + +#ifndef __riscv_arch_test +#error "__riscv_arch_test" +#endif + +#if __riscv_xlen != 64 +#error "__riscv_xlen" +#endif + +#if !defined(__riscv_i) +#error "__riscv_i" +#endif + +#if !defined(__riscv_zk) +#error "__riscv_zk" +#endif + +#if !defined(__riscv_zkn) +#error "__riscv_zkn" +#endif + +#if !defined(__riscv_zks) +#error "__riscv_zks" +#endif + +#if !defined(__riscv_zbkb) +#error "__riscv_zbkb" +#endif + +#if !defined(__riscv_zbkc) +#error "__riscv_zbkc" +#endif + +#if !defined(__riscv_zbkx) +#error "__riscv_zbkx" +#endif + +#if !defined(__riscv_zknd) +#error "__riscv_zknd" +#endif + +#if !defined(__riscv_zkne) +#error "__riscv_zkne" +#endif + +#if !defined(__riscv_zknh) +#error "__riscv_zknh" +#endif + +#if !defined(__riscv_zksh) +#error "__riscv_zksh" +#endif + + return 0; +} \ No newline at end of file -- 2.31.1.windows.1