[XPU] Support ZE_AFFINITY_MASK passthrough in xpu_disagg_acc_test (#47105)

Signed-off-by: zhenwei-intel <zhenwei.liu@intel.com>
This commit is contained in:
liuzhenwei
2026-06-30 17:06:12 +00:00
committed by GitHub
parent f41e8ddc97
commit 7a341fa109
3 changed files with 56 additions and 23 deletions
@@ -21,27 +21,28 @@ DECODER_TP_SIZE=${DECODER_TP_SIZE:-1}
KV_BUFFER_DEVICE=${KV_BUFFER_DEVICE:-"xpu"}
GPU_MEMORY_UTILIZATION=${GPU_MEMORY_UTILIZATION:-0.8}
generate_affinity_mask() {
local count=$1
local start=${2:-0}
local mask=""
local i
for ((i=0; i<count; i++)); do
local device=$((start + i))
if [[ -z "${mask}" ]]; then
mask="${device}"
else
mask="${mask},${device}"
fi
# Parse available devices from ZE_AFFINITY_MASK (e.g. "2,3") or default to "0,1,...".
# compute_gpu_id indexes into this list to assign devices per-instance.
if [[ -n "${ZE_AFFINITY_MASK:-}" ]]; then
IFS=',' read -r -a AVAILABLE_DEVICES <<< "${ZE_AFFINITY_MASK}"
else
# Default: devices 0 .. (PREFILLER_TP_SIZE + DECODER_TP_SIZE - 1)
AVAILABLE_DEVICES=()
for ((i=0; i<PREFILLER_TP_SIZE + DECODER_TP_SIZE; i++)); do
AVAILABLE_DEVICES+=("$i")
done
fi
echo "${mask}"
compute_gpu_id() {
local start=$1
local tp_size=$2
local gpu_id="${AVAILABLE_DEVICES[$start]}"
for (( j=1; j<tp_size; j++ )); do
gpu_id="${gpu_id},${AVAILABLE_DEVICES[$((start + j))]}"
done
echo "${gpu_id}"
}
PREFILLER_ZE_AFFINITY_MASK=${PREFILLER_ZE_AFFINITY_MASK:-$(generate_affinity_mask "${PREFILLER_TP_SIZE}" 0)}
DECODER_ZE_AFFINITY_MASK=${DECODER_ZE_AFFINITY_MASK:-$(generate_affinity_mask "${DECODER_TP_SIZE}" "${PREFILLER_TP_SIZE}")}
# execution env
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P)"
@@ -69,8 +70,11 @@ wait_for_server() {
}
launch_baseline() {
local BASELINE_GPU_ID
BASELINE_GPU_ID=$(compute_gpu_id 0 1)
BASELINE_BASE_CMD="
ZE_AFFINITY_MASK=0 \
ZE_AFFINITY_MASK=$BASELINE_GPU_ID \
VLLM_WORKER_MULTIPROC_METHOD=spawn \
VLLM_ENABLE_V1_MULTIPROCESSING=1 vllm serve $MODEL_NAME \
--host ${BASELINE_HOST} \
@@ -89,9 +93,14 @@ launch_baseline() {
}
launch_pd() {
local PREFILL_GPU_ID
PREFILL_GPU_ID=$(compute_gpu_id 0 "${PREFILLER_TP_SIZE}")
local DECODE_GPU_ID
DECODE_GPU_ID=$(compute_gpu_id "${PREFILLER_TP_SIZE}" "${DECODER_TP_SIZE}")
PREFILL_BASE_CMD="
ZE_AFFINITY_MASK=${PREFILLER_ZE_AFFINITY_MASK} \
VLLM_MULTIPROC_EXECUTE_MODEL_TIMEOUT_S=200 \
ZE_AFFINITY_MASK=$PREFILL_GPU_ID \
VLLM_EXECUTE_MODEL_TIMEOUT_SECONDS=200 \
VLLM_NIXL_SIDE_CHANNEL_HOST=${PREFILL_HOST} \
VLLM_NIXL_SIDE_CHANNEL_PORT=${PREFILL_NIXL_SIDE_PORT} \
VLLM_WORKER_MULTIPROC_METHOD=spawn \
@@ -109,8 +118,8 @@ launch_pd() {
DECODE_BASE_CMD="
ZE_AFFINITY_MASK=${DECODER_ZE_AFFINITY_MASK} \
VLLM_MULTIPROC_EXECUTE_MODEL_TIMEOUT_S=200 \
ZE_AFFINITY_MASK=$DECODE_GPU_ID \
VLLM_EXECUTE_MODEL_TIMEOUT_SECONDS=200 \
VLLM_WORKER_MULTIPROC_METHOD=spawn \
VLLM_ENABLE_V1_MULTIPROCESSING=1 vllm serve $MODEL_NAME \
--host ${DECODE_HOST} \