From patchwork Fri Jan 20 21:16:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 1729841 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=QtshHtvM; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NzC7s492Gz23hB for ; Sat, 21 Jan 2023 08:20:09 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5915B3895FDA for ; Fri, 20 Jan 2023 21:20:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5915B3895FDA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674249607; bh=sY+YvZjWeG+Di1NMnZoY5q7yd+IP4Ia8ez9SoC+m9Hg=; 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=QtshHtvMNy9OghrhS+U/CEzv1HHgFJ6gudn2Ns26wH8XXpgvEI0mbHLbNXmTwuEEU 6VMq3mnRVbgld38FV8qGJ0DjSVh/FuHOc0CHv+7DqEJ6AwHVIT7iKsNO/DZfbsdp1b 2JubBi4qtpCdxU5yOX517500TclHFAYe0/IQbyqk= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-ot1-x336.google.com (mail-ot1-x336.google.com [IPv6:2607:f8b0:4864:20::336]) by sourceware.org (Postfix) with ESMTPS id 9CCC73854153 for ; Fri, 20 Jan 2023 21:17:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9CCC73854153 Received: by mail-ot1-x336.google.com with SMTP id m18-20020a05683026d200b0068661404380so3828794otu.2 for ; Fri, 20 Jan 2023 13:17:12 -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=sY+YvZjWeG+Di1NMnZoY5q7yd+IP4Ia8ez9SoC+m9Hg=; b=ZZ7g/xJdxzRUEhxUg1f+Omg2af5xMRAMbCPSuvLwUPlsP/eqBBYiD2XnoqWnYWWeau CBBzF8Bdg1QgCKn79yrdoRW7KxAn0B5nDYO1gu5K6Zxml4Tl7bqDmKWV/aOxEO9tRwhD Fpo/5THltoyJA0YHyHdczP4C1GZJIXHHKRCyRXMheyqlhNkWKqFYrRUccOHJ2Bh4ZYJ6 QwyB4mZuAXMWmEJdqS1eUJsEjjwHHElZo9hRkk/qby56qqzAHp1j1pPxD/kbl7mcxiVm ekhTB0LQrm7WUGhLc7gEl828ZcLgZ+K8vu/WiNONYYQ8OM8oAnGwedIoaZIS/JBoKpQe vlWw== X-Gm-Message-State: AFqh2krl4fQC2Rdrz2d37z1qRj8r/X7Xb41/wGmwGtUMdtZ+hTdDX8Mh nq1l7HXSp/xfhVLfWAbi0aHx4hr0ayqijp187XE= X-Google-Smtp-Source: AMrXdXvqECWysVgW7NorsfkLsuebUTr3yGL3chggkxyR3S91JXmemb02FFU+n4c4FCFVxTTimFu50g== X-Received: by 2002:a05:6830:314f:b0:686:3bb9:19e6 with SMTP id c15-20020a056830314f00b006863bb919e6mr9829233ots.9.1674249431292; Fri, 20 Jan 2023 13:17:11 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c1:7e99:f284:be2f:4ee5:d122]) by smtp.gmail.com with ESMTPSA id d18-20020a056830139200b00686467f920bsm6937432otq.48.2023.01.20.13.17.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 13:17:10 -0800 (PST) To: libc-alpha@sourceware.org, Richard Henderson , Noah Goldstein Subject: [PATCH v10 19/24] string: Hook up the default implementation on test-strnlen Date: Fri, 20 Jan 2023 18:16:17 -0300 Message-Id: <20230120211622.3445279-20-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230120211622.3445279-1-adhemerval.zanella@linaro.org> References: <20230120211622.3445279-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 Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" Also remove the SIMPLE_STRNLEN, which is not used anywhere. --- string/test-strnlen.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/string/test-strnlen.c b/string/test-strnlen.c index 8b5372c3a1..976c65dc09 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 __strlen_default +# define memchr __memchr_default +# include "string/strnlen.c" +IMPL (__strlen_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)