From patchwork Tue Apr 15 19:23:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 881252 Delivered-To: patch@linaro.org Received: by 2002:adf:f902:0:b0:38f:210b:807b with SMTP id b2csp628730wrr; Tue, 15 Apr 2025 12:42:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWmbC2CtPOLOamadOrlsDBCdQAq0CR5ImIGqu6lqNYftiQaJpLS2giBVe3rGUGK6m+kVtA1dg==@linaro.org X-Google-Smtp-Source: AGHT+IGhdgE8P25ClaVmf0+HO24bdSKRSfu547FPHi0H8hZ5KtQBEZsQ3hm0FDwnHoWaEobgGcEL X-Received: by 2002:a05:620a:27d3:b0:7c5:6375:1459 with SMTP id af79cd13be357-7c914292a7amr124997985a.55.1744746170808; Tue, 15 Apr 2025 12:42:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744746170; cv=none; d=google.com; s=arc-20240605; b=f60eZWqsIOAn+MfSjHXBVyzZcMePIueLMBFfpLwR5FjfVElWdRiXKVpB9qeuyqR6++ ZUyZzzUAFC/Xb65/JulLTSRBR2JDwTEXuXBdCSIbyG634tQgsBsKQKr86OJdmaroKKQX Abty4luVysdrYzifFI/OuOLs23zDJF6gyTSrqj2eSAMW3HHvzD7griREFKGCqDNvUtE9 e0owBCRCblKQO7QPTNVAkVdyrBBukqp+6HpzyhhxVbRdPlPBKtDLt851aXVKxNeblhcb yQcRdF5IReY3GIPqN7x1yfp43xuPyRBodHl7U+aPe5oDnIsJMms2BfS05FPXDHWLiWGv Xo/g== 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:to:from :dkim-signature; bh=VRmUCU5RGiT0RevU+cyFtfo5uoiRRSh4+rYYpOPsRow=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=KFnQZHvkiqktk2uGnn2dlKe41D0hnBmC83MvM/NzitqaRiZSBIBNWUkAy4HOMWByj0 bynZyuFKtZWjHLgx1BfvkIqMCanhHUp4gh8v0I9ZsKyUfUmZenWtl+FAPQ83/1Wm5HSA 0yKG6Cr3uW0ISpaQ0SvZtTpVESUlddktkmarNcQTj7x7Cs3XrdrQTAnFI84mo952HnHl ayLZoYVF99IrrFH5hfwJMF4eXZ6XzeSERuqI8xDogu9MxXYMw3IsyizDm1DWVdLPGDWV XiviY56sW/BRZOvElfT8DUd+4ywxNBnq+NIvdM9w+H0xLVpHbubp/6+urZxGLe2IsPaa l06w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PAlYl+tf; 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-7c7a89f4946si1131506085a.237.2025.04.15.12.42.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 Apr 2025 12:42:50 -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=PAlYl+tf; 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 1u4m57-0007W0-Kr; Tue, 15 Apr 2025 15:36:37 -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 1u4lzL-0000Gw-QW for qemu-devel@nongnu.org; Tue, 15 Apr 2025 15:30:32 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u4lyC-0000vJ-5g for qemu-devel@nongnu.org; Tue, 15 Apr 2025 15:30:30 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-227b650504fso59354195ad.0 for ; Tue, 15 Apr 2025 12:29:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744745358; x=1745350158; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=VRmUCU5RGiT0RevU+cyFtfo5uoiRRSh4+rYYpOPsRow=; b=PAlYl+tfcKwBtg0jEmJKQ75xxtw0pZ/1zuNEBEM/LGB6uPhL9w2vzc9Mw7xtgC88vI r7FtouPTbsLnWRqlcfq6JqgfjSXFXmDty4Ui12HyjRgaBPC/hf6uWXMT219Jww+Lz9w/ YChxnRzG3TUjTnYrDAmIJ0GTZ5aZZnR3OG0olR6kPxOGQ5rA8sbsDD1Bsnr6nQkYIrMV HU6f7TbxAyc9KCv7HO0xPfUm2DpAP1Y2+SCbEWhc/y9jDV2RHwiek6uEczLYRKUMRaSI 9+AFf8JgRtXrqYYaw+U6QqLkftz38SJw2K68S+DPWFcLFsO2F249utXONxzLcjzrt+sM nAOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744745358; x=1745350158; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VRmUCU5RGiT0RevU+cyFtfo5uoiRRSh4+rYYpOPsRow=; b=o/wWxGhPnnkEPmrHrKQPMm48GsX9Yd1/yAaoxHp+GPUHyl+xPw1OoEZZ+ioOb7+tHm wDFQS/uTUJvpv/xl7uea4f2KcjJKC4EWv/3kpEa92FuB4PCn2ELIItAmMxoAWmGFGbqX UTM5fMjkzeD8YUPiLxHZ46m7MOU7h6x30YlY0ssYQstECxd6IxxBx6joDNQ86CZXhsnb CySOJFMPNox9dbxK4UOzQj4ZjjinsRA//zgJe5oi6yDBV4DhOIKkcylc6t/kJLkIwnM3 hcV0M4d4ii8l8ThvY3Ff6buhaJ8eiyqHriWenhZ2EUyoHZ1Wvhrv3/Hn0ucxqU2kGHcG ZMaQ== X-Gm-Message-State: AOJu0Yz24VnDNNlD6pm6pTehna1ZNF/45UFiacBfvYOGg711o5KNYiPA KS1Ctfx1sHJ2dyP8he5xvjnZXim4mthYpi44qF9WVVWKMfpYfxjhiuf7aS9yf3a7icse2YkLfUg + X-Gm-Gg: ASbGncu8DWZztzsGCZ8CJfutJX6K3tSUVxRibETuwXki8yLkSP4G0SJDPSMSbblEYr5 GS/ZIhhvEnQdznphwxL8G/NpOiQtK9mzPxt0ba8zEc4pkYiqGGgNx5daKW3jNgsaVghZKt/sQ2h q7jt7lQxbtWjoyeKvhKXcS+1drJdph8RhPEzxHN/rwMBQNRWV4EejFL+TiY71ThxKjqZJpYgKXf bLtc4UpQQQ/zGXyin/2tyPJB6HiQLdniCndGLKWRrO71MbzR01lN4+BHBZbEF4OuuvqBljDZtb1 1c3qsCW4OEzJRnSA59Uz/ipuMQVbojFIJGsUdZv3wK8f22Pgtmh1PxMX8G4rJVPlzMJ+90e0jM0 = X-Received: by 2002:a17:902:ef44:b0:223:6657:5008 with SMTP id d9443c01a7336-22c31a49b33mr6386005ad.24.1744745358088; Tue, 15 Apr 2025 12:29:18 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-306df06a165sm13534812a91.4.2025.04.15.12.29.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Apr 2025 12:29:17 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 072/163] tcg/loongarch64: Support negsetcond Date: Tue, 15 Apr 2025 12:23:43 -0700 Message-ID: <20250415192515.232910-73-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::62d; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62d.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 Signed-off-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- tcg/loongarch64/tcg-target-con-set.h | 2 -- tcg/loongarch64/tcg-target-has.h | 4 ++-- tcg/loongarch64/tcg-target.c.inc | 34 ++++++++++++++++++++++------ 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/tcg/loongarch64/tcg-target-con-set.h b/tcg/loongarch64/tcg-target-con-set.h index da84e4d49c..c145d4ab66 100644 --- a/tcg/loongarch64/tcg-target-con-set.h +++ b/tcg/loongarch64/tcg-target-con-set.h @@ -29,8 +29,6 @@ C_O1_I2(r, r, rJ) C_O1_I2(r, r, rU) C_O1_I2(r, r, rW) C_O1_I2(r, 0, rz) -C_O1_I2(r, rz, ri) -C_O1_I2(r, rz, rJ) C_O1_I2(w, w, w) C_O1_I2(w, w, wM) C_O1_I2(w, w, wA) diff --git a/tcg/loongarch64/tcg-target-has.h b/tcg/loongarch64/tcg-target-has.h index 12a721b4da..e9bb913961 100644 --- a/tcg/loongarch64/tcg-target-has.h +++ b/tcg/loongarch64/tcg-target-has.h @@ -10,7 +10,7 @@ #include "host/cpuinfo.h" /* optional instructions */ -#define TCG_TARGET_HAS_negsetcond_i32 0 +#define TCG_TARGET_HAS_negsetcond_i32 1 #define TCG_TARGET_HAS_extract2_i32 0 #define TCG_TARGET_HAS_add2_i32 0 #define TCG_TARGET_HAS_sub2_i32 0 @@ -19,7 +19,7 @@ #define TCG_TARGET_HAS_qemu_st8_i32 0 /* 64-bit operations */ -#define TCG_TARGET_HAS_negsetcond_i64 0 +#define TCG_TARGET_HAS_negsetcond_i64 1 #define TCG_TARGET_HAS_extract2_i64 0 #define TCG_TARGET_HAS_extr_i64_i32 1 #define TCG_TARGET_HAS_bswap16_i64 1 diff --git a/tcg/loongarch64/tcg-target.c.inc b/tcg/loongarch64/tcg-target.c.inc index aed1d9712d..c4f908f3ae 100644 --- a/tcg/loongarch64/tcg-target.c.inc +++ b/tcg/loongarch64/tcg-target.c.inc @@ -634,14 +634,29 @@ static int tcg_out_setcond_int(TCGContext *s, TCGCond cond, TCGReg ret, } static void tcg_out_setcond(TCGContext *s, TCGCond cond, TCGReg ret, - TCGReg arg1, tcg_target_long arg2, bool c2) + TCGReg arg1, tcg_target_long arg2, + bool c2, bool neg) { int tmpflags = tcg_out_setcond_int(s, cond, ret, arg1, arg2, c2); + TCGReg tmp = tmpflags & ~SETCOND_FLAGS; - if (tmpflags != ret) { - TCGReg tmp = tmpflags & ~SETCOND_FLAGS; - + if (neg) { + /* If intermediate result is zero/non-zero: test != 0. */ + if (tmpflags & SETCOND_NEZ) { + tcg_out_opc_sltu(s, ret, TCG_REG_ZERO, tmp); + tmp = ret; + } + /* Produce the 0/-1 result. */ + if (tmpflags & SETCOND_INV) { + tcg_out_opc_addi_d(s, ret, tmp, -1); + } else { + tcg_out_opc_sub_d(s, ret, TCG_REG_ZERO, tmp); + } + } else { switch (tmpflags & SETCOND_FLAGS) { + case 0: + tcg_debug_assert(tmp == ret); + break; case SETCOND_INV: /* Intermediate result is boolean: simply invert. */ tcg_out_opc_xori(s, ret, tmp, 1); @@ -1788,7 +1803,11 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, TCGType type, case INDEX_op_setcond_i32: case INDEX_op_setcond_i64: - tcg_out_setcond(s, args[3], a0, a1, a2, c2); + tcg_out_setcond(s, args[3], a0, a1, a2, c2, false); + break; + case INDEX_op_negsetcond_i32: + case INDEX_op_negsetcond_i64: + tcg_out_setcond(s, args[3], a0, a1, a2, c2, true); break; case INDEX_op_movcond_i32: @@ -2428,9 +2447,10 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsigned flags) return C_O1_I2(r, 0, rz); case INDEX_op_setcond_i32: - return C_O1_I2(r, rz, ri); case INDEX_op_setcond_i64: - return C_O1_I2(r, rz, rJ); + case INDEX_op_negsetcond_i32: + case INDEX_op_negsetcond_i64: + return C_O1_I2(r, r, rJ); case INDEX_op_movcond_i32: case INDEX_op_movcond_i64: