Skip to content

Commit b6c818d

Browse files
aleksandar-markovicgregkh
aleksandar-markovic
authored and
gregkh
committed
MIPS: math-emu: <MAX|MAXA|MIN|MINA>.<D|S>: Fix quiet NaN propagation
commit e78bf0dc4789bdea1453595ae89e8db65918e22e upstream. Fix the value returned by <MAX|MAXA|MIN|MINA>.<D|S> fd,fs,ft, if both inputs are quiet NaNs. The <MAX|MAXA|MIN|MINA>.<D|S> specifications state that the returned value in such cases should be the quiet NaN contained in register fs. A relevant example: MAX.S fd,fs,ft: If fs contains qNaN1, and ft contains qNaN2, fd is going to contain qNaN1 (without this patch, it used to contain qNaN2). Fixes: a79f5f9 ("MIPS: math-emu: Add support for the MIPS R6 MAX{, A} FPU instruction") Fixes: 4e9561b ("MIPS: math-emu: Add support for the MIPS R6 MIN{, A} FPU instruction") Signed-off-by: Miodrag Dinic <miodrag.dinic@imgtec.com> Signed-off-by: Goran Ferenc <goran.ferenc@imgtec.com> Signed-off-by: Aleksandar Markovic <aleksandar.markovic@imgtec.com> Reviewed-by: James Hogan <james.hogan@imgtec.com> Cc: Bo Hu <bohu@google.com> Cc: Douglas Leung <douglas.leung@imgtec.com> Cc: Jin Qian <jinqian@google.com> Cc: Paul Burton <paul.burton@imgtec.com> Cc: Petar Jovanovic <petar.jovanovic@imgtec.com> Cc: Raghu Gandham <raghu.gandham@imgtec.com> Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/16880/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent bf592dd commit b6c818d

4 files changed

Lines changed: 112 additions & 16 deletions

File tree

‎arch/mips/math-emu/dp_fmax.c‎

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,26 @@ union ieee754dp ieee754dp_fmax(union ieee754dp x, union ieee754dp y)
4747
case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_INF):
4848
return ieee754dp_nanxcpt(x);
4949

50-
/* numbers are preferred to NaNs */
50+
/*
51+
* Quiet NaN handling
52+
*/
53+
54+
/*
55+
* The case of both inputs quiet NaNs
56+
*/
57+
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_QNAN):
58+
return x;
59+
60+
/*
61+
* The cases of exactly one input quiet NaN (numbers
62+
* are here preferred as returned values to NaNs)
63+
*/
5164
case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_QNAN):
5265
case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_QNAN):
5366
case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_QNAN):
5467
case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_QNAN):
5568
return x;
5669

57-
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_QNAN):
5870
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_ZERO):
5971
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_NORM):
6072
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_DNORM):
@@ -147,14 +159,26 @@ union ieee754dp ieee754dp_fmaxa(union ieee754dp x, union ieee754dp y)
147159
case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_INF):
148160
return ieee754dp_nanxcpt(x);
149161

150-
/* numbers are preferred to NaNs */
162+
/*
163+
* Quiet NaN handling
164+
*/
165+
166+
/*
167+
* The case of both inputs quiet NaNs
168+
*/
169+
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_QNAN):
170+
return x;
171+
172+
/*
173+
* The cases of exactly one input quiet NaN (numbers
174+
* are here preferred as returned values to NaNs)
175+
*/
151176
case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_QNAN):
152177
case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_QNAN):
153178
case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_QNAN):
154179
case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_QNAN):
155180
return x;
156181

157-
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_QNAN):
158182
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_ZERO):
159183
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_NORM):
160184
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_DNORM):

‎arch/mips/math-emu/dp_fmin.c‎

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,26 @@ union ieee754dp ieee754dp_fmin(union ieee754dp x, union ieee754dp y)
4747
case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_INF):
4848
return ieee754dp_nanxcpt(x);
4949

50-
/* numbers are preferred to NaNs */
50+
/*
51+
* Quiet NaN handling
52+
*/
53+
54+
/*
55+
* The case of both inputs quiet NaNs
56+
*/
57+
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_QNAN):
58+
return x;
59+
60+
/*
61+
* The cases of exactly one input quiet NaN (numbers
62+
* are here preferred as returned values to NaNs)
63+
*/
5164
case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_QNAN):
5265
case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_QNAN):
5366
case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_QNAN):
5467
case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_QNAN):
5568
return x;
5669

