From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) by sourceware.org (Postfix) with ESMTPS id 617AC385842B for ; Wed, 1 Feb 2023 17:57:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 617AC385842B Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-pj1-x1036.google.com with SMTP id z1-20020a17090a66c100b00226f05b9595so2813003pjl.0 for ; Wed, 01 Feb 2023 09:57:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=jD3zJyExcWE1wrzq/Lx9XQ2tWJNOrLKy3dkQ0e2MeUI=; b=d5XbAFcgxcg20Pjfsj3+DTq2K/0S5ITxlieC9AJqyxiwoG7wQD6UfkfXujtY6isOBn 0cz4hmlloIkHXdrGzrSvLvxwOOStpwxHIBsy5BFFlZtjM2bFP4ezJ7J30sQGyqP4bErk mW+guoyN5BgFODdEE2BKtKR2CQsi1NLhyFx6sgEOzog91lkR/3Lw7+R/iJeCGwHZED23 07ZwZyPiwm5n9Pmb9aP5pqohwh0f6U8me4RTQ3bY33e+DtXWzfmEMsYSTlPn25RYoKPw 25FZ/CuYsrWW+4c55eWT89EEHfDRzn41SatjeDbFgS5AtKIi43ZFrdacbhAgd8d+LPsg 2ReA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=jD3zJyExcWE1wrzq/Lx9XQ2tWJNOrLKy3dkQ0e2MeUI=; b=OAgbMZtICUpoTpS5I0CBBswpwJnbcVOSKyIF7QTXXNPpVPi8V8EYQAEP8iWqbwgYqr w4JrCEVFdXy9mUDWa9fsuoByJCKmIeev2lqrIgKyNqILNrXoLfG/0PsAGGsTKsDBIiWN dyM02hI4l+m0EFwo6zx1/m5VgHCkXX07ZSyBBnra6Mi3SdJd5xCh781r/6crzcWtpzjJ DGNEOEvrWAgSl4LyTFUl5pVYRIZo8AbOij+9/Vm9pachC6NOZhP93ycg9DisYFkkTphi U6Vh+niXD8hHcgeGw/uAsZgM1sfDgeyas4U4NeHKveVwOmnAAC6GPaUHQbb7gRNINSQE 1pKA== X-Gm-Message-State: AO0yUKVF8gsrYr7yC/md6+/8K8e3Jzyv7kehqD99gRtU95QURi92lEQ6 1/ktGdlQIeb4jR7cG89uWBuMAw== X-Google-Smtp-Source: AK7set8IUbJK2ptWX52MRsXW4crxCxiCcYcJRaSybvAo0gwbkfJis0BKB9GWzsOC7ayDOugn+Yrtzg== X-Received: by 2002:a05:6a21:33a6:b0:bf:58d1:ce92 with SMTP id yy38-20020a056a2133a600b000bf58d1ce92mr1509240pzb.17.1675274224417; Wed, 01 Feb 2023 09:57:04 -0800 (PST) Received: from [192.168.50.50] (rrcs-173-197-98-118.west.biz.rr.com. [173.197.98.118]) by smtp.gmail.com with ESMTPSA id ft8-20020a17090b0f8800b0022908f1398dsm1614097pjb.32.2023.02.01.09.57.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 01 Feb 2023 09:57:03 -0800 (PST) Message-ID: <3797810c-c47b-b42e-5a01-cb6b7214fb03@linaro.org> Date: Wed, 1 Feb 2023 07:57:01 -1000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: [PATCH v11 28/29] string: Hook up the default implementation on test-memchr Content-Language: en-US To: Adhemerval Zanella , libc-alpha@sourceware.org, Noah Goldstein , Jeff Law , Xi Ruoyao References: <20230201170406.303978-1-adhemerval.zanella@linaro.org> <20230201170406.303978-29-adhemerval.zanella@linaro.org> From: Richard Henderson In-Reply-To: <20230201170406.303978-29-adhemerval.zanella@linaro.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 2/1/23 07:04, Adhemerval Zanella wrote: > And remove SIMPLE_MEMCHR, which is not used anywhere. > --- > string/test-memchr.c | 31 ++++++++++++++++++++----------- > 1 file changed, 20 insertions(+), 11 deletions(-) Reviewed-by: Richard Henderson r~ > > diff --git a/string/test-memchr.c b/string/test-memchr.c > index 862094ef0b..0daecab537 100644 > --- a/string/test-memchr.c > +++ b/string/test-memchr.c > @@ -30,7 +30,6 @@ > # define MEMCHR memchr > # define CHAR char > # define UCHAR unsigned char > -# define SIMPLE_MEMCHR simple_memchr > # define BIG_CHAR CHAR_MAX > # define SMALL_CHAR 127 > #else > @@ -38,7 +37,6 @@ > # define MEMCHR wmemchr > # define CHAR wchar_t > # define UCHAR wchar_t > -# define SIMPLE_MEMCHR simple_wmemchr > # define BIG_CHAR WCHAR_MAX > # define SMALL_CHAR 1273 > #endif /* WIDE */ > @@ -47,15 +45,26 @@ typedef CHAR *(*proto_t) (const CHAR *, int, size_t); > > IMPL (MEMCHR, 1) > > -/* Naive implementation to verify results. */ > -CHAR * > -SIMPLE_MEMCHR (const CHAR *s, int c, size_t n) > -{ > - while (n--) > - if (*s++ == (CHAR) c) > - return (CHAR *) s - 1; > - return NULL; > -} > +/* Also check the generic implementation. */ > +#undef MEMCHR > +#undef weak_alias > +#define weak_alias(a, b) > +#undef libc_hidden_builtin_def > +#define libc_hidden_builtin_def(a) > +#undef libc_hidden_def > +#define libc_hidden_def(a) > +#undef libc_hidden_weak > +#define libc_hidden_weak(a) > +#ifndef WIDE > +# define MEMCHR __memchr_default > +# include "string/memchr.c" > +# define MEMCHR_DEFAULT MEMCHR > +#else > +# define WMEMCHR __wmemchr_default > +# include "wcsmbs/wmemchr.c" > +# define MEMCHR_DEFAULT WMEMCHR > +#endif > +IMPL (MEMCHR_DEFAULT, 1) > > static void > do_one_test (impl_t *impl, const CHAR *s, int c, size_t n, CHAR *exp_res)