From nobody Wed Aug 27 19:22:10 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 4cBvYG5SRDz65W1P; Wed, 27 Aug 2025 19:22:10 +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 4cBvYG2QHhz43bc; Wed, 27 Aug 2025 19:22:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756322530; 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=SgC1ISmHGuU6aHxCK8XfIls5GWF6GCMeh10OeFopFhk=; b=v04bbmzAhK8Ybm+tXe+6lKzs9XellDFVOrIifHolap82pnFb9s3k/5t3PAqmcgDc/RGxd0 bN6TBwMhOvzTM2MwVX7rQ2xQKwJqYFoztyukS36gLT+JwK6TwG+8WFseAe8iVSb+rWYuVI q/RR7P7r/kdZm/0JNiSlK/bN0q8u31SO8pZzcNgxhCRNQXebOeNe3D5KKq6bjfZMcSoCZk JWFUAs2WNehWL7KwWPrBmXjXYFvwcTEg8UQL6Br6XL35PsEPouL7cUhWQk3bLpJXaFDFNV OXJKoUlFemJALhUfxo02JhkiOf92gMC12Hh7dz0rd59MZXhO1vgIMLLBS+DI4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756322530; 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=SgC1ISmHGuU6aHxCK8XfIls5GWF6GCMeh10OeFopFhk=; b=vuwvGiBUgsfaI4mRslfV8FrIFV1+xYyCTE3baVqxBVav5a3L0f8Z/TC02jhlqOglEQXMOx QZhxf3hQio4I4sTpDX9j+6yZaX8zcqvF+L8MOAkreYtCO89Tz4+6gFSf+68MnoeyH5zW3P ByEqLHBvyiyKRdfnKez3k3JpkEQgdemQunR+f8b5Ha1xC3r/KBLpCDHCWwJjFvObgKbP0W yINMOFyHcRfTfmzwma0mlbEcFi5F4BwIbVeG+vTurE+/0f/zz5SMv3uk8GvbcJIl7vT10a YjqE/ClgpONr8Sl7jrNKqW5T4tAyBRVHIBorY05Xh8ZlPT2Tim2ZmXm8tbwoWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756322530; a=rsa-sha256; cv=none; b=xAIiUVbUJbOooTwk3btWMqLm76i9CJ4ehUyDgIaXF/nllJbXZqT4GAzd9gl/3Ifnc3N8Vk zDavA8yc9h99lJd+dm/WISoXznneOk1XcdLGtgLkeYM3KsswsWAnGsa0jHNFidDads1I4B az5yqa1mXTqMojlLLUciPqibhp0ipA+o75EMxJa8vtjpfZlYVpE8g9EhqnkwvhODOy/dQN XZDZrvFPN3ofxJfwERs6SPm0q2Xl0GlED/OakZLKv89VJE3kX8f6EiWEAP5n2/P4NQ/Zol bZ+4nDWXrhcRWKH++DVXik+9kKJHsdHfNJfRHNoG0VAtTTnIWXp7Hv4IW9F+bg== 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 4cBvYG1sMfzbvR; Wed, 27 Aug 2025 19:22:10 +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 57RJMAq9041007; Wed, 27 Aug 2025 19:22:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57RJMA8e041004; Wed, 27 Aug 2025 19:22:10 GMT (envelope-from git) Date: Wed, 27 Aug 2025 19:22:10 GMT Message-Id: <202508271922.57RJMA8e041004@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 935c26dbe3a6 - stable/14 - libkern: Drop incorrect qsort optimization 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 935c26dbe3a6ce77cda9bd802fa45cdb938610a6 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=935c26dbe3a6ce77cda9bd802fa45cdb938610a6 commit 935c26dbe3a6ce77cda9bd802fa45cdb938610a6 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-15 18:01:02 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-27 18:49:58 +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 (cherry picked from commit ef8f3e913156aa268e07ae1daa68e3bc3f1c4d29) --- 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 2707d2ecb738..71cdceaa33dc 100644 --- a/sys/libkern/qsort.c +++ b/sys/libkern/qsort.c @@ -115,11 +115,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; @@ -148,7 +147,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; } @@ -156,7 +154,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; } @@ -165,18 +162,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);