From b71ac2b9ce840391a7c6b96bfa045802d21596c9 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 24 Oct 2018 20:34:31 +0000 Subject: Use gen-libm-test.py to generate ulps table for manual. This patch extends gen-libm-test.py to generate the ulps table for the manual, so meaning there is only a single ulps file parser needed and another Perl script is eliminated. As with the introduction of gen-libm-test.py, this is designed to generate exactly the same libm-err.texi as libm-err-tab.pl did. (gen-libm-test.py is still shorter in lines than the old gen-libm-test.pl even after this patch.) Note that this introduces a Python dependency for building the manual, which is thus noted in install.texi and NEWS. Tested building html / info / pdf versions of the manual. * math/gen-libm-test.py: Import os. (ALL_FLOATS_MANUAL): New constant. (ALL_FLOATS_SUFFIX): Likewise. (Ulps.all_functions): New function. (real_all_ulps): Likewise. (generate_err_table_sub): Likewise. (generate_err_table): Likewise. (main): Handle -s and -m options. * manual/libm-err-tab.pl: Remove. * manual/Makefile ($(objpfx)stamp-libm-err): Use gen-libm-test.py instead of libm-err-tab.pl. [$(PERL) != no]: Change condition to [$(if $(PYTHON),$(PERL),no) != no]. * manual/install.texi (Tools for Compilation): Document requirement for Python to build manual. * INSTALL: Regenerated. --- manual/Makefile | 12 +-- manual/install.texi | 5 +- manual/libm-err-tab.pl | 206 ------------------------------------------------- 3 files changed, 10 insertions(+), 213 deletions(-) delete mode 100755 manual/libm-err-tab.pl (limited to 'manual') diff --git a/manual/Makefile b/manual/Makefile index c275664..9c35c9d 100644 --- a/manual/Makefile +++ b/manual/Makefile @@ -99,10 +99,11 @@ $(objpfx)dir-add.texi: xtract-typefun.awk $(texis-path) # The table with the math errors is generated. $(objpfx)libm-err.texi: $(objpfx)stamp-libm-err -$(objpfx)stamp-libm-err: libm-err-tab.pl $(wildcard $(foreach dir,$(sysdirs),\ - $(dir)/libm-test-ulps)) +$(objpfx)stamp-libm-err: $(..)math/gen-libm-test.py \ + $(wildcard $(foreach dir,$(sysdirs),\ + $(dir)/libm-test-ulps)) pwd=`pwd`; \ - $(PERL) $< $$pwd/.. > $(objpfx)libm-err-tmp + $(PYTHON) $< -s $$pwd/.. -m $(objpfx)libm-err-tmp $(move-if-change) $(objpfx)libm-err-tmp $(objpfx)libm-err.texi touch $@ @@ -169,8 +170,9 @@ include ../Rules .PHONY: install subdir_install install-data install-data subdir_install: install -# Generated files requiring perl: libm-err.texi, summary.texi -ifneq ($(PERL),no) +# Generated files requiring python: libm-err.texi +# Generated files requiring perl: summary.texi +ifneq ($(if $(PYTHON),$(PERL),no),no) ifneq ($(strip $(MAKEINFO)),:) install: $(inst_infodir)/libc.info @if $(SHELL) -c '$(INSTALL_INFO) --version' >/dev/null 2>&1; then \ diff --git a/manual/install.texi b/manual/install.texi index 61178da..08a39f5 100644 --- a/manual/install.texi +++ b/manual/install.texi @@ -577,8 +577,9 @@ with any version of @code{sed}. As of release time, @code{sed} version @item Python 2.7/3.4 or later -Python is required to run some tests. As of release time, Python 3.6 -is the newest verified to work for testing @theglibc{}. +Python is required to build the @glibcadj{} manual and to run some +tests. As of release time, Python 3.6 is the newest verified to work +for testing @theglibc{}. @item PExpect 4.0 diff --git a/manual/libm-err-tab.pl b/manual/libm-err-tab.pl deleted file mode 100755 index 768d2da..0000000 --- a/manual/libm-err-tab.pl +++ /dev/null @@ -1,206 +0,0 @@ -#!/usr/bin/perl -w -# Copyright (C) 1999-2018 Free Software Foundation, Inc. -# This file is part of the GNU C Library. -# Contributed by Andreas Jaeger , 1999. - -# The GNU C Library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. - -# The GNU C Library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. - -# You should have received a copy of the GNU Lesser General Public -# License along with the GNU C Library; if not, see -# . - -# Information about tests are stored in: %results -# $results{$test}{"type"} is the result type, e.g. normal or complex. -# In the following description $platform, $type and $float are: -# - $platform is the used platform -# - $type is either "normal", "real" (for the real part of a complex number) -# or "imag" (for the imaginary part # of a complex number). -# - $float is either of float, ifloat, double, idouble, ldouble, ildouble; -# It represents the underlying floating point type (float, double or long -# double) and if inline functions (the leading i stands for inline) -# are used. -# $results{$test}{$platform}{$type}{$float} is defined and has a delta -# or 'fail' as value. - -use File::Find; - -use strict; - -use vars qw ($sources @platforms %pplatforms); -use vars qw (%results @all_floats %suffices %all_functions); - - -# all_floats is in output order and contains all recognised float types that -# we're going to output -@all_floats = ('float', 'double', 'ldouble', 'float128'); -%suffices = - ( 'float' => 'f', - 'double' => '', - 'ldouble' => 'l', - 'float128' => 'f128' - ); - -# Pretty description of platform -%pplatforms = (); - -%all_functions = (); - -if ($#ARGV == 0) { - $sources = $ARGV[0]; -} else { - $sources = '/usr/src/cvs/libc'; -} - -find (\&find_files, $sources); - -@platforms = sort by_platforms @platforms; - -&print_all; - -sub find_files { - if ($_ eq 'libm-test-ulps') { - # print "Parsing $File::Find::name\n"; - push @platforms, $File::Find::dir; - my ($file, $name); - $file = "${File::Find::name}-name"; - open NAME, $file or die ("Can't open $file: $!"); - $name = ; - chomp $name; - close NAME; - $pplatforms{$File::Find::dir} = $name; - &parse_ulps ($File::Find::name, $File::Find::dir); - } -} - -# Parse ulps file -sub parse_ulps { - my ($file, $platform) = @_; - my ($test, $type, $float, $eps, $ignore_fn); - - # $type has the following values: - # "normal": No complex variable - # "real": Real part of complex result - # "imag": Imaginary part of complex result - open ULP, $file or die ("Can't open $file: $!"); - while () { - chop; - # ignore comments and empty lines - next if /^#/; - next if /^\s*$/; - if (/^Function: /) { - if (/Real part of/) { - s/Real part of //; - $type = 'real'; - } elsif (/Imaginary part of/) { - s/Imaginary part of //; - $type = 'imag'; - } else { - $type = 'normal'; - } - ($test) = ($_ =~ /^Function:\s*\"([a-zA-Z0-9_]+)\"/); - next; - } - if ($test =~ /_(downward|towardzero|upward|vlen)/) { - $ignore_fn = 1; - } else { - $ignore_fn = 0; - $all_functions{$test} = 1; - } - if (/^i?(float|double|ldouble|float128):/) { - ($float, $eps) = split /\s*:\s*/,$_,2; - if ($ignore_fn) { - next; - } elsif ($eps eq 'fail') { - $results{$test}{$platform}{$type}{$float} = 'fail'; - } elsif ($eps eq "0") { - # ignore - next; - } elsif (!exists $results{$test}{$platform}{$type}{$float} - || $results{$test}{$platform}{$type}{$float} ne 'fail') { - $results{$test}{$platform}{$type}{$float} = $eps; - } - if ($type =~ /^real|imag$/) { - $results{$test}{'type'} = 'complex'; - } elsif ($type eq 'normal') { - $results{$test}{'type'} = 'normal'; - } - next; - } - print "Skipping unknown entry: `$_'\n"; - } - close ULP; -} - -sub get_value { - my ($fct, $platform, $type, $float) = @_; - - return (exists $results{$fct}{$platform}{$type}{$float} - ? $results{$fct}{$platform}{$type}{$float} : "0"); -} - -sub print_platforms { - my (@p) = @_; - my ($fct, $platform, $float, $first, $i, $platform_no, $platform_total); - - print '@multitable {nexttowardf} '; - foreach (@p) { - print ' {1000 + i 1000}'; - } - print "\n"; - - print '@item Function '; - foreach (@p) { - print ' @tab '; - print $pplatforms{$_}; - } - print "\n"; - - - foreach $fct (sort keys %all_functions) { - foreach $float (@all_floats) { - print "\@item $fct$suffices{$float} "; - foreach $platform (@p) { - print ' @tab '; - if (exists $results{$fct}{$platform}{'normal'}{$float} - || exists $results{$fct}{$platform}{'real'}{$float} - || exists $results{$fct}{$platform}{'imag'}{$float}) { - if ($results{$fct}{'type'} eq 'complex') { - print &get_value ($fct, $platform, 'real', $float), - ' + i ', &get_value ($fct, $platform, 'imag', $float); - } else { - print $results{$fct}{$platform}{'normal'}{$float}; - } - } else { - print '-'; - } - } - print "\n"; - } - } - - print "\@end multitable\n"; -} - -sub print_all { - my ($i, $max); - - my ($columns) = 5; - - # Print only 5 platforms at a time. - for ($i=0; $i < $#platforms; $i+=$columns) { - $max = $i+$columns-1 > $#platforms ? $#platforms : $i+$columns-1; - print_platforms (@platforms[$i .. $max]); - } -} - -sub by_platforms { - return $pplatforms{$a} cmp $pplatforms{$b}; -} -- cgit v1.1