[CPU][RISC-V] Auto-bind OMP threads and harden nobind path (#40569)
Signed-off-by: liuyudong <liuyudong@iscas.ac.cn>
This commit is contained in:
@@ -40,12 +40,13 @@ class OMPProcessManager:
|
||||
|
||||
assert not (self.use_iomp and self.use_gomp)
|
||||
|
||||
# at least reserve 1/local_world_size(for ARM) core for scheduler
|
||||
# at least reserve 1/local_world_size(for ARM/RISC-V) core for scheduler
|
||||
# proc as always use MP executor
|
||||
# TODO: make scheduler proc sleep when idle
|
||||
self.reserve_cpu_num = (
|
||||
self.local_world_size
|
||||
if current_platform.get_cpu_architecture() == CpuArchEnum.ARM
|
||||
if current_platform.get_cpu_architecture()
|
||||
in (CpuArchEnum.ARM, CpuArchEnum.RISCV)
|
||||
else 1
|
||||
)
|
||||
# reserve at one more core for nixl_connector under p/d case
|
||||
@@ -140,8 +141,8 @@ class OMPProcessManager:
|
||||
cpu_list, reserve_list = self._get_autobind_cpu_ids(
|
||||
lambda cpus: cpus[-1:]
|
||||
)
|
||||
elif cpu_arch == CpuArchEnum.ARM:
|
||||
# For AArch64, no SMT, use all logical CPU
|
||||
elif cpu_arch in (CpuArchEnum.ARM, CpuArchEnum.RISCV):
|
||||
# For AArch64 / RISC-V, no SMT, use all logical CPUs
|
||||
cpu_list, reserve_list = self._get_autobind_cpu_ids(lambda cpus: cpus)
|
||||
else:
|
||||
cpu_list, reserve_list = [], []
|
||||
@@ -173,9 +174,15 @@ class OMPProcessManager:
|
||||
# skip
|
||||
self.cpu_lists = []
|
||||
|
||||
msg = "OpenMP thread binding info: \n"
|
||||
for i in range(self.local_world_size):
|
||||
msg += f"\tlocal_rank={i}, core ids={self.cpu_lists[i]}\n"
|
||||
msg = (
|
||||
"OpenMP thread binding info: \n"
|
||||
f"\tVLLM_CPU_OMP_THREADS_BIND={vllm_mask!r}, "
|
||||
f"auto_setup={self.auto_setup}, skip_setup={self.skip_setup}\n"
|
||||
f"\tlocal_world_size={self.local_world_size}, "
|
||||
f"reserve_cpu_num={self.reserve_cpu_num}\n"
|
||||
)
|
||||
for i, cpus in enumerate(self.cpu_lists):
|
||||
msg += f"\tlocal_rank={i}, core ids={cpus}\n"
|
||||
msg += f"\treserved_cpus={self.reserved_cpu_list}"
|
||||
logger.info(msg)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user