[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commits] r24197 - in /fsf/trunk/libc: ./ benchtests/ localedata/ scripts/



Author: eglibc
Date: Tue Oct  8 00:02:07 2013
New Revision: 24197

Log:
Import glibc-mainline for 2013-10-08

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/benchtests/Makefile
    fsf/trunk/libc/benchtests/README
    fsf/trunk/libc/benchtests/acos-inputs
    fsf/trunk/libc/benchtests/acosh-inputs
    fsf/trunk/libc/benchtests/asin-inputs
    fsf/trunk/libc/benchtests/asinh-inputs
    fsf/trunk/libc/benchtests/atan-inputs
    fsf/trunk/libc/benchtests/atanh-inputs
    fsf/trunk/libc/benchtests/cos-inputs
    fsf/trunk/libc/benchtests/cosh-inputs
    fsf/trunk/libc/benchtests/exp-inputs
    fsf/trunk/libc/benchtests/log-inputs
    fsf/trunk/libc/benchtests/pow-inputs
    fsf/trunk/libc/benchtests/rint-inputs
    fsf/trunk/libc/benchtests/sin-inputs
    fsf/trunk/libc/benchtests/sinh-inputs
    fsf/trunk/libc/benchtests/tan-inputs
    fsf/trunk/libc/benchtests/tanh-inputs
    fsf/trunk/libc/localedata/ChangeLog
    fsf/trunk/libc/localedata/SUPPORTED
    fsf/trunk/libc/scripts/bench.pl

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Oct  8 00:02:07 2013
@@ -1,3 +1,26 @@
+2013-10-07  Siddhesh Poyarekar  <siddhesh@xxxxxxxxxx>
+
+	* benchtests/Makefile: Remove ARGLIST and RET variables.
+	($(objpfx)bench-%.c): Pass only function name to the script.
+	* benchtests/README: Update documentation.
+	* benchtests/acos-inputs: Add new directives.
+	* benchtests/acosh-inputs: Likewise.
+	* benchtests/asin-inputs: Likewise.
+	* benchtests/asinh-inputs: Likewise.
+	* benchtests/atan-inputs: Likewise.
+	* benchtests/atanh-inputs: Likewise.
+	* benchtests/cos-inputs: Likewise.
+	* benchtests/cosh-inputs: Likewise.
+	* benchtests/exp-inputs: Likewise.
+	* benchtests/log-inputs: Likewise.
+	* benchtests/pow-inputs: Likewise.
+	* benchtests/rint-inputs: Likewise.
+	* benchtests/sin-inputs: Likewise.
+	* benchtests/sinh-inputs: Likewise.
+	* benchtests/tan-inputs: Likewise.
+	* benchtests/tanh-inputs: Likewise.
+	* scripts/bench.pl: Add support for new directives.
+
 2013-10-07  Alan Modra  <amodra@xxxxxxxxx>
 
 	* README: Fix careless merge.
@@ -150,7 +173,7 @@
 2013-10-04  Alan Modra  <amodra@xxxxxxxxx>
 
 	* sysdeps/powerpc/powerpc64/memset.S: Replace rlwimi with
-        insrdi.  Formatting.
+	insrdi.  Formatting.
 	* sysdeps/powerpc/powerpc64/power4/memset.S: Likewise.
 	* sysdeps/powerpc/powerpc64/power6/memset.S: Likewise.
 	* sysdeps/powerpc/powerpc64/power7/memset.S: Likewise.

Modified: fsf/trunk/libc/benchtests/Makefile
==============================================================================
--- fsf/trunk/libc/benchtests/Makefile (original)
+++ fsf/trunk/libc/benchtests/Makefile Tue Oct  8 00:02:07 2013
@@ -34,70 +34,22 @@
 
 benchset := $(string-bench-all)
 
-acos-ARGLIST = double
-acos-RET = double
 LDLIBS-bench-acos = -lm
-
-acosh-ARGLIST = double
-acosh-RET = double
 LDLIBS-bench-acosh = -lm
-
-asin-ARGLIST = double
-asin-RET = double
 LDLIBS-bench-asin = -lm
-
-asinh-ARGLIST = double
-asinh-RET = double
 LDLIBS-bench-asinh = -lm
-
-atan-ARGLIST = double
-atan-RET = double
 LDLIBS-bench-atan = -lm
-
-atanh-ARGLIST = double
-atanh-RET = double
 LDLIBS-bench-atanh = -lm
