From patchwork Mon Feb 19 20:45:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 86000 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 A9DEB385840F for ; Mon, 19 Feb 2024 20:45:42 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) by sourceware.org (Postfix) with ESMTPS id C51733858D35 for ; Mon, 19 Feb 2024 20:45:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C51733858D35 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org C51733858D35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::52e ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708375511; cv=none; b=XTTelJ9BWTVdtJlXA7dOuee1X8cfIm2VZ7WvP02vjsZq6/F8QWXoWWMuAonUyBBl0K3XDLMNzV+f74hJi8GqT7FXdW28v7m9YbRqpJkq660Nk/OI21x5Wo3wMMwePABh1I0fE/IpRkJfQZ9lx5hNWRIEppbc0ljeo/zzGwpA41g= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708375511; c=relaxed/simple; bh=2pcO3n3QzcLTEXoLUJhoP/rzNma3qD6133uDLGYDHWs=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=my7DOBZ7rR+HpeoiEc/G4RZ3XkIHXhCpY9tb29/wsQq2VPilW4YJO/O5ZshOYeGW6pUzGhsECniELIiQ6R1QzDZVRjSno1OoAr6Yr2Q3X++h1dYUBbZ1LLf6TFQCV8R2Os5KtSCu7eWVBZR8mN2LVmSUDOH/QR1Pa/Py4XKFGrQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pg1-x52e.google.com with SMTP id 41be03b00d2f7-5d8b70b39efso3363307a12.0 for ; Mon, 19 Feb 2024 12:45:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708375508; x=1708980308; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=GqMjbh/bGB8MFqoqD/3CB95F3q6+jxXX90AhF6bbzqI=; b=vqHMS+AmGqAZqJZOAovPVyNvcxtSkBi1w2b0fpAveGmEx+9QeO3JXavnVdpsed7UgT nSelfqfE6wrEvOaYV52WhTi8r0FI2NxsMxR2P/LI+LsUMmE4MSNqyfFlRpd3CMUWi8yH MVyChSxMJ7TPVywFq0jmyceLj1PrkRxPJs0FFBDehe9p0inmJd/eh8k8niMQuIRwrWKe peKdwjmH8IOa4HPG+CKVdA5cnyfLZ2XsWGZ2yUtrhX3hLdiXkVFP83ioMAmZVA5TURbK 1AWs60AD/JckzymAd4PcyBwn0bW2CIJtUKAN3Moq7g2Nmyql+d+LMul/bnluKY7wIBl1 YnzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708375508; x=1708980308; 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=GqMjbh/bGB8MFqoqD/3CB95F3q6+jxXX90AhF6bbzqI=; b=CNX6sNc6pHrUMG8WSz+DCN3Bhjm23MTFC1MYGMDqhbU960r57cnND6ge6Ktn9UlwEL a52uJ38fuzBNwLzx2KjnuGNj3/CUxXQC3iu80E1NrbyZx8RaVqTpJYWDGA1OqCZ3bdaH 3kz7bZI3eHZuB0mSK46XfQ5eXfNdbdnLD1pnPh2DevFfh2iixBm5s/hx8hWsYAD1WfpV HrCXhpGZDsvKwXEBQLe6QNqpVgNrpjA0xRnyjNVc2lWW+aVUCYl3PRmXAs+Pmb4z9LEl vLt0qmyEcDC//u0/CUKDTr2sLqL5l6q7oliqOG5uDDhmEJkOLa4lLtVSB+gVN3pTWE9F HqVw== X-Gm-Message-State: AOJu0YwG3uyMYbAu6C9mT8xLlPbw53GH2QqcGgvIx0BKkJRNsRM8bD2+ z7OnVn3slKjER+PEV34fyDiMOUrjOcI8zO7m4WnnpBfqIWytAgv731BuyagexJdrp9wsTc7RxuS z X-Google-Smtp-Source: AGHT+IHpyyusoyCfEhSVOUDiciGvSnTyAqXLhksn7HQhfI7ZtUFXRg6CpK9gamw4ww3StDqm6miwMg== X-Received: by 2002:a05:6a20:9f45:b0:19e:488f:692d with SMTP id ml5-20020a056a209f4500b0019e488f692dmr11987437pzb.7.1708375508200; Mon, 19 Feb 2024 12:45:08 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c0:8177:87f4:ac6d:3153:10b3]) by smtp.gmail.com with ESMTPSA id i28-20020a056a00005c00b006e37bedbcbdsm4369802pfk.115.2024.02.19.12.45.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 12:45:07 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 1/3] string: Remove c_strstr from test-strstr Date: Mon, 19 Feb 2024 17:45:00 -0300 Message-Id: <20240219204502.3095343-2-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240219204502.3095343-1-adhemerval.zanella@linaro.org> References: <20240219204502.3095343-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.1 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, T_SCC_BODY_TEXT_LINE 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.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org There is no much point is checking the generic code if this is not really used by libc. --- string/test-strstr.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/string/test-strstr.c b/string/test-strstr.c index 4115f7d2fd..05d0b7c98c 100644 --- a/string/test-strstr.c +++ b/string/test-strstr.c @@ -21,11 +21,6 @@ #include "test-string.h" -#define STRSTR c_strstr -#define libc_hidden_builtin_def(arg) /* nothing */ -#define __strnlen strnlen -#include "strstr.c" - /* Naive implementation to verify results. */ static char * simple_strstr (const char *s1, const char *s2) @@ -52,7 +47,6 @@ simple_strstr (const char *s1, const char *s2) typedef char *(*proto_t) (const char *, const char *); -IMPL (c_strstr, 0) IMPL (strstr, 1) From patchwork Mon Feb 19 20:45:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 86001 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 2B718385842F for ; Mon, 19 Feb 2024 20:45:46 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) by sourceware.org (Postfix) with ESMTPS id 6EECD3858D37 for ; Mon, 19 Feb 2024 20:45:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6EECD3858D37 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 6EECD3858D37 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::434 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708375514; cv=none; b=UbOD52pVafTwMbC6AjYwZAVg5klbr4s1vfxd2JSpjQnhpND2MALxe7qZJ0/cLSxlrR1jdyFxoZEjFEJYoRX8FfoUHWZ/gXfZ/Lu5TThG1b4/gGH2NCbVSN4Ycx71/DJ85KpUodjKEcozCwCgGSahLFFcik/e5GSUJS1YQMPJZHQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708375514; c=relaxed/simple; bh=egfTyI6S00AP6bNg47u48YBIluSzHf6UpDcEPrL56fk=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=OyNSjozSgs8CvVYURUff2UB5UwLmzM6jG4K68/XPtEm9NdPLXSypLujDlql6R3yE49YGk7t2YjbWQN/DLuz0O8xyIXKjVmhCoOKT5VKR2ZKlpwEad51oAirF099pbRwZe9InOdKsyuWP6C403rKkxh4UyHHhUxH3bTMfQZYFayk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-6e479be127dso79736b3a.3 for ; Mon, 19 Feb 2024 12:45:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708375510; x=1708980310; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Fi5v6Ml6+6ZP2QRCv0cftcoyL8dBQhfbrx45DaGPIlc=; b=q4aRAR2GynhrhTRm11KHmlc9ASI0GswDKRm7ytveRSzMUhmn6UXqdnAFhWglZwBpVy 35UREub4QF5+0oRBt170LmdmF+FOQ8aRQ+dDQnell7rhRSjKqqRa/4k0CfxSJJ+MMHAK Nd6Gvt9uijVSKKqiM90FhacheTlNnfrjRF9wikKd0cyFTLX/kGZxQYgwP5rA5PDnd7lK 6wWJDSVLxIoBS0cXgJD2KAp7hQMmY2OqJkOpNObjUShIykqKfauQu2GruJuk43zCzgFk +XWwUDay+M5HTwugdcMREKd4qC721v3FFZAfZiZMfexOkXZ7Wiah43vRfl7Ql3Wf55Pf 4HZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708375510; x=1708980310; 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=Fi5v6Ml6+6ZP2QRCv0cftcoyL8dBQhfbrx45DaGPIlc=; b=CJ/enwZLSdBOEOVJ7fxCHL+SFYaSzgV7ivcQmegCwYObPio9c96iOu/EiqEu88k3Mz SNsQhkDVRFmfPbMjeeeNrU+mgFpkLEJxaaSBzkbwWmre78X8kW8dD/CJrWhNf3WkeA30 xWID09YlyEb5flA+OOsHZP4JkZpnKGeWZoLXS/ZHvDociWgIvQqnnS+kt4nOcSuGUFbt I4MEQ3O3uO6v0iDnmjqkilhibfte1X/YNEk/dyAazpmggPCHzIP0ldS7dVQfrP5x5jXM +9T+bqIUjtdIQbMvcZjgGSWs5+VxW3Tp/DiDkor+R8epcITObgHFu46bU6SrfvwQM05R 415A== X-Gm-Message-State: AOJu0YwDmxtJuV2QX+G2N12O79e0a+IprlKW/xfhEvZdqCseaFy0h6XB Sh+YkojTV60TLX3Z0bwMuviNhRLVQYrra4oOJfLoawF25bSWmBz9IfiruJ7ea/rp9S5IwS24NtV x X-Google-Smtp-Source: AGHT+IGu9yzyiyWM9mJtcF1928OFh4IKdYlpKnW/ESDS82d/8D68LxWilfBSL7o1aJxNTL5ax7zWHw== X-Received: by 2002:a62:6381:0:b0:6e4:59aa:93a2 with SMTP id x123-20020a626381000000b006e459aa93a2mr5362955pfb.2.1708375509765; Mon, 19 Feb 2024 12:45:09 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c0:8177:87f4:ac6d:3153:10b3]) by smtp.gmail.com with ESMTPSA id i28-20020a056a00005c00b006e37bedbcbdsm4369802pfk.115.2024.02.19.12.45.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 12:45:09 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 2/3] wcsmbs: Add test-wcsstr Date: Mon, 19 Feb 2024 17:45:01 -0300 Message-Id: <20240219204502.3095343-3-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240219204502.3095343-1-adhemerval.zanella@linaro.org> References: <20240219204502.3095343-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Parametrize test-strstr.c so it can be used to check wcsstr. Checked on x86_64-linux-gnu and aarch64-linux-gnu. --- string/test-strstr.c | 125 +++++++++++++++++++++++++++---------------- wcsmbs/Makefile | 1 + wcsmbs/test-wcsstr.c | 20 +++++++ 3 files changed, 100 insertions(+), 46 deletions(-) create mode 100644 wcsmbs/test-wcsstr.c diff --git a/string/test-strstr.c b/string/test-strstr.c index 05d0b7c98c..3d7858e6be 100644 --- a/string/test-strstr.c +++ b/string/test-strstr.c @@ -17,16 +17,44 @@ . */ #define TEST_MAIN -#define TEST_NAME "strstr" -#include "test-string.h" +#ifndef WIDE +# define TEST_NAME "strstr" +#else +# define TEST_NAME "wcsstr" +#endif + +#ifndef WIDE +# define CHAR char +# define STRLEN strlen +# define STRSTR strstr +# define STRCPY strcpy +# define MEMCPY memcpy +# define MEMSET memset +# define MEMPCPY mempcpy +# define L(s) s +#else +# include +# define CHAR wchar_t +# define STRLEN wcslen +# define STRCPY wcscpy +# define STRSTR wcsstr +# define MEMCPY wmemcpy +# define MEMSET wmemset +# define MEMPCPY wmempcpy +# define L(s) L ## s +/* The test requires up to 8191 charateres, so allocate at least 32Kb + (considering 4kb page size). */ +# define BUF1PAGES 4 +#endif +#include "test-string.h" /* Naive implementation to verify results. */ -static char * -simple_strstr (const char *s1, const char *s2) +static CHAR * +simple_strstr (const CHAR *s1, const CHAR *s2) { - ssize_t s1len = strlen (s1); - ssize_t s2len = strlen (s2); + ssize_t s1len = STRLEN (s1); + ssize_t s2len = STRLEN (s2); if (s2len > s1len) return NULL; @@ -38,28 +66,27 @@ simple_strstr (const char *s1, const char *s2) if (s1[i + j] != s2[j]) break; if (j == s2len) - return (char *) s1 + i; + return (CHAR *) s1 + i; } return NULL; } -typedef char *(*proto_t) (const char *, const char *); +typedef CHAR *(*proto_t) (const CHAR *, const CHAR *); -IMPL (strstr, 1) +IMPL (STRSTR, 1) static int -check_result (impl_t *impl, const char *s1, const char *s2, - char *exp_result) +check_result (impl_t *impl, const CHAR *s1, const CHAR *s2, + CHAR *exp_result) { - char *result = CALL (impl, s1, s2); + CHAR *result = CALL (impl, s1, s2); if (result != exp_result) { - error (0, 0, "Wrong result in function %s %s %s", impl->name, - (result == NULL) ? "(null)" : result, - (exp_result == NULL) ? "(null)" : exp_result); + error (0, 0, "Wrong result in function %p %p %p", impl->name, + result, exp_result); ret = 1; return -1; } @@ -68,7 +95,7 @@ check_result (impl_t *impl, const char *s1, const char *s2, } static void -do_one_test (impl_t *impl, const char *s1, const char *s2, char *exp_result) +do_one_test (impl_t *impl, const CHAR *s1, const CHAR *s2, CHAR *exp_result) { if (check_result (impl, s1, s2, exp_result) < 0) return; @@ -79,49 +106,52 @@ static void do_test (size_t align1, size_t align2, size_t len1, size_t len2, int fail) { - char *s1 = (char *) (buf1 + align1); - char *s2 = (char *) (buf2 + align2); + align1 = align1 * sizeof (CHAR); + align2 = align2 * sizeof (CHAR); - static const char d[] = "1234567890abcdef"; -#define dl (sizeof (d) - 1) - char *ss2 = s2; + CHAR *s1 = (CHAR *) (buf1 + align1); + CHAR *s2 = (CHAR *) (buf2 + align2); + + static const CHAR d[] = L("1234567890abcdef"); + const size_t dl = STRLEN (d); + CHAR *ss2 = s2; for (size_t l = len2; l > 0; l = l > dl ? l - dl : 0) { size_t t = l > dl ? dl : l; - ss2 = mempcpy (ss2, d, t); + ss2 = MEMPCPY (ss2, d, t); } s2[len2] = '\0'; if (fail) { - char *ss1 = s1; + CHAR *ss1 = s1; for (size_t l = len1; l > 0; l = l > dl ? l - dl : 0) { size_t t = l > dl ? dl : l; - memcpy (ss1, d, t); + MEMCPY (ss1, d, t); ++ss1[len2 > 7 ? 7 : len2 - 1]; ss1 += t; } } else { - memset (s1, '0', len1); - memcpy (s1 + len1 - len2, s2, len2); + MEMSET (s1, '0', len1); + MEMCPY (s1 + len1 - len2, s2, len2); } s1[len1] = '\0'; FOR_EACH_IMPL (impl, 0) do_one_test (impl, s1, s2, fail ? NULL : s1 + len1 - len2); - } static void +__attribute_used__ check1 (void) { - const char s1[] = - "F_BD_CE_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_C3_88_20_EF_BF_BD_EF_BF_BD_EF_BF_BD_C3_A7_20_EF_BF_BD"; - const char s2[] = "_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD"; - char *exp_result; + const CHAR s1[] = + L("F_BD_CE_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_C3_88_20_EF_BF_BD_EF_BF_BD_EF_BF_BD_C3_A7_20_EF_BF_BD"); + const CHAR s2[] = L("_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD"); + CHAR *exp_result; exp_result = simple_strstr (s1, s2); FOR_EACH_IMPL (impl, 0) @@ -129,32 +159,34 @@ check1 (void) } static void +__attribute_used__ check2 (void) { - const char s1_stack[] = ", enable_static, \0, enable_shared, "; + const CHAR s1_stack[] = L(", enable_static, \0, enable_shared, "); const size_t s1_byte_count = 18; - const char *s2_stack = &(s1_stack[s1_byte_count]); - const size_t s2_byte_count = 18; - char *exp_result; + const size_t s1_byte_len = 18 * sizeof (CHAR); + const CHAR *s2_stack = &(s1_stack[s1_byte_count]); + const size_t s2_byte_len = 18 * sizeof (CHAR);; + CHAR *exp_result; const size_t page_size_real = getpagesize (); /* Haystack at end of page. The following page is protected. */ - char *s1_page_end = (void *) buf1 + page_size - s1_byte_count; - strcpy (s1_page_end, s1_stack); + CHAR *s1_page_end = (void *) buf1 + page_size - s1_byte_len; + STRCPY (s1_page_end, s1_stack); /* Haystack which crosses a page boundary. Note: page_size is at least 2 * getpagesize. See test_init. */ - char *s1_page_cross = (void *) buf1 + page_size_real - 8; - strcpy (s1_page_cross, s1_stack); + CHAR *s1_page_cross = (void *) buf1 + page_size_real - 8; + STRCPY (s1_page_cross, s1_stack); /* Needle at end of page. The following page is protected. */ - char *s2_page_end = (void *) buf2 + page_size - s2_byte_count; - strcpy (s2_page_end, s2_stack); + CHAR *s2_page_end = (void *) buf2 + page_size - s2_byte_len; + STRCPY (s2_page_end, s2_stack); /* Needle which crosses a page boundary. Note: page_size is at least 2 * getpagesize. See test_init. */ - char *s2_page_cross = (void *) buf2 + page_size_real - 8; - strcpy (s2_page_cross, s2_stack); + CHAR *s2_page_cross = (void *) buf2 + page_size_real - 8; + STRCPY (s2_page_cross, s2_stack); exp_result = simple_strstr (s1_stack, s2_stack); FOR_EACH_IMPL (impl, 0) @@ -176,10 +208,11 @@ check2 (void) #define N 1024 static void +__attribute_used__ pr23637 (void) { - char *h = (char*) buf1; - char *n = (char*) buf2; + CHAR *h = (CHAR*) buf1; + CHAR *n = (CHAR*) buf2; for (int i = 0; i < N; i++) { @@ -194,7 +227,7 @@ pr23637 (void) /* Ensure we don't match at the first 'x'. */ h[0] = 'x'; - char *exp_result = simple_strstr (h, n); + CHAR *exp_result = simple_strstr (h, n); FOR_EACH_IMPL (impl, 0) check_result (impl, h, n, exp_result); } diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile index f3333c6a4b..1cddd8cc6d 100644 --- a/wcsmbs/Makefile +++ b/wcsmbs/Makefile @@ -163,6 +163,7 @@ tests := \ test-wcspbrk \ test-wcsrchr \ test-wcsspn \ + test-wcsstr \ test-wmemchr \ test-wmemcmp \ test-wmemset \ diff --git a/wcsmbs/test-wcsstr.c b/wcsmbs/test-wcsstr.c new file mode 100644 index 0000000000..cb9b2f51c0 --- /dev/null +++ b/wcsmbs/test-wcsstr.c @@ -0,0 +1,20 @@ +/* Test wcsstr function. + Copyright (C) 2024 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#define WIDE 1 +#include "../string/test-strstr.c" From patchwork Mon Feb 19 20:45:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 86002 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 EB56E3858437 for ; Mon, 19 Feb 2024 20:45:51 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) by sourceware.org (Postfix) with ESMTPS id 8D8A13858D3C for ; Mon, 19 Feb 2024 20:45:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8D8A13858D3C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 8D8A13858D3C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::42c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708375517; cv=none; b=Eq5uRuuMVgDW15I3Db9YUtMV77NU6WhS7BL3Xo6kT1bOOZ+TNmgdtYVhsCArQPWfpZIWKg+xBHuKbiNPqVF3qUNf6FdUR5cm8dp1txH+RelTNqeMpHUW4RRCc/fNcICCw8HafY7hwSZkPc/NWuGO25RWFLz3yC5zUqQBxw2xFaI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708375517; c=relaxed/simple; bh=/MER4nNRep/TjuLY1/T8j3P+2cJKGqKVQCKdkxNwWmU=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=lWyGxlKpE2Rq/5/ojDRDEwzfDHCWn1dbFcdQn4ZFaX7uyI6mT9C/OsIIzk5ZmuRGPXJbXiKUbfj4E5icgNeIlANMEI5uuP1uNxC7bxA8LerPYY4XSE6Hw2O/y6/Bnw3WsDp/skY6OqusfAGvzDoVV/dAHYszRnvDj8Zsj3CglrA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-6e3ffafa708so1625318b3a.1 for ; Mon, 19 Feb 2024 12:45:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708375512; x=1708980312; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=tlGC0gcqIal4bydYvPTq39y+jpRenPOm7bb1ZhXjIzs=; b=GVSQQ8NqCfyJ4xzv7Mr9/N2bD8gou5yPdvHDswhCqa/oEyph5xWwc8QjVVlMgSdejb gHSmbtT7dF6SIH6cSBu39ssz9ZV14ZmWCLrWui1YDKEhOL8isM3VOYqThZZ3nWZANJ+G ZGXv06q69PCEchdj9eBTSUVGN8J40nkQZ0drgBly5smIlsfDEzj4a9kjuH0hXQ4S0+Ml AqSbEOEod3/bAKA62yBQ8x6qd9ggYPnsXmGY+9GC7u9hTBmj8920VzJ5JoCqJzqcg1yy p2JUmqQ67UosNtQr85YylaUqxcRcnIcc3jy05ppvtS3oXFP4Lz/oS4QbLoSlcR4f6uWm Ty2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708375512; x=1708980312; 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=tlGC0gcqIal4bydYvPTq39y+jpRenPOm7bb1ZhXjIzs=; b=Wxu3+dOZ+t0IpYnFcBgvNpmsI6kuRThe1LM8kktc6HdB4RVlL5mCtvXDlFPwO1x5me Q/vR8i1Wz/EWYDdkNhwevkiFVIUcZsre4G5B6As+o3hbOuKSNWkZMafcDABce+g96fAt 17xmEaczP+q8HEnaOLHXyg6EqWXFsoMytgpzYjHShnjI8u4KMHJYrwR7cpnOOZ0z6T8W ykHntrUcjwe+sOTkXYd3ticvMOV/vzp62St5FEwzgGS8FyI6/IL7E3bPcwUm+6bPb6X9 tFU02YSI0FG7zZpPrG/AmlSETbMrg0/e4kJxVmhKNs6BuHK0zHaRLmZaUEPcQ0FcXLFV Z2wg== X-Gm-Message-State: AOJu0Yxes8nPrRBsgS/wzTPHC18JoH4IQi4RzvDpRrM3HB3++9hvDCWc f2zzvZG57KBQ8z94MPYkjerLA0PpJgwfa2t6Wc0yddlBUfMPe/qN66CqofgC99HO/x50FIdDbGg v X-Google-Smtp-Source: AGHT+IGa513NHBW6tYgkoK+eryVd+weLMGtRdfpRfr18U+fgbAxGqlTvb1GBQKljU5AbeUlIAY9KQA== X-Received: by 2002:a05:6a00:9383:b0:6e4:6981:e9b3 with SMTP id ka3-20020a056a00938300b006e46981e9b3mr3008463pfb.2.1708375511561; Mon, 19 Feb 2024 12:45:11 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c0:8177:87f4:ac6d:3153:10b3]) by smtp.gmail.com with ESMTPSA id i28-20020a056a00005c00b006e37bedbcbdsm4369802pfk.115.2024.02.19.12.45.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 12:45:10 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 3/3] wcsmbs: Ensure wcstr worst-case linear execution time (BZ 23865) Date: Mon, 19 Feb 2024 17:45:02 -0300 Message-Id: <20240219204502.3095343-4-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240219204502.3095343-1-adhemerval.zanella@linaro.org> References: <20240219204502.3095343-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org It uses the same two-way algorithm used on strstr, strcasestr, and memmem. Different than strstr, neither the "shift table" optimization nor the self-adapting filtering check is used because it would result in a too-large shift table (and it also simplifies the implementation bit). Checked on x86_64-linux-gnu and aarch64-linux-gnu. --- wcsmbs/wcs-two-way.h | 312 +++++++++++++++++++++++++++++++++++++++++++ wcsmbs/wcsstr.c | 104 +++++---------- 2 files changed, 344 insertions(+), 72 deletions(-) create mode 100644 wcsmbs/wcs-two-way.h diff --git a/wcsmbs/wcs-two-way.h b/wcsmbs/wcs-two-way.h new file mode 100644 index 0000000000..2dcee7fc1a --- /dev/null +++ b/wcsmbs/wcs-two-way.h @@ -0,0 +1,312 @@ +/* Byte-wise substring search, using the Two-Way algorithm. + Copyright (C) 2024 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +/* Before including this file, you need to include (and + before that, if not part of libc), and define: + AVAILABLE(h, h_l, j, n_l) + A macro that returns nonzero if there are + at least N_L characters left starting at H[J]. + H is 'wchar_t *', H_L, J, and N_L are 'size_t'; + H_L is an lvalue. For NUL-terminated searches, + H_L can be modified each iteration to avoid + having to compute the end of H up front. + + For case-insensitivity, you may optionally define: + CMP_FUNC(p1, p2, l) A macro that returns 0 iff the first L + characters of P1 and P2 are equal. + CANON_ELEMENT(c) A macro that canonicalizes an element right after + it has been fetched from one of the two strings. + The argument is an 'wchar_t'; the result must + be an 'wchar_t' as well. +*/ + +#include +#include +#include /* Defines MAX. */ + +/* We use the Two-Way string matching algorithm, which guarantees + linear complexity with constant space. + + See http://www-igm.univ-mlv.fr/~lecroq/string/node26.html#SECTION00260 + and http://en.wikipedia.org/wiki/Boyer-Moore_string_search_algorithm +*/ + +#ifndef CANON_ELEMENT +# define CANON_ELEMENT(c) c +#endif +#ifndef CMP_FUNC +# define CMP_FUNC __wmemcmp +#endif + +/* Perform a critical factorization of NEEDLE, of length NEEDLE_LEN. + Return the index of the first character in the right half, and set + *PERIOD to the global period of the right half. + + The global period of a string is the smallest index (possibly its + length) at which all remaining bytes in the string are repetitions + of the prefix (the last repetition may be a subset of the prefix). + + When NEEDLE is factored into two halves, a local period is the + length of the smallest word that shares a suffix with the left half + and shares a prefix with the right half. All factorizations of a + non-empty NEEDLE have a local period of at least 1 and no greater + than NEEDLE_LEN. + + A critical factorization has the property that the local period + equals the global period. All strings have at least one critical + factorization with the left half smaller than the global period. + + Given an ordered alphabet, a critical factorization can be computed + in linear time, with 2 * NEEDLE_LEN comparisons, by computing the + larger of two ordered maximal suffixes. The ordered maximal + suffixes are determined by lexicographic comparison of + periodicity. */ +static size_t +critical_factorization (const wchar_t *needle, size_t needle_len, + size_t *period) +{ + /* Index of last character of left half, or SIZE_MAX. */ + size_t max_suffix, max_suffix_rev; + size_t j; /* Index into NEEDLE for current candidate suffix. */ + size_t k; /* Offset into current period. */ + size_t p; /* Intermediate period. */ + wchar_t a, b; /* Current comparison bytes. */ + + /* Special case NEEDLE_LEN of 1 or 2 (all callers already filtered + out 0-length needles. */ + if (needle_len < 3) + { + *period = 1; + return needle_len - 1; + } + + /* Invariants: + 0 <= j < NEEDLE_LEN - 1 + -1 <= max_suffix{,_rev} < j (treating SIZE_MAX as if it were signed) + min(max_suffix, max_suffix_rev) < global period of NEEDLE + 1 <= p <= global period of NEEDLE + p == global period of the substring NEEDLE[max_suffix{,_rev}+1...j] + 1 <= k <= p + */ + + /* Perform lexicographic search. */ + max_suffix = SIZE_MAX; + j = 0; + k = p = 1; + while (j + k < needle_len) + { + a = CANON_ELEMENT (needle[j + k]); + b = CANON_ELEMENT (needle[max_suffix + k]); + if (a < b) + { + /* Suffix is smaller, period is entire prefix so far. */ + j += k; + k = 1; + p = j - max_suffix; + } + else if (a == b) + { + /* Advance through repetition of the current period. */ + if (k != p) + ++k; + else + { + j += p; + k = 1; + } + } + else /* b < a */ + { + /* Suffix is larger, start over from current location. */ + max_suffix = j++; + k = p = 1; + } + } + *period = p; + + /* Perform reverse lexicographic search. */ + max_suffix_rev = SIZE_MAX; + j = 0; + k = p = 1; + while (j + k < needle_len) + { + a = CANON_ELEMENT (needle[j + k]); + b = CANON_ELEMENT (needle[max_suffix_rev + k]); + if (b < a) + { + /* Suffix is smaller, period is entire prefix so far. */ + j += k; + k = 1; + p = j - max_suffix_rev; + } + else if (a == b) + { + /* Advance through repetition of the current period. */ + if (k != p) + ++k; + else + { + j += p; + k = 1; + } + } + else /* a < b */ + { + /* Suffix is larger, start over from current location. */ + max_suffix_rev = j++; + k = p = 1; + } + } + + /* Choose the shorted suffix. Return the first character of the right + half, rather than the last character of the left half. */ + if (max_suffix_rev + 1 < max_suffix + 1) + return max_suffix + 1; + *period = p; + return max_suffix_rev + 1; +} + +/* Return the first location of non-empty NEEDLE within HAYSTACK, or + NULL. HAYSTACK_LEN is the minimum known length of HAYSTACK. + + If AVAILABLE does not modify HAYSTACK_LEN (as in memmem), then at + most 2 * HAYSTACK_LEN - NEEDLE_LEN comparisons occur in searching. + If AVAILABLE modifies HAYSTACK_LEN (as in strstr), then at most 3 * + HAYSTACK_LEN - NEEDLE_LEN comparisons occur in searching. */ +static inline wchar_t * +two_way_short_needle (const wchar_t *haystack, size_t haystack_len, + const wchar_t *needle, size_t needle_len) +{ + size_t i; /* Index into current character of NEEDLE. */ + size_t j; /* Index into current window of HAYSTACK. */ + size_t period; /* The period of the right half of needle. */ + size_t suffix; /* The index of the right half of needle. */ + + /* Factor the needle into two halves, such that the left half is + smaller than the global period, and the right half is + periodic (with a period as large as NEEDLE_LEN - suffix). */ + suffix = critical_factorization (needle, needle_len, &period); + + /* Perform the search. Each iteration compares the right half + first. */ + if (CMP_FUNC (needle, needle + period, suffix) == 0) + { + /* Entire needle is periodic; a mismatch can only advance by the + period, so use memory to avoid rescanning known occurrences + of the period. */ + size_t memory = 0; + j = 0; + while (AVAILABLE (haystack, haystack_len, j, needle_len)) + { + const wchar_t *pneedle; + const wchar_t *phaystack; + + /* Scan for matches in right half. */ + i = MAX (suffix, memory); + pneedle = &needle[i]; + phaystack = &haystack[i + j]; + while (i < needle_len && (CANON_ELEMENT (*pneedle++) + == CANON_ELEMENT (*phaystack++))) + ++i; + if (needle_len <= i) + { + /* Scan for matches in left half. */ + i = suffix - 1; + pneedle = &needle[i]; + phaystack = &haystack[i + j]; + while (memory < i + 1 && (CANON_ELEMENT (*pneedle--) + == CANON_ELEMENT (*phaystack--))) + --i; + if (i + 1 < memory + 1) + return (wchar_t *) (haystack + j); + /* No match, so remember how many repetitions of period + on the right half were scanned. */ + j += period; + memory = needle_len - period; + } + else + { + j += i - suffix + 1; + memory = 0; + } + } + } + else + { + const wchar_t *phaystack; + /* The comparison always starts from needle[suffix], so cache it + and use an optimized first-character loop. */ + wchar_t needle_suffix = CANON_ELEMENT (needle[suffix]); + + /* The two halves of needle are distinct; no extra memory is + required, and any mismatch results in a maximal shift. */ + period = MAX (suffix, needle_len - suffix) + 1; + j = 0; + while (AVAILABLE (haystack, haystack_len, j, needle_len)) + { + wchar_t haystack_char; + const wchar_t *pneedle; + + phaystack = &haystack[suffix + j]; + + while (needle_suffix + != (haystack_char = CANON_ELEMENT (*phaystack++))) + { + ++j; + if (!AVAILABLE (haystack, haystack_len, j, needle_len)) + goto ret0; + } + + /* Scan for matches in right half. */ + i = suffix + 1; + pneedle = &needle[i]; + while (i < needle_len) + { + if (CANON_ELEMENT (*pneedle++) + != (haystack_char = CANON_ELEMENT (*phaystack++))) + break; + ++i; + } + if (needle_len <= i) + { + /* Scan for matches in left half. */ + i = suffix - 1; + pneedle = &needle[i]; + phaystack = &haystack[i + j]; + while (i != SIZE_MAX) + { + if (CANON_ELEMENT (*pneedle--) + != (haystack_char = CANON_ELEMENT (*phaystack--))) + break; + --i; + } + if (i == SIZE_MAX) + return (wchar_t *) (haystack + j); + j += period; + } + else + j += i - suffix + 1; + } + } +ret0: __attribute__ ((unused)) + return NULL; +} + +#undef AVAILABLE +#undef CANON_ELEMENT +#undef CMP_FUNC diff --git a/wcsmbs/wcsstr.c b/wcsmbs/wcsstr.c index 78f1cc9ce0..7e791a5356 100644 --- a/wcsmbs/wcsstr.c +++ b/wcsmbs/wcsstr.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1995-2024 Free Software Foundation, Inc. +/* Locate a substring in a wide-character string. + Copyright (C) 1995-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -15,82 +16,41 @@ License along with the GNU C Library; if not, see . */ -/* - * The original strstr() file contains the following comment: - * - * My personal strstr() implementation that beats most other algorithms. - * Until someone tells me otherwise, I assume that this is the - * fastest implementation of strstr() in C. - * I deliberately chose not to comment it. You should have at least - * as much fun trying to understand it, as I had to write it :-). - * - * Stephen R. van den Berg, berg@pool.informatik.rwth-aachen.de */ - #include +#include + +#define AVAILABLE(h, h_l, j, n_l) \ + (((j) + (n_l) <= (h_l)) \ + || ((h_l) += __wcsnlen ((void*)((h) + (h_l)), (n_l) + 128), \ + (j) + (n_l) <= (h_l))) +#include "wcs-two-way.h" + +/* Hash character pairs so a small shift table can be used. All bits of + p[0] are included, but not all bits from p[-1]. So if two equal hashes + match on p[-1], p[0] matches too. Hash collisions are harmless and result + in smaller shifts. */ +#define hash2(p) (((size_t)(p)[0] - ((size_t)(p)[-1] << 3)) % sizeof (shift)) wchar_t * wcsstr (const wchar_t *haystack, const wchar_t *needle) { - wchar_t b, c; - - if ((b = *needle) != L'\0') - { - haystack--; /* possible ANSI violation */ - do - if ((c = *++haystack) == L'\0') - goto ret0; - while (c != b); - - if (!(c = *++needle)) - goto foundneedle; - ++needle; - goto jin; - - for (;;) - { - wchar_t a; - const wchar_t *rhaystack, *rneedle; - - do - { - if (!(a = *++haystack)) - goto ret0; - if (a == b) - break; - if ((a = *++haystack) == L'\0') - goto ret0; -shloop: ; - } - while (a != b); - -jin: if (!(a = *++haystack)) - goto ret0; - - if (a != c) - goto shloop; - - if (*(rhaystack = haystack-- + 1) == (a = *(rneedle = needle))) - do - { - if (a == L'\0') - goto foundneedle; - if (*++rhaystack != (a = *++needle)) - break; - if (a == L'\0') - goto foundneedle; - } - while (*++rhaystack == (a = *++needle)); - - needle = rneedle; /* took the register-poor approach */ - - if (a == L'\0') - break; - } - } -foundneedle: - return (wchar_t*) haystack; -ret0: - return NULL; + const wchar_t *hs = (const wchar_t *) haystack; + const wchar_t *ne = (const wchar_t *) needle; + + /* Ensure haystack length is at least as long as needle length. + Since a match may occur early on in a huge haystack, use strnlen + and read ahead a few cachelines for improved performance. */ + size_t ne_len = __wcslen (ne); + size_t hs_len = __wcsnlen (hs, ne_len | 128); + if (hs_len < ne_len) + return NULL; + + /* Check whether we have a match. This improves performance since we + avoid initialization overheads. */ + if (__wmemcmp (hs, ne, ne_len) == 0) + return (wchar_t *) hs; + + return two_way_short_needle (hs, hs_len, ne, ne_len); } /* This alias is for backward compatibility with drafts of the ISO C standard. Unfortunately the Unix(TM) standard requires this name. */