From patchwork Sat Jul 29 01:56:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsukasa OI X-Patchwork-Id: 127957 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp796951vqg; Fri, 28 Jul 2023 18:57:06 -0700 (PDT) X-Google-Smtp-Source: APBJJlFdXv67GCs4FoaduHmya5wraEYoyRHRLKdY20eqOH8C6jL8XTg09TJTJYgFpD2JNWFzcSR/ X-Received: by 2002:a17:906:31ce:b0:99b:ff9d:93f3 with SMTP id f14-20020a17090631ce00b0099bff9d93f3mr126546ejf.40.1690595826520; Fri, 28 Jul 2023 18:57:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690595826; cv=none; d=google.com; s=arc-20160816; b=TXzp/bOFvbWB+SQ85eQpUkHKvUhdt4Pvz91soYjJRauLgZjEDKalGHD/b4n95LgwEw uSoypFdCQFjP8+oUOH4135LuPQoI5bDUOoe05D9mgg+uYB8iGAxgScyMsscramrvh6f6 5f3zyOrJyXNlU3WbDlvd3bUJM+iSq5zLF1BRJvz1x65YGOmZeUac/Y++mqzNjdotns8A uMQNVm+HHcWSPakn/LzTDj48N1Z5/GQXZEZ0+iBJBuxzMfVr3Ww0AlFQMJ3diqRENi+O DlhrKy58+LEigcVwtUtES/ByRHXE/8nyG0NnGIaZTBOb+mJq4lMKsudOrh/M2MvJygL8 6MeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=sPwm9D5WP1hXpqUi+IukNRRL08Dgxs/tsLChARI2NVw=; fh=KnRutd7BouZxRY+6M5qDe08RppVkf82SqeNz44ywgXI=; b=php0qrX+FQBqOXW5B7zTkiJ+34N109Vm0wrg8zGYO0mm2Pug9nEmIUFeLFa4TFOkMc LgfslhFZUi2hix8DZjvSlRtzaPJwYsAqTidgI3WjQlTtW0tFKSsSPSdheeFnD5TiYXPV boRn3JwZobsZ6fPdXFoNfgH4nKy/+N/kaBmmOQOx5y+jx64T1Ww2fDaAbe8rLZ74K/xi u7jfe4+Wd23cJcbZNvKXsIZbEItqeu9OSsdRwIoAdK9wNG0+xiAp0TGlfbOMUvscAuv6 sJh7HPKZvZQtPlfKUU7dXnM772ghXRhgkTV8kuKLGIkftQZc+vxHaRQebN+GtFvzrTjJ 3JQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=VLVpxaU5; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id p14-20020a1709061b4e00b0099bc8db97basi3901408ejg.139.2023.07.28.18.57.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jul 2023 18:57:06 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=VLVpxaU5; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id ABFCA385AFAB for ; Sat, 29 Jul 2023 01:56:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org ABFCA385AFAB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1690595818; bh=sPwm9D5WP1hXpqUi+IukNRRL08Dgxs/tsLChARI2NVw=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=VLVpxaU5zCVBoSloG2MLrhuFYcwBlQ0kzLs6c3Ve7yC8lmWEuGlpGvjDMSaD54ll2 gdghX4mJ2v7kRe6NfAhUjtfQIn0EM7hVPH5U+l/IUfpIUFCk4oOdz/3zyeySROZRv1 jxR+JhG3k1o3Xq1z58JFooyHgi/KCROMVwfN9PJc= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-sender-0.a4lg.com (mail-sender-0.a4lg.com [IPv6:2401:2500:203:30b:4000:6bfe:4757:0]) by sourceware.org (Postfix) with ESMTPS id 7D1003858D38 for ; Sat, 29 Jul 2023 01:56:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7D1003858D38 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id 7779C300089; Sat, 29 Jul 2023 01:56:44 +0000 (UTC) To: Tsukasa OI , Palmer Dabbelt , Andrew Waterman , Jim Wilson , Nelson Chu , Kito Cheng , Jiawei Cc: binutils@sourceware.org Subject: [REVIEW ONLY 1/3] RISC-V: Base for complex extension implications Date: Sat, 29 Jul 2023 01:56:18 +0000 Message-ID: In-Reply-To: References: Mime-Version: 1.0 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, KAM_MANYTO, 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: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tsukasa OI via Binutils From: Tsukasa OI Reply-To: Tsukasa OI Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772718209088548464 X-GMAIL-MSGID: 1772718209088548464 From: Tsukasa OI Thanks to the commit 48558a5e5471 ("RISC-V: Allow nested implications for extensions"), we can write complex extension implications in theory. However, to actually do that, we need to pass more information to check_func. For example, we want to imply 'Zcf' from 'F' if and only if the 'Zce' extension is also enabled and XLEN is 32. Passing rps is a way to enable this. This commit prepares for such complex extension implications. bfd/ChangeLog: * elfxx-riscv.c (struct riscv_implicit_subset) Move around and change check_func function prototype. (check_implicit_always): New arguments. (check_implicit_for_i): Likewise. (riscv_implicit_subsets): Add comment for this variable. (riscv_parse_add_implicit_subsets): Call check_func with new arguments. --- bfd/elfxx-riscv.c | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c index ba5165766b2b..06ac521bdf27 100644 --- a/bfd/elfxx-riscv.c +++ b/bfd/elfxx-riscv.c @@ -1064,11 +1064,25 @@ riscv_elf_ignore_reloc (bfd *abfd ATTRIBUTE_UNUSED, return bfd_reloc_ok; } +/* Record all implicit information for the subsets. */ + +typedef struct riscv_implicit_subset +{ + const char *subset_name; + const char *implicit_name; + /* A function to determine if we need to add the implicit subset. */ + bool (*check_func) (const riscv_parse_subset_t *, + const struct riscv_implicit_subset *, + const riscv_subset_t *); +} riscv_implicit_subset_t; + /* Always add the IMPLICIT for the SUBSET. */ static bool -check_implicit_always (const char *implicit ATTRIBUTE_UNUSED, - riscv_subset_t *subset ATTRIBUTE_UNUSED) +check_implicit_always (const riscv_parse_subset_t *rps ATTRIBUTE_UNUSED, + const riscv_implicit_subset_t *implicit + ATTRIBUTE_UNUSED, + const riscv_subset_t *subset ATTRIBUTE_UNUSED) { return true; } @@ -1076,23 +1090,18 @@ check_implicit_always (const char *implicit ATTRIBUTE_UNUSED, /* Add the IMPLICIT only when the version of SUBSET less than 2.1. */ static bool -check_implicit_for_i (const char *implicit ATTRIBUTE_UNUSED, - riscv_subset_t *subset) +check_implicit_for_i (const riscv_parse_subset_t *rps ATTRIBUTE_UNUSED, + const riscv_implicit_subset_t *implicit ATTRIBUTE_UNUSED, + const riscv_subset_t *subset) { return (subset->major_version < 2 || (subset->major_version == 2 && subset->minor_version < 1)); } -/* Record all implicit information for the subsets. */ -struct riscv_implicit_subset -{ - const char *subset_name; - const char *implicit_name; - /* A function to determine if we need to add the implicit subset. */ - bool (*check_func) (const char *, riscv_subset_t *); -}; -static struct riscv_implicit_subset riscv_implicit_subsets[] = +/* All extension implications. */ + +static riscv_implicit_subset_t riscv_implicit_subsets[] = { {"e", "i", check_implicit_always}, {"i", "zicsr", check_implicit_for_i}, @@ -1900,7 +1909,7 @@ riscv_parse_extensions (riscv_parse_subset_t *rps, static void riscv_parse_add_implicit_subsets (riscv_parse_subset_t *rps) { - struct riscv_implicit_subset *t = riscv_implicit_subsets; + riscv_implicit_subset_t *t = riscv_implicit_subsets; bool finished = false; while (!finished) { @@ -1912,7 +1921,7 @@ riscv_parse_add_implicit_subsets (riscv_parse_subset_t *rps) if (riscv_lookup_subset (rps->subset_list, t->subset_name, &subset) && !riscv_lookup_subset (rps->subset_list, t->implicit_name, &implicit_subset) - && t->check_func (t->implicit_name, subset)) + && t->check_func (rps, t, subset)) { riscv_parse_add_subset (rps, t->implicit_name, RISCV_UNKNOWN_VERSION, From patchwork Sat Jul 29 01:56:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsukasa OI X-Patchwork-Id: 127958 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp797029vqg; Fri, 28 Jul 2023 18:57:25 -0700 (PDT) X-Google-Smtp-Source: APBJJlGSWgH19hmr2SCqkMsp644xbPU7aRWgka/wyWNnn/e9o1z4AOlYkmqODQtls91Dh3HxoWwW X-Received: by 2002:a17:906:7788:b0:99b:dfe5:74f5 with SMTP id s8-20020a170906778800b0099bdfe574f5mr890764ejm.41.1690595845678; Fri, 28 Jul 2023 18:57:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690595845; cv=none; d=google.com; s=arc-20160816; b=KyuMpcwFJHc/bNyjli2cdsGQ/Z9MXSYq3aK4MDREmfdA43Kx8s/e3VvCHjYZfmDqb5 cI2hx5ONU0St/Iru63U6AmAc6a3LFdY+Mi1SwaFh4b28TgJyASRC8a+Ux4tbmcbgYUS7 plEZQe+HFMEXO9icYM9qVFgO/Rlqo2K4B4P5gGG9Iel1eatePKi8B4aufu6QQH5rwO7V zhd4QVCA73jVtb3vKtB9qeTONlxu+VkW3ImTdjX7Xcn6/IyY81KcO1OpNVYtOMp1eWp/ T4nSQBxluHE6ga0tpU77LGBTosknkEudsKdsgqt8hffHD+DloKJfRpGpvT0ueGSPjPwl MzMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=XzSFHtN8gxcGT2WleCXzYbCAtMevue4z1HMXZNHW6Lc=; fh=KnRutd7BouZxRY+6M5qDe08RppVkf82SqeNz44ywgXI=; b=s6nrr3zHzWtzifEs45bhp/vHCjLHPxq+0QAar3YqMKciw21kCEdJODQ19nskyIyaFW eJALmR6p35TpUTo6wrIomedUgM0C8U0XG99No2K9CgGi2OK9AW1TKoDGSJT2e9Z9CXRe FNIuycpYXldaNjDuZsuIuSboX/giF7AeC3xcTL+ZlzxnOSFsjlccbHn1qMRTFsq754uH 7f5L2LLvZOM/QuStrt6QIj8piH1wKoZbeFwG1aIgX7iFBMf+HW2ZXctubfvH8gS2aAhi i3i9pV8/u/7tc1nQeA9WmnmYU8sIOMibbyPJzteq+wuIYoBJ23AZ3S3gAbdMYKFjMRaW NRTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=vJqYR86G; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id n11-20020a170906088b00b009937e7c4e50si3439405eje.546.2023.07.28.18.57.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jul 2023 18:57:25 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=vJqYR86G; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0AD3D385C414 for ; Sat, 29 Jul 2023 01:57:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0AD3D385C414 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1690595828; bh=XzSFHtN8gxcGT2WleCXzYbCAtMevue4z1HMXZNHW6Lc=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=vJqYR86GdmmhKhu56tltswhYauLenVVwNczBCraIEyuguylGA42aDEc0svsD43nfK XFvyHrAiieR/n+DpXsrUwGIMnmfHmVYC+TsMaZ91sOpiS8dv5/8wlEyUFTDO1yPGDY bc9/b0GtkHxAVdI8QwqWTw+R4cIbA/aAMZEpWMN4= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-sender-0.a4lg.com (mail-sender-0.a4lg.com [IPv6:2401:2500:203:30b:4000:6bfe:4757:0]) by sourceware.org (Postfix) with ESMTPS id 7E74338555AF for ; Sat, 29 Jul 2023 01:56:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7E74338555AF Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id 4B34D300089; Sat, 29 Jul 2023 01:56:55 +0000 (UTC) To: Tsukasa OI , Palmer Dabbelt , Andrew Waterman , Jim Wilson , Nelson Chu , Kito Cheng , Jiawei Cc: binutils@sourceware.org Subject: [REVIEW ONLY 2/3] MOCK: RISC-V: Add 'Zce' extension support Date: Sat, 29 Jul 2023 01:56:19 +0000 Message-ID: <8d7e2380a4ebb6795b33559ab98c5ca4e3881dcb.1690595772.git.research_trasio@irq.a4lg.com> In-Reply-To: References: Mime-Version: 1.0 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, KAM_MANYTO, 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: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tsukasa OI via Binutils From: Tsukasa OI Reply-To: Tsukasa OI Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772718229558977044 X-GMAIL-MSGID: 1772718229558977044 From: Tsukasa OI It adds a support for the 'Zce' superset compressed instruction extension for embedded systems. **THIS IS A MOCKUP** Since 'Zcmp' and 'Zcmt' are not added to GNU Binutils yet, this commit is just a mockup. However, it outlines what will be required on the 'Zce' support along with new complex implication design. bfd/ChangeLog: * elfxx-riscv.c (check_implicit_for_f_zce): New function to check whether adding implication 'F' -> 'Zcf' is appropriate. (riscv_implicit_subsets): Add conditional implication from 'F' -> 'Zcf'. (riscv_supported_std_z_ext): [MOCK] Add 'Zce' to the supported 'Z' extension list. --- bfd/elfxx-riscv.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c index 06ac521bdf27..94487306fae5 100644 --- a/bfd/elfxx-riscv.c +++ b/bfd/elfxx-riscv.c @@ -1099,6 +1099,20 @@ check_implicit_for_i (const riscv_parse_subset_t *rps ATTRIBUTE_UNUSED, && subset->minor_version < 1)); } +/* Add the IMPLICIT only when the 'Zce' extension is also available + and XLEN is 32. */ + +static bool +check_implicit_for_f_zce (const riscv_parse_subset_t *rps, + const riscv_implicit_subset_t *implicit + ATTRIBUTE_UNUSED, + const riscv_subset_t *subset ATTRIBUTE_UNUSED) +{ + riscv_subset_t *tmp = NULL; + return *rps->xlen == 32 + && riscv_lookup_subset (rps->subset_list, "zce", &tmp); +} + /* All extension implications. */ static riscv_implicit_subset_t riscv_implicit_subsets[] = @@ -1184,6 +1198,10 @@ static riscv_implicit_subset_t riscv_implicit_subsets[] = {"zvksg", "zvkg", check_implicit_always}, {"zvksc", "zvks", check_implicit_always}, {"zvksc", "zvbc", check_implicit_always}, + {"zce", "zca", check_implicit_always}, + {"zce", "zcb", check_implicit_always}, + {"zce", "zcmp", check_implicit_always}, + {"zce", "zcmt", check_implicit_always}, {"zcf", "zca", check_implicit_always}, {"zcd", "zca", check_implicit_always}, {"zcb", "zca", check_implicit_always}, @@ -1194,6 +1212,9 @@ static riscv_implicit_subset_t riscv_implicit_subsets[] = {"sscofpmf", "zicsr", check_implicit_always}, {"ssstateen", "zicsr", check_implicit_always}, {"sstc", "zicsr", check_implicit_always}, + /* Complex implications (that should be checked after others). */ + {"f", "zcf", check_implicit_for_f_zce}, + /* Tail of the list. */ {NULL, NULL, NULL} }; @@ -1325,6 +1346,10 @@ static struct riscv_supported_ext riscv_supported_std_z_ext[] = {"zcb", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {"zcf", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {"zcd", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, + /* MOCK: uncomment those lines once ready. */ + // {"zce", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, + // {"zcmp", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, + // {"zcmt", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {NULL, 0, 0, 0, 0} }; From patchwork Sat Jul 29 01:56:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsukasa OI X-Patchwork-Id: 127959 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp797504vqg; Fri, 28 Jul 2023 18:59:22 -0700 (PDT) X-Google-Smtp-Source: APBJJlHgZPmZbmcCrBf/PtMdCaMnwdz4YHL70zyIZwR4sbrRofV2hKb/wVvFttUvU/0C925VZstL X-Received: by 2002:a17:906:8462:b0:989:450:e567 with SMTP id hx2-20020a170906846200b009890450e567mr821806ejc.65.1690595962029; Fri, 28 Jul 2023 18:59:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690595962; cv=none; d=google.com; s=arc-20160816; b=eROFXeGukKGSZZh2oKD/pvxoI+gcMM55uWz2tyH1RPr6/c4sWjDsLbj7glXOJhzSok Y8niRyhaFd8CjP60w/kYKYhVQ2fCwN5yep+ipkc4m/ch9x76rW1ZlcCSYqgAJ/h6+em2 lKU4miipS206gNAqcB87JSxWXQXXf7foBgrCMIGbBRPQUfuPDQl7/pJyTS8LF3144Rft FVEBaRXPwsjVCLogkm6vEoTiNhHvuWKSNs7LCMJ0FiLVKq2uCU0o+es660ghVmy1jgVn MaMsI1p1ZY0rbBahZrRMUje297iHjj09v7mJp6+J+/5lfz1JZbOpH7e3Hstg1Zk1BNXe aPPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=kMZcB2dVSof/5Y5x/NNx+vHcoVIwHcZ0EgCJe+9mwlY=; fh=KnRutd7BouZxRY+6M5qDe08RppVkf82SqeNz44ywgXI=; b=PYk7ZXtsajpzI17K4Kx7XDmy7ClmkYH/vN3pYsjC4PVw0vYzDdgdBS2URUTSw1Vy/U AIKbjTeixxz2nX+QTdJmWSky4tX8Z85fhhcDmoKneFMYvf/MvhJSPGjKFYWFsPBZD0uA hLgoLUsZPevo79DPFgDF4mI+eXkCPIqWv2przUZhl7U10UNYlZK75dJH1FfpVRCJZpu7 4lvIv0fmBO4APayrw+4a2XlO68oKy2Groxmk7IdKHs4J71wv161MC3iXS6j45cyorXL9 jCDmmOcWloxBPfqZ/6EC97x4KkqWarAZoGY4eaNJ7uebaqMgN5CNtAviuoEMAkbNX0UC B4jg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=ve2bMjt+; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id e25-20020a1709067e1900b0099bd1cb6ffbsi3449013ejr.185.2023.07.28.18.59.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jul 2023 18:59:22 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=ve2bMjt+; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2C2943854C65 for ; Sat, 29 Jul 2023 01:57:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2C2943854C65 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1690595879; bh=kMZcB2dVSof/5Y5x/NNx+vHcoVIwHcZ0EgCJe+9mwlY=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=ve2bMjt+gCmmI/XP3MC3QiTTV65qPNkbMOVwkDZe/hUDtUrrfcgGEoXNEXFfRcH1D i7JQvGVNbHeKEC9M8UclSR3B1Ca2YRm0BKjCb2HkuguBbng268Zq7ljGBbE54i4vLw YbmQMRo/1sPIYsrSaW/yCSTNaL0LeeJLN9REU8eE= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-sender-0.a4lg.com (mail-sender-0.a4lg.com [IPv6:2401:2500:203:30b:4000:6bfe:4757:0]) by sourceware.org (Postfix) with ESMTPS id 551DA3855592 for ; Sat, 29 Jul 2023 01:57:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 551DA3855592 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id 1864D300089; Sat, 29 Jul 2023 01:57:06 +0000 (UTC) To: Tsukasa OI , Palmer Dabbelt , Andrew Waterman , Jim Wilson , Nelson Chu , Kito Cheng , Jiawei Cc: binutils@sourceware.org Subject: [REVIEW ONLY 3/3] MOCK: RISC-V: Tests for 'Zce' implications Date: Sat, 29 Jul 2023 01:56:20 +0000 Message-ID: <93732f158a54f1fb3fb5fab60e1b17c72addafb9.1690595772.git.research_trasio@irq.a4lg.com> In-Reply-To: References: Mime-Version: 1.0 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, KAM_MANYTO, 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: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tsukasa OI via Binutils From: Tsukasa OI Reply-To: Tsukasa OI Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772718351760450276 X-GMAIL-MSGID: 1772718351760450276 From: Tsukasa OI **NEVER COMMIT THIS.** This commit is intended to be merged to the previous patch once 'Zcmp' and 'Zcmt' extensions are ready. It adds several tests related to 'Zce' implications. bfd/ChangeLog: * elfxx-riscv.c: [MOCK] Uncomment mock lines to pass the test. gas/ChangeLog: * testsuite/gas/riscv/march-imply-zce.d: New test. * testsuite/gas/riscv/march-imply-zce-f-32.d: Likewise. * testsuite/gas/riscv/march-imply-zce-f-64.d: Likewise. --- bfd/elfxx-riscv.c | 7 +++---- gas/testsuite/gas/riscv/march-imply-zce-f-32.d | 6 ++++++ gas/testsuite/gas/riscv/march-imply-zce-f-64.d | 6 ++++++ gas/testsuite/gas/riscv/march-imply-zce.d | 6 ++++++ 4 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 gas/testsuite/gas/riscv/march-imply-zce-f-32.d create mode 100644 gas/testsuite/gas/riscv/march-imply-zce-f-64.d create mode 100644 gas/testsuite/gas/riscv/march-imply-zce.d diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c index 94487306fae5..583a10c2794b 100644 --- a/bfd/elfxx-riscv.c +++ b/bfd/elfxx-riscv.c @@ -1346,10 +1346,9 @@ static struct riscv_supported_ext riscv_supported_std_z_ext[] = {"zcb", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {"zcf", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {"zcd", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, - /* MOCK: uncomment those lines once ready. */ - // {"zce", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, - // {"zcmp", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, - // {"zcmt", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, + {"zce", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, + {"zcmp", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, + {"zcmt", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {NULL, 0, 0, 0, 0} }; diff --git a/gas/testsuite/gas/riscv/march-imply-zce-f-32.d b/gas/testsuite/gas/riscv/march-imply-zce-f-32.d new file mode 100644 index 000000000000..e0cca82e0a08 --- /dev/null +++ b/gas/testsuite/gas/riscv/march-imply-zce-f-32.d @@ -0,0 +1,6 @@ +#as: -march=rv32if_zce -march-attr -misa-spec=20191213 +#readelf: -A +#source: empty.s +Attribute Section: riscv +File Attributes + Tag_RISCV_arch: "rv32i2p1_f2p2_zicsr2p0_zca1p0_zcb1p0_zce1p0_zcf1p0_zcmp1p0_zcmt1p0" diff --git a/gas/testsuite/gas/riscv/march-imply-zce-f-64.d b/gas/testsuite/gas/riscv/march-imply-zce-f-64.d new file mode 100644 index 000000000000..f0ccd7a3fce5 --- /dev/null +++ b/gas/testsuite/gas/riscv/march-imply-zce-f-64.d @@ -0,0 +1,6 @@ +#as: -march=rv64if_zce -march-attr -misa-spec=20191213 +#readelf: -A +#source: empty.s +Attribute Section: riscv +File Attributes + Tag_RISCV_arch: "rv64i2p1_f2p2_zicsr2p0_zca1p0_zcb1p0_zce1p0_zcmp1p0_zcmt1p0" diff --git a/gas/testsuite/gas/riscv/march-imply-zce.d b/gas/testsuite/gas/riscv/march-imply-zce.d new file mode 100644 index 000000000000..2a4ab4e1b639 --- /dev/null +++ b/gas/testsuite/gas/riscv/march-imply-zce.d @@ -0,0 +1,6 @@ +#as: -march=rv32i_zce -march-attr -misa-spec=20191213 +#readelf: -A +#source: empty.s +Attribute Section: riscv +File Attributes + Tag_RISCV_arch: "rv32i2p1_zca1p0_zcb1p0_zce1p0_zcmp1p0_zcmt1p0"