From patchwork Fri Apr 25 21:52:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 884798 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp4190912wrs; Fri, 25 Apr 2025 15:40:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWg/gA5fv4d2jgzFn/wzBqAtn0nW63MktlbhJ+3QLgb/M00jPD/zUW/bo6FhBRiIYI/aUH8WQ==@linaro.org X-Google-Smtp-Source: AGHT+IEQAdQyLJ/jsewELcpqJZoEmC+HZ7Ii/Uhn2VVnatfMFJJcjm/yCADHnZr6NJV5NgHsfKyH X-Received: by 2002:a05:620a:1789:b0:7c5:46d0:a77f with SMTP id af79cd13be357-7c96686f741mr181292385a.16.1745620817504; Fri, 25 Apr 2025 15:40:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745620817; cv=none; d=google.com; s=arc-20240605; b=bft+KfCl4hUZarb+TSrkxNecwFdDTSiReZEoQqqCYVUnqQxhoefrCnS7daFnfQPndw zzCWjFXvIzxW/qYfBwQNjW/TC6kpRzX9GDSBQmZQVtu5BYfW1dFgdzT97U0B9T9MIc+n AofqEvL7kU9YHv3OVGSfMcGlUna+4I9K5+WTkbgzRkd29wfc3sS4O/huNu0K21igt7ox +lVbvmGp2sKMuBQyLkOGsqXmDpKqBn6EPLjAxOPkU1JltWuMJuKPW1n7hRklgh4fNFdc Vv6tD0KKv8tT2XmY+O/rreBMJvRwT5UaSmBEsdNNBoIhMnvI09rAKYRMJSWPTka9u/y9 VnbQ== 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=CYvV5TWCtjdL8c/bnPynBrKFwdpxNBMsjAqk42veUr0=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=egdspunpbXvonPqAF/xMzqHevvrAjnAm+LEjyiTH+269Munh42mZEOg/Y+93Ai08FN +9aVLoVfplhlAcBm7kdmOKw1MeA0gYkjWlqElf786pLkhGuO0Ttg0rHtax5vchYSsQjA A84htXnJpjykKlQxcconTylUY10o/1+luBeLlMZWsDjGJLk8J5X2/HmAKD1ak9RIMhmA mw2HTxK7Mqq75w/LdSNZ8ErBWuJOLJ7WhSKYBbPsTGWvubxm1S73wcF4SLAgsl16umPD 7X/ESkNKXsLF9P9EiNiTdz7E1La+J+/neqMpxdXnw/lrWEX/26F1KF96qz5jBeYNcq01 Oxlw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=g5mkiY5Y; 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 af79cd13be357-7c958edfb83si464553285a.626.2025.04.25.15.40.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Apr 2025 15:40:17 -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=g5mkiY5Y; 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 1u8R4M-0001ld-Bv; Fri, 25 Apr 2025 17:58:51 -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 1u8R46-0000j0-DG for qemu-devel@nongnu.org; Fri, 25 Apr 2025 17:58:35 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u8R41-0000mS-Qb for qemu-devel@nongnu.org; Fri, 25 Apr 2025 17:58:33 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-224171d6826so44563485ad.3 for ; Fri, 25 Apr 2025 14:58:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745618308; x=1746223108; 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=CYvV5TWCtjdL8c/bnPynBrKFwdpxNBMsjAqk42veUr0=; b=g5mkiY5YP5JBHjcVa453wPqHChBZseQ7Sz8tHIXfEUatrd1qmdYx9p/w7j51UZ9rY0 qEBUtnGCtiDCqKBkDM4vcwIF4HQpFIjS+fTTYqPzO8/rZrEdaceBH46GHQEG+1GeNIyX YerQEtLcDf4vBYDoqi2ehzHJW4LEgLlaJEmP5Ia74Uq8kWObDFYK7IEn6SLrelkwj+T8 IqXhJNRJ2aAE5K5PIjcyvPgcJM1pHFBU//WB/ue0Ln5opMi1nL70lhj6F9SxLocoZXF3 p1fWAn+kd8mVmgPJ+hxll8O7Gm0hxASy+Erp2HovYoD2iFPeqg4zGK/hetjTO8d/xXb2 Nfzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745618308; x=1746223108; 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=CYvV5TWCtjdL8c/bnPynBrKFwdpxNBMsjAqk42veUr0=; b=Lw4J4+wC87S3ZI82q5x6mNcRw3ZzVBPMPxI/R+bOIVA2m1+ftT/I6weYNhydABKRSo 7wl+2MZf+Ua0jWhdRM5rz0TVUvrYk2bCUHIe9amETocRg0zOTFVBltIYMUjcEZSp+TAL VW6ocShwv5e/BtUpNESb738BwUeqgXy2ZmXjerjfmFHfG7SacFpt1AEK4eJQdRxbqLDl Vi+QQ1KRnWjfLr86YKUo0UlxK+0ekF9YPK1hMtGbdf4SxyRzs4SnhypQWbHO5GADTOoj gMzr+sABn1j6ry7g71IK0K4U9w5rzap6SpGsvHZJoWws1dmuS5d1dkcXpSNZjeMA6yFR Qt9g== X-Gm-Message-State: AOJu0YzKNujFiHuJStUfqqksvAVPl4Po4Wq14UGfZJWCuccW71cSv525 oY+eWLlCjPZYHT+x29Zcod2npU8QGZUEbg1fAOZnXM+mmNy6oQ3DZF2YNTKunYAxaaoeeqLdzZa r X-Gm-Gg: ASbGnctwkzStiXW0XQ2+PRhBwbEsrZBjVdbYNCSbbGcy2etT0OUAJAVWOgljhCGV5oZ j7MYl1H9NjoGNqe8vKNs7ZMO6QENk74Wr4ICZqizvm/2ruNYNU+e9Wg7mqYYDcgKDScMLOOab8b vubUUrmQOJy7hWzNU4PVzGATVweHH1DgvaKt4G99Je1q1YkllzXEWkA9ovpB3muRuYcZTGZGO9u XmsXZN9xxqLykrsJOeMpTNZ7wS9mgsoBCxixLASA/wsIrM3cc+EMoum9siXLeuxAHqseapySdQn HptLWzc++cY0SSKpQH55WOxqS6moHhowy6dJR4xceT+ceFUpeTZkOI5XhK80Ww8RXPI9nm25H00 = X-Received: by 2002:a17:903:2450:b0:223:5379:5e4e with SMTP id d9443c01a7336-22dc69f8403mr17187435ad.10.1745618307956; Fri, 25 Apr 2025 14:58:27 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db4d770d6sm37749595ad.17.2025.04.25.14.58.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 14:58:27 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 044/159] tcg: Merge INDEX_op_mulsh_{i32,i64} Date: Fri, 25 Apr 2025 14:52:58 -0700 Message-ID: <20250425215454.886111-45-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::62d; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62d.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 Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- include/tcg/tcg-opc.h | 3 +-- tcg/optimize.c | 10 +++++----- tcg/tcg-op.c | 8 ++++---- tcg/tcg.c | 14 ++++---------- docs/devel/tcg-ops.rst | 2 +- 5 files changed, 15 insertions(+), 22 deletions(-) diff --git a/include/tcg/tcg-opc.h b/include/tcg/tcg-opc.h index 28a5128537..a9d7938a52 100644 --- a/include/tcg/tcg-opc.h +++ b/include/tcg/tcg-opc.h @@ -44,6 +44,7 @@ DEF(and, 1, 2, 0, TCG_OPF_INT) DEF(andc, 1, 2, 0, TCG_OPF_INT) DEF(eqv, 1, 2, 0, TCG_OPF_INT) DEF(mul, 1, 2, 0, TCG_OPF_INT) +DEF(mulsh, 1, 2, 0, TCG_OPF_INT) DEF(muluh, 1, 2, 0, TCG_OPF_INT) DEF(nand, 1, 2, 0, TCG_OPF_INT) DEF(neg, 1, 1, 0, TCG_OPF_INT) @@ -90,7 +91,6 @@ DEF(add2_i32, 2, 4, 0, 0) DEF(sub2_i32, 2, 4, 0, 0) DEF(mulu2_i32, 2, 2, 0, 0) DEF(muls2_i32, 2, 2, 0, 0) -DEF(mulsh_i32, 1, 2, 0, 0) DEF(brcond2_i32, 0, 4, 2, TCG_OPF_BB_END | TCG_OPF_COND_BRANCH) DEF(setcond2_i32, 1, 4, 1, 0) @@ -151,7 +151,6 @@ DEF(add2_i64, 2, 4, 0, 0) DEF(sub2_i64, 2, 4, 0, 0) DEF(mulu2_i64, 2, 2, 0, 0) DEF(muls2_i64, 2, 2, 0, 0) -DEF(mulsh_i64, 1, 2, 0, 0) #define DATA64_ARGS (TCG_TARGET_REG_BITS == 64 ? 1 : 2) diff --git a/tcg/optimize.c b/tcg/optimize.c index e19bccf906..fd446fc47d 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -549,10 +549,10 @@ static uint64_t do_constant_folding_2(TCGOpcode op, TCGType type, mulu64(&l64, &h64, x, y); return h64; - case INDEX_op_mulsh_i32: - return ((int64_t)(int32_t)x * (int32_t)y) >> 32; - - case INDEX_op_mulsh_i64: + case INDEX_op_mulsh: + if (type == TCG_TYPE_I32) { + return ((int64_t)(int32_t)x * (int32_t)y) >> 32; + } muls64(&l64, &h64, x, y); return h64; @@ -2969,7 +2969,7 @@ void tcg_optimize(TCGContext *s) case INDEX_op_mul: done = fold_mul(&ctx, op); break; - CASE_OP_32_64(mulsh): + case INDEX_op_mulsh: case INDEX_op_muluh: done = fold_mul_highpart(&ctx, op); break; diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index a043c4554b..664c698187 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -1156,10 +1156,10 @@ void tcg_gen_muls2_i32(TCGv_i32 rl, TCGv_i32 rh, TCGv_i32 arg1, TCGv_i32 arg2) { if (TCG_TARGET_HAS_muls2_i32) { tcg_gen_op4_i32(INDEX_op_muls2_i32, rl, rh, arg1, arg2); - } else if (tcg_op_supported(INDEX_op_mulsh_i32, TCG_TYPE_I32, 0)) { + } else if (tcg_op_supported(INDEX_op_mulsh, TCG_TYPE_I32, 0)) { TCGv_i32 t = tcg_temp_ebb_new_i32(); tcg_gen_op3_i32(INDEX_op_mul, t, arg1, arg2); - tcg_gen_op3_i32(INDEX_op_mulsh_i32, rh, arg1, arg2); + tcg_gen_op3_i32(INDEX_op_mulsh, rh, arg1, arg2); tcg_gen_mov_i32(rl, t); tcg_temp_free_i32(t); } else if (TCG_TARGET_REG_BITS == 32) { @@ -2861,10 +2861,10 @@ void tcg_gen_muls2_i64(TCGv_i64 rl, TCGv_i64 rh, TCGv_i64 arg1, TCGv_i64 arg2) { if (TCG_TARGET_HAS_muls2_i64) { tcg_gen_op4_i64(INDEX_op_muls2_i64, rl, rh, arg1, arg2); - } else if (tcg_op_supported(INDEX_op_mulsh_i64, TCG_TYPE_I64, 0)) { + } else if (tcg_op_supported(INDEX_op_mulsh, TCG_TYPE_I64, 0)) { TCGv_i64 t = tcg_temp_ebb_new_i64(); tcg_gen_op3_i64(INDEX_op_mul, t, arg1, arg2); - tcg_gen_op3_i64(INDEX_op_mulsh_i64, rh, arg1, arg2); + tcg_gen_op3_i64(INDEX_op_mulsh, rh, arg1, arg2); tcg_gen_mov_i64(rl, t); tcg_temp_free_i64(t); } else if (TCG_TARGET_HAS_mulu2_i64 || diff --git a/tcg/tcg.c b/tcg/tcg.c index 4bfda0a38f..d4b5872128 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -1022,8 +1022,7 @@ static const TCGOutOp * const all_outop[NB_OPS] = { OUTOP(INDEX_op_andc, TCGOutOpBinary, outop_andc), OUTOP(INDEX_op_eqv, TCGOutOpBinary, outop_eqv), OUTOP(INDEX_op_mul, TCGOutOpBinary, outop_mul), - OUTOP(INDEX_op_mulsh_i32, TCGOutOpBinary, outop_mulsh), - OUTOP(INDEX_op_mulsh_i64, TCGOutOpBinary, outop_mulsh), + OUTOP(INDEX_op_mulsh, TCGOutOpBinary, outop_mulsh), OUTOP(INDEX_op_muluh, TCGOutOpBinary, outop_muluh), OUTOP(INDEX_op_nand, TCGOutOpBinary, outop_nand), OUTOP(INDEX_op_neg, TCGOutOpUnary, outop_neg), @@ -4028,18 +4027,14 @@ liveness_pass_1(TCGContext *s) goto do_not_remove; case INDEX_op_muls2_i32: + case INDEX_op_muls2_i64: opc_new = INDEX_op_mul; - opc_new2 = INDEX_op_mulsh_i32; + opc_new2 = INDEX_op_mulsh; goto do_mul2; case INDEX_op_mulu2_i32: case INDEX_op_mulu2_i64: opc_new = INDEX_op_mul; opc_new2 = INDEX_op_muluh; - goto do_mul2; - case INDEX_op_muls2_i64: - opc_new = INDEX_op_mul; - opc_new2 = INDEX_op_mulsh_i64; - goto do_mul2; do_mul2: nb_iargs = 2; nb_oargs = 2; @@ -5424,8 +5419,7 @@ static void tcg_reg_alloc_op(TCGContext *s, const TCGOp *op) case INDEX_op_andc: case INDEX_op_eqv: case INDEX_op_mul: - case INDEX_op_mulsh_i32: - case INDEX_op_mulsh_i64: + case INDEX_op_mulsh: case INDEX_op_muluh: case INDEX_op_nand: case INDEX_op_nor: diff --git a/docs/devel/tcg-ops.rst b/docs/devel/tcg-ops.rst index 4fed5a77c6..fe922d1dac 100644 --- a/docs/devel/tcg-ops.rst +++ b/docs/devel/tcg-ops.rst @@ -589,7 +589,7 @@ Multiword arithmetic support - | Similar to mulu2, except the two inputs *t1* and *t2* are signed. - * - mulsh_i32/i64 *t0*, *t1*, *t2* + * - mulsh *t0*, *t1*, *t2* muluh *t0*, *t1*, *t2*