rteval: Add relative cpusets
v2 cover rteval: Add relative cpusets
From: Tomas Glozar <[email protected]>
Note: this contains only original patch 3 and 4; 1 and 2 have already been applied.
v2: Implemented feedback for two remaining patches, namely keeping the assignment of short names of functions from cpulist_utils in rteval-cmd and other places. The original patch changed this to always use the full cpulist_utils.<name> syntax, which had some formatting issues with lines being too long and also made the patch some tens of lines larger.
Tomas Glozar (2):
rteval: Convert CpuList class to a module
rteval: Add relative cpulists for measurements
rteval-cmd | 34 ++-- rteval/cpulist_utils.py | 161 ++++++++++++++++++ rteval/modules/loads/__init__.py | 8 +- rteval/modules/loads/hackbench.py | 9 +- rteval/modules/loads/kcompile.py | 11 +- rteval/modules/loads/stressng.py | 8 +- rteval/modules/measurement/__init__.py | 11 +- rteval/modules/measurement/cyclictest.py | 53 +----- rteval/systopology.py | 198 ++++++----------------- 9 files changed, 259 insertions(+), 234 deletions(-) create mode 100644 rteval/cpulist_utils.py
Signature · 1 line
2.43.0
PATCH v2 1/2 rteval: Convert CpuList class to a module
From: Tomas Glozar <[email protected]>
Move out code from CpuList class in rteval.systopology into a separate module named rteval.cpulist_utils and avoid wrapping CPU lists in a CpuList object.
Almost all uses of CpuList in the code either use the static methods of the class or its constructor to filter online CPUs by running CpuList(...).cpulist. The only exception to this are NumaNode and SimNumaNode classes in systopology; these store a CpuList object, however their .getcpulist() method extracts the list out. Thus, the class is completely unnecessary.
Note: A better name for the module would be cpulist, consistent with the original name of the class, but this name is already used for variables throughout the code, hence cpulist_utils is used instead.
--- rteval-cmd | 10 +- rteval/cpulist_utils.py | 128 ++++++++++++++++++ rteval/modules/loads/__init__.py | 8 +- rteval/modules/loads/hackbench.py | 9 +- rteval/modules/loads/kcompile.py | 11 +- rteval/modules/loads/stressng.py | 8 +- rteval/modules/measurement/__init__.py | 8 +- rteval/modules/measurement/cyclictest.py | 11 +- rteval/systopology.py | 165 ++--------------------- 9 files changed, 177 insertions(+), 181 deletions(-) create mode 100644 rteval/cpulist_utils.py
rteval-cmd +6 -4
@@ -30,11 +30,13 @@ from rteval import RtEval, rtevalConfig from rteval.modules.loads import LoadModules from rteval.modules.measurement import MeasurementModules from rteval.version import RTEVAL_VERSION -from rteval.systopology import CpuList, SysTopology +from rteval.systopology import SysTopology from rteval.modules.loads.kcompile import ModuleParameters +import rteval.cpulist_utils as cpulist_utils -compress_cpulist = CpuList.compress_cpulist -expand_cpulist = CpuList.expand_cpulist +compress_cpulist = cpulist_utils.compress_cpulist +expand_cpulist = cpulist_utils.expand_cpulist +collapse_cpulist = cpulist_utils.collapse_cpulist def summarize(repfile, xslt): """ Summarize an already existing XML report """
@@ -211,7 +213,7 @@ def remove_offline(cpulist): """ return cpulist in collapsed compressed form with only online cpus """ tmplist = expand_cpulist(cpulist) tmplist = SysTopology().online_cpulist(tmplist) - return CpuList.collapse_cpulist(tmplist) + return collapse_cpulist(tmplist) if __name__ == '__main__':
rteval/cpulist_utils.py new file +128 -0
128 lines not on this page · raw message
rteval/modules/loads/__init__.py +5 -3
@@ -11,7 +11,8 @@ import libxml2 from rteval.Log import Log from rteval.rtevalConfig import rtevalCfgSection from rteval.modules import RtEvalModules, rtevalModulePrototype -from rteval.systopology import CpuList, SysTopology as SysTop +from rteval.systopology import SysTopology as SysTop +import rteval.cpulist_utils as cpulist_utils class LoadThread(rtevalModulePrototype): def __init__(self, name, config, logger=None):
@@ -117,10 +118,11 @@ class LoadModules(RtEvalModules): cpulist = self._cfg.GetSection(self._module_config).cpulist if cpulist: # Convert str to list and remove offline cpus - cpulist = CpuList(cpulist).cpulist + cpulist = cpulist_utils.expand_cpulist(cpulist) + cpulist = cpulist_utils.online_cpulist(cpulist) else: cpulist = SysTop().default_cpus() - rep_n.newProp("loadcpus", CpuList.collapse_cpulist(cpulist)) + rep_n.newProp("loadcpus", cpulist_utils.collapse_cpulist(cpulist)) return rep_n
rteval/modules/loads/hackbench.py +5 -4
@@ -16,10 +16,11 @@ import errno from signal import SIGKILL from rteval.modules.loads import CommandLineLoad from rteval.Log import Log -from rteval.systopology import CpuList, SysTopology +from rteval.systopology import SysTopology +import rteval.cpulist_utils as cpulist_utils -expand_cpulist = CpuList.expand_cpulist -isolated_cpulist = CpuList.isolated_cpulist +expand_cpulist = cpulist_utils.expand_cpulist +isolated_cpulist = cpulist_utils.isolated_cpulist class Hackbench(CommandLineLoad): def __init__(self, config, logger):
@@ -61,7 +62,7 @@ class Hackbench(CommandLineLoad): self.cpus[n] = [c for c in self.cpus[n] if c in expand_cpulist(self.cpulist)] # if a cpulist was not specified, exclude isolated cpus else: - self.cpus[n] = CpuList.nonisolated_cpulist(self.cpus[n]) + self.cpus[n] = cpulist_utils.nonisolated_cpulist(self.cpus[n]) # track largest number of cpus used on a node node_biggest = len(self.cpus[n])
rteval/modules/loads/kcompile.py +6 -5
@@ -14,11 +14,12 @@ import subprocess from rteval.modules import rtevalRuntimeError from rteval.modules.loads import CommandLineLoad from rteval.Log import Log -from rteval.systopology import CpuList, SysTopology +from rteval.systopology import SysTopology +import rteval.cpulist_utils as cpulist_utils -expand_cpulist = CpuList.expand_cpulist -compress_cpulist = CpuList.compress_cpulist -nonisolated_cpulist = CpuList.nonisolated_cpulist +expand_cpulist = cpulist_utils.expand_cpulist +compress_cpulist = cpulist_utils.compress_cpulist +nonisolated_cpulist = cpulist_utils.nonisolated_cpulist DEFAULT_KERNEL_PREFIX = "linux-6.6"
@@ -38,7 +39,7 @@ class KBuildJob: os.mkdir(self.objdir) # Exclude isolated CPUs if cpulist not set - cpus_available = len(nonisolated_cpulist(self.node.cpus.cpulist)) + cpus_available = len(nonisolated_cpulist(self.node.cpus)) if os.path.exists('/usr/bin/numactl') and not cpulist: # Use numactl
rteval/modules/loads/stressng.py +4 -4
@@ -7,10 +7,10 @@ import subprocess import signal from rteval.modules.loads import CommandLineLoad from rteval.Log import Log -from rteval.systopology import CpuList, SysTopology +from rteval.systopology import SysTopology +import rteval.cpulist_utils as cpulist_utils -expand_cpulist = CpuList.expand_cpulist -nonisolated_cpulist = CpuList.nonisolated_cpulist +expand_cpulist = cpulist_utils.expand_cpulist class Stressng(CommandLineLoad): " This class creates a load module that runs stress-ng "
@@ -73,7 +73,7 @@ class Stressng(CommandLineLoad): cpus[n] = [c for c in cpus[n] if c in expand_cpulist(self.cpulist)] # if a cpulist was not specified, exclude isolated cpus else: - cpus[n] = CpuList.nonisolated_cpulist(cpus[n]) + cpus[n] = cpulist_utils.nonisolated_cpulist(cpus[n]) # remove nodes with no cpus available for running
rteval/modules/measurement/__init__.py +5 -3
@@ -5,7 +5,8 @@ import libxml2 from rteval.modules import RtEvalModules, ModuleContainer -from rteval.systopology import CpuList, SysTopology as SysTop +from rteval.systopology import SysTopology as SysTop +import rteval.cpulist_utils as cpulist_utils class MeasurementProfile(RtEvalModules): """Keeps and controls all the measurement modules with the same measurement profile"""
@@ -184,10 +185,11 @@ measurement profiles, based on their characteristics""" run_on_isolcpus = self.__cfg.GetSection("measurement").run_on_isolcpus if cpulist: # Convert str to list and remove offline cpus - cpulist = CpuList(cpulist).cpulist + cpulist = cpulist_utils.expand_cpulist(cpulist) + cpulist = cpulist_utils.online_cpulist(cpulist) else: cpulist = SysTop().online_cpus() if run_on_isolcpus else SysTop().default_cpus() - rep_n.newProp("measurecpus", CpuList.collapse_cpulist(cpulist)) + rep_n.newProp("measurecpus", cpulist_utils.collapse_cpulist(cpulist)) for mp in self.__measureprofiles: mprep_n = mp.MakeReport()
rteval/modules/measurement/cyclictest.py +6 -5
@@ -17,9 +17,10 @@ import libxml2 from rteval.Log import Log from rteval.modules import rtevalModulePrototype from rteval.systopology import cpuinfo -from rteval.systopology import CpuList, SysTopology +from rteval.systopology import SysTopology +import rteval.cpulist_utils as cpulist_utils -expand_cpulist = CpuList.expand_cpulist +expand_cpulist = cpulist_utils.expand_cpulist class RunData: '''class to keep instance data from a cyclictest run'''
@@ -201,9 +202,9 @@ class Cyclictest(rtevalModulePrototype): self.__cpulist = self.__cfg.cpulist self.__cpus = expand_cpulist(self.__cpulist) # Only include online cpus - self.__cpus = CpuList(self.__cpus).cpulist + self.__cpus = cpulist_utils.online_cpulist(self.__cpus) # Reset cpulist from the newly calculated self.__cpus - self.__cpulist = CpuList.collapse_cpulist(self.__cpus) + self.__cpulist = cpulist_utils.collapse_cpulist(self.__cpus) self.__cpus = [str(c) for c in self.__cpus] self.__sparse = True if self.__run_on_isolcpus:
@@ -220,7 +221,7 @@ class Cyclictest(rtevalModulePrototype): self.__cpus = [c for c in self.__cpus if c in cpuset or self.__run_on_isolcpus and c in isolcpus] if self.__run_on_isolcpus: self.__sparse = True - self.__cpulist = CpuList.collapse_cpulist([int(c) for c in self.__cpus]) + self.__cpulist = cpulist_utils.collapse_cpulist([int(c) for c in self.__cpus]) # Sort the list of cpus to align with the order reported by cyclictest self.__cpus.sort(key=int)
rteval/systopology.py +12 -153
222 lines not on this page · raw message
Signature · 1 line
2.43.0
Re: [PATCH v2 1/2] rteval: Convert CpuList class to a module
Quoted 602 lines · On Thu, 18 Jan 2024, [email protected] wrote:
From: Tomas Glozar <[email protected]>
Move out code from CpuList class in rteval.systopology into a separate module named rteval.cpulist_utils and avoid wrapping CPU lists in a CpuList object.
Almost all uses of CpuList in the code either use the static methods of the class or its constructor to filter online CPUs by running CpuList(...).cpulist. The only exception to this are NumaNode and SimNumaNode classes in systopology; these store a CpuList object, however their .getcpulist() method extracts the list out. Thus, the class is completely unnecessary.
Note: A better name for the module would be cpulist, consistent with the original name of the class, but this name is already used for variables throughout the code, hence
cpulist_utilsis used instead.Signed-off-by Tomas Glozar <[email protected]>--- rteval-cmd | 10 +- rteval/cpulist_utils.py | 128 ++++++++++++++++++ rteval/modules/loads/__init__.py | 8 +- rteval/modules/loads/hackbench.py | 9 +- rteval/modules/loads/kcompile.py | 11 +- rteval/modules/loads/stressng.py | 8 +- rteval/modules/measurement/__init__.py | 8 +- rteval/modules/measurement/cyclictest.py | 11 +- rteval/systopology.py | 165 ++--------------------- 9 files changed, 177 insertions(+), 181 deletions(-) create mode 100644 rteval/cpulist_utils.pyrteval-cmd +6
-4@@ -30,11 +30,13 @@ from rteval import RtEval, rtevalConfig from rteval.modules.loads import LoadModules from rteval.modules.measurement import MeasurementModules from rteval.version import RTEVAL_VERSION -from rteval.systopology import CpuList, SysTopology +from rteval.systopology import SysTopology from rteval.modules.loads.kcompile import ModuleParameters +import rteval.cpulist_utils as cpulist_utils -compress_cpulist = CpuList.compress_cpulist -expand_cpulist = CpuList.expand_cpulist +compress_cpulist = cpulist_utils.compress_cpulist +expand_cpulist = cpulist_utils.expand_cpulist +collapse_cpulist = cpulist_utils.collapse_cpulist def summarize(repfile, xslt): """ Summarize an already existing XML report """@@ -211,7 +213,7 @@ def remove_offline(cpulist): """ return cpulist in collapsed compressed form with only online cpus """ tmplist = expand_cpulist(cpulist) tmplist = SysTopology().online_cpulist(tmplist) - return CpuList.collapse_cpulist(tmplist) + return collapse_cpulist(tmplist) if __name__ == '__main__':rteval/cpulist_utils.py new file +128
-0@@ -0,0 +1,128 @@ +# -*- coding: utf-8 -*- +# SPDX-License-Identifier: GPL-2.0-or-later +# +# Copyright 2016 - Clark Williams <[email protected]> +# Copyright 2021 - John Kacur <[email protected]> +# Copyright 2023 - Tomas Glozar <[email protected]> +# +"""Module providing utility functions for working with CPU lists""" + +import os + + +cpupath = "/sys/devices/system/cpu" + + +def sysread(path, obj): + """ Helper function for reading system files """ + with open(os.path.join(path, obj), "r") as fp: + return fp.readline().strip() + + +def _online_file_exists(): + """ Check whether machine / kernel is configured with online file """ + # Note: some machines do not have cpu0/online so we check cpu1/online. + # In the case of machines with a single CPU, there is no cpu1, but + # that is not a problem, since a single CPU cannot be offline + return os.path.exists(os.path.join(cpupath, "cpu1/online")) + + +def _isolated_file_exists(): + """ Check whether machine / kernel is configured with isolated file """ + return os.path.exists(os.path.join(cpupath, "isolated")) + + +def collapse_cpulist(cpulist): + """ + Collapse a list of cpu numbers into a string range + of cpus (e.g. 0-5, 7, 9) + """ + cur_range = [None, None] + result = [] + for cpu in cpulist + [None]: + if cur_range[0] is None: + cur_range[0] = cur_range[1] = cpu + continue + if cpu is not None and cpu == cur_range[1] + 1: + # Extend currently processed range + cur_range[1] += 1 + else: + # Range processing finished, add range to string + result.append(f"{cur_range[0]}-{cur_range[1]}" + if cur_range[0] != cur_range[1] + else str(cur_range[0])) + # Reset + cur_range[0] = cur_range[1] = cpu + return ",".join(result) + + +def compress_cpulist(cpulist): + """ return a string representation of cpulist """ + if not cpulist: + return "" + if isinstance(cpulist[0], int): + return ",".join(str(e) for e in cpulist) + return ",".join(cpulist) + + +def expand_cpulist(cpulist): + """ expand a range string into an array of cpu numbers + don't error check against online cpus + """ + result = [] + + if not cpulist: + return result + + for part in cpulist.split(','): + if '-' in part: + a, b = part.split('-') + a, b = int(a), int(b) + result.extend(list(range(a, b + 1))) + else: + a = int(part) + result.append(a) + return [int(i) for i in list(set(result))] + + +def is_online(n): + """ check whether cpu n is online """ + path = os.path.join(cpupath, f'cpu{n}') + + # Some hardware doesn't allow cpu0 to be turned off + if not os.path.exists(path + '/online') and n == 0: + return True + + return sysread(path, "online") == "1" + + +def online_cpulist(cpulist): + """ Given a cpulist, return a cpulist of online cpus """ + # This only works if the sys online files exist + if not _online_file_exists(): + return cpulist + newlist = [] + for cpu in cpulist: + if not _online_file_exists() and cpu == '0': + newlist.append(cpu) + elif is_online(int(cpu)): + newlist.append(cpu) + return newlist + + +def isolated_cpulist(cpulist): + """Given a cpulist, return a cpulist of isolated CPUs""" + if not _isolated_file_exists(): + return cpulist + isolated_cpulist = sysread(cpupath, "isolated") + isolated_cpulist = expand_cpulist(isolated_cpulist) + return list(set(isolated_cpulist) & set(cpulist)) + + +def nonisolated_cpulist(cpulist): + """Given a cpulist, return a cpulist of non-isolated CPUs""" + if not _isolated_file_exists(): + return cpulist + isolated_cpulist = sysread(cpupath, "isolated") + isolated_cpulist = expand_cpulist(isolated_cpulist) + return list(set(cpulist).difference(set(isolated_cpulist)))rteval/modules/loads/__init__.py +5
-3@@ -11,7 +11,8 @@ import libxml2 from rteval.Log import Log from rteval.rtevalConfig import rtevalCfgSection from rteval.modules import RtEvalModules, rtevalModulePrototype -from rteval.systopology import CpuList, SysTopology as SysTop +from rteval.systopology import SysTopology as SysTop +import rteval.cpulist_utils as cpulist_utils class LoadThread(rtevalModulePrototype): def __init__(self, name, config, logger=None):@@ -117,10 +118,11 @@ class LoadModules(RtEvalModules): cpulist = self._cfg.GetSection(self._module_config).cpulist if cpulist: # Convert str to list and remove offline cpus - cpulist = CpuList(cpulist).cpulist + cpulist = cpulist_utils.expand_cpulist(cpulist) + cpulist = cpulist_utils.online_cpulist(cpulist) else: cpulist = SysTop().default_cpus() - rep_n.newProp("loadcpus", CpuList.collapse_cpulist(cpulist)) + rep_n.newProp("loadcpus", cpulist_utils.collapse_cpulist(cpulist)) return rep_nrteval/modules/loads/hackbench.py +5
-4@@ -16,10 +16,11 @@ import errno from signal import SIGKILL from rteval.modules.loads import CommandLineLoad from rteval.Log import Log -from rteval.systopology import CpuList, SysTopology +from rteval.systopology import SysTopology +import rteval.cpulist_utils as cpulist_utils -expand_cpulist = CpuList.expand_cpulist -isolated_cpulist = CpuList.isolated_cpulist +expand_cpulist = cpulist_utils.expand_cpulist +isolated_cpulist = cpulist_utils.isolated_cpulist class Hackbench(CommandLineLoad): def __init__(self, config, logger):@@ -61,7 +62,7 @@ class Hackbench(CommandLineLoad): self.cpus[n] = [c for c in self.cpus[n] if c in expand_cpulist(self.cpulist)] # if a cpulist was not specified, exclude isolated cpus else: - self.cpus[n] = CpuList.nonisolated_cpulist(self.cpus[n]) + self.cpus[n] = cpulist_utils.nonisolated_cpulist(self.cpus[n]) # track largest number of cpus used on a node node_biggest = len(self.cpus[n])rteval/modules/loads/kcompile.py +6
-5@@ -14,11 +14,12 @@ import subprocess from rteval.modules import rtevalRuntimeError from rteval.modules.loads import CommandLineLoad from rteval.Log import Log -from rteval.systopology import CpuList, SysTopology +from rteval.systopology import SysTopology +import rteval.cpulist_utils as cpulist_utils -expand_cpulist = CpuList.expand_cpulist -compress_cpulist = CpuList.compress_cpulist -nonisolated_cpulist = CpuList.nonisolated_cpulist +expand_cpulist = cpulist_utils.expand_cpulist +compress_cpulist = cpulist_utils.compress_cpulist +nonisolated_cpulist = cpulist_utils.nonisolated_cpulist DEFAULT_KERNEL_PREFIX = "linux-6.6"@@ -38,7 +39,7 @@ class KBuildJob: os.mkdir(self.objdir) # Exclude isolated CPUs if cpulist not set - cpus_available = len(nonisolated_cpulist(self.node.cpus.cpulist)) + cpus_available = len(nonisolated_cpulist(self.node.cpus)) if os.path.exists('/usr/bin/numactl') and not cpulist: # Use numactlrteval/modules/loads/stressng.py +4
-4@@ -7,10 +7,10 @@ import subprocess import signal from rteval.modules.loads import CommandLineLoad from rteval.Log import Log -from rteval.systopology import CpuList, SysTopology +from rteval.systopology import SysTopology +import rteval.cpulist_utils as cpulist_utils -expand_cpulist = CpuList.expand_cpulist -nonisolated_cpulist = CpuList.nonisolated_cpulist +expand_cpulist = cpulist_utils.expand_cpulist class Stressng(CommandLineLoad): " This class creates a load module that runs stress-ng "@@ -73,7 +73,7 @@ class Stressng(CommandLineLoad): cpus[n] = [c for c in cpus[n] if c in expand_cpulist(self.cpulist)] # if a cpulist was not specified, exclude isolated cpus else: - cpus[n] = CpuList.nonisolated_cpulist(cpus[n]) + cpus[n] = cpulist_utils.nonisolated_cpulist(cpus[n]) # remove nodes with no cpus available for runningrteval/modules/measurement/__init__.py +5
-3@@ -5,7 +5,8 @@ import libxml2 from rteval.modules import RtEvalModules, ModuleContainer -from rteval.systopology import CpuList, SysTopology as SysTop +from rteval.systopology import SysTopology as SysTop +import rteval.cpulist_utils as cpulist_utils class MeasurementProfile(RtEvalModules): """Keeps and controls all the measurement modules with the same measurement profile"""@@ -184,10 +185,11 @@ measurement profiles, based on their characteristics""" run_on_isolcpus = self.__cfg.GetSection("measurement").run_on_isolcpus if cpulist: # Convert str to list and remove offline cpus - cpulist = CpuList(cpulist).cpulist + cpulist = cpulist_utils.expand_cpulist(cpulist) + cpulist = cpulist_utils.online_cpulist(cpulist) else: cpulist = SysTop().online_cpus() if run_on_isolcpus else SysTop().default_cpus() - rep_n.newProp("measurecpus", CpuList.collapse_cpulist(cpulist)) + rep_n.newProp("measurecpus", cpulist_utils.collapse_cpulist(cpulist)) for mp in self.__measureprofiles: mprep_n = mp.MakeReport()rteval/modules/measurement/cyclictest.py +6
-5@@ -17,9 +17,10 @@ import libxml2 from rteval.Log import Log from rteval.modules import rtevalModulePrototype from rteval.systopology import cpuinfo -from rteval.systopology import CpuList, SysTopology +from rteval.systopology import SysTopology +import rteval.cpulist_utils as cpulist_utils -expand_cpulist = CpuList.expand_cpulist +expand_cpulist = cpulist_utils.expand_cpulist class RunData: '''class to keep instance data from a cyclictest run'''@@ -201,9 +202,9 @@ class Cyclictest(rtevalModulePrototype): self.__cpulist = self.__cfg.cpulist self.__cpus = expand_cpulist(self.__cpulist) # Only include online cpus - self.__cpus = CpuList(self.__cpus).cpulist + self.__cpus = cpulist_utils.online_cpulist(self.__cpus) # Reset cpulist from the newly calculated self.__cpus - self.__cpulist = CpuList.collapse_cpulist(self.__cpus) + self.__cpulist = cpulist_utils.collapse_cpulist(self.__cpus) self.__cpus = [str(c) for c in self.__cpus] self.__sparse = True if self.__run_on_isolcpus:@@ -220,7 +221,7 @@ class Cyclictest(rtevalModulePrototype): self.__cpus = [c for c in self.__cpus if c in cpuset or self.__run_on_isolcpus and c in isolcpus] if self.__run_on_isolcpus: self.__sparse = True - self.__cpulist = CpuList.collapse_cpulist([int(c) for c in self.__cpus]) + self.__cpulist = cpulist_utils.collapse_cpulist([int(c) for c in self.__cpus]) # Sort the list of cpus to align with the order reported by cyclictest self.__cpus.sort(key=int)rteval/systopology.py +11
-152@@ -9,12 +9,8 @@ import os import os.path import glob - - -def sysread(path, obj): - """ Helper function for reading system files """ - with open(os.path.join(path, obj), "r") as fp: - return fp.readline().strip() +import rteval.cpulist_utils as cpulist_utils +from rteval.cpulist_utils import sysread def cpuinfo(): ''' return a dictionary of cpu keys with various cpu information '''@@ -56,145 +52,6 @@ def cpuinfo(): return info -# -# class to provide access to a list of cpus -# - -class CpuList: - "Object that represents a group of system cpus" - - cpupath = '/sys/devices/system/cpu' - - def __init__(self, cpulist): - if isinstance(cpulist, list): - self.cpulist = cpulist - elif isinstance(cpulist, str): - self.cpulist = self.expand_cpulist(cpulist) - self.cpulist = self.online_cpulist(self.cpulist) - self.cpulist.sort() - - def __str__(self): - return self.collapse_cpulist(self.cpulist) - - def __contains__(self, cpu): - return cpu in self.cpulist - - def __len__(self): - return len(self.cpulist) - - def getcpulist(self): - """ return the list of cpus tracked """ - return self.cpulist - - @staticmethod - def online_file_exists(): - """ Check whether machine / kernel is configured with online file """ - # Note: some machines do not have cpu0/online so we check cpu1/online. - # In the case of machines with a single CPU, there is no cpu1, but - # that is not a problem, since a single CPU cannot be offline - return os.path.exists(os.path.join(CpuList.cpupath, "cpu1/online")) - - @staticmethod - def isolated_file_exists(): - """ Check whether machine / kernel is configured with isolated file """ - return os.path.exists(os.path.join(CpuList.cpupath, "isolated")) - - @staticmethod - def collapse_cpulist(cpulist): - """ - Collapse a list of cpu numbers into a string range - of cpus (e.g. 0-5, 7, 9) - """ - cur_range = [None, None] - result = [] - for cpu in cpulist + [None]: - if cur_range[0] is None: - cur_range[0] = cur_range[1] = cpu - continue - if cpu is not None and cpu == cur_range[1] + 1: - # Extend currently processed range - cur_range[1] += 1 - else: - # Range processing finished, add range to string - result.append(f"{cur_range[0]}-{cur_range[1]}" - if cur_range[0] != cur_range[1] - else str(cur_range[0])) - # Reset - cur_range[0] = cur_range[1] = cpu - return ",".join(result) - - @staticmethod - def compress_cpulist(cpulist): - """ return a string representation of cpulist """ - if not cpulist: - return "" - if isinstance(cpulist[0], int): - return ",".join(str(e) for e in cpulist) - return ",".join(cpulist) - - @staticmethod - def expand_cpulist(cpulist): - """ expand a range string into an array of cpu numbers - don't error check against online cpus - """ - result = [] - - if not cpulist: - return result - - for part in cpulist.split(','): - if '-' in part: - a, b = part.split('-') - a, b = int(a), int(b) - result.extend(list(range(a, b + 1))) - else: - a = int(part) - result.append(a) - return [int(i) for i in list(set(result))] - - @staticmethod - def is_online(n): - """ check whether cpu n is online """ - path = os.path.join(CpuList.cpupath, f'cpu{n}') - - # Some hardware doesn't allow cpu0 to be turned off - if not os.path.exists(path + '/online') and n == 0: - return True - - return sysread(path, "online") == "1" - - @staticmethod - def online_cpulist(cpulist): - """ Given a cpulist, return a cpulist of online cpus """ - # This only works if the sys online files exist - if not CpuList.online_file_exists(): - return cpulist - newlist = [] - for cpu in cpulist: - if not CpuList.online_file_exists() and cpu == '0': - newlist.append(cpu) - elif CpuList.is_online(int(cpu)): - newlist.append(cpu) - return newlist - - @staticmethod - def isolated_cpulist(cpulist): - """Given a cpulist, return a cpulist of isolated CPUs""" - if not CpuList.isolated_file_exists(): - return cpulist - isolated_cpulist = sysread(CpuList.cpupath, "isolated") - isolated_cpulist = CpuList.expand_cpulist(isolated_cpulist) - return list(set(isolated_cpulist) & set(cpulist)) - - @staticmethod - def nonisolated_cpulist(cpulist): - """Given a cpulist, return a cpulist of non-isolated CPUs""" - if not CpuList.isolated_file_exists(): - return cpulist - isolated_cpulist = sysread(CpuList.cpupath, "isolated") - isolated_cpulist = CpuList.expand_cpulist(isolated_cpulist) - return list(set(cpulist).difference(set(isolated_cpulist))) - # # class to abstract access to NUMA nodes in /sys filesystem #@@ -208,7 +65,8 @@ class NumaNode: """ self.path = path self.nodeid = int(os.path.basename(path)[4:].strip()) - self.cpus = CpuList(sysread(self.path, "cpulist")) + self.cpus = cpulist_utils.expand_cpulist(sysread(self.path, "cpulist")) + self.cpus = cpulist_utils.online_cpulist(self.cpus) self.getmeminfo() def __contains__(self, cpu):@@ -240,11 +98,11 @@ class NumaNode: def getcpustr(self): """ return list of cpus for this node as a string """ - return str(self.cpus) + return cpulist_utils.collapse_cpulist(self.cpus) def getcpulist(self): """ return list of cpus for this node """ - return self.cpus.getcpulist() + return self.cpus class SimNumaNode(NumaNode): """class representing a simulated NUMA node.@@ -257,7 +115,8 @@ class SimNumaNode(NumaNode): def __init__(self): self.nodeid = 0 - self.cpus = CpuList(sysread(SimNumaNode.cpupath, "possible")) + self.cpus = cpulist_utils.expand_cpulist(sysread(SimNumaNode.cpupath, "possible")) + self.cpus = cpulist_utils.online_cpulist(self.cpus) self.getmeminfo() def getmeminfo(self):@@ -339,7 +198,7 @@ class SysTopology: """ return a list of integers of all online cpus """ cpulist = [] for n in self.nodes: - cpulist += self.getcpus(n) + cpulist += cpulist_utils.online_cpulist(self.getcpus(n)) cpulist.sort() return cpulist@@ -347,7 +206,7 @@ class SysTopology: """ return a list of integers of all isolated cpus """ cpulist = [] for n in self.nodes: - cpulist += CpuList.isolated_cpulist(self.getcpus(n)) + cpulist += cpulist_utils.isolated_cpulist(self.getcpus(n)) cpulist.sort() return cpulist@@ -355,7 +214,7 @@ class SysTopology: """ return a list of integers of all default schedulable cpus, i.e. online non-isolated cpus """ cpulist = [] for n in self.nodes: - cpulist += CpuList.nonisolated_cpulist(self.getcpus(n)) + cpulist += cpulist_utils.nonisolated_cpulist(self.getcpus(n)) cpulist.sort() return cpulist
rteval/systopology.py if __name__ == "__main__": · line 268
Quoted 8 lines
rteval/systopology.py +1
-1@@ -403,7 +262,7 @@ if __name__ == "__main__": onlcpus = s.online_cpus() print(f'onlcpus = {onlcpus}') - onlcpus = CpuList.collapse_cpulist(onlcpus) + onlcpus = cpulist_utils.collapse_cpulist(onlcpus) print(f'onlcpus = {onlcpus}') onlcpus_str = s.online_cpus_str()
PATCH v2 2/2 rteval: Add relative cpulists for measurements
In reply to [email protected]From: Tomas Glozar <[email protected]>
Instead of specifying an absolute list of CPUs to run measurements on in --measurement-cpulist, implement an option to specify a relative list with respect to the current cpuset of rteval.
The relative cpulist can include CPUs both for addition and for removal, e.g. +0,1,-7,8.
Also move the logic for processing cpulists specified by the user as a string into cpulists usable by rteval to a single function.
--- rteval-cmd | 26 +++++++----- rteval/cpulist_utils.py | 33 ++++++++++++++++ rteval/modules/measurement/__init__.py | 9 +---- rteval/modules/measurement/cyclictest.py | 50 +++--------------------- rteval/systopology.py | 33 ++++++++++++++++ 5 files changed, 90 insertions(+), 61 deletions(-)
rteval-cmd +16 -10
@@ -30,7 +30,7 @@ from rteval import RtEval, rtevalConfig from rteval.modules.loads import LoadModules from rteval.modules.measurement import MeasurementModules from rteval.version import RTEVAL_VERSION -from rteval.systopology import SysTopology +from rteval.systopology import SysTopology, parse_cpulist_from_config from rteval.modules.loads.kcompile import ModuleParameters import rteval.cpulist_utils as cpulist_utils
@@ -339,26 +339,32 @@ if __name__ == '__main__': ldcfg = config.GetSection('loads') msrcfg = config.GetSection('measurement') - if ldcfg.cpulist and msrcfg.cpulist: + msrcfg_cpulist_present = msrcfg.cpulist != "" + # Parse measurement cpulist using parse_cpulist_from_config to account for run-on-isolcpus + # and relative cpusets + cpulist = parse_cpulist_from_config(msrcfg.cpulist, msrcfg.run_on_isolcpus) + if msrcfg_cpulist_present and not cpulist_utils.is_relative(msrcfg.cpulist) and msrcfg.run_on_isolcpus: + logger.log(Log.WARN, "ignoring --measurement-run-on-isolcpus, since cpulist is specified") + msrcfg.cpulist = collapse_cpulist(cpulist) + if ldcfg.cpulist: ldcfg.cpulist = remove_offline(ldcfg.cpulist) - msrcfg.cpulist = remove_offline(msrcfg.cpulist) # if we only specified one set of cpus (loads or measurement) # default the other to the inverse of the specified list - if not ldcfg.cpulist and msrcfg.cpulist: + if not ldcfg.cpulist and msrcfg_cpulist_present: tmplist = expand_cpulist(msrcfg.cpulist) tmplist = SysTopology().invert_cpulist(tmplist) - ldcfg.cpulist = compress_cpulist(tmplist) - msrcfg.cpulist = remove_offline(msrcfg.cpulist) - if not msrcfg.cpulist and ldcfg.cpulist: + tmplist = cpulist_utils.online_cpulist(tmplist) + ldcfg.cpulist = collapse_cpulist(tmplist) + if not msrcfg_cpulist_present and ldcfg.cpulist: tmplist = expand_cpulist(ldcfg.cpulist) tmplist = SysTopology().invert_cpulist(tmplist) - msrcfg.cpulist = compress_cpulist(tmplist) - ldcfg.cpulist = remove_offline(ldcfg.cpulist) + tmplist = cpulist_utils.online_cpulist(tmplist) + msrcfg.cpulist = collapse_cpulist(tmplist) if ldcfg.cpulist: logger.log(Log.DEBUG, f"loads cpulist: {ldcfg.cpulist}") # if --onlyload is specified msrcfg.cpulist is unused - if msrcfg.cpulist and not rtevcfg.onlyload: + if msrcfg_cpulist_present and not rtevcfg.onlyload: logger.log(Log.DEBUG, f"measurement cpulist: {msrcfg.cpulist}") logger.log(Log.DEBUG, f"workdir: {rtevcfg.workdir}")
rteval/cpulist_utils.py +33 -0
@@ -126,3 +126,36 @@ def nonisolated_cpulist(cpulist): isolated_cpulist = sysread(cpupath, "isolated") isolated_cpulist = expand_cpulist(isolated_cpulist) return list(set(cpulist).difference(set(isolated_cpulist))) + + +def is_relative(cpulist): + return cpulist.startswith("+") or cpulist.startswith("-") + + +def expand_relative_cpulist(cpulist): + """ + Expand a relative cpulist into a tuple of lists. + :param cpulist: Relative cpulist of form +1,2,3,-4,5,6 + :return: Tuple of two lists, one for added CPUs, one for removed CPUs + """ + added_cpus = [] + removed_cpus = [] + + if not cpulist: + return added_cpus, removed_cpus + + cpus = None + + for part in cpulist.split(','): + if part.startswith('+') or part.startswith('-'): + cpus = added_cpus if part[0] == '+' else removed_cpus + part = part[1:] + if '-' in part: + a, b = part.split('-') + a, b = int(a), int(b) + cpus.extend(list(range(a, b + 1))) + else: + a = int(part) + cpus.append(a) + + return list(set(added_cpus)), list(set(removed_cpus))
rteval/modules/measurement/__init__.py +2 -7
@@ -5,7 +5,7 @@ import libxml2 from rteval.modules import RtEvalModules, ModuleContainer -from rteval.systopology import SysTopology as SysTop +from rteval.systopology import parse_cpulist_from_config import rteval.cpulist_utils as cpulist_utils class MeasurementProfile(RtEvalModules):
@@ -183,12 +183,7 @@ measurement profiles, based on their characteristics""" rep_n = libxml2.newNode("Measurements") cpulist = self.__cfg.GetSection("measurement").cpulist run_on_isolcpus = self.__cfg.GetSection("measurement").run_on_isolcpus - if cpulist: - # Convert str to list and remove offline cpus - cpulist = cpulist_utils.expand_cpulist(cpulist) - cpulist = cpulist_utils.online_cpulist(cpulist) - else: - cpulist = SysTop().online_cpus() if run_on_isolcpus else SysTop().default_cpus() + cpulist = parse_cpulist_from_config(cpulist, run_on_isolcpus) rep_n.newProp("measurecpus", cpulist_utils.collapse_cpulist(cpulist)) for mp in self.__measureprofiles:
rteval/modules/measurement/cyclictest.py +6 -44
75 lines not on this page · raw message
rteval/systopology.py +33 -0
@@ -241,6 +241,39 @@ class SysTopology: """ return a list of online cpus in cpulist """ return [c for c in self.online_cpus() if c in cpulist] + +def parse_cpulist_from_config(cpulist, run_on_isolcpus=False): + """ + Generates a cpulist based on --*-cpulist argument given by user + :param cpulist: Value of --*-cpulist argument + :param run_on_isolcpus: Value of --*-run-on-isolcpus argument + :return: Sorted list of CPUs as integers + """ + if cpulist and not cpulist_utils.is_relative(cpulist): + result = cpulist_utils.expand_cpulist(cpulist) + # Only include online cpus + result = cpulist_utils.online_cpulist(result) + else: + result = SysTopology().online_cpus() + # Get the cpuset from the environment + cpuset = os.sched_getaffinity(0) + # Get isolated CPU list + isolcpus = SysTopology().isolated_cpus() + if cpulist and cpulist_utils.is_relative(cpulist): + # Include cpus that are not removed in relative cpuset and are either in cpuset from affinity, + # isolcpus (with run_on_isolcpus enabled, or added by relative cpuset + added_cpus, removed_cpus = cpulist_utils.expand_relative_cpulist(cpulist) + result = [c for c in result + if (c in cpuset or + c in added_cpus or + run_on_isolcpus and c in isolcpus) and + c not in removed_cpus] + else: + # Only include cpus that are in the cpuset and isolated CPUs if run_on_isolcpus is enabled + result = [c for c in result if c in cpuset or run_on_isolcpus and c in isolcpus] + return result + + if __name__ == "__main__": def unit_test():
Signature · 1 line
2.43.0
Re: [PATCH v2 2/2] rteval: Add relative cpulists for measurements
Quoted 262 lines · On Thu, 18 Jan 2024, [email protected] wrote:
From: Tomas Glozar <[email protected]>
Instead of specifying an absolute list of CPUs to run measurements on in --measurement-cpulist, implement an option to specify a relative list with respect to the current cpuset of rteval.
The relative cpulist can include CPUs both for addition and for removal, e.g. +0,1,-7,8.
Also move the logic for processing cpulists specified by the user as a string into cpulists usable by rteval to a single function.
Signed-off-by Tomas Glozar <[email protected]>--- rteval-cmd | 26 +++++++----- rteval/cpulist_utils.py | 33 ++++++++++++++++ rteval/modules/measurement/__init__.py | 9 +---- rteval/modules/measurement/cyclictest.py | 50 +++--------------------- rteval/systopology.py | 33 ++++++++++++++++ 5 files changed, 90 insertions(+), 61 deletions(-)rteval-cmd +16
-10@@ -30,7 +30,7 @@ from rteval import RtEval, rtevalConfig from rteval.modules.loads import LoadModules from rteval.modules.measurement import MeasurementModules from rteval.version import RTEVAL_VERSION -from rteval.systopology import SysTopology +from rteval.systopology import SysTopology, parse_cpulist_from_config from rteval.modules.loads.kcompile import ModuleParameters import rteval.cpulist_utils as cpulist_utils@@ -339,26 +339,32 @@ if __name__ == '__main__': ldcfg = config.GetSection('loads') msrcfg = config.GetSection('measurement') - if ldcfg.cpulist and msrcfg.cpulist: + msrcfg_cpulist_present = msrcfg.cpulist != "" + # Parse measurement cpulist using parse_cpulist_from_config to account for run-on-isolcpus + # and relative cpusets + cpulist = parse_cpulist_from_config(msrcfg.cpulist, msrcfg.run_on_isolcpus) + if msrcfg_cpulist_present and not cpulist_utils.is_relative(msrcfg.cpulist) and msrcfg.run_on_isolcpus: + logger.log(Log.WARN, "ignoring --measurement-run-on-isolcpus, since cpulist is specified") + msrcfg.cpulist = collapse_cpulist(cpulist) + if ldcfg.cpulist: ldcfg.cpulist = remove_offline(ldcfg.cpulist) - msrcfg.cpulist = remove_offline(msrcfg.cpulist) # if we only specified one set of cpus (loads or measurement) # default the other to the inverse of the specified list - if not ldcfg.cpulist and msrcfg.cpulist: + if not ldcfg.cpulist and msrcfg_cpulist_present: tmplist = expand_cpulist(msrcfg.cpulist) tmplist = SysTopology().invert_cpulist(tmplist) - ldcfg.cpulist = compress_cpulist(tmplist) - msrcfg.cpulist = remove_offline(msrcfg.cpulist) - if not msrcfg.cpulist and ldcfg.cpulist: + tmplist = cpulist_utils.online_cpulist(tmplist) + ldcfg.cpulist = collapse_cpulist(tmplist) + if not msrcfg_cpulist_present and ldcfg.cpulist: tmplist = expand_cpulist(ldcfg.cpulist) tmplist = SysTopology().invert_cpulist(tmplist) - msrcfg.cpulist = compress_cpulist(tmplist) - ldcfg.cpulist = remove_offline(ldcfg.cpulist) + tmplist = cpulist_utils.online_cpulist(tmplist) + msrcfg.cpulist = collapse_cpulist(tmplist) if ldcfg.cpulist: logger.log(Log.DEBUG, f"loads cpulist: {ldcfg.cpulist}") # if --onlyload is specified msrcfg.cpulist is unused - if msrcfg.cpulist and not rtevcfg.onlyload: + if msrcfg_cpulist_present and not rtevcfg.onlyload: logger.log(Log.DEBUG, f"measurement cpulist: {msrcfg.cpulist}") logger.log(Log.DEBUG, f"workdir: {rtevcfg.workdir}")rteval/cpulist_utils.py +33
-0@@ -126,3 +126,36 @@ def nonisolated_cpulist(cpulist): isolated_cpulist = sysread(cpupath, "isolated") isolated_cpulist = expand_cpulist(isolated_cpulist) return list(set(cpulist).difference(set(isolated_cpulist))) + + +def is_relative(cpulist): + return cpulist.startswith("+") or cpulist.startswith("-") + + +def expand_relative_cpulist(cpulist): + """ + Expand a relative cpulist into a tuple of lists. + :param cpulist: Relative cpulist of form +1,2,3,-4,5,6 + :return: Tuple of two lists, one for added CPUs, one for removed CPUs + """ + added_cpus = [] + removed_cpus = [] + + if not cpulist: + return added_cpus, removed_cpus + + cpus = None + + for part in cpulist.split(','): + if part.startswith('+') or part.startswith('-'): + cpus = added_cpus if part[0] == '+' else removed_cpus + part = part[1:] + if '-' in part: + a, b = part.split('-') + a, b = int(a), int(b) + cpus.extend(list(range(a, b + 1))) + else: + a = int(part) + cpus.append(a) + + return list(set(added_cpus)), list(set(removed_cpus))rteval/modules/measurement/__init__.py +2
-7@@ -5,7 +5,7 @@ import libxml2 from rteval.modules import RtEvalModules, ModuleContainer -from rteval.systopology import SysTopology as SysTop +from rteval.systopology import parse_cpulist_from_config import rteval.cpulist_utils as cpulist_utils class MeasurementProfile(RtEvalModules):@@ -183,12 +183,7 @@ measurement profiles, based on their characteristics""" rep_n = libxml2.newNode("Measurements") cpulist = self.__cfg.GetSection("measurement").cpulist run_on_isolcpus = self.__cfg.GetSection("measurement").run_on_isolcpus - if cpulist: - # Convert str to list and remove offline cpus - cpulist = cpulist_utils.expand_cpulist(cpulist) - cpulist = cpulist_utils.online_cpulist(cpulist) - else: - cpulist = SysTop().online_cpus() if run_on_isolcpus else SysTop().default_cpus() + cpulist = parse_cpulist_from_config(cpulist, run_on_isolcpus) rep_n.newProp("measurecpus", cpulist_utils.collapse_cpulist(cpulist)) for mp in self.__measureprofiles:rteval/modules/measurement/cyclictest.py +6
-44@@ -16,8 +16,7 @@ import math import libxml2 from rteval.Log import Log from rteval.modules import rtevalModulePrototype -from rteval.systopology import cpuinfo -from rteval.systopology import SysTopology +from rteval.systopology import cpuinfo, parse_cpulist_from_config import rteval.cpulist_utils as cpulist_utils expand_cpulist = cpulist_utils.expand_cpulist@@ -193,39 +192,9 @@ class Cyclictest(rtevalModulePrototype): self.__priority = int(self.__cfg.setdefault('priority', 95)) self.__buckets = int(self.__cfg.setdefault('buckets', 2000)) self.__numcores = 0 - self.__cpus = [] self.__cyclicdata = {} - self.__sparse = False - self.__run_on_isolcpus = bool(self.__cfg.setdefault('run-on-isolcpus', False)) - - if self.__cfg.cpulist: - self.__cpulist = self.__cfg.cpulist - self.__cpus = expand_cpulist(self.__cpulist) - # Only include online cpus - self.__cpus = cpulist_utils.online_cpulist(self.__cpus) - # Reset cpulist from the newly calculated self.__cpus - self.__cpulist = cpulist_utils.collapse_cpulist(self.__cpus) - self.__cpus = [str(c) for c in self.__cpus] - self.__sparse = True - if self.__run_on_isolcpus: - self._log(Log.WARN, "ignoring --measurement-run-on-isolcpus, since cpulist is specified") - else: - self.__cpus = SysTopology().online_cpus_str() - # Get the cpuset from the environment - cpuset = os.sched_getaffinity(0) - # Convert the elements to strings - cpuset = [str(c) for c in cpuset] - # Get isolated CPU list - isolcpus = [str(c) for c in SysTopology().isolated_cpus()] - # Only include cpus that are in the cpuset and isolated CPUs if run_on_isolcpus is enabled - self.__cpus = [c for c in self.__cpus if c in cpuset or self.__run_on_isolcpus and c in isolcpus] - if self.__run_on_isolcpus: - self.__sparse = True - self.__cpulist = cpulist_utils.collapse_cpulist([int(c) for c in self.__cpus]) - - # Sort the list of cpus to align with the order reported by cyclictest - self.__cpus.sort(key=int) - + self.__cpulist = self.__cfg.cpulist + self.__cpus = [str(c) for c in expand_cpulist(self.__cpulist)] self.__numcores = len(self.__cpus) info = cpuinfo()@@ -242,10 +211,7 @@ class Cyclictest(rtevalModulePrototype): logfnc=self._log) self.__cyclicdata['system'].description = (f"({self.__numcores} cores) ") + info['0']['model name'] - if self.__sparse: - self._log(Log.DEBUG, f"system using {self.__numcores} cpu cores") - else: - self._log(Log.DEBUG, f"system has {self.__numcores} cpu cores") + self._log(Log.DEBUG, f"system using {self.__numcores} cpu cores") self.__started = False self.__cyclicoutput = None self.__breaktraceval = None@@ -280,12 +246,8 @@ class Cyclictest(rtevalModulePrototype): f'-h {self.__buckets}', f"-p{int(self.__priority)}", ] - if self.__sparse: - self.__cmd.append(f'-t{self.__numcores}') - self.__cmd.append(f'-a{self.__cpulist}') - else: - self.__cmd.append('-t') - self.__cmd.append('-a') + self.__cmd.append(f'-t{self.__numcores}') + self.__cmd.append(f'-a{self.__cpulist}') if 'threads' in self.__cfg and self.__cfg.threads: self.__cmd.append(f"-t{int(self.__cfg.threads)}")rteval/systopology.py +26
-0@@ -241,6 +241,39 @@ class SysTopology: """ return a list of online cpus in cpulist """ return [c for c in self.online_cpus() if c in cpulist] + +def parse_cpulist_from_config(cpulist, run_on_isolcpus=False): + """ + Generates a cpulist based on --*-cpulist argument given by user + :param cpulist: Value of --*-cpulist argument + :param run_on_isolcpus: Value of --*-run-on-isolcpus argument + :return: Sorted list of CPUs as integers + """ + if cpulist and not cpulist_utils.is_relative(cpulist): + result = cpulist_utils.expand_cpulist(cpulist) + # Only include online cpus + result = cpulist_utils.online_cpulist(result) + else: + result = SysTopology().online_cpus() + # Get the cpuset from the environment + cpuset = os.sched_getaffinity(0) + # Get isolated CPU list + isolcpus = SysTopology().isolated_cpus() + if cpulist and cpulist_utils.is_relative(cpulist): + # Include cpus that are not removed in relative cpuset and are either in cpuset from affinity, + # isolcpus (with run_on_isolcpus enabled, or added by relative cpuset + added_cpus, removed_cpus = cpulist_utils.expand_relative_cpulist(cpulist) + result = [c for c in result + if (c in cpuset or + c in added_cpus or + run_on_isolcpus and c in isolcpus) and
rteval/systopology.py class SysTopology: · line 279
Quoted 10 lines
rteval/systopology.py +7
-0+ c not in removed_cpus] + else: + # Only include cpus that are in the cpuset and isolated CPUs if run_on_isolcpus is enabled + result = [c for c in result if c in cpuset or run_on_isolcpus and c in isolcpus] + return result + + if __name__ == "__main__": def unit_test():