From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by sourceware.org (Postfix) with ESMTPS id A88D338582BE for ; Wed, 1 Feb 2023 17:54:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A88D338582BE 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-pl1-x62c.google.com with SMTP id m2so14237479plg.4 for ; Wed, 01 Feb 2023 09:54:41 -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=WGs4GuUdVlPfxV86/Mb0cLko8juGWW6Lxf4sVc9CAU0=; b=e7c32ZW/a5vFuBCKLb8R3dw2uTcBOQLiM8wafsD9NoVQXhxaIkHpvYZx/yg9uS4uxY Qj4Ws4G3MT5KFe4/2V7VvLel9erzecrRukekGALloGQ73hQq9FEuVYlMWosQAgBCAyTk k16rNuzpuB20XLHBMrPE0WLqOdL4XcYSUfU0Imylc6C9SmZZa4rMOR9OvB9lq3QYUKs0 npJ4wI0ZfTKnsyvYJV4ZBK8osVYRQ1vSRprVsCgI4d4+HnVAZXg+A96BHrLGOD3eX+Jb p1cbtDM00bvZTys7W8+uJe7ISqDcV20Ik5mE30H4oX3y9/0rgDf0Kqhlkq0sufvGJ8lJ HCDA== 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=WGs4GuUdVlPfxV86/Mb0cLko8juGWW6Lxf4sVc9CAU0=; b=LOXrcTBTlLUf/i/PlBbB4adm6wmj6Z3sOMOVj2FAqTv2XeOIxQYA1e91hWw+l3f/OO 0Z4RnJlQREeorkqnne4cJjIUpTf0TIdNpqavapPhjAk+HdGrcryHnAp93bBUazeQzAmJ xRMANUJD+dp+jtQnA2SES4VyuIZA9K6Tta12NtmOCmIBOP6fmoBw6IQsK6LQtVDTvbK2 a9RA+2nPqU3Ob8fgqGenlGsszPji8MWHvQRWDzk1TJF/5nuAezIcPLbvNet1a8IjXPUZ qHNoNxmve6yRLBziYL/sqyji5QsilDW8HFdlcTU8Q97sEmTsQ4ljLNZYgyGnncpA2Yps 16Hg== X-Gm-Message-State: AO0yUKVdjWt8JvaEqKoGGMxJwv1tDYfuIJ/7Dohz7Bx0vn2uI0P5Qw2/ bNd98UrA3d45TL16nS9fIdhCWw== X-Google-Smtp-Source: AK7set/jVlvQ2OI6TaYlGHZ66rw8phfQc+JWnXSzv+A8N+BepVoaUGLHFe17veUxWWRMM99W6SpcXQ== X-Received: by 2002:a05:6a21:32a4:b0:bf:58d1:ce93 with SMTP id yt36-20020a056a2132a400b000bf58d1ce93mr1465066pzb.18.1675274080697; Wed, 01 Feb 2023 09:54:40 -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 j191-20020a636ec8000000b00497c1399b38sm3590000pgc.78.2023.02.01.09.54.39 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 01 Feb 2023 09:54:40 -0800 (PST) Message-ID: <59c33a0f-f144-9df7-7ba8-eea051c3ba53@linaro.org> Date: Wed, 1 Feb 2023 07:54:37 -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 22/29] string: Hook up the default implementation on test-strnlen 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-23-adhemerval.zanella@linaro.org> From: Richard Henderson In-Reply-To: <20230201170406.303978-23-adhemerval.zanella@linaro.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-11.3 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:03, Adhemerval Zanella wrote: > Also remove the SIMPLE_STRNLEN, which is not used anywhere. > --- > string/test-strnlen.c | 35 ++++++++++++++++++++++++----------- > 1 file changed, 24 insertions(+), 11 deletions(-) Reviewed-by: Richard Henderson r~ > > diff --git a/string/test-strnlen.c b/string/test-strnlen.c > index 8b5372c3a1..ef73dd34f4 100644 > --- a/string/test-strnlen.c > +++ b/string/test-strnlen.c > @@ -43,17 +43,30 @@ > > typedef size_t (*proto_t) (const CHAR *, size_t); > > -IMPL (STRNLEN, 1) > - > -/* Naive implementation to verify results. */ > -size_t > -SIMPLE_STRNLEN (const CHAR *s, size_t maxlen) > -{ > - size_t i; > - > - for (i = 0; i < maxlen && s[i]; ++i); > - return i; > -} > +/* Also check the default implementation. */ > +#undef STRNLEN > +#ifndef WIDE > +# define MEMCHR __memchr_default > +# define weak_alias(a, b) > +# define libc_hidden_def(a) > +# define libc_hidden_builtin_def(a) > +# include "string/memchr.c" > +# undef STRNLEN > +# define STRNLEN __strnlen_default > +# define memchr __memchr_default > +# include "string/strnlen.c" > +IMPL (__strnlen_default, 1) > +#else > +# define WMEMCHR __wmemchr_default > +# define weak_alias(a, b) > +# define libc_hidden_def(a) > +# define libc_hidden_weak(a) > +# include "wcsmbs/wmemchr.c" > +# define WCSNLEN __wcsnlen_default > +# define wmemchr __wmemchr_default > +# include "wcsmbs/wcsnlen.c" > +IMPL (__wcsnlen_default, 1) > +#endif > > static void > do_one_test (impl_t *impl, const CHAR *s, size_t maxlen, size_t exp_len)