Skip to content

Raise SL_MAX_TIPS from 2048 to 32768 #265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ms609 merged 1 commit into from
Mar 29, 2026
Merged

Raise SL_MAX_TIPS from 2048 to 32768 #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions inst/include/TreeTools/SplitList.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,19 @@ using splitbit = uint_fast64_t;

#define R_BIN_SIZE int16(8)
#define SL_BIN_SIZE int16(64)
#define SL_MAX_BINS int16(32)
#define SL_MAX_BINS int16(512)

/* * Stack allocation limits (Legacy support for speed)
* Trees smaller than this will use stack arrays.
* Trees larger will trigger heap allocation.
*/
#define SL_MAX_TIPS (SL_BIN_SIZE * SL_MAX_BINS) // 2048
#define SL_MAX_TIPS (SL_BIN_SIZE * SL_MAX_BINS) // 32768
#define SL_MAX_SPLITS (SL_MAX_TIPS - 3)

/* Stack allocation thresholds.
* Trees with n_splits <= SL_STACK_SPLITS AND n_bins <= SL_STACK_BINS
* use fast stack arrays; larger trees fall back to heap allocation.
* Kept at the pre-v1.16 values to avoid bloating SplitList objects.
*/
#define SL_STACK_BINS int16(32)
#define SL_STACK_SPLITS int16(SL_BIN_SIZE * SL_STACK_BINS - 3) // 2045

#define INLASTBIN(n, size) int16((size) - int16((size) - int16((n) % (size))) % (size))
#define INSUBBIN(bin, offset) \
splitbit(x(split, ((bin) * input_bins_per_bin) + (offset)))
Expand Down Expand Up @@ -75,10 +79,10 @@ namespace TreeTools {
splitbit** state;

private:
/* STACK STORAGE (Fast path for small trees) */
int32 stack_in_split[SL_MAX_SPLITS];
splitbit stack_state[SL_MAX_SPLITS][SL_MAX_BINS];
splitbit* stack_rows[SL_MAX_SPLITS];
/* STACK STORAGE (Fast path for small trees ≤ SL_STACK_SPLITS splits) */
int32 stack_in_split[SL_STACK_SPLITS];
splitbit stack_state[SL_STACK_SPLITS][SL_STACK_BINS];
splitbit* stack_rows[SL_STACK_SPLITS];

/* HEAP STORAGE (Large trees) */
std::vector<int32> heap_in_split;
Expand All @@ -102,7 +106,7 @@ namespace TreeTools {
ASSERT(n_input_bins > 0);
n_bins = int32(n_input_bins + R_BIN_SIZE - 1) / input_bins_per_bin;

bool use_heap = (n_splits > SL_MAX_SPLITS) || (n_bins > SL_MAX_BINS);
bool use_heap = (n_splits > SL_STACK_SPLITS) || (n_bins > SL_STACK_BINS);

if (use_heap) {
heap_in_split.resize(n_splits, 0);
Expand Down
8 changes: 5 additions & 3 deletions src/splits_to_tree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,13 @@ IntegerMatrix splits_to_edge(const RawMatrix splits, const IntegerVector nTip) {
const SplitList x(splits);

// Decide whether to use stack or heap allocation based on tree size
const bool use_heap = (n_tip > SL_MAX_TIPS) || (x.n_splits > SL_MAX_SPLITS);
// Use stack arrays for small trees, heap for large
constexpr int32 stack_tip_lim = SL_BIN_SIZE * SL_STACK_BINS;
const bool use_heap = (n_tip > stack_tip_lim) || (x.n_splits > SL_STACK_SPLITS);

// Stack allocation for small trees (fast path)
alignas(64) std::array<int32, SL_MAX_TIPS + SL_MAX_SPLITS> stack_parent{};
alignas(64) std::array<int32, SL_MAX_TIPS> stack_patriarch{};
alignas(64) std::array<int32, stack_tip_lim + SL_STACK_SPLITS> stack_parent{};
alignas(64) std::array<int32, stack_tip_lim> stack_patriarch{};

// Heap allocation for large trees
std::vector<int32> heap_parent;
Expand Down
Loading