Skip to content

Commit 3358f2d

Browse files
committed
AVL: Remove obsolete branching optimizations
Modern Clang and GCC can successfully implement simple conditions without branching with math and flag operations. Use of arrays for translation no longer helps as much as it was 14+ years ago. Disassemble of the code generated by Clang 13.0.0 on FreeBSD 13.1, Clang 14.0.4 on FreeBSD 14 and GCC 10.2.1 on Debian 11 with this change still shows no branching instructions. Profiling of CPU-bound scan stage of sorted scrub shows reproducible reduction of time spent inside avl_find() from 6.52% to 4.58%. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Alexander Motin <[email protected]> Sponsored-By: iXsystems, Inc. Closes openzfs#13540
1 parent 22b22a0 commit 3358f2d

File tree

1 file changed

+4
-20
lines changed

1 file changed

+4
-20
lines changed

module/avl/avl.c

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -108,21 +108,6 @@
108108
#include <sys/cmn_err.h>
109109
#include <sys/mod.h>
110110

111-
/*
112-
* Small arrays to translate between balance (or diff) values and child indices.
113-
*
114-
* Code that deals with binary tree data structures will randomly use
115-
* left and right children when examining a tree. C "if()" statements
116-
* which evaluate randomly suffer from very poor hardware branch prediction.
117-
* In this code we avoid some of the branch mispredictions by using the
118-
* following translation arrays. They replace random branches with an
119-
* additional memory reference. Since the translation arrays are both very
120-
* small the data should remain efficiently in cache.
121-
*/
122-
static const int avl_child2balance[2] = {-1, 1};
123-
static const int avl_balance2child[] = {0, 0, 1};
124-
125-
126111
/*
127112
* Walk from one node to the previous valued node (ie. an infix walk
128113
* towards the left). At any given node we do one of 2 things:
@@ -278,8 +263,7 @@ avl_find(avl_tree_t *tree, const void *value, avl_index_t *where)
278263
#endif
279264
return (AVL_NODE2DATA(node, off));
280265
}
281-
child = avl_balance2child[1 + diff];
282-
266+
child = (diff > 0);
283267
}
284268

285269
if (where != NULL)
@@ -531,7 +515,7 @@ avl_insert(avl_tree_t *tree, void *new_data, avl_index_t where)
531515
* Compute the new balance
532516
*/
533517
old_balance = AVL_XBALANCE(node);
534-
new_balance = old_balance + avl_child2balance[which_child];
518+
new_balance = old_balance + (which_child ? 1 : -1);
535519

536520
/*
537521
* If we introduced equal balance, then we are done immediately
@@ -697,7 +681,7 @@ avl_remove(avl_tree_t *tree, void *data)
697681
* choose node to swap from whichever side is taller
698682
*/
699683
old_balance = AVL_XBALANCE(delete);
700-
left = avl_balance2child[old_balance + 1];
684+
left = (old_balance > 0);
701685
right = 1 - left;
702686

703687
/*
@@ -781,7 +765,7 @@ avl_remove(avl_tree_t *tree, void *data)
781765
*/
782766
node = parent;
783767
old_balance = AVL_XBALANCE(node);
784-
new_balance = old_balance - avl_child2balance[which_child];
768+
new_balance = old_balance - (which_child ? 1 : -1);
785769
parent = AVL_XPARENT(node);
786770
which_child = AVL_XCHILD(node);
787771

0 commit comments

Comments
 (0)