From 394beb633b0b5b5d68aed3d2f2b5c1477e756d80 Mon Sep 17 00:00:00 2001 From: Andreas Karatzas Date: Mon, 27 Jul 2026 04:18:01 -0500 Subject: [PATCH] [Bugfix][ROCm] Use batch DMA for CPU KV cache loads (#49843) Signed-off-by: Andreas Karatzas Co-authored-by: OpenAI Codex --- tests/v1/kv_offload/cpu/test_gpu_worker.py | 14 ++++++++++++++ vllm/v1/kv_offload/cpu/gpu_worker.py | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/tests/v1/kv_offload/cpu/test_gpu_worker.py b/tests/v1/kv_offload/cpu/test_gpu_worker.py index 4e5e94c2bc..bfbb18251c 100644 --- a/tests/v1/kv_offload/cpu/test_gpu_worker.py +++ b/tests/v1/kv_offload/cpu/test_gpu_worker.py @@ -7,6 +7,7 @@ import uuid import pytest import torch +from vllm import _custom_ops as ops from vllm.platforms import current_platform from vllm.utils.math_utils import round_up from vllm.utils.torch_utils import set_random_seed @@ -16,6 +17,7 @@ from vllm.v1.kv_offload.base import ( CanonicalKVCacheTensor, GPULoadStoreSpec, ) +from vllm.v1.kv_offload.cpu import gpu_worker from vllm.v1.kv_offload.cpu.common import CPULoadStoreSpec from vllm.v1.kv_offload.cpu.gpu_worker import CPUOffloadingWorker from vllm.v1.kv_offload.cpu.shared_offload_region import SharedOffloadRegion @@ -32,6 +34,18 @@ NUM_MAPPINGS = [3] NUM_MAPPINGS_PER_GROUP = [2] +@pytest.mark.skipif(not current_platform.is_rocm(), reason="ROCm-specific test") +def test_rocm_cpu_to_gpu_uses_dma(monkeypatch: pytest.MonkeyPatch) -> None: + monkeypatch.setattr(gpu_worker, "HAS_TRITON", True) + monkeypatch.setattr(gpu_worker.current_platform, "is_xpu", lambda: False) + monkeypatch.setattr(gpu_worker.current_platform, "is_rocm", lambda: True) + + refs = [[CanonicalKVCacheRef(tensor_idx=0, page_size_bytes=512)]] + assert gpu_worker._select_swap_blocks_fn(refs, gpu_to_cpu=False) is ( + ops.swap_blocks_batch + ) + + @pytest.mark.parametrize("gpu_to_cpu", [True, False]) @pytest.mark.parametrize("num_mappings", NUM_MAPPINGS) @pytest.mark.parametrize("gpu_page_size_bytes", GPU_PAGE_SIZES) diff --git a/vllm/v1/kv_offload/cpu/gpu_worker.py b/vllm/v1/kv_offload/cpu/gpu_worker.py index baf9a66719..40b57ac867 100644 --- a/vllm/v1/kv_offload/cpu/gpu_worker.py +++ b/vllm/v1/kv_offload/cpu/gpu_worker.py @@ -41,10 +41,10 @@ def _select_swap_blocks_fn( if gpu_to_cpu: return ops.swap_blocks_batch # Fall back to the C++ DMA path on platforms where Triton isn't usable - # (e.g. ROCm builds without Triton) or where GPU kernels cannot directly + # (e.g. ROCm host mappings) or where GPU kernels cannot directly # dereference CPU pointers (XPU lacks CUDA's unified virtual address space, # so the Triton kernel's tl.load(cpu_ptr) is invalid on XPU). - if not HAS_TRITON or current_platform.is_xpu(): + if not HAS_TRITON or current_platform.is_xpu() or current_platform.is_rocm(): return ops.swap_blocks_batch page_sizes = [r.page_size_bytes for g in kv_cache_groups_data_refs for r in g] # Triton wins only on small, 8-byte-aligned payloads.