From patchwork Thu May 25 18:10:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 685624 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp502485wrt; Thu, 25 May 2023 11:15:00 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7DUAZwklamWB06QQ8HfPH8le/bESHSmnwaMrgDJNAIPsXhB7kO1VyhSYgpLolvWaowA/R/ X-Received: by 2002:a05:620a:8c90:b0:75b:23a1:3606 with SMTP id ra16-20020a05620a8c9000b0075b23a13606mr9083616qkn.23.1685038500076; Thu, 25 May 2023 11:15:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685038500; cv=none; d=google.com; s=arc-20160816; b=AyLC32vLvUk01NBN1RsEuwZGyNvzfuIZX+WTouj0I6VMKrc2uLFgbdr2F9kLFXxxGG bDrmrY82U0ZT+8FLziBo81rs7cO+zn6Sa3u2+XFjQjdfI9uwspcNHdp7akWMtyJY6NJX 0drdyId+Sk0utsKz5vNZakCwpNwab+HrjUDXDsybci1v1T66H7CV0HYYVRqSmO7QuVOc daVxvGsTQEzq5zN2PzS9QgkXo0FuHjp/kAtsuAX4F5177CB39w8RftoVM5sRsf8m8Onv DRKN//jm6pZJb6ClYm2RkjPu2YkQM07uDDbk7qpBmUhWPpSscZMfmB7olyG6OlX5mYSe OHTg== 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:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=f+yUsbKoScoR37tEqHJpwp6atQ/4Z4oAuy6m32A5GM4=; b=pydrPGKxMTRuto2OchspK1/4u2bQbxG0JgVpyelc6caj8b+MjJQUdoi4NeQ+43ho5i jJlFd+XsoRbPV3+vHITyq9J7qCD1uODfPCq9nBBMTDRcYSyA/C+obYNPknx4vlzvKSzb TfU6oCljF8KxmQ7ULNuTspBsIMExbm/BmqpaAvvK3RKP2td7QyRATk13rC14mOIbpmPo xPYjhfKrbQsXgVu9hArguC0SXCC8ir9AHtANqUQB8pvM4233kaxExJWy692CCYp100gp AKgt4iJcrSEtynpbYO7+bIMWoGuu+DYovM1+yHPTfEpjBuChxl3bQ5onaSuA9Iznc55e aDhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Zbc2vaAw; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id du32-20020a05620a47e000b0075c985e81aasi699456qkb.404.2023.05.25.11.14.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 May 2023 11:15:00 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Zbc2vaAw; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2FQR-00005d-QU; Thu, 25 May 2023 14:10:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2FQP-0008TO-EG for qemu-devel@nongnu.org; Thu, 25 May 2023 14:10:57 -0400 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q2FQN-0005rF-Ln for qemu-devel@nongnu.org; Thu, 25 May 2023 14:10:57 -0400 Received: by mail-pg1-x534.google.com with SMTP id 41be03b00d2f7-53033a0b473so1364294a12.0 for ; Thu, 25 May 2023 11:10:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685038254; x=1687630254; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=f+yUsbKoScoR37tEqHJpwp6atQ/4Z4oAuy6m32A5GM4=; b=Zbc2vaAwsmPV4bGiNBw6DMQespxAYcHW5mky08e1k990DvNzMLtBE1G3p3DHRX0thj 1akq6aEmIrSbTDPqHHivXK1SxjkQ+iCt4b1NkNl/q36m/GtMTTw1YGaYoVnos7shBDHb 6OJhPMVWzfw9MecHkhWMIlqsPMcStw1asJPXZYitJHofbIxtg7VJjMjpcHGhwP4u7dmi rMJdsS7VnnqpW41qqmD3y6ylFNrIQQIgFvCBFkG6ATpsOc8P9xatcxEDSa/1x0uUn1q9 XQVKZyIWsMegU5xWY0mFpHcocFcP0ha833fmua82FvzAAKatknKzqhstnysP4UtatrXY p6hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685038254; x=1687630254; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=f+yUsbKoScoR37tEqHJpwp6atQ/4Z4oAuy6m32A5GM4=; b=JpfxtgOJwkWaZdiV2F3Ksb0hL8dZ3FtqXvqzOT5F+Hh0205uHaiS0L8TkuZh9aOXpH QcLCSFg14J26x4WcGglXDsbYUMmyq3+bUHgUDL6agHZY1ZyYAX17MkWkVhhnI815Nok9 w7k8HOkNiIfqvvFgWrrEnPY5xNcI689/7xEHkcHeXX9eR4+wf3ChGgTLyH7QPRtyCiWI JDR92WztXWEZmuQVo9olidsQcO9JeRrKkiPQoGMpfvtMZ8m3As2RfpgCpgX1VJ3cM19J 1+JxakwETaDD8KLXhfJ4Enl/X0v3nPWjxOlCnwkxHZ2xVB+PLhZnHbOKh780HI2OBpd6 xceA== X-Gm-Message-State: AC+VfDznYl3ixmSoOk3p3PoJo8ui22Y0hi1S39wor68wRLyNGd8OY2TH aFo6eJRZEumunq4GSmavwHmK9AoWWRXXFpHzkZQ= X-Received: by 2002:a17:902:d48e:b0:1af:f4f5:6fa3 with SMTP id c14-20020a170902d48e00b001aff4f56fa3mr2734890plg.55.1685038254388; Thu, 25 May 2023 11:10:54 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:7ac5:31cc:3997:3a16]) by smtp.gmail.com with ESMTPSA id m18-20020a170902db1200b001aae64e9b36sm1710243plx.114.2023.05.25.11.10.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 11:10:54 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Alistair Francis , Daniel Henrique Barboza Subject: [PULL 20/23] tcg/riscv: Support CPOP from Zbb Date: Thu, 25 May 2023 11:10:33 -0700 Message-Id: <20230525181036.1559435-21-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230525181036.1559435-1-richard.henderson@linaro.org> References: <20230525181036.1559435-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::534; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x534.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Acked-by: Alistair Francis Reviewed-by: Daniel Henrique Barboza Signed-off-by: Richard Henderson --- tcg/riscv/tcg-target.h | 4 ++-- tcg/riscv/tcg-target.c.inc | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/tcg/riscv/tcg-target.h b/tcg/riscv/tcg-target.h index 8e327afc3a..e0b23006c4 100644 --- a/tcg/riscv/tcg-target.h +++ b/tcg/riscv/tcg-target.h @@ -127,7 +127,7 @@ extern bool have_zbb; #define TCG_TARGET_HAS_nor_i32 0 #define TCG_TARGET_HAS_clz_i32 0 #define TCG_TARGET_HAS_ctz_i32 0 -#define TCG_TARGET_HAS_ctpop_i32 0 +#define TCG_TARGET_HAS_ctpop_i32 have_zbb #define TCG_TARGET_HAS_brcond2 1 #define TCG_TARGET_HAS_setcond2 1 #define TCG_TARGET_HAS_qemu_st8_i32 0 @@ -161,7 +161,7 @@ extern bool have_zbb; #define TCG_TARGET_HAS_nor_i64 0 #define TCG_TARGET_HAS_clz_i64 0 #define TCG_TARGET_HAS_ctz_i64 0 -#define TCG_TARGET_HAS_ctpop_i64 0 +#define TCG_TARGET_HAS_ctpop_i64 have_zbb #define TCG_TARGET_HAS_add2_i64 1 #define TCG_TARGET_HAS_sub2_i64 1 #define TCG_TARGET_HAS_mulu2_i64 0 diff --git a/tcg/riscv/tcg-target.c.inc b/tcg/riscv/tcg-target.c.inc index cb4afb4733..05ea9fead8 100644 --- a/tcg/riscv/tcg-target.c.inc +++ b/tcg/riscv/tcg-target.c.inc @@ -1511,6 +1511,13 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, } break; + case INDEX_op_ctpop_i32: + tcg_out_opc_imm(s, OPC_CPOPW, a0, a1, 0); + break; + case INDEX_op_ctpop_i64: + tcg_out_opc_imm(s, OPC_CPOP, a0, a1, 0); + break; + case INDEX_op_add2_i32: tcg_out_addsub2(s, a0, a1, a2, args[3], args[4], args[5], const_args[4], const_args[5], false, true); @@ -1637,6 +1644,8 @@ static TCGConstraintSetIndex tcg_target_op_def(TCGOpcode op) case INDEX_op_bswap16_i64: case INDEX_op_bswap32_i64: case INDEX_op_bswap64_i64: + case INDEX_op_ctpop_i32: + case INDEX_op_ctpop_i64: return C_O1_I1(r, r); case INDEX_op_st8_i32: