From patchwork Sat Feb 1 16:40:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 861272 Delivered-To: patch@linaro.org Received: by 2002:adf:fb05:0:b0:385:e875:8a9e with SMTP id c5csp1264542wrr; Sat, 1 Feb 2025 08:48:18 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVulcbio1q9v1rC1cAhfd6oURFrmRn5v1XrEzWKylRb4nPKxWLoNZ3OBPkGKhpTaEQT+1Twyw==@linaro.org X-Google-Smtp-Source: AGHT+IHnzqB0T0eXJgf7q2CC/fHnY+f3o63aYJXCBe5lwZ9ldeN2otnrvdtHJnOitr0DALRda7iy X-Received: by 2002:a05:622a:1306:b0:467:6941:4ecc with SMTP id d75a77b69052e-46fd0b6af4bmr236890321cf.39.1738428498464; Sat, 01 Feb 2025 08:48:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1738428498; cv=none; d=google.com; s=arc-20240605; b=khHbOr/X77m4XQPnnI7JGUuelzLT0EcR6ooq3Iu9m/0DSlViR05U2QGlDu8DUt85ZC EQTv4A9w0ipMATh2jl/3hvzKOu6E1kdwriuh5gXCUvzOqg81Q8aBe6qaUvvqECyBDIs1 R/Zab6KIqslzyELmt9e3C9r61aY0D+8H2GwlVG9iSOdJ1DIJGhv01xt2IDScRdsLThjc nZWNRvhkyROgz4yFFAs1vLZcIBdLPrZlIKg0h6iAfxcGj3HPMsBdV5veMqrAyQoc206l JZQpaOsNtXMXZ12tkOWNNT6QfezqTCTo7hZcCiu6xypEd9Z5jdePFcQP3KpdRFcJjFp1 X8EA== 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=KL1yU7FzWgomIFAJcktx8UQOLZ+TTPy9vMWFLlf6FpA=; fh=1IzXedy8q4klW07nr+ZpldGIlBFlgkQxI17LZzuHNOw=; b=KYtXOPpHFO2zjy132KYLWZgjTWgMj36txguLYge4xm6E8uvRLgbC9g5oQrOb+wTo8Z dcz7qbw2YX7vYWgpcwZJOAoxAllg0qhL4c+58TqknLiqkDPLls4dH3cAjKTmUndL5Mmf 3A28fw4xvUPuTFz2/3PE5VRglGILJ0CINH4qiL/3VPegf3m72p1nWDKfQJ8sKQ/IyrTN nd0Dz47F0Pq2h/bc/ZfQxAiWrY4PUz6XvL2rRo07FlIiQydJDpCT7zuPuz3ufacCbdjj eTxJU25O7V3nqZ1BzuZmtsZitMRalGoFAgkrgkAnbn3Ru3DzXq/KeAG6kSxpV/XIaB5M 2uGg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xN61iEnD; 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-46fdf0aac7csi61492791cf.45.2025.02.01.08.48.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 01 Feb 2025 08:48:18 -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=xN61iEnD; 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 1teGZC-0000iu-L7; Sat, 01 Feb 2025 11:41:58 -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 1teGYs-0007Vw-6R for qemu-devel@nongnu.org; Sat, 01 Feb 2025 11:41:41 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1teGYq-0001NM-3X for qemu-devel@nongnu.org; Sat, 01 Feb 2025 11:41:37 -0500 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-385d7b4da2bso2705356f8f.1 for ; Sat, 01 Feb 2025 08:41:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738428095; x=1739032895; 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=KL1yU7FzWgomIFAJcktx8UQOLZ+TTPy9vMWFLlf6FpA=; b=xN61iEnD2RGjm2ORGrTUdPcxTuaFC+roa7J6lkat8N2OSCSqjxubyl3eBJgspHVWvv Uc8cddOX0fTtVtXAaxcI0fAiqFtIReqw8xMhD5vDTbWsT4i5IdPK1DpdknjNSbrtpMZL 54/LfNxQfh2Oyajt3dfK4kdG67iFw2hdn3egj8fPVXVKyuYvfEilypLPbYUjyIwITqDk hoQ6SKTINEk9CLWFAmahBZl/PfhQAMDg54Hnt5K8LrswjyWP7U5uqHkb4QKYx91nbfPG LYvCux9zrjoi5IUL3aqRrkaorplnBcosiTROh3OIG7ll/Oodf1DF72NWvjnseYROM01o h+jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738428095; x=1739032895; 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=KL1yU7FzWgomIFAJcktx8UQOLZ+TTPy9vMWFLlf6FpA=; b=BpjqeGr/uSn6Fti1jXbb55k+sZCGO2iZQdDCFZ8WgGQScQoUFVpsMU7jAUwBusu5JE YDdznO7IAVjhy8I4jUYaBOCTV31izXUDZhN7X9s3FTJIyXmnRVKTuYKcKEP1GptAs3q/ /41lmHRCfiQnYtcC7kPpeanc23lEbiR2mywg5XcJd74eAzIAsHBaigQcqpnbBHnsFLfP hYJpJKc4EfRn6h87eXpRdCcZnJWsspOCSNeaLfTdyNdHp7sO+aN1Q6cmubuPb2IvIALB 7GkA+HPzGywvbdw4xhZE2EenMiUeSVQVLqTo81bJ9YECno+EyrZz3u53EM48FzpcS4RF Bfzw== X-Forwarded-Encrypted: i=1; AJvYcCVtqrgSwiJ1Rx6Ae4aTMAMaxrv7bhaWU/WGh9AXccSdPg1dgJR0gMkUUFlErT8CDYElipRcW2gvlNMI@nongnu.org X-Gm-Message-State: AOJu0Yw+X78NYGHxW5lA7NfqDx2srLl8VqJNZRHAJ883Qfrt3b50NR7S 8Bw4E2YFrNcW0tzoqtTLgnlXpwBE/Oc97+UZ/fVPodH/KBQD7bYJjJChRhvUhxU= X-Gm-Gg: ASbGnctCZITP5lhDJxJ2R91js8pAI8rou9VhBTVP/3SG9wHMRkZhZgfMFbpOZ4S1PN9 cYCvIowkgmZsUxdgGvgucwrF3RGknIi5jFQMDU6U43S7d+8sF5HpPPtBXf0yAWEb6sPyvSA7aao sg5Ff3toZ18xuSvaBwWb4SP9yh1gC5D7+TM5smRwjy4OQQmUsYI9csJ2t5MZ3SJUc0suZ9/VvQ4 H3b8K8sfyJVsCGogGSaQfjSpazlchZ2RVf+Pmv4yq/7WAUlUTbkoBe8e7bofVMt3DRmnvnqKwz0 Ph2iqfkjX4T6nwMyOSUw X-Received: by 2002:a05:6000:154e:b0:385:e9de:d521 with SMTP id ffacd0b85a97d-38c519395bamr14473850f8f.8.1738428094688; Sat, 01 Feb 2025 08:41:34 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-438dcc81d74sm127401525e9.37.2025.02.01.08.41.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2025 08:41:34 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH v2 63/69] target/arm: Remove fp_status_f16_a32 Date: Sat, 1 Feb 2025 16:40:06 +0000 Message-Id: <20250201164012.1660228-64-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250201164012.1660228-1-peter.maydell@linaro.org> References: <20250201164012.1660228-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42b.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=unavailable 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 From: Richard Henderson Replace with fp_status[FPST_A32_F16]. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-id: 20250129013857.135256-13-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/cpu.h | 1 - target/arm/cpu.c | 2 +- target/arm/tcg/vec_helper.c | 4 ++-- target/arm/vfp_helper.c | 14 +++++++------- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 9e39c8d0d3a..06dbee57259 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -692,7 +692,6 @@ typedef struct CPUArchState { struct { float_status fp_status_a32; float_status fp_status_a64; - float_status fp_status_f16_a32; }; }; diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 4fc1d00d60f..ceb2dcb3fb9 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -553,7 +553,7 @@ static void arm_cpu_reset_hold(Object *obj, ResetType type) arm_set_default_fp_behaviours(&env->vfp.fp_status_a32); arm_set_default_fp_behaviours(&env->vfp.fp_status_a64); arm_set_default_fp_behaviours(&env->vfp.fp_status[FPST_STD]); - arm_set_default_fp_behaviours(&env->vfp.fp_status_f16_a32); + arm_set_default_fp_behaviours(&env->vfp.fp_status[FPST_A32_F16]); arm_set_default_fp_behaviours(&env->vfp.fp_status[FPST_A64_F16]); arm_set_default_fp_behaviours(&env->vfp.fp_status[FPST_STD_F16]); arm_set_ah_fp_behaviours(&env->vfp.fp_status[FPST_AH]); diff --git a/target/arm/tcg/vec_helper.c b/target/arm/tcg/vec_helper.c index 48dbd8bdd23..78f14503f49 100644 --- a/target/arm/tcg/vec_helper.c +++ b/target/arm/tcg/vec_helper.c @@ -2155,7 +2155,7 @@ void HELPER(gvec_fmlal_a32)(void *vd, void *vn, void *vm, uint64_t negx = is_s ? 0x8000800080008000ull : 0; do_fmlal(vd, vn, vm, &env->vfp.fp_status[FPST_STD], negx, 0, desc, - get_flush_inputs_to_zero(&env->vfp.fp_status_f16_a32)); + get_flush_inputs_to_zero(&env->vfp.fp_status[FPST_A32_F16])); } void HELPER(gvec_fmlal_a64)(void *vd, void *vn, void *vm, @@ -2236,7 +2236,7 @@ void HELPER(gvec_fmlal_idx_a32)(void *vd, void *vn, void *vm, uint64_t negx = is_s ? 0x8000800080008000ull : 0; do_fmlal_idx(vd, vn, vm, &env->vfp.fp_status[FPST_STD], negx, 0, desc, - get_flush_inputs_to_zero(&env->vfp.fp_status_f16_a32)); + get_flush_inputs_to_zero(&env->vfp.fp_status[FPST_A32_F16])); } void HELPER(gvec_fmlal_idx_a64)(void *vd, void *vn, void *vm, diff --git a/target/arm/vfp_helper.c b/target/arm/vfp_helper.c index 6f7ca617936..e6e14bfd646 100644 --- a/target/arm/vfp_helper.c +++ b/target/arm/vfp_helper.c @@ -120,7 +120,7 @@ static uint32_t vfp_get_fpsr_from_host(CPUARMState *env) a32_flags |= get_float_exception_flags(&env->vfp.fp_status_a32); a32_flags |= get_float_exception_flags(&env->vfp.fp_status[FPST_STD]); /* FZ16 does not generate an input denormal exception. */ - a32_flags |= (get_float_exception_flags(&env->vfp.fp_status_f16_a32) + a32_flags |= (get_float_exception_flags(&env->vfp.fp_status[FPST_A32_F16]) & ~float_flag_input_denormal_flushed); a32_flags |= (get_float_exception_flags(&env->vfp.fp_status[FPST_STD_F16]) & ~float_flag_input_denormal_flushed); @@ -157,7 +157,7 @@ static void vfp_clear_float_status_exc_flags(CPUARMState *env) */ set_float_exception_flags(0, &env->vfp.fp_status_a32); set_float_exception_flags(0, &env->vfp.fp_status_a64); - set_float_exception_flags(0, &env->vfp.fp_status_f16_a32); + set_float_exception_flags(0, &env->vfp.fp_status[FPST_A32_F16]); set_float_exception_flags(0, &env->vfp.fp_status[FPST_A64_F16]); set_float_exception_flags(0, &env->vfp.fp_status[FPST_STD]); set_float_exception_flags(0, &env->vfp.fp_status[FPST_STD_F16]); @@ -200,16 +200,16 @@ static void vfp_set_fpcr_to_host(CPUARMState *env, uint32_t val, uint32_t mask) } set_float_rounding_mode(i, &env->vfp.fp_status_a32); set_float_rounding_mode(i, &env->vfp.fp_status_a64); - set_float_rounding_mode(i, &env->vfp.fp_status_f16_a32); + set_float_rounding_mode(i, &env->vfp.fp_status[FPST_A32_F16]); set_float_rounding_mode(i, &env->vfp.fp_status[FPST_A64_F16]); } if (changed & FPCR_FZ16) { bool ftz_enabled = val & FPCR_FZ16; - set_flush_to_zero(ftz_enabled, &env->vfp.fp_status_f16_a32); + set_flush_to_zero(ftz_enabled, &env->vfp.fp_status[FPST_A32_F16]); set_flush_to_zero(ftz_enabled, &env->vfp.fp_status[FPST_A64_F16]); set_flush_to_zero(ftz_enabled, &env->vfp.fp_status[FPST_STD_F16]); set_flush_to_zero(ftz_enabled, &env->vfp.fp_status[FPST_AH_F16]); - set_flush_inputs_to_zero(ftz_enabled, &env->vfp.fp_status_f16_a32); + set_flush_inputs_to_zero(ftz_enabled, &env->vfp.fp_status[FPST_A32_F16]); set_flush_inputs_to_zero(ftz_enabled, &env->vfp.fp_status[FPST_A64_F16]); set_flush_inputs_to_zero(ftz_enabled, &env->vfp.fp_status[FPST_STD_F16]); set_flush_inputs_to_zero(ftz_enabled, &env->vfp.fp_status[FPST_AH_F16]); @@ -234,7 +234,7 @@ static void vfp_set_fpcr_to_host(CPUARMState *env, uint32_t val, uint32_t mask) bool dnan_enabled = val & FPCR_DN; set_default_nan_mode(dnan_enabled, &env->vfp.fp_status_a32); set_default_nan_mode(dnan_enabled, &env->vfp.fp_status_a64); - set_default_nan_mode(dnan_enabled, &env->vfp.fp_status_f16_a32); + set_default_nan_mode(dnan_enabled, &env->vfp.fp_status[FPST_A32_F16]); set_default_nan_mode(dnan_enabled, &env->vfp.fp_status[FPST_A64_F16]); set_default_nan_mode(dnan_enabled, &env->vfp.fp_status[FPST_AH]); set_default_nan_mode(dnan_enabled, &env->vfp.fp_status[FPST_AH_F16]); @@ -496,7 +496,7 @@ void VFP_HELPER(cmpe, P)(ARGTYPE a, ARGTYPE b, CPUARMState *env) \ softfloat_to_vfp_compare(env, \ FLOATTYPE ## _compare(a, b, &env->vfp.FPST)); \ } -DO_VFP_cmp(h, float16, dh_ctype_f16, fp_status_f16_a32) +DO_VFP_cmp(h, float16, dh_ctype_f16, fp_status[FPST_A32_F16]) DO_VFP_cmp(s, float32, float32, fp_status_a32) DO_VFP_cmp(d, float64, float64, fp_status_a32) #undef DO_VFP_cmp