From nobody Mon Aug 01 05:45:41 2022 X-Original-To: dev-commits-src-branches@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 4Lx6Y13wfKz4XVNB; Mon, 1 Aug 2022 05:45:41 +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 4Lx6Y13Rj3z3D4L; Mon, 1 Aug 2022 05:45:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659332741; 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=EQAK2guNOGGiQ6G7GCoN7hY1z0PZ+N+5Pj9rEfx7OSc=; b=H+TuGpWHZzWGMp3avObYqYYlP1gl96MIsh+AWu+nsFq3tDe2njTXOqAGGRGmxSwtey6kVn kL/DU5355kKTItoCzw5iijjNl8+WyVdG1LZF5+zN8P1a1+IHgMtqPDnHKNvic13QtDg1t5 zd/PjBLszwHSb6yrNSzHt8MlZjoyW7PswoX8oqBl7l/QiVjIwvmtOWMhWwO3urV0ZgZysp GL2ev+DEtE9CFL2atVz1pZCHr0YrrBwueM5oBiPK1tZrI+7KWHUyBbrTYQD03AFvN9H5vc by5mSeAVnLqpSQTqdui6GD0nGUyM8En7z0k0MDRLwT4D1RiAwxK7eofCzCT1mA== 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 4Lx6Y12VXmzMyM; Mon, 1 Aug 2022 05:45:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2715jf8V034741; Mon, 1 Aug 2022 05:45:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2715jfFR034740; Mon, 1 Aug 2022 05:45:41 GMT (envelope-from git) Date: Mon, 1 Aug 2022 05:45:41 GMT Message-Id: <202208010545.2715jfFR034740@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Moore Subject: git: 8445e3d50ee2 - stable/13 - rb_tree: fine-tune rebalancing code List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 8445e3d50ee221e06beaf354a7bc3937532821df Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659332741; 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=EQAK2guNOGGiQ6G7GCoN7hY1z0PZ+N+5Pj9rEfx7OSc=; b=Ahji/x4R1AxLrEAMHbdZO+3d4v8dTGHBv75V+hzzQii5dTDT10q2ENXJTavojiprv2OoMj 6lHR4zxEivfP2cFt38eIZhyxVnELfJF90lbRE5PkxpTjJaUIMyHYoMkyDDaygOiMWvH/N3 M8yH7jvGLOUz8vuaOh0gg1OPFeikWvfgUOjIEc3aT9cOCQSARXbTeCDAcO8nPspk4qEuUu GTAMBzv1lr5dx/oAKRctmkJMms2OoHUy1zqwgC/piFl6o+iFGhxEEdTHWjia/D7rj9k4Fi FfVBYGuPsLdiR3q94Pvy+r/b5ZSEY0RozdepCskXbOimoo+xc/7FdvBNQtSVag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659332741; a=rsa-sha256; cv=none; b=VnAhRXW7air1A9kuszqBu86VCOe8R7ASAsWOxCdr1hvMfzcqvNaGrgaXNTvXLpRQOR1FAz WUEzPz8gfUXjHO8TXEzbSOgHC2Fr5h29KrjLyBt2fwZXe0zzWyPL07qC8KM2gKfeUpnyQR yi977jTdY79viSLWo/UNS0R6j0bAAIhP3Ii/je6uJzOSqSfxhPaFCCCi3+q1tMRR0Ookna YiaBOH2ifDN9m/HPOUoLp0qf/R9EkOROMKHuDInZ/cLHJ42eShDjf7wpUJalKt7uc0yol9 6TRoiDkIGF5utLRgSlS/d+uqMUya26ragP+fIhV+N3hzcw4KvDZ8SfcZMdCUYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=8445e3d50ee221e06beaf354a7bc3937532821df commit 8445e3d50ee221e06beaf354a7bc3937532821df Author: Doug Moore AuthorDate: 2022-07-04 17:28:35 +0000 Commit: Doug Moore CommitDate: 2022-08-01 05:43:36 +0000 rb_tree: fine-tune rebalancing code Change parts of RB_INSERT_COLOR and RB_REMOVE_COLOR to reduce the number of operations, by, in some cases, flipping two color bits at a time instead of flipping each individually, in separate operations, and by using a switch statement to replace a sequence of if-elses. Rewrite RB_SET_PARENT to generate fewer instructions. These changes reduce the code size by over 100 bytes on some architectures. Also, allow RB users to define a preprocessor symbol to generate RB_REMOVE_COLOR code that matches the implementation described in the original weak-AVL paper in one particular case, instead of the still correct, but slightly more efficient implementation of that case currently implemented. Reviewed by: alc MFC after: 3 weeks Differential Revision: https://reviews.freebsd.org/D35524 (cherry picked from commit 2120d7f57aa0ee48d0be7a4309072bb332d568dd) --- sys/sys/tree.h | 104 +++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 71 insertions(+), 33 deletions(-) diff --git a/sys/sys/tree.h b/sys/sys/tree.h index f6252ff7ac25..5d215d0babe9 100644 --- a/sys/sys/tree.h +++ b/sys/sys/tree.h @@ -340,6 +340,7 @@ struct { \ #define RB_RED_MASK ((__uintptr_t)3) #define RB_FLIP_LEFT(elm, field) (RB_BITS(elm, field) ^= RB_RED_L) #define RB_FLIP_RIGHT(elm, field) (RB_BITS(elm, field) ^= RB_RED_R) +#define RB_FLIP_ALL(elm, field) (RB_BITS(elm, field) ^= RB_RED_MASK) #define RB_RED_LEFT(elm, field) ((RB_BITS(elm, field) & RB_RED_L) != 0) #define RB_RED_RIGHT(elm, field) ((RB_BITS(elm, field) & RB_RED_R) != 0) #define RB_PARENT(elm, field) ((__typeof(RB_UP(elm, field))) \ @@ -348,8 +349,8 @@ struct { \ #define RB_EMPTY(head) (RB_ROOT(head) == NULL) #define RB_SET_PARENT(dst, src, field) do { \ - RB_BITS(dst, field) &= RB_RED_MASK; \ - RB_BITS(dst, field) |= (__uintptr_t)src; \ + RB_BITS(dst, field) = (__uintptr_t)src | \ + (RB_BITS(dst, field) & RB_RED_MASK); \ } while (/*CONSTCOND*/ 0) #define RB_SET(elm, parent, field) do { \ @@ -487,13 +488,14 @@ name##_RB_INSERT_COLOR(struct name *head, struct type *elm) \ continue; \ } \ if (!RB_RED_RIGHT(elm, field)) { \ - RB_FLIP_LEFT(elm, field); \ /* coverity[uninit_use] */ \ RB_ROTATE_LEFT(head, elm, child, field);\ - if (RB_RED_LEFT(child, field)) \ - RB_FLIP_RIGHT(elm, field); \ - else if (RB_RED_RIGHT(child, field)) \ + if (RB_RED_RIGHT(child, field)) \ RB_FLIP_LEFT(parent, field); \ + if (RB_RED_LEFT(child, field)) \ + RB_FLIP_ALL(elm, field); \ + else \ + RB_FLIP_LEFT(elm, field); \ elm = child; \ } \ RB_ROTATE_RIGHT(head, parent, elm, field); \ @@ -509,13 +511,14 @@ name##_RB_INSERT_COLOR(struct name *head, struct type *elm) \ continue; \ } \ if (!RB_RED_LEFT(elm, field)) { \ - RB_FLIP_RIGHT(elm, field); \ /* coverity[uninit_use] */ \ RB_ROTATE_RIGHT(head, elm, child, field);\ - if (RB_RED_RIGHT(child, field)) \ - RB_FLIP_LEFT(elm, field); \ - else if (RB_RED_LEFT(child, field)) \ + if (RB_RED_LEFT(child, field)) \ RB_FLIP_RIGHT(parent, field); \ + if (RB_RED_RIGHT(child, field)) \ + RB_FLIP_ALL(elm, field); \ + else \ + RB_FLIP_RIGHT(elm, field); \ elm = child; \ } \ RB_ROTATE_LEFT(head, parent, elm, field); \ @@ -525,6 +528,17 @@ name##_RB_INSERT_COLOR(struct name *head, struct type *elm) \ } \ } +#ifndef RB_STRICT_HST +/* + * In REMOVE_COLOR, the HST paper, in figure 3, in the single-rotate case, has + * 'parent' with one higher rank, and then reduces its rank if 'parent' has + * become a leaf. This implementation always has the parent in its new position + * with lower rank, to avoid the leaf check. Define RB_STRICT_HST to 1 to get + * the behavior that HST describes. + */ +#define RB_STRICT_HST 0 +#endif + #define RB_GENERATE_REMOVE_COLOR(name, type, field, attr) \ attr void \ name##_RB_REMOVE_COLOR(struct name *head, \ @@ -539,7 +553,7 @@ name##_RB_REMOVE_COLOR(struct name *head, \ if (parent == NULL) \ return; \ } \ - do { \ + do { \ if (RB_LEFT(parent, field) == elm) { \ if (!RB_RED_LEFT(parent, field)) { \ RB_FLIP_LEFT(parent, field); \ @@ -551,24 +565,36 @@ name##_RB_REMOVE_COLOR(struct name *head, \ continue; \ } \ sib = RB_RIGHT(parent, field); \ - if ((~RB_BITS(sib, field) & RB_RED_MASK) == 0) {\ - RB_BITS(sib, field) &= ~RB_RED_MASK; \ + switch (RB_BITS(sib, field) & RB_RED_MASK) { \ + case RB_RED_MASK: \ + RB_FLIP_ALL(sib, field); \ elm = parent; \ continue; \ - } \ - RB_FLIP_RIGHT(sib, field); \ - if (RB_RED_LEFT(sib, field)) \ - RB_FLIP_LEFT(parent, field); \ - else if (!RB_RED_RIGHT(sib, field)) { \ - RB_FLIP_LEFT(parent, field); \ + case RB_RED_R: \ elm = RB_LEFT(sib, field); \ RB_ROTATE_RIGHT(head, sib, elm, field); \ - if (RB_RED_RIGHT(elm, field)) \ - RB_FLIP_LEFT(sib, field); \ if (RB_RED_LEFT(elm, field)) \ - RB_FLIP_RIGHT(parent, field); \ + RB_FLIP_ALL(parent, field); \ + else \ + RB_FLIP_LEFT(parent, field); \ + if (RB_RED_RIGHT(elm, field)) \ + RB_FLIP_ALL(sib, field); \ + else \ + RB_FLIP_RIGHT(sib, field); \ RB_BITS(elm, field) |= RB_RED_MASK; \ sib = elm; \ + break; \ + case RB_RED_L: \ + if (RB_STRICT_HST && elm != NULL) { \ + RB_FLIP_RIGHT(parent, field); \ + RB_FLIP_ALL(sib, field); \ + break; \ + } \ + RB_FLIP_LEFT(parent, field); \ + /* FALLTHROUGH */ \ + default: \ + RB_FLIP_RIGHT(sib, field); \ + break; \ } \ RB_ROTATE_LEFT(head, parent, sib, field); \ } else { \ @@ -582,24 +608,36 @@ name##_RB_REMOVE_COLOR(struct name *head, \ continue; \ } \ sib = RB_LEFT(parent, field); \ - if ((~RB_BITS(sib, field) & RB_RED_MASK) == 0) {\ - RB_BITS(sib, field) &= ~RB_RED_MASK; \ + switch (RB_BITS(sib, field) & RB_RED_MASK) { \ + case RB_RED_MASK: \ + RB_FLIP_ALL(sib, field); \ elm = parent; \ continue; \ - } \ - RB_FLIP_LEFT(sib, field); \ - if (RB_RED_RIGHT(sib, field)) \ - RB_FLIP_RIGHT(parent, field); \ - else if (!RB_RED_LEFT(sib, field)) { \ - RB_FLIP_RIGHT(parent, field); \ + case RB_RED_L: \ elm = RB_RIGHT(sib, field); \ RB_ROTATE_LEFT(head, sib, elm, field); \ - if (RB_RED_LEFT(elm, field)) \ - RB_FLIP_RIGHT(sib, field); \ if (RB_RED_RIGHT(elm, field)) \ - RB_FLIP_LEFT(parent, field); \ + RB_FLIP_ALL(parent, field); \ + else \ + RB_FLIP_RIGHT(parent, field); \ + if (RB_RED_LEFT(elm, field)) \ + RB_FLIP_ALL(sib, field); \ + else \ + RB_FLIP_LEFT(sib, field); \ RB_BITS(elm, field) |= RB_RED_MASK; \ sib = elm; \ + break; \ + case RB_RED_R: \ + if (RB_STRICT_HST && elm != NULL) { \ + RB_FLIP_LEFT(parent, field); \ + RB_FLIP_ALL(sib, field); \ + break; \ + } \ + RB_FLIP_RIGHT(parent, field); \ + /* FALLTHROUGH */ \ + default: \ + RB_FLIP_LEFT(sib, field); \ + break; \ } \ RB_ROTATE_RIGHT(head, parent, sib, field); \ } \