From nobody Fri Aug 15 23:24:58 2025 X-Original-To: dev-commits-src-main@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 4c3dVz0mJCz64SGR; Fri, 15 Aug 2025 23:24:59 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c3dVz02N6z3yH4; Fri, 15 Aug 2025 23:24:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755300299; 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=737cYciDxXvOBvXKP509mT1EhOVgetq+tn7oMb2WioQ=; b=ajWHqdg9cmzXwGUExhqZZ35WzdXU30mdH5Jg0MNdLCidOpqKT7qDL2s6ZmwABfJDf9i0FM IvRixDv8aiiaHIufyKqao4tnXwGKuOdQ+y0UrcjGuNhScAWA5uSDTAG5PNmggnbIGJBK1z osze+uI/cI5bdBnIPXtXerBMsICSglK1eNivJhyK80eShj1lF5cbgigS9E3wqfBLh/JK+H ZuQNh7sh9oMLr0hLItKWF+Ix7QMDDD42Q/eWNkjQ8RVOKD8l9n8pt0vjTJhmPFyyrQR1wL F1VF0vhFBK/ddAzfBwBve4EW7LNsXTr0AJIDHn0eLoM18zZJfTQ+fpawYiBxIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755300299; 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=737cYciDxXvOBvXKP509mT1EhOVgetq+tn7oMb2WioQ=; b=WQqOtawZ9F3WT+xhOcBuKOaEYv5EB9hJHArJoR2lh87FqkZmT4yeXHFSSVV10jxO0KrvvA rJV2MI6xU3N+UZysGSbu4AOCEAVOnAQFM2EUNWlpTCw1jL1uF8cCao5qnK8CpnCINlbcld 0apQ9SGAVWEVL3sqedJHWg2ke3Cto5TTOA05Fpx20oTDTIxr/vgdJe2EDt6z+IGyaNOwPI M1ge4CfkMKaPZnfjeVaXrvjGcd47IYCLbqL3U/pKpUybAOXNVvKKFlRCp/FH0Ub4+f80F8 1y74gdr7ShP+l9oyBNBlwVgzLIRHT91N+2d+HGJkzIZh432frqmWs7tsNXZ7Sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755300299; a=rsa-sha256; cv=none; b=P08qJvQOZarcnTW0Ykt0rQZGXm+bHKnL4QlvBCSYIwEkE+v48PjeXlLk2To2CIi5xFsmKQ axYKAPlxVrAO/eEdASDf5tenLWc/WmXX4FkWNwK9vgyCehq4971544RbCkLJEsdVqzFGe1 eq32OrIHdCo4o7v2UbksmcBVoOT4yrFjfJG2GmkDIkIQFuFVr7cPgWDEIc95N6Mi2iSHHC 7qp2Dk4TOsb/ACYWFaXM+UTzl84A2Dm4B+BdOu7mfU+dxGrPCbNu0xMCgXREIyp6TUQt1D IqJgjLSwDCJ9CIGpP3AJaQsutSwU2nIXLhmN5+TzNaUVok/yx2I8Ta2Jy7J0gw== 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 4c3dVy6Ys6zxvg; Fri, 15 Aug 2025 23:24:58 +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 57FNOwx8012242; Fri, 15 Aug 2025 23:24:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57FNOwGV012239; Fri, 15 Aug 2025 23:24:58 GMT (envelope-from git) Date: Fri, 15 Aug 2025 23:24:58 GMT Message-Id: <202508152324.57FNOwGV012239@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: ef8f3e913156 - main - libkern: Drop incorrect qsort optimization List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef8f3e913156aa268e07ae1daa68e3bc3f1c4d29 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=ef8f3e913156aa268e07ae1daa68e3bc3f1c4d29 commit ef8f3e913156aa268e07ae1daa68e3bc3f1c4d29 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-15 18:01:02 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-15 23:23:35 +0000 libkern: Drop incorrect qsort optimization See 5205b32de3fb for details. PR: 287089 MFC after: 1 week Reviewed by: jlduran Differential Revision: https://reviews.freebsd.org/D51919 --- sys/libkern/qsort.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/sys/libkern/qsort.c b/sys/libkern/qsort.c index 0255a3d64d76..342b1525dd8a 100644 --- a/sys/libkern/qsort.c +++ b/sys/libkern/qsort.c @@ -114,11 +114,10 @@ qsort(void *a, size_t n, size_t es, cmp_t *cmp) char *pa, *pb, *pc, *pd, *pl, *pm, *pn; size_t d1, d2; int cmp_result; - int swaptype_long, swaptype_int, swap_cnt; + int swaptype_long, swaptype_int; loop: SWAPINIT(long, a, es); SWAPINIT(int, a, es); - swap_cnt = 0; if (n < 7) { for (pm = (char *)a + es; pm < (char *)a + n * es; pm += es) for (pl = pm; @@ -147,7 +146,6 @@ loop: SWAPINIT(long, a, es); for (;;) { while (pb <= pc && (cmp_result = CMP(thunk, pb, a)) <= 0) { if (cmp_result == 0) { - swap_cnt = 1; swap(pa, pb); pa += es; } @@ -155,7 +153,6 @@ loop: SWAPINIT(long, a, es); } while (pb <= pc && (cmp_result = CMP(thunk, pc, a)) >= 0) { if (cmp_result == 0) { - swap_cnt = 1; swap(pc, pd); pd -= es; } @@ -164,18 +161,9 @@ loop: SWAPINIT(long, a, es); if (pb > pc) break; swap(pb, pc); - swap_cnt = 1; pb += es; pc -= es; } - if (swap_cnt == 0) { /* Switch to insertion sort */ - for (pm = (char *)a + es; pm < (char *)a + n * es; pm += es) - for (pl = pm; - pl > (char *)a && CMP(thunk, pl - es, pl) > 0; - pl -= es) - swap(pl, pl - es); - return; - } pn = (char *)a + n * es; d1 = MIN(pa - (char *)a, pb - pa);