This patch cleans up the strsep implementation and improves performance.

Currently strsep calls strpbrk is is now a veneer to strcspn.  Calling
strcspn directly is faster.  Since it handles a delimiter string of size
1 as a special case, this is not needed in strsep itself.  Although this
means there is a slightly higher overhead if the delimiter size is 1,
all other cases are slightly faster.  The overall performance gain is 5-10%
on AArch64.

The string/bits/string2.h header contains optimizations for constant
delimiters of size 1-3.  Benchmarking these showed similar performance for
size 1 (since in all cases strchr/strchrnul is used), while size 2 and 3
can give up to 2x speedup for small input strings.  However if these cases
are common it seems much better to add this optimization to strcspn.
So move these header optimizations to string-inlines.c.

Improve the strsep benchmark so that it actually benchmarks something.
The current version contains a delimiter character at every position in the
input string, so there is very little work to do, and the extremely inefficent
simple_strsep implementation appears fastest in every case.  The new version
has either no match in the input for the fail case and a match halfway in the
input for the success case.  The input is then restored so that each iteration
does exactly the same amount of work.  Reduce the number of testcases since
simple_strsep takes a lot of time now.

	* benchtests/bench-strsep.c (oldstrsep): Add old implementation.
	(do_one_test) Restore original string so iteration works.
	* string/string-inlines.c (do_test): Create better input strings.
	(test_main) Reduce number of testruns.
	* string/string-inlines.c (__old_strsep_1c): New function.
	(__old_strsep_2c): Likewise.
	(__old_strsep_3c): Likewise.
	* string/strsep.c (__strsep): Remove case of small delim string.
	Call strcspn directly rather than strpbrk.
	* string/bits/string2.h (__strsep): Remove define.
	(__strsep_1c): Remove.
	(__strsep_2c): Remove.
	(__strsep_3c): Remove.
	(strsep): Remove.
	* sysdeps/unix/sysv/linux/internal_statvfs.c
	(__statvfs_getflags): Rename to __strsep.

1 files changed, 19 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index b8436d37f6..8e8c0a3f6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2015-12-21  Wilco Dijkstra  <wdijkstr@arm.com>
+
+	* benchtests/bench-strsep.c (oldstrsep): Add old implementation.
+	(do_one_test) Restore original string so iteration works.
+	* string/string-inlines.c (do_test): Create better input strings.
+	(test_main) Reduce number of testruns.
+	* string/string-inlines.c (__old_strsep_1c): New function.
+	(__old_strsep_2c): Likewise.
+	(__old_strsep_3c): Likewise.
+	* string/strsep.c (__strsep): Remove case of small delim string.
+	Call strcspn directly rather than strpbrk.
+	* string/bits/string2.h (__strsep): Remove define.
+	(__strsep_1c): Remove.
+	(__strsep_2c): Remove.
+	(__strsep_3c): Remove.
+	(strsep): Remove.
+	* sysdeps/unix/sysv/linux/internal_statvfs.c
+	(__statvfs_getflags): Rename to __strsep.
+
 2016-12-21  Florian Weimer  <fweimer@redhat.com>
 
 	* csu/libc-tls.c (_dl_tls_setup): Remove.