-
-cos-ARGLIST = double
-cos-RET = double
 LDLIBS-bench-cos = -lm
-
-cosh-ARGLIST = double
-cosh-RET = double
 LDLIBS-bench-cosh = -lm
-
-exp-ARGLIST = double
-exp-RET = double
 LDLIBS-bench-exp = -lm
-
-log-ARGLIST = double
-log-RET = double
 LDLIBS-bench-log = -lm
-
-pow-ARGLIST = double:double
-pow-RET = double
 LDLIBS-bench-pow = -lm
-
-rint-ARGLIST = double
-rint-RET = double
 LDLIBS-bench-rint = -lm
-
-sin-ARGLIST = double
-sin-RET = double
 LDLIBS-bench-sin = -lm
-
-sinh-ARGLIST = double
-sinh-RET = double
 LDLIBS-bench-sinh = -lm
-
-tan-ARGLIST = double
-tan-RET = double
 LDLIBS-bench-tan = -lm
-
-tanh-ARGLIST = double
-tanh-RET = double
 LDLIBS-bench-tanh = -lm
-
 LDLIBS-bench-sincos = -lm
 
 
@@ -171,6 +123,5 @@
 	{ if [ -n "$($*-INCLUDE)" ]; then \
 	  cat $($*-INCLUDE); \
 	fi; \
-	$(..)scripts/bench.pl $(patsubst %-inputs,%,$<) \
-	  $($*-ARGLIST) $($*-RET); } > $@-tmp
+	$(..)scripts/bench.pl $(patsubst %-inputs,%,$<); } > $@-tmp
 	mv -f $@-tmp $@

Modified: fsf/trunk/libc/benchtests/README
==============================================================================
--- fsf/trunk/libc/benchtests/README (original)
+++ fsf/trunk/libc/benchtests/README Tue Oct  8 00:02:07 2013
@@ -40,23 +40,24 @@
 
 - Append the function name to the bench variable in the Makefile.
 
-- Define foo-ARGLIST as a colon separated list of types of the input
-  arguments.  Use `void' if function does not take any inputs.  Put in quotes
-  if the input argument is a pointer, e.g.:
+- Make a file called `foo-inputs` to provide the definition and input for the
+  function.  The file should have some directives telling the parser script
+  about the function and then one input per line.  Directives are lines that
+  have a special meaning for the parser and they begin with two hashes '##'.
+  The following directives are recognized:
 
-     malloc-ARGLIST: "void *"
+  - args: This should be assigned a colon separated list of types of the input
+    arguments.  This directive may be skipped if the function does not take any
+    inputs.
+  - ret: This should be assigned the type that the function returns.  This
+    directive may be skipped if the function does not return a value.
+  - includes: This should be assigned a comma separated list of headers that
+    need to be included to provide declarations for the function and types it
+    may need.
+  - name: See following section for instructions on how to use this directive.
 
-- Define foo-RET as the type the function returns.  Skip if the function
-  returns void.  One could even skip foo-ARGLIST if the function does not
-  take any inputs AND the function returns void.
-
-- Make a file called `foo-inputs` with one input value per line, an input
-  being a comma separated list of arguments to be passed into the function.
-  See pow-inputs for an example.
-
-  The script that parses the -inputs file treats lines beginning with a single
-  `#' as comments.  Lines beginning with two hashes `##' are treated specially
-  as `directives'.
+  Lines beginning with a single hash '#' are treated as comments.  See
+  pow-inputs for an example of an input file.
 
 Multiple execution units per function:
 =====================================

Modified: fsf/trunk/libc/benchtests/acos-inputs
==============================================================================
--- fsf/trunk/libc/benchtests/acos-inputs (original)
+++ fsf/trunk/libc/benchtests/acos-inputs Tue Oct  8 00:02:07 2013
@@ -1,3 +1,6 @@
+## args: double
+## ret: double
+## includes: math.h
 0.5
 0.1
 0.2

Modified: fsf/trunk/libc/benchtests/acosh-inputs
==============================================================================
--- fsf/trunk/libc/benchtests/acosh-inputs (original)
+++ fsf/trunk/libc/benchtests/acosh-inputs Tue Oct  8 00:02:07 2013
@@ -1,3 +1,6 @@
+## args: double
+## ret: double
+## includes: math.h
 0.1
 0.2
 0.3

Modified: fsf/trunk/libc/benchtests/asin-inputs
==============================================================================
--- fsf/trunk/libc/benchtests/asin-inputs (original)
+++ fsf/trunk/libc/benchtests/asin-inputs Tue Oct  8 00:02:07 2013
@@ -1,3 +1,6 @@
+## args: double
+## ret: double
+## includes: math.h
 0.5
 0.1
 0.2

Modified: fsf/trunk/libc/benchtests/asinh-inputs
==============================================================================
--- fsf/trunk/libc/benchtests/asinh-inputs (original)
+++ fsf/trunk/libc/benchtests/asinh-inputs Tue Oct  8 00:02:07 2013
@@ -1,3 +1,6 @@
+## args: double
+## ret: double
+## includes: math.h
 0.1
 0.2
 0.3

Modified: fsf/trunk/libc/benchtests/atan-inputs
==============================================================================
--- fsf/trunk/libc/benchtests/atan-inputs (original)
+++ fsf/trunk/libc/benchtests/atan-inputs Tue Oct  8 00:02:07 2013
@@ -1,3 +1,6 @@
+## args: double
+## ret: double
+## includes: math.h
 0x1.000000c5cba86p0
 0x1.000001883003ap0
 0x1.00000dfb2b674p0

Modified: fsf/trunk/libc/benchtests/atanh-inputs
==============================================================================
--- fsf/trunk/libc/benchtests/atanh-inputs (original)
+++ fsf/trunk/libc/benchtests/atanh-inputs Tue Oct  8 00:02:07 2013
@@ -1,3 +1,6 @@
+## args: double
+## ret: double
+## includes: math.h
 0.1
 0.2
 0.3

Modified: fsf/trunk/libc/benchtests/cos-inputs
==============================================================================
--- fsf/trunk/libc/benchtests/cos-inputs (original)
+++ fsf/trunk/libc/benchtests/cos-inputs Tue Oct  8 00:02:07 2013
@@ -1,3 +1,6 @@
+## args: double
+## ret: double
+## includes: math.h
 0x1.000000cf4a2a1p0
 0x1.0000010b239a8p0
 0x1.00000162a932ap0

Modified: fsf/trunk/libc/benchtests/cosh-inputs
==============================================================================
--- fsf/trunk/libc/benchtests/cosh-inputs (original)
+++ fsf/trunk/libc/benchtests/cosh-inputs Tue Oct  8 00:02:07 2013
@@ -1,3 +1,6 @@
+## args: double
+## ret: double
+## includes: math.h
 0.1
 0.2
 0.3

Modified: fsf/trunk/libc/benchtests/exp-inputs
==============================================================================
--- fsf/trunk/libc/benchtests/exp-inputs (original)
+++ fsf/trunk/libc/benchtests/exp-inputs Tue Oct  8 00:02:07 2013
@@ -1,3 +1,6 @@
+## args: double
+## ret: double
+## includes: math.h
 42
 # Slowest path with computation in 768 bit precision.
 # Implemented in: sysdeps/ieee754/dbl-64/mpexp.c

Modified: fsf/trunk/libc/benchtests/log-inputs
==============================================================================
--- fsf/trunk/libc/benchtests/log-inputs (original)
+++ fsf/trunk/libc/benchtests/log-inputs Tue Oct  8 00:02:07 2013
@@ -1,1 +1,4 @@
+## args: double
+## ret: double
+## includes: math.h
 42.0

Modified: fsf/trunk/libc/benchtests/pow-inputs
==============================================================================
--- fsf/trunk/libc/benchtests/pow-inputs (original)
+++ fsf/trunk/libc/benchtests/pow-inputs Tue Oct  8 00:02:07 2013
@@ -1,3 +1,6 @@
+## args: double:double
+## ret: double
+## includes: math.h
 42.0, 42.0
 # pow slowest path at 768 bits
 # Implemented in sysdeps/ieee754/dbl-64/slowpow.c

Modified: fsf/trunk/libc/benchtests/rint-inputs
==============================================================================
--- fsf/trunk/libc/benchtests/rint-inputs (original)
+++ fsf/trunk/libc/benchtests/rint-inputs Tue Oct  8 00:02:07 2013
@@ -1,3 +1,6 @@
+## args: double
+## ret: double
+## includes: math.h
 78.5
 -78.5
 4503599627370497.0

Modified: fsf/trunk/libc/benchtests/sin-inputs
==============================================================================
--- fsf/trunk/libc/benchtests/sin-inputs (original)
+++ fsf/trunk/libc/benchtests/sin-inputs Tue Oct  8 00:02:07 2013
@@ -1,3 +1,6 @@
+## includes: math.h
+## args: double
+## ret: double
 0.9
 2.3
 3.7

Modified: fsf/trunk/libc/benchtests/sinh-inputs
==============================================================================
--- fsf/trunk/libc/benchtests/sinh-inputs (original)
+++ fsf/trunk/libc/benchtests/sinh-inputs Tue Oct  8 00:02:07 2013
@@ -1,3 +1,6 @@
+## args: double
+## ret: double
+## includes: math.h
 0.1
 0.2
 0.3

Modified: fsf/trunk/libc/benchtests/tan-inputs
==============================================================================
--- fsf/trunk/libc/benchtests/tan-inputs (original)
+++ fsf/trunk/libc/benchtests/tan-inputs Tue Oct  8 00:02:07 2013
@@ -1,3 +1,6 @@
+## args: double
+## ret: double
+## includes: math.h
 0x1.dffffffffff1ep-22
 # tan slowest path at 768 bits
 # Implemented in sysdeps/ieee754/dbl-64/mptan.c

Modified: fsf/trunk/libc/benchtests/tanh-inputs
==============================================================================
--- fsf/trunk/libc/benchtests/tanh-inputs (original)
+++ fsf/trunk/libc/benchtests/tanh-inputs Tue Oct  8 00:02:07 2013
@@ -1,3 +1,6 @@
+## args: double
+## ret: double
+## includes: math.h
 0.1
 0.2
 0.3

Modified: fsf/trunk/libc/localedata/ChangeLog
==============================================================================
--- fsf/trunk/libc/localedata/ChangeLog (original)
+++ fsf/trunk/libc/localedata/ChangeLog Tue Oct  8 00:02:07 2013
@@ -1,51 +1,63 @@
 2013-10-05  Chris Leonard  <cjl@xxxxxxxxxxxxx>
 
-	* localedata/locales/ff_SN: Adjust language-code fields of LC_ADDRESS.
-	* localedata/locales/fil_PH: Likewise.
-	* localedata/locales/fo_FO: Likewise.
-	* localedata/locales/fr_BE: Likewise.
-	* localedata/locales/fr_CA: Likewise.
-	* localedata/locales/fr_CH: Likewise.
-	* localedata/locales/fr_FR: Likewise.
-	* localedata/locales/fr_LU: Likewise.
-	* localedata/locales/fur_IT: Likewise.
-	* localedata/locales/fy_DE: Likewise.
-	* localedata/locales/fy_NL: Likewise.
-	* localedata/locales/ga_IE: Likewise.
-	* localedata/locales/gez_ER: Likewise.
-	* localedata/locales/gez_ET: Likewise.
-	* localedata/locales/gl_ES: Likewise.
-	* localedata/locales/gu_IN: Likewise.
-	* localedata/locales/gv_GB: Likewise.
-
-2013-09-25  Michael Bauer <fios@xxxxxxxxxxxxx>
-
-    [BZ#15400]
-    * locales/gd_GB: Version 1.2 of gd_GB locale.
-
-2013-09-23  Wei-Lun Chao <bluebat@xxxxxxxxxxxxxx>
-
-    [BZ#15609]
-    * locales/cmn_TW: New locale for cmn_TW.
-    * SUPPORTED: Add cmn_TW.
-
-2013-09-23  Wei-Lun Chao <bluebat@xxxxxxxxxxxxxx>
-
-    [BZ#15608]
-    * locales/hak_TW: New locale for hak_TW.
-    * SUPPORTED: Add hak_TW.
-
-2013-09-23  Wei-Lun Chao <bluebat@xxxxxxxxxxxxxx>
-
-    [BZ#15608]
-    * locales/lzh_TW: New locale for lzh_TW.
-    * SUPPORTED: Add lzh_TW.
-
-2013-09-23  Wei-Lun Chao <bluebat@xxxxxxxxxxxxxx>
-
-    [BZ#15608]
-    * locales/nan_TW: New locale for nan_TW.
-    * SUPPORTED: Add nan_TW.
+	* locales/ff_SN: Adjust language-code fields of LC_ADDRESS.
+	* locales/fil_PH: Likewise.
+	* locales/fo_FO: Likewise.
+	* locales/fr_BE: Likewise.
+	* locales/fr_CA: Likewise.
+	* locales/fr_CH: Likewise.
+	* locales/fr_FR: Likewise.
+	* locales/fr_LU: Likewise.
+	* locales/fur_IT: Likewise.
+	* locales/fy_DE: Likewise.
+	* locales/fy_NL: Likewise.
+	* locales/ga_IE: Likewise.
+	* locales/gez_ER: Likewise.
+	* locales/gez_ET: Likewise.
+	* locales/gl_ES: Likewise.
+	* locales/gu_IN: Likewise.
+	* locales/gv_GB: Likewise.
+
+2013-10-04  Chris Leonard  <cjl@xxxxxxxxxxxxx>
+
+	* locales/pap_AN: Copy / modify pap_AN into pap_AW and pap_CW.
+	* locales/pap_AW: Likewise.
+	* locales/pap_CW: Likewise.
+	* SUPPORTED: Add ar_SS, pap_AW, pap_CW.
+
+2013-10-04  Chris Leonard  <cjl@xxxxxxxxxxxxx>
+
+	* locales/ar_SD: Split ar_SD into ar_SD and ar_SS
+	* locales/ar_SS: Likewise.
+
+2013-09-25  Michael Bauer  <fios@xxxxxxxxxxxxx>
+
+	[BZ #15400]
+	* locales/gd_GB: Version 1.2 of gd_GB locale.
+
+2013-09-23  Wei-Lun Chao  <bluebat@xxxxxxxxxxxxxx>
+
+	[BZ #15609]
+	* locales/cmn_TW: New locale for cmn_TW.
+	* SUPPORTED: Add cmn_TW.
+
+2013-09-23  Wei-Lun Chao  <bluebat@xxxxxxxxxxxxxx>
+
+	[BZ #15608]
+	* locales/hak_TW: New locale for hak_TW.
+	* SUPPORTED: Add hak_TW.
+
+2013-09-23  Wei-Lun Chao  <bluebat@xxxxxxxxxxxxxx>
+
+	[BZ #15608]
+	* locales/lzh_TW: New locale for lzh_TW.
+	* SUPPORTED: Add lzh_TW.
+
+2013-09-23  Wei-Lun Chao  <bluebat@xxxxxxxxxxxxxx>
+
+	[BZ #15608]
+	* locales/nan_TW: New locale for nan_TW.
+	* SUPPORTED: Add nan_TW.
 
 2013-09-15  Chris Leonard  <cjl@xxxxxxxxxxxxx>
 

Modified: fsf/trunk/libc/localedata/SUPPORTED
==============================================================================
--- fsf/trunk/libc/localedata/SUPPORTED (original)
+++ fsf/trunk/libc/localedata/SUPPORTED Tue Oct  8 00:02:07 2013
@@ -41,7 +41,7 @@
 ar_SA/ISO-8859-6 \
 ar_SD.UTF-8/UTF-8 \
 ar_SD/ISO-8859-6 \
-ar_SS.UTF-8 \
+ar_SS/UTF-8 \
 ar_SY.UTF-8/UTF-8 \
 ar_SY/ISO-8859-6 \
 ar_TN.UTF-8/UTF-8 \

Modified: fsf/trunk/libc/scripts/bench.pl
==============================================================================
--- fsf/trunk/libc/scripts/bench.pl (original)
+++ fsf/trunk/libc/scripts/bench.pl Tue Oct  8 00:02:07 2013
@@ -21,40 +21,78 @@
 use warnings;
 # Generate a benchmark source file for a given input.
 
-if (@ARGV < 2) {
-  die "Usage: bench.pl <function> [parameter types] [return type]"
+if (@ARGV < 1) {
+  die "Usage: bench.pl <function>"
 }
 
-my $arg;
 my $func = $ARGV[0];
 my @args;
 my $ret = "void";
 my $getret = "";
-my $retval = "";
 
-if (@ARGV >= 2) {
-  @args = split(':', $ARGV[1]);
+# We create a hash of inputs for each variant of the test.
+my $variant = "";
+my @curvals;
+my %vals;
+my @include_files;
+my $incl;
+
+open INPUTS, "<$func-inputs" or die $!;
+
+LINE:while (<INPUTS>) {
+  chomp;
+
+  # Directives.
+  if (/^## (\w+): (.*)/) {
+    # Function argument types.
+    if ($1 eq "args") {
+      @args = split(":", $2);
+    }
+
+    # Function return type.
+    elsif ($1 eq "ret") {
+      $ret = $2;
+    }
+
+    elsif ($1 eq "includes") {
+      @include_files = split (",", $2);
+    }
+
+    # New variant.  This is the only directive allowed in the body of the
+    # inputs to separate inputs into variants.  All others should be at the
+    # top or else all hell will break loose.
+    elsif ($1 eq "name") {
+
+      # Save values in the previous variant.
+      my @copy = @curvals;
+      $vals{$variant} = \@copy;
+
+      # Prepare for the next.
+      $variant=$2;
+      undef @curvals;
+      next LINE;
+    }
+  }
+
+  # Skip over comments.
+  if (/^#/) {
+    next LINE;
+  }
+  push (@curvals, $_);
 }
 
-if (@ARGV == 3) {
-  $ret = $ARGV[2];
+
+my $bench_func = "#define CALL_BENCH_FUNC(v, i) $func (";
+
+
+# Print the definitions and macros.
+foreach $incl (@include_files) {
+  print "#include <" . $incl . ">\n";
 }
 
-my $decl = "extern $ret $func (";
-
-# Function has no arguments.
-if (@args == 0 || $args[0] eq "void") {
-  print "$decl void);\n";
-  print "#define CALL_BENCH_FUNC(i,j) $func();\n";
-  print "#define NUM_VARIANTS (1)\n";
-  print "#define NUM_SAMPLES(v) (1)\n";
-  print "#define VARIANT(v) FUNCNAME \"()\"\n"
-}
-# The function has arguments, so parse them and populate the inputs.
-else {
-  my $num = 0;
-  my $bench_func = "#define CALL_BENCH_FUNC(v, i) $func (";
-
+if (@args > 0) {
+  # Save values in the last variant.
+  $vals{$variant} = \@curvals;
   my $struct =
     "struct _variants
     {
@@ -65,60 +103,21 @@
 
   my $arg_struct = "struct args {";
 
+  my $num = 0;
+  my $arg;
   foreach $arg (@args) {
     if ($num > 0) {
       $bench_func = "$bench_func,";
-      $decl = "$decl,";
     }
 
     $arg_struct = "$arg_struct volatile $arg arg$num;";
     $bench_func = "$bench_func variants[v].in[i].arg$num";
-    $decl = "$decl $arg";
     $num = $num + 1;
   }
 
   $arg_struct = $arg_struct . "};\n";
-  $decl = $decl . ");\n";
   $bench_func = $bench_func . ");\n";
 
-  # We create a hash of inputs for each variant of the test.
-  my $variant = "";
-  my @curvals;
-  my %vals;
-
-  open INPUTS, "<$func-inputs" or die $!;
-
-  LINE:while (<INPUTS>) {
-    chomp;
-
-    # New variant.
-    if (/^## (\w+): (\w+)/) {
-      #We only identify Name for now.
-      if ($1 ne "name") {
-        next LINE;
-      }
-
-      # Save values in the last variant.
-      my @copy = @curvals;
-      $vals{$variant} = \@copy;
-
-      # Prepare for the next.
-      $variant=$2;
-      undef @curvals;
-      next LINE;
-    }
-
-    # Skip over comments.
-    if (/^#/) {
-      next LINE;
-    }
-    push (@curvals, $_);
-  }
-
-  $vals{$variant} = \@curvals;
-
-  # Print the definitions and macros.
-  print $decl;
   print $bench_func;
   print $arg_struct;
   print $struct;
@@ -147,17 +146,24 @@
     $c += 1;
   }
   print "};\n\n";
-
   # Finally, print the last set of macros.
   print "#define NUM_VARIANTS $c\n";
   print "#define NUM_SAMPLES(i) (variants[i].count)\n";
   print "#define VARIANT(i) (variants[i].name)\n";
 }
+else {
+  print $bench_func . ");\n";
+  print "#define NUM_VARIANTS (1)\n";
+  print "#define NUM_SAMPLES(v) (1)\n";
+  print "#define VARIANT(v) FUNCNAME \"()\"\n"
+}
+
+
 
 # In some cases not storing a return value seems to result in the function call
 # being optimized out.
 if ($ret ne "void") {
-  print "static volatile $ret ret = 0.0;\n";
+  print "static volatile $ret ret;\n";
   $getret = "ret = ";
 }
 

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits