From patchwork Fri Apr 25 21:53:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 884503 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp4181140wrs; Fri, 25 Apr 2025 15:06:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUFiJntUBlQhLDKYSDqX7q9hTOz0dnil2W6OIa1zlBvzfpb321t4LW/7Gc3FCxEyU6/FrpQag==@linaro.org X-Google-Smtp-Source: AGHT+IH9ew1jGazt+gc74cUR2Hrbbtol1jh/Xj/4XbhV8CEPUJixA2HL8TT79cV9mZtpxxPymKRG X-Received: by 2002:a05:620a:3948:b0:7c5:9c13:2858 with SMTP id af79cd13be357-7c96053f2admr626813285a.0.1745618806278; Fri, 25 Apr 2025 15:06:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745618806; cv=none; d=google.com; s=arc-20240605; b=NT8s9IKgFAsV1jhmiqMLnc57gAajHodkYer7rq4xdTDrzvy4/ZGEJIK8akNz7PWtgL j3ScyG0WYULZTLk8X/Ykb1Xx9DtJ1ZU1HanNiiZIkOinZsqwyu4dI1E/E5I9OOQ6OeiM 9g9CwZ+ngBxfEOqNW/UrK4WJaHLq9sT31MQbX4G9+qO+nry4u6X7q9KFNFjXxs6T2Te4 hyBVO+X9Pe4VCTbkWYomCT9y0i0OucKDFE1Q7eoFQsDp7FCKdzdpJiVBw42qNaQd8+3h L9qXwxtqspHbbGzjNgm8B8uilyAZj16Acb3lCvvi/KpeSokbMFIMQvk4iXlT2B9sT/FR 3gIQ== 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=qco4sCVwv5KRtVm2PlYQi3gxH6Jr7HgmpYFaYVza3I0=; fh=i/pWNGcx7KiR3ewgypxpPkuORYlkCnVXLqKVm9/UgNc=; b=UhrCXUZkxjP40BSLffYgCTW58gB3QT1jrHETK2buA04VJAdXeKSZ5VDUYd/7Px5JPy 464XXCFpGx8MIscBVKaLzd2zUms8C54uQ6qs5wi+Js28LslCizn/a4fqQemnVSvY1tRI MnHi7lZo16Fv9hRBamdFyLiHw8hU6KE5S4Hj/V50Meiw4hSNv+i+bgzuRzQofXIOkbJB 4Kt9HTM0HxmaFBlxE9mn/7hMT1soYcUpFM3mrUNG++MHF2dkHdTUad9gSCCKKQmamcIW di1JBieLoVTxjiiLTnZ5i29yRXTkLVNnKrogHoHAoMVSqR11/3ruBy56sFNesizLnFqc ynpw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=h4LzGqXy; 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 a1e0cc1a2514c-877c6962f30si51839241.3.2025.04.25.15.06.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Apr 2025 15:06:46 -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=h4LzGqXy; 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 1u8RBJ-0004kD-AY; Fri, 25 Apr 2025 18:06:01 -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 1u8R7e-00055H-Ap for qemu-devel@nongnu.org; Fri, 25 Apr 2025 18:02:15 -0400 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u8R7a-0001LM-0K for qemu-devel@nongnu.org; Fri, 25 Apr 2025 18:02:13 -0400 Received: by mail-pj1-x1035.google.com with SMTP id 98e67ed59e1d1-2ff694d2d4dso2512636a91.0 for ; Fri, 25 Apr 2025 15:02:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745618528; x=1746223328; 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=qco4sCVwv5KRtVm2PlYQi3gxH6Jr7HgmpYFaYVza3I0=; b=h4LzGqXyZOrW91pwHjCiLJ16zeJu5jQ+lcoba6IPZV66qqMhVppiZkErwvjF/kbCJ0 UUgAHAQwNg8qLtYSEklHWR5ic3S70hYlfdFuRHvC9hi/XwS4VlA7vV7OevyN9eGx2mbO wxSqppRdYwADHf63hogw3feqGDa1VCyw38my/SMXKhSFH2062abqgRSsgfpcFYKHUb5p HIQUbo5BSDah70YPbvZ5tj2drIm53mNCZaEuqsa8BEjkiOCOkLs4Ll0oPTeJp8wAcY7S qbaWmQ3A5C60qSEd4XUBaZAfAjSzBuXU3RVuIEZe/njHay5dEz/AGCvC1ZI9oRQjwf9u xbbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745618528; x=1746223328; 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=qco4sCVwv5KRtVm2PlYQi3gxH6Jr7HgmpYFaYVza3I0=; b=dvg3AVQTfPSTqGSlll20zhiiovxYmWYhTT8PWyGJhuKL5JWl00QJBS7qeL6nkIoul1 9fM31z7eEDR4Eh0WFdMQp4nR6a3pwrWOvmDFAXFeQohIi8lPIheeju07COZO10yV355p EwWM34Khlq+d04/LZ3XEWYQLAnXo9eLf0d3g44mrI+WYhPMRKuwJzq84o5y9AnX2mteO JpnQqZTLLDMwhH6Q0bdgZIIAjRy3mFX+MKoWKphnYjOqe301lD3TyZdeZ85UgihBPYvn RSrQCDZ3+GjJpSz2TcvcPQEMgfVXWoEIiLBFJq0YStaEBbFXX3A99amz+S0Lw/Ye2bBs qV3g== X-Gm-Message-State: AOJu0YwRRRBZrVR3sgYpk6D94vqFvTF4ucB88gLHS2XV6iJp/H2V9ZvE a95qbXGdVqBd9mtL1Nf/10CgqHOhzkTIa2+5drow+hv2gxiqDoY/WlIpPwkuLPhEJBDHZXPtv8S 4 X-Gm-Gg: ASbGnctxcEfhRYXW6xaNb7YREfOXNLPoBJcyI8sS4YesOSAk+8wbT+ShxWTZ0U1JYtp 7PeHsMLpDV/aV1RTgoK6yv9wqN/EEYv5u0+k/vwfTejJv0btaCo13UAdoUfUJtVlq3W3oyl7Wx5 p+L4dg4jYI2L6cu1xrcGl7Fg6p7GNSKjoVWneuLPd+R+NdkrE1TOblzPatI09ZhCOs437hO2FP9 3pe/txs/Oae0sdqxtmf1SjiM6ljYHhiLNJJ4ziJI/eUKRBqt6mo5fFZpIP6pTvFF+19JnWEZ0NY mKtNbiTaPhjOhYYSNfmbgI/t/nQlWYkKnj5bvkm1p3jV9Y7Vfg11zBuayFqihn7QTSsu1TRTvzg = X-Received: by 2002:a17:90b:2dc4:b0:308:6d7a:5d30 with SMTP id 98e67ed59e1d1-309f7ddd586mr7012202a91.18.1745618528154; Fri, 25 Apr 2025 15:02:08 -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.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 15:02:07 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PULL 096/159] tcg: Rename INDEX_op_bswap64_i64 to INDEX_op_bswap64 Date: Fri, 25 Apr 2025 14:53:50 -0700 Message-ID: <20250425215454.886111-97-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::1035; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1035.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 Even though bswap64 can only be used with TCG_TYPE_I64, rename the opcode to maintain uniformity. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- include/tcg/tcg-opc.h | 3 +-- tcg/optimize.c | 6 +++--- tcg/tcg-op.c | 4 ++-- tcg/tcg.c | 6 +++--- tcg/tci.c | 4 ++-- docs/devel/tcg-ops.rst | 5 +++-- tcg/tci/tcg-target.c.inc | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/tcg/tcg-opc.h b/include/tcg/tcg-opc.h index 296dffe99a..1d27b882fe 100644 --- a/include/tcg/tcg-opc.h +++ b/include/tcg/tcg-opc.h @@ -45,6 +45,7 @@ DEF(and, 1, 2, 0, TCG_OPF_INT) DEF(andc, 1, 2, 0, TCG_OPF_INT) DEF(bswap16, 1, 1, 1, TCG_OPF_INT) DEF(bswap32, 1, 1, 1, TCG_OPF_INT) +DEF(bswap64, 1, 1, 1, TCG_OPF_INT) DEF(clz, 1, 2, 0, TCG_OPF_INT) DEF(ctpop, 1, 1, 0, TCG_OPF_INT) DEF(ctz, 1, 2, 0, TCG_OPF_INT) @@ -121,8 +122,6 @@ DEF(extu_i32_i64, 1, 1, 0, 0) DEF(extrl_i64_i32, 1, 1, 0, 0) DEF(extrh_i64_i32, 1, 1, 0, 0) -DEF(bswap64_i64, 1, 1, 1, 0) - DEF(add2_i64, 2, 4, 0, 0) DEF(sub2_i64, 2, 4, 0, 0) diff --git a/tcg/optimize.c b/tcg/optimize.c index 6fa968624d..a860b62109 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -526,7 +526,7 @@ static uint64_t do_constant_folding_2(TCGOpcode op, TCGType type, x = bswap32(x); return y & TCG_BSWAP_OS ? (int32_t)x : x; - case INDEX_op_bswap64_i64: + case INDEX_op_bswap64: return bswap64(x); case INDEX_op_ext_i32_i64: @@ -1580,7 +1580,7 @@ static bool fold_bswap(OptContext *ctx, TCGOp *op) z_mask = bswap32(z_mask); sign = INT32_MIN; break; - case INDEX_op_bswap64_i64: + case INDEX_op_bswap64: z_mask = bswap64(z_mask); sign = INT64_MIN; break; @@ -2870,7 +2870,7 @@ void tcg_optimize(TCGContext *s) break; case INDEX_op_bswap16: case INDEX_op_bswap32: - case INDEX_op_bswap64_i64: + case INDEX_op_bswap64: done = fold_bswap(&ctx, op); break; case INDEX_op_clz: diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index 27e700161f..ba062191ac 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -2184,8 +2184,8 @@ void tcg_gen_bswap64_i64(TCGv_i64 ret, TCGv_i64 arg) tcg_gen_mov_i32(TCGV_HIGH(ret), t0); tcg_temp_free_i32(t0); tcg_temp_free_i32(t1); - } else if (tcg_op_supported(INDEX_op_bswap64_i64, TCG_TYPE_I64, 0)) { - tcg_gen_op3i_i64(INDEX_op_bswap64_i64, ret, arg, 0); + } else if (tcg_op_supported(INDEX_op_bswap64, TCG_TYPE_I64, 0)) { + tcg_gen_op3i_i64(INDEX_op_bswap64, ret, arg, 0); } else { TCGv_i64 t0 = tcg_temp_ebb_new_i64(); TCGv_i64 t1 = tcg_temp_ebb_new_i64(); diff --git a/tcg/tcg.c b/tcg/tcg.c index f2f2c0dd74..1ba86dd515 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -1113,7 +1113,7 @@ static const TCGOutOp * const all_outop[NB_OPS] = { OUTOP(INDEX_op_brcond2_i32, TCGOutOpBrcond2, outop_brcond2), OUTOP(INDEX_op_setcond2_i32, TCGOutOpSetcond2, outop_setcond2), #else - OUTOP(INDEX_op_bswap64_i64, TCGOutOpUnary, outop_bswap64), + OUTOP(INDEX_op_bswap64, TCGOutOpUnary, outop_bswap64), #endif }; @@ -2939,7 +2939,7 @@ void tcg_dump_ops(TCGContext *s, FILE *f, bool have_prefs) break; case INDEX_op_bswap16: case INDEX_op_bswap32: - case INDEX_op_bswap64_i64: + case INDEX_op_bswap64: { TCGArg flags = op->args[k]; const char *name = NULL; @@ -5470,7 +5470,7 @@ static void tcg_reg_alloc_op(TCGContext *s, const TCGOp *op) } break; - case INDEX_op_bswap64_i64: + case INDEX_op_bswap64: assert(TCG_TARGET_REG_BITS == 64); /* fall through */ case INDEX_op_ctpop: diff --git a/tcg/tci.c b/tcg/tci.c index 903f996f02..30928c3412 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -788,7 +788,7 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState *env, tci_args_rr(insn, &r0, &r1); regs[r0] = (uint32_t)regs[r1]; break; - case INDEX_op_bswap64_i64: + case INDEX_op_bswap64: tci_args_rr(insn, &r0, &r1); regs[r0] = bswap64(regs[r1]); break; @@ -1009,7 +1009,7 @@ int print_insn_tci(bfd_vma addr, disassemble_info *info) case INDEX_op_not: case INDEX_op_ext_i32_i64: case INDEX_op_extu_i32_i64: - case INDEX_op_bswap64_i64: + case INDEX_op_bswap64: tci_args_rr(insn, &r0, &r1); info->fprintf_func(info->stream, "%-12s %s, %s", op_name, str_r(r0), str_r(r1)); diff --git a/docs/devel/tcg-ops.rst b/docs/devel/tcg-ops.rst index e89ede54fa..72a23d6ea2 100644 --- a/docs/devel/tcg-ops.rst +++ b/docs/devel/tcg-ops.rst @@ -431,10 +431,11 @@ Misc they apply from bit 31 instead of bit 15. On TCG_TYPE_I32, the flags should be zero. - * - bswap64_i64 *t0*, *t1*, *flags* + * - bswap64 *t0*, *t1*, *flags* - | 64 bit byte swap. The flags are ignored, but still present - for consistency with the other bswap opcodes. + for consistency with the other bswap opcodes. For future + compatibility, the flags should be zero. * - discard_i32/i64 *t0* diff --git a/tcg/tci/tcg-target.c.inc b/tcg/tci/tcg-target.c.inc index cbfe92adf3..4fc857ad35 100644 --- a/tcg/tci/tcg-target.c.inc +++ b/tcg/tci/tcg-target.c.inc @@ -930,7 +930,7 @@ static const TCGOutOpBswap outop_bswap32 = { #if TCG_TARGET_REG_BITS == 64 static void tgen_bswap64(TCGContext *s, TCGType type, TCGReg a0, TCGReg a1) { - tcg_out_op_rr(s, INDEX_op_bswap64_i64, a0, a1); + tcg_out_op_rr(s, INDEX_op_bswap64, a0, a1); } static const TCGOutOpUnary outop_bswap64 = {