Merge pull request #976 from aprokop/fixing_perf

Change spatial traversal to fix perf regression from #897
arborx · Dec 7, 2023 · 851e915 · 851e915
2 parents fbd2584 + e61159f
commit 851e915
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 31 deletions.
diff --git a/src/details/ArborX_DetailsHalfTraversal.hpp b/src/details/ArborX_DetailsHalfTraversal.hpp
@@ -61,25 +61,18 @@ struct HalfTraversal
     int node = HappyTreeFriends::getRope(_bvh, i);
     while (node != ROPE_SENTINEL)
     {
-      bool const is_leaf = HappyTreeFriends::isLeaf(_bvh, node);
-
-      if (is_leaf ? predicate(HappyTreeFriends::getIndexable(_bvh, node))
-                  : predicate(HappyTreeFriends::getInternalBoundingVolume(
-                        _bvh, node)))
+      if (HappyTreeFriends::isLeaf(_bvh, node))
       {
-        if (is_leaf)
-        {
+        if (predicate(HappyTreeFriends::getIndexable(_bvh, node)))
           _callback(leaf_permutation_i, HappyTreeFriends::getValue(_bvh, node));
-          node = HappyTreeFriends::getRope(_bvh, node);
-        }
-        else
-        {
-          node = HappyTreeFriends::getLeftChild(_bvh, node);
-        }
+        node = HappyTreeFriends::getRope(_bvh, node);
       }
       else
       {
-        node = HappyTreeFriends::getRope(_bvh, node);
+        node =
+            (predicate(HappyTreeFriends::getInternalBoundingVolume(_bvh, node))
+                 ? HappyTreeFriends::getLeftChild(_bvh, node)
+                 : HappyTreeFriends::getRope(_bvh, node));
       }
     }
   }

diff --git a/src/details/ArborX_DetailsTreeTraversal.hpp b/src/details/ArborX_DetailsTreeTraversal.hpp
@@ -104,27 +104,20 @@ struct TreeTraversal<BVH, Predicates, Callback, SpatialPredicateTag>
     int node = HappyTreeFriends::getRoot(_bvh); // start with root
     do
     {
-      bool const is_leaf = HappyTreeFriends::isLeaf(_bvh, node);
-
-      if (is_leaf ? predicate(HappyTreeFriends::getIndexable(_bvh, node))
-                  : predicate(HappyTreeFriends::getInternalBoundingVolume(
-                        _bvh, node)))
+      if (HappyTreeFriends::isLeaf(_bvh, node))
       {
-        if (is_leaf)
-        {
-          if (invoke_callback_and_check_early_exit(
-                  _callback, predicate, HappyTreeFriends::getValue(_bvh, node)))
-            return;
-          node = HappyTreeFriends::getRope(_bvh, node);
-        }
-        else
-        {
-          node = HappyTreeFriends::getLeftChild(_bvh, node);
-        }
+        if (predicate(HappyTreeFriends::getIndexable(_bvh, node)) &&
+            invoke_callback_and_check_early_exit(
+                _callback, predicate, HappyTreeFriends::getValue(_bvh, node)))
+          return;
+        node = HappyTreeFriends::getRope(_bvh, node);
       }
       else
       {
-        node = HappyTreeFriends::getRope(_bvh, node);
+        node =
+            (predicate(HappyTreeFriends::getInternalBoundingVolume(_bvh, node))
+                 ? HappyTreeFriends::getLeftChild(_bvh, node)
+                 : HappyTreeFriends::getRope(_bvh, node));
       }
     } while (node != ROPE_SENTINEL);
   }