From patchwork Fri Apr 25 21:53:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 884471 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp4178237wrs; Fri, 25 Apr 2025 15:00:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWb9O5wLMLov7YYYFGA5Um+BDiv76C8FOUtjLcWmiwFH6q2n4PTlo8VWLxr5IOdulKUzGKW6g==@linaro.org X-Google-Smtp-Source: AGHT+IHRgATQB3EBC3nf04HKj6X5VPnNHIFm6r7tLoY5vOl1NbtWcNv27mpizoq5E16rx/paQidx X-Received: by 2002:a05:6214:2486:b0:6e8:f464:c9a9 with SMTP id 6a1803df08f44-6f4d1eee17amr18133076d6.2.1745618452596; Fri, 25 Apr 2025 15:00:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745618452; cv=none; d=google.com; s=arc-20240605; b=OYujeplGtCWx7QnZZE9ZGJsINIpbc6810RDaR+IjyT0od+qUhIg3ENT/jp/6lTI/16 dP/1GWZhq9e0d8rgIBXc+bJV3syXt0PxA371XMYsDTZHOHU9X2mfyS+qQHJIhaZVKm0Q LXg2+KepmkxXJqu8PU2lRKJ2u5IwfPMqTHvPeTWpAf4/a96cDuulk8QD9WzdBahRQfKR Nt7A7lb/kmLvT3lt5lM+voE0yQfcQ/zoqaHaw1yan8E61mJXKaY1Q5LY3JgUZbiucqZd A+1+FEfYwW9FZp6nMU1dgfzy8Xi8xbWjdFh7mvpHdc2eAS/r1mfW6YDpNjTNYE8O7iuf fdRw== 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=ZT0Kj1SfTX+ZgYChf3jXt44TzeEVVik1w3IgP4Oj0Kc=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=WzGqo0HkAAikkprACfAnfVnrpBf43ZfXaYdRSeNxk7v78xrbLV6VieVmCZxDAvKh/8 W19LqH9rSjQfCFRmVtLFVzbf44vHsiwPSG3eAG1iKWkGm9OK8VjMXhdCWnn92mqKWsgo +uxXxDTgnrrXDqkbwrQV5AmaC2tx2VlAgNeOupEuqz6445F/nzuHZx+5Gaa+OOtEPOBO xqC1fV+FQq8lIriaVaIyK+oP34acUrUmZ482Vy3qWWdvQ+4IjH93/QFfC+hTY2i+rtmr gIoX/MUVDkRZ5T6mH1rBuFH8iez7SekXflemrSAb12XSQOw5QqWPY5/5GH0Daqw0OsND NDPA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wgdnzkQR; 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-6f4c0b08c0dsi45594296d6.375.2025.04.25.15.00.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Apr 2025 15:00:52 -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=wgdnzkQR; 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 1u8R4U-0002GU-Gy; Fri, 25 Apr 2025 17:58:58 -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 1u8R4F-0001M5-KI for qemu-devel@nongnu.org; Fri, 25 Apr 2025 17:58:44 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u8R4D-0000pw-3E for qemu-devel@nongnu.org; Fri, 25 Apr 2025 17:58:43 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-2295d78b433so32363545ad.2 for ; Fri, 25 Apr 2025 14:58:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745618319; x=1746223119; 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=ZT0Kj1SfTX+ZgYChf3jXt44TzeEVVik1w3IgP4Oj0Kc=; b=wgdnzkQRwJ0EJ34wAGY/YJv1iQqFXEHbe/gUdaLV/DMJeDqQ00SYA6e7q5Inl7PoeD ScwirLZHN3nHoGwUCkMnBz3I9b8htrpceZuUlvU2te7ChvuS4/tIxKqGVIo5LRXIHJOZ sOQscGRUNOy5/XE4J/cEo3orI6GCr6ML4K/HohbOKJ9hezJoC0LzpceP1xMADe8WjEn5 n0OSSBgXTFcOIEVqdne8nCpsPg1UfpL6R9BbsVWad6SJbdr6CvNaLmH1+57Cc7THm1cB TTvxv4IFlzU9htuRhhIRyrQzMIe5FCjvKv4cu3ssd4LTVJzovHCU6HXmai1QhrlyqpKH z65A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745618319; x=1746223119; 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=ZT0Kj1SfTX+ZgYChf3jXt44TzeEVVik1w3IgP4Oj0Kc=; b=AdL6yQ3aa6s1X8oZ7L4p0Lr2lYKKtHuMehmTcFmxegvaV5rxKJTu5HS4LNSbnJkJS5 2gjh1hg4L6oPwupQymwOLQJE0widQ/bxrrdbcYm6fUBuOuI87Knrig5eSxUkj0mUeGTo lWV+I5/Y2zzLry7BweT/8637tplsG8ljWekUqpyfkHOopgoYZ1cdkXlAoF8Kv+qIsc24 8Uk2OxThxty03V0j+ju9r0t+zxMA09qGlh2sA3KLGDZ2xYizcXWHV9iZCJgSqv4ZVwEq HHiC/QMsULc5qgynyhTw9CxisiwxhIkC7jankgAxdFhGAF7WHRGvLKErbJdThH9urFK0 eIOQ== X-Gm-Message-State: AOJu0Yx9fYDiW406f10GXr0LA81Gn/5/5a+JXAoZWOQChylxbOfhUzAw JcuIXhS6QxBmCPmQM79wMB91W57tXkaSBKDs0vUljoGRvcG3sf1Mhfs6CrHgcz7DOZ9HzdXOBIT 2 X-Gm-Gg: ASbGncvSUoEnx8sZd6BDrYRZ1UvWEfpN2zSDdjHZn5BIPhhHpi8Z+mNwNJ3HuA4Poh1 f6bpDqJQAuSz8zQ1FNsG8EHovmf8zj62GTRgGxsidfgfbDvA9zOpiRDUbikyO+2jEK5YC7uU/lo 7o/qrTC+sJJBMmV3GmVPf4iFeHatDMEqtJLTkhr3YAZgY1J/AYTb57PfdX/7+GY8iqucA2c4BIj AA2FpW55DUJwdduPjSixf4fSG77AjhIs/BJzbRM7T68dWkJtFaHqGE8kw7el1VpxZuyg5fEoo/u xHJH9bbEVt1wi+/Kq/21bE2GuwRItmHaGMu7nkwGpHm4uMnoPwW2M5Dg/DMd4G7Y1Gdd/US9gFY = X-Received: by 2002:a17:903:1b0c:b0:21f:45d:21fb with SMTP id d9443c01a7336-22dc69efa5fmr14741265ad.3.1745618319315; Fri, 25 Apr 2025 14:58:39 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 14:58:38 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 056/159] tcg: Merge INDEX_op_remu_{i32,i64} Date: Fri, 25 Apr 2025 14:53:10 -0700 Message-ID: <20250425215454.886111-57-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::62f; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62f.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 | 5 +---- tcg/optimize.c | 9 +++++---- tcg/tcg-op.c | 8 ++++---- tcg/tcg.c | 6 ++---- tcg/tci.c | 4 ++-- docs/devel/tcg-ops.rst | 2 +- tcg/tci/tcg-target.c.inc | 2 +- 7 files changed, 16 insertions(+), 20 deletions(-) diff --git a/include/tcg/tcg-opc.h b/include/tcg/tcg-opc.h index 040f4da835..ebb23347e9 100644 --- a/include/tcg/tcg-opc.h +++ b/include/tcg/tcg-opc.h @@ -57,6 +57,7 @@ DEF(not, 1, 1, 0, TCG_OPF_INT) DEF(or, 1, 2, 0, TCG_OPF_INT) DEF(orc, 1, 2, 0, TCG_OPF_INT) DEF(rems, 1, 2, 0, TCG_OPF_INT) +DEF(remu, 1, 2, 0, TCG_OPF_INT) DEF(sub, 1, 2, 0, TCG_OPF_INT) DEF(xor, 1, 2, 0, TCG_OPF_INT) @@ -72,8 +73,6 @@ DEF(ld_i32, 1, 1, 1, 0) DEF(st8_i32, 0, 2, 1, 0) DEF(st16_i32, 0, 2, 1, 0) DEF(st_i32, 0, 2, 1, 0) -/* arith */ -DEF(remu_i32, 1, 2, 0, 0) /* shifts/rotates */ DEF(shl_i32, 1, 2, 0, 0) DEF(shr_i32, 1, 2, 0, 0) @@ -115,8 +114,6 @@ DEF(st8_i64, 0, 2, 1, 0) DEF(st16_i64, 0, 2, 1, 0) DEF(st32_i64, 0, 2, 1, 0) DEF(st_i64, 0, 2, 1, 0) -/* arith */ -DEF(remu_i64, 1, 2, 0, 0) /* shifts/rotates */ DEF(shl_i64, 1, 2, 0, 0) DEF(shr_i64, 1, 2, 0, 0) diff --git a/tcg/optimize.c b/tcg/optimize.c index 01ec365175..69f9ba1555 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -575,9 +575,10 @@ static uint64_t do_constant_folding_2(TCGOpcode op, TCGType type, } return (int64_t)x % ((int64_t)y ? : 1); - case INDEX_op_remu_i32: - return (uint32_t)x % ((uint32_t)y ? : 1); - case INDEX_op_remu_i64: + case INDEX_op_remu: + if (type == TCG_TYPE_I32) { + return (uint32_t)x % ((uint32_t)y ? : 1); + } return (uint64_t)x % ((uint64_t)y ? : 1); default: @@ -3024,7 +3025,7 @@ void tcg_optimize(TCGContext *s) done = fold_qemu_st(&ctx, op); break; case INDEX_op_rems: - CASE_OP_32_64(remu): + case INDEX_op_remu: done = fold_remainder(&ctx, op); break; CASE_OP_32_64(rotl): diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index 4ff6c9f0ab..0f1e83a49f 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -649,8 +649,8 @@ void tcg_gen_divu_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2) void tcg_gen_remu_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2) { - if (tcg_op_supported(INDEX_op_remu_i32, TCG_TYPE_I32, 0)) { - tcg_gen_op3_i32(INDEX_op_remu_i32, ret, arg1, arg2); + if (tcg_op_supported(INDEX_op_remu, TCG_TYPE_I32, 0)) { + tcg_gen_op3_i32(INDEX_op_remu, ret, arg1, arg2); } else if (tcg_op_supported(INDEX_op_divu, TCG_TYPE_I32, 0)) { TCGv_i32 t0 = tcg_temp_ebb_new_i32(); tcg_gen_op3_i32(INDEX_op_divu, t0, arg1, arg2); @@ -2017,8 +2017,8 @@ void tcg_gen_divu_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2) void tcg_gen_remu_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2) { - if (tcg_op_supported(INDEX_op_remu_i64, TCG_TYPE_I64, 0)) { - tcg_gen_op3_i64(INDEX_op_remu_i64, ret, arg1, arg2); + if (tcg_op_supported(INDEX_op_remu, TCG_TYPE_I64, 0)) { + tcg_gen_op3_i64(INDEX_op_remu, ret, arg1, arg2); } else if (tcg_op_supported(INDEX_op_divu, TCG_TYPE_I64, 0)) { TCGv_i64 t0 = tcg_temp_ebb_new_i64(); tcg_gen_op3_i64(INDEX_op_divu, t0, arg1, arg2); diff --git a/tcg/tcg.c b/tcg/tcg.c index 537b665d07..cd89ef1faa 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -1041,8 +1041,7 @@ static const TCGOutOp * const all_outop[NB_OPS] = { OUTOP(INDEX_op_or, TCGOutOpBinary, outop_or), OUTOP(INDEX_op_orc, TCGOutOpBinary, outop_orc), OUTOP(INDEX_op_rems, TCGOutOpBinary, outop_rems), - OUTOP(INDEX_op_remu_i32, TCGOutOpBinary, outop_remu), - OUTOP(INDEX_op_remu_i64, TCGOutOpBinary, outop_remu), + OUTOP(INDEX_op_remu, TCGOutOpBinary, outop_remu), OUTOP(INDEX_op_sub, TCGOutOpSubtract, outop_sub), OUTOP(INDEX_op_xor, TCGOutOpBinary, outop_xor), }; @@ -5423,8 +5422,7 @@ static void tcg_reg_alloc_op(TCGContext *s, const TCGOp *op) case INDEX_op_or: case INDEX_op_orc: case INDEX_op_rems: - case INDEX_op_remu_i32: - case INDEX_op_remu_i64: + case INDEX_op_remu: case INDEX_op_xor: { const TCGOutOpBinary *out = diff --git a/tcg/tci.c b/tcg/tci.c index bd5817a382..5d2cba4941 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -732,7 +732,7 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState *env, tci_args_rrr(insn, &r0, &r1, &r2); regs[r0] = (int64_t)regs[r1] % (int64_t)regs[r2]; break; - case INDEX_op_remu_i64: + case INDEX_op_remu: tci_args_rrr(insn, &r0, &r1, &r2); regs[r0] = (uint64_t)regs[r1] % (uint64_t)regs[r2]; break; @@ -1080,9 +1080,9 @@ int print_insn_tci(bfd_vma addr, disassemble_info *info) case INDEX_op_or: case INDEX_op_orc: case INDEX_op_rems: + case INDEX_op_remu: case INDEX_op_sub: case INDEX_op_xor: - case INDEX_op_remu_i64: case INDEX_op_shl_i32: case INDEX_op_shl_i64: case INDEX_op_shr_i32: diff --git a/docs/devel/tcg-ops.rst b/docs/devel/tcg-ops.rst index 1f4160a585..bceecb0596 100644 --- a/docs/devel/tcg-ops.rst +++ b/docs/devel/tcg-ops.rst @@ -292,7 +292,7 @@ Arithmetic - | *t0* = *t1* % *t2* (signed) | Undefined behavior if division by zero or overflow. - * - remu_i32/i64 *t0*, *t1*, *t2* + * - remu *t0*, *t1*, *t2* - | *t0* = *t1* % *t2* (unsigned) | Undefined behavior if division by zero. diff --git a/tcg/tci/tcg-target.c.inc b/tcg/tci/tcg-target.c.inc index 421a2a8ac7..eb30fd04ba 100644 --- a/tcg/tci/tcg-target.c.inc +++ b/tcg/tci/tcg-target.c.inc @@ -769,7 +769,7 @@ static void tgen_remu(TCGContext *s, TCGType type, { TCGOpcode opc = (type == TCG_TYPE_I32 ? INDEX_op_tci_remu32 - : INDEX_op_remu_i64); + : INDEX_op_remu); tcg_out_op_rrr(s, opc, a0, a1, a2); }