From patchwork Tue Apr 15 19:22:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 881301 Delivered-To: patch@linaro.org Received: by 2002:adf:f902:0:b0:38f:210b:807b with SMTP id b2csp633668wrr; Tue, 15 Apr 2025 12:57:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVFt8vVyj/B82jksYuOUznKkiPnT39S5AJzzysEIIqfDq1HsROxfSmK5QkfOW1XB4MWVoWsqw==@linaro.org X-Google-Smtp-Source: AGHT+IHbA3E5Jbi3KAF0lWLPVnGGTB7ItWWcO6ItSwE1UBuLK3Tp4tZJ73RVmzyYMkZE4JP3GDtw X-Received: by 2002:a05:6214:20a3:b0:6ec:f76f:64fa with SMTP id 6a1803df08f44-6f2ada36608mr11013196d6.44.1744747067536; Tue, 15 Apr 2025 12:57:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744747067; cv=none; d=google.com; s=arc-20240605; b=k7FjfkRLOxjoEsxgDFEFKQ3ttABuSu4iqauhpuapEz5zkEK0FlCgY0BLmCp8/rJwvp N2vNjQgyApLLVHyV+fsCnxgSp4u6P8grBS1v8OA3Bp/gMlNB96KRsHhuAgK91cu7GXF1 M8FDmyzegZZD+g3cIEu5tRrh92VGHpTqYLcbVvpstN2lTT+gqGlxk92b2QkfP/LNXusc ilnxoUHbVYBYXkyH2HejS57qtO/UCWFd0otPUoelvRfOqu7FkIn1ZTgPIbCmcJUg5MKl 42Ux+OBDpC7DD6brtIkZUELqutnRgN7CXnRfYD2bl5zNoKuAEnWKosJn98pt2hucwBkP bR1w== 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=sWHE8wUyc9t6dnJDnwkA1EMHlWgxXLwM3g/a2FWHjDQ=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=eE61FH5v4/anYfK5nsbaIdjP8juOm+SPgO8ClHIfQkZR+mxGMFF7fmi422sqpz/qc3 TC7DjQDrgPgpqfW1OqBj82bdH5KvHGw+2G8wBZFkS2xdkAv2jfS0VAxIa5hVUDm1ckeZ BQ6KAnlscOB6MFM15DxQC7Il/W6eWlgNvZMZ0/n8x4mBeAYvhXAlOx6r2cXC05l7K6bD 7MrT7nvYVj5P6jIJ2EdUVsI/w0wrQ9n4RmxbFHbmRfPzwjmOO/5AbFYYdwzYiG0M0tSF pCUu0x/Ml43KrG+cO1k5UJcTUIzdnRkCxT+0gSD9zQmN0LaEzDwizW3AqpMentIMyA09 /DLg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=m+N2WkEE; 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-6f0dea11eb3si141626866d6.487.2025.04.15.12.57.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 Apr 2025 12:57:47 -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=m+N2WkEE; 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 1u4lv8-0000Bf-PL; Tue, 15 Apr 2025 15:26:13 -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 1u4lua-0008Ts-D8 for qemu-devel@nongnu.org; Tue, 15 Apr 2025 15:25:36 -0400 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u4luT-0007y9-Ny for qemu-devel@nongnu.org; Tue, 15 Apr 2025 15:25:32 -0400 Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-736b34a71a1so6948294b3a.0 for ; Tue, 15 Apr 2025 12:25:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744745128; x=1745349928; 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=sWHE8wUyc9t6dnJDnwkA1EMHlWgxXLwM3g/a2FWHjDQ=; b=m+N2WkEEaxxVHOaOeKdJgIhK5aI8LHE5TF+NpUg719TWe6vOwFi/HTfl+5R6X8FkN1 QhiY0BcST9b/ubKGwb3dHefTjHgTRtzpCP+B+PfvumH3hkbBp2wAyPvDJocg8akw4HBM aNmsaOt4Ky2R4pVaVJy+UqyUZZR6HgIeFJ2hFS9r/P65hGBA2Wlria3M5vWhCzWf1orO Pc6Ogm9xa9E5TtHw/RpV1/7uedQayBnvMurn3LrvjbVPYANro5fzp9oEa2NKJxlzEyv6 1rBADuIS4IXUUFrgmd9EYl48rKZn6MbdyuvhydXppwmyhQIsOZ0rb8RSVvPc/TrW2O7h xkkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744745128; x=1745349928; 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=sWHE8wUyc9t6dnJDnwkA1EMHlWgxXLwM3g/a2FWHjDQ=; b=mmACv0RoTCjAq8brp2NOVteUolrAZr3ZEbA3ggLgN16WtCHxutumBLMnB8GjhvGx+C WtBlWXqf7C8yJWfnxwoLIHEeuJxeIkN8beo/oXq+qFN0KNLRNkjKKhXtz98z3cAu5Tt3 C4jfxWJSNlZFkH5ebYc27/2RlBDk3huXBqc526qXnx83GHn9WL+Dy5PU4VRKnGYXTgcl Y7y/pjry85Noo/dwKWXysv5M9gRWD60MtP0b6+xWIHkPcoqLV9i9m5hqd2dSebbnJIms vNZRkKboILRi/6e+FQxFvL95CBXPn5om3rvxlU4iIazmefD+TvGTbbKzwP4pWd+1Vc6v ZFGw== X-Gm-Message-State: AOJu0YymE6Te4tEsjog4x3bns3ndC1zkIVaguHAhtGzoToxaINogQRwr 4l26Knk8PFH7NoJZ6IS5dagMevjLtETNzkSZZ3YE1VbcpWSheEa/iCY82aEtSDLqBvdqNgoHrcF y X-Gm-Gg: ASbGncu6hCWxswNcIB/MKiqBM0PEVMgVpsPr9UME4KN7rSKzeML7914BHALt3xyEFEz k9odBrdIjGQly0VOmQvmxwXZf8iJ+eiDOuP2P96TDJvDBTKJ8HKhKYHJ5xCbuxvRurKpX+89zN5 5EI2k/67f3bwzrhs/0qmpngLLmPjrhQabZY8vbybI+bwW6VXnY2C4tSzv3fS3r4u93O4Z33tp9W Ol0j8hEweoncbrBqIMpIwuC0xiikqs9mJXSNLCEvnhjG0qmWpKId7o7yvnoSSOLpeOmoHu/8c2c l9q4B4KXZ2pcXkdWY+v9qLhA4xNyeuPFvcm/WZODPB9yR8RxuGEQUnigobEg036L3aCTM2Znalk = X-Received: by 2002:a05:6a00:1409:b0:73b:9be4:e64a with SMTP id d2e1a72fcca58-73c1fb48cdamr819569b3a.23.1744745127754; Tue, 15 Apr 2025 12:25:27 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73bd22f82ebsm9225124b3a.92.2025.04.15.12.25.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Apr 2025 12:25:27 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v4 014/163] tcg: Merge INDEX_op_or_{i32,i64} Date: Tue, 15 Apr 2025 12:22:45 -0700 Message-ID: <20250415192515.232910-15-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250415192515.232910-1-richard.henderson@linaro.org> References: <20250415192515.232910-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::436; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x436.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 +-- target/sh4/translate.c | 4 ++-- tcg/optimize.c | 6 ++++-- tcg/tcg-op.c | 4 ++-- tcg/tcg.c | 9 +++------ tcg/tci.c | 5 ++--- docs/devel/tcg-ops.rst | 2 +- tcg/tci/tcg-target.c.inc | 2 +- 8 files changed, 16 insertions(+), 19 deletions(-) diff --git a/include/tcg/tcg-opc.h b/include/tcg/tcg-opc.h index 9bc511992d..95608d6d31 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(or, 1, 2, 0, TCG_OPF_INT) DEF(setcond_i32, 1, 2, 1, 0) DEF(negsetcond_i32, 1, 2, 1, 0) @@ -64,7 +65,6 @@ DEF(rem_i32, 1, 2, 0, 0) DEF(remu_i32, 1, 2, 0, 0) DEF(div2_i32, 2, 3, 0, 0) DEF(divu2_i32, 2, 3, 0, 0) -DEF(or_i32, 1, 2, 0, 0) DEF(xor_i32, 1, 2, 0, 0) /* shifts/rotates */ DEF(shl_i32, 1, 2, 0, 0) @@ -124,7 +124,6 @@ DEF(rem_i64, 1, 2, 0, 0) DEF(remu_i64, 1, 2, 0, 0) DEF(div2_i64, 2, 3, 0, 0) DEF(divu2_i64, 2, 3, 0, 0) -DEF(or_i64, 1, 2, 0, 0) DEF(xor_i64, 1, 2, 0, 0) /* shifts/rotates */ DEF(shl_i64, 1, 2, 0, 0) diff --git a/target/sh4/translate.c b/target/sh4/translate.c index acc6b92f18..17e09f3d2a 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -1949,7 +1949,7 @@ static void decode_gusa(DisasContext *ctx, CPUSH4State *env) op_opc = INDEX_op_xor_i32; goto do_reg_op; case 0x200b: /* or Rm,Rn */ - op_opc = INDEX_op_or_i32; + op_opc = INDEX_op_or; do_reg_op: /* The operation register should be as expected, and the other input cannot depend on the load. */ @@ -2119,7 +2119,7 @@ static void decode_gusa(DisasContext *ctx, CPUSH4State *env) } break; - case INDEX_op_or_i32: + case INDEX_op_or: if (op_dst != st_src) { goto fail; } diff --git a/tcg/optimize.c b/tcg/optimize.c index 6dfc1da1b6..d388c2b9ae 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -425,7 +425,8 @@ static uint64_t do_constant_folding_2(TCGOpcode op, uint64_t x, uint64_t y) case INDEX_op_and_vec: return x & y; - CASE_OP_32_64_VEC(or): + case INDEX_op_or: + case INDEX_op_or_vec: return x | y; CASE_OP_32_64_VEC(xor): @@ -2949,7 +2950,8 @@ void tcg_optimize(TCGContext *s) CASE_OP_32_64_VEC(not): done = fold_not(&ctx, op); break; - CASE_OP_32_64_VEC(or): + case INDEX_op_or: + case INDEX_op_or_vec: done = fold_or(&ctx, op); break; CASE_OP_32_64_VEC(orc): diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index d87bd13375..6807f4eebd 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -436,7 +436,7 @@ void tcg_gen_andi_i32(TCGv_i32 ret, TCGv_i32 arg1, int32_t arg2) void tcg_gen_or_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2) { - tcg_gen_op3_i32(INDEX_op_or_i32, ret, arg1, arg2); + tcg_gen_op3_i32(INDEX_op_or, ret, arg1, arg2); } void tcg_gen_ori_i32(TCGv_i32 ret, TCGv_i32 arg1, int32_t arg2) @@ -1585,7 +1585,7 @@ void tcg_gen_and_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2) void tcg_gen_or_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2) { if (TCG_TARGET_REG_BITS == 64) { - tcg_gen_op3_i64(INDEX_op_or_i64, ret, arg1, arg2); + tcg_gen_op3_i64(INDEX_op_or, ret, arg1, arg2); } else { tcg_gen_or_i32(TCGV_LOW(ret), TCGV_LOW(arg1), TCGV_LOW(arg2)); tcg_gen_or_i32(TCGV_HIGH(ret), TCGV_HIGH(arg1), TCGV_HIGH(arg2)); diff --git a/tcg/tcg.c b/tcg/tcg.c index 693cd6da89..5cc6c293be 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_or_i32, TCGOutOpBinary, outop_or), - OUTOP(INDEX_op_or_i64, TCGOutOpBinary, outop_or), + OUTOP(INDEX_op_or, TCGOutOpBinary, outop_or), }; #undef OUTOP @@ -2212,6 +2211,7 @@ bool tcg_op_supported(TCGOpcode op, TCGType type, unsigned flags) case INDEX_op_add: case INDEX_op_and: case INDEX_op_mov: + case INDEX_op_or: return has_type; case INDEX_op_setcond_i32: @@ -2228,7 +2228,6 @@ bool tcg_op_supported(TCGOpcode op, TCGType type, unsigned flags) case INDEX_op_sub_i32: case INDEX_op_neg_i32: case INDEX_op_mul_i32: - case INDEX_op_or_i32: case INDEX_op_xor_i32: case INDEX_op_shl_i32: case INDEX_op_shr_i32: @@ -2308,7 +2307,6 @@ bool tcg_op_supported(TCGOpcode op, TCGType type, unsigned flags) case INDEX_op_sub_i64: case INDEX_op_neg_i64: case INDEX_op_mul_i64: - case INDEX_op_or_i64: case INDEX_op_xor_i64: case INDEX_op_shl_i64: case INDEX_op_shr_i64: @@ -5440,8 +5438,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_or_i32: - case INDEX_op_or_i64: + case INDEX_op_or: { const TCGOutOpBinary *out = container_of(all_outop[op->opc], TCGOutOpBinary, base); diff --git a/tcg/tci.c b/tcg/tci.c index e4a0408fec..3e361be6bd 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -539,7 +539,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(or) + case INDEX_op_or: tci_args_rrr(insn, &r0, &r1, &r2); regs[r0] = regs[r1] | regs[r2]; break; @@ -1083,12 +1083,11 @@ 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_or: case INDEX_op_sub_i32: case INDEX_op_sub_i64: case INDEX_op_mul_i32: case INDEX_op_mul_i64: - case INDEX_op_or_i32: - case INDEX_op_or_i64: case INDEX_op_xor_i32: case INDEX_op_xor_i64: case INDEX_op_orc_i32: diff --git a/docs/devel/tcg-ops.rst b/docs/devel/tcg-ops.rst index 116a0438b1..8d67b0cdeb 100644 --- a/docs/devel/tcg-ops.rst +++ b/docs/devel/tcg-ops.rst @@ -307,7 +307,7 @@ Logical - | *t0* = *t1* & *t2* - * - or_i32/i64 *t0*, *t1*, *t2* + * - or *t0*, *t1*, *t2* - | *t0* = *t1* | *t2* diff --git a/tcg/tci/tcg-target.c.inc b/tcg/tci/tcg-target.c.inc index 6fdfcab061..4214b76b34 100644 --- a/tcg/tci/tcg-target.c.inc +++ b/tcg/tci/tcg-target.c.inc @@ -669,7 +669,7 @@ static const TCGOutOpBinary outop_andc = { static void tgen_or(TCGContext *s, TCGType type, TCGReg a0, TCGReg a1, TCGReg a2) { - tcg_out_op_rrr(s, glue(INDEX_op_or_i,TCG_TARGET_REG_BITS), a0, a1, a2); + tcg_out_op_rrr(s, INDEX_op_or, a0, a1, a2); } static const TCGOutOpBinary outop_or = {