From patchwork Sat Jan 21 00:29:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Tomsich X-Patchwork-Id: 46737 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp499747wrn; Fri, 20 Jan 2023 16:29:48 -0800 (PST) X-Google-Smtp-Source: AMrXdXt2+FM9zaJNTlCbQ4o9yo+UV/+1j9tZczBQLXKwngMLhCbbeILZOjRVrsWsrBrFqeRU5B4Z X-Received: by 2002:a17:907:1b0f:b0:86b:93ea:3366 with SMTP id mp15-20020a1709071b0f00b0086b93ea3366mr25728459ejc.3.1674260988716; Fri, 20 Jan 2023 16:29:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674260988; cv=none; d=google.com; s=arc-20160816; b=FQC9HcPcnbHsP62F/zANKvvFk+/gkLT7ycZPmrsGwM0LUcR8jW910WLjIwilBgh9Xp 8OBsdc2wZAYIgS8tT4IDZKv9gxQu3I6LpQSPrtsGhRBl0J9FRHJBsWE2sduwUzvL59mO cOMF7X/opI4GnqpjqIAsSpixM0j/lNoqGEppWG94x61VC3fH+dKfZjvLTJEHxrlDWF00 mUGsroV5pCOjT7GO/BJmwBcqHHyC/DgsoB48zRQh4nmCiObN415x3vhcwXNBgxErDZRr UFqUMoiqPEgNSZiPr5GB95HwSjM0mJXbXhwIp6XBiQawTFzxQsTSsRZydxr7Ub0Oq68A OK6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature :dmarc-filter:delivered-to; bh=bRXO5ATCqUdw/yXOeOTe6INp01+rRchdRVPRi+uwuw4=; b=h4Gz8z2JlqLgRHnanoXKfuegVcFwFcLeHH+bukXaN2A/+eoX3K4aJ3xYlLkLAvwAcB HZB9ayuX+P4bH+dZciPUs6UizYjNnOI1Nc+qgmLwU0VwkGKfwV7/cFZREvRcuEQz0KGT k5VZotmJ9JlNdFN4DjQ7MZkku0Yt0z5P5Ddgs6Q7s798BpH0CG5omozdXQrnXjZieaBv cPYHuBgie3o8abX+PHysBTgpMyMiMpXUYRm07tRPlNT22dWABI1sNfLR8fS1mb7VPWJt 3DDWZ4akptL14nlwgjDUL4P7dEzspArQobBVEJcWIqzHNgzQz6TR2QlDNm8pSd8fufMc +HOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@vrull.eu header.s=google header.b=YP8fWckw; 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" Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id xd9-20020a170907078900b0084cdfa26c19si42817276ejb.841.2023.01.20.16.29.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 16:29:48 -0800 (PST) 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=@vrull.eu header.s=google header.b=YP8fWckw; 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" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8DAE7385843D for ; Sat, 21 Jan 2023 00:29:47 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by sourceware.org (Postfix) with ESMTPS id 4A8113858D1E for ; Sat, 21 Jan 2023 00:29:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4A8113858D1E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=vrull.eu Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=vrull.eu Received: by mail-ed1-x534.google.com with SMTP id z11so8640735ede.1 for ; Fri, 20 Jan 2023 16:29:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vrull.eu; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=bRXO5ATCqUdw/yXOeOTe6INp01+rRchdRVPRi+uwuw4=; b=YP8fWckw2OZibfmi70RnT5IKE3nDsIGwRazbLFkyo+13H76bUzH7p/eTvo8fimHnih PB73gHBIxNLnend3roP2xfn8OA82BL8oFDmIoGoxWJh/sEFaCK1XHdSL0D5sTyXVEhSk jj25IAVQ/3e5FgSrsGu2nRsF8l2hUbSD+ygi2Xf5SSUXeANoMRMg/IxSdSEu8NjoQGR2 4WsdNjpJZQDcY1E5XPNM78IP7d+BjZrCoFHkDTnEO6qUBtqbjSlP59z2fB9lVW1CG3MC 9CZozjopu3Z/dqIWE/KwKrfhTegdEu5xkaOaml4l97p0ernKhpuYQAybEeP/zT7ErRy4 A/OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=bRXO5ATCqUdw/yXOeOTe6INp01+rRchdRVPRi+uwuw4=; b=DJcCA3BEoDIEFa9jrDV7egGv4H1RPCKuQWb/P9NudMI8JVEIxEzFvJAD0hDGfDcwhf 1hOitk31t8WrFk1usDt5p77ozqHsJY85rwlYJ5vkwew6lz58UkO4i3xzPe02STtEpoJg STnXaKrv2WR+5987jgjDn51iOQgb0gV+4Unx4daBY3xcFmILR7z83qskFFqb9JBIu2w8 tse8nZ/+divCeaJ8XLT2OMF7fTgvESFiypp3b+x/IHMqHTzbzBEHOx1AILDte5lEwZPq 4hC0C1TSXMOVX6TDOCK8dPWYlthU+cPcFpW4ca1b7fyb+D9YL/jnW/LRMeFyb0ZyykJG txag== X-Gm-Message-State: AFqh2kr9fcCOoBCBPTQ7IhO8suBhdaiW4p2hynyR/rVR2xuNlKJfSfhg MOlEMBCx/6Dp/iaOPc+NMx80Mo3ThQhUqcS7X0U= X-Received: by 2002:a05:6402:2990:b0:499:8849:5fb8 with SMTP id eq16-20020a056402299000b0049988495fb8mr18272919edb.30.1674260978700; Fri, 20 Jan 2023 16:29:38 -0800 (PST) Received: from ubuntu-focal.. ([2a01:4f9:3a:1e26::2]) by smtp.gmail.com with ESMTPSA id k16-20020a05640212d000b0048b4e2aaba0sm18012131edx.34.2023.01.20.16.29.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 16:29:38 -0800 (PST) From: Philipp Tomsich To: binutils@sourceware.org Cc: Kito Cheng , Nelson Chu , Christoph Muellner , Philipp Tomsich Subject: [RFC PATCH v1] RISC-V: Support Zicond extension Date: Sat, 21 Jan 2023 01:29:34 +0100 Message-Id: <20230121002935.1139281-1-philipp.tomsich@vrull.eu> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755589890418821246?= X-GMAIL-MSGID: =?utf-8?q?1755589890418821246?= *** Zicond is not FROZEN at this time. Do not merge until FROZEN. *** This implements the Zicond (conditional integer operations) extension, as of version 1.0-draft-20230120. The Zicond extension acts as a building block for branchless sequences including conditional-arithmetic, conditional-logic and conditional-select/move. The following instructions constitute Zicond: - czero.eqz rd, rs1, rs2 => rd = (rs2 == 0) ? 0 : rs1 - czero.nez rd, rs1, rs2 => rd = (rs2 != 0) ? 0 : rs1 See https://github.com/riscv/riscv-zicond/releases/download/v1.0-draft-20230120/riscv-zicond_1.0-draft-20230120.pdf for the proposed specification and usage details. bfd/ChangeLog: * elfxx-riscv.c (riscv_multi_subset_supports): Recognize INSN_CLASS_XVENTANACONDOPS. (riscv_multi_subset_supports_ext): Recognize INSN_CLASS_XVENTANACONDOPS, gas/ChangeLog: * testsuite/gas/riscv/zicond.d: New test. * testsuite/gas/riscv/zicond.s: New test. include/ChangeLog: * opcode/riscv-opc.h (MATCH_CZERO_EQZ): Define. (MASK_CZERO_EQZ): Define. (MATCH_CZERO_NEZ): Define, (MASK_CZERO_NEZ): Define. (DECLARE_INSN): Add czero.eqz and czero.nez. * opcode/riscv.h (enum riscv_insn_class): Add INSN_CLASS_ZICOND opcodes/ChangeLog: * riscv-opc.c: Add czero.eqz and czero.nez. Signed-off-by: Philipp Tomsich --- bfd/elfxx-riscv.c | 5 +++++ gas/testsuite/gas/riscv/zicond.d | 12 ++++++++++++ gas/testsuite/gas/riscv/zicond.s | 3 +++ include/opcode/riscv-opc.h | 8 ++++++++ include/opcode/riscv.h | 1 + opcodes/riscv-opc.c | 4 ++++ 6 files changed, 33 insertions(+) create mode 100644 gas/testsuite/gas/riscv/zicond.d create mode 100644 gas/testsuite/gas/riscv/zicond.s diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c index a48d6300a1f..ec69c7fdc4d 100644 --- a/bfd/elfxx-riscv.c +++ b/bfd/elfxx-riscv.c @@ -1168,6 +1168,7 @@ static struct riscv_supported_ext riscv_supported_std_z_ext[] = {"zicbom", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {"zicbop", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {"zicboz", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, + {"zicond", ISA_SPEC_CLASS_DRAFT, 1, 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 }, @@ -2267,6 +2268,8 @@ riscv_multi_subset_supports (riscv_parse_subset_t *rps, return riscv_subset_supports (rps, "zicbop"); case INSN_CLASS_ZICBOZ: return riscv_subset_supports (rps, "zicboz"); + case INSN_CLASS_ZICOND: + return riscv_subset_supports (rps, "zicond"); case INSN_CLASS_ZICSR: return riscv_subset_supports (rps, "zicsr"); case INSN_CLASS_ZIFENCEI: @@ -2435,6 +2438,8 @@ riscv_multi_subset_supports_ext (riscv_parse_subset_t *rps, return "zicbop"; case INSN_CLASS_ZICBOZ: return "zicboz"; + case INSN_CLASS_ZICOND: + return "zicond"; case INSN_CLASS_ZICSR: return "zicsr"; case INSN_CLASS_ZIFENCEI: diff --git a/gas/testsuite/gas/riscv/zicond.d b/gas/testsuite/gas/riscv/zicond.d new file mode 100644 index 00000000000..7a79ee6a716 --- /dev/null +++ b/gas/testsuite/gas/riscv/zicond.d @@ -0,0 +1,12 @@ +#as: -march=rv64i_zicond +#source: zicond.s +#objdump: -d + +.*:[ ]+file format .* + + +Disassembly of section .text: + +0+000 : +[ ]+0:[ ]+0ec5d533[ ]+czero.eqz[ ]+a0,a1,a2 +[ ]+4:[ ]+0ee6f533[ ]+czero.nez[ ]+a0,a3,a4 diff --git a/gas/testsuite/gas/riscv/zicond.s b/gas/testsuite/gas/riscv/zicond.s new file mode 100644 index 00000000000..4e5edd5056a --- /dev/null +++ b/gas/testsuite/gas/riscv/zicond.s @@ -0,0 +1,3 @@ +target: + czero.eqz a0, a1, a2 + czero.nez a0, a3, a4 diff --git a/include/opcode/riscv-opc.h b/include/opcode/riscv-opc.h index 32b160660d3..c99756e47e1 100644 --- a/include/opcode/riscv-opc.h +++ b/include/opcode/riscv-opc.h @@ -2187,6 +2187,11 @@ #define MASK_CBO_INVAL 0xfff07fff #define MATCH_CBO_ZERO 0x40200f #define MASK_CBO_ZERO 0xfff07fff +/* Zicond instructions. */ +#define MATCH_CZERO_EQZ 0xe005033 +#define MASK_CZERO_EQZ 0xfe00707f +#define MATCH_CZERO_NEZ 0xe007033 +#define MASK_CZERO_NEZ 0xfe00707f /* Zawrs intructions. */ #define MATCH_WRS_NTO 0x00d00073 #define MASK_WRS_NTO 0xffffffff @@ -3194,6 +3199,9 @@ DECLARE_INSN(cbo_clean, MATCH_CBO_CLEAN, MASK_CBO_CLEAN); DECLARE_INSN(cbo_flush, MATCH_CBO_FLUSH, MASK_CBO_FLUSH); DECLARE_INSN(cbo_inval, MATCH_CBO_INVAL, MASK_CBO_INVAL); DECLARE_INSN(cbo_zero, MATCH_CBO_ZERO, MASK_CBO_ZERO); +/* Zicond instructions. */ +DECLARE_INSN(czero_eqz, MATCH_CZERO_EQZ, MASK_CZERO_EQZ) +DECLARE_INSN(czero_nez, MATCH_CZERO_NEZ, MASK_CZERO_NEZ) /* Zawrs instructions. */ DECLARE_INSN(wrs_nto, MATCH_WRS_NTO, MASK_WRS_NTO) DECLARE_INSN(wrs_sto, MATCH_WRS_STO, MASK_WRS_STO) diff --git a/include/opcode/riscv.h b/include/opcode/riscv.h index 57bea48704d..dfab0502d49 100644 --- a/include/opcode/riscv.h +++ b/include/opcode/riscv.h @@ -379,6 +379,7 @@ enum riscv_insn_class INSN_CLASS_Q, INSN_CLASS_F_AND_C, INSN_CLASS_D_AND_C, + INSN_CLASS_ZICOND, INSN_CLASS_ZICSR, INSN_CLASS_ZIFENCEI, INSN_CLASS_ZIHINTPAUSE, diff --git a/opcodes/riscv-opc.c b/opcodes/riscv-opc.c index 639683e76b1..33cd4ab57d1 100644 --- a/opcodes/riscv-opc.c +++ b/opcodes/riscv-opc.c @@ -935,6 +935,10 @@ const struct riscv_opcode riscv_opcodes[] = {"cbo.inval", 0, INSN_CLASS_ZICBOM, "0(s)", MATCH_CBO_INVAL, MASK_CBO_INVAL, match_opcode, 0 }, {"cbo.zero", 0, INSN_CLASS_ZICBOZ, "0(s)", MATCH_CBO_ZERO, MASK_CBO_ZERO, match_opcode, 0 }, +/* Zicond instructions. */ +{"czero.eqz", 0, INSN_CLASS_ZICOND, "d,s,t", MATCH_CZERO_EQZ, MASK_CZERO_EQZ, match_opcode, 0 }, +{"czero.nez", 0, INSN_CLASS_ZICOND, "d,s,t", MATCH_CZERO_NEZ, MASK_CZERO_NEZ, match_opcode, 0 }, + /* Zawrs instructions. */ {"wrs.nto", 0, INSN_CLASS_ZAWRS, "", MATCH_WRS_NTO, MASK_WRS_NTO, match_opcode, 0 }, {"wrs.sto", 0, INSN_CLASS_ZAWRS, "", MATCH_WRS_STO, MASK_WRS_STO, match_opcode, 0 },