From patchwork Sun Feb 16 00:01:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 865529 Delivered-To: patch@linaro.org Received: by 2002:a5d:64e6:0:b0:38f:210b:807b with SMTP id g6csp519928wri; Sat, 15 Feb 2025 16:04:39 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXe977WqEOuuLiAAdud5TXXzvweaUmtn7X2AKIwkX6rmuJ1IjwBlMlfatsrafDuzDs1AUqq/g==@linaro.org X-Google-Smtp-Source: AGHT+IEOB80LF1xscLRzX0f+61e/N1b8WbYhF9P0GdkzjFTZnBtgVSTEtYmDHONkbkmz5+ReLVMW X-Received: by 2002:a05:620a:444b:b0:7c0:82cb:f430 with SMTP id af79cd13be357-7c08a9ce7bdmr595908085a.27.1739664279419; Sat, 15 Feb 2025 16:04:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739664279; cv=none; d=google.com; s=arc-20240605; b=QlJAuM3R/R7AeWP77PGL/olQwt8JCTCV72uwVH7fNzZ1KrcR7ygFaEOcF79tEyBcaC 3MBArElw2HZ5mb0o1st2VTCFBVa6odzyf/vfjKJgfAI3oWeuFema/c9zuRcXd53HH42f BjdKPBUkQl3+44wXuaNmccNtutbyOtqQ+YpzwD/EBMXUI383pOniX7ygDAaLAKA9mk1l 7WoQiJRlg8jTpLrU0AhYgAbgI200UmayCz5MDkK8UiDZfN0gwSnuAWrDIP0vOn2XIEzD 0z94JU7UnsxgSdOplBRR4juZhuA+objF4S4mhTGxNfC1BpRuYkNK8JCRzdUtIaiCdpR1 6hMQ== 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=dPHXMTVD2Fm2wK5XqhrhS+/8+R7tQQXD2orYSrUxi/8=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=LXP34mu31q6axCgMjyEm3tYP0ow8uoEICAkDpmZL+yV/JACmyK2Znj2xqWaNmkbzoi aP7c/UndcGDEARkH3rKUr7ceCk9b3UTWGiLvY8s6TfiVNrAi5JoUjI+1zJfy5mhPqVT8 /jYfWEarPoMT2DC+mAZjLDTJNknOjSjmSaVq9Oym1bepjbRszqqrN8/8zuQaavxCqBiJ +UfUR9VtABzFbXXXoWz+p7zw/7lodCEj19lue0FZgMQPuNpd8H7czR7VywtW8GO9aCZ3 JORiQpOeIbxfKVIBvg6nal8rJaJECsDERIG9vScFLTei6pnG006Wlxgm968RLfkR3FDH Llyg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SSliZYsm; 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-7c07c623c26si613626285a.77.2025.02.15.16.04.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 15 Feb 2025 16:04:39 -0800 (PST) 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=SSliZYsm; 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 1tjS6M-0007gN-RT; Sat, 15 Feb 2025 19:01:38 -0500 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 1tjS6K-0007eG-2A for qemu-devel@nongnu.org; Sat, 15 Feb 2025 19:01:36 -0500 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tjS6A-0006Hi-7f for qemu-devel@nongnu.org; Sat, 15 Feb 2025 19:01:35 -0500 Received: by mail-pj1-x102b.google.com with SMTP id 98e67ed59e1d1-2fbf77b2b64so6026765a91.2 for ; Sat, 15 Feb 2025 16:01:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739664085; x=1740268885; 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=dPHXMTVD2Fm2wK5XqhrhS+/8+R7tQQXD2orYSrUxi/8=; b=SSliZYsm4PpgsrT2Ct9OnDb8QexRroBjEqlbyHBNkLo412um7oUXwMg4a60KfcQ9Bg g/KBW5YZRKBNsrzTDZPes0k4oYY3EI5aIIRSIvAvjFBDqEawEGowSmW4MssCj4jRZMKs 9kBsA/ypAYL9Z4OlASOLYASAbfeBCagmJ3E75lGNemCuLsgLPhICAE+2KAj3iPIYPwtu WlDNMIle15tZLFZQ+o3fgCTPAKRF287S3+A3ZGxF4GzHdp71J12ZFWKjqHB/48SNEu/Q tTuJ407OmF0bFxXxmgDrlUnu4zjevuX78OqSS0a2wB2l58xrl1o5i4vtrhWX9YaRV9HC JCpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739664085; x=1740268885; 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=dPHXMTVD2Fm2wK5XqhrhS+/8+R7tQQXD2orYSrUxi/8=; b=fRNMVGW5LA1ooDIbl+6qK6UL8bF/eTfG9/8Ed22nOEiMPXMGquBbPVullOFVgV0Ivq lKmo5lXuFycKrVlgB3iqKbHiMpFjfHLee+FEH5NTx/BOu2wVu4IamHzhbhLc6qa23+wR iduU1LOQT0dZemONpTDLZXkpy6nxN9NZbJ1Ckgrp6QPvjVogcevPg/aX0vvT9AuVr6WD /nwvgVnr3iTXVHT8fC2WlmPO2qN9fK24M5lJwOpBiUuPLTrstclqFAw9wOdvGM5fHB+L VYMRfasroS8XRCOjZ5Z5A2vvKwum3ADWTl2TRyoulSGMFpS6orduNmixn5wC8aCx2uq1 WzWg== X-Gm-Message-State: AOJu0YwvskuYq5UU36a6eXsG5HgUekLMFUt/d7RZzpqAh8toI8V0NpuJ ggt9RpUgFGL3zapEPWcngJ6uVZhxsaGemh+Fdh17N3bygqNoyEGkwEiGA4E9fItQtNKq0jdey6i c X-Gm-Gg: ASbGnct98sHqA+1mIstuzKwrKVQrFTcgheZeYOiMAQPo+3+woswYOo8kJ0s1LXekVL9 jUcsRKFjBWYqMlhsj8Ca7fVZ6T6C/ml4zOdJjqQlFdBwLlkQUmHhhzq6oLQV943WEzqTrgv+I6i OOmnRFN4HDQb2kqmQvFkPoyzV6LdiitQ424uqTZ2igf2q9xMexf1IlliB4M2ce6j5FKsKOpUr/P rQRNq+nm61rEGMeO8B6HS5B2bVFHFvJTTfjNaytXXVNHOpYoWk5NZx00DfXSUSeMBRnndBzYF36 xC7JlO6eMMGJ4W4uHyP69VSFPx6UfkqPYCbVo50XODWT5DI= X-Received: by 2002:a17:90b:1e0e:b0:2ee:8427:4b02 with SMTP id 98e67ed59e1d1-2fc41049fbfmr6744070a91.28.1739664084884; Sat, 15 Feb 2025 16:01:24 -0800 (PST) Received: from stoup.. (71-212-39-66.tukw.qwest.net. [71.212.39.66]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d5366729sm48960315ad.79.2025.02.15.16.01.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Feb 2025 16:01:24 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 18/24] tcg/riscv: Use 'z' constraint Date: Sat, 15 Feb 2025 16:01:02 -0800 Message-ID: <20250216000109.2606518-19-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250216000109.2606518-1-richard.henderson@linaro.org> References: <20250216000109.2606518-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102b; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102b.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 Replace target-specific 'Z' with generic 'z'. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- tcg/riscv/tcg-target-con-set.h | 10 +++++----- tcg/riscv/tcg-target-con-str.h | 1 - tcg/riscv/tcg-target.c.inc | 28 ++++++++++++---------------- 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/tcg/riscv/tcg-target-con-set.h b/tcg/riscv/tcg-target-con-set.h index 3c4ef44eb0..e92e815491 100644 --- a/tcg/riscv/tcg-target-con-set.h +++ b/tcg/riscv/tcg-target-con-set.h @@ -10,17 +10,17 @@ * tcg-target-con-str.h; the constraint combination is inclusive or. */ C_O0_I1(r) -C_O0_I2(rZ, r) -C_O0_I2(rZ, rZ) +C_O0_I2(rz, r) +C_O0_I2(rz, rz) C_O1_I1(r, r) C_O1_I2(r, r, ri) C_O1_I2(r, r, rI) C_O1_I2(r, r, rJ) -C_O1_I2(r, rZ, rN) -C_O1_I2(r, rZ, rZ) +C_O1_I2(r, rz, rN) +C_O1_I2(r, rz, rz) C_N1_I2(r, r, rM) C_O1_I4(r, r, rI, rM, rM) -C_O2_I4(r, r, rZ, rZ, rM, rM) +C_O2_I4(r, r, rz, rz, rM, rM) C_O0_I2(v, r) C_O1_I1(v, r) C_O1_I1(v, v) diff --git a/tcg/riscv/tcg-target-con-str.h b/tcg/riscv/tcg-target-con-str.h index 089efe96ca..2f9700638c 100644 --- a/tcg/riscv/tcg-target-con-str.h +++ b/tcg/riscv/tcg-target-con-str.h @@ -21,4 +21,3 @@ CONST('K', TCG_CT_CONST_S5) CONST('L', TCG_CT_CONST_CMP_VI) CONST('N', TCG_CT_CONST_N12) CONST('M', TCG_CT_CONST_M12) -CONST('Z', TCG_CT_CONST_ZERO) diff --git a/tcg/riscv/tcg-target.c.inc b/tcg/riscv/tcg-target.c.inc index 689fbea0df..f7e1ca5a56 100644 --- a/tcg/riscv/tcg-target.c.inc +++ b/tcg/riscv/tcg-target.c.inc @@ -112,13 +112,12 @@ static TCGReg tcg_target_call_oarg_reg(TCGCallReturnKind kind, int slot) return TCG_REG_A0 + slot; } -#define TCG_CT_CONST_ZERO 0x100 -#define TCG_CT_CONST_S12 0x200 -#define TCG_CT_CONST_N12 0x400 -#define TCG_CT_CONST_M12 0x800 -#define TCG_CT_CONST_J12 0x1000 -#define TCG_CT_CONST_S5 0x2000 -#define TCG_CT_CONST_CMP_VI 0x4000 +#define TCG_CT_CONST_S12 0x100 +#define TCG_CT_CONST_N12 0x200 +#define TCG_CT_CONST_M12 0x400 +#define TCG_CT_CONST_J12 0x800 +#define TCG_CT_CONST_S5 0x1000 +#define TCG_CT_CONST_CMP_VI 0x2000 #define ALL_GENERAL_REGS MAKE_64BIT_MASK(0, 32) #define ALL_VECTOR_REGS MAKE_64BIT_MASK(32, 32) @@ -391,9 +390,6 @@ static bool tcg_target_const_match(int64_t val, int ct, if (ct & TCG_CT_CONST) { return 1; } - if ((ct & TCG_CT_CONST_ZERO) && val == 0) { - return 1; - } if (type >= TCG_TYPE_V64) { /* Val is replicated by VECE; extract the highest element. */ val >>= (-8 << vece) & 63; @@ -2681,7 +2677,7 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsigned flags) case INDEX_op_st16_i64: case INDEX_op_st32_i64: case INDEX_op_st_i64: - return C_O0_I2(rZ, r); + return C_O0_I2(rz, r); case INDEX_op_add_i32: case INDEX_op_and_i32: @@ -2707,7 +2703,7 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsigned flags) case INDEX_op_sub_i32: case INDEX_op_sub_i64: - return C_O1_I2(r, rZ, rN); + return C_O1_I2(r, rz, rN); case INDEX_op_mul_i32: case INDEX_op_mulsh_i32: @@ -2723,7 +2719,7 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsigned flags) case INDEX_op_divu_i64: case INDEX_op_rem_i64: case INDEX_op_remu_i64: - return C_O1_I2(r, rZ, rZ); + return C_O1_I2(r, rz, rz); case INDEX_op_shl_i32: case INDEX_op_shr_i32: @@ -2745,7 +2741,7 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsigned flags) case INDEX_op_brcond_i32: case INDEX_op_brcond_i64: - return C_O0_I2(rZ, rZ); + return C_O0_I2(rz, rz); case INDEX_op_movcond_i32: case INDEX_op_movcond_i64: @@ -2755,14 +2751,14 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsigned flags) case INDEX_op_add2_i64: case INDEX_op_sub2_i32: case INDEX_op_sub2_i64: - return C_O2_I4(r, r, rZ, rZ, rM, rM); + return C_O2_I4(r, r, rz, rz, rM, rM); case INDEX_op_qemu_ld_i32: case INDEX_op_qemu_ld_i64: return C_O1_I1(r, r); case INDEX_op_qemu_st_i32: case INDEX_op_qemu_st_i64: - return C_O0_I2(rZ, r); + return C_O0_I2(rz, r); case INDEX_op_st_vec: return C_O0_I2(v, r);