Don't include individual test ulps in libm-test-ulps.

As recently discussed
<https://sourceware.org/ml/libc-alpha/2014-02/msg00670.html>, it
doesn't seem particularly useful for libm-test-ulps files to contain
huge amounts of data on ulps for individual tests; just the global
maximum observed ulps for each function, together with the
verification of exceptions, errno and special results such as
infinities and NaNs for each test, suffices to verify that a
function's behavior on the given test inputs is within the expected
accuracy.  Removing this data reduces source tree churn caused by
updates to these files when libm tests are added, and reduces the
frequency with which testsuite additions actually need libm-test-ulps
changes at all.

Accordingly, this patch removes that data, so that individual tests
get checked against the global bounds for the given function and only
generate an error if those are exceeded.  Tested x86_64 (including
verifying that if an ulps value is artificially reduced, the tests do
indeed fail as they should and "make regen-ulps" generates the
expected changes).

	* math/libm-test.inc (struct ulp_data): Don't refer to ulps for
	individual tests in comment.
	(libm-test-ulps.h): Don't refer to test_ulps in #include comment.
	(prev_max_error): New variable.
	(prev_real_max_error): Likewise.
	(prev_imag_max_error): Likewise.
	(compare_ulp_data): Don't refer to test names in comment.
	(find_test_ulps): Remove function.
	(find_function_ulps): Likewise.
	(find_complex_function_ulps): Likewise.
	(init_max_error): Take function name as argument.  Look up ulps
	for that function.
	(print_ulps): Remove function.
	(print_max_error): Use prev_max_error instead of calling
	find_function_ulps.
	(print_complex_max_error): Use prev_real_max_error and
	prev_imag_max_error instead of calling find_complex_function_ulps.
	(check_float_internal): Take max_ulp parameter instead of calling
	find_test_ulps.  Don't call print_ulps.
	(check_float): Update call to check_float_internal.
	(check_complex): Update calls to check_float_internal.
	(START): Pass argument to init_max_error.
	* math/gen-libm-test.pl (%results): Don't include "kind"
	information.
	(parse_ulps): Don't handle ulps of individual tests.
	(print_ulps_file): Likewise.
	(output_ulps): Likewise.
	* math/README.libm-test: Update.
	* manual/libm-err-tab.pl (parse_ulps): Don't handle ulps of
	individual tests.
	* sysdeps/aarch64/libm-test-ulps: Remove individual test ulps.
	* sysdeps/alpha/fpu/libm-test-ulps: Likewise.
	* sysdeps/arm/libm-test-ulps: Likewise.
	* sysdeps/i386/fpu/libm-test-ulps: Likewise.
	* sysdeps/ia64/fpu/libm-test-ulps: Likewise.
	* sysdeps/m68k/coldfire/fpu/libm-test-ulps: Likewise.
	* sysdeps/m68k/m680x0/fpu/libm-test-ulps: Likewise.
	* sysdeps/microblaze/libm-test-ulps: Likewise.
	* sysdeps/mips/mips32/libm-test-ulps: Likewise.
	* sysdeps/mips/mips64/libm-test-ulps: Likewise.
	* sysdeps/powerpc/fpu/libm-test-ulps: Likewise.
	* sysdeps/powerpc/nofpu/libm-test-ulps: Likewise.
	* sysdeps/s390/fpu/libm-test-ulps: Likewise.
	* sysdeps/sh/libm-test-ulps: Likewise.
	* sysdeps/sparc/fpu/libm-test-ulps: Likewise.
	* sysdeps/tile/libm-test-ulps: Likewise.
	* sysdeps/x86_64/fpu/libm-test-ulps: Likewise.

	* sysdeps/hppa/fpu/libm-test-ulps: Remove individual test ulps.

1 files changed, 6 insertions, 73 deletions

diff --git a/math/gen-libm-test.pl b/math/gen-libm-test.pl
index a1c528d..919f0f2 100755
--- a/math/gen-libm-test.pl
+++ b/math/gen-libm-test.pl
@@ -21,8 +21,6 @@
 # Note that functions and tests share the same namespace.
 
 # Information about tests are stored in: %results
-# $results{$test}{"kind"} is either "fct" or "test" and flags whether this
-# is a maximal error of a function or a single test.
 # $results{$test}{"type"} is the result type, e.g. normal or complex.
 # $results{$test}{"has_ulps"} is set if deltas exist.
 # In the following description $type and $float are:
