From nobody Mon Sep 8 09:40:19 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cL24N1Hk9z66N2y; Mon, 08 Sep 2025 09:40:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cL24N031cz3hnJ; Mon, 08 Sep 2025 09:40:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757324420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LMaDwLMuj/b36C2koLuu/PC3nifY4N61SW88N96ODwQ=; b=JXKS+QXkPfmd4u1IEDRpZqBWpWx+ypo7Myx0lV2jyp4UJvujyvOBx+jb5aB7BDqd1LncEP WUi08j+Lshq0zKgEjaQWusupa5WYiGNkoCMXgA9FSX6k53eR2pTgHv452XWQ7ezHh2biha Vb8Vdw9YtgVZQrOILvK4EdxANZUlJme9gZc/NE/tCFyz+hp7/dv5vsO77A31Dxpdq1aIOA RCx+FI6KNc6mu8mJfsnryh2Oy/tYyX4tJOcXH2vvmjJ9DfB8YDoEus9UPo8kypQi9sPQPV tzvscg3gHOfu4aNgyncnAyXTbR1InV8gOMWU/de9tXDscgjTX/KP++r9RR+/Fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757324420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LMaDwLMuj/b36C2koLuu/PC3nifY4N61SW88N96ODwQ=; b=SR4k7rzHknwkQlhXsA/o+FZsrNlSdygopjegcfPDN0zHFzmuMzhrMkBpPD+PtrQMc1iebP RWBC99x0P9DGH5Y+97LeTF1b35PU2uxrM3VPp98eWZAxV3qVShPbPXYndfuvfGmW+4/QJT TSusDbidI15jI6a9cKQrtLYGfEpGSPtgPzlr/UEKwywk1JnieNu3H1aXayIOkwi1Vj+tp0 yDdeUun3Z8YiK4WPh2oVk02zHupMClsTuF6NelxOGbrGaxtloxOdgk2jLoyS1ibtaMBS35 vP4bHrmYjme1EF1NmLtmoA3Vu5lDZ1OMPiN+kYkoULwIbSpyrMwivAoLGKJ+Eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757324420; a=rsa-sha256; cv=none; b=eAhzPaN2288ZBBP8sh4dIjuDEosngOxgjp+5qOMHTz26zYIjMapqOfZLea1qXZ2Jfy0Ffn XUjMeru2dgIt1m0FS+IlVw3mlkB8a7yVMbSgHW4wTHAd9MdVF3f4GpyezA+eJlsiaCA0ws XptzLLGH+Fj4+9lExgiuQTMYJxiyHo2sg0dJ5yf9f9hLBWVyKBLx7RhNKxG7wmGOGc4QYn sq09TgH3Aa1VBmNYUyrltJdxIMM+G0rSkohtilFOICcRW5ujsN9VcBQ2hv3btJa12hR3S0 rtBlaEuYRStA53FhCmIe7twG3LZBFHU2kO2ityEQUYIgCuZAdUfC7Z2iv3ciKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cL24M6PgSz11S2; Mon, 08 Sep 2025 09:40:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5889eJqK028755; Mon, 8 Sep 2025 09:40:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5889eJIG028752; Mon, 8 Sep 2025 09:40:19 GMT (envelope-from git) Date: Mon, 8 Sep 2025 09:40:19 GMT Message-Id: <202509080940.5889eJIG028752@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 7caa8fbd17a8 - stable/14 - libc/amd64: rewrite memrchr() scalar impl. to read the string from the back List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7caa8fbd17a8a50df6677f2e7c6a6cade053366e Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=7caa8fbd17a8a50df6677f2e7c6a6cade053366e commit 7caa8fbd17a8a50df6677f2e7c6a6cade053366e Author: Robert Clausecker AuthorDate: 2025-07-29 20:12:11 +0000 Commit: Robert Clausecker CommitDate: 2025-09-08 09:39:12 +0000 libc/amd64: rewrite memrchr() scalar impl. to read the string from the back A very simple implementation as I don't have the patience right now to write a full SWAR kernel. Should still do the trick if you wish to opt out of SSE for some reason. Reported by: Mikael Simonsson Reviewed by: strajabot PR: 288321 MFC after: 1 month (cherry picked from commit 30acc84270266e41f66cf572f67c3290d923da2f) --- lib/libc/amd64/string/memrchr.S | 72 +++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 38 deletions(-) diff --git a/lib/libc/amd64/string/memrchr.S b/lib/libc/amd64/string/memrchr.S index 4f6c5a238daa..f487437255a9 100644 --- a/lib/libc/amd64/string/memrchr.S +++ b/lib/libc/amd64/string/memrchr.S @@ -16,58 +16,54 @@ ARCHFUNCS(memrchr) ENDARCHFUNCS(memrchr) ARCHENTRY(memrchr, scalar) - xor %eax, %eax # prospective return value - sub $4, %rdx # 4 bytes left to process? - jb 1f + lea -1(%rdi, %rdx, 1), %rax # point to last char in buffer + sub $4, %rdx # 4 bytes left to process? + jb .Ltail ALIGN_TEXT -0: xor %r8, %r8 - lea 2(%rdi), %r10 - cmp %sil, 2(%rdi) - cmovne %r8, %r10 # point to null if no match +0: cmp %sil, (%rax) # match at last entry? + je 1f - cmp %sil, (%rdi) - cmove %rdi, %r8 # point to first char if match + cmp %sil, -1(%rax) # match at second to last entry? + je 2f - lea 1(%rdi), %r9 - cmp %sil, 1(%rdi) - cmovne %r8, %r9 # point to first result if no match in second + cmp %sil, -2(%rax) # match at third to last entry? + je 3f - lea 3(%rdi), %r11 - cmp %sil, 3(%rdi) - cmovne %r10, %r11 + cmp %sil, -3(%rax) # match at fourth to last entry? + je 4f - test %r11, %r11 - cmovz %r9, %r11 # take first pair match if none in second + sub $4, %rax + sub $4, %rdx + jae 0b - test %r11, %r11 - cmovnz %r11, %rax # take match in current set if any +.Ltail: cmp $-3, %edx # at least one character left to process? + jb .Lnotfound - add $4, %rdi - sub $4, %rdx - jae 0b + cmp %sil, (%rax) + je 1f -1: cmp $-3, %edx # a least one character left to process? - jb 2f + cmp $-2, %edx # at least two characters left to process? + jb .Lnotfound - cmp %sil, (%rdi) - cmove %rdi, %rax + cmp %sil, -1(%rax) + je 2f - lea 1(%rdi), %rcx - cmp $-2, %edx # at least two characters left to process? - jb 2f + cmp $-1, %edx # at least three characters left to process? + jb .Lnotfound - cmp %sil, 1(%rdi) - cmove %rcx, %rax + cmp %sil, -2(%rax) + je 3f - lea 2(%rdi), %rcx - cmp $-1, %edx # at least three character left to process? - jb 2f - - cmp %sil, 2(%rdi) - cmove %rcx, %rax +.Lnotfound: + xor %eax, %eax + ret -2: ret + /* match found -- adjust rax to point to matching byte */ +4: dec %rax +3: dec %rax +2: dec %rax +1: ret ARCHEND(memrchr, scalar) ARCHENTRY(memrchr, baseline)