Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix ulps regeneration for *-finite tests.
On running tests after from-scratch ulps regeneration, I found that
some libm tests failed with ulps in excess of those recorded in the
from-scratch regeneration, which should never happen unless those ulps
exceed the limit on ulps that can go in libm-test-ulps files.

Failure: Test: atan2_upward (inf, -inf)
Result:
 is:          2.35619498e+00   0x1.2d97ccp+1
 should be:   2.35619450e+00   0x1.2d97c8p+1
 difference:  4.76837159e-07   0x1.000000p-21
 ulp       :  2.0000
 max.ulp   :  1.0000
Maximal error of `atan2_upward'
 is      : 2 ulp
 accepted: 1 ulp
Failure: Test: carg_upward (-inf + inf i)
Result:
 is:          2.35619498e+00   0x1.2d97ccp+1
 should be:   2.35619450e+00   0x1.2d97c8p+1
 difference:  4.76837159e-07   0x1.000000p-21
 ulp       :  2.0000
 max.ulp   :  1.0000
Maximal error of `carg_upward'
 is      : 2 ulp
 accepted: 1 ulp

The problem comes from the addition of tests for the finite-math-only
versions of libm functions.  Those tests share ulps with the default
function variants.  make regen-ulps runs the default tests before the
finite-math-only tests, concatenating the resulting ulps before
feeding them to gen-libm-test.pl to generate a new libm-test-ulps
file.  But gen-libm-test.pl always takes the last ulps value given for
any (function, type) pair.  So, if the largest ulps for a function
come from non-finite inputs, a from-scratch regeneration loses those
ulps.

This patch fixes gen-libm-test.pl, in the case where there are
multiple ulps values for a (function, type) pair - which can only
happen as part of a regeneration - to take the largest ulps value
rather than the last one.

Tested for ARM / MIPS / powerpc-nofpu.

	* math/gen-libm-test.pl (parse_ulps): Do not reduce
	already-recorded ulps.
	* sysdeps/arm/libm-test-ulps: Regenerated.
	* sysdeps/mips/mips32/libm-test-ulps: Likewise.
	* sysdeps/mips/mips64/libm-test-ulps: Likewise.
	* sysdeps/powerpc/nofpu/libm-test-ulps: Likewise.
  • Loading branch information
Joseph Myers committed Jan 19, 2016
1 parent df782dc commit 2e3d0de
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 10 deletions.
9 changes: 9 additions & 0 deletions ChangeLog
@@ -1,3 +1,12 @@
2016-01-19 Joseph Myers <joseph@codesourcery.com>

* math/gen-libm-test.pl (parse_ulps): Do not reduce
already-recorded ulps.
* sysdeps/arm/libm-test-ulps: Regenerated.
* sysdeps/mips/mips32/libm-test-ulps: Likewise.
* sysdeps/mips/mips64/libm-test-ulps: Likewise.
* sysdeps/powerpc/nofpu/libm-test-ulps: Likewise.

2016-01-19 Andrew Senkevich <andrew.senkevich@intel.com>
Paul Pluzhnikov <ppluzhnikov@google.com>

Expand Down
7 changes: 5 additions & 2 deletions math/gen-libm-test.pl
Expand Up @@ -583,8 +583,11 @@ sub parse_ulps {
# ignore
next;
} else {
$results{$test}{$type}{'ulp'}{$float} = $eps;
$results{$test}{'has_ulps'} = 1;
if (!defined ($results{$test}{$type}{'ulp'}{$float})
|| $results{$test}{$type}{'ulp'}{$float} < $eps) {
$results{$test}{$type}{'ulp'}{$float} = $eps;
$results{$test}{'has_ulps'} = 1;
}
}
if ($type =~ /^real|imag$/) {
$results{$test}{'type'} = 'complex';
Expand Down
4 changes: 2 additions & 2 deletions sysdeps/arm/libm-test-ulps
Expand Up @@ -115,7 +115,7 @@ ifloat: 2

Function: "atan2_upward":
double: 1
float: 1
float: 2
idouble: 1
ifloat: 2

Expand Down Expand Up @@ -291,7 +291,7 @@ ifloat: 2

Function: "carg_upward":
double: 1
float: 1
float: 2
idouble: 1
ifloat: 2

Expand Down
4 changes: 2 additions & 2 deletions sysdeps/mips/mips32/libm-test-ulps
Expand Up @@ -115,7 +115,7 @@ ifloat: 2

Function: "atan2_upward":
double: 1
float: 1
float: 2
idouble: 1
ifloat: 2

Expand Down Expand Up @@ -291,7 +291,7 @@ ifloat: 2

Function: "carg_upward":
double: 1
float: 1
float: 2
idouble: 1
ifloat: 2

Expand Down
4 changes: 2 additions & 2 deletions sysdeps/mips/mips64/libm-test-ulps
Expand Up @@ -155,7 +155,7 @@ ldouble: 3

Function: "atan2_upward":
double: 1
float: 1
float: 2
idouble: 1
ifloat: 2
ildouble: 2
Expand Down Expand Up @@ -393,7 +393,7 @@ ldouble: 3

Function: "carg_upward":
double: 1
float: 1
float: 2
idouble: 1
ifloat: 2
ildouble: 2
Expand Down
4 changes: 2 additions & 2 deletions sysdeps/powerpc/nofpu/libm-test-ulps
Expand Up @@ -155,7 +155,7 @@ ldouble: 6

Function: "atan2_upward":
double: 1
float: 1
float: 2
idouble: 1
ifloat: 2
ildouble: 3
Expand Down Expand Up @@ -393,7 +393,7 @@ ldouble: 6

Function: "carg_upward":
double: 1
float: 1
float: 2
idouble: 1
ifloat: 2
ildouble: 3
Expand Down

0 comments on commit 2e3d0de

Please sign in to comment.