[Core] Introduce popleft_n and append_n in FreeKVCacheBlockQueue to further optimize block_pool (#21222)
Signed-off-by: Jialin Ouyang <Jialin.Ouyang@gmail.com>
This commit is contained in:
@@ -184,6 +184,111 @@ def test_free_kv_cache_block_queue_operations():
|
||||
assert str(e.value) == "No free blocks available"
|
||||
|
||||
|
||||
def test_free_kv_cache_block_queue_append_n():
|
||||
# Create an empty FreeKVCacheBlockQueue with these blocks
|
||||
queue = FreeKVCacheBlockQueue([])
|
||||
blocks = [KVCacheBlock(block_id=i) for i in range(6)]
|
||||
# Append 0 block
|
||||
# fake_head->fake_tail
|
||||
queue.append_n([])
|
||||
assert queue.num_free_blocks == 0
|
||||
assert (queue.fake_free_list_head.next_free_block
|
||||
is queue.fake_free_list_tail)
|
||||
assert (queue.fake_free_list_tail.prev_free_block
|
||||
is queue.fake_free_list_head)
|
||||
# Append 1 block
|
||||
# fake_head->b0->fake_tail
|
||||
queue.append_n(blocks[0:1])
|
||||
assert queue.num_free_blocks == 1
|
||||
assert queue.fake_free_list_head.next_free_block is blocks[0]
|
||||
assert blocks[0].prev_free_block is queue.fake_free_list_head
|
||||
assert blocks[0].next_free_block is queue.fake_free_list_tail
|
||||
assert queue.fake_free_list_tail.prev_free_block is blocks[0]
|
||||
# Append 2 blocks
|
||||
# fake_head->b0->b4->b5->fake_tail
|
||||
queue.append_n(blocks[4:6])
|
||||
assert queue.num_free_blocks == 3
|
||||
assert queue.fake_free_list_head.next_free_block is blocks[0]
|
||||
assert blocks[0].prev_free_block is queue.fake_free_list_head
|
||||
assert blocks[0].next_free_block is blocks[4]
|
||||
assert blocks[4].prev_free_block is blocks[0]
|
||||
assert blocks[4].next_free_block is blocks[5]
|
||||
assert blocks[5].prev_free_block is blocks[4]
|
||||
assert blocks[5].next_free_block is queue.fake_free_list_tail
|
||||
assert queue.fake_free_list_tail.prev_free_block is blocks[5]
|
||||
# Append 3 blocks
|
||||
# fake_head->b0->b4->b5->b1->b2->b3->fake_tail
|
||||
queue.append_n(blocks[1:4])
|
||||
assert queue.num_free_blocks == 6
|
||||
assert queue.fake_free_list_head.next_free_block is blocks[0]
|
||||
assert blocks[0].prev_free_block is queue.fake_free_list_head
|
||||
assert blocks[0].next_free_block is blocks[4]
|
||||
assert blocks[4].prev_free_block is blocks[0]
|
||||
assert blocks[4].next_free_block is blocks[5]
|
||||
assert blocks[5].prev_free_block is blocks[4]
|
||||
assert blocks[5].next_free_block is blocks[1]
|
||||
assert blocks[1].prev_free_block is blocks[5]
|
||||
assert blocks[1].next_free_block is blocks[2]
|
||||
assert blocks[2].prev_free_block is blocks[1]
|
||||
assert blocks[2].next_free_block is blocks[3]
|
||||
assert blocks[3].prev_free_block is blocks[2]
|
||||
assert blocks[3].next_free_block is queue.fake_free_list_tail
|
||||
assert queue.fake_free_list_tail.prev_free_block is blocks[3]
|
||||
|
||||
|
||||
def test_free_kv_cache_block_queue_popleft_n():
|
||||
blocks = [KVCacheBlock(block_id=i) for i in range(6)]
|
||||
# Create a empty FreeKVCacheBlockQueue with these blocks
|
||||
queue = FreeKVCacheBlockQueue(
|
||||
[blocks[1], blocks[3], blocks[5], blocks[4], blocks[0], blocks[2]])
|
||||
assert queue.num_free_blocks == 6
|
||||
assert queue.fake_free_list_head.next_free_block is blocks[1]
|
||||
assert blocks[1].prev_free_block is queue.fake_free_list_head
|
||||
assert blocks[1].next_free_block is blocks[3]
|
||||
assert blocks[3].prev_free_block is blocks[1]
|
||||
assert blocks[3].next_free_block is blocks[5]
|
||||
assert blocks[5].prev_free_block is blocks[3]
|
||||
assert blocks[5].next_free_block is blocks[4]
|
||||
assert blocks[4].prev_free_block is blocks[5]
|
||||
assert blocks[4].next_free_block is blocks[0]
|
||||
assert blocks[0].prev_free_block is blocks[4]
|
||||
assert blocks[0].next_free_block is blocks[2]
|
||||
assert blocks[2].prev_free_block is blocks[0]
|
||||
assert blocks[2].next_free_block is queue.fake_free_list_tail
|
||||
assert queue.fake_free_list_tail.prev_free_block is blocks[2]
|
||||
|
||||
# Pop 0 block
|
||||
# fake_head->b1->b3->b5->b4->b0->b2->fake_tail
|
||||
assert len(queue.popleft_n(0)) == 0
|
||||
# Pop 1 block
|
||||
# fake_head->b3->b5->b4->b0->b2->fake_tail
|
||||
result_blocks = queue.popleft_n(1)
|
||||
assert len(result_blocks) == 1
|
||||
assert result_blocks[0] is blocks[1]
|
||||
for block in result_blocks:
|
||||
assert block.prev_free_block is None
|
||||
assert block.next_free_block is None
|
||||
# Pop 2 blocks
|
||||
# fake_head->b4->b0->b2->fake_tail
|
||||
result_blocks = queue.popleft_n(2)
|
||||
assert len(result_blocks) == 2
|
||||
assert result_blocks[0] is blocks[3]
|
||||
assert result_blocks[1] is blocks[5]
|
||||
for block in result_blocks:
|
||||
assert block.prev_free_block is None
|
||||
assert block.next_free_block is None
|
||||
# Pop 3 blocks
|
||||
# fake_head->fake_tail
|
||||
result_blocks = queue.popleft_n(3)
|
||||
assert len(result_blocks) == 3
|
||||
assert result_blocks[0] is blocks[4]
|
||||
assert result_blocks[1] is blocks[0]
|
||||
assert result_blocks[2] is blocks[2]
|
||||
for block in result_blocks:
|
||||
assert block.prev_free_block is None
|
||||
assert block.next_free_block is None
|
||||
|
||||
|
||||
def test_free_kv_cache_block_queue_get_all_free_blocks():
|
||||
# Create a list of KVCacheBlock objects
|
||||
blocks = [KVCacheBlock(block_id=i) for i in range(5)]
|
||||
|
||||
Reference in New Issue
Block a user