53 lines
2.0 KiB
Diff
53 lines
2.0 KiB
Diff
|
From 2db552584b292d8a0d030c5d0e3a0a5cdc8af7cc Mon Sep 17 00:00:00 2001
|
||
|
|
From: Tomas Glozar <tglozar@redhat.com>
|
||
|
|
Date: Fri, 30 Jun 2023 11:19:04 +0200
|
||
|
|
Subject: [PATCH] rteval: Exclude isolcpus from kcompile by default
|
||
|
|
|
||
|
|
Allows correct calculation of make job count that does not include
|
||
|
|
isolated CPUs, on which the loads won't be scheduled.
|
||
|
|
|
||
|
|
Signed-off-by: Tomas Glozar <tglozar@redhat.com>
|
||
|
|
Signed-off-by: John Kacur <jkacur@redhat.com>
|
||
|
|
---
|
||
|
|
rteval/modules/loads/kcompile.py | 8 ++++++--
|
||
|
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/rteval/modules/loads/kcompile.py b/rteval/modules/loads/kcompile.py
|
||
|
|
index 9244246..316791e 100644
|
||
|
|
--- a/rteval/modules/loads/kcompile.py
|
||
|
|
+++ b/rteval/modules/loads/kcompile.py
|
||
|
|
@@ -37,6 +37,7 @@ from rteval.systopology import CpuList, SysTopology
|
||
|
|
|
||
|
|
expand_cpulist = CpuList.expand_cpulist
|
||
|
|
compress_cpulist = CpuList.compress_cpulist
|
||
|
|
+nonisolated_cpulist = CpuList.nonisolated_cpulist
|
||
|
|
|
||
|
|
DEFAULT_KERNEL_PREFIX = "linux-6.1"
|
||
|
|
|
||
|
|
@@ -55,17 +56,20 @@ class KBuildJob:
|
||
|
|
if not os.path.isdir(self.objdir):
|
||
|
|
os.mkdir(self.objdir)
|
||
|
|
|
||
|
|
+ # Exclude isolated CPUs if cpulist not set
|
||
|
|
+ cpus_available = len(nonisolated_cpulist(self.node.cpus.cpulist))
|
||
|
|
+
|
||
|
|
if os.path.exists('/usr/bin/numactl') and not cpulist:
|
||
|
|
# Use numactl
|
||
|
|
self.binder = f'numactl --cpunodebind {int(self.node)}'
|
||
|
|
- self.jobs = self.calc_jobs_per_cpu() * len(self.node)
|
||
|
|
+ self.jobs = self.calc_jobs_per_cpu() * cpus_available
|
||
|
|
elif cpulist:
|
||
|
|
# Use taskset
|
||
|
|
self.jobs = self.calc_jobs_per_cpu() * len(cpulist)
|
||
|
|
self.binder = f'taskset -c {compress_cpulist(cpulist)}'
|
||
|
|
else:
|
||
|
|
# Without numactl calculate number of jobs from the node
|
||
|
|
- self.jobs = self.calc_jobs_per_cpu() * len(self.node)
|
||
|
|
+ self.jobs = self.calc_jobs_per_cpu() * cpus_available
|
||
|
|
|
||
|
|
self.runcmd = f"make O={self.objdir} -C {self.kdir} -j{self.jobs}"
|
||
|
|
self.cleancmd = f"make O={self.objdir} -C {self.kdir} clean allmodconfig"
|
||
|
|
--
|
||
|
|
2.41.0
|
||
|
|
|