From nobody Sun Nov 30 01:45:52 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 4dJqcd0kCWz6Jf1d for ; Sun, 30 Nov 2025 01:45:53 +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 4dJqcc59yMz3mM6 for ; Sun, 30 Nov 2025 01:45:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764467152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WUsrF02wP46twxyxfhQF67mPxQvRYsQiDbin0Tg3Cgo=; b=fePEZxJFST8svhgD4zNjHbCfkzTJ7wEfA48ZUpvKVWeM7nmH69OAJgH1PQ2kJWHfLlE/xC J1swpS4552WEjmJquVcyBXTScdFYMcsW+ELotRJ29kYLoslvXMjSCcSgMFpjM5SbkaYpRm FFbguD/m7vTBHhmV+lbjzkH3G2gACMNYUw0BATvRTOXz8QIECZrxgM8zCGEzZtBWGefN/m xZ0j18UAWN5CzlfLozbj6BVx0fW4OEEJCA9Hwpc+QQ/ammxQVA5qn/Em8GbVI+G0b1xjtg 7emyLF+14kZq/p8M21YbNmW6SFK4B53nqcyHy0tMyj+Eat9TorigSrDgIvMxDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764467152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WUsrF02wP46twxyxfhQF67mPxQvRYsQiDbin0Tg3Cgo=; b=BNKtvCV3ovowsvyruEIT5gf8Z6PdHOcb5HGmrYOhilu9+rzMRftzRfDE4p3LivNZfCHwSo h1/qB+3/85+3MX59g32BXZJcGJMSnJNB4WXawqgkYc3qeLKWELxuEruHJXv6YW/y+wqtw8 r5N78T+oGtCv9CZkNz74CA5KCS290HRDxBEfmBid/+BcU9aYOF5+h/Imm9v0oQqJ4Ekt4W 6dYQgAw4ptmNkb20WcoHtNoFqXXP0JTQ+rV0iKl4weNlya3KK42MoxClOmUf99Tm2+whvh IpdQyUrvVwiALSyZN2spuUkJAb/ega06kQEFuqRUyDNoXQ8AT8WJq9f50k6WrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764467152; a=rsa-sha256; cv=none; b=CFvYy2LgzWcCEKIJBe0eN1u904i5/8lSdPC5i0DUWgfvEOQjFe1UrspemlCI7LbRoexrJN IT0BeYLRxq1jeba/HyhGFN2yTDPgdfEOqSRtqvZyIw8squN96l9m62WHN2eILK9N4ElJa3 Z7jpHByzMBNhntyN8aRQlxyJDFjFU0lFSmUnsN9zHXmk9ePP6BvjQwrQDqR2d+hB/h/ktM zCIazoB6igR1gLHask9LPn8p72ndgrh/TuNQharB/T8Xih6OGdALTRTpFZGbDC+9WJDRFh vE9l39MHKsNXEDC34r+15+Q5Ao/6MgD3hHOF1yYXIleC+FMb1OcW1hakh2Os4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dJqcc4Xq7zT8 for ; Sun, 30 Nov 2025 01:45:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2a65e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 30 Nov 2025 01:45:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Strahinja =?utf-8?Q?Stani=C5=A1?==?utf-8?Q?i=C4=87?= From: Robert Clausecker Subject: git: 650ac47256ab - stable/15 - libc: scalar strlen() in RISC-V assembly 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/15 X-Git-Reftype: branch X-Git-Commit: 650ac47256ab933f45a44f92900fffc85189b2b6 Auto-Submitted: auto-generated Date: Sun, 30 Nov 2025 01:45:52 +0000 Message-Id: <692ba1d0.2a65e.7e1b0d1b@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=650ac47256ab933f45a44f92900fffc85189b2b6 commit 650ac47256ab933f45a44f92900fffc85189b2b6 Author: Strahinja Stanišić AuthorDate: 2024-05-17 14:23:48 +0000 Commit: Robert Clausecker CommitDate: 2025-11-30 00:43:05 +0000 libc: scalar strlen() in RISC-V assembly Includes a scalar implementation of strlen() for the RISC-V architecture and changes to the corresponding manpage. Performance was benchamarked using before and after: https://github.com/clausecker/strperf os: FreeBSD arch: riscv │ strlen_baseline │ strlen_scalar │ │ sec/op │ sec/op vs base │ Short 541.2µ ± 17% 401.6µ ± 0% -25.78% (p=0.000 n=21+20) Mid 249.6µ ± 3% 191.9µ ± 0% -23.13% (p=0.000 n=21+20) Long 124.6µ ± 0% 110.7µ ± 0% -11.13% (p=0.000 n=21+20) geomean 256.3µ 204.3µ -20.26% │ strlen_baseline │ strlen_scalar │ │ B/s │ B/s vs base │ Short 220.3Mi ± 14% 296.8Mi ± 0% +34.74% (p=0.000 n=21+20) Mid 477.6Mi ± 3% 621.3Mi ± 0% +30.09% (p=0.000 n=21+20) Long 956.9Mi ± 0% 1076.7Mi ± 0% +12.52% (p=0.000 n=21+20) geomean 465.2Mi 583.4Mi +25.40% MFC after: 1 month MFC to: stable/15 Approved by: mhorne, markj (mentor) Reviewed by: fuz Sponsored by: Google LLC (GSoC 2024) Differential Revision: https://reviews.freebsd.org/D45693 (cherry picked from commit e09c1583eddd345bdb79f3db8a91166f6f139207) --- lib/libc/riscv/string/Makefile.inc | 1 + lib/libc/riscv/string/strlen.S | 77 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/lib/libc/riscv/string/Makefile.inc b/lib/libc/riscv/string/Makefile.inc index 44aeb65bf1f7..5853ea114277 100644 --- a/lib/libc/riscv/string/Makefile.inc +++ b/lib/libc/riscv/string/Makefile.inc @@ -1,4 +1,5 @@ MDSRCS+= \ memchr.S \ memset.S \ + strlen.S \ strrchr.S diff --git a/lib/libc/riscv/string/strlen.S b/lib/libc/riscv/string/strlen.S new file mode 100644 index 000000000000..3beb160f2e6f --- /dev/null +++ b/lib/libc/riscv/string/strlen.S @@ -0,0 +1,77 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Strahinja Stanisic + */ + +#include + +/* + * https://graphics.stanford.edu/~seander/bithacks.html#ZeroInWord + * uses haszero(v) (((v) - 0x01010101UL) & ~(v) & 0x80808080UL) + * which evalutates > 0 when there is zero in v + * + * register a0 - char *s + */ +ENTRY(strlen) + /* + * register a0 - char *str_start + * register a1 - char *str_ptr + * register a2 - char[8] iter + */ + + /* load constants for haszero */ + li t0, 0x0101010101010101 + slli t1, t0, 7 # 0x8080808080808080, avoid li + + /* check alignment of str_start */ + andi a1, a0, ~0b111 + ld a2, (a1) + beq a1, a0, .Lhas_zero + + /* fill bytes before str_start with non-zero */ + slli t2, a0, 3 + addi t3, t2, -64 + neg t3, t3 + srl t3, t0, t3 + or a2, a2, t3 + + /* unrolled iteration of haszero */ + not t2, a2 + sub a2, a2, t0 + and a2, a2, t2 + and a2, a2, t1 + + bnez a2, .Lfind_zero + +.Lloop_has_zero: + ld a2, 8(a1) + addi a1, a1, 8 # move ptr to next 8byte +.Lhas_zero: + not t2, a2 + sub a2, a2, t0 + and a2, a2, t2 + and a2, a2, t1 + + beqz a2, .Lloop_has_zero + +.Lfind_zero: + /* use (iter & -iter) to isolate lowest set bit */ + sub a3, zero, a2 #a3 = -iter + and t1, a2, a3 #t1 = (iter & -iter) + + li t0, 0x0001020304050607 + srli t1, t1, 7 + /* + * lowest set bit is 2^(8*k) + * multiplying by it shifts the idx array in t0 by k bytes to the left + */ + mul t1, t1, t0 + /* highest byte contains idx of first zero */ + srli t1, t1, 56 + + add a1, a1, t1 + sub a0, a1, a0 + ret +END(strlen) +