From patchwork Wed Dec 21 23:05:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 707984 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tkVdr1hbCz9t1F for ; Thu, 22 Dec 2016 10:06:40 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="O7QCuA6G"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=dhfJm2DFCIE7FLUSQt9sV6mSbYwT9Y5 geTsZcfFCjD9vENhyhqq9P3yaIyfHTvA72CfHg44U6sDh7N/LGu0DLWGV9/y/fCH MajREpY2Cmc6xzTtHBDRUoN4bLRjyKrfi+JPiMQje+UTh/t6RTySAZNEEIC8NcZz ARpNcgZ7wGIg= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=FhPYUamaEzzmeX1bI38tdYwb1fU=; b=O7QCu A6GC9TOo8ToMmOcbs8oglVvjks3+Py+gS0jAlIgQUFJaNgD733cxrToq0nmuD7MO 1goMApNGPjDscuQQ6sdPprNKJRbviS2EfqPRP9LxWaPJ8UTjI5Pv2IDo8lVxMbDJ LP6bSjiIZmB9ZCVzDqBnQw2VoA8ZpgSHz65rEE= Received: (qmail 50725 invoked by alias); 21 Dec 2016 23:06:16 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 50675 invoked by uid 89); 21 Dec 2016 23:06:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.6 required=5.0 tests=BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=no version=3.3.2 spammy=consisting, 0x80, our X-HELO: mail-pg0-f67.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=Lmpl8HgTooHEmUha6rXjHnrnLnTyJhHQ7mvYnzyHziE=; b=GP7nvxqCvGN46inmN1Il6Pe7XylorN79Tt3x4LDof6Cl9qKlD1EOwj7F/AQAVzD28E fbmJCZwRUFwg+nPMdREaVDc/M+FP6lZt+til+xq5oFQsgmsVfHXkHyzlGCrbBUxJ9i3h am/ZFtxdpffmESR90uQ0pZ8K1IX94GLUZUMZf5ysGJtVkXxiFyk+es6jqSpve2rM7hoq VzXqr68mz2aVv2160wMi2K5XI/izjv+kU9NUkv4KwgBzCNSnvl9Aa+anGn4yx4Mi2Q+y myx5bcTAhIh489MPt+L2ILFtnfKRe+ykRzVJP4QYHmnxDsFMihNqclIKYcQk4rgfAytF fmSQ== X-Gm-Message-State: AIkVDXLsQ9SYeVMp7/6Lm7NJkeML3rKjaecIzUXCFBsHl1KrYuxVeVDFMNJ1MdYx8YJiyg== X-Received: by 10.84.197.1 with SMTP id m1mr13225784pld.157.1482361571513; Wed, 21 Dec 2016 15:06:11 -0800 (PST) From: Richard Henderson To: libc-alpha@sourceware.org Subject: [PATCH v2 05/16] Improve generic memchr Date: Wed, 21 Dec 2016 15:05:54 -0800 Message-Id: <20161221230605.28638-6-rth@twiddle.net> In-Reply-To: <20161221230605.28638-1-rth@twiddle.net> References: <20161221230605.28638-1-rth@twiddle.net> [BZ #5806] * string/memchr.c: Use string-fzb.h, string-fzi.h, string-opthr.h. --- string/memchr.c | 146 ++++++++++++++++---------------------------------------- 1 file changed, 41 insertions(+), 105 deletions(-) diff --git a/string/memchr.c b/string/memchr.c index ca9fd99..f724911 100644 --- a/string/memchr.c +++ b/string/memchr.c @@ -25,138 +25,74 @@ #endif #include - #include - -#include +#include +#include +#include +#include #undef __memchr -#ifdef _LIBC -# undef memchr -#endif +#undef memchr -#ifndef weak_alias -# define __memchr memchr -#endif - -#ifndef MEMCHR -# define MEMCHR __memchr +#ifdef MEMCHR +#define __memchr MEMCHR #endif /* Search no more than N bytes of S for C. */ void * -MEMCHR (void const *s, int c_in, size_t n) +__memchr (void const *s, int c_in, size_t n) { - /* On 32-bit hardware, choosing longword to be a 32-bit unsigned - long instead of a 64-bit uintmax_t tends to give better - performance. On 64-bit hardware, unsigned long is generally 64 - bits already. Change this typedef to experiment with - performance. */ - typedef unsigned long int longword; - const unsigned char *char_ptr; - const longword *longword_ptr; - longword repeated_one; - longword repeated_c; + const op_t *word_ptr; + op_t word, repeated_c; unsigned char c; + uintptr_t i, align; c = (unsigned char) c_in; + char_ptr = (const unsigned char *) s; /* Handle the first few bytes by reading one byte at a time. - Do this until CHAR_PTR is aligned on a longword boundary. */ - for (char_ptr = (const unsigned char *) s; - n > 0 && (size_t) char_ptr % sizeof (longword) != 0; - --n, ++char_ptr) + Do this until CHAR_PTR is aligned on a word boundary, or + the entirety of small inputs. */ + align = -(uintptr_t)char_ptr % sizeof (word); + if (n < OP_T_THRES || align > n) + align = n; + for (i = 0; i < align; ++i, ++char_ptr) if (*char_ptr == c) return (void *) char_ptr; - longword_ptr = (const longword *) char_ptr; + /* Set up a word, each of whose bytes is C. */ + repeated_c = ((op_t)-1 / 0xff) * c; - /* All these elucidatory comments refer to 4-byte longwords, - but the theory applies equally well to any size longwords. */ + word_ptr = (const op_t *) char_ptr; + n -= align; + if (__glibc_unlikely (n == 0)) + return NULL; - /* Compute auxiliary longword values: - repeated_one is a value which has a 1 in every byte. - repeated_c has c in every byte. */ - repeated_one = 0x01010101; - repeated_c = c | (c << 8); - repeated_c |= repeated_c << 16; - if (0xffffffffU < (longword) -1) + /* Loop while we have more than one word remaining. */ + while (n > sizeof (word)) { - repeated_one |= repeated_one << 31 << 1; - repeated_c |= repeated_c << 31 << 1; - if (8 < sizeof (longword)) - { - size_t i; - - for (i = 64; i < sizeof (longword) * 8; i *= 2) - { - repeated_one |= repeated_one << i; - repeated_c |= repeated_c << i; - } - } + word = *word_ptr; + if (has_eq (word, repeated_c)) + goto found; + word_ptr++; + n -= sizeof (word); } - /* Instead of the traditional loop which tests each byte, we will test a - longword at a time. The tricky part is testing if *any of the four* - bytes in the longword in question are equal to c. We first use an xor - with repeated_c. This reduces the task to testing whether *any of the - four* bytes in longword1 is zero. - - We compute tmp = - ((longword1 - repeated_one) & ~longword1) & (repeated_one << 7). - That is, we perform the following operations: - 1. Subtract repeated_one. - 2. & ~longword1. - 3. & a mask consisting of 0x80 in every byte. - Consider what happens in each byte: - - If a byte of longword1 is zero, step 1 and 2 transform it into 0xff, - and step 3 transforms it into 0x80. A carry can also be propagated - to more significant bytes. - - If a byte of longword1 is nonzero, let its lowest 1 bit be at - position k (0 <= k <= 7); so the lowest k bits are 0. After step 1, - the byte ends in a single bit of value 0 and k bits of value 1. - After step 2, the result is just k bits of value 1: 2^k - 1. After - step 3, the result is 0. And no carry is produced. - So, if longword1 has only non-zero bytes, tmp is zero. - Whereas if longword1 has a zero byte, call j the position of the least - significant zero byte. Then the result has a zero at positions 0, ..., - j-1 and a 0x80 at position j. We cannot predict the result at the more - significant bytes (positions j+1..3), but it does not matter since we - already have a non-zero bit at position 8*j+7. - - So, the test whether any byte in longword1 is zero is equivalent to - testing whether tmp is nonzero. */ - - while (n >= sizeof (longword)) + /* Since our pointer is aligned, we can always read the last word. */ + word = *word_ptr; + if (has_eq (word, repeated_c)) { - longword longword1 = *longword_ptr ^ repeated_c; - - if ((((longword1 - repeated_one) & ~longword1) - & (repeated_one << 7)) != 0) - break; - longword_ptr++; - n -= sizeof (longword); - } - - char_ptr = (const unsigned char *) longword_ptr; - - /* At this point, we know that either n < sizeof (longword), or one of the - sizeof (longword) bytes starting at char_ptr is == c. On little-endian - machines, we could determine the first such byte without any further - memory accesses, just by looking at the tmp result from the last loop - iteration. But this does not work on big-endian machines. Choose code - that works in both cases. */ - - for (; n > 0; --n, ++char_ptr) - { - if (*char_ptr == c) - return (void *) char_ptr; + found: + i = index_first_eq (word, repeated_c); + if (i < n) + return (char *) word_ptr + i; } return NULL; } -#ifdef weak_alias + +#ifndef MEMCHR weak_alias (__memchr, memchr) -#endif libc_hidden_builtin_def (memchr) +#endif