From patchwork Tue Jan 17 20:00:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 63303 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 367DA3899423 for ; Tue, 17 Jan 2023 20:05:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 367DA3899423 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673985942; bh=D5xrb91QV0y7uWPJmoeCLcGN8IqcF9OqoJEdJWdEDzM=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=vCGcp8On8loVwaRD/XEJEWoI9nFYRUQFtygS2xM8akXrcUYMKTMMqwRxdQ1e6jVEs MPgxfj4OmlXYv3mEw7ToM+Wanb8jSiGzAwBbhZ3rZLzDI5tTKoyfCAnRoLzRcHEdFN 30uniFtEAlUqdbAz6HR2qPBYH0f2tDsjUg2e4ygQ= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oi1-x22d.google.com (mail-oi1-x22d.google.com [IPv6:2607:f8b0:4864:20::22d]) by sourceware.org (Postfix) with ESMTPS id 3160A3858000 for ; Tue, 17 Jan 2023 20:01:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3160A3858000 Received: by mail-oi1-x22d.google.com with SMTP id i5so8643549oih.11 for ; Tue, 17 Jan 2023 12:01:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=D5xrb91QV0y7uWPJmoeCLcGN8IqcF9OqoJEdJWdEDzM=; b=zwpSmLJP6tDb9tsk1GpQmcAfOuSBlrygA11CoFwyFZnQ2aqUT8tcCUwcqR1OfqBQ4T UZy4Mxuz/CSuz3KgMOnckgeK+Y/2wLIkoaAe/F9Z9AG3D9z+nDAYLKhS98EAucrHnx4I Nt0qYvH4FlrCh/ENQMhX2sp8OAYJa2qozI9HsJ411v6cZsSvKRaf0YvTw/8+Oq8gbyET uIdcQnmWeHCyilWo8NpkFQSxqOll/bbgKUh5OkbN7FP8/bPMAdBjcVPAy1gSycJdxNN8 P/R6G5b/HQbm5DsJKUb0qSwTehFTmNfIsLnqYaxC37pqtFxVlAtNQP3YpEG82d9b2krD TSnA== X-Gm-Message-State: AFqh2krdpzwaFozfzCxe5Y/VoaS57tecgkBqDsfxwhq2UHfbh+4wkK5C AwbISVVzmfZUCgedjeGD5VcIuXVqfprtbP8yB3U= X-Google-Smtp-Source: AMrXdXtzO/Q2ZawLs4ebAxzOFLwSUyYl/Z06kvY9HK2kt15Wpl1nMVHEU8GyDSG54SkJbZRrU9jKoQ== X-Received: by 2002:a05:6808:1313:b0:364:59d6:d8e8 with SMTP id y19-20020a056808131300b0036459d6d8e8mr2458818oiv.27.1673985661824; Tue, 17 Jan 2023 12:01:01 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c1:1652:fbfc:c80a:f5e8:5ed9]) by smtp.gmail.com with ESMTPSA id l10-20020a056808020a00b00360e46a1edasm15095866oie.22.2023.01.17.12.01.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jan 2023 12:01:01 -0800 (PST) To: libc-alpha@sourceware.org, Richard Henderson , Noah Goldstein Subject: [PATCH v9 21/22] string: Hook up the default implementation on test-memchr Date: Tue, 17 Jan 2023 17:00:13 -0300 Message-Id: <20230117200014.1299923-22-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230117200014.1299923-1-adhemerval.zanella@linaro.org> References: <20230117200014.1299923-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" And remove SIMPLE_MEMCHR, which is not used anywhere. --- string/test-memchr.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/string/test-memchr.c b/string/test-memchr.c index 862094ef0b..94121b9fe8 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 WCSCHR __memchr_default +# include "wcsmbs/wcschr.c" +# define MEMCHR_DEFAULT WCSCHR +#endif +IMPL (MEMCHR_DEFAULT, 1) static void do_one_test (impl_t *impl, const CHAR *s, int c, size_t n, CHAR *exp_res)