@@ -484,7 +482,7 @@ sub generate_testfile {
 # Parse ulps file
 sub parse_ulps {
   my ($file) = @_;
-  my ($test, $type, $float, $eps, $kind);
+  my ($test, $type, $float, $eps);
 
   # $type has the following values:
   # "normal": No complex variable
@@ -496,21 +494,6 @@ sub parse_ulps {
     # ignore comments and empty lines
     next if /^#/;
     next if /^\s*$/;
-    if (/^Test/) {
-      if (/Real part of:/) {
-	s/Real part of: //;
-	$type = 'real';
-      } elsif (/Imaginary part of:/) {
-	s/Imaginary part of: //;
-	$type = 'imag';
-      } else {
-	$type = 'normal';
-      }
-      s/^.+\"(.*)\".*$/$1/;
-      $test = $_;
-      $kind = 'test';
-      next;
-    }
     if (/^Function: /) {
       if (/Real part of/) {
 	s/Real part of //;
@@ -522,7 +505,6 @@ sub parse_ulps {
 	$type = 'normal';
       }
       ($test) = ($_ =~ /^Function:\s*\"([a-zA-Z0-9_]+)\"/);
-      $kind = 'fct';
       next;
     }
     if (/^i?(float|double|ldouble):/) {
@@ -540,7 +522,6 @@ sub parse_ulps {
       } elsif ($type eq 'normal') {
 	$results{$test}{'type'} = 'normal';
       }
-      $results{$test}{'kind'} = $kind;
       next;
     }
     print "Skipping unknown entry: `$_'\n";
@@ -569,39 +550,9 @@ sub print_ulps_file {
   $last_fct = '';
   open NEWULP, ">$file" or die ("Can't open $file: $!");
   print NEWULP "# Begin of automatic generation\n";
-  # first the function calls
-  foreach $test (sort keys %results) {
-    next if ($results{$test}{'kind'} ne 'test');
-    foreach $type ('real', 'imag', 'normal') {
-      if (exists $results{$test}{$type}) {
-	if (defined $results{$test}) {
-	  ($fct) = ($test =~ /^(\w+)\s/);
-	  if ($fct ne $last_fct) {
-	    $last_fct = $fct;
-	    print NEWULP "\n# $fct\n";
-	  }
-	}
-	if ($type eq 'normal') {
-	  print NEWULP "Test \"$test\":\n";
-	} elsif ($type eq 'real') {
-	  print NEWULP "Test \"Real part of: $test\":\n";
-	} elsif ($type eq 'imag') {
-	  print NEWULP "Test \"Imaginary part of: $test\":\n";
-	}
-	foreach $float (@all_floats) {
-	  if (exists $results{$test}{$type}{'ulp'}{$float}) {
-	    print NEWULP "$float: ",
-	    &clean_up_number ($results{$test}{$type}{'ulp'}{$float}),
-	    "\n";
-	  }
-	}
-      }
-    }
-  }
   print NEWULP "\n# Maximal error of functions:\n";
 
   foreach $fct (sort keys %results) {
-    next if ($results{$fct}{'kind'} ne 'fct');
     foreach $type ('real', 'imag', 'normal') {
       if (exists $results{$fct}{$type}) {
 	if ($type eq 'normal') {
@@ -656,7 +607,7 @@ sub get_all_ulps_for_test {
 sub output_ulps {
   my ($file, $ulps_filename) = @_;
   my ($i, $fct, $type, $ulp, $ulp_real, $ulp_imag);
-  my (%test_ulps, %func_ulps, %func_real_ulps, %func_imag_ulps);
+  my (%func_ulps, %func_real_ulps, %func_imag_ulps);
 
   open ULP, ">$file" or die ("Can't open $file: $!");
 
@@ -674,22 +625,11 @@ sub output_ulps {
     } else {
       die "unknown results ($fct) type $type\n";
     }
-    if ($results{$fct}{'kind'} eq 'fct') {
-      if ($type eq 'normal') {
-	$func_ulps{$fct} = $ulp;
-      } else {
-	$func_real_ulps{$fct} = $ulp_real;
-	$func_imag_ulps{$fct} = $ulp_imag;
-      }
-    } elsif ($results{$fct}{'kind'} eq 'test') {
-      if ($type eq 'normal') {
-	$test_ulps{$fct} = $ulp;
-      } else {
-	$test_ulps{"Real part of: $fct"} = $ulp_real;
-	$test_ulps{"Imaginary part of: $fct"} = $ulp_imag;
-      }
+    if ($type eq 'normal') {
+      $func_ulps{$fct} = $ulp;
     } else {
-      die "unknown results ($fct) kind $results{$fct}{'kind'}\n";
+      $func_real_ulps{$fct} = $ulp_real;
+      $func_imag_ulps{$fct} = $ulp_imag;
     }
   }
   print ULP "\n/* Maximal error of functions.  */\n";
@@ -708,13 +648,6 @@ sub output_ulps {
     print ULP "    { \"$fct\", $func_imag_ulps{$fct} },\n";
   }
   print ULP "  };\n";
-
-  print ULP "\n/* Error of single function calls.  */\n";
-  print ULP "static const struct ulp_data test_ulps[] =\n  {\n";
-  foreach $fct (sort keys %test_ulps) {
-    print ULP "    { \"$fct\", $test_ulps{$fct} },\n";
-  }
-  print ULP "  };\n";
   close ULP;
 }