This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.26.9000-844-g8d7d3ba


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  8d7d3ba8c505d84b2bd1946f474d9ddfe4219f0f (commit)
       via  0422ed1e84d923023f3bd57e723d3d4dc7569901 (commit)
       via  d5090db30edf04f39dc0eacfc09db72af8045f39 (commit)
       via  0595e3603406e7f7b457bf9c99059bf1a48d97ef (commit)
      from  b4c645c2f5513ef4f97916ee59243aa8aac1f3c1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=8d7d3ba8c505d84b2bd1946f474d9ddfe4219f0f

commit 8d7d3ba8c505d84b2bd1946f474d9ddfe4219f0f
Author: Siddhesh Poyarekar <siddhesh@sourceware.org>
Date:   Tue Nov 28 20:04:31 2017 +0530

    localedata: Remove duplicate cs_CZ from LOCALES
    
    The LOCALES variable in the localedata had two instances of cs_CZ
    which generated the following warning:
    
    ../gen-locales.mk:11: target '/opt/build/localedata/cs_CZ.UTF-8/LC_CTYPE' given more than once in the same rule
    
    Dropped the duplicate entry.

diff --git a/ChangeLog b/ChangeLog
index f7616dc..14b2455 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-11-28  Siddhesh Poyarekar  <siddhesh@sourceware.org>
+
+	* localedata/Makefile (LOCALES): Remove duplicate cs_CZ.UTF-8.
+
 2017-11-28  Victor Rodriguez  <victor.rodriguez.bahena@intel.com>
 	    Icarus Sparry  <icarus.w.sparry@intel.com>
 
diff --git a/localedata/Makefile b/localedata/Makefile
index 6e4f9ea..b9f77d6 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -108,7 +108,7 @@ LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 \
 	   nb_NO.ISO-8859-1 nn_NO.ISO-8859-1 tr_TR.UTF-8 cs_CZ.UTF-8 \
 	   zh_TW.EUC-TW fa_IR.UTF-8 fr_FR.UTF-8 ja_JP.UTF-8 si_LK.UTF-8 \
 	   tr_TR.ISO-8859-9 en_GB.UTF-8 uk_UA.UTF-8 hu_HU.UTF-8 lv_LV.UTF-8 \
-	   pl_PL.UTF-8 cs_CZ.UTF-8
+	   pl_PL.UTF-8
 include ../gen-locales.mk
 endif
 

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=0422ed1e84d923023f3bd57e723d3d4dc7569901

commit 0422ed1e84d923023f3bd57e723d3d4dc7569901
Author: Victor Rodriguez <victor.rodriguez.bahena@intel.com>
Date:   Tue Nov 28 19:57:46 2017 +0530

    benchtests: Enable BENCHSET to run subset of tests
    
    This patch adds BENCHSET variable to benchtests/Makefile in order to
    provide the capability to run a list of subsets of benchmark tests, ie;
    
        make bench BENCHSET="bench-pthread bench-math malloc-thread"
    
    This helps users to benchmark specific glibc area
    
    ChangeLog:
    
            * benchtests/Makefile:Add BENCHSET to allow subsets of
            benchmarks to be run.
            * benchtests/README: Add documentation for: Running subsets of
            benchmarks.
    
    Signed-off-by: Victor Rodriguez <victor.rodriguez.bahena@intel.com>
    Signed-off-by: Icarus Sparry <icarus.w.sparry@intel.com>
    Reviewed-By: Siddhesh Poyarekar <siddhesh@sourceware.org>

diff --git a/ChangeLog b/ChangeLog
index 9685aec..f7616dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
 2017-11-28  Victor Rodriguez  <victor.rodriguez.bahena@intel.com>
