Disable libm-test test name beautification for M_* constants.

math/gen-libm-test.pl has code to beautify names of various constants,
transforming the source form in libm-test.inc into the version
appearing in test names in libm-test-ulps files.

This has become decreasingly relevant over time for the M_* constants,
first as I changed the test names so only the arguments and not the
expected results appeared in them, then as tests have moved to
auto-libm-test-* so that automatically generated hex float constants
get used instead of M_* in test inputs.

This patch removes the beautification for all M_* constants.  Tested
x86_64 and x86 and ulps updated accordingly.  Even the one case where
this affected the name in the ulps files will disappear once complex
function tests are moved to auto-libm-test-*.

	* math/gen-libm-test.pl (%beautify): Remove M_* constants.
	* sysdeps/i386/fpu/libm-test-ulps: Update.
	* sysdeps/x86_64/fpu/libm-test-ulps: Likewise.

diff --git a/ChangeLog b/ChangeLog
index e8b90876d6d5d2ca6e8bfb243d0fe17cb6fdf75b..7386e3a49c1893368b849abf029f7c8c94913519 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2013-12-19  Joseph Myers  <joseph@codesourcery.com>
 
+       * math/gen-libm-test.pl (%beautify): Remove M_* constants.
+       * sysdeps/i386/fpu/libm-test-ulps: Update.
+       * sysdeps/x86_64/fpu/libm-test-ulps: Likewise.
+
        [BZ #16293]
        * sysdeps/i386/fpu/e_expl.S (IEEE754_EXPL) [USE_AS_EXPM1L]: Set
        round-to-nearest mode when using frndint.

diff --git a/math/gen-libm-test.pl b/math/gen-libm-test.pl
index 81f5fabdd71eea8ed500031b8dbd8725354fe8ba..29522a3a25b4e41b907fd6bea6b3dca1152bc2c6 100755 (executable)
--- a/math/gen-libm-test.pl
+++ b/math/gen-libm-test.pl
@@ -61,23 +61,6 @@ use vars qw (%auto_tests);
     "minus_infty" => "-inf",
     "plus_infty" => "inf",
     "qnan_value" => "qNaN",
-    "M_El" => "e",
-    "M_E2l" => "e^2",
-    "M_E3l" => "e^3",
-    "M_LOG10El", "log10(e)",
-    "M_PIl" => "pi",
-    "M_PI_34l" => "3/4 pi",
-    "M_PI_2l" => "pi/2",
-    "M_PI_4l" => "pi/4",
-    "M_PI_6l" => "pi/6",
-    "M_PI_34_LOG10El" => "3/4 pi*log10(e)",
-    "M_PI_LOG10El" => "pi*log10(e)",
-    "M_PI2_LOG10El" => "pi/2*log10(e)",
-    "M_PI4_LOG10El" => "pi/4*log10(e)",
-    "M_LOG_SQRT_PIl" => "log(sqrt(pi))",
-    "M_LOG_2_SQRT_PIl" => "log(2*sqrt(pi))",
-    "M_2_SQRT_PIl" => "2 sqrt (pi)",
-    "M_SQRT_PIl" => "sqrt (pi)",
   );
 
 

diff --git a/sysdeps/i386/fpu/libm-test-ulps b/sysdeps/i386/fpu/libm-test-ulps
index bb3adcbd67a2bc2b792e4939a7c7a00b7e529a9d..6b154bc0b80de899d63fbf63643095f2d0f13b6b 100644 (file)
--- a/sysdeps/i386/fpu/libm-test-ulps
+++ b/sysdeps/i386/fpu/libm-test-ulps
@@ -5807,6 +5807,9 @@ ldouble: 1
 Test "Imaginary part of: ctanh (0 + 0x3.243f6cp-1 i)":
 float: 1
 ifloat: 1
+Test "Imaginary part of: ctanh (0 + M_PI_4l i)":
+ildouble: 1
+ldouble: 1
 Test "Imaginary part of: ctanh (0 + pi/4 i)":
 ildouble: 1
 ldouble: 1

diff --git a/sysdeps/x86_64/fpu/libm-test-ulps b/sysdeps/x86_64/fpu/libm-test-ulps
index 89b4bc828931fffd3820cbe245066704ac83ea72..a4fa4a28277ceb050414330f523e8e45bfa77f8f 100644 (file)
--- a/sysdeps/x86_64/fpu/libm-test-ulps
+++ b/sysdeps/x86_64/fpu/libm-test-ulps
@@ -6630,6 +6630,11 @@ ldouble: 1
 Test "Imaginary part of: ctanh (0 + 0x3.243f6cp-1 i)":
 float: 1
 ifloat: 1
+Test "Imaginary part of: ctanh (0 + M_PI_4l i)":
+double: 1
+idouble: 1
+ildouble: 1
+ldouble: 1
 Test "Imaginary part of: ctanh (0 + pi/4 i)":
 double: 1
 idouble: 1