From patchwork Fri Apr 25 21:52:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 884513 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp4183123wrs; Fri, 25 Apr 2025 15:13:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU7NOlfaqHmMVIC8ngjXbzDXpdbpemO2Ss1c/2GvJPK2lCh9aiaRJUJAx84javKbuKuiXK75w==@linaro.org X-Google-Smtp-Source: AGHT+IGLhCZtIKOauVjjdFHEUoDItfx9UIMz745SK8KgnuVh6CzGfP3uiuRqbt2UgyqSwKAc+T4K X-Received: by 2002:a05:620a:c43:b0:7c5:562d:ccf4 with SMTP id af79cd13be357-7c9668496efmr223368485a.4.1745619181044; Fri, 25 Apr 2025 15:13:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745619181; cv=none; d=google.com; s=arc-20240605; b=ADFYOE1vAlS1cEpMGcW/3YCGzA9qsOUOmz9Km1ZeYygBJWiWk0tdKSXQNxbHLlkTtt 3kKPZLtowIMGsEB5c2RWiLBKnDYUnqBd/t4+yIRBY0qHyXTLO6TaLqQrSiKsKhouTPMe cjbzOyQMCxIdLSViRukXJ8zVTospGafhh9HL01YPmiG1+31rDzuJHa2l8k5wYw3cJSMw 3ZYo8GMf9QwuD3R0MlmzRO2zSRiqXcgTAHoDQeXDt6NGOyir5HYT9+N6oYrCIvVyCtBj k2rFadeUw2Z13DpKbHTWP3Tl0Sw9x7+F2ckt9GU8/BRGHMlwphrxVwJ41Tfk5JOuyzp+ Gd8A== 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=SByVEntwOwHxqWnyvhcPsNbVTLrFSBxR8uHdPEGFVBg=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=Rmu1+YZ+VZr4vr89Ir6wl2pwFb6LmOpW9y8NrlaOgMTgeli9hinBxhmmVNUA/Te1Kb SmfZ9lKCE8eIF6vMQOfgTyN8mwRuFBSevdOA5vHcQmtwqnRUythoT20WWcU7MYy8bG7D QWsEEPYE65giELMqz1KKYZktwIzdbFQO6zoCMYHtUudq6lt8vxANT9OXLdOs4Uag56Hv zZdfh2V2uDQ3Hpc+5WEq70+sF7f88V8ZA9FB3cvTv0PFIYHVgVQKALmg5tgis+2/vGs1 b/aC4TD2oPbctUaUnApPcxlXUn94EH5caucSdKWcnTdF6wN+yQ9v59SYtoDsweKiqmAR SNVQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Cksmdegk; 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-7c958cd69c4si430188585a.184.2025.04.25.15.13.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Apr 2025 15:13:01 -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=Cksmdegk; 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 1u8R16-0007aX-7U; Fri, 25 Apr 2025 17:55:28 -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 1u8R0w-0007Tp-2t for qemu-devel@nongnu.org; Fri, 25 Apr 2025 17:55:18 -0400 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u8R0t-0000YD-Uo for qemu-devel@nongnu.org; Fri, 25 Apr 2025 17:55:17 -0400 Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-7394945d37eso2459250b3a.3 for ; Fri, 25 Apr 2025 14:55:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745618114; x=1746222914; 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=SByVEntwOwHxqWnyvhcPsNbVTLrFSBxR8uHdPEGFVBg=; b=CksmdegkCn29A+qkabOaIuXUReiSzZrlZRMBjr08J294hUWUO2k/6q4kMnvuZeYrj3 OHfHtCBYKAb4UGUXATGXzLezthtrFbctN1teVcJ8KDuOI8B5AjBx0qnh3yLmjKXIVJCp 2dco9ZFc01HY3UcbPemP1BFg+4vX1qv7Ter49wpjFrmuYbibBDA/jivjoD5rgA7T+bLA FA0NdtgBzXhJ/qPYsYpe+n6TccM+GkEdrcVsJjiRFYxwLPORLpMpmRgE3UCMyTQ/d8p/ jAqO4zhBjPFcLkKk9eRlDsjsJnbJqCX0CXUNahNn9evyil7/KA4DODVQrlYkMs57LdzD +ECA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745618114; x=1746222914; 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=SByVEntwOwHxqWnyvhcPsNbVTLrFSBxR8uHdPEGFVBg=; b=uL7EoS+HDToS9ynQM0QAfd4g7qGAirFazj73d8ck+nzQ/4jkSJbQsdkHEgkfpddA+e F2pC0g4uRIYMhlFC9KNvyFfRyfuG6xcS4LvzebshV5zQUZipbkOh/SQc0EGr/plrMnBt E+Ed2rSnMRlNhhDVUWMIHBwisAoN51x03yIAWdXEBVdxnRjvP7xIxgYpOLrD7Q5q6Ag8 qEhtdgpkJx5jvp2GWl/4YxV/sFc/N448I9qdtiktkYJmecQVvGpFFa3SFd8D7ZLc4Pl8 iBSjhcmPjIBvV7TGtQK72Wc3w4esRRA9J847+VnthAR8Ec7FjtqNyBWF/66stbyHrBYd cCjg== X-Gm-Message-State: AOJu0YwxPyi8TJNSK89CJCcuvTIagN8tvNb+XYM4Y2xBO6AR2LSJWQCZ wiZnA2pIKdLAW+He7DPENg9T5zKZeyoifUnzycxIBn+icXwVcerDDKwZCmeaMk1Mu8D5NJkDIIK H X-Gm-Gg: ASbGncvvz+QxpgTAKY18qQHUmJDBC0QimoNkSp9PuY1IkbZRwSj8Od59or7BWGvT6cd ELc0LbcI9BON5nhPQHcYE+KvNSSPGiUQCtma0iQBJDnpnGLp0POl9HXLrGvyS+wFb+5IVMEaJ1W q5b30jt3Z4R3opkQnFaHdYOUnDhzt+QMT1F3mdnm9vEV5TfXkWS6X+VGivpYBBcSAi/1O3miCFA P4vN/UCr59CHS/E6GYnGrnoIASD0UGXhmC9tADzDLg974rbj2UDLS55x5O+u+uFSgnic/WP/d1I XC5Z09L5vrCH2QXNjkT3aME1tEJMoHObfZpjnUxxY5AWm5ddyTA06MM/K/n0OIs9NG2mW8Nqfps = X-Received: by 2002:a05:6a21:789d:b0:1f5:852a:dd8a with SMTP id adf61e73a8af0-2046a6dccc3mr1088493637.28.1745618114406; Fri, 25 Apr 2025 14:55:14 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73e259414b0sm3664392b3a.48.2025.04.25.14.55.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 14:55:14 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 026/159] tcg: Merge INDEX_op_eqv_{i32,i64} Date: Fri, 25 Apr 2025 14:52:40 -0700 Message-ID: <20250425215454.886111-27-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::42e; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42e.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 | 6 ++++-- tcg/tcg-op.c | 8 ++++---- tcg/tcg.c | 6 ++---- tcg/tci.c | 5 ++--- docs/devel/tcg-ops.rst | 2 +- tcg/tci/tcg-target.c.inc | 2 +- 7 files changed, 15 insertions(+), 17 deletions(-) diff --git a/include/tcg/tcg-opc.h b/include/tcg/tcg-opc.h index 8f6115bedb..c6869de244 100644 --- a/include/tcg/tcg-opc.h +++ b/include/tcg/tcg-opc.h @@ -42,6 +42,7 @@ DEF(mov, 1, 1, 0, TCG_OPF_INT | TCG_OPF_NOT_PRESENT) DEF(add, 1, 2, 0, TCG_OPF_INT) 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(or, 1, 2, 0, TCG_OPF_INT) DEF(orc, 1, 2, 0, TCG_OPF_INT) DEF(xor, 1, 2, 0, TCG_OPF_INT) @@ -93,7 +94,6 @@ DEF(bswap16_i32, 1, 1, 1, 0) DEF(bswap32_i32, 1, 1, 1, 0) DEF(not_i32, 1, 1, 0, 0) DEF(neg_i32, 1, 1, 0, 0) -DEF(eqv_i32, 1, 2, 0, 0) DEF(nand_i32, 1, 2, 0, 0) DEF(nor_i32, 1, 2, 0, 0) DEF(clz_i32, 1, 2, 0, 0) @@ -147,7 +147,6 @@ DEF(bswap32_i64, 1, 1, 1, 0) DEF(bswap64_i64, 1, 1, 1, 0) DEF(not_i64, 1, 1, 0, 0) DEF(neg_i64, 1, 1, 0, 0) -DEF(eqv_i64, 1, 2, 0, 0) DEF(nand_i64, 1, 2, 0, 0) DEF(nor_i64, 1, 2, 0, 0) DEF(clz_i64, 1, 2, 0, 0) diff --git a/tcg/optimize.c b/tcg/optimize.c index e18fe37ad2..47898b7086 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -489,7 +489,8 @@ static uint64_t do_constant_folding_2(TCGOpcode op, uint64_t x, uint64_t y) case INDEX_op_orc_vec: return x | ~y; - CASE_OP_32_64_VEC(eqv): + case INDEX_op_eqv: + case INDEX_op_eqv_vec: return ~(x ^ y); CASE_OP_32_64_VEC(nand): @@ -2929,7 +2930,8 @@ void tcg_optimize(TCGContext *s) case INDEX_op_dup2_vec: done = fold_dup2(&ctx, op); break; - CASE_OP_32_64_VEC(eqv): + case INDEX_op_eqv: + case INDEX_op_eqv_vec: done = fold_eqv(&ctx, op); break; CASE_OP_32_64(extract): diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index 8008b0d3e0..2520a60cee 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -680,8 +680,8 @@ void tcg_gen_andc_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2) void tcg_gen_eqv_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2) { - if (tcg_op_supported(INDEX_op_eqv_i32, TCG_TYPE_I32, 0)) { - tcg_gen_op3_i32(INDEX_op_eqv_i32, ret, arg1, arg2); + if (tcg_op_supported(INDEX_op_eqv, TCG_TYPE_I32, 0)) { + tcg_gen_op3_i32(INDEX_op_eqv, ret, arg1, arg2); } else { tcg_gen_xor_i32(ret, arg1, arg2); tcg_gen_not_i32(ret, ret); @@ -2279,8 +2279,8 @@ void tcg_gen_eqv_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2) if (TCG_TARGET_REG_BITS == 32) { tcg_gen_eqv_i32(TCGV_LOW(ret), TCGV_LOW(arg1), TCGV_LOW(arg2)); tcg_gen_eqv_i32(TCGV_HIGH(ret), TCGV_HIGH(arg1), TCGV_HIGH(arg2)); - } else if (tcg_op_supported(INDEX_op_eqv_i64, TCG_TYPE_I64, 0)) { - tcg_gen_op3_i64(INDEX_op_eqv_i64, ret, arg1, arg2); + } else if (tcg_op_supported(INDEX_op_eqv, TCG_TYPE_I64, 0)) { + tcg_gen_op3_i64(INDEX_op_eqv, ret, arg1, arg2); } else { tcg_gen_xor_i64(ret, arg1, arg2); tcg_gen_not_i64(ret, ret); diff --git a/tcg/tcg.c b/tcg/tcg.c index 53158a292b..6642429df6 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -1007,8 +1007,7 @@ static const TCGOutOp * const all_outop[NB_OPS] = { OUTOP(INDEX_op_add, TCGOutOpBinary, outop_add), OUTOP(INDEX_op_and, TCGOutOpBinary, outop_and), OUTOP(INDEX_op_andc, TCGOutOpBinary, outop_andc), - OUTOP(INDEX_op_eqv_i32, TCGOutOpBinary, outop_eqv), - OUTOP(INDEX_op_eqv_i64, TCGOutOpBinary, outop_eqv), + OUTOP(INDEX_op_eqv, TCGOutOpBinary, outop_eqv), OUTOP(INDEX_op_or, TCGOutOpBinary, outop_or), OUTOP(INDEX_op_orc, TCGOutOpBinary, outop_orc), OUTOP(INDEX_op_xor, TCGOutOpBinary, outop_xor), @@ -5436,8 +5435,7 @@ static void tcg_reg_alloc_op(TCGContext *s, const TCGOp *op) case INDEX_op_add: case INDEX_op_and: case INDEX_op_andc: - case INDEX_op_eqv_i32: - case INDEX_op_eqv_i64: + case INDEX_op_eqv: case INDEX_op_or: case INDEX_op_orc: case INDEX_op_xor: diff --git a/tcg/tci.c b/tcg/tci.c index 26a271e71f..d2baa8d3fc 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -555,7 +555,7 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState *env, tci_args_rrr(insn, &r0, &r1, &r2); regs[r0] = regs[r1] | ~regs[r2]; break; - CASE_32_64(eqv) + case INDEX_op_eqv: tci_args_rrr(insn, &r0, &r1, &r2); regs[r0] = ~(regs[r1] ^ regs[r2]); break; @@ -1079,6 +1079,7 @@ int print_insn_tci(bfd_vma addr, disassemble_info *info) case INDEX_op_add: case INDEX_op_and: case INDEX_op_andc: + case INDEX_op_eqv: case INDEX_op_or: case INDEX_op_orc: case INDEX_op_xor: @@ -1086,8 +1087,6 @@ int print_insn_tci(bfd_vma addr, disassemble_info *info) case INDEX_op_sub_i64: case INDEX_op_mul_i32: case INDEX_op_mul_i64: - case INDEX_op_eqv_i32: - case INDEX_op_eqv_i64: case INDEX_op_nand_i32: case INDEX_op_nand_i64: case INDEX_op_nor_i32: diff --git a/docs/devel/tcg-ops.rst b/docs/devel/tcg-ops.rst index a4aa4f8824..fe149e012d 100644 --- a/docs/devel/tcg-ops.rst +++ b/docs/devel/tcg-ops.rst @@ -323,7 +323,7 @@ Logical - | *t0* = *t1* & ~\ *t2* - * - eqv_i32/i64 *t0*, *t1*, *t2* + * - eqv *t0*, *t1*, *t2* - | *t0* = ~(*t1* ^ *t2*), or equivalently, *t0* = *t1* ^ ~\ *t2* diff --git a/tcg/tci/tcg-target.c.inc b/tcg/tci/tcg-target.c.inc index 4c9e055614..fe3450373e 100644 --- a/tcg/tci/tcg-target.c.inc +++ b/tcg/tci/tcg-target.c.inc @@ -663,7 +663,7 @@ static const TCGOutOpBinary outop_andc = { static void tgen_eqv(TCGContext *s, TCGType type, TCGReg a0, TCGReg a1, TCGReg a2) { - tcg_out_op_rrr(s, glue(INDEX_op_eqv_i,TCG_TARGET_REG_BITS), a0, a1, a2); + tcg_out_op_rrr(s, INDEX_op_eqv, a0, a1, a2); } static const TCGOutOpBinary outop_eqv = {