From nobody Thu Jul 6 18:37:42 2023 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 4QxldM0qjkz4m6QP; Thu, 6 Jul 2023 18:37:43 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QxldM09N6z3tSg; Thu, 6 Jul 2023 18:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688668663; 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=wqFNhRo26aPx4B3mSpLOLKCKOE9pLrvOiaBxZisYr4U=; b=SQ8DDiCYXjtpukrkhvcYsdscrGvhefh+o92bc4DOoKaBG/MG7qsyZntUgDvxnt9iIhE18k GrcWC4JS1WaJTjrd6y7wyH229xxffkxjRrJCpjdBOSrjRep4rruUfuphsar8D92Vjk8JsO qASmjKDzMuMaYe7ZU343r0+ocihyUj8SZ2Yylwy/azxZGl+6NAfSzKlvcwOATAcrY8ns+j K9C625Ks5YYo9sANAF9+8Bod/6i7TqAufMUlL6UR6ltBi7bsQslWy2Y+JWuSn4pzrEpDLW AzbzjJzLS6ro3SpBs6MVOLkFAZdrQLie/usBK2ddk40H9cKjMbgFfE3w/yMNHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688668663; 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=wqFNhRo26aPx4B3mSpLOLKCKOE9pLrvOiaBxZisYr4U=; b=VcAnmxakNSdBVZkupxWuqKTKTvfe7XFwvNsQpmvEkB6rQVJVI0NrVIhJUgIiamj27xlf8g MbgVYTH4KEeQxh8LaIMam7sj1EY5f+4KjGmmkuZz5fGuKNNTPc7rNeZ49/w68rldFckx+J 2ifZYvgJqwidcSHzaAH5wbk91rREFn512838wrS4I1xVDhFU8s00p1qSz8WBQOKMNnvVkU jY3Id9sN9zdywjg9Lr6GZ9m9w/ho1NU64/oC2YFRed/+JvTU/AAFQxeX7cl10wAGtu06Ml FN3SOH4Bau2R9DlZS7/5ZeLrqqncF2i9bjpiay72jPYeNiSdNSOIE7wTg2GgSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688668663; a=rsa-sha256; cv=none; b=VIzOYX4IOa3eVdLNlCc2pr2n2CE5jB8RYJukJ6bED2LP9bAim3Nk4UsLMUku4KsDSD/wND 7aCqcLdTANslO3GkgY4g1dkn90onkBSjG4TNNN9oW1+jZZAWH2jrhLZNGkzvhlpODNm3l+ oeusf2R2OGnGVXqEDMTJMJyTllcz3VOkPzo36epzaymhR/tFtjzYoIetSQRhn1uROtJz5p oQJCctaAhUbpiacRgtYMcSVeESuqUs4FZmu7vz1QFGGN++eNVuoGA7yn1qXwoSMaltyEEr MIp2DbK+cLqS5NQ6rHtFcpjioDSXJt3m4ZOshJSzrIrXiDrYgzHTF+zYDykJSw== 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 4QxldL6Hv6z16y6; Thu, 6 Jul 2023 18:37:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 366IbgbX097885; Thu, 6 Jul 2023 18:37:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 366Ibg5V097884; Thu, 6 Jul 2023 18:37:42 GMT (envelope-from git) Date: Thu, 6 Jul 2023 18:37:42 GMT Message-Id: <202307061837.366Ibg5V097884@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: d4e236c70b0d - main - inline_ffs: remove backup binary implementation 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d4e236c70b0db52cd7232a11ad0a2ed895e65f70 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=d4e236c70b0db52cd7232a11ad0a2ed895e65f70 commit d4e236c70b0db52cd7232a11ad0a2ed895e65f70 Author: Doug Moore AuthorDate: 2023-07-06 18:36:12 +0000 Commit: Doug Moore CommitDate: 2023-07-06 18:36:12 +0000 inline_ffs: remove backup binary implementation There is no longer be any point to maintaining a binary search routine for ffs; inlines will always do it as well or better. Reviewed by: mhorne Differential Revision: https://reviews.freebsd.org/D40703 --- sys/kern/subr_blist.c | 35 +++-------------------------------- 1 file changed, 3 insertions(+), 32 deletions(-) diff --git a/sys/kern/subr_blist.c b/sys/kern/subr_blist.c index ba13fb4efd80..aa0ba6a88610 100644 --- a/sys/kern/subr_blist.c +++ b/sys/kern/subr_blist.c @@ -184,42 +184,13 @@ bitrange(int n, int count) ((u_daddr_t)-1 >> (BLIST_RADIX - (n + count)))); } -/* - * Find the first bit set in a u_daddr_t. - */ -static inline int -generic_bitpos(u_daddr_t mask) -{ - int hi, lo, mid; - - lo = 0; - hi = BLIST_RADIX; - while (lo + 1 < hi) { - mid = (lo + hi) >> 1; - if (mask & bitrange(0, mid)) - hi = mid; - else - lo = mid; - } - return (lo); -} - static inline int bitpos(u_daddr_t mask) { - switch (sizeof(mask)) { -#ifdef HAVE_INLINE_FFSLL - case sizeof(long long): - return (ffsll(mask) - 1); -#endif -#ifdef HAVE_INLINE_FFS - case sizeof(int): - return (ffs(mask) - 1); -#endif - default: - return (generic_bitpos(mask)); - } + _Static_assert(sizeof(long long) >= sizeof(mask), + "mask too big for ffsll()"); + return (ffsll(mask) - 1); } /*