From patchwork Mon Nov 27 02:48:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Zeng X-Patchwork-Id: 169952 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp2814793vqx; Sun, 26 Nov 2023 18:49:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IFTBhJc8ionasvMLGYY9o3Sbpnqi5dNPf94FwPLBKym80TtJpqj3F6CpmF9ybsrs0FoxfUt X-Received: by 2002:a05:622a:1899:b0:423:6f47:e5f7 with SMTP id v25-20020a05622a189900b004236f47e5f7mr24051783qtc.4.1701053390986; Sun, 26 Nov 2023 18:49:50 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1701053390; cv=pass; d=google.com; s=arc-20160816; b=wTqNvybiXejt1wDCam/mXft0cpXVnbVqJaTZTcqO0p+wyAVwQl1XQas/DNL4Vtv8qu l4g9AERBzuLPxfBBeUniXKxH0ftEk5I/2d8pcnvqFB9iQVet9x7jAIEUGAXIyHw64WpO 2blebTrwpTOY1DgOatyEK0gDnoaTJ62zsr2zrW1QTGePbEhMp3fi7my/LVT5Kf2efZiW Vky7aKezkCi8RxqCR9hfzgiVgtH+G+ADV+undo1W0i366zsBmZd3bXM+rKHmn9AZh3Us uM7ow9t39QSrwioCjU9h0o+CyKENAfl4CMwDoZRS1x6dUiH+75GUkLhnuA18FvbB4ZZy nMWg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:message-id:date:subject:cc:to :from:arc-filter:dmarc-filter:delivered-to; bh=jhIBmGL6CSv2qm/tfg5PPNvEdvtNxp1x4en8JvARfCY=; fh=Bem+mzSdaks8eVuQ41/rcaagubuAMz9T7x37VHc0uxs=; b=SPyyCrU/T/SJZO4hrBl2C3Thucd2i1EsQZ/OQuMbK6sr6fG6y1yYtooh+gY/o5SC+M wjcr2w8AOjlJ8M0X7IyYq0tFnacLSPNtfYkQJi0zis0I22RMc7mRs6fKv7MCJuvYPUYe sM8y/9HUmBuIjRfLaifDyYw4aXgl9cm17XN3XsONcvOOSq7nJqgDk/BATyAYFGynqrBU sOGf1Bs/kbOIiqvwVeiJ0Ceag6Dgv7ZFzfv0ISZ0+E2jTZ70+Oa7h2p0Q1HQ6y+kUdZx aVgKVsJc++QLmV5X7Eap+PDRVodJ3tVjYVjW60a2DKbufNwOTYOqTPYJZ1My1o4Y3V79 iwkg== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); 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" Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id t12-20020ac8588c000000b00423871f3eebsi8489586qta.759.2023.11.26.18.49.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Nov 2023 18:49:50 -0800 (PST) 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; arc=pass (i=1); 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" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BFA3338582AC for ; Mon, 27 Nov 2023 02:49:50 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from zg8tmtu5ljg5lje1ms4xmtka.icoremail.net (zg8tmtu5ljg5lje1ms4xmtka.icoremail.net [159.89.151.119]) by sourceware.org (Postfix) with ESMTP id 354F838582BE for ; Mon, 27 Nov 2023 02:49:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 354F838582BE 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 354F838582BE 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=1701053369; cv=none; b=CuScXXApG5XmdPjNj+Dk1+d3WTGvq0APMJ3qDjeRb5obanfNsDjYTyF9Hp5TN8NQHNnlj6z652147i4bULS3p5iF0+iLvW0p923zs4LngbBsTOPmqQpflflUm6q3IHPgeAEvIFPCrJcEGvuqYcdfBZMzPplWylJfADh3A9z0gYs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701053369; c=relaxed/simple; bh=r4JWNBETfM2W5I4YRZlZT6nv+Z1PE3cPpdegR6ocEIY=; h=From:To:Subject:Date:Message-Id; b=tKldwYDeO9RfYa2UWaXDfMmIIiPFDqJQITCyolaJEMm6UMwA1MrvWQVyceicFLJa3ItN4rKzeyEOAcEjwCnGEIBZdIRIu71qz38ObhbL1aYGkuEzJfOehasnHxMLkXyH/UGQFsuw+rTKNHaql120qPqJMLObvnpGQ3food9awK0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from localhost.localdomain (unknown [10.12.130.31]) by app2 (Coremail) with SMTP id TQJkCgAXAIV_A2RldnQBAA--.18260S4; Mon, 27 Nov 2023 10:48:31 +0800 (CST) From: Xiao Zeng To: binutils@sourceware.org Cc: kito.cheng@gmail.com, palmer@dabbelt.com, nelson@rivosinc.com, Xiao Zeng Subject: [PATCH v2] RISC-V: Imply 'Zicntr' and 'Zihpm' implicitly depended on 'Zicsr' Date: Mon, 27 Nov 2023 10:48:50 +0800 Message-Id: <20231127024850.22977-1-zengxiao@eswincomputing.com> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: TQJkCgAXAIV_A2RldnQBAA--.18260S4 X-Coremail-Antispam: 1UD129KBjvJXoWxZw4fWFWrWF4kCr48JFWUurg_yoWrWF18pF WruFy0krWrXF17tanrGry7X3W7Ww1rur909r40y3W2yr4ft39rJr1ktw1FyF43XF4DCwn3 Zw4fXrW3ZFyYgF7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUva14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4U JVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Gc CE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E 2Ix0cI8IcVAFwI0_JrI_JrylYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJV W8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lc7CjxVAaw2AFwI0_ JF0_Jw1lc2xSY4AK6svPMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI 8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AK xVWUAVWUtwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI 8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280 aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJVW8JbIYCTnIWIevJa73UjIFyT uYvjfUr2-eDUUUU X-CM-SenderInfo: p2hqw5xldrqvxvzl0uprps33xlqjhudrp/ X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H4, 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: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783683760783177208 X-GMAIL-MSGID: 1783683760783177208 This commit adds support for ratified extensions: 'Zicntr' and 'Zihpm', Which are all implicitly depend on 'Zicsr'. This is based on: bfd/ChangeLog: * elfxx-riscv.c: Add 'Zicntr' and 'Zihpm' -> 'Zicsr'. (riscv_supported_std_z_ext) Add 'Zicntr' and 'Zihpm' to the list. gas/ChangeLog: * testsuite/gas/riscv/attribute-15.d: New test. * testsuite/gas/riscv/attribute-15.s: New test. * testsuite/gas/riscv/attribute-16.d: New test. * testsuite/gas/riscv/attribute-16.s: New test. --- bfd/elfxx-riscv.c | 4 ++++ gas/testsuite/gas/riscv/attribute-15.d | 6 ++++++ gas/testsuite/gas/riscv/attribute-15.s | 1 + gas/testsuite/gas/riscv/attribute-16.d | 6 ++++++ gas/testsuite/gas/riscv/attribute-16.s | 1 + 5 files changed, 18 insertions(+) create mode 100644 gas/testsuite/gas/riscv/attribute-15.d create mode 100644 gas/testsuite/gas/riscv/attribute-15.s create mode 100644 gas/testsuite/gas/riscv/attribute-16.d create mode 100644 gas/testsuite/gas/riscv/attribute-16.s diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c index 567631e7d96..4c91081acd1 100644 --- a/bfd/elfxx-riscv.c +++ b/bfd/elfxx-riscv.c @@ -1144,6 +1144,8 @@ static struct riscv_implicit_subset riscv_implicit_subsets[] = {"zvl256b", "zvl128b", check_implicit_always}, {"zvl128b", "zvl64b", check_implicit_always}, {"zvl64b", "zvl32b", check_implicit_always}, + {"zicntr", "zicsr", check_implicit_always}, + {"zihpm", "zicsr", check_implicit_always}, {"zcd", "d", check_implicit_always}, {"zcf", "f", check_implicit_always}, {"zfa", "f", check_implicit_always}, @@ -1260,12 +1262,14 @@ static struct riscv_supported_ext riscv_supported_std_z_ext[] = {"zicbop", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {"zicboz", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {"zicond", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, + {"zicntr", ISA_SPEC_CLASS_DRAFT, 2, 0, 0 }, {"zicsr", ISA_SPEC_CLASS_20191213, 2, 0, 0 }, {"zicsr", ISA_SPEC_CLASS_20190608, 2, 0, 0 }, {"zifencei", ISA_SPEC_CLASS_20191213, 2, 0, 0 }, {"zifencei", ISA_SPEC_CLASS_20190608, 2, 0, 0 }, {"zihintntl", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {"zihintpause", ISA_SPEC_CLASS_DRAFT, 2, 0, 0 }, + {"zihpm", ISA_SPEC_CLASS_DRAFT, 2, 0, 0 }, {"zmmul", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {"zawrs", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {"zfa", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, diff --git a/gas/testsuite/gas/riscv/attribute-15.d b/gas/testsuite/gas/riscv/attribute-15.d new file mode 100644 index 00000000000..a17e82c8508 --- /dev/null +++ b/gas/testsuite/gas/riscv/attribute-15.d @@ -0,0 +1,6 @@ +#as: -march-attr -misa-spec=20191213 +#readelf: -A +#source: attribute-15.s +Attribute Section: riscv +File Attributes + Tag_RISCV_arch: "rv32i2p1_zicntr2p0_zicsr2p0_zihpm2p0" diff --git a/gas/testsuite/gas/riscv/attribute-15.s b/gas/testsuite/gas/riscv/attribute-15.s new file mode 100644 index 00000000000..ecb10a298fd --- /dev/null +++ b/gas/testsuite/gas/riscv/attribute-15.s @@ -0,0 +1 @@ + .attribute arch,"rv32i_zicntr_zihpm" diff --git a/gas/testsuite/gas/riscv/attribute-16.d b/gas/testsuite/gas/riscv/attribute-16.d new file mode 100644 index 00000000000..6ca3b5351f8 --- /dev/null +++ b/gas/testsuite/gas/riscv/attribute-16.d @@ -0,0 +1,6 @@ +#as: -march-attr -misa-spec=20191213 +#readelf: -A +#source: attribute-16.s +Attribute Section: riscv +File Attributes + Tag_RISCV_arch: "rv64i2p1_zicntr2p0_zicsr2p0_zihpm2p0" diff --git a/gas/testsuite/gas/riscv/attribute-16.s b/gas/testsuite/gas/riscv/attribute-16.s new file mode 100644 index 00000000000..8757bb5181b --- /dev/null +++ b/gas/testsuite/gas/riscv/attribute-16.s @@ -0,0 +1 @@ + .attribute arch,"rv64i_zicntr_zihpm"