[XPU] weekly simple model enablement 2026/09/14 (#39439)
Co-authored-by: Juan Muneton <102537701+jmunetong@users.noreply.github.com> Co-authored-by: YangKai0616 <kai.yang@intel.com> Co-authored-by: devan-carlin <devan-carlin@users.noreply.github.com> Co-authored-by: Ashwini Rathi <arathi@habana.ai> Co-authored-by: Ranjan Debnath <ranjan.debnath@intel.com> Co-authored-by: Juan Muneton <juan.muneton.gallego@intel.com> Co-authored-by: Amrutha M <amrutha.m@intel.com>
This commit is contained in:
co-authored by
Juan Muneton
YangKai0616
devan-carlin
Ashwini Rathi
Ranjan Debnath
Juan Muneton
Amrutha M
parent
4793f56835
commit
84d7604b7e
@@ -24,6 +24,7 @@ def _set_dummy_server_args():
|
||||
|
||||
|
||||
def test_hash_topk_remaps_per_rank_fused_shared_slots(monkeypatch):
|
||||
monkeypatch.setattr(hash_topk_module, "_is_xpu", False)
|
||||
monkeypatch.setattr(
|
||||
hash_topk_module, "has_per_rank_fused_shared_slots", lambda *_args: True
|
||||
)
|
||||
|
||||
@@ -0,0 +1,251 @@
|
||||
"""
|
||||
Verifies the fused ``store_cache_xpu`` KV-cache write path on Intel XPU.
|
||||
|
||||
This branch wires the fused SYCL ``store_cache_xpu`` kernel (from
|
||||
sgl-kernel-xpu) into sglang's KV-cache writer
|
||||
``sglang.srt.mem_cache.memory_pool._set_kv_buffer_impl``. On XPU that
|
||||
dispatch replaces 2x ``index_put`` with a single kernel launch.
|
||||
|
||||
The tests exercise sglang's own dispatch (not the kernel in isolation), so
|
||||
they fail if the wiring regresses to the ``index_put`` fallback:
|
||||
|
||||
- ``test_parity_*`` : fused write matches an ``index_put`` reference.
|
||||
- ``test_dispatches_*`` : the fused kernel is actually the path taken.
|
||||
- ``test_single_token`` : the common decode (1 token) case.
|
||||
- ``test_parity_strided_*`` : non-contiguous K/V (a per-head slice of a
|
||||
wider ``[tokens, heads, dim]`` tensor) writes
|
||||
correctly. The fused kernel addresses source
|
||||
rows by their real stride, so the SWA-layer
|
||||
layout used by Gemma-style models is handled
|
||||
without a host-side ``.contiguous()`` copy.
|
||||
- ``test_dispatches_strided``: the strided write still takes the fused path.
|
||||
|
||||
Run from test/registered::
|
||||
|
||||
python3 -m unittest xpu.test_store_cache_xpu
|
||||
|
||||
Requires Intel XPU. ``store_cache_xpu`` is exported by the sgl-kernel-xpu
|
||||
wheel pinned in ``python/pyproject_xpu.toml``, so it is not optional: a missing
|
||||
op is a broken install and must fail loudly rather than skip.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import unittest
|
||||
|
||||
import torch
|
||||
|
||||
from sglang.srt.utils import is_xpu
|
||||
from sglang.test.ci.ci_register import register_xpu_ci
|
||||
from sglang.test.test_utils import CustomTestCase
|
||||
|
||||
# Pure unit test (no server); fast and runs on the 1-GPU XPU runner.
|
||||
register_xpu_ci(est_time=60, suite="stage-b-test-1-gpu-xpu")
|
||||
|
||||
|
||||
def _reference_store(k, v, k_cache, v_cache, indices):
|
||||
"""Naive index_put write — the path the fused kernel replaces."""
|
||||
k_cache[indices] = k
|
||||
v_cache[indices] = v
|
||||
|
||||
|
||||
@unittest.skipUnless(is_xpu(), "Intel XPU not available")
|
||||
class TestStoreCacheXPU(CustomTestCase):
|
||||
"""store_cache_xpu, exercised through sglang's _set_kv_buffer_impl."""
|
||||
|
||||
def _store(self, k, v, k_cache, v_cache, indices):
|
||||
"""Invoke sglang's KV-cache writer (the integration point)."""
|
||||
from sglang.srt.mem_cache.memory_pool import _set_kv_buffer_impl
|
||||
|
||||
row_dim = k.shape[-1]
|
||||
cache_size = k_cache.shape[0]
|
||||
_set_kv_buffer_impl(
|
||||
k,
|
||||
v,
|
||||
k_cache,
|
||||
v_cache,
|
||||
indices,
|
||||
row_dim,
|
||||
k.dtype,
|
||||
torch.xpu,
|
||||
size_limit=cache_size,
|
||||
alt_stream=None,
|
||||
)
|
||||
torch.xpu.synchronize()
|
||||
|
||||
def _assert_parity(self, num_tokens, row_dim, dtype):
|
||||
torch.manual_seed(42)
|
||||
cache_size = 2048
|
||||
|
||||
k = torch.randn(num_tokens, row_dim, dtype=dtype, device="xpu")
|
||||
v = torch.randn(num_tokens, row_dim, dtype=dtype, device="xpu")
|
||||
indices = torch.randperm(cache_size, device="xpu")[:num_tokens].to(torch.int64)
|
||||
|
||||
k_ref = torch.zeros(cache_size, row_dim, dtype=dtype, device="xpu")
|
||||
v_ref = torch.zeros_like(k_ref)
|
||||
k_test = torch.zeros_like(k_ref)
|
||||
v_test = torch.zeros_like(k_ref)
|
||||
|
||||
_reference_store(k, v, k_ref, v_ref, indices)
|
||||
self._store(k, v, k_test, v_test, indices)
|
||||
|
||||
torch.testing.assert_close(k_test, k_ref)
|
||||
torch.testing.assert_close(v_test, v_ref)
|
||||
|
||||
@staticmethod
|
||||
def _strided_head_slice(num_tokens, num_heads, row_dim, head, dtype):
|
||||
"""A non-contiguous per-head K/V slice of a wider tensor.
|
||||
|
||||
``[num_tokens, num_heads, row_dim][:, head, :]`` has shape
|
||||
``(num_tokens, row_dim)`` but row stride ``num_heads * row_dim`` (not
|
||||
``row_dim``) — the SWA-layer layout Gemma-style models hand to the
|
||||
KV-cache writer. The fused kernel must address rows by this real
|
||||
stride; a naive ``.view``/contiguous assumption would corrupt or copy.
|
||||
"""
|
||||
kw = torch.randn(num_tokens, num_heads, row_dim, dtype=dtype, device="xpu")
|
||||
vw = torch.randn(num_tokens, num_heads, row_dim, dtype=dtype, device="xpu")
|
||||
k = kw[:, head, :]
|
||||
v = vw[:, head, :]
|
||||
assert not k.is_contiguous()
|
||||
assert k.stride() == (num_heads * row_dim, 1)
|
||||
return k, v
|
||||
|
||||
def _assert_parity_strided(self, num_tokens, row_dim, num_heads, head, dtype):
|
||||
torch.manual_seed(123)
|
||||
cache_size = 2048
|
||||
|
||||
k, v = self._strided_head_slice(num_tokens, num_heads, row_dim, head, dtype)
|
||||
indices = torch.randperm(cache_size, device="xpu")[:num_tokens].to(torch.int64)
|
||||
|
||||
k_ref = torch.zeros(cache_size, row_dim, dtype=dtype, device="xpu")
|
||||
v_ref = torch.zeros_like(k_ref)
|
||||
k_test = torch.zeros_like(k_ref)
|
||||
v_test = torch.zeros_like(k_ref)
|
||||
|
||||
_reference_store(k, v, k_ref, v_ref, indices)
|
||||
self._store(k, v, k_test, v_test, indices)
|
||||
|
||||
torch.testing.assert_close(k_test, k_ref)
|
||||
torch.testing.assert_close(v_test, v_ref)
|
||||
|
||||
def test_parity_shapes(self):
|
||||
"""Fused write matches index_put across token counts and row dims."""
|
||||
for num_tokens in (1, 4, 32, 128):
|
||||
for row_dim in (128, 256, 512, 1024):
|
||||
with self.subTest(num_tokens=num_tokens, row_dim=row_dim):
|
||||
self._assert_parity(num_tokens, row_dim, torch.bfloat16)
|
||||
|
||||
def test_parity_dtypes(self):
|
||||
"""Both KV-cache dtypes write correctly (contiguous K/V)."""
|
||||
for dtype in (torch.bfloat16, torch.float16):
|
||||
with self.subTest(dtype=dtype):
|
||||
self._assert_parity(32, 256, dtype)
|
||||
|
||||
def test_parity_strided_shapes(self):
|
||||
"""Non-contiguous K/V (per-head slice) matches index_put across shapes.
|
||||
|
||||
Covers a few head counts / slice positions / token counts so the
|
||||
kernel's row-stride addressing is exercised for both the odd
|
||||
(non-vectorizable) and aligned (16-byte OWord) row-base cases.
|
||||
"""
|
||||
# num_tokens > 1: a single-row slice is trivially contiguous, so it
|
||||
# would not exercise the inter-row stride this test targets.
|
||||
for num_heads in (2, 10):
|
||||
for head in (0, num_heads - 1):
|
||||
for num_tokens in (2, 33, 271):
|
||||
with self.subTest(
|
||||
num_heads=num_heads, head=head, num_tokens=num_tokens
|
||||
):
|
||||
self._assert_parity_strided(
|
||||
num_tokens, 256, num_heads, head, torch.bfloat16
|
||||
)
|
||||
|
||||
def test_parity_strided_dtypes(self):
|
||||
"""Both KV-cache dtypes write correctly for non-contiguous K/V."""
|
||||
for dtype in (torch.bfloat16, torch.float16):
|
||||
with self.subTest(dtype=dtype):
|
||||
self._assert_parity_strided(271, 256, 10, 1, dtype)
|
||||
|
||||
def test_single_token(self):
|
||||
"""Single-token decode (the most common runtime case)."""
|
||||
torch.manual_seed(0)
|
||||
row_dim, cache_size = 512, 4096
|
||||
|
||||
k = torch.randn(1, row_dim, dtype=torch.bfloat16, device="xpu")
|
||||
v = torch.randn(1, row_dim, dtype=torch.bfloat16, device="xpu")
|
||||
indices = torch.tensor([42], dtype=torch.int64, device="xpu")
|
||||
|
||||
k_cache = torch.zeros(cache_size, row_dim, dtype=torch.bfloat16, device="xpu")
|
||||
v_cache = torch.zeros_like(k_cache)
|
||||
|
||||
self._store(k, v, k_cache, v_cache, indices)
|
||||
|
||||
torch.testing.assert_close(k_cache[42], k[0])
|
||||
torch.testing.assert_close(v_cache[42], v[0])
|
||||
|
||||
def _count_fused_calls(self, k, v, indices, cache_size, row_dim):
|
||||
"""Run a store through sglang and return how many times the fused
|
||||
``store_cache_xpu`` kernel was actually invoked."""
|
||||
from sglang.srt.mem_cache import memory_pool
|
||||
|
||||
calls = {"n": 0}
|
||||
# memory_pool imports the symbol at module level, so patch the binding
|
||||
# it actually calls, not sgl_kernel's attribute.
|
||||
original = memory_pool.store_cache_xpu
|
||||
|
||||
def counting_store(*args, **kwargs):
|
||||
calls["n"] += 1
|
||||
return original(*args, **kwargs)
|
||||
|
||||
memory_pool.store_cache_xpu = counting_store
|
||||
try:
|
||||
k_cache = torch.zeros(cache_size, row_dim, dtype=k.dtype, device="xpu")
|
||||
v_cache = torch.zeros_like(k_cache)
|
||||
self._store(k, v, k_cache, v_cache, indices)
|
||||
finally:
|
||||
memory_pool.store_cache_xpu = original
|
||||
return calls["n"]
|
||||
|
||||
def test_dispatches_to_fused_kernel(self):
|
||||
"""sglang must take the fused path on XPU, not the index_put fallback.
|
||||
|
||||
Wrap the kernel and assert it is invoked exactly once. Guards against
|
||||
the dispatch silently regressing (e.g. if can_use_store_cache starts
|
||||
gating XPU again, which can't JIT-compile the CUDA kernel).
|
||||
"""
|
||||
torch.manual_seed(7)
|
||||
row_dim, cache_size, num_tokens = 256, 1024, 8
|
||||
k = torch.randn(num_tokens, row_dim, dtype=torch.bfloat16, device="xpu")
|
||||
v = torch.randn(num_tokens, row_dim, dtype=torch.bfloat16, device="xpu")
|
||||
indices = torch.randperm(cache_size, device="xpu")[:num_tokens].to(torch.int64)
|
||||
|
||||
n = self._count_fused_calls(k, v, indices, cache_size, row_dim)
|
||||
self.assertEqual(
|
||||
n,
|
||||
1,
|
||||
"expected _set_kv_buffer_impl to call the fused store_cache_xpu "
|
||||
"exactly once on XPU; it likely fell back to index_put",
|
||||
)
|
||||
|
||||
def test_dispatches_to_fused_kernel_strided(self):
|
||||
"""The fused path must also be taken for non-contiguous (per-head
|
||||
slice) K/V — sglang must not silently fall back to index_put just
|
||||
because the source rows are strided."""
|
||||
torch.manual_seed(8)
|
||||
row_dim, cache_size, num_tokens, num_heads = 256, 1024, 8, 10
|
||||
k, v = self._strided_head_slice(
|
||||
num_tokens, num_heads, row_dim, 1, torch.bfloat16
|
||||
)
|
||||
indices = torch.randperm(cache_size, device="xpu")[:num_tokens].to(torch.int64)
|
||||
|
||||
n = self._count_fused_calls(k, v, indices, cache_size, row_dim)
|
||||
self.assertEqual(
|
||||
n,
|
||||
1,
|
||||
"expected _set_kv_buffer_impl to call the fused store_cache_xpu "
|
||||
"exactly once for strided K/V; it likely fell back to index_put",
|
||||
)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
Reference in New Issue
Block a user