From patchwork Mon Feb 17 19:30:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 865944 Delivered-To: patch@linaro.org Received: by 2002:a5d:64e6:0:b0:38f:210b:807b with SMTP id g6csp1251860wri; Mon, 17 Feb 2025 11:32:11 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUIcnozIPLDGksvuoyMK90ysk15UscjKiWQCFgRe4rTHPKXznk88urZbdDZl8Nmm0EXWi5WuQ==@linaro.org X-Google-Smtp-Source: AGHT+IH9FxcTqwM2RG7QO9dgDh9uKwf1qSKUgKv6iUBbSbM0MvBvelNOHXZIhChKSUNMQyYCdyhb X-Received: by 2002:a05:622a:1828:b0:471:ba79:cf31 with SMTP id d75a77b69052e-471dbecc36emr152014941cf.49.1739820730894; Mon, 17 Feb 2025 11:32:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739820730; cv=none; d=google.com; s=arc-20240605; b=JFg7S/eHiE5oy9uYlKkiz60Nwwz+Dt9NrvOKO7ISrTudlE2caTtdHtFx7s9D9paOle OHy+7P1QvcOdBbXniy5sdSe5dPrq4chAbjBwrMXXwJixSVTt6Ne+eD5RHeED3tgqB0wA XCjOXud8QJ+PKBIMRRjB5FP5zf5RuT+fAyG6dUklNVFm/MuQAL8nfncv8bQy6kqiJZ8n IcL4uGU+juh0RxQzzgXDYH09kya+rONs9Ne0OwWpBg4x9VD6sT9agKIp3AZ2mO3jyjtr yEV+Rg8Qm8qQeySEmWSyXRsepyKtMXOyjGUnirSFUiGFREsBqBirtUUXgGlbbZx2gtmn Ck0w== 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=Tq6TRsiiRjeuVQ3qwo9ikZ9Io3/h9WGDFxvUSUnXPT36CahoCyTc2VzuClDrVk+eaa AZWDiuRrymoLN6p/3Ubybh0mh10OGLZVjHuIqrX8j6tbQUMHBjrFfaE1CpGq+79EJbcO AH0CzCHz0kLlJucjc6GZI3y8u4mtxwJXi/D2VKEzU8+Zsve2VPBo2FjPDNSvXuqDgrNC PS7THCuEzP9QLa7w1Y5fFal64drrKCmOjxNoIRSda3FtN50aZSFVMRbU9DAOVVtXaJYP oLQdm1XHDkMqVzSAvygdaTRLRHgSW2Wjr1OkHLeCv7kaRjdnatgy6dW7/sqmwsHIr9p+ u+Dw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iAJZkT0w; 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 d75a77b69052e-471efbfee08si26744881cf.61.2025.02.17.11.32.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 Feb 2025 11:32:10 -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=iAJZkT0w; 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 1tk6qT-0003ub-Ay; Mon, 17 Feb 2025 14:32:00 -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 1tk6p6-0001yR-EV for qemu-devel@nongnu.org; Mon, 17 Feb 2025 14:30:34 -0500 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tk6p2-0008Q6-7N for qemu-devel@nongnu.org; Mon, 17 Feb 2025 14:30:31 -0500 Received: by mail-pj1-x102d.google.com with SMTP id 98e67ed59e1d1-2fc20e0f0ceso5810867a91.3 for ; Mon, 17 Feb 2025 11:30:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739820627; x=1740425427; 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=iAJZkT0wefHgJ6kuXfPS1oHFbbRgiaTlmaVG+um0D3Sj0vfBMYU034ox+84kGdGAWb Smjn3pCOpFbDvVdwnz9v6dSNaZRSFtgwZqTjFnRLXB6R/fOlxvurDph7Q1kJhdhUqtAv NZH50ItEU4RbYjNnBT3zp1AErQ6szrBBH3N3ajqSBjIRqc6Jk7E1qRHWMJBWR2fTHXD0 lX4caTs5sHzRFjQ+/Et2tnXYrW6EBpW0gcsaO5jt3P4UzK9fgu77PHpB7kQqu8cODmHC 0G/neglO+RbzawlIaGKsHTQJI2o9fscNIMAf8SsR/bnyDptWsaNO/09nklYULZrfTx3y EWwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739820627; x=1740425427; 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=ozLs7Y+rBxsktm9FnKuPjfQ4ONer8VRg/C3j/DJle/iW5XN6xWeAc58LnEtpHJtKAv nUrco/KdCbDRZAM/m8S82UU/KV8H9jFs1XJOwTTxTefyq4775sxBr7XTbpA3G9vAqKwJ VCMuMiUSdTRXOUE6ztMhbsSf3KPk+yrTiAYH/CXSGjyEnuxfNVmbdFKefOudrNQZcnwL 7BObj9/CB8Udy5Up+0Fgq3kPDvyjUFepGIfYmVJK5MLQWzJo05KT4fe/IiKAMjRyCdpF Zg3JhEW1ZcDfamBPASmqSCwPpFWo1hQnziWwHzrFIAZjH1/Cz+yRlCE77AYejp0mK+UA hhDw== X-Gm-Message-State: AOJu0YyTuNnaMijJjNRuMYZB+RGRdgcAH8fMq0A8UgnnSb+lNJAzVS9Q d17gf9n7xgCYfO7RNzbbA2bgo897Me4o/R4q2xtFhSPee/Ijz/pyIGH5kOjZy2gzOVrXMoT+/OQ R X-Gm-Gg: ASbGncuoVbv/LN19RstmcXDF3Rx3XkZDPYR2YiwDWC2FoJfzLHjOUD3umUYHsjxlbMd VUqf685Zwc5Vvun34XHsdyCCRQrZbGjX3DtKfBGWGkIVAzIDgGVV4jmbFOGJ1hBoF4dDCWY2DEK 7H6uttX+y7aSl1DfkhVKiv3vZwZxAKUOr9pIQAmD1PVgBlpc3QHNgHA0I55GK4Io3see9dmmunN iFzB23qDhRbdbslhCNdJF2q+RWEP15YDv9PWBSuQhivKdspySD8O2gKLf/byUAQxp6GKsrcn9IO Cgi/jBDg0WIyEUOPS0KHmGfq3c2p3pxo7tANrIpp21Tcjbs= X-Received: by 2002:a05:6a00:1903:b0:725:df1a:285 with SMTP id d2e1a72fcca58-732617c63d2mr16018665b3a.12.1739820626728; Mon, 17 Feb 2025 11:30:26 -0800 (PST) Received: from stoup.. (71-212-39-66.tukw.qwest.net. [71.212.39.66]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7326a38ff76sm4347164b3a.160.2025.02.17.11.30.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 11:30:26 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL v2 19/27] tcg/riscv: Use 'z' constraint Date: Mon, 17 Feb 2025 11:30:00 -0800 Message-ID: <20250217193009.2873875-20-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250217193009.2873875-1-richard.henderson@linaro.org> References: <20250217193009.2873875-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102d; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102d.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);