[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-10.0 16/25] target/arm: Set Float3NaNPropRule explicitly
From: |
Peter Maydell |
Subject: |
[PATCH for-10.0 16/25] target/arm: Set Float3NaNPropRule explicitly |
Date: |
Thu, 28 Nov 2024 10:43:01 +0000 |
Set the Float3NaNPropRule explicitly for Arm, and remove the
ifdef from pickNaNMulAdd().
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
target/arm/cpu.c | 5 +++++
fpu/softfloat-specialize.c.inc | 8 +-------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index ead39793985..c81f6df3fca 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -173,6 +173,10 @@ void arm_register_el_change_hook(ARMCPU *cpu,
ARMELChangeHookFn *hook,
* * tininess-before-rounding
* * 2-input NaN propagation prefers SNaN over QNaN, and then
* operand A over operand B (see FPProcessNaNs() pseudocode)
+ * * 3-input NaN propagation prefers SNaN over QNaN, and then
+ * operand C over A over B (see FPProcessNaNs3() pseudocode,
+ * but note that for QEMU muladd is a * b + c, whereas for
+ * the pseudocode function the arguments are in the order c, a, b.
* * 0 * Inf + NaN returns the default NaN if the input NaN is quiet,
* and the input NaN if it is signalling
*/
@@ -180,6 +184,7 @@ static void arm_set_default_fp_behaviours(float_status *s)
{
set_float_detect_tininess(float_tininess_before_rounding, s);
set_float_2nan_prop_rule(float_2nan_prop_s_ab, s);
+ set_float_3nan_prop_rule(float_3nan_prop_s_cab, s);
set_float_infzeronan_rule(float_infzeronan_dnan_if_qnan, s);
}
diff --git a/fpu/softfloat-specialize.c.inc b/fpu/softfloat-specialize.c.inc
index d7c0c90ea65..9b5243c9529 100644
--- a/fpu/softfloat-specialize.c.inc
+++ b/fpu/softfloat-specialize.c.inc
@@ -502,13 +502,7 @@ static int pickNaNMulAdd(FloatClass a_cls, FloatClass
b_cls, FloatClass c_cls,
}
if (rule == float_3nan_prop_none) {
-#if defined(TARGET_ARM)
- /*
- * This looks different from the ARM ARM pseudocode, because the ARM
ARM
- * puts the operands to a fused mac operation (a*b)+c in the order
c,a,b
- */
- rule = float_3nan_prop_s_cab;
-#elif defined(TARGET_MIPS)
+#if defined(TARGET_MIPS)
if (snan_bit_is_one(status)) {
rule = float_3nan_prop_s_abc;
} else {
--
2.34.1
- [PATCH for-10.0 10/25] target/xtensa: Set FloatInfZeroNaNRule explicitly, (continued)
- [PATCH for-10.0 10/25] target/xtensa: Set FloatInfZeroNaNRule explicitly, Peter Maydell, 2024/11/28
- [PATCH for-10.0 14/25] softfloat: Allow runtime choice of NaN propagation for muladd, Peter Maydell, 2024/11/28
- [PATCH for-10.0 20/25] target/sparc: Set Float3NaNPropRule explicitly, Peter Maydell, 2024/11/28
- [PATCH for-10.0 09/25] target/sparc: Set FloatInfZeroNaNRule explicitly, Peter Maydell, 2024/11/28
- [PATCH for-10.0 11/25] target/x86: Set FloatInfZeroNaNRule explicitly, Peter Maydell, 2024/11/28
- [PATCH for-10.0 08/25] target/mips: Set FloatInfZeroNaNRule explicitly, Peter Maydell, 2024/11/28
- [PATCH for-10.0 13/25] target/hppa: Set FloatInfZeroNaNRule explicitly, Peter Maydell, 2024/11/28
- [PATCH for-10.0 15/25] tests/fp: Explicitly set 3-NaN propagation rule, Peter Maydell, 2024/11/28
- [PATCH for-10.0 19/25] target/s390x: Set Float3NaNPropRule explicitly, Peter Maydell, 2024/11/28
- [PATCH for-10.0 18/25] target/ppc: Set Float3NaNPropRule explicitly, Peter Maydell, 2024/11/28
- [PATCH for-10.0 16/25] target/arm: Set Float3NaNPropRule explicitly,
Peter Maydell <=
- [PATCH for-10.0 25/25] fpu: Remove use_first_nan field from float_status, Peter Maydell, 2024/11/28
- [PATCH for-10.0 23/25] target/i386: Set Float3NaNPropRule explicitly, Peter Maydell, 2024/11/28
- [PATCH for-10.0 12/25] target/loongarch: Set FloatInfZeroNaNRule explicitly, Peter Maydell, 2024/11/28
- [PATCH for-10.0 24/25] target/hppa: Set Float3NaNPropRule explicitly, Peter Maydell, 2024/11/28
- [PATCH for-10.0 17/25] target/loongarch: Set Float3NaNPropRule explicitly, Peter Maydell, 2024/11/28
- [PATCH for-10.0 22/25] target/xtensa: Set Float3NaNPropRule explicitly, Peter Maydell, 2024/11/28
- [PATCH for-10.0 21/25] target/mips: Set Float3NaNPropRule explicitly, Peter Maydell, 2024/11/28