+	    Icarus Sparry  <icarus.w.sparry@intel.com>
+
+	* benchtests/Makefile:Add BENCHSET to allow subsets of
+	benchmarks to be run.
+	* benchtests/README: Add documentation for: Running subsets of
+	benchmarks.
+
+2017-11-28  Victor Rodriguez  <victor.rodriguez.bahena@intel.com>
 
 	* benchtests/scripts/benchout.schema.json: Fix regex to accept a wider
 	range of tests names.
diff --git a/benchtests/Makefile b/benchtests/Makefile
index 4157f8c..74b3821 100644
--- a/benchtests/Makefile
+++ b/benchtests/Makefile
@@ -30,7 +30,11 @@ bench-pthread := pthread_once thread_create
 
 bench-string := ffs ffsll
 
+ifeq (${BENCHSET},)
 bench := $(bench-math) $(bench-pthread) $(bench-string)
+else
+bench := $(foreach B,$(filter bench-%,${BENCHSET}), ${${B}})
+endif
 
 # String function benchmarks.
 string-benchset := bcopy bzero memccpy memchr memcmp memcpy memmem memmove \
@@ -68,8 +72,12 @@ stdio-common-benchset := sprintf
 
 math-benchset := math-inlines
 
+ifeq (${BENCHSET},)
 benchset := $(string-benchset-all) $(stdlib-benchset) $(stdio-common-benchset) \
 	    $(math-benchset)
+else
+benchset := $(foreach B,$(filter %-benchset,${BENCHSET}), ${${B}})
+endif
 
 CFLAGS-bench-ffs.c += -fno-builtin
 CFLAGS-bench-ffsll.c += -fno-builtin
@@ -81,7 +89,11 @@ CFLAGS-bench-fmaxf.c += -fno-builtin
 CFLAGS-bench-trunc.c += -fno-builtin
 CFLAGS-bench-truncf.c += -fno-builtin
 
+ifeq (${BENCHSET},)
 bench-malloc := malloc-thread
+else
+bench-malloc := $(filter malloc-%,${BENCHSET})
+endif
 
 $(addprefix $(objpfx)bench-,$(bench-math)): $(libm)
 $(addprefix $(objpfx)bench-,$(math-benchset)): $(libm)
@@ -149,6 +161,19 @@ bench-clean:
 	rm -f $(timing-type) $(addsuffix .o,$(timing-type))
 	rm -f $(addprefix $(objpfx),$(bench-extra-objs))
 
+# Validate the passed in BENCHSET
+ifneq ($(strip ${BENCHSET}),)
+VALIDBENCHSETNAMES := bench-pthread bench-math bench-string string-benchset \
+   wcsmbs-benchset stdlib-benchset stdio-common-benchset math-benchset \
+   malloc-thread
+INVALIDBENCHSETNAMES := $(filter-out ${VALIDBENCHSETNAMES},${BENCHSET})
+ifneq (${INVALIDBENCHSETNAMES},)
+$(info The following values in BENCHSET are invalid: ${INVALIDBENCHSETNAMES})
+$(info The valid ones are: ${VALIDBENCHSETNAMES})
+$(error Invalid BENCHSET value)
+endif
+endif
+
 # Define the bench target only if the target has a usable python installation.
 ifdef PYTHON
 bench: bench-build bench-set bench-func bench-malloc
@@ -175,10 +200,11 @@ bench-set: $(binaries-benchset)
 	done
 
 bench-malloc: $(binaries-bench-malloc)
-	run=$(objpfx)bench-malloc-thread; \
-	for thr in 1 8 16 32; do \
-	  echo "Running $${run} $${thr}"; \
+	for run in $^; do \
+		for thr in 1 8 16 32; do \
+			echo "Running $${run} $${thr}"; \
 	  $(run-bench) $${thr} > $${run}-$${thr}.out; \
+	  done;\
 	done
 
 # Build and execute the benchmark functions.  This target generates JSON
@@ -186,25 +212,28 @@ bench-malloc: $(binaries-bench-malloc)
 # so one could even execute them individually and process it using any JSON
 # capable language or tool.
 bench-func: $(binaries-bench)