57-
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_QNAN):
5870
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_ZERO):
5971
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_NORM):
6072
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_DNORM):
@@ -147,14 +159,26 @@ union ieee754dp ieee754dp_fmina(union ieee754dp x, union ieee754dp y)
147159
case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_INF):
148160
return ieee754dp_nanxcpt(x);
149161

150-
/* numbers are preferred to NaNs */
162+
/*
163+
* Quiet NaN handling
164+
*/
165+
166+
/*
167+
* The case of both inputs quiet NaNs
168+
*/
169+
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_QNAN):
170+
return x;
171+
172+
/*
173+
* The cases of exactly one input quiet NaN (numbers
174+
* are here preferred as returned values to NaNs)
175+
*/
151176
case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_QNAN):
152177
case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_QNAN):
153178
case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_QNAN):
154179
case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_QNAN):
155180
return x;
156181

157-
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_QNAN):
158182
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_ZERO):
159183
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_NORM):
160184
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_DNORM):

‎arch/mips/math-emu/sp_fmax.c‎

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,26 @@ union ieee754sp ieee754sp_fmax(union ieee754sp x, union ieee754sp y)
4747
case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_INF):
4848
return ieee754sp_nanxcpt(x);
4949

50-
/* numbers are preferred to NaNs */
50+
/*
51+
* Quiet NaN handling
52+
*/
53+
54+
/*
55+
* The case of both inputs quiet NaNs
56+
*/
57+
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_QNAN):
58+
return x;
59+
60+
/*
61+
* The cases of exactly one input quiet NaN (numbers
62+
* are here preferred as returned values to NaNs)
63+
*/
5164
case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_QNAN):
5265
case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_QNAN):
5366
case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_QNAN):
5467
case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_QNAN):
5568
return x;
5669

57-
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_QNAN):
5870
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_ZERO):
5971
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_NORM):
6072
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_DNORM):
@@ -147,14 +159,26 @@ union ieee754sp ieee754sp_fmaxa(union ieee754sp x, union ieee754sp y)
147159
case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_INF):
148160
return ieee754sp_nanxcpt(x);
149161

150-
/* numbers are preferred to NaNs */
162+
/*
163+
* Quiet NaN handling
164+
*/
165+
166+
/*
167+
* The case of both inputs quiet NaNs
168+
*/
169+
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_QNAN):
170+
return x;
171+
172+
/*
173+
* The cases of exactly one input quiet NaN (numbers
174+
* are here preferred as returned values to NaNs)
175+
*/
151176
case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_QNAN):
152177
case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_QNAN):
153178
case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_QNAN):
154179
case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_QNAN):
155180
return x;
156181

157-
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_QNAN):
158182
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_ZERO):
159183
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_NORM):
160184
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_DNORM):

‎arch/mips/math-emu/sp_fmin.c‎

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,26 @@ union ieee754sp ieee754sp_fmin(union ieee754sp x, union ieee754sp y)
4747
case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_INF):
4848
return ieee754sp_nanxcpt(x);
4949

50-
/* numbers are preferred to NaNs */
50+
/*
51+
* Quiet NaN handling
52+
*/
53+
54+
/*
55+
* The case of both inputs quiet NaNs
56+
*/
57+
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_QNAN):
58+
return x;
59+
60+
/*
61+
* The cases of exactly one input quiet NaN (numbers
62+
* are here preferred as returned values to NaNs)
63+
*/
5164
case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_QNAN):
5265
case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_QNAN):
5366
case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_QNAN):
5467
case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_QNAN):
5568
return x;
5669

57-
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_QNAN):
5870
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_ZERO):
5971
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_NORM):
6072
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_DNORM):
@@ -147,14 +159,26 @@ union ieee754sp ieee754sp_fmina(union ieee754sp x, union ieee754sp y)
147159
case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_INF):
148160
return ieee754sp_nanxcpt(x);
149161

150-
/* numbers are preferred to NaNs */
162+
/*
163+
* Quiet NaN handling
164+
*/
165+
166+
/*
167+
* The case of both inputs quiet NaNs
168+
*/
169+
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_QNAN):
170+
return x;
171+
172+
/*
173+
* The cases of exactly one input quiet NaN (numbers
174+
* are here preferred as returned values to NaNs)
175+
*/
151176
case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_QNAN):
152177
case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_QNAN):
153178
case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_QNAN):
154179
case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_QNAN):
155180
return x;
156181

157-
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_QNAN):
158182
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_ZERO):
159183
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_NORM):
160184
case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_DNORM):

0 commit comments

Comments
 (0)