From patchwork Tue Apr 15 19:22: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: 881311 Delivered-To: patch@linaro.org Received: by 2002:adf:f902:0:b0:38f:210b:807b with SMTP id b2csp635017wrr; Tue, 15 Apr 2025 13:01:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX1+2nzvxDMoHkC7kXMuseXtpaswuK70lvcKqIA205qklJBTL1rNFy7kK+47/vrhK5KQhdYCQ==@linaro.org X-Google-Smtp-Source: AGHT+IFSVNsuYhPBdRcJAd1NjgPYbSPkC9xo5dueBMbw4oc3TqNJdlEhHt2nbBaKWWUCz6I2N2Ex X-Received: by 2002:a05:6214:4101:b0:6d8:8fdd:9791 with SMTP id 6a1803df08f44-6f2ad8b4c52mr13003406d6.25.1744747270287; Tue, 15 Apr 2025 13:01:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744747270; cv=none; d=google.com; s=arc-20240605; b=cRvXtj5nUyZKNyBhDLfHJGNcPQjmr8DSe3BgX4fVNG2pE9s9goMWtGiTHQLI2GHu/X EaGqam8i+ZJ00IS+fmVq+rR+02+OaDwXJ/NBuuX1YHIsCyIgNMiM9KxdcLUuscEtbg1R Ktrni9JCEAxKtOlUKnFdLRjZlnzbOLNxgMDCryB/olmebhUSf5a5YLihkVoOMepHNAHp 9xWEyLOA3rlTiDcMSWTEjxisDAVAYui7WaCeG6yXMErS4vbmpT/cqFMu/6TMq2mMSGOd Vs7GoFFXFWmGpH4XElt1Q2rKQLRPDYapRM0bp77atbGtBERdJaXWFZyNjvKqU4UIol+P v2Rw== 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=lZ0EVgmJ1Y1dFaPMBerbje/yXylN0znlxX2TPFFtfCM=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=io46BUg74bKct3nKrCZuPlwPRh9E2s+E118Ds1C79NtRXyx8Udw/5noXthZIxLy95V lcWfz1QU+gEVsarYzOr5Y9PDmHYYy5JaRvpGFO5Q5f4ZctbhoYFzG4YOhHFsq2KnwVYO M/6OF8/PHcjsvLgr54Cw40uh5NxhynTXdEHbKPRUP8cPjhrl8v05xjeKEQDQg6fzjc9/ ddN4Rc5d6IlLN7+Je3O+zGNeQPDmvFGyWX8DZRtamvF6bwYc7zMox6wIMJHZvoeY/smf aPvvskjv+coUaV5IqQ7jkTYw+7JuUPlQGVBrIBzeP+OEFUiaPqeX9PJb5YSwJAr5dKz8 dMHA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RhdDoEW8; 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-6f0de9ecc93si136213846d6.317.2025.04.15.13.01.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 Apr 2025 13:01:10 -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=RhdDoEW8; 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 1u4lyg-0006hw-B1; Tue, 15 Apr 2025 15:29: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 1u4luo-000087-0g for qemu-devel@nongnu.org; Tue, 15 Apr 2025 15:25:51 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u4lug-00082q-To for qemu-devel@nongnu.org; Tue, 15 Apr 2025 15:25:46 -0400 Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-736aa9d0f2aso6682569b3a.0 for ; Tue, 15 Apr 2025 12:25:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744745141; x=1745349941; 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=lZ0EVgmJ1Y1dFaPMBerbje/yXylN0znlxX2TPFFtfCM=; b=RhdDoEW8Ia/j8/exHBRe3q1zkDfcUS8OYhp1RbKW87PrTmZa1bJW1z0TUxXUy8lqAc pROncACefSUmkgBrS2vJYGZF/HIaysDUhoQqWE9KS90+DMjttFy4sbTAHpBRxCa+2RU0 QsxQwQRBvPqs0wzKcTUS41Y5tuDSYkAGg1R1fdDDEg1lSkNTWmNxv4cI0O2Ga14PPCDn gAxhDpgnlOnuhKcbMGyoBemYojILDrs3Zpq9T3ti8vbBUzm6Aj2vm0LPd2E4r/wGp+oH PRBFZeENZfvRFsZxZOp7S0rGeb1EZJj17NZnQ7wy7X9BekNw+xYEJeCxxLaZ0/c6SN/N xorw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744745141; x=1745349941; 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=lZ0EVgmJ1Y1dFaPMBerbje/yXylN0znlxX2TPFFtfCM=; b=L5uzGyj7wWrc3IlcXeL90ITS7AMI1Sxwy4sMH0OlI41fnOgzW/vJDq3bjCmKYzrMcE Itqjrg9sdHCknhp91Oh3aTzDikAqmpfR1QbP4MrL7T99K39HGKiz+bmd64I1y0fyFx7u cmBLqJjpbnXiRZTQbew6/mukAHFkIsr1RwQisXeskIefxKUEc/WdWEGM8RJam1wAcOE0 N6WHErFBFqzML9tnFhuh3QIKeAn8CFua+/huOEzCThr/FHpVt3Xk8mFoNOF9c+bq8O8/ MvcwVXSnyOHKf5jzXLwyCW3/omuxX9ELwwfCl7ySFzIUpD4YH0KKoZJhtqOgAGjy/7Cg N5nA== X-Gm-Message-State: AOJu0Yy/MyvOb5kCDtYjQ4A0KFINXztD4qMHeRjYFD7ne+Q3A+bR2XD5 jsR9xqCLmcf8rwZhMr+jCl+ybGb574PAX3uxaKCm8AiFdKHMydvNfll5YpZHDPIh1xhz3Xg3tBi D X-Gm-Gg: ASbGncv9OGOO6v5XKan6V6IxEHY1xchHf1qQUFqCjoCLfEcfhvOLcCR+GHkzipyd/uh 6F0D9RUweZHCsm9YzOH55gXktJaym2MONDJ6Y2OCm3CQWd5bN3+XfnMNnBJHMG4wsR4llyUnkNQ t5c/g4nEClbqkim3/jLSZlKff243Rgmh5+rTvgINNRXtH5OwFUXHk/M2PZH702tUhoDrZVMhgrd 5Ao49GSyiQ+iK5eZgnROnGhQqoqMuprOG1JqhxJAZzPtwU1AGEeKOzOXwOOp9UqGOesHGlBkvSG rj1CxaqvVq+0vTE5cBn13kLzWFJjR3WhCohjsF27vmz0AI1HUvKC+9PcNnjCxTnn36IuxSiFdll PbWXVkosx6g== X-Received: by 2002:a05:6a00:23cc:b0:736:6d4d:ffa6 with SMTP id d2e1a72fcca58-73c1fafc857mr836109b3a.15.1744745140842; Tue, 15 Apr 2025 12:25:40 -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.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Apr 2025 12:25:40 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v4 027/163] tcg: Merge INDEX_op_nor_{i32,i64} Date: Tue, 15 Apr 2025 12:22:58 -0700 Message-ID: <20250415192515.232910-28-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::42d; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42d.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 1acdd7cfda..aa9ed393c9 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(nand, 1, 2, 0, TCG_OPF_INT) +DEF(nor, 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) @@ -95,7 +96,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(nor_i32, 1, 2, 0, 0) DEF(clz_i32, 1, 2, 0, 0) DEF(ctz_i32, 1, 2, 0, 0) DEF(ctpop_i32, 1, 1, 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(nor_i64, 1, 2, 0, 0) DEF(clz_i64, 1, 2, 0, 0) DEF(ctz_i64, 1, 2, 0, 0) DEF(ctpop_i64, 1, 1, 0, 0) diff --git a/tcg/optimize.c b/tcg/optimize.c index b4dc34b9b1..1fe73f70ed 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -485,7 +485,8 @@ static uint64_t do_constant_folding_2(TCGOpcode op, uint64_t x, uint64_t y) case INDEX_op_nand_vec: return ~(x & y); - CASE_OP_32_64_VEC(nor): + case INDEX_op_nor: + case INDEX_op_nor_vec: return ~(x | y); case INDEX_op_clz_i32: @@ -2988,7 +2989,8 @@ void tcg_optimize(TCGContext *s) CASE_OP_32_64(neg): done = fold_neg(&ctx, op); break; - CASE_OP_32_64_VEC(nor): + case INDEX_op_nor: + case INDEX_op_nor_vec: done = fold_nor(&ctx, op); break; CASE_OP_32_64_VEC(not): diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index ac939bb4ea..228aa8f088 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -700,8 +700,8 @@ void tcg_gen_nand_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2) void tcg_gen_nor_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2) { - if (tcg_op_supported(INDEX_op_nor_i32, TCG_TYPE_I32, 0)) { - tcg_gen_op3_i32(INDEX_op_nor_i32, ret, arg1, arg2); + if (tcg_op_supported(INDEX_op_nor, TCG_TYPE_I32, 0)) { + tcg_gen_op3_i32(INDEX_op_nor, ret, arg1, arg2); } else { tcg_gen_or_i32(ret, arg1, arg2); tcg_gen_not_i32(ret, ret); @@ -2305,8 +2305,8 @@ void tcg_gen_nor_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2) if (TCG_TARGET_REG_BITS == 32) { tcg_gen_nor_i32(TCGV_LOW(ret), TCGV_LOW(arg1), TCGV_LOW(arg2)); tcg_gen_nor_i32(TCGV_HIGH(ret), TCGV_HIGH(arg1), TCGV_HIGH(arg2)); - } else if (tcg_op_supported(INDEX_op_nor_i64, TCG_TYPE_I64, 0)) { - tcg_gen_op3_i64(INDEX_op_nor_i64, ret, arg1, arg2); + } else if (tcg_op_supported(INDEX_op_nor, TCG_TYPE_I64, 0)) { + tcg_gen_op3_i64(INDEX_op_nor, ret, arg1, arg2); } else { tcg_gen_or_i64(ret, arg1, arg2); tcg_gen_not_i64(ret, ret); diff --git a/tcg/tcg.c b/tcg/tcg.c index 6964f24b44..e70877244e 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -1009,8 +1009,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_nand, TCGOutOpBinary, outop_nand), - OUTOP(INDEX_op_nor_i32, TCGOutOpBinary, outop_nor), - OUTOP(INDEX_op_nor_i64, TCGOutOpBinary, outop_nor), + OUTOP(INDEX_op_nor, TCGOutOpBinary, outop_nor), OUTOP(INDEX_op_or, TCGOutOpBinary, outop_or), OUTOP(INDEX_op_orc, TCGOutOpBinary, outop_orc), OUTOP(INDEX_op_xor, TCGOutOpBinary, outop_xor), @@ -5429,8 +5428,7 @@ static void tcg_reg_alloc_op(TCGContext *s, const TCGOp *op) case INDEX_op_andc: case INDEX_op_eqv: case INDEX_op_nand: - case INDEX_op_nor_i32: - case INDEX_op_nor_i64: + case INDEX_op_nor: case INDEX_op_or: case INDEX_op_orc: case INDEX_op_xor: diff --git a/tcg/tci.c b/tcg/tci.c index 3ea93fa5a6..ff129266c2 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -563,7 +563,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(nor) + case INDEX_op_nor: tci_args_rrr(insn, &r0, &r1, &r2); regs[r0] = ~(regs[r1] | regs[r2]); break; @@ -1077,6 +1077,7 @@ int print_insn_tci(bfd_vma addr, disassemble_info *info) case INDEX_op_andc: case INDEX_op_eqv: case INDEX_op_nand: + case INDEX_op_nor: case INDEX_op_or: case INDEX_op_orc: case INDEX_op_xor: @@ -1084,8 +1085,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_nor_i32: - case INDEX_op_nor_i64: case INDEX_op_div_i32: case INDEX_op_div_i64: case INDEX_op_rem_i32: diff --git a/docs/devel/tcg-ops.rst b/docs/devel/tcg-ops.rst index 7703dfbc51..26d464fa38 100644 --- a/docs/devel/tcg-ops.rst +++ b/docs/devel/tcg-ops.rst @@ -331,7 +331,7 @@ Logical - | *t0* = ~(*t1* & *t2*) - * - nor_i32/i64 *t0*, *t1*, *t2* + * - nor *t0*, *t1*, *t2* - | *t0* = ~(*t1* | *t2*) diff --git a/tcg/tci/tcg-target.c.inc b/tcg/tci/tcg-target.c.inc index a0f4c58be8..dec51692f0 100644 --- a/tcg/tci/tcg-target.c.inc +++ b/tcg/tci/tcg-target.c.inc @@ -681,7 +681,7 @@ static const TCGOutOpBinary outop_nand = { static void tgen_nor(TCGContext *s, TCGType type, TCGReg a0, TCGReg a1, TCGReg a2) { - tcg_out_op_rrr(s, glue(INDEX_op_nor_i,TCG_TARGET_REG_BITS), a0, a1, a2); + tcg_out_op_rrr(s, INDEX_op_nor, a0, a1, a2); } static const TCGOutOpBinary outop_nor = {