+	if [ -n '$^' ] ; then \
 	{ timing_type=$$($(timing-type)); \
-	echo "{\"timing_type\": \"$${timing_type}\","; \
-	echo " \"functions\": {"; \
-	for run in $^; do \
-	  if ! [ "x$${run}" = "x$<" ]; then \
-	    echo ","; \
+	  echo "{\"timing_type\": \"$${timing_type}\","; \
+	  echo " \"functions\": {"; \
+	  for run in $^; do \
+	    if ! [ "x$${run}" = "x$<" ]; then \
+	      echo ","; \
+	    fi; \
+	    echo "Running $${run}" >&2; \
+	    $(run-bench) $(DETAILED_OPT); \
+	  done; \
+	  echo; \
+	  echo " }"; \
+	  echo "}"; \
+	  } > $(objpfx)bench.out-tmp; \
+	  if [ -f $(objpfx)bench.out ]; then \
+	    mv -f $(objpfx)bench.out $(objpfx)bench.out.old; \
 	  fi; \
-	  echo "Running $${run}" >&2; \
-	  $(run-bench) $(DETAILED_OPT); \
-	done; \
-	echo; \
-	echo " }"; \
-	echo "}"; } > $(objpfx)bench.out-tmp; \
-	if [ -f $(objpfx)bench.out ]; then \
-	  mv -f $(objpfx)bench.out $(objpfx)bench.out.old; \
-	fi; \
-	mv -f $(objpfx)bench.out-tmp $(objpfx)bench.out
-	$(PYTHON) scripts/validate_benchout.py $(objpfx)bench.out \
-		scripts/benchout.schema.json
+	  mv -f $(objpfx)bench.out-tmp $(objpfx)bench.out; \
+	  $(PYTHON) scripts/validate_benchout.py $(objpfx)bench.out \
+	  scripts/benchout.schema.json; \
+	fi
 
 $(timing-type) $(binaries-bench) $(binaries-benchset) \
 	$(binaries-bench-malloc): %: %.o $(objpfx)json-lib.o \
diff --git a/benchtests/README b/benchtests/README
index 9aa750a..4ddff79 100644
--- a/benchtests/README
+++ b/benchtests/README
@@ -53,6 +53,25 @@ otherwise the above command may try to build the benchmark again.  Benchmarks
 that require generated code to be executed during the build are skipped when
 cross-building.
 
+Running subsets of benchmarks:
+==============================
+
+To run only a subset of benchmarks, one may invoke make as follows
+
+  $ make bench BENCHSET="bench-pthread bench-math malloc-thread"
+
+where BENCHSET may be a space-separated list of the following values:
+
+    bench-math
+    bench-pthread
+    bench-string
+    string-benchset
+    wcsmbs-benchset
+    stdlib-benchset
+    stdio-common-benchset
+    math-benchset
+    malloc-thread
+
 Adding a function to benchtests:
 ===============================
 

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=d5090db30edf04f39dc0eacfc09db72af8045f39

commit d5090db30edf04f39dc0eacfc09db72af8045f39
Author: Victor Rodriguez <victor.rodriguez.bahena@intel.com>
Date:   Tue Nov 28 19:52:57 2017 +0530

    benchtests: Expand range of tests names in schema.json
    
    When executing bench-math the benchmark output is invalid with this
    error msg:
    
        Invalid benchmark output: 'workload-spec2006.wrf' does not match any of
        the regexes: '^[_a-zA-Z0-9]*$¹ or Invalid benchmark output: Additional
        properties are not allowed ('workload-spec2006.wrf' was unexpected)
    
    The error was seen when running the test:
    workload-spec2006.wrf, 'stack=1024,guard=1' and 'stack=1024,guard=2'.
    The problem is that the current regex's do not accept the hyphen, dot, equal
    and comma in the output.
    
    This patch changes the regex in benchout.schema.json to accept symbols in
    benchmark tests names.
    
    ChangeLog:
    
            * benchtests/scripts/benchout.schema.json: Fix regex to accept a
            wider range of tests names.
    
    Signed-off-by: Victor Rodriguez <victor.rodriguez.bahena@intel.com>
    Reviewed-By: Siddhesh Poyarekar <siddhesh@sourceware.org>

diff --git a/ChangeLog b/ChangeLog
index 21fd04a..9685aec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2017-11-28  Victor Rodriguez  <victor.rodriguez.bahena@intel.com>
 
+	* benchtests/scripts/benchout.schema.json: Fix regex to accept a wider
+	range of tests names.
+
 	* benchtests/scripts/benchout.schema.json: Add throughput as accepted
 	result from property and remove "max", min" and "mean" from
 	required properties based on benchtests/bench-skeleton.c.
diff --git a/benchtests/scripts/benchout.schema.json b/benchtests/scripts/benchout.schema.json
index dfc00b1..0eca21b 100644
--- a/benchtests/scripts/benchout.schema.json
+++ b/benchtests/scripts/benchout.schema.json
@@ -13,7 +13,7 @@
           "title": "Function names",
           "type": "object",
           "patternProperties": {
-            "^[_a-zA-Z0-9]*$": {
+            "^[_a-zA-Z0-9,=.-]*$": {
               "title": "Function variants",
               "type": "object",
               "properties": {

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=0595e3603406e7f7b457bf9c99059bf1a48d97ef

commit 0595e3603406e7f7b457bf9c99059bf1a48d97ef
Author: Victor Rodriguez <victor.rodriguez.bahena@intel.com>
Date:   Tue Nov 28 19:49:59 2017 +0530

    benchtests: Adjust valid and accepted properties
    
    Benchmark workload-spec2006.wrf does not produce max, min or mean
    results but instead produce throughput. This is represented in
    benchtests/bench-skeleton.c. This patch adjust benchout.schema.json to consider
    bench.out from bench-math benchmarks as valid
    
    ChangeLog:
    
    	* benchtests/scripts/benchout.schema.json: Add throughput as accepted
    	result from property and remove "max", min" and "mean" from required
    	properties based on benchtests/bench-skeleton.c.
    
    Signed-off-by: Victor Rodriguez <victor.rodriguez.bahena@intel.com>
    Reviewed-By: Siddhesh Poyarekar <siddhesh@sourceware.org>

diff --git a/ChangeLog b/ChangeLog
index 2042359..21fd04a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-11-28  Victor Rodriguez  <victor.rodriguez.bahena@intel.com>
+
+	* benchtests/scripts/benchout.schema.json: Add throughput as accepted
+	result from property and remove "max", min" and "mean" from
+	required properties based on benchtests/bench-skeleton.c.
+
 2017-11-28  Florian Weimer  <fweimer@redhat.com>
 
 	[BZ #20826]
diff --git a/benchtests/scripts/benchout.schema.json b/benchtests/scripts/benchout.schema.json
index affb7c1..dfc00b1 100644
--- a/benchtests/scripts/benchout.schema.json
+++ b/benchtests/scripts/benchout.schema.json
@@ -19,6 +19,7 @@
               "properties": {
                 "duration": {"type": "number"},
                 "iterations": {"type": "number"},
+                "throughput": {"type": "number"},
                 "max": {"type": "number"},
                 "min": {"type": "number"},
                 "mean": {"type": "number"},
@@ -27,7 +28,7 @@
                   "items": {"type": "number"}
                 }
               },
-              "required": ["duration", "iterations", "max", "min", "mean"],
+              "required": ["duration", "iterations"],
               "additionalProperties": false
             }
           },

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                               |   21 +++++++++
 benchtests/Makefile                     |   69 ++++++++++++++++++++++---------
 benchtests/README                       |   19 ++++++++
 benchtests/scripts/benchout.schema.json |    5 +-
 localedata/Makefile                     |    2 +-
 5 files changed, 93 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]