[model_runner_v2]:optimize the performance of the _compute_slot_mappings_kernel (#7575)
### What this PR does / why we need it?
This PR optimizes the `_compute_slot_mappings_kernel` for Ascend NPUs to
improve performance. The key changes include:
- A new Triton kernel implementation (`_compute_slot_mappings_kernel`)
with NPU-specific optimizations, such as using `tl.gather` to handle
non-contiguous memory access and replacing modulo operations.
- A new method `compute_slot_mappings` in `AscendBlockTables` to use
this new kernel.
- An end-to-end test to verify the correctness of the new kernel against
the reference GPU implementation.
The optimization is needed to avoid performance degradation from scalar
computation on Ascend devices.
### Does this PR introduce _any_ user-facing change?
### How was this patch tested?
- vLLM version: v0.18.0
- vLLM main:
ed359c497a
---------
Signed-off-by: lhp-deep <liuhaopeng1@huawei.com>
This commit is contained in:
@@ -0,0 +1,112 @@
|
|||||||
|
import torch
|
||||||
|
import pytest
|
||||||
|
from vllm.triton_utils import tl, triton
|
||||||
|
from vllm.v1.worker.gpu.block_table import _compute_slot_mappings_kernel as \
|
||||||
|
ref_compute_slot_mappings_kernel
|
||||||
|
from vllm_ascend.worker.v2.block_table import _compute_slot_mappings_kernel as \
|
||||||
|
ascend_compute_slot_mappings_kernel
|
||||||
|
from vllm.v1.worker.gpu.block_table import _load_ptr, _make_ptr_tensor
|
||||||
|
|
||||||
|
def test_compute_slot_mapping_npu_kernel():
|
||||||
|
|
||||||
|
"""
|
||||||
|
Computes the physical slot IDs in KV cache for each token in the current batch.
|
||||||
|
This function maps the logical positions of tokens to their actual storage locations
|
||||||
|
in the block-managed KV cache, which is critical for efficient memory access in LLM inference.
|
||||||
|
|
||||||
|
Input:
|
||||||
|
- max_num_batched_tokens (int): Maximum preallocated batched tokens in KV cache (memory limit)
|
||||||
|
- idx_mapping (torch.Tensor): [num_reqs], int32 → Virtual-to-actual request index mapping
|
||||||
|
- query_start_loc (torch.Tensor): [num_reqs+1], int32 → Batch-level token start positions per request
|
||||||
|
- positions (torch.Tensor): [num_tokens], int64 → Per-token logical sequence positions in requests
|
||||||
|
- block_table_ptrs (torch.Tensor): [num_kv_cache_groups], int32 → Pointers to block tables (virtual→physical)
|
||||||
|
- block_table_strides (torch.Tensor): [num_kv_cache_groups], int32 → Stride for block table addressing
|
||||||
|
- block_sizes_tensor (torch.Tensor): [num_kv_cache_groups], int32 → Token capacity per KV cache block
|
||||||
|
- slot_mappings (torch.Tensor): [num_kv_cache_groups, max_num_batched_tokens], int32 → Output slot ID tensor
|
||||||
|
- slot_mappings_stride0 (int): Stride of the first dimension of slot_mappings (memory layout)
|
||||||
|
- cp_rank (int): Current device rank in column-parallel (CP) group
|
||||||
|
- CP_SIZE (int): Total devices in CP parallel group
|
||||||
|
- CP_INTERLEAVE (bool): Enable interleaved CP computation (memory access optimization)
|
||||||
|
- PAD_ID (int): Padding value for invalid slot IDs (-1)
|
||||||
|
- TRITON_BLOCK_SIZE (int): Block size for Triton kernel execution (hardware optimization),
|
||||||
|
'TOTAL_BLOCK_SIZE' must be greater than the 'position / (block_size * CP_SIZE) + 1024'
|
||||||
|
|
||||||
|
Output:
|
||||||
|
- slot_mappings (torch.Tensor): [num_kv_cache_groups, max_num_batched_tokens], int32 → Output slot ID tensor
|
||||||
|
"""
|
||||||
|
|
||||||
|
|
||||||
|
torch.manual_seed(42)
|
||||||
|
|
||||||
|
device = "npu" if torch.npu.is_available() else "cuda" if torch.cuda.is_available() else "cpu"
|
||||||
|
|
||||||
|
max_num_batched_tokens = 8192
|
||||||
|
idx_mapping = torch.tensor([63], dtype=torch.int32, device=device)
|
||||||
|
query_start_loc = torch.tensor([0, 5], dtype=torch.int32, device=device)
|
||||||
|
positions = torch.tensor([0,1,2,3,4,0,0,0], dtype=torch.int64, device=device)
|
||||||
|
|
||||||
|
num_kv_cache_groups = 1
|
||||||
|
max_num_reqs = 64
|
||||||
|
max_num_blocks = 320
|
||||||
|
block_tables: list[torch.Tensor] = []
|
||||||
|
for i in range(num_kv_cache_groups):
|
||||||
|
block_table = torch.randint(0, 320, (max_num_reqs, max_num_blocks), dtype=torch.int32, device=device)
|
||||||
|
block_tables.append(block_table)
|
||||||
|
block_table_ptrs = _make_ptr_tensor(block_tables)
|
||||||
|
block_table_strides = torch.tensor([320], dtype=torch.int32, device=device)
|
||||||
|
|
||||||
|
block_sizes_tensor = torch.tensor([128], dtype=torch.int32, device=device)
|
||||||
|
slot_mappings = torch.zeros(size=(1, 8192), dtype=torch.int64, device=device)
|
||||||
|
ref_slot_mappings = torch.zeros(size=(1, 8192), dtype=torch.int64, device=device)
|
||||||
|
cp_rank = 0
|
||||||
|
cp_size = 1
|
||||||
|
cp_interleave = 1
|
||||||
|
num_reqs = query_start_loc.shape[0] - 1
|
||||||
|
num_groups = num_kv_cache_groups
|
||||||
|
|
||||||
|
try:
|
||||||
|
ascend_compute_slot_mappings_kernel[(num_groups, num_reqs+1)](
|
||||||
|
max_num_batched_tokens,
|
||||||
|
idx_mapping,
|
||||||
|
query_start_loc,
|
||||||
|
positions,
|
||||||
|
block_table_ptrs,
|
||||||
|
block_table_strides,
|
||||||
|
block_sizes_tensor,
|
||||||
|
slot_mappings,
|
||||||
|
slot_mappings.stride(0),
|
||||||
|
cp_rank,
|
||||||
|
CP_SIZE=cp_size,
|
||||||
|
CP_INTERLEAVE=cp_interleave,
|
||||||
|
PAD_ID=-1,
|
||||||
|
TRITON_BLOCK_SIZE=1024, # type: ignore
|
||||||
|
TOTAL_BLOCK_SIZE=4096,
|
||||||
|
)
|
||||||
|
|
||||||
|
ref_compute_slot_mappings_kernel[(num_groups, num_reqs+1)](
|
||||||
|
max_num_batched_tokens,
|
||||||
|
idx_mapping,
|
||||||
|
query_start_loc,
|
||||||
|
positions,
|
||||||
|
block_table_ptrs,
|
||||||
|
block_table_strides,
|
||||||
|
block_sizes_tensor,
|
||||||
|
ref_slot_mappings,
|
||||||
|
ref_slot_mappings.stride(0),
|
||||||
|
cp_rank,
|
||||||
|
CP_SIZE=cp_size,
|
||||||
|
CP_INTERLEAVE=cp_interleave,
|
||||||
|
PAD_ID=-1,
|
||||||
|
TRITON_BLOCK_SIZE=1024, # type: ignore
|
||||||
|
)
|
||||||
|
|
||||||
|
# ========== Verify results ==========
|
||||||
|
assert torch.equal(slot_mappings, ref_slot_mappings), \
|
||||||
|
f"ascend output differs from gpu reference.\n" \
|
||||||
|
f"Max diff: {torch.max(torch.abs(slot_mappings - ref_slot_mappings))}\n" \
|
||||||
|
f"Mean diff: {torch.mean(torch.abs(slot_mappings - ref_slot_mappings).float())}"
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
print(f'Error during executionm: {e}')
|
||||||
|
import traceback
|
||||||
|
traceback.print_exc()
|
||||||
@@ -18,7 +18,9 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
import torch
|
import torch
|
||||||
from vllm.v1.worker.gpu.block_table import BlockTables
|
from vllm.triton_utils import tl, triton
|
||||||
|
from vllm.v1.attention.backends.utils import PAD_SLOT_ID
|
||||||
|
from vllm.v1.worker.gpu.block_table import BlockTables, _load_ptr
|
||||||
|
|
||||||
|
|
||||||
class AscendBlockTables(BlockTables):
|
class AscendBlockTables(BlockTables):
|
||||||
@@ -56,3 +58,104 @@ class AscendBlockTables(BlockTables):
|
|||||||
dtype=torch.int32,
|
dtype=torch.int32,
|
||||||
device=self.device,
|
device=self.device,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def compute_slot_mappings(
|
||||||
|
self,
|
||||||
|
idx_mapping: torch.Tensor,
|
||||||
|
query_start_loc: torch.Tensor,
|
||||||
|
positions: torch.Tensor,
|
||||||
|
num_tokens_padded: int,
|
||||||
|
) -> torch.Tensor:
|
||||||
|
num_reqs = idx_mapping.shape[0]
|
||||||
|
num_groups = self.num_kv_cache_groups
|
||||||
|
_compute_slot_mappings_kernel[(num_groups, num_reqs + 1)](
|
||||||
|
self.max_num_batched_tokens,
|
||||||
|
idx_mapping,
|
||||||
|
query_start_loc,
|
||||||
|
positions,
|
||||||
|
self.block_table_ptrs,
|
||||||
|
self.block_table_strides,
|
||||||
|
self.block_sizes_tensor,
|
||||||
|
self.slot_mappings,
|
||||||
|
self.slot_mappings.stride(0),
|
||||||
|
self.cp_rank,
|
||||||
|
CP_SIZE=self.cp_size,
|
||||||
|
CP_INTERLEAVE=self.cp_interleave,
|
||||||
|
PAD_ID=PAD_SLOT_ID,
|
||||||
|
TRITON_BLOCK_SIZE=1024, # type: ignore
|
||||||
|
TOTAL_BLOCK_SIZE=4096,
|
||||||
|
)
|
||||||
|
return self.slot_mappings[:, :num_tokens_padded]
|
||||||
|
|
||||||
|
|
||||||
|
@triton.jit
|
||||||
|
def _compute_slot_mappings_kernel(
|
||||||
|
max_num_tokens,
|
||||||
|
idx_mapping, # [num_reqs]
|
||||||
|
query_start_loc, # [num_reqs + 1]
|
||||||
|
pos, # [num_tokens]
|
||||||
|
block_table_ptrs, # [num_kv_cache_groups]
|
||||||
|
block_table_strides, # [num_kv_cache_groups]
|
||||||
|
block_sizes, # [num_kv_cache_groups]
|
||||||
|
slot_mappings_ptr, # [num_kv_cache_groups, max_num_tokens]
|
||||||
|
slot_mappings_stride,
|
||||||
|
cp_rank,
|
||||||
|
CP_SIZE: tl.constexpr,
|
||||||
|
CP_INTERLEAVE: tl.constexpr,
|
||||||
|
PAD_ID: tl.constexpr,
|
||||||
|
TRITON_BLOCK_SIZE: tl.constexpr,
|
||||||
|
TOTAL_BLOCK_SIZE: tl.constexpr,
|
||||||
|
):
|
||||||
|
# kv cache group id
|
||||||
|
group_id = tl.program_id(0)
|
||||||
|
batch_idx = tl.program_id(1)
|
||||||
|
slot_mapping_ptr = slot_mappings_ptr + group_id * slot_mappings_stride
|
||||||
|
|
||||||
|
if batch_idx == tl.num_programs(1) - 1:
|
||||||
|
actual_num_tokens = tl.load(query_start_loc + batch_idx)
|
||||||
|
for i in range(actual_num_tokens, max_num_tokens, TRITON_BLOCK_SIZE):
|
||||||
|
offset = i + tl.arange(0, TRITON_BLOCK_SIZE)
|
||||||
|
tl.store(slot_mapping_ptr + offset, PAD_ID, mask=offset < max_num_tokens)
|
||||||
|
return
|
||||||
|
|
||||||
|
block_table_ptr = _load_ptr(block_table_ptrs + group_id, tl.int32)
|
||||||
|
block_table_stride = tl.load(block_table_strides + group_id)
|
||||||
|
block_size = tl.load(block_sizes + group_id)
|
||||||
|
|
||||||
|
req_state_idx = tl.load(idx_mapping + batch_idx)
|
||||||
|
start_idx = tl.load(query_start_loc + batch_idx)
|
||||||
|
end_idx = tl.load(query_start_loc + batch_idx + 1)
|
||||||
|
for i in range(start_idx, end_idx, TRITON_BLOCK_SIZE):
|
||||||
|
offset = i + tl.arange(0, TRITON_BLOCK_SIZE)
|
||||||
|
positions = tl.load(pos + offset, mask=offset < end_idx, other=0)
|
||||||
|
|
||||||
|
# Type conversion of 'position' to int32 to be compatible with npu
|
||||||
|
# otherwise, it will degrade to scalar computation
|
||||||
|
positions = positions.to(tl.int32)
|
||||||
|
block_indices = positions // (block_size * CP_SIZE)
|
||||||
|
|
||||||
|
# block_offset = positions % (block_size * CP_SIZE)
|
||||||
|
# The % operation on int32 type will degrade to scalar computation
|
||||||
|
# replace the % operation with sub and mul instead
|
||||||
|
block_offsets = positions - (block_size * CP_SIZE) * block_indices
|
||||||
|
|
||||||
|
# The 'block_indics' variable results in non-contiguous memory assess,
|
||||||
|
# which triggers degradation toscalar computation.
|
||||||
|
# Mitigate this by loading the complete data block and extracting the required data with tl.gather
|
||||||
|
block_numbers = tl.load(block_table_ptr + req_state_idx * block_table_stride + tl.arange(0, TOTAL_BLOCK_SIZE))
|
||||||
|
block_numbers = block_numbers.to(tl.float32)
|
||||||
|
block_numbers = tl.gather(block_numbers, block_indices, 0)
|
||||||
|
|
||||||
|
if CP_SIZE == 1:
|
||||||
|
# Common case: Context parallelism is not used.
|
||||||
|
slot_ids = block_numbers * block_size + block_offsets
|
||||||
|
else:
|
||||||
|
# Context parallelism is used.
|
||||||
|
is_local = block_offsets // CP_INTERLEAVE % CP_SIZE == cp_rank
|
||||||
|
rounds = block_offsets // (CP_INTERLEAVE * CP_SIZE)
|
||||||
|
remainder = block_offsets % CP_INTERLEAVE
|
||||||
|
local_offsets = rounds * CP_INTERLEAVE + remainder
|
||||||
|
slot_ids = block_numbers * block_size + local_offsets
|
||||||
|
slot_ids = tl.where(is_local, slot_ids, PAD_ID)
|
||||||
|
|
||||||
|
tl.store(slot_mapping_ptr + offset, slot_ids, mask=offset < end_idx)
|
||||||
|
|||||||
Reference in New Issue
Block a user