From patchwork Fri Apr 25 21:54:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 884517 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp4183583wrs; Fri, 25 Apr 2025 15:14:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVjMZQz/zNnHUm0mT1iuky9K0J55vvTDoelTC61hft2z9iERIm8YyxFRAZnfLDNfZAdmqVGBQ==@linaro.org X-Google-Smtp-Source: AGHT+IEFxBg+QbDXmncfjjMUjX0UIHvB8f7el50bnCsPnpVr+c5x19Y/iFiwVhAezj8/EpTNO43t X-Received: by 2002:a05:6214:29ef:b0:6e6:5bd5:f3a8 with SMTP id 6a1803df08f44-6f4cba516e8mr61479436d6.29.1745619284218; Fri, 25 Apr 2025 15:14:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745619284; cv=none; d=google.com; s=arc-20240605; b=UEixCr2lDynHm9XRCmq/bdZUuiWJUughyjjbTbpTr7OaxjZdj9ftrrZ/1lZLHE5SFu p3RNPgEE/poYZH2oRhtTC1/LSFxgDYGw9xgmQhjmKOk5OY2VOT2PBEjOQhIFOyepgIx+ gWSCnWwHzwit4gVRrhppssVQ2Ro9C5xAdZgDO2zeaMajWSIIpmTwmfN4YWLl+2fcN1TF Ts4eXvyNHraznIXsOn9KF9UuRukCuzKOOBMRLrYcGxNHS0sk0klT30j5GrFmATFBOPuE i4SR/iDcZbzi2PNmuzkRT726r0xiyU/5WE932IjtjMzV+jgrTPx0EkIemJyjdWXbRlvn voXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=Dn3ql/FiObl9BE/j0TWBEIvNjDAyjPMnxmlG+GZsUT8=; fh=vm85eyWrvOAHduw3sqEA+cYBqvHB7M0MHFcRJg7VWOo=; b=kjjqZKVFYAEPml0i33B+X6iQfhBjJNLE3WaPKTUnHJr6MiShCOZebWXBGLZtqInjL1 yXdd9Eg2sHK+2IcGG+ldjMzOAXmyv4Fw0YVR3YKr/S2A7lcASPu6F2c4PlcSXBqzUUht WuELSIaC/3kI6NmqC/UKWpeiFreOwxnFe3E3MsgxFDYJj4YOK5BRiSmSbvem0H9u3x5/ ZhElIQMKqBgjlwFS8iZzlwDfh+vjPmlHWspPQXHeU5KdspEVYhJ1Ahe72XEdpZphw7So ixmWYpY1GlxYBW62ffEdMl6qzMrOd2y+j2Gpv8hXk179Pr8HJm6MZrpBQtdRax1RUjuU OQsQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=C6+BFlgO; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f4c0b20543si47529836d6.469.2025.04.25.15.14.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Apr 2025 15:14:44 -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=C6+BFlgO; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8RBQ-0005AN-2U; Fri, 25 Apr 2025 18:06:08 -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 1u8R7j-0005Kz-SY for qemu-devel@nongnu.org; Fri, 25 Apr 2025 18:02:20 -0400 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u8R7h-0001NI-6I for qemu-devel@nongnu.org; Fri, 25 Apr 2025 18:02:19 -0400 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-2243803b776so48115525ad.0 for ; Fri, 25 Apr 2025 15:02:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745618535; x=1746223335; darn=nongnu.org; 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=Dn3ql/FiObl9BE/j0TWBEIvNjDAyjPMnxmlG+GZsUT8=; b=C6+BFlgOuqCRTomhd96Vx2kxWoqq+iq/xtnjSapj3QoDaBB76+ICBiRzkj4mcxE67S cyV5zZJ0aN/a3Qpa3TAKHu1j6EIbzh5fQqgAhsmbVY47YHNOdu/4Mzbl1NLpk6pXN+gd HF/AfvPw2/nFGHzozgbZSpkVITk73Q/WqpWFaJ3LATMR1Uyg1CJLNr3ccrTmXJUlLRry /DmB2l7JmxE1+lob6dmC+AFYfET0ypvtLV+gcinkPoOayGt3ILxRzkjLYZdFBmuUVvQ1 NbBCp+adrw7K1yNQIucKeHSTXYItlHv/q08quMvCnCNlKXZKxltWJjn7Ig393agDqEW+ smqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745618535; x=1746223335; 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=Dn3ql/FiObl9BE/j0TWBEIvNjDAyjPMnxmlG+GZsUT8=; b=nUV3YkGfulnQ6cL24eHfdY2L8HRsl/4wEjbSIE84pl9Q+fTeHdZjYGhCzjI/NEBv6q fNj+eLF6TQH1mFmd18H7a5HA8xu5rcYvrepDiQq2dRVVjXcM1Wt/9fC8sIkQX6evX3o3 kk5Gdxt6T6qSqcceCXc/XKr2HtoSSPyZBRxfaN/9mQfQIDGx2QE6gV7uRmQsb5OsH2cx CMNV9DOMd+UAF08GO9DkRHS97/2ZYnCUFbuqzsmIJbeO/9pW4pFsYZrxHPTdHpNx87Rz xuh3Q8LtUM4HeyzsL5n8B7qRxcX0oTDic8rxvBC76lwGWdPHhyzfriVCh8Z0ri3fr342 NFRA== X-Gm-Message-State: AOJu0YyyZMux20RDDQpq/LaItfcVt4FWBDNBUTIdi8QuqoqbMJx5CN9r 2ckYQJ4fRqrgr8lVvyXyhb9FT2vAzFdC0pZCkB4kkTFgpxSAWhRcS1dg6y/fpM6EhEfwRkIRG4G U X-Gm-Gg: ASbGncteSrgIRmAvEQl2TJ8vWHC2usrhfGYE2D3ScbP6HhFXAuknxqP46Jh00ZRuRrt I6SvnBobmE2ouX222E92mTvQACnXqd7gPjSMMRfPnmNirGEc1f+Z98kTQ6YFLvq/kAmpUlcM685 8LGYdgPzwTFLQU60KxOlDoY1NQjgNadq9VsY+0AotDpwD5zqeJaFlv4K9IC1UyoNdxsYguNqFRJ NbpsT26Zgq2fMlrnKU2+MUYXAU6XII1uOZoqw1GJl3duiHTH+xIGAlQg02/RE8boFhjQpnVIVo3 5eL6s1bY5Sz2bNrW97BGgD9SkPUcaLVaBkpGb11Uhh3uNznREkC0xwESl+wDcqesJ/+8mn+VMM4 = X-Received: by 2002:a17:902:cf0f:b0:224:910:23f0 with SMTP id d9443c01a7336-22dbf634d89mr53466145ad.49.1745618535129; Fri, 25 Apr 2025 15:02:15 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-309f7765c88sm2212961a91.28.2025.04.25.15.02.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 15:02:14 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Pierrick Bouvier Subject: [PULL 106/159] tcg/aarch64: Improve deposit Date: Fri, 25 Apr 2025 14:54:00 -0700 Message-ID: <20250425215454.886111-107-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250425215454.886111-1-richard.henderson@linaro.org> References: <20250425215454.886111-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62c; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62c.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 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 Use ANDI for deposit 0 into a register. Use UBFIZ, aka UBFM, for deposit register into 0. Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- tcg/aarch64/tcg-target-con-set.h | 2 +- tcg/aarch64/tcg-target.c.inc | 29 ++++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/tcg/aarch64/tcg-target-con-set.h b/tcg/aarch64/tcg-target-con-set.h index 1281e5efc0..2eda499cd3 100644 --- a/tcg/aarch64/tcg-target-con-set.h +++ b/tcg/aarch64/tcg-target-con-set.h @@ -18,7 +18,6 @@ C_O1_I1(r, r) C_O1_I1(w, r) C_O1_I1(w, w) C_O1_I1(w, wr) -C_O1_I2(r, 0, rz) C_O1_I2(r, r, r) C_O1_I2(r, r, rA) C_O1_I2(r, r, rAL) @@ -26,6 +25,7 @@ C_O1_I2(r, r, rC) C_O1_I2(r, r, ri) C_O1_I2(r, r, rL) C_O1_I2(r, rz, rz) +C_O1_I2(r, rZ, rZ) C_O1_I2(w, 0, w) C_O1_I2(w, w, w) C_O1_I2(w, w, wN) diff --git a/tcg/aarch64/tcg-target.c.inc b/tcg/aarch64/tcg-target.c.inc index 62b045c222..dee4afcce1 100644 --- a/tcg/aarch64/tcg-target.c.inc +++ b/tcg/aarch64/tcg-target.c.inc @@ -2572,12 +2572,39 @@ static void tgen_deposit(TCGContext *s, TCGType type, TCGReg a0, TCGReg a1, TCGReg a2, unsigned ofs, unsigned len) { unsigned mask = type == TCG_TYPE_I32 ? 31 : 63; + + /* + * Since we can't support "0Z" as a constraint, we allow a1 in + * any register. Fix things up as if a matching constraint. + */ + if (a0 != a1) { + if (a0 == a2) { + tcg_out_mov(s, type, TCG_REG_TMP0, a2); + a2 = TCG_REG_TMP0; + } + tcg_out_mov(s, type, a0, a1); + } tcg_out_bfm(s, type, a0, a2, -ofs & mask, len - 1); } +static void tgen_depositi(TCGContext *s, TCGType type, TCGReg a0, TCGReg a1, + tcg_target_long a2, unsigned ofs, unsigned len) +{ + tgen_andi(s, type, a0, a1, ~MAKE_64BIT_MASK(ofs, len)); +} + +static void tgen_depositz(TCGContext *s, TCGType type, TCGReg a0, TCGReg a2, + unsigned ofs, unsigned len) +{ + int max = type == TCG_TYPE_I32 ? 31 : 63; + tcg_out_ubfm(s, type, a0, a2, -ofs & max, len - 1); +} + static const TCGOutOpDeposit outop_deposit = { - .base.static_constraint = C_O1_I2(r, 0, rz), + .base.static_constraint = C_O1_I2(r, rZ, rZ), .out_rrr = tgen_deposit, + .out_rri = tgen_depositi, + .out_rzr = tgen_depositz, }; static void tgen_extract(TCGContext *s, TCGType type, TCGReg a0, TCGReg a1,