Re: [PATCH 3/N] [x86_64] Vectorized math functions

[Andrew Senkevich <andrew dot n dot senkevich at gmail dot com>]

2014-11-26 19:53 GMT+03:00 Joseph Myers <joseph@codesourcery.com>:
> On Mon, 24 Nov 2014, Andrew Senkevich wrote:
>
>> @@ -113,9 +113,10 @@ ulps-file = $(firstword $(wildcard
>> $(sysdirs:%=%/libm-test-ulps)))
>>  $(addprefix $(objpfx), $(libm-tests-generated)): $(objpfx)libm-test.stmp
>>
>>  $(objpfx)libm-test.stmp: $(ulps-file) libm-test.inc gen-libm-test.pl \
>> - auto-libm-test-out
>> + gen-libm-have-vector-test.sh auto-libm-test-out
>>   $(make-target-directory)
>>   $(PERL) gen-libm-test.pl -u $< -o "$(objpfx)"
>> + $(BASH) gen-libm-have-vector-test.sh > $(objpfx)libm-have-vector-test.h
>
> I don't see anything bash-specific in this script, so $(SHELL) seems more
> appropriate.
>
>> +# Generate series of definitions used for vector math functions tests.
>> +print_defs()
>> +{
>> +  echo "#if defined TEST_VECTOR_$1 && TEST_VECTOR_$1"
>> +  echo "# define HAVE_VECTOR_$1 1"
>> +  echo "# define ${1}_VEC_SUFF WRAPPER_NAME($1)"
>
> Space before '(' in call to WRAPPER_NAME.
>
>> +  echo "#else"
>> +  echo "# define HAVE_VECTOR_$1 0"
>> +  echo "# define ${1}_VEC_SUFF $1"
>> +  echo "#endif"
>> +  echo
>
> I think more explanation is needed in a comment about where the
> TEST_VECTOR_* macros, and WRAPPER_NAME, come from.

Fixed.

ChangeLog

2014-12-02  Andrew Senkevich  <andrew.n.senkevich@gmail.com>

        * math/gen-libm-have-vector-test.sh: Script generates series of macros
        for conditions in testing functions.
        * math/Makefile: Added call of libm-have-vector-test.sh.
        * math/libm-test.inc (HAVE_VECTOR): New macros.

diff --git a/math/Makefile b/math/Makefile
index 866bc0f..73d299d 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -102,7 +102,7 @@ libm-tests = test-float test-double
$(test-longdouble-$(long-double-fcts)) \
 libm-tests.o = $(addsuffix .o,$(libm-tests))

 tests += $(libm-tests)
-libm-tests-generated = libm-test-ulps.h libm-test.c
+libm-tests-generated = libm-test-ulps.h libm-have-vector-test.h libm-test.c
 generated += $(libm-tests-generated) libm-test.stmp

 # This is needed for dependencies
@@ -113,9 +113,10 @@ ulps-file = $(firstword $(wildcard
$(sysdirs:%=%/libm-test-ulps)))
 $(addprefix $(objpfx), $(libm-tests-generated)): $(objpfx)libm-test.stmp

 $(objpfx)libm-test.stmp: $(ulps-file) libm-test.inc gen-libm-test.pl \
- auto-libm-test-out
+ gen-libm-have-vector-test.sh auto-libm-test-out
  $(make-target-directory)
  $(PERL) gen-libm-test.pl -u $< -o "$(objpfx)"
+ $(SHELL) gen-libm-have-vector-test.sh > $(objpfx)libm-have-vector-test.h
  @echo > $@

 $(objpfx)test-float.o: $(objpfx)libm-test.stmp
diff --git a/math/gen-libm-have-vector-test.sh
b/math/gen-libm-have-vector-test.sh
new file mode 100644
index 0000000..ef06f4a
--- /dev/null
+++ b/math/gen-libm-have-vector-test.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# This file is part of the GNU C Library.
+
+# 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
+# <http://www.gnu.org/licenses/>.
+
+# Generate series of definitions used for vector math functions tests.
+# TEST_VECTOR_* and WRAPPER_NAME are defined in vector math functions tests.
+# *_VEC_SUFF is used in individual tests, as result of FUNC_TEST unfolding
+# to avoid warnings / errors about undeclared functions.
+print_defs()
+{
+  echo "#if defined TEST_VECTOR_$1 && TEST_VECTOR_$1"
+  echo "# define HAVE_VECTOR_$1 1"
+  echo "# define ${1}_VEC_SUFF WRAPPER_NAME ($1)"
+  echo "#else"
+  echo "# define HAVE_VECTOR_$1 0"
+  echo "# define ${1}_VEC_SUFF $1"
+  echo "#endif"
+  echo
+}
+
+for func in $(grep ALL_RM_TEST libm-test.inc | grep -v define | sed
-r "s/.*\(//; s/,.*//"); do
+  print_defs ${func}
+  print_defs ${func}f
+  print_defs ${func}l
+done
+
+# When all functions will use ALL_RM_TEST instead of using START directly,
+# this code can be removed.
+for func in $(grep 'START.*;$' libm-test.inc | sed -r "s/.*\(//; s/,.*//"); do
+  print_defs ${func}
+  print_defs ${func}f
+  print_defs ${func}l
+done
diff --git a/math/libm-test.inc b/math/libm-test.inc
index bcedc1e..8caafe1 100644
--- a/math/libm-test.inc
+++ b/math/libm-test.inc
@@ -1698,11 +1698,16 @@ struct test_fFF_11_data
 #define STR_CONCAT(a, b, c) __STRING (a##b##c)
 #define STR_CON3(a, b, c) STR_CONCAT (a, b, c)

+/* This generated header defines series of macros started with HAVE_VECTOR_. */
+#include "libm-have-vector-test.h"
+
+#define HAVE_VECTOR(func) __CONCAT (HAVE_VECTOR_, func)
+
 /* Start and end the tests for a given function.  */
-#define START(FUNC, SUFF, EXACT) \
+#define START(FUN, SUFF, EXACT) \
   CHECK_ARCH_EXT; \
-  if (TEST_MATHVEC) return; \
-  const char *this_func = STR_CON3 (FUNC, SUFF, VEC_SUFF); \
+  if (TEST_MATHVEC && !HAVE_VECTOR (FUNC (FUN))) return; \
+  const char *this_func = STR_CON3 (FUN, SUFF, VEC_SUFF); \
   init_max_error (this_func, EXACT)
 #define END \
   print_max_error (this_func)

Is it OK?


--
WBR,
Andrew

Attachment: libmvec_3_of_N_v3.patch
Description: Binary data