[Perf] Free KV pages by segment in the paged allocator without a device sync (#32701)
This commit is contained in:
@@ -0,0 +1,179 @@
|
||||
"""free_segment / free_segments vs the torch.unique reference: stride page
|
||||
extraction over all segment alignments, plus boundary-page dedup and free-group
|
||||
deferral. See PagedTokenToKVPoolAllocator.free_segment for why unique is avoided.
|
||||
|
||||
python -m pytest test/registered/unit/mem_cache/test_paged_free_segment.py -v
|
||||
"""
|
||||
|
||||
import unittest
|
||||
|
||||
import torch
|
||||
|
||||
from sglang.srt.mem_cache.allocator.base import BaseTokenToKVPoolAllocator
|
||||
from sglang.srt.mem_cache.allocator.paged import PagedTokenToKVPoolAllocator
|
||||
from sglang.test.ci.ci_register import register_cpu_ci
|
||||
|
||||
register_cpu_ci(est_time=15, suite="base-a-test-cpu")
|
||||
|
||||
PAGE_SIZE = 4
|
||||
NUM_PAGES = 64
|
||||
|
||||
|
||||
def _make_allocator(need_sort=False):
|
||||
return PagedTokenToKVPoolAllocator(
|
||||
size=NUM_PAGES * PAGE_SIZE,
|
||||
page_size=PAGE_SIZE,
|
||||
dtype=torch.float16,
|
||||
device="cpu",
|
||||
kvcache=None,
|
||||
need_sort=need_sort,
|
||||
)
|
||||
|
||||
|
||||
def _make_kv_row(alloc, num_tokens):
|
||||
# Page-aligned allocation, then trim to num_tokens: mirrors a request's
|
||||
# req_to_token row (token position t lives at page*page_size + t%page_size).
|
||||
num_pages = -(num_tokens // -PAGE_SIZE)
|
||||
indices = alloc.alloc(num_pages * PAGE_SIZE)
|
||||
return indices[:num_tokens]
|
||||
|
||||
|
||||
class TestFreeSegment(unittest.TestCase):
|
||||
def test_matches_unique_over_alignments(self):
|
||||
# Sweep (start, end) so segments cover: aligned/unaligned head and
|
||||
# tail, single partial page, full row.
|
||||
for num_tokens in (1, PAGE_SIZE, PAGE_SIZE + 1, 3 * PAGE_SIZE - 1):
|
||||
for start in range(num_tokens):
|
||||
for end in range(start + 1, num_tokens + 1):
|
||||
alloc = _make_allocator()
|
||||
row = _make_kv_row(alloc, num_tokens)
|
||||
expected = torch.unique(row[start:end] // PAGE_SIZE)
|
||||
before = len(alloc.free_pages)
|
||||
alloc.free_segment(row[start:end], start_pos=start)
|
||||
freed = alloc.free_pages[: len(alloc.free_pages) - before]
|
||||
self.assertTrue(
|
||||
torch.equal(torch.sort(freed)[0], expected),
|
||||
f"{num_tokens=} {start=} {end=}",
|
||||
)
|
||||
|
||||
def test_empty_segment_is_noop(self):
|
||||
alloc = _make_allocator()
|
||||
row = _make_kv_row(alloc, PAGE_SIZE)
|
||||
before = len(alloc.free_pages)
|
||||
alloc.free_segment(row[:0], start_pos=0)
|
||||
self.assertEqual(len(alloc.free_pages), before)
|
||||
|
||||
def test_need_sort_routes_to_release_pages(self):
|
||||
alloc = _make_allocator(need_sort=True)
|
||||
row = _make_kv_row(alloc, 2 * PAGE_SIZE)
|
||||
alloc.free_segment(row, start_pos=0)
|
||||
self.assertEqual(len(alloc.release_pages), 2)
|
||||
|
||||
def test_group_defers_until_group_end(self):
|
||||
alloc = _make_allocator()
|
||||
row = _make_kv_row(alloc, 2 * PAGE_SIZE)
|
||||
before = len(alloc.free_pages)
|
||||
alloc.free_group_begin()
|
||||
alloc.free_segment(row, start_pos=0)
|
||||
self.assertEqual(len(alloc.free_pages), before)
|
||||
alloc.free_group_end()
|
||||
self.assertEqual(len(alloc.free_pages), before + 2)
|
||||
|
||||
def test_group_end_debug_assert_catches_cross_call_double_free(self):
|
||||
# legacy free() + free_segment() on the same page in one group must
|
||||
# trip free_group_end's debug assert
|
||||
alloc = _make_allocator()
|
||||
alloc.debug_mode = True
|
||||
row = _make_kv_row(alloc, PAGE_SIZE)
|
||||
alloc.free_group_begin()
|
||||
alloc.free(row)
|
||||
alloc.free_segment(row, start_pos=0)
|
||||
with self.assertRaises(AssertionError):
|
||||
alloc.free_group_end()
|
||||
|
||||
def test_group_end_debug_assert_covers_release_pages(self):
|
||||
# need_sort routes frees into release_pages; the duplicate check must
|
||||
# not go vacuous there (PD disaggregation runs with need_sort=True).
|
||||
alloc = _make_allocator(need_sort=True)
|
||||
alloc.debug_mode = True
|
||||
row = _make_kv_row(alloc, PAGE_SIZE)
|
||||
alloc.free_group_begin()
|
||||
alloc.free(row)
|
||||
alloc.free_segment(row, start_pos=0)
|
||||
with self.assertRaises(AssertionError):
|
||||
alloc.free_group_end()
|
||||
|
||||
|
||||
class TestFreeSegments(unittest.TestCase):
|
||||
def _freed_by_segments(self, num_tokens, spans):
|
||||
alloc = _make_allocator()
|
||||
row = _make_kv_row(alloc, num_tokens)
|
||||
before = len(alloc.free_pages)
|
||||
alloc.free_segments([(row[a:b], a) for a, b in spans])
|
||||
freed = alloc.free_pages[: len(alloc.free_pages) - before]
|
||||
reference = torch.unique(torch.cat([row[a:b] for a, b in spans]) // PAGE_SIZE)
|
||||
return freed, reference
|
||||
|
||||
def test_adjacent_segments_share_boundary_page(self):
|
||||
# [0, 6) and [6, 11) with page_size 4: page 1 spans both segments and
|
||||
# must be freed exactly once.
|
||||
freed, reference = self._freed_by_segments(11, [(0, 6), (6, 11)])
|
||||
self.assertTrue(torch.equal(torch.sort(freed)[0], reference))
|
||||
|
||||
def test_disjoint_segments_share_boundary_page(self):
|
||||
# [0, 5) and [7, 11): gap [5, 7) stays within page 1, which both
|
||||
# segments touch.
|
||||
freed, reference = self._freed_by_segments(11, [(0, 5), (7, 11)])
|
||||
self.assertTrue(torch.equal(torch.sort(freed)[0], reference))
|
||||
|
||||
def test_second_segment_inside_shared_page_is_skipped(self):
|
||||
# [0, 5) and [5, 7): the second segment lies entirely in page 1,
|
||||
# already emitted by the first.
|
||||
freed, reference = self._freed_by_segments(7, [(0, 5), (5, 7)])
|
||||
self.assertTrue(torch.equal(torch.sort(freed)[0], reference))
|
||||
|
||||
def test_page_aligned_segments_no_trim(self):
|
||||
freed, reference = self._freed_by_segments(
|
||||
3 * PAGE_SIZE, [(0, PAGE_SIZE), (PAGE_SIZE, 3 * PAGE_SIZE)]
|
||||
)
|
||||
self.assertTrue(torch.equal(torch.sort(freed)[0], reference))
|
||||
|
||||
|
||||
class _RecordingBaseAllocator(BaseTokenToKVPoolAllocator):
|
||||
"""Base-fallback allocator: free_segment inherits the default (ignore
|
||||
start_pos, call free()), free() records what it received."""
|
||||
|
||||
def __init__(self):
|
||||
super().__init__(
|
||||
size=NUM_PAGES * PAGE_SIZE,
|
||||
page_size=PAGE_SIZE,
|
||||
dtype=torch.float16,
|
||||
device="cpu",
|
||||
kvcache=None,
|
||||
need_sort=False,
|
||||
)
|
||||
self.freed = []
|
||||
|
||||
def alloc(self, need_size: int):
|
||||
raise NotImplementedError
|
||||
|
||||
def clear(self):
|
||||
pass
|
||||
|
||||
def free(self, free_index: torch.Tensor):
|
||||
self.freed.append(free_index)
|
||||
|
||||
|
||||
class TestBaseFallbackFreeSegments(unittest.TestCase):
|
||||
def test_trim_dedups_boundary_page_before_fallback_free(self):
|
||||
# fallback allocators (UnifiedMamba/SWA) dedup per free() call at best;
|
||||
# the shared boundary page must reach free() in exactly one call
|
||||
alloc = _RecordingBaseAllocator()
|
||||
row = torch.arange(11) # position i lives on page i // PAGE_SIZE
|
||||
alloc.free_segments([(row[0:6], 0), (row[6:11], 6)])
|
||||
per_call_pages = [set((t // PAGE_SIZE).tolist()) for t in alloc.freed]
|
||||
self.assertEqual(per_call_pages, [{0, 1}, {2}])
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -590,8 +590,8 @@ class TestRadixCache(unittest.TestCase):
|
||||
f"evicted {result.num_tokens_evicted} tokens, expected at least 2",
|
||||
)
|
||||
|
||||
# Should have called free and reduced size
|
||||
mock_allocator.free.assert_called()
|
||||
# Should have called free_segment and reduced size
|
||||
mock_allocator.free_segment.assert_called()
|
||||
self.assertLess(cache.total_size(), initial_size)
|
||||
|
||||
def test_page_alignment_boundary(self):
|
||||
|
||||
@@ -5363,8 +5363,8 @@ class TestUnifiedRadixCacheActionRouting(CustomTestCase):
|
||||
first, second = torch.tensor([4, 5]), torch.tensor([6])
|
||||
action = FreeDeviceKV([first, second])
|
||||
UnifiedRadixCache._apply_cache_action(cache, action)
|
||||
cache.token_to_kv_pool_allocator.free.assert_has_calls(
|
||||
[mock.call(first), mock.call(second)]
|
||||
cache.token_to_kv_pool_allocator.free_segment.assert_has_calls(
|
||||
[mock.call(first, start_pos=0), mock.call(second, start_pos=0)]
|
||||
)
|
||||
|
||||
def test_apply_cache_action_routes_free_component_device_kv(self):
|
||||
|
||||
Reference in New Issue
Block a user