s390x: Add floating-point extension facility to "qemu" cpu model
cover s390x/tcg: Implement floating-point extension facility
In reply to David HildenbrandThis series is based on the patches currently on the list:
- softfloat: Implement float128_to_uint32
- softfloat: add float128_is_{normal,denormal}
- s390x: add zPCI feature to "qemu" CPU model
For the KVM folks, only the last patch is of interest.
The floating-point extension facility seems to be used often without checking by user space. Vector instruction support seems to somewhat also rely on it being available. Some parts are already implemented, others not or are broken.
Fix some stuff in fpu code, add some FIXMEs to indicate what is definetly missing and implement all BFP stuff needed for the floating-point extension facility. Finally, enable it for TCG, adding it to the CPU model for the 4.0 compat machine.
This series also contains some refactorings needed for floating-point vector instruction support.
David Hildenbrand (15):
s390x/tcg: Fix TEST DATA CLASS instructions
s390x/tcg: Fix rounding from float128 to uint64_t/uin32_t s390x/tcg: Factor out conversion of softfloat exceptions s390x/tcg: Fix parts of IEEE exception handling s390x/tcg: Hide IEEE underflows in some scenarios s390x/tcg: Refactor SET FPC AND SIGNAL handling s390x/tcg: Fix simulated-IEEE exceptions
s390x/tcg: Handle SET FPC AND LOAD FPC 3-bit BFP rounding modes s390x/tcg: Check for exceptions in SET BFP ROUNDING MODE s390x/tcg: Refactor saving/restoring the bfp rounding mode s390x/tcg: Prepare for IEEE-inexact-exception control (XxC) s390x/tcg: Implement XxC and checks for most FP instructions s390x/tcg: Implement rounding mode and XxC for LOAD ROUNDED s390x/tcg: Handle all rounding modes overwritten by BFP instructions
s390x: Add floating-point extension facility to "qemu" cpu model
target/s390x/fpu_helper.c | 547 +++++++++++++++++++++++------------- target/s390x/gen-features.c | 5 + target/s390x/helper.h | 9 +- target/s390x/insn-data.def | 12 +- target/s390x/internal.h | 15 + target/s390x/translate.c | 340 +++++++++++++++------- 6 files changed, 628 insertions(+), 300 deletions(-)
Signature · 1 line
2.17.2
PATCH 1/1 s390x: Add floating-point extension facility to "qemu" cpu model
The floating-point extension facility implemented certain changes to BFP, HFP and DFP instructions.
As we don't implement HFP/DFP, we can ignore those completely. Related to BFP, the changes include
- SET BFP ROUNDING MODE (SRNMB) instruction
- BFP-rounding-mode field in the FPC register is changed to 3 bits
- CONVERT FROM LOGICAL instructions
- CONVERT TO LOGICAL instructions
- Changes (rounding mode + XxC) added to
-- CONVERT TO FIXED
-- CONVERT FROM FIXED
-- LOAD FP INTEGER
-- LOAD ROUNDED
-- DIVIDE TO INTEGER
For TCG, we don't implement DIVIDE TO INTEGER, and it is harder to implement, so skip that. Also, as we don't implement PFPO, we can skip changes to that as well. The other parts are now implemented, we can indicate the facility.
z14 PoP mentiones that "The floating-point extension facility is installed in the z/Architecture architectural mode. When bit 37 is one, bit 42 is also one.", meaning that the DFP (decimal-floating-point) facility also has to be inidicated. We can ignore that for now.
--- target/s390x/gen-features.c | 5 +++++ 1 file changed, 5 insertions(+)
target/s390x/gen-features.c +5 -0
@@ -593,6 +593,11 @@ static uint16_t qemu_V3_1[] = { };static uint16_t qemu_LATEST[] = { +/* +* Only BFP bits are implemented (HFP, DFP, PFPO and DIVIDE TO INTEGER not +* implemented yet). +*/ +S390_FEAT_FLOATING_POINT_EXT ,S390_FEAT_ZPCI , };
Signature · 1 line
2.17.2
PATCH 6/15 s390x/tcg: Refactor SET FPC AND SIGNAL handling
We can directly work on the uint64_t value, no need for a temporary uint32_t value.
Also cleanup and shorten the comments.
--- target/s390x/fpu_helper.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
target/s390x/fpu_helper.c +12 -10
@@ -820,21 +820,23 @@ void HELPER(sfpc)(CPUS390XState *env, uint64_t fpc) }/* set fpc and signal */ -void HELPER (sfas )(CPUS390XState *env,uint64_t val) +void HELPER (sfas )(CPUS390XState *env,uint64_t fpc) {uint32_t signalling = env->fpc; -uint32_t source = val;uint32_t s390_exc; -/* The contents of the source operand are placed in the FPC register; -then the flags in the FPC register are set to the logical OR of the -signalling flags and the source flags. */ - env->fpc = source | (signalling &0x00ff0000 ); -set_float_rounding_mode (fpc_to_rnd[source &3 ], &env->fpu_status); +/* +* FPC is set to the FPC operand with a bitwise OR of the signalling +* flags. +*/ + env->fpc = fpc | (signalling &0x00ff0000 ); +set_float_rounding_mode (fpc_to_rnd[fpc &3 ], &env->fpu_status); -/* If any signalling flag is 1 and the corresponding source mask -is also 1, a simulated-iee-exception trap occurs. */ - s390_exc = (signalling >>16 ) & (source >>24 ); +/* +* If any signaling flag is enabled in the new FPC mask, a +* simulated-iee-exception exception occurs. +*/ + s390_exc = (signalling >>16 ) & (fpc >>24 );if (s390_exc) {tcg_s390_data_exception (env, s390_exc |3 ,GETPC ()); }
Signature · 1 line
2.17.2
PATCH 1/15 s390x/tcg: Fix TEST DATA CLASS instructions
In reply to David HildenbrandLet's detect normal and denormal ("subnormal") numbers reliably. Also test for quiet NaN's.
While at it, use a better check to test for the mask bits in the data class mask. The data class mask has 12 bits, whereby bit 0 is the leftmost bit and bit 11 the rightmost bit. In the PoP an easy to read table with the numbers is provided for the VECTOR FP TEST DATA CLASS IMMEDIATE instruction, the table for TEST DATA CLASS is more confusing as it is based on 64 bit values.
Factor the checks out into separate functions, as they will also be needed for floating point vector instructions.
--- target/s390x/fpu_helper.c | 96 ++++++++++++++++++++++++++------------- 1 file changed, 65 insertions(+), 31 deletions(-)
target/s390x/fpu_helper.c +65 -31
@@ -645,66 +645,100 @@ uint64_t HELPER(msdb)(CPUS390XState *env, uint64_t f1,return ret; } +/* +* The rightmost 12 bits are the mask. The rightmost bit has the number 11. +*/ +static inline bool test_dc_mask (uint16_t dc_mask,int bit,bool neg) +{ +return dc_mask & (1 << (11 - bit - neg)); +} + +static bool s390_tdc32 (CPUS390XState *env,float32 f1,uint16_t dc_mask) +{ +const bool neg =float32_is_neg (f1); +const bool zero =float32_is_zero (f1); +const bool normal =float32_is_normal (f1); +const bool denormal =float32_is_denormal (f1); +const bool infinity =float32_is_infinity (f1); +const bool quiet_nan =float32_is_quiet_nan (f1, &env->fpu_status); +const bool sig_nan =float32_is_signaling_nan (f1, &env->fpu_status); + +return (zero &&test_dc_mask (dc_mask,0 , neg)) || + (normal &&test_dc_mask (dc_mask,2 , neg)) || + (denormal &&test_dc_mask (dc_mask,4 , neg)) || + (infinity &&test_dc_mask (dc_mask,6 , neg)) || + (quiet_nan &&test_dc_mask (dc_mask,8 , neg)) || + (sig_nan &&test_dc_mask (dc_mask,10 , neg)); +} +/* test data class 32-bit */ uint32_t HELPER (tceb )(CPUS390XState *env,uint64_t f1,uint64_t m2) { -float32 v1 = f1; -int neg =float32_is_neg (v1);uint32_t cc =0 ; -if ((float32_is_zero (v1) && (m2 & (1 << (11 -neg)))) || - (float32_is_infinity (v1) && (m2 & (1 << (5 -neg)))) || - (float32_is_any_nan (v1) && (m2 & (1 << (3 -neg)))) || - (float32_is_signaling_nan (v1, &env->fpu_status) && - (m2 & (1 << (1 -neg))))) { - cc =1 ; - }else if (m2 & (1 << (9 -neg))) { -/* assume normalized number */ +if (s390_tdc32 (env, f1, m2)) { cc =1 ; } -/* FIXME: denormalized? */ return cc; } +static bool s390_tdc64 (CPUS390XState *env,float64 f1,uint16_t dc_mask) +{ +const bool neg =float64_is_neg (f1); +const bool zero =float64_is_zero (f1); +const bool normal =float64_is_normal (f1); +const bool denormal =float64_is_denormal (f1); +const bool infinity =float64_is_infinity (f1); +const bool quiet_nan =float64_is_quiet_nan (f1, &env->fpu_status); +const bool sig_nan =float64_is_signaling_nan (f1, &env->fpu_status); + +return (zero &&test_dc_mask (dc_mask,0 , neg)) || + (normal &&test_dc_mask (dc_mask,2 , neg)) || + (denormal &&test_dc_mask (dc_mask,4 , neg)) || + (infinity &&test_dc_mask (dc_mask,6 , neg)) || + (quiet_nan &&test_dc_mask (dc_mask,8 , neg)) || + (sig_nan &&test_dc_mask (dc_mask,10 , neg)); +} +/* test data class 64-bit */ uint32_t HELPER (tcdb )(CPUS390XState *env,uint64_t v1,uint64_t m2) { -int neg =float64_is_neg (v1);uint32_t cc =0 ; -if ((float64_is_zero (v1) && (m2 & (1 << (11 -neg)))) || - (float64_is_infinity (v1) && (m2 & (1 << (5 -neg)))) || - (float64_is_any_nan (v1) && (m2 & (1 << (3 -neg)))) || - (float64_is_signaling_nan (v1, &env->fpu_status) && - (m2 & (1 << (1 -neg))))) { - cc =1 ; - }else if (m2 & (1 << (9 -neg))) { -/* assume normalized number */ +if (s390_tdc64 (env, v1, m2)) { cc =1 ; } -/* FIXME: denormalized? */ return cc; } +static bool s390_tdc128 (CPUS390XState *env,float128 f1,uint16_t dc_mask) +{ +const bool neg =float128_is_neg (f1); +const bool zero =float128_is_zero (f1); +const bool normal =float128_is_normal (f1); +const bool denormal =float128_is_denormal (f1); +const bool infinity =float128_is_infinity (f1); +const bool quiet_nan =float128_is_quiet_nan (f1, &env->fpu_status); +const bool sig_nan =float128_is_signaling_nan (f1, &env->fpu_status); + +return (zero &&test_dc_mask (dc_mask,0 , neg)) || + (normal &&test_dc_mask (dc_mask,2 , neg)) || + (denormal &&test_dc_mask (dc_mask,4 , neg)) || + (infinity &&test_dc_mask (dc_mask,6 , neg)) || + (quiet_nan &&test_dc_mask (dc_mask,8 , neg)) || + (sig_nan &&test_dc_mask (dc_mask,10 , neg)); +} +/* test data class 128-bit */ uint32_t HELPER (tcxb )(CPUS390XState *env,uint64_t ah,uint64_t al,uint64_t m2) {float128 v1 =make_float128 (ah, al); -int neg =float128_is_neg (v1);uint32_t cc =0 ; -if ((float128_is_zero (v1) && (m2 & (1 << (11 -neg)))) || - (float128_is_infinity (v1) && (m2 & (1 << (5 -neg)))) || - (float128_is_any_nan (v1) && (m2 & (1 << (3 -neg)))) || - (float128_is_signaling_nan (v1, &env->fpu_status) && - (m2 & (1 << (1 -neg))))) { - cc =1 ; - }else if (m2 & (1 << (9 -neg))) { -/* assume normalized number */ +if (s390_tdc128 (env, v1, m2)) { cc =1 ; } -/* FIXME: denormalized? */ return cc; }
Signature · 1 line
2.17.2
PATCH 3/15 s390x/tcg: Factor out conversion of softfloat exceptions
In reply to David HildenbrandWe want to reuse that function in vector instruction context. While at it, cleanup the code, using defines for magic values and avoiding the handcrafted bit conversion.
--- target/s390x/fpu_helper.c | 25 +++++++++++++------------ target/s390x/internal.h | 7 +++++++ 2 files changed, 20 insertions(+), 12 deletions(-)
target/s390x/fpu_helper.c +13 -12
@@ -36,10 +36,18 @@#define RET128 (F ) (env->retxl = F.low, F.high) -#define convert_bit (mask, from, to) \ - (to < from \ - ? (mask / (from / to)) & to \ - : (mask & from) * (to / from)) +uint8_t s390_softfloat_exc_to_ieee (unsigned int exc) +{ +uint8_t s390_exc =0 ; + + s390_exc |= (exc & float_flag_invalid) ?S390_IEEE_MASK_INVALID :0 ; + s390_exc |= (exc & float_flag_divbyzero) ?S390_IEEE_MASK_DIVBYZERO :0 ; + s390_exc |= (exc & float_flag_overflow) ?S390_IEEE_MASK_OVERFLOW :0 ; + s390_exc |= (exc & float_flag_underflow) ?S390_IEEE_MASK_UNDERFLOW :0 ; + s390_exc |= (exc & float_flag_inexact) ?S390_IEEE_MASK_INEXACT :0 ; + +return s390_exc; +}/* Should be called after any operation that may raise IEEE exceptions. */ static void handle_exceptions (CPUS390XState *env,uintptr_t retaddr)
@@ -53,14 +61,7 @@ static void handle_exceptions(CPUS390XState *env, uintptr_t retaddr)return ; } env->fpu_status.float_exception_flags =0 ; - -/* Convert softfloat exception bits to s390 exception bits. */ - s390_exc =0 ; - s390_exc |=convert_bit (qemu_exc, float_flag_invalid,0x80 ); - s390_exc |=convert_bit (qemu_exc, float_flag_divbyzero,0x40 ); - s390_exc |=convert_bit (qemu_exc, float_flag_overflow,0x20 ); - s390_exc |=convert_bit (qemu_exc, float_flag_underflow,0x10 ); - s390_exc |=convert_bit (qemu_exc, float_flag_inexact,0x08 ); + s390_exc =s390_softfloat_exc_to_ieee (qemu_exc);/* Install the exceptions that we raised. */ env->fpc |= s390_exc <<16 ;
target/s390x/internal.h +7 -0
@@ -308,6 +308,13 @@ void s390x_cpu_do_unaligned_access(CPUState *cs, vaddr addr,uint32_t set_cc_nz_f32 (float32 v);uint32_t set_cc_nz_f64 (float64 v);uint32_t set_cc_nz_f128 (float128 v); +#define S390_IEEE_MASK_INVALID 0x80 +#define S390_IEEE_MASK_DIVBYZERO 0x40 +#define S390_IEEE_MASK_OVERFLOW 0x20 +#define S390_IEEE_MASK_UNDERFLOW 0x10 +#define S390_IEEE_MASK_INEXACT 0x08 +#define S390_IEEE_MASK_QUANTUM 0x04 +uint8_t s390_softfloat_exc_to_ieee (unsigned int exc);/* gdbstub.c */
Signature · 1 line
2.17.2
PATCH 4/15 s390x/tcg: Fix parts of IEEE exception handling
In reply to David HildenbrandMany things are wrong and some parts cannot be fixed yet. Fix what we can fix easily and add two FIXMEs:
The fpc flags are not updated in case an exception is actually injected. Inexact exceptions have to be handled separately, as they are the only exceptions that can coexist with underflows and overflows.
I reread the horribly complicated chapters in the PoP at least 5 times and hope I got it right.
For references:
- z14 PoP, 9-18, "IEEE Exceptions"
- z14 PoP, 19-9, Figure 19-8
--- target/s390x/fpu_helper.c | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-)
target/s390x/fpu_helper.c +32 -6
@@ -63,13 +63,39 @@ static void handle_exceptions(CPUS390XState *env, uintptr_t retaddr) env->fpu_status.float_exception_flags =0 ; s390_exc =s390_softfloat_exc_to_ieee (qemu_exc); -/* Install the exceptions that we raised. */ - env->fpc |= s390_exc <<16 ; +/* +* FIXME: +* 1. Right now, all inexact conditions are inidicated as +* "truncated" (0) and never as "incremented" (1) in the DXC. +* 2. Only traps due to invalid/divbyzero are suppressing. Other traps +* are completing, meaning the target register has to be written! +* This, however will mean that we have to write the register before +* triggering the trap - impossible right now. +*/ + +/* +* invalid/divbyzero cannot coexist with other conditions. +* overflow/underflow however can coexist with inexact, we have to +* handle it separatly. +*/ +if (s390_exc & ~S390_IEEE_MASK_INEXACT ) { +if (s390_exc & ~S390_IEEE_MASK_INEXACT & env->fpc >>24 ) { +/* trap condition - inexact reported along */ +tcg_s390_data_exception (env, s390_exc, retaddr); + } +/* nontrap condition - inexact handled differently */ + env->fpc |= (s390_exc & ~S390_IEEE_MASK_INEXACT ) <<16 ; + } -/* Send signals for enabled exceptions. */ - s390_exc &= env->fpc >>24 ; -if (s390_exc) { -tcg_s390_data_exception (env, s390_exc, retaddr); +/* inexact handling */ +if (s390_exc &S390_IEEE_MASK_INEXACT ) { +/* trap condition - overflow/underflow _not_ reported along */ +if (s390_exc &S390_IEEE_MASK_INEXACT & env->fpc >>24 ) { +tcg_s390_data_exception (env, s390_exc &S390_IEEE_MASK_INEXACT , + retaddr); + } +/* nontrap condition */ + env->fpc |= (s390_exc &S390_IEEE_MASK_INEXACT ) <<16 ; } }
Signature · 1 line
2.17.2
PATCH 2/15 s390x/tcg: Fix rounding from float128 to uint64_t/uin32_t
In reply to David HildenbrandLet's use the proepr conversion functions now that we have them.
--- target/s390x/fpu_helper.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
target/s390x/fpu_helper.c +2 -6
@@ -509,9 +509,7 @@ uint64_t HELPER(clgdb)(CPUS390XState *env, uint64_t v2, uint32_t m3)uint64_t HELPER (clgxb )(CPUS390XState *env,uint64_t h,uint64_t l,uint32_t m3) {int hold =swap_round_mode (env, m3); -float128 v2 =make_float128 (h, l); -/* ??? Not 100% correct. */ -uint64_t ret =float128_to_int64 (v2, &env->fpu_status); +uint64_t ret =float128_to_uint64 (make_float128 (h, l), &env->fpu_status);set_float_rounding_mode (hold, &env->fpu_status);handle_exceptions (env,GETPC ());return ret;
@@ -541,9 +539,7 @@ uint64_t HELPER(clfdb)(CPUS390XState *env, uint64_t v2, uint32_t m3)uint64_t HELPER (clfxb )(CPUS390XState *env,uint64_t h,uint64_t l,uint32_t m3) {int hold =swap_round_mode (env, m3); -float128 v2 =make_float128 (h, l); -/* Not 100% correct. */ -uint32_t ret =float128_to_int64 (v2, &env->fpu_status); +uint32_t ret =float128_to_uint32 (make_float128 (h, l), &env->fpu_status);set_float_rounding_mode (hold, &env->fpu_status);handle_exceptions (env,GETPC ());return ret;
Signature · 1 line
2.17.2
PATCH 5/15 s390x/tcg: Hide IEEE underflows in some scenarios
In reply to David HildenbrandIEEE underflows are not reported when the mask bit is off and we don't also have an inexact exception.
z14 PoP, 9-20, "IEEE Underflow":
An IEEE-underflow exception is recognized for an IEEE target when the tininess condition exists and
either: (1) the IEEE-underflow mask bit in the FPC register is zero and the result value is inexact, or (2) the IEEE-underflow mask bit in the FPC register is one.
--- target/s390x/fpu_helper.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
target/s390x/fpu_helper.c +13 -0
@@ -63,6 +63,19 @@ static void handle_exceptions(CPUS390XState *env, uintptr_t retaddr) env->fpu_status.float_exception_flags =0 ; s390_exc =s390_softfloat_exc_to_ieee (qemu_exc); +/* +* IEEE-Underflow exception recognition exists if a tininess condition +* (underflow) exists and +* - The mask bit in the FPC is zero and the result is inexact +* - The mask bit in the FPC is one +* So tininess conditions that are not inexact don't trigger any +* underflow action in case the mask bit is not one. +*/ +if (!(s390_exc &S390_IEEE_MASK_INEXACT ) && + !((env->fpc >>24 ) &S390_IEEE_MASK_UNDERFLOW )) { + s390_exc &= ~S390_IEEE_MASK_UNDERFLOW ; + } +/* * FIXME: * 1. Right now, all inexact conditions are inidicated as
Signature · 1 line
2.17.2
PATCH 8/15 s390x/tcg: Handle SET FPC AND LOAD FPC 3-bit BFP rounding modes
In reply to David HildenbrandWe already forward the 3 bits correctly in the translation functions. We also have to handle them properly and check for specification exceptions.
Setting an invalid rounding mode (BFP only, all DFP rounding modes) results in a specification exception. Setting unassigned bits in the fpc, results in a specification exception.
This fixes LOAD FPC (AND SIGNAL), SET FPC (AND SIGNAL). Also for, SET BFP ROUNDING MODE, 3-bit rounding mode is now explicitly checked.
Notes:
1. Use "float_round_to_zero" for now to handle "Round to prepare for shorter precision". Looking at the PoP "Summary of Rounding and Range Actions" for BFP. They differ when it comes to tiny values.
2. TCG_CALL_NO_WG is required for sfpc handler, as we now inject exceptions.
We won't be modeling abscence of the "floating-point extension facility" for now, not necessary as most take the facility for granted without checking.
z14 PoP, 9-23, "LOAD FPC"
When the floating-point extension facility is installed, bits 29-31 of the second operand must specify a valid BFP rounding mode and bits 6-7, 14-15, 24, and 28 must be zero; otherwise, a specification exception is recognized.
--- target/s390x/fpu_helper.c | 24 ++++++++++++++++++++---- target/s390x/helper.h | 2 +- 2 files changed, 21 insertions(+), 5 deletions(-)
target/s390x/fpu_helper.c +20 -4
@@ -802,21 +802,33 @@ uint64_t HELPER(sqxb)(CPUS390XState *env, uint64_t ah, uint64_t al)return RET128 (ret); } -static const int fpc_to_rnd[4 ] = { +static const int fpc_to_rnd[8 ] = { float_round_nearest_even, float_round_to_zero, float_round_up, - float_round_down + float_round_down, +-1 , +-1 , +-1 , +/* +* FIXME: we actually want something like round_to_odd, but that does not +* support all data types yet. +*/ + float_round_to_zero, };/* set fpc */ void HELPER (sfpc )(CPUS390XState *env,uint64_t fpc) { +if (fpc_to_rnd[fpc &0x7 ] ==-1 || fpc &0x03030088u ) { +s390_program_interrupt (env,PGM_SPECIFICATION ,ILEN_AUTO ,GETPC ()); + } +/* Install everything in the main FPC. */ env->fpc = fpc;/* Install the rounding mode in the shadow fpu_status. */ -set_float_rounding_mode (fpc_to_rnd[fpc &3 ], &env->fpu_status); +set_float_rounding_mode (fpc_to_rnd[fpc &0x7 ], &env->fpu_status); }/* set fpc and signal */
@@ -825,12 +837,16 @@ void HELPER(sfas)(CPUS390XState *env, uint64_t fpc)uint32_t signalling = env->fpc;uint32_t s390_exc; +if (fpc_to_rnd[fpc &0x7 ] ==-1 || fpc &0x03030088u ) { +s390_program_interrupt (env,PGM_SPECIFICATION ,ILEN_AUTO ,GETPC ()); + } +/* * FPC is set to the FPC operand with a bitwise OR of the signalling * flags. */ env->fpc = fpc | (signalling &0x00ff0000 ); -set_float_rounding_mode (fpc_to_rnd[fpc &3 ], &env->fpu_status); +set_float_rounding_mode (fpc_to_rnd[fpc &0x7 ], &env->fpu_status);/* * If any signaling flag is enabled in the new FPC mask, a
target/s390x/helper.h +1 -1
@@ -104,7 +104,7 @@ DEF_HELPER_4(trtr, i32, env, i32, i64, i64) DEF_HELPER_5(trXX, i32, env, i32, i32, i32, i32) DEF_HELPER_4(cksm, i64, env, i64, i64, i64) DEF_HELPER_FLAGS_5(calc_cc, TCG_CALL_NO_RWG_SE, i32, env, i32, i64, i64, i64) -DEF_HELPER_FLAGS_2(sfpc, TCG_CALL_NO_RWG, void, env, i64) +DEF_HELPER_FLAGS_2(sfpc, TCG_CALL_NO_WG, void, env, i64) DEF_HELPER_FLAGS_2(sfas, TCG_CALL_NO_WG, void, env, i64) DEF_HELPER_FLAGS_1(popcnt, TCG_CALL_NO_RWG_SE, i64, i64)DEF_HELPER_2 (stfle, i32, env, i64)
Signature · 1 line
2.17.2
PATCH 9/15 s390x/tcg: Check for exceptions in SET BFP ROUNDING MODE
In reply to David HildenbrandLet's split handling of BFP/DFP rounding mode configuration. Also, let's not reuse the sfpc handler, use a separate handler so we can properly check for specification exceptions for SRNMB.
--- target/s390x/fpu_helper.c | 11 ++++++++ target/s390x/helper.h | 1 + target/s390x/insn-data.def | 6 ++-- target/s390x/translate.c | 56 ++++++++++++++++---------------------- 4 files changed, 39 insertions(+), 35 deletions(-)
target/s390x/fpu_helper.c +11 -0
@@ -870,3 +870,14 @@ void HELPER(sfas)(CPUS390XState *env, uint64_t fpc)tcg_s390_data_exception (env, s390_exc |3 ,GETPC ()); } } + +/* set bfp rounding mode */ +void HELPER (srnm )(CPUS390XState *env,uint64_t rnd) +{ +if (rnd >0x7 || fpc_to_rnd[rnd &0x7 ] ==-1 ) { +s390_program_interrupt (env,PGM_SPECIFICATION ,ILEN_AUTO ,GETPC ()); + } + + env->fpc =deposit32 (env->fpc,0 ,3 , rnd); +set_float_rounding_mode (fpc_to_rnd[rnd &0x7 ], &env->fpu_status); +}
target/s390x/helper.h +1 -0
@@ -106,6 +106,7 @@ DEF_HELPER_4(cksm, i64, env, i64, i64, i64) DEF_HELPER_FLAGS_5(calc_cc, TCG_CALL_NO_RWG_SE, i32, env, i32, i64, i64, i64) DEF_HELPER_FLAGS_2(sfpc, TCG_CALL_NO_WG, void, env, i64) DEF_HELPER_FLAGS_2(sfas, TCG_CALL_NO_WG, void, env, i64) +DEF_HELPER_FLAGS_2(srnm, TCG_CALL_NO_WG, void, env, i64) DEF_HELPER_FLAGS_1(popcnt, TCG_CALL_NO_RWG_SE, i64, i64) DEF_HELPER_2(stfle, i32, env, i64)DEF_HELPER_FLAGS_2 (lpq,TCG_CALL_NO_WG , i64, env, i64)
target/s390x/insn-data.def +3 -3
@@ -759,10 +759,10 @@ /* SET FPC AND SIGNAL */ F(0xb385, SFASR, RRE, IEEEE_SIM, 0, r1_o, 0, 0, sfas, 0, IF_DFP) /* SET BFP ROUNDING MODE */ - F(0xb299, SRNM, S, Z, 0, 0, 0, 0, srnm, 0, IF_BFP) - F(0xb2b8, SRNMB, S, FPE, 0, 0, 0, 0, srnm, 0, IF_BFP) + F(0xb299, SRNM, S, Z, la2, 0, 0, 0, srnm, 0, IF_BFP) + F(0xb2b8, SRNMB, S, FPE, la2, 0, 0, 0, srnmb, 0, IF_BFP) /* SET DFP ROUNDING MODE */ - F(0xb2b9, SRNMT, S, DFPR, 0, 0, 0, 0, srnm, 0, IF_DFP) + F(0xb2b9, SRNMT, S, DFPR, la2, 0, 0, 0, srnmt, 0, IF_DFP) /* SET PROGRAM MASK */ C(0x0400, SPM, RR_a, Z, r1, 0, 0, 0, spm, 0)
target/s390x/translate.c +24 -32
65 lines not on this page · raw message
Signature · 1 line
2.17.2
PATCH 7/15 s390x/tcg: Fix simulated-IEEE exceptions
In reply to David HildenbrandThe trap is triggered based on priority of the enabled signaling flags. Only overflow and underflow allow a concurrent inexact exception.
z14 PoP, 9-33, Figure 9-21
--- target/s390x/fpu_helper.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
target/s390x/fpu_helper.c +13 -0
@@ -838,6 +838,19 @@ void HELPER(sfas)(CPUS390XState *env, uint64_t fpc)*/ s390_exc = (signalling >>16 ) & (fpc >>24 );if (s390_exc) { +if (s390_exc &S390_IEEE_MASK_INVALID ) { + s390_exc =S390_IEEE_MASK_INVALID ; + }else if (s390_exc &S390_IEEE_MASK_DIVBYZERO ) { + s390_exc =S390_IEEE_MASK_DIVBYZERO ; + }else if (s390_exc &S390_IEEE_MASK_OVERFLOW ) { + s390_exc &= (S390_IEEE_MASK_OVERFLOW |S390_IEEE_MASK_INEXACT ); + }else if (s390_exc &S390_IEEE_MASK_UNDERFLOW ) { + s390_exc &= (S390_IEEE_MASK_UNDERFLOW |S390_IEEE_MASK_INEXACT ); + }else if (s390_exc &S390_IEEE_MASK_INEXACT ) { + s390_exc =S390_IEEE_MASK_INEXACT ; + }else if (s390_exc &S390_IEEE_MASK_QUANTUM ) { + s390_exc =S390_IEEE_MASK_QUANTUM ; + }tcg_s390_data_exception (env, s390_exc |3 ,GETPC ()); } }
Signature · 1 line
2.17.2
PATCH 10/15 s390x/tcg: Refactor saving/restoring the bfp rounding mode
In reply to David HildenbrandWe want to reuse this in the context of vector instructions. So use better matching names and introduce s390_restore_bfp_rounding_mode().
While at it, add proper newlines.
--- target/s390x/fpu_helper.c | 113 +++++++++++++++++++++++--------------- target/s390x/internal.h | 2 + 2 files changed, 72 insertions(+), 43 deletions(-)
target/s390x/fpu_helper.c +70 -43
@@ -372,7 +372,7 @@ uint32_t HELPER(cxb)(CPUS390XState *env, uint64_t ah, uint64_t al,return float_comp_to_cc (env, cmp); } -static int swap_round_mode (CPUS390XState *env,int m3) +int s390_swap_bfp_rounding_mode (CPUS390XState *env,int m3) {int ret = env->fpu_status.float_rounding_mode;switch (m3) {
@@ -401,12 +401,18 @@ static int swap_round_mode(CPUS390XState *env, int m3)return ret; } +void s390_restore_bfp_rounding_mode (CPUS390XState *env,int old_mode) +{ +set_float_rounding_mode (old_mode, &env->fpu_status); +} +/* convert 64-bit int to 32-bit float */ uint64_t HELPER (cegb )(CPUS390XState *env,int64_t v2,uint32_t m3) { -int hold =swap_round_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m3); +float32 ret =int64_to_float32 (v2, &env->fpu_status); -set_float_rounding_mode (hold, &env->fpu_status); +s390_restore_bfp_rounding_mode (env, old_mode);handle_exceptions (env,GETPC ());return ret; }
@@ -414,9 +420,10 @@ uint64_t HELPER(cegb)(CPUS390XState *env, int64_t v2, uint32_t m3)/* convert 64-bit int to 64-bit float */ uint64_t HELPER (cdgb )(CPUS390XState *env,int64_t v2,uint32_t m3) { -int hold =swap_round_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m3); +float64 ret =int64_to_float64 (v2, &env->fpu_status); -set_float_rounding_mode (hold, &env->fpu_status); +s390_restore_bfp_rounding_mode (env, old_mode);handle_exceptions (env,GETPC ());return ret; }
@@ -424,9 +431,10 @@ uint64_t HELPER(cdgb)(CPUS390XState *env, int64_t v2, uint32_t m3)/* convert 64-bit int to 128-bit float */ uint64_t HELPER (cxgb )(CPUS390XState *env,int64_t v2,uint32_t m3) { -int hold =swap_round_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m3); +float128 ret =int64_to_float128 (v2, &env->fpu_status); -set_float_rounding_mode (hold, &env->fpu_status); +s390_restore_bfp_rounding_mode (env, old_mode);handle_exceptions (env,GETPC ());return RET128 (ret); }
@@ -434,9 +442,10 @@ uint64_t HELPER(cxgb)(CPUS390XState *env, int64_t v2, uint32_t m3)/* convert 64-bit uint to 32-bit float */ uint64_t HELPER (celgb )(CPUS390XState *env,uint64_t v2,uint32_t m3) { -int hold =swap_round_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m3); +float32 ret =uint64_to_float32 (v2, &env->fpu_status); -set_float_rounding_mode (hold, &env->fpu_status); +s390_restore_bfp_rounding_mode (env, old_mode);handle_exceptions (env,GETPC ());return ret; }
@@ -444,9 +453,10 @@ uint64_t HELPER(celgb)(CPUS390XState *env, uint64_t v2, uint32_t m3)/* convert 64-bit uint to 64-bit float */ uint64_t HELPER (cdlgb )(CPUS390XState *env,uint64_t v2,uint32_t m3) { -int hold =swap_round_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m3); +float64 ret =uint64_to_float64 (v2, &env->fpu_status); -set_float_rounding_mode (hold, &env->fpu_status); +s390_restore_bfp_rounding_mode (env, old_mode);handle_exceptions (env,GETPC ());return ret; }
@@ -454,9 +464,10 @@ uint64_t HELPER(cdlgb)(CPUS390XState *env, uint64_t v2, uint32_t m3)/* convert 64-bit uint to 128-bit float */ uint64_t HELPER (cxlgb )(CPUS390XState *env,uint64_t v2,uint32_t m3) { -int hold =swap_round_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m3); +float128 ret =uint64_to_float128 (v2, &env->fpu_status); -set_float_rounding_mode (hold, &env->fpu_status); +s390_restore_bfp_rounding_mode (env, old_mode);handle_exceptions (env,GETPC ());return RET128 (ret); }
@@ -464,9 +475,10 @@ uint64_t HELPER(cxlgb)(CPUS390XState *env, uint64_t v2, uint32_t m3)/* convert 32-bit float to 64-bit int */ uint64_t HELPER (cgeb )(CPUS390XState *env,uint64_t v2,uint32_t m3) { -int hold =swap_round_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m3);int64_t ret =float32_to_int64 (v2, &env->fpu_status); -set_float_rounding_mode (hold, &env->fpu_status); + +s390_restore_bfp_rounding_mode (env, old_mode);handle_exceptions (env,GETPC ());return ret; }
@@ -474,9 +486,10 @@ uint64_t HELPER(cgeb)(CPUS390XState *env, uint64_t v2, uint32_t m3)/* convert 64-bit float to 64-bit int */ uint64_t HELPER (cgdb )(CPUS390XState *env,uint64_t v2,uint32_t m3) { -int hold =swap_round_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m3);int64_t ret =float64_to_int64 (v2, &env->fpu_status); -set_float_rounding_mode (hold, &env->fpu_status); + +s390_restore_bfp_rounding_mode (env, old_mode);handle_exceptions (env,GETPC ());return ret; }
@@ -484,10 +497,11 @@ uint64_t HELPER(cgdb)(CPUS390XState *env, uint64_t v2, uint32_t m3)/* convert 128-bit float to 64-bit int */ uint64_t HELPER (cgxb )(CPUS390XState *env,uint64_t h,uint64_t l,uint32_t m3) { -int hold =swap_round_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m3);float128 v2 =make_float128 (h, l);int64_t ret =float128_to_int64 (v2, &env->fpu_status); -set_float_rounding_mode (hold, &env->fpu_status); + +s390_restore_bfp_rounding_mode (env, old_mode);handle_exceptions (env,GETPC ());return ret; }
@@ -495,9 +509,10 @@ uint64_t HELPER(cgxb)(CPUS390XState *env, uint64_t h, uint64_t l, uint32_t m3)/* convert 32-bit float to 32-bit int */ uint64_t HELPER (cfeb )(CPUS390XState *env,uint64_t v2,uint32_t m3) { -int hold =swap_round_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m3);int32_t ret =float32_to_int32 (v2, &env->fpu_status); -set_float_rounding_mode (hold, &env->fpu_status); + +s390_restore_bfp_rounding_mode (env, old_mode);handle_exceptions (env,GETPC ());return ret; }
@@ -505,9 +520,10 @@ uint64_t HELPER(cfeb)(CPUS390XState *env, uint64_t v2, uint32_t m3)/* convert 64-bit float to 32-bit int */ uint64_t HELPER (cfdb )(CPUS390XState *env,uint64_t v2,uint32_t m3) { -int hold =swap_round_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m3);int32_t ret =float64_to_int32 (v2, &env->fpu_status); -set_float_rounding_mode (hold, &env->fpu_status); + +s390_restore_bfp_rounding_mode (env, old_mode);handle_exceptions (env,GETPC ());return ret; }
@@ -515,10 +531,12 @@ uint64_t HELPER(cfdb)(CPUS390XState *env, uint64_t v2, uint32_t m3)/* convert 128-bit float to 32-bit int */ uint64_t HELPER (cfxb )(CPUS390XState *env,uint64_t h,uint64_t l,uint32_t m3) { -int hold =swap_round_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m3); +float128 v2 =make_float128 (h, l);int32_t ret =float128_to_int32 (v2, &env->fpu_status); -set_float_rounding_mode (hold, &env->fpu_status); + +s390_restore_bfp_rounding_mode (env, old_mode);handle_exceptions (env,GETPC ());return ret; }
@@ -526,11 +544,12 @@ uint64_t HELPER(cfxb)(CPUS390XState *env, uint64_t h, uint64_t l, uint32_t m3)/* convert 32-bit float to 64-bit uint */ uint64_t HELPER (clgeb )(CPUS390XState *env,uint64_t v2,uint32_t m3) { -int hold =swap_round_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m3);uint64_t ret; + v2 =float32_to_float64 (v2, &env->fpu_status); ret =float64_to_uint64 (v2, &env->fpu_status); -set_float_rounding_mode (hold, &env->fpu_status); +s390_restore_bfp_rounding_mode (env, old_mode);handle_exceptions (env,GETPC ());return ret; }
@@ -538,9 +557,10 @@ uint64_t HELPER(clgeb)(CPUS390XState *env, uint64_t v2, uint32_t m3)/* convert 64-bit float to 64-bit uint */ uint64_t HELPER (clgdb )(CPUS390XState *env,uint64_t v2,uint32_t m3) { -int hold =swap_round_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m3); +uint64_t ret =float64_to_uint64 (v2, &env->fpu_status); -set_float_rounding_mode (hold, &env->fpu_status); +s390_restore_bfp_rounding_mode (env, old_mode);handle_exceptions (env,GETPC ());return ret; }
@@ -548,9 +568,10 @@ uint64_t HELPER(clgdb)(CPUS390XState *env, uint64_t v2, uint32_t m3)/* convert 128-bit float to 64-bit uint */ uint64_t HELPER (clgxb )(CPUS390XState *env,uint64_t h,uint64_t l,uint32_t m3) { -int hold =swap_round_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m3);uint64_t ret =float128_to_uint64 (make_float128 (h, l), &env->fpu_status); -set_float_rounding_mode (hold, &env->fpu_status); + +s390_restore_bfp_rounding_mode (env, old_mode);handle_exceptions (env,GETPC ());return ret; }
@@ -558,9 +579,10 @@ uint64_t HELPER(clgxb)(CPUS390XState *env, uint64_t h, uint64_t l, uint32_t m3)/* convert 32-bit float to 32-bit uint */ uint64_t HELPER (clfeb )(CPUS390XState *env,uint64_t v2,uint32_t m3) { -int hold =swap_round_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m3);uint32_t ret =float32_to_uint32 (v2, &env->fpu_status); -set_float_rounding_mode (hold, &env->fpu_status); + +s390_restore_bfp_rounding_mode (env, old_mode);handle_exceptions (env,GETPC ());return ret; }
@@ -568,9 +590,10 @@ uint64_t HELPER(clfeb)(CPUS390XState *env, uint64_t v2, uint32_t m3)/* convert 64-bit float to 32-bit uint */ uint64_t HELPER (clfdb )(CPUS390XState *env,uint64_t v2,uint32_t m3) { -int hold =swap_round_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m3);uint32_t ret =float64_to_uint32 (v2, &env->fpu_status); -set_float_rounding_mode (hold, &env->fpu_status); + +s390_restore_bfp_rounding_mode (env, old_mode);handle_exceptions (env,GETPC ());return ret; }
@@ -578,9 +601,10 @@ uint64_t HELPER(clfdb)(CPUS390XState *env, uint64_t v2, uint32_t m3)/* convert 128-bit float to 32-bit uint */ uint64_t HELPER (clfxb )(CPUS390XState *env,uint64_t h,uint64_t l,uint32_t m3) { -int hold =swap_round_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m3);uint32_t ret =float128_to_uint32 (make_float128 (h, l), &env->fpu_status); -set_float_rounding_mode (hold, &env->fpu_status); + +s390_restore_bfp_rounding_mode (env, old_mode);handle_exceptions (env,GETPC ());return ret; }
@@ -588,9 +612,10 @@ uint64_t HELPER(clfxb)(CPUS390XState *env, uint64_t h, uint64_t l, uint32_t m3)/* round to integer 32-bit */ uint64_t HELPER (fieb )(CPUS390XState *env,uint64_t f2,uint32_t m3) { -int hold =swap_round_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m3); +float32 ret =float32_round_to_int (f2, &env->fpu_status); -set_float_rounding_mode (hold, &env->fpu_status); +s390_restore_bfp_rounding_mode (env, old_mode);handle_exceptions (env,GETPC ());return ret; }
@@ -598,9 +623,10 @@ uint64_t HELPER(fieb)(CPUS390XState *env, uint64_t f2, uint32_t m3)/* round to integer 64-bit */ uint64_t HELPER (fidb )(CPUS390XState *env,uint64_t f2,uint32_t m3) { -int hold =swap_round_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m3); +float64 ret =float64_round_to_int (f2, &env->fpu_status); -set_float_rounding_mode (hold, &env->fpu_status); +s390_restore_bfp_rounding_mode (env, old_mode);handle_exceptions (env,GETPC ());return ret; }
@@ -608,10 +634,11 @@ uint64_t HELPER(fidb)(CPUS390XState *env, uint64_t f2, uint32_t m3)/* round to integer 128-bit */ uint64_t HELPER (fixb )(CPUS390XState *env,uint64_t ah,uint64_t al,uint32_t m3) { -int hold =swap_round_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m3); +float128 ret =float128_round_to_int (make_float128 (ah, al), &env->fpu_status); -set_float_rounding_mode (hold, &env->fpu_status); +s390_restore_bfp_rounding_mode (env, old_mode);handle_exceptions (env,GETPC ());return RET128 (ret); }
target/s390x/internal.h +2 -0
@@ -315,6 +315,8 @@ uint32_t set_cc_nz_f128(float128 v);#define S390_IEEE_MASK_INEXACT 0x08#define S390_IEEE_MASK_QUANTUM 0x04uint8_t s390_softfloat_exc_to_ieee (unsigned int exc); +int s390_swap_bfp_rounding_mode (CPUS390XState *env,int m3); +void s390_restore_bfp_rounding_mode (CPUS390XState *env,int old_mode);/* gdbstub.c */
Signature · 1 line
2.17.2
PATCH 12/15 s390x/tcg: Implement XxC and checks for most FP instructions
In reply to David HildenbrandWith the floating-point extension facility
- CONVERT FROM LOGICAL
- CONVERT TO LOGICAL
- CONVERT TO FIXED
- CONVERT FROM FIXED
- LOAD FP INTEGER
have both, a rounding mode specification and the inexact-exception control (XxC). Other instructions will be handled separatly.
Check for valid rounding modes and forward also the XxC. To avoid a lot of boilerplate code and changes to the helpers, combine both, the m3 and m4 field in a combined 32 bit TCG variable. Mangle/unmangle on a 8bit basis, so this can be reused for other fields later on.
--- target/s390x/fpu_helper.c | 126 +++++++++---------- target/s390x/internal.h | 6 + target/s390x/translate.c | 254 ++++++++++++++++++++++++++++---------- 3 files changed, 260 insertions(+), 126 deletions(-)
target/s390x/fpu_helper.c +63 -63
@@ -407,239 +407,239 @@ void s390_restore_bfp_rounding_mode(CPUS390XState *env, int old_mode) }/* convert 64-bit int to 32-bit float */ -uint64_t HELPER (cegb )(CPUS390XState *env,int64_t v2,uint32_t m3) +uint64_t HELPER (cegb )(CPUS390XState *env,int64_t v2,uint32_t m) { -int old_mode =s390_swap_bfp_rounding_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m &0xf );float32 ret =int64_to_float32 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env, false,GETPC ()); +handle_exceptions (env, (m >>8 ) &1 ,GETPC ());return ret; }/* convert 64-bit int to 64-bit float */ -uint64_t HELPER (cdgb )(CPUS390XState *env,int64_t v2,uint32_t m3) +uint64_t HELPER (cdgb )(CPUS390XState *env,int64_t v2,uint32_t m) { -int old_mode =s390_swap_bfp_rounding_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m &0xf );float64 ret =int64_to_float64 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env, false,GETPC ()); +handle_exceptions (env, (m >>8 ) &1 ,GETPC ());return ret; }/* convert 64-bit int to 128-bit float */ -uint64_t HELPER (cxgb )(CPUS390XState *env,int64_t v2,uint32_t m3) +uint64_t HELPER (cxgb )(CPUS390XState *env,int64_t v2,uint32_t m) { -int old_mode =s390_swap_bfp_rounding_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m &0xf );float128 ret =int64_to_float128 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env, false,GETPC ()); +handle_exceptions (env, (m >>8 ) &1 ,GETPC ());return RET128 (ret); }/* convert 64-bit uint to 32-bit float */ -uint64_t HELPER (celgb )(CPUS390XState *env,uint64_t v2,uint32_t m3) +uint64_t HELPER (celgb )(CPUS390XState *env,uint64_t v2,uint32_t m) { -int old_mode =s390_swap_bfp_rounding_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m &0xf );float32 ret =uint64_to_float32 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env, false,GETPC ()); +handle_exceptions (env, (m >>8 ) &1 ,GETPC ());return ret; }/* convert 64-bit uint to 64-bit float */ -uint64_t HELPER (cdlgb )(CPUS390XState *env,uint64_t v2,uint32_t m3) +uint64_t HELPER (cdlgb )(CPUS390XState *env,uint64_t v2,uint32_t m) { -int old_mode =s390_swap_bfp_rounding_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m &0xf );float64 ret =uint64_to_float64 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env, false,GETPC ()); +handle_exceptions (env, (m >>8 ) &1 ,GETPC ());return ret; }/* convert 64-bit uint to 128-bit float */ -uint64_t HELPER (cxlgb )(CPUS390XState *env,uint64_t v2,uint32_t m3) +uint64_t HELPER (cxlgb )(CPUS390XState *env,uint64_t v2,uint32_t m) { -int old_mode =s390_swap_bfp_rounding_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m &0xf );float128 ret =uint64_to_float128 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env, false,GETPC ()); +handle_exceptions (env, (m >>8 ) &1 ,GETPC ());return RET128 (ret); }/* convert 32-bit float to 64-bit int */ -uint64_t HELPER (cgeb )(CPUS390XState *env,uint64_t v2,uint32_t m3) +uint64_t HELPER (cgeb )(CPUS390XState *env,uint64_t v2,uint32_t m) { -int old_mode =s390_swap_bfp_rounding_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m &0xf );int64_t ret =float32_to_int64 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env, false,GETPC ()); +handle_exceptions (env, (m >>8 ) &1 ,GETPC ());return ret; }/* convert 64-bit float to 64-bit int */ -uint64_t HELPER (cgdb )(CPUS390XState *env,uint64_t v2,uint32_t m3) +uint64_t HELPER (cgdb )(CPUS390XState *env,uint64_t v2,uint32_t m) { -int old_mode =s390_swap_bfp_rounding_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m &0xf );int64_t ret =float64_to_int64 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env, false,GETPC ()); +handle_exceptions (env, (m >>8 ) &1 ,GETPC ());return ret; }/* convert 128-bit float to 64-bit int */ -uint64_t HELPER (cgxb )(CPUS390XState *env,uint64_t h,uint64_t l,uint32_t m3) +uint64_t HELPER (cgxb )(CPUS390XState *env,uint64_t h,uint64_t l,uint32_t m) { -int old_mode =s390_swap_bfp_rounding_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m &0xf );float128 v2 =make_float128 (h, l);int64_t ret =float128_to_int64 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env, false,GETPC ()); +handle_exceptions (env, (m >>8 ) &1 ,GETPC ());return ret; }/* convert 32-bit float to 32-bit int */ -uint64_t HELPER (cfeb )(CPUS390XState *env,uint64_t v2,uint32_t m3) +uint64_t HELPER (cfeb )(CPUS390XState *env,uint64_t v2,uint32_t m) { -int old_mode =s390_swap_bfp_rounding_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m &0xf );int32_t ret =float32_to_int32 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env, false,GETPC ()); +handle_exceptions (env, (m >>8 ) &1 ,GETPC ());return ret; }/* convert 64-bit float to 32-bit int */ -uint64_t HELPER (cfdb )(CPUS390XState *env,uint64_t v2,uint32_t m3) +uint64_t HELPER (cfdb )(CPUS390XState *env,uint64_t v2,uint32_t m) { -int old_mode =s390_swap_bfp_rounding_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m &0xf );int32_t ret =float64_to_int32 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env, false,GETPC ()); +handle_exceptions (env, (m >>8 ) &1 ,GETPC ());return ret; }/* convert 128-bit float to 32-bit int */ -uint64_t HELPER (cfxb )(CPUS390XState *env,uint64_t h,uint64_t l,uint32_t m3) +uint64_t HELPER (cfxb )(CPUS390XState *env,uint64_t h,uint64_t l,uint32_t m) { -int old_mode =s390_swap_bfp_rounding_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m &0xf );float128 v2 =make_float128 (h, l);int32_t ret =float128_to_int32 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env, false,GETPC ()); +handle_exceptions (env, (m >>8 ) &1 ,GETPC ());return ret; }/* convert 32-bit float to 64-bit uint */ -uint64_t HELPER (clgeb )(CPUS390XState *env,uint64_t v2,uint32_t m3) +uint64_t HELPER (clgeb )(CPUS390XState *env,uint64_t v2,uint32_t m) { -int old_mode =s390_swap_bfp_rounding_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m &0xf );uint64_t ret; v2 =float32_to_float64 (v2, &env->fpu_status); ret =float64_to_uint64 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env, false,GETPC ()); +handle_exceptions (env, (m >>8 ) &1 ,GETPC ());return ret; }/* convert 64-bit float to 64-bit uint */ -uint64_t HELPER (clgdb )(CPUS390XState *env,uint64_t v2,uint32_t m3) +uint64_t HELPER (clgdb )(CPUS390XState *env,uint64_t v2,uint32_t m) { -int old_mode =s390_swap_bfp_rounding_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m &0xf );uint64_t ret =float64_to_uint64 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env, false,GETPC ()); +handle_exceptions (env, (m >>8 ) &1 ,GETPC ());return ret; }/* convert 128-bit float to 64-bit uint */ -uint64_t HELPER (clgxb )(CPUS390XState *env,uint64_t h,uint64_t l,uint32_t m3) +uint64_t HELPER (clgxb )(CPUS390XState *env,uint64_t h,uint64_t l,uint32_t m) { -int old_mode =s390_swap_bfp_rounding_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m &0xf );uint64_t ret =float128_to_uint64 (make_float128 (h, l), &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env, false,GETPC ()); +handle_exceptions (env, (m >>8 ) &1 ,GETPC ());return ret; }/* convert 32-bit float to 32-bit uint */ -uint64_t HELPER (clfeb )(CPUS390XState *env,uint64_t v2,uint32_t m3) +uint64_t HELPER (clfeb )(CPUS390XState *env,uint64_t v2,uint32_t m) { -int old_mode =s390_swap_bfp_rounding_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m &0xf );uint32_t ret =float32_to_uint32 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env, false,GETPC ()); +handle_exceptions (env, (m >>8 ) &1 ,GETPC ());return ret; }/* convert 64-bit float to 32-bit uint */ -uint64_t HELPER (clfdb )(CPUS390XState *env,uint64_t v2,uint32_t m3) +uint64_t HELPER (clfdb )(CPUS390XState *env,uint64_t v2,uint32_t m) { -int old_mode =s390_swap_bfp_rounding_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m &0xf );uint32_t ret =float64_to_uint32 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env, false,GETPC ()); +handle_exceptions (env, (m >>8 ) &1 ,GETPC ());return ret; }/* convert 128-bit float to 32-bit uint */ -uint64_t HELPER (clfxb )(CPUS390XState *env,uint64_t h,uint64_t l,uint32_t m3) +uint64_t HELPER (clfxb )(CPUS390XState *env,uint64_t h,uint64_t l,uint32_t m) { -int old_mode =s390_swap_bfp_rounding_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m &0xf );uint32_t ret =float128_to_uint32 (make_float128 (h, l), &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env, false,GETPC ()); +handle_exceptions (env, (m >>8 ) &1 ,GETPC ());return ret; }/* round to integer 32-bit */ -uint64_t HELPER (fieb )(CPUS390XState *env,uint64_t f2,uint32_t m3) +uint64_t HELPER (fieb )(CPUS390XState *env,uint64_t f2,uint32_t m) { -int old_mode =s390_swap_bfp_rounding_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m &0xf );float32 ret =float32_round_to_int (f2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env, false,GETPC ()); +handle_exceptions (env, (m >>8 ) &1 ,GETPC ());return ret; }/* round to integer 64-bit */ -uint64_t HELPER (fidb )(CPUS390XState *env,uint64_t f2,uint32_t m3) +uint64_t HELPER (fidb )(CPUS390XState *env,uint64_t f2,uint32_t m) { -int old_mode =s390_swap_bfp_rounding_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m &0xf );float64 ret =float64_round_to_int (f2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env, false,GETPC ()); +handle_exceptions (env, (m >>8 ) &1 ,GETPC ());return ret; }/* round to integer 128-bit */ -uint64_t HELPER (fixb )(CPUS390XState *env,uint64_t ah,uint64_t al,uint32_t m3) +uint64_t HELPER (fixb )(CPUS390XState *env,uint64_t ah,uint64_t al,uint32_t m) { -int old_mode =s390_swap_bfp_rounding_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m &0xf );float128 ret =float128_round_to_int (make_float128 (ah, al), &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env, false,GETPC ()); +handle_exceptions (env, (m >>8 ) &1 ,GETPC ());return RET128 (ret); }
target/s390x/internal.h +6 -0
@@ -176,6 +176,12 @@ static inline uint64_t wrap_address(CPUS390XState *env, uint64_t a)return a; } +/* verify a bfp rounding mode as specified e.g. via m3 field */ +static inline bool valid_bfp_rounding_mode (uint8_t mode) +{ +return mode !=2 && mode <=7 ; +} +/* CC optimization */ /* Instead of computing the condition codes after each x86 instruction,
target/s390x/translate.c +191 -63
381 lines not on this page · raw message
Signature · 1 line
2.17.2
PATCH 11/15 s390x/tcg: Prepare for IEEE-inexact-exception control (XxC)
In reply to David HildenbrandSome instructions allow to suppress IEEE inexact exceptions.
z14 PoP, 9-23, "Suppression of Certain IEEE Exceptions"
IEEE-inexact-exception control (XxC): Bit 1 of the M4 field is the XxC bit. If XxC is zero, recogni- tion of IEEE-inexact exception is not suppressed; if XxC is one, recognition of IEEE-inexact excep- tion is suppressed.
Especially, handling for overflow/unerflow remains as is, inexact is reported along
z14 PoP, 9-23, "Suppression of Certain IEEE Exceptions"
For example, the IEEE-inexact-exception control (XxC) has no effect on the DXC; that is, the DXC for IEEE- overflow or IEEE-underflow exceptions along with the detail for exact, inexact and truncated, or inexact and incremented, is reported according to the actual con- dition.
Follow up patches will wire it correctly up for the applicable instructions.
--- target/s390x/fpu_helper.c | 112 +++++++++++++++++++------------------- 1 file changed, 56 insertions(+), 56 deletions(-)
target/s390x/fpu_helper.c +56 -56
@@ -50,7 +50,7 @@ uint8_t s390_softfloat_exc_to_ieee(unsigned int exc) }/* Should be called after any operation that may raise IEEE exceptions. */ -static void handle_exceptions (CPUS390XState *env,uintptr_t retaddr) +static void handle_exceptions (CPUS390XState *env,bool XxC,uintptr_t retaddr) {unsigned s390_exc, qemu_exc;
@@ -101,7 +101,7 @@ static void handle_exceptions(CPUS390XState *env, uintptr_t retaddr) }/* inexact handling */ -if (s390_exc &S390_IEEE_MASK_INEXACT ) { +if (s390_exc &S390_IEEE_MASK_INEXACT && !XxC) {/* trap condition - overflow/underflow _not_ reported along */ if (s390_exc &S390_IEEE_MASK_INEXACT & env->fpc >>24 ) { tcg_s390_data_exception(env, s390_exc & S390_IEEE_MASK_INEXACT,
@@ -174,7 +174,7 @@ uint32_t set_cc_nz_f128(float128 v)uint64_t HELPER (aeb )(CPUS390XState *env,uint64_t f1,uint64_t f2) {float32 ret =float32_add (f1, f2, &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -182,7 +182,7 @@ uint64_t HELPER(aeb)(CPUS390XState *env, uint64_t f1, uint64_t f2)uint64_t HELPER (adb )(CPUS390XState *env,uint64_t f1,uint64_t f2) {float64 ret =float64_add (f1, f2, &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -193,7 +193,7 @@ uint64_t HELPER(axb)(CPUS390XState *env, uint64_t ah, uint64_t al,float128 ret =float128_add (make_float128 (ah, al),make_float128 (bh, bl), &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return RET128 (ret); }
@@ -201,7 +201,7 @@ uint64_t HELPER(axb)(CPUS390XState *env, uint64_t ah, uint64_t al,uint64_t HELPER (seb )(CPUS390XState *env,uint64_t f1,uint64_t f2) {float32 ret =float32_sub (f1, f2, &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -209,7 +209,7 @@ uint64_t HELPER(seb)(CPUS390XState *env, uint64_t f1, uint64_t f2)uint64_t HELPER (sdb )(CPUS390XState *env,uint64_t f1,uint64_t f2) {float64 ret =float64_sub (f1, f2, &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -220,7 +220,7 @@ uint64_t HELPER(sxb)(CPUS390XState *env, uint64_t ah, uint64_t al,float128 ret =float128_sub (make_float128 (ah, al),make_float128 (bh, bl), &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return RET128 (ret); }
@@ -228,7 +228,7 @@ uint64_t HELPER(sxb)(CPUS390XState *env, uint64_t ah, uint64_t al,uint64_t HELPER (deb )(CPUS390XState *env,uint64_t f1,uint64_t f2) {float32 ret =float32_div (f1, f2, &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -236,7 +236,7 @@ uint64_t HELPER(deb)(CPUS390XState *env, uint64_t f1, uint64_t f2)uint64_t HELPER (ddb )(CPUS390XState *env,uint64_t f1,uint64_t f2) {float64 ret =float64_div (f1, f2, &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -247,7 +247,7 @@ uint64_t HELPER(dxb)(CPUS390XState *env, uint64_t ah, uint64_t al,float128 ret =float128_div (make_float128 (ah, al),make_float128 (bh, bl), &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return RET128 (ret); }
@@ -255,7 +255,7 @@ uint64_t HELPER(dxb)(CPUS390XState *env, uint64_t ah, uint64_t al,uint64_t HELPER (meeb )(CPUS390XState *env,uint64_t f1,uint64_t f2) {float32 ret =float32_mul (f1, f2, &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -263,7 +263,7 @@ uint64_t HELPER(meeb)(CPUS390XState *env, uint64_t f1, uint64_t f2)uint64_t HELPER (mdb )(CPUS390XState *env,uint64_t f1,uint64_t f2) {float64 ret =float64_mul (f1, f2, &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -272,7 +272,7 @@ uint64_t HELPER(mdeb)(CPUS390XState *env, uint64_t f1, uint64_t f2) {float64 ret =float32_to_float64 (f2, &env->fpu_status); ret =float64_mul (f1, ret, &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -283,7 +283,7 @@ uint64_t HELPER(mxb)(CPUS390XState *env, uint64_t ah, uint64_t al,float128 ret =float128_mul (make_float128 (ah, al),make_float128 (bh, bl), &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return RET128 (ret); }
@@ -293,7 +293,7 @@ uint64_t HELPER(mxdb)(CPUS390XState *env, uint64_t ah, uint64_t al, {float128 ret =float64_to_float128 (f2, &env->fpu_status); ret =float128_mul (make_float128 (ah, al), ret, &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return RET128 (ret); }
@@ -301,7 +301,7 @@ uint64_t HELPER(mxdb)(CPUS390XState *env, uint64_t ah, uint64_t al,uint64_t HELPER (ldeb )(CPUS390XState *env,uint64_t f2) {float64 ret =float32_to_float64 (f2, &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -309,7 +309,7 @@ uint64_t HELPER(ldeb)(CPUS390XState *env, uint64_t f2)uint64_t HELPER (ldxb )(CPUS390XState *env,uint64_t ah,uint64_t al) {float64 ret =float128_to_float64 (make_float128 (ah, al), &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -317,7 +317,7 @@ uint64_t HELPER(ldxb)(CPUS390XState *env, uint64_t ah, uint64_t al)uint64_t HELPER (lxdb )(CPUS390XState *env,uint64_t f2) {float128 ret =float64_to_float128 (f2, &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return RET128 (ret); }
@@ -325,7 +325,7 @@ uint64_t HELPER(lxdb)(CPUS390XState *env, uint64_t f2)uint64_t HELPER (lxeb )(CPUS390XState *env,uint64_t f2) {float128 ret =float32_to_float128 (f2, &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return RET128 (ret); }
@@ -333,7 +333,7 @@ uint64_t HELPER(lxeb)(CPUS390XState *env, uint64_t f2)uint64_t HELPER (ledb )(CPUS390XState *env,uint64_t f2) {float32 ret =float64_to_float32 (f2, &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -341,7 +341,7 @@ uint64_t HELPER(ledb)(CPUS390XState *env, uint64_t f2)uint64_t HELPER (lexb )(CPUS390XState *env,uint64_t ah,uint64_t al) {float32 ret =float128_to_float32 (make_float128 (ah, al), &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -349,7 +349,7 @@ uint64_t HELPER(lexb)(CPUS390XState *env, uint64_t ah, uint64_t al)uint32_t HELPER (ceb )(CPUS390XState *env,uint64_t f1,uint64_t f2) {int cmp =float32_compare_quiet (f1, f2, &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return float_comp_to_cc (env, cmp); }
@@ -357,7 +357,7 @@ uint32_t HELPER(ceb)(CPUS390XState *env, uint64_t f1, uint64_t f2)uint32_t HELPER (cdb )(CPUS390XState *env,uint64_t f1,uint64_t f2) {int cmp =float64_compare_quiet (f1, f2, &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return float_comp_to_cc (env, cmp); }
@@ -368,7 +368,7 @@ uint32_t HELPER(cxb)(CPUS390XState *env, uint64_t ah, uint64_t al,int cmp =float128_compare_quiet (make_float128 (ah, al),make_float128 (bh, bl), &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return float_comp_to_cc (env, cmp); }
@@ -413,7 +413,7 @@ uint64_t HELPER(cegb)(CPUS390XState *env, int64_t v2, uint32_t m3)float32 ret =int64_to_float32 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -424,7 +424,7 @@ uint64_t HELPER(cdgb)(CPUS390XState *env, int64_t v2, uint32_t m3)float64 ret =int64_to_float64 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -435,7 +435,7 @@ uint64_t HELPER(cxgb)(CPUS390XState *env, int64_t v2, uint32_t m3)float128 ret =int64_to_float128 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return RET128 (ret); }
@@ -446,7 +446,7 @@ uint64_t HELPER(celgb)(CPUS390XState *env, uint64_t v2, uint32_t m3)float32 ret =uint64_to_float32 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -457,7 +457,7 @@ uint64_t HELPER(cdlgb)(CPUS390XState *env, uint64_t v2, uint32_t m3)float64 ret =uint64_to_float64 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -468,7 +468,7 @@ uint64_t HELPER(cxlgb)(CPUS390XState *env, uint64_t v2, uint32_t m3)float128 ret =uint64_to_float128 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return RET128 (ret); }
@@ -479,7 +479,7 @@ uint64_t HELPER(cgeb)(CPUS390XState *env, uint64_t v2, uint32_t m3)int64_t ret =float32_to_int64 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -490,7 +490,7 @@ uint64_t HELPER(cgdb)(CPUS390XState *env, uint64_t v2, uint32_t m3)int64_t ret =float64_to_int64 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -502,7 +502,7 @@ uint64_t HELPER(cgxb)(CPUS390XState *env, uint64_t h, uint64_t l, uint32_t m3)int64_t ret =float128_to_int64 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -513,7 +513,7 @@ uint64_t HELPER(cfeb)(CPUS390XState *env, uint64_t v2, uint32_t m3)int32_t ret =float32_to_int32 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -524,7 +524,7 @@ uint64_t HELPER(cfdb)(CPUS390XState *env, uint64_t v2, uint32_t m3)int32_t ret =float64_to_int32 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -537,7 +537,7 @@ uint64_t HELPER(cfxb)(CPUS390XState *env, uint64_t h, uint64_t l, uint32_t m3)int32_t ret =float128_to_int32 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -550,7 +550,7 @@ uint64_t HELPER(clgeb)(CPUS390XState *env, uint64_t v2, uint32_t m3) v2 =float32_to_float64 (v2, &env->fpu_status); ret =float64_to_uint64 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -561,7 +561,7 @@ uint64_t HELPER(clgdb)(CPUS390XState *env, uint64_t v2, uint32_t m3)uint64_t ret =float64_to_uint64 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -572,7 +572,7 @@ uint64_t HELPER(clgxb)(CPUS390XState *env, uint64_t h, uint64_t l, uint32_t m3)uint64_t ret =float128_to_uint64 (make_float128 (h, l), &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -583,7 +583,7 @@ uint64_t HELPER(clfeb)(CPUS390XState *env, uint64_t v2, uint32_t m3)uint32_t ret =float32_to_uint32 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -594,7 +594,7 @@ uint64_t HELPER(clfdb)(CPUS390XState *env, uint64_t v2, uint32_t m3)uint32_t ret =float64_to_uint32 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -605,7 +605,7 @@ uint64_t HELPER(clfxb)(CPUS390XState *env, uint64_t h, uint64_t l, uint32_t m3)uint32_t ret =float128_to_uint32 (make_float128 (h, l), &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -616,7 +616,7 @@ uint64_t HELPER(fieb)(CPUS390XState *env, uint64_t f2, uint32_t m3)float32 ret =float32_round_to_int (f2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -627,7 +627,7 @@ uint64_t HELPER(fidb)(CPUS390XState *env, uint64_t f2, uint32_t m3)float64 ret =float64_round_to_int (f2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -639,7 +639,7 @@ uint64_t HELPER(fixb)(CPUS390XState *env, uint64_t ah, uint64_t al, uint32_t m3)float128 ret =float128_round_to_int (make_float128 (ah, al), &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return RET128 (ret); }
@@ -647,7 +647,7 @@ uint64_t HELPER(fixb)(CPUS390XState *env, uint64_t ah, uint64_t al, uint32_t m3)uint32_t HELPER (keb )(CPUS390XState *env,uint64_t f1,uint64_t f2) {int cmp =float32_compare (f1, f2, &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return float_comp_to_cc (env, cmp); }
@@ -655,7 +655,7 @@ uint32_t HELPER(keb)(CPUS390XState *env, uint64_t f1, uint64_t f2)uint32_t HELPER (kdb )(CPUS390XState *env,uint64_t f1,uint64_t f2) {int cmp =float64_compare (f1, f2, &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return float_comp_to_cc (env, cmp); }
@@ -666,7 +666,7 @@ uint32_t HELPER(kxb)(CPUS390XState *env, uint64_t ah, uint64_t al,int cmp =float128_compare (make_float128 (ah, al),make_float128 (bh, bl), &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return float_comp_to_cc (env, cmp); }
@@ -675,7 +675,7 @@ uint64_t HELPER(maeb)(CPUS390XState *env, uint64_t f1, uint64_t f2, uint64_t f3) {float32 ret =float32_muladd (f2, f3, f1,0 , &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -684,7 +684,7 @@ uint64_t HELPER(madb)(CPUS390XState *env, uint64_t f1, uint64_t f2, uint64_t f3) {float64 ret =float64_muladd (f2, f3, f1,0 , &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -694,7 +694,7 @@ uint64_t HELPER(mseb)(CPUS390XState *env, uint64_t f1, {float32 ret =float32_muladd (f2, f3, f1, float_muladd_negate_c, &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -704,7 +704,7 @@ uint64_t HELPER(msdb)(CPUS390XState *env, uint64_t f1, {float64 ret =float64_muladd (f2, f3, f1, float_muladd_negate_c, &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -809,7 +809,7 @@ uint32_t HELPER(tcxb)(CPUS390XState *env, uint64_t ah,uint64_t HELPER (sqeb )(CPUS390XState *env,uint64_t f2) {float32 ret =float32_sqrt (f2, &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -817,7 +817,7 @@ uint64_t HELPER(sqeb)(CPUS390XState *env, uint64_t f2)uint64_t HELPER (sqdb )(CPUS390XState *env,uint64_t f2) {float64 ret =float64_sqrt (f2, &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return ret; }
@@ -825,7 +825,7 @@ uint64_t HELPER(sqdb)(CPUS390XState *env, uint64_t f2)uint64_t HELPER (sqxb )(CPUS390XState *env,uint64_t ah,uint64_t al) {float128 ret =float128_sqrt (make_float128 (ah, al), &env->fpu_status); -handle_exceptions (env,GETPC ()); +handle_exceptions (env, false,GETPC ());return RET128 (ret); }
Signature · 1 line
2.17.2
PATCH 13/15 s390x/tcg: Implement rounding mode and XxC for LOAD ROUNDED
In reply to David HildenbrandWith the floating-point extension facility, LOAD ROUNDED has a rounding mode specification and the inexact-exception control (XxC).
Handle them just like e.g. LOAD FP INTEGER.
--- target/s390x/fpu_helper.c | 22 ++++++++++++++++------ target/s390x/helper.h | 6 +++--- target/s390x/insn-data.def | 6 +++--- target/s390x/translate.c | 30 +++++++++++++++++++++++++++--- 4 files changed, 49 insertions(+), 15 deletions(-)
target/s390x/fpu_helper.c +16 -6
@@ -306,10 +306,14 @@ uint64_t HELPER(ldeb)(CPUS390XState *env, uint64_t f2) }/* convert 128-bit float to 64-bit float */ -uint64_t HELPER (ldxb )(CPUS390XState *env,uint64_t ah,uint64_t al) +uint64_t HELPER (ldxb )(CPUS390XState *env,uint64_t ah,uint64_t al,uint32_t m) { +int old_mode =s390_swap_bfp_rounding_mode (env, m &0xf ); + +s390_restore_bfp_rounding_mode (env, old_mode);float64 ret =float128_to_float64 (make_float128 (ah, al), &env->fpu_status); -handle_exceptions (env, false,GETPC ()); +s390_restore_bfp_rounding_mode (env, old_mode); +handle_exceptions (env, (m >>8 ) &1 ,GETPC ());return ret; }
@@ -330,18 +334,24 @@ uint64_t HELPER(lxeb)(CPUS390XState *env, uint64_t f2) }/* convert 64-bit float to 32-bit float */ -uint64_t HELPER (ledb )(CPUS390XState *env,uint64_t f2) +uint64_t HELPER (ledb )(CPUS390XState *env,uint64_t f2,uint32_t m) { +int old_mode =s390_swap_bfp_rounding_mode (env, m &0xf );float32 ret =float64_to_float32 (f2, &env->fpu_status); -handle_exceptions (env, false,GETPC ()); + +s390_restore_bfp_rounding_mode (env, old_mode); +handle_exceptions (env, (m >>8 ) &1 ,GETPC ());return ret; }/* convert 128-bit float to 32-bit float */ -uint64_t HELPER (lexb )(CPUS390XState *env,uint64_t ah,uint64_t al) +uint64_t HELPER (lexb )(CPUS390XState *env,uint64_t ah,uint64_t al,uint32_t m) { +int old_mode =s390_swap_bfp_rounding_mode (env, m &0xf );float32 ret =float128_to_float32 (make_float128 (ah, al), &env->fpu_status); -handle_exceptions (env, false,GETPC ()); + +s390_restore_bfp_rounding_mode (env, old_mode); +handle_exceptions (env, (m >>8 ) &1 ,GETPC ());return ret; }
target/s390x/helper.h +3 -3
@@ -53,11 +53,11 @@ DEF_HELPER_FLAGS_3(mdb, TCG_CALL_NO_WG, i64, env, i64, i64) DEF_HELPER_FLAGS_5(mxb, TCG_CALL_NO_WG, i64, env, i64, i64, i64, i64) DEF_HELPER_FLAGS_4(mxdb, TCG_CALL_NO_WG, i64, env, i64, i64, i64) DEF_HELPER_FLAGS_2(ldeb, TCG_CALL_NO_WG, i64, env, i64) -DEF_HELPER_FLAGS_3(ldxb, TCG_CALL_NO_WG, i64, env, i64, i64) +DEF_HELPER_FLAGS_4(ldxb, TCG_CALL_NO_WG, i64, env, i64, i64, i32) DEF_HELPER_FLAGS_2(lxdb, TCG_CALL_NO_WG, i64, env, i64) DEF_HELPER_FLAGS_2(lxeb, TCG_CALL_NO_WG, i64, env, i64) -DEF_HELPER_FLAGS_2(ledb, TCG_CALL_NO_WG, i64, env, i64) -DEF_HELPER_FLAGS_3(lexb, TCG_CALL_NO_WG, i64, env, i64, i64) +DEF_HELPER_FLAGS_3(ledb, TCG_CALL_NO_WG, i64, env, i64, i32) +DEF_HELPER_FLAGS_4(lexb, TCG_CALL_NO_WG, i64, env, i64, i64, i32) DEF_HELPER_FLAGS_3(ceb, TCG_CALL_NO_WG_SE, i32, env, i64, i64) DEF_HELPER_FLAGS_3(cdb, TCG_CALL_NO_WG_SE, i32, env, i64, i64)DEF_HELPER_FLAGS_5 (cxb,TCG_CALL_NO_WG_SE , i32, env, i64, i64, i64, i64)
target/s390x/insn-data.def +3 -3
@@ -599,9 +599,9 @@ F(0xed05, LXDB, RXE, Z, 0, m2_64, new_P, x1, lxdb, 0, IF_BFP) F(0xed06, LXEB, RXE, Z, 0, m2_32u, new_P, x1, lxeb, 0, IF_BFP) /* LOAD ROUNDED */ - F(0xb344, LEDBR, RRE, Z, 0, f2, new, e1, ledb, 0, IF_BFP) - F(0xb345, LDXBR, RRE, Z, x2h, x2l, new, f1, ldxb, 0, IF_BFP) - F(0xb346, LEXBR, RRE, Z, x2h, x2l, new, e1, lexb, 0, IF_BFP) + F(0xb344, LEDBR, RRF_e, Z, 0, f2, new, e1, ledb, 0, IF_BFP) + F(0xb345, LDXBR, RRF_e, Z, x2h, x2l, new, f1, ldxb, 0, IF_BFP) + F(0xb346, LEXBR, RRF_e, Z, x2h, x2l, new, e1, lexb, 0, IF_BFP) /* LOAD MULTIPLE */ C(0x9800, LM, RS_a, Z, 0, a2, 0, 0, lm32, 0)
target/s390x/translate.c +27 -3
@@ -2806,19 +2806,43 @@ static DisasJumpType op_ldeb(DisasContext *s, DisasOps *o)static DisasJumpType op_ledb (DisasContext *s,DisasOps *o) { -gen_helper_ledb (o->out, cpu_env, o->in2); +TCGv_i32 m; + +if (!valid_bfp_rounding_mode (get_field (s->fields, m3))) { +gen_program_exception (s,PGM_SPECIFICATION ); +return DISAS_NORETURN ; + } + m =tcg_const_i32 (get_fields2 (s->fields, m3, m4)); +gen_helper_ledb (o->out, cpu_env, o->in2, m); +tcg_temp_free_i32 (m);return DISAS_NEXT ; }static DisasJumpType op_ldxb (DisasContext *s,DisasOps *o) { -gen_helper_ldxb (o->out, cpu_env, o->in1, o->in2); +TCGv_i32 m; + +if (!valid_bfp_rounding_mode (get_field (s->fields, m3))) { +gen_program_exception (s,PGM_SPECIFICATION ); +return DISAS_NORETURN ; + } + m =tcg_const_i32 (get_fields2 (s->fields, m3, m4)); +gen_helper_ldxb (o->out, cpu_env, o->in1, o->in2, m); +tcg_temp_free_i32 (m);return DISAS_NEXT ; }static DisasJumpType op_lexb (DisasContext *s,DisasOps *o) { -gen_helper_lexb (o->out, cpu_env, o->in1, o->in2); +TCGv_i32 m; + +if (!valid_bfp_rounding_mode (get_field (s->fields, m3))) { +gen_program_exception (s,PGM_SPECIFICATION ); +return DISAS_NORETURN ; + } + m =tcg_const_i32 (get_fields2 (s->fields, m3, m4)); +gen_helper_lexb (o->out, cpu_env, o->in1, o->in2, m); +tcg_temp_free_i32 (m);return DISAS_NEXT ; }
Signature · 1 line
2.17.2
PATCH 14/15 s390x/tcg: Handle all rounding modes overwritten by BFP instructions
In reply to David HildenbrandPoP describes "Round to nearest with ties away from 0" as
"The candidate nearest to the input value is selected. In case of a tie,
the candidate selected is the one that is larger in magnitude."
While float_round_ties_away is according to the introducing commit f9288a76f181 ("softfloat: Add support for ties-away rounding")
"roundTiesToAway: the floating-point number nearest to the infinitely
precise result shall be delivered; if the two nearest floating-point numbers bracketing an unrepresentable infinitely precise result are equally near, the one with larger magnitude shall be delivered."
So this could be it if we're lucky ;)
Handle "round to prepare for shorter precision" just as when setting it via SET FLOATING POINT and friends.
As all instructions properly check for valid rounding modes in translate.c we can add an assert. Fix one missing empty line.
--- target/s390x/fpu_helper.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
target/s390x/fpu_helper.c +16 -2
@@ -385,14 +385,26 @@ uint32_t HELPER(cxb)(CPUS390XState *env, uint64_t ah, uint64_t al,int s390_swap_bfp_rounding_mode (CPUS390XState *env,int m3) {int ret = env->fpu_status.float_rounding_mode; +switch (m3) {case 0 :/* current mode */ break ;case 1 : -/* biased round no nearest */ +/* round to nearest with ties away from 0 */ +set_float_rounding_mode (float_round_ties_away, &env->fpu_status); +break ; +case 3 : +/* +* round to prepare for shorter precision +* +* FIXME: we actually want something like round_to_odd, but that +* does not support all data types yet. +*/ +set_float_rounding_mode (float_round_to_zero, &env->fpu_status); +break ;case 4 : -/* round to nearest */ +/* round to nearest with ties to even */ set_float_rounding_mode (float_round_nearest_even, &env->fpu_status);break ;case 5 :
@@ -407,6 +419,8 @@ int s390_swap_bfp_rounding_mode(CPUS390XState *env, int m3)/* round to -inf */ set_float_rounding_mode (float_round_down, &env->fpu_status);break ; +default : +g_assert_not_reached (); }return ret; }
Signature · 1 line
2.17.2
Quoted 21 lines · David Hildenbrand
The floating-point extension facility implemented certain changes to BFP, HFP and DFP instructions.
As we don't implement HFP/DFP, we can ignore those completely. Related to BFP, the changes include
- SET BFP ROUNDING MODE (SRNMB) instruction
- BFP-rounding-mode field in the FPC register is changed to 3 bits
- CONVERT FROM LOGICAL instructions
- CONVERT TO LOGICAL instructions
- Changes (rounding mode + XxC) added to
-- CONVERT TO FIXED
-- CONVERT FROM FIXED
-- LOAD FP INTEGER
-- LOAD ROUNDED
-- DIVIDE TO INTEGERFor TCG, we don't implement DIVIDE TO INTEGER, and it is harder to implement, so skip that. Also, as we don't implement PFPO, we can skip changes to that as well. The other parts are now implemented, we can indicate the facility.
Quoted 6 lines
z14 PoP mentiones that "The floating-point extension facility is installed in the z/Architecture architectural mode. When bit 37 is one, bit 42 is also one.", meaning that the DFP (decimal-floating-point) facility also has to be inidicated. We can ignore that for now.
Signed-off-by David Hildenbrand <[email protected]>
This is the same patch as 15/15, refer to 0/15 as cover letter instead.
Signature · 3 lines
Thanks, David / dhildenb
PATCH 15/15 s390x: Add floating-point extension facility to "qemu" cpu model
In reply to David HildenbrandThe floating-point extension facility implemented certain changes to BFP, HFP and DFP instructions.
As we don't implement HFP/DFP, we can ignore those completely. Related to BFP, the changes include
- SET BFP ROUNDING MODE (SRNMB) instruction
- BFP-rounding-mode field in the FPC register is changed to 3 bits
- CONVERT FROM LOGICAL instructions
- CONVERT TO LOGICAL instructions
- Changes (rounding mode + XxC) added to
-- CONVERT TO FIXED
-- CONVERT FROM FIXED
-- LOAD FP INTEGER
-- LOAD ROUNDED
-- DIVIDE TO INTEGER
For TCG, we don't implement DIVIDE TO INTEGER, and it is harder to implement, so skip that. Also, as we don't implement PFPO, we can skip changes to that as well. The other parts are now implemented, we can indicate the facility.
z14 PoP mentiones that "The floating-point extension facility is installed in the z/Architecture architectural mode. When bit 37 is one, bit 42 is also one.", meaning that the DFP (decimal-floating-point) facility also has to be inidicated. We can ignore that for now.
--- target/s390x/gen-features.c | 5 +++++ 1 file changed, 5 insertions(+)
target/s390x/gen-features.c +5 -0
@@ -593,6 +593,11 @@ static uint16_t qemu_V3_1[] = { };static uint16_t qemu_LATEST[] = { +/* +* Only BFP bits are implemented (HFP, DFP, PFPO and DIVIDE TO INTEGER not +* implemented yet). +*/ +S390_FEAT_FLOATING_POINT_EXT ,S390_FEAT_ZPCI , };
Signature · 1 line
2.17.2
Re: [Qemu-devel] [PATCH v1 05/15] s390x/tcg: Hide IEEE underflows in some scenarios
In reply to David HildenbrandQuoted 11 lines · David Hildenbrand
IEEE underflows are not reported when the mask bit is off and we don't also have an inexact exception.
z14 PoP, 9-20, "IEEE Underflow":
An IEEE-underflow exception is recognized for an IEEE target when the tininess condition exists and
either: (1) the IEEE-underflow mask bit in the FPC register is zero and the result value is inexact, or (2) the IEEE-underflow mask bit in the FPC register is one.
Quoted 4 lines
Signed-off-by David Hildenbrand <[email protected]>--- target/s390x/fpu_helper.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
r~
Re: [Qemu-devel] [PATCH v1 04/15] s390x/tcg: Fix parts of IEEE exception handling
In reply to David HildenbrandQuoted 10 lines · David Hildenbrand
Many things are wrong and some parts cannot be fixed yet. Fix what we can fix easily and add two FIXMEs:
The fpc flags are not updated in case an exception is actually injected. Inexact exceptions have to be handled separately, as they are the only exceptions that can coexist with underflows and overflows.
I reread the horribly complicated chapters in the PoP at least 5 times and hope I got it right.
Quoted 8 lines
For references:
- z14 PoP, 9-18, "IEEE Exceptions"
- z14 PoP, 19-9, Figure 19-8Signed-off-by David Hildenbrand <[email protected]>--- target/s390x/fpu_helper.c | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-)
r~
Re: [Qemu-devel] [PATCH v1 03/15] s390x/tcg: Factor out conversion of softfloat exceptions
In reply to David HildenbrandQuoted 9 lines · David Hildenbrand
We want to reuse that function in vector instruction context. While at it, cleanup the code, using defines for magic values and avoiding the handcrafted bit conversion.
Signed-off-by David Hildenbrand <[email protected]>--- target/s390x/fpu_helper.c | 25 +++++++++++++------------ target/s390x/internal.h | 7 +++++++ 2 files changed, 20 insertions(+), 12 deletions(-)
r~
Re: [Qemu-devel] [PATCH v1 02/15] s390x/tcg: Fix rounding from float128 to uint64_t/uin32_t
In reply to David HildenbrandQuoted 1 line · David Hildenbrand
Let's use the proepr conversion functions now that we have them.
"proper"
r~
Re: [Qemu-devel] [PATCH v1 01/15] s390x/tcg: Fix TEST DATA CLASS instructions
In reply to David HildenbrandQuoted 8 lines · David Hildenbrand
target/s390x/fpu_helper.c +8
-0+static bool s390_tdc32 (CPUS390XState *env,float32 f1,uint16_t dc_mask) +{ +const bool neg =float32_is_neg (f1); +const bool zero =float32_is_zero (f1); +const bool normal =float32_is_normal (f1); +const bool denormal =float32_is_denormal (f1); +const bool infinity =float32_is_infinity (f1); +const bool quiet_nan =float32_is_quiet_nan (f1, &env->fpu_status);
target/s390x/fpu_helper.c uint64_t HELPER(msdb)(CPUS390XState *env, uint64_t f1, · line 673
Quoted 10 lines
target/s390x/fpu_helper.c +10
-0+const bool sig_nan =float32_is_signaling_nan (f1, &env->fpu_status); + +return (zero &&test_dc_mask (dc_mask,0 , neg)) || + (normal &&test_dc_mask (dc_mask,2 , neg)) || + (denormal &&test_dc_mask (dc_mask,4 , neg)) || + (infinity &&test_dc_mask (dc_mask,6 , neg)) || + (quiet_nan &&test_dc_mask (dc_mask,8 , neg)) || + (sig_nan &&test_dc_mask (dc_mask,10 , neg)); +} +
This is doing more work than necessary, since any one fp value can only be one of these.
I think it would be better to structure this like the riscv helper_fclass_*:
static inline uint32_t dcmask(int bit, bool neg)
{
return 1 << (11 - bit - neg);
}static uint32_t float32_dcmask(CPUS390XState *env, float32 f1)
{
bool neg = float32_is_neg(f1);
/* Sorted by most common cases. */
if (float32_is_normal(f1)) {
return dc_mask(2, neg);
} else if (float32_is_zero(f1)) {
return dc_mask(0, neg);
} else if (float32_is_zero_or_denormal(f1)) {
/* denormal, since zero is eliminated */
return dc_mask(4, neg);
} else if (float32_is_infinity(f1)) {
return dc_mask(6, neg);
} else if (float64_is_quiet_nan(f1, &env->fpu_status)) {
return dc_mask(8, neg);
} else {
/* signaling nan, as last remaining case */
return dc_mask(10, neg);
}
}uint32_t HELPER(tceb)(CPUS390XState *env, uint64_t f1, uint64_t m2)
{
return (m2 & float32_dcmask(env, f1)) != 0;
}You may or may not wish to macro-ise float32_dcmask for the float type.
r~
Re: [Qemu-devel] [PATCH v1 01/15] s390x/tcg: Fix TEST DATA CLASS instructions
Quoted 53 lines · Richard Henderson
Quoted 8 lines · David Hildenbrand
target/s390x/fpu_helper.c +8
-0+static bool s390_tdc32 (CPUS390XState *env,float32 f1,uint16_t dc_mask) +{ +const bool neg =float32_is_neg (f1); +const bool zero =float32_is_zero (f1); +const bool normal =float32_is_normal (f1); +const bool denormal =float32_is_denormal (f1); +const bool infinity =float32_is_infinity (f1); +const bool quiet_nan =float32_is_quiet_nan (f1, &env->fpu_status);target/s390x/fpu_helper.c uint64_t HELPER(msdb)(CPUS390XState *env, uint64_t f1, · line 673
Quoted 10 lines
target/s390x/fpu_helper.c +10
-0+const bool sig_nan =float32_is_signaling_nan (f1, &env->fpu_status); + +return (zero &&test_dc_mask (dc_mask,0 , neg)) || + (normal &&test_dc_mask (dc_mask,2 , neg)) || + (denormal &&test_dc_mask (dc_mask,4 , neg)) || + (infinity &&test_dc_mask (dc_mask,6 , neg)) || + (quiet_nan &&test_dc_mask (dc_mask,8 , neg)) || + (sig_nan &&test_dc_mask (dc_mask,10 , neg)); +} +This is doing more work than necessary, since any one fp value can only be one of these.
I think it would be better to structure this like the riscv helper_fclass_*:
static inline
uint32_tdcmask(int bit, bool neg){ return 1 << (11 - bit - neg); }static
uint32_tfloat32_dcmask(CPUS390XState *env, float32 f1){ bool neg = float32_is_neg(f1); /* Sorted by most common cases. */ if (float32_is_normal(f1)) { return dc_mask(2, neg); } else if (float32_is_zero(f1)) { return dc_mask(0, neg); } else if (float32_is_zero_or_denormal(f1)) { /* denormal, since zero is eliminated */ return dc_mask(4, neg); } else if (float32_is_infinity(f1)) { return dc_mask(6, neg); } else if (float64_is_quiet_nan(f1, &env->fpu_status)) { return dc_mask(8, neg); } else { /* signaling nan, as last remaining case */ return dc_mask(10, neg); } }
uint32_tHELPER(tceb)(CPUS390XState *env,uint64_tf1,uint64_tm2)
Quoted 9 lines
{ return (m2 & float32_dcmask(env, f1)) != 0; }You may or may not wish to macro-ise
float32_dcmaskfor the float type.r~
Indeed, makes sense! Also thought about macros, but I guess the huge pile of code for vector instruction support I have lying around make me lazy :)
Thanks!
Signature · 3 lines
Thanks, David / dhildenb
Re: [Qemu-devel] [PATCH v1 06/15] s390x/tcg: Refactor SET FPC AND SIGNAL handling
In reply to David HildenbrandQuoted 9 lines · David Hildenbrand
We can directly work on the
uint64_tvalue, no need for a temporaryuint32_tvalue.Also cleanup and shorten the comments.
Signed-off-by David Hildenbrand <[email protected]>--- target/s390x/fpu_helper.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
r~
Re: [Qemu-devel] [PATCH v1 07/15] s390x/tcg: Fix simulated-IEEE exceptions
In reply to David HildenbrandQuoted 9 lines · David Hildenbrand
The trap is triggered based on priority of the enabled signaling flags. Only overflow and underflow allow a concurrent inexact exception.
z14 PoP, 9-33, Figure 9-21
Signed-off-by David Hildenbrand <[email protected]>--- target/s390x/fpu_helper.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
r~
Re: [Qemu-devel] [PATCH v1 08/15] s390x/tcg: Handle SET FPC AND LOAD FPC 3-bit BFP rounding modes
In reply to David HildenbrandQuoted 22 lines · David Hildenbrand
We already forward the 3 bits correctly in the translation functions. We also have to handle them properly and check for specification exceptions.
Setting an invalid rounding mode (BFP only, all DFP rounding modes) results in a specification exception. Setting unassigned bits in the fpc, results in a specification exception.
This fixes LOAD FPC (AND SIGNAL), SET FPC (AND SIGNAL). Also for, SET BFP ROUNDING MODE, 3-bit rounding mode is now explicitly checked.
Notes:
1. Use "float_round_to_zero" for now to handle "Round to prepare for shorter precision". Looking at the PoP "Summary of Rounding and Range Actions" for BFP. They differ when it comes to tiny values.
2.TCG_CALL_NO_WGis required for sfpc handler, as we now inject exceptions.We won't be modeling abscence of the "floating-point extension facility" for now, not necessary as most take the facility for granted without checking.
Quoted 6 lines
z14 PoP, 9-23, "LOAD FPC"
When the floating-point extension facility is installed, bits 29-31 of the second operand must specify a valid BFP rounding mode and bits 6-7, 14-15, 24, and 28 must be zero; otherwise, a specification exception is recognized.
target/s390x/fpu_helper.c uint64_t HELPER(sqxb)(CPUS390XState *env, uint64_t ah, uint64_t al) · line 817
Quoted 5 lines
target/s390x/fpu_helper.c +5
-0+/* +* FIXME: we actually want something like round_to_odd, but that does not +* support all data types yet. +*/ + float_round_to_zero,
Yes, you want round_to_odd. I suppose that's not valid for float128 right now?
r~
Re: [Qemu-devel] [PATCH v1 08/15] s390x/tcg: Handle SET FPC AND LOAD FPC 3-bit BFP rounding modes
Quoted 33 lines · Richard Henderson
Quoted 22 lines · David Hildenbrand
We already forward the 3 bits correctly in the translation functions. We also have to handle them properly and check for specification exceptions.
Setting an invalid rounding mode (BFP only, all DFP rounding modes) results in a specification exception. Setting unassigned bits in the fpc, results in a specification exception.
This fixes LOAD FPC (AND SIGNAL), SET FPC (AND SIGNAL). Also for, SET BFP ROUNDING MODE, 3-bit rounding mode is now explicitly checked.
Notes:
1. Use "float_round_to_zero" for now to handle "Round to prepare for shorter precision". Looking at the PoP "Summary of Rounding and Range Actions" for BFP. They differ when it comes to tiny values.
2.TCG_CALL_NO_WGis required for sfpc handler, as we now inject exceptions.We won't be modeling abscence of the "floating-point extension facility" for now, not necessary as most take the facility for granted without checking.
Quoted 6 lines
z14 PoP, 9-23, "LOAD FPC"
When the floating-point extension facility is installed, bits 29-31 of the second operand must specify a valid BFP rounding mode and bits 6-7, 14-15, 24, and 28 must be zero; otherwise, a specification exception is recognized.Reviewed-by Richard Henderson <[email protected]>
Quoted 7 lines
target/s390x/fpu_helper.c uint64_t HELPER(sqxb)(CPUS390XState *env, uint64_t ah, uint64_t al) · line 817
Quoted 5 lines
target/s390x/fpu_helper.c +5
-0+/* +* FIXME: we actually want something like round_to_odd, but that does not +* support all data types yet. +*/ + float_round_to_zero,Yes, you want
round_to_odd. I suppose that's not valid for float128 right now?
roundAndPackFloat64()
as well as
roundAndPackFloat128()
support it.
It's not implemented for round_canonical(), round_to_int(), roundAndPackInt32(), roundAndPackInt64(), roundAndPackUint64(), roundAndPackFloat32() (and roundAndPackFloatx80()).
I assume at least 32bit is missing. I can't judge if the other functions are relevant (x80 clearly not).
Quoted 4 lines
r~
Signature · 3 lines
Thanks, David / dhildenb
Re: [Qemu-devel] [PATCH v1 08/15] s390x/tcg: Handle SET FPC AND LOAD FPC 3-bit BFP rounding modes
Quoted 11 lines · David Hildenbrand
Quoted 1 line
Yes, you want
round_to_odd. I suppose that's not valid for float128 right now?
roundAndPackFloat64()as well as
roundAndPackFloat128()support it.
It's not implemented for
round_canonical(),round_to_int(),
These two are easy. I think Alex and I didn't implement it in the float32/64 rewrite because we didn't have a user. Now we will.
Quoted 2 lines
roundAndPackInt32(),roundAndPackInt64(),roundAndPackUint64(),roundAndPackFloat32()
Right, these would be from the float128 side. It shouldn't be too hard...
r~
Re: [Qemu-devel] [PATCH v1 09/15] s390x/tcg: Check for exceptions in SET BFP ROUNDING MODE
In reply to David HildenbrandQuoted 6 lines · David Hildenbrand
Let's split handling of BFP/DFP rounding mode configuration. Also, let's not reuse the sfpc handler, use a separate handler so we can properly check for specification exceptions for SRNMB.
Signed-off-by David Hildenbrand <[email protected]>---
r~
Re: [Qemu-devel] [PATCH v1 10/15] s390x/tcg: Refactor saving/restoring the bfp rounding mode
In reply to David HildenbrandQuoted 7 lines · David Hildenbrand
We want to reuse this in the context of vector instructions. So use better matching names and introduce
s390_restore_bfp_rounding_mode().While at it, add proper newlines.
Signed-off-by David Hildenbrand <[email protected]>---
r~
Re: [Qemu-devel] [PATCH v1 11/15] s390x/tcg: Prepare for IEEE-inexact-exception control (XxC)
In reply to David HildenbrandQuoted 20 lines · David Hildenbrand
Some instructions allow to suppress IEEE inexact exceptions.
z14 PoP, 9-23, "Suppression of Certain IEEE Exceptions"
IEEE-inexact-exception control (XxC): Bit 1 of the M4 field is the XxC bit. If XxC is zero, recogni- tion of IEEE-inexact exception is not suppressed; if XxC is one, recognition of IEEE-inexact excep- tion is suppressed.Especially, handling for overflow/unerflow remains as is, inexact is reported along
z14 PoP, 9-23, "Suppression of Certain IEEE Exceptions"
For example, the IEEE-inexact-exception control (XxC) has no effect on the DXC; that is, the DXC for IEEE- overflow or IEEE-underflow exceptions along with the detail for exact, inexact and truncated, or inexact and incremented, is reported according to the actual con- dition.
Quoted 7 lines
Follow up patches will wire it correctly up for the applicable instructions.
Signed-off-by David Hildenbrand <[email protected]>--- target/s390x/fpu_helper.c | 112 +++++++++++++++++++------------------- 1 file changed, 56 insertions(+), 56 deletions(-)
r~
Re: [Qemu-devel] [PATCH v1 12/15] s390x/tcg: Implement XxC and checks for most FP instructions
In reply to David Hildenbrandtarget/s390x/fpu_helper.c void s390_restore_bfp_rounding_mode(CPUS390XState *env, int old_mode) · line 418
Quoted 12 lines · David Hildenbrand
target/s390x/fpu_helper.c +3
-3-uint64_t HELPER (cegb )(CPUS390XState *env,int64_t v2,uint32_t m3) +uint64_t HELPER (cegb )(CPUS390XState *env,int64_t v2,uint32_t m) { -int old_mode =s390_swap_bfp_rounding_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m &0xf );float32 ret =int64_to_float32 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env, false,GETPC ()); +handle_exceptions (env, (m >>8 ) &1 ,GETPC ());return ret; }
It might be helpful to have inlines for these extractions. E.g
static inline uint32_t round_from_m34(uint32_t m); static inline bool xxc_from_m34(uint32_t m);
Quoted 7 lines
static DisasJumpType
op_cfeb(DisasContext *s, DisasOps *o){target/s390x/translate.c +2
-3-TCGv_i32 m3 =tcg_const_i32 (get_field (s->fields, m3)); -gen_helper_cfeb (o->out, cpu_env, o->in2, m3); -tcg_temp_free_i32 (m3); +TCGv_i32 m; +
target/s390x/translate.c static DisasJumpType op_cxb(DisasContext *s, DisasOps *o) · line 1776
Quoted 10 lines
target/s390x/translate.c +7
-0+if (!valid_bfp_rounding_mode (get_field (s->fields, m3))) { +gen_program_exception (s,PGM_SPECIFICATION ); +return DISAS_NORETURN ; + } + m =tcg_const_i32 (get_fields2 (s->fields, m3, m4)); +gen_helper_cfeb (o->out, cpu_env, o->in2, m); +tcg_temp_free_i32 (m);gen_set_cc_nz_f32 (s, o->in2);return DISAS_NEXT ; }
The m4 field does not exist unless fp extension facility is enabled. You should ignore the field if not installed.
It would be good to split this out to a helper, since there are so many copies.
E.g.
static bool extract_m3_m4(DisasContext *s, uint32_t *m34)
{
int m3 = get_field(s->fields, m3);
int m4 = get_field(s->fields, m4);
if (!valid_bfp_rounding_mode(m3)) {
gen_program_exception(s, PGM_SPECIFICATION);
return false;
}
if (feature) {
return deposit32(m3, 8, 1, m4);
}
return m3;
}Hmm.. Except that I see we don't have enough stored in DisasContext to allow you to look up the proper feature. So perhaps just a FIXME for now?
r~
Re: [Qemu-devel] [PATCH v1 13/15] s390x/tcg: Implement rounding mode and XxC for LOAD ROUNDED
In reply to David HildenbrandQuoted 7 lines · David Hildenbrand
With the floating-point extension facility, LOAD ROUNDED has a rounding mode specification and the inexact-exception control (XxC).
Handle them just like e.g. LOAD FP INTEGER.
Signed-off-by David Hildenbrand <[email protected]>---
Modulo the comments for patch 12,
r~
Re: [Qemu-devel] [PATCH v1 14/15] s390x/tcg: Handle all rounding modes overwritten by BFP instructions
In reply to David HildenbrandQuoted 4 lines · David Hildenbrand
PoP describes "Round to nearest with ties away from 0" as
"The candidate nearest to the input value is selected. In case of a tie,
the candidate selected is the one that is larger in magnitude."
Quoted 8 lines
While
float_round_ties_awayis according to the introducing commitf9288a76f181("softfloat: Add support for ties-away rounding")
"roundTiesToAway: the floating-point number nearest to the infinitely
precise result shall be delivered; if the two nearest floating-point numbers bracketing an unrepresentable infinitely precise result are equally near, the one with larger magnitude shall be delivered."So this could be it if we're lucky ;)
Yep, that's right.
Quoted 10 lines
Handle "round to prepare for shorter precision" just as when setting it via SET FLOATING POINT and friends.
As all instructions properly check for valid rounding modes in
translate.cwe can add an assert. Fix one missing empty line.Cc Peter Maydell <[email protected]>Signed-off-by David Hildenbrand <[email protected]>---
r~
Re: [Qemu-devel] [PATCH v1 12/15] s390x/tcg: Implement XxC and checks for most FP instructions
In reply to Richard HendersonQuoted 37 lines · Richard Henderson
target/s390x/fpu_helper.c void s390_restore_bfp_rounding_mode(CPUS390XState *env, int old_mode) · line 418
Quoted 12 lines · David Hildenbrand
target/s390x/fpu_helper.c +3
-3-uint64_t HELPER (cegb )(CPUS390XState *env,int64_t v2,uint32_t m3) +uint64_t HELPER (cegb )(CPUS390XState *env,int64_t v2,uint32_t m) { -int old_mode =s390_swap_bfp_rounding_mode (env, m3); +int old_mode =s390_swap_bfp_rounding_mode (env, m &0xf );float32 ret =int64_to_float32 (v2, &env->fpu_status);s390_restore_bfp_rounding_mode (env, old_mode); -handle_exceptions (env, false,GETPC ()); +handle_exceptions (env, (m >>8 ) &1 ,GETPC ());return ret; }It might be helpful to have inlines for these extractions. E.g
static inline
uint32_tround_from_m34(uint32_t m); static inline boolxxc_from_m34(uint32_t m);Quoted 7 lines
static DisasJumpType
op_cfeb(DisasContext *s, DisasOps *o){target/s390x/translate.c +2
-3-TCGv_i32 m3 =tcg_const_i32 (get_field (s->fields, m3)); -gen_helper_cfeb (o->out, cpu_env, o->in2, m3); -tcg_temp_free_i32 (m3); +TCGv_i32 m; +target/s390x/translate.c static DisasJumpType op_cxb(DisasContext *s, DisasOps *o) · line 1776
Quoted 10 lines
target/s390x/translate.c +7
-0+if (!valid_bfp_rounding_mode (get_field (s->fields, m3))) { +gen_program_exception (s,PGM_SPECIFICATION ); +return DISAS_NORETURN ; + } + m =tcg_const_i32 (get_fields2 (s->fields, m3, m4)); +gen_helper_cfeb (o->out, cpu_env, o->in2, m); +tcg_temp_free_i32 (m);gen_set_cc_nz_f32 (s, o->in2);return DISAS_NEXT ; }
Quoted 2 lines
The m4 field does not exist unless fp extension facility is enabled. You should ignore the field if not installed.
As all users I know already take the floating-point extension facility for granted, I wanted to avoid faking it away for now. Old implementations set all fields to zero either way. But I'll take another shot if it can be easily added without uglifying the code.
Quoted 5 lines
It would be good to split this out to a helper, since there are so many copies.
E.g.static bool
extract_m3_m4(DisasContext *s, uint32_t *m34)
Quoted 13 lines
{
int m3 = get_field(s->fields, m3);
int m4 = get_field(s->fields, m4);
if (!valid_bfp_rounding_mode(m3)) {
gen_program_exception(s, PGM_SPECIFICATION);
return false;
}
if (feature) {
return deposit32(m3, 8, 1, m4);
}
return m3;
}Okay, I'll play with it to see what the end result would look like.
Quoted 3 lines
Hmm.. Except that I see we don't have enough stored in DisasContext to allow you to look up the proper feature. So perhaps just a FIXME for now?
We do have s390_has_feat(S390_FEAT_FLOATING_POINT_EXT)
Quoted 4 lines
r~
Signature · 3 lines
Thanks, David / dhildenb
Re: [Qemu-devel] [PATCH v1 08/15] s390x/tcg: Handle SET FPC AND LOAD FPC 3-bit BFP rounding modes
In reply to Richard HendersonQuoted 16 lines · Richard Henderson
Quoted 11 lines · David Hildenbrand
Quoted 1 line
Yes, you want
round_to_odd. I suppose that's not valid for float128 right now?
roundAndPackFloat64()as well as
roundAndPackFloat128()support it.
It's not implemented for
round_canonical(),round_to_int(),These two are easy. I think Alex and I didn't implement it in the float32/64 rewrite because we didn't have a user. Now we will.
Quoted 8 lines
Quoted 2 lines
roundAndPackInt32(),roundAndPackInt64(),roundAndPackUint64(),roundAndPackFloat32()Right, these would be from the float128 side. It shouldn't be too hard...
r~
Sounds like you are volunteering to implement them? ;)
Signature · 3 lines
Thanks, David / dhildenb
Re: [Qemu-devel] [PATCH v1 08/15] s390x/tcg: Handle SET FPC AND LOAD FPC 3-bit BFP rounding modes
Quoted 8 lines · David Hildenbrand
Quoted 8 lines
Quoted 1 line
It's not implemented for
round_canonical(),round_to_int(),These two are easy. I think Alex and I didn't implement it in the float32/64 rewrite because we didn't have a user. Now we will.
Quoted 2 lines
roundAndPackInt32(),roundAndPackInt64(),roundAndPackUint64(),roundAndPackFloat32()
Quoted 7 lines
Quoted 5 lines
Right, these would be from the float128 side. It shouldn't be too hard...
r~
Sounds like you are volunteering to implement them? ;)
Yep.
r~