From patchwork Wed Feb 6 14:58:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 1037590 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-99820-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="ig4Hau8H"; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="G4lDscib"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43vl3R2vlgz9s7T for ; Thu, 7 Feb 2019 01:59:47 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=DGxdgEpt05JwFg2OeNlot6XsvRn+V9X Nn5sFAhauNMNNdigqnVOl9KgonVt+qn8sGV63kmByBzS4ds9JPVdL/FlCw+0IpGg DqX/bMCoViv8cZR5gCoke3KYsm+7ay0YdBBzqledgEvqf34X17zDlvv8a2De5U8r B+fkU0nimBek= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=Tdvku9jR99pQcth0tNcGvfOCNFs=; b=ig4Ha u8HdVWoe2J79vru7U7lUYbkRyf33cSt4+wYPJMKwRFbK3jwPE34lkXDWCl6IWlrt YvW31RjyAu4sRj6XCPghrybi7VoivsiVvZtfCFh7T8VjCR6Su80z8rPUA/mET9IW s3JKhrmVF4Vt9u/EBVFuJ919v82s57QLJOxt/A= Received: (qmail 110078 invoked by alias); 6 Feb 2019 14:59:05 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 110033 invoked by uid 89); 6 Feb 2019 14:59:05 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-qk1-f176.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=V2aQ/Yu5qAsX0B4JdCgC4Jknz71S7kCZHOUeR3xT+VI=; b=G4lDscibi5Oap9jcQkCExwRahD0egGuX0I7tzaaDDj0+qndhNGsw621fLcYe0BBWjY jBOozzK4/Ik7EpHulgNPcoPzVqZbUQw5EhuWbhVp0DF8PTIHHFm54Carr4nmrRYq0Ckk 64f3GHgHx0IpSRJeFrVXo+vRTjJTcAbllK1cjnH8TFLx+RcyVqjE0DgS1wMuiUrOaBG3 WfQATJt7jiwfEvixRbJ0/tIo3pRW0mmrrNaTk3SN8kdrMXe0D4bn8Oz6OmbSWQA+pMjS 2n62EF0l9xpBArYZ/ujvlljauuGg0ia3GSplGHssM71jnhqlg8ttu4zSBNVPfabd0Db0 JXyQ== From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 6/7] wcsmbs: optimize wcsncpy Date: Wed, 6 Feb 2019 12:58:49 -0200 Message-Id: <20190206145850.22003-6-adhemerval.zanella@linaro.org> In-Reply-To: <20190206145850.22003-1-adhemerval.zanella@linaro.org> References: <20190206145850.22003-1-adhemerval.zanella@linaro.org> This patch rewrites wcsncpy using wcsnlen, wmemset, and wmemcpy. This is similar to the optimization done on strncpy by f6482cf29d and 6423d4754c. Checked on x86_64-linux-gnu. * wcsmbs/wcsncpy.c (__wcsncpy): Rewrite using wcsnlen, wmemset, and wmemcpy. --- wcsmbs/wcsncpy.c | 60 ++++-------------------------------------------- 1 file changed, 4 insertions(+), 56 deletions(-) diff --git a/wcsmbs/wcsncpy.c b/wcsmbs/wcsncpy.c index 2fd523c815..d5d7f4ad86 100644 --- a/wcsmbs/wcsncpy.c +++ b/wcsmbs/wcsncpy.c @@ -26,62 +26,10 @@ wchar_t * __wcsncpy (wchar_t *dest, const wchar_t *src, size_t n) { - wint_t c; - wchar_t *const s = dest; - - --dest; - - if (n >= 4) - { - size_t n4 = n >> 2; - - for (;;) - { - c = *src++; - *++dest = c; - if (c == L'\0') - break; - c = *src++; - *++dest = c; - if (c == L'\0') - break; - c = *src++; - *++dest = c; - if (c == L'\0') - break; - c = *src++; - *++dest = c; - if (c == L'\0') - break; - if (--n4 == 0) - goto last_chars; - } - n = n - (dest - s) - 1; - if (n == 0) - return s; - goto zero_fill; - } - - last_chars: - n &= 3; - if (n == 0) - return s; - - do - { - c = *src++; - *++dest = c; - if (--n == 0) - return s; - } - while (c != L'\0'); - - zero_fill: - do - *++dest = L'\0'; - while (--n > 0); - - return s; + size_t size = __wcsnlen (src, n); + if (size != n) + __wmemset (dest + size, L'\0', n - size); + return __wmemcpy (dest, src, size); } #ifndef WCSNCPY weak_alias (__wcsncpy, wcsncpy)