| Message ID | 20240621022417.2086751-5-crwood@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | rteval: Remove measurement profiles and make latency mods exclusive | expand |
On Thu, 20 Jun 2024, Crystal Wood wrote: > Latency modules will step on each other's toes if run at the same time > (on the same CPU, though that's an enhancement for later), so only > run one of them. A priority mechanism allows selecting > > Signed-off-by: Crystal Wood <crwood@redhat.com> > --- > rteval/modules/__init__.py | 11 +++++++++++ > rteval/modules/measurement/cyclictest.py | 1 + > rteval/modules/measurement/timerlat.py | 1 + > 3 files changed, 13 insertions(+) > > diff --git a/rteval/modules/__init__.py b/rteval/modules/__init__.py > index de1ddc4628c1..2a4eafae71c7 100644 > --- a/rteval/modules/__init__.py > +++ b/rteval/modules/__init__.py > @@ -40,6 +40,7 @@ class rtevalModulePrototype(threading.Thread): > "finished": threading.Event()} > self._donotrun = False > self._exclusive = False > + self._latency = False > self.__timestamps = {} > self.__sleeptime = 2.0 > > @@ -67,6 +68,11 @@ class rtevalModulePrototype(threading.Thread): > self._exclusive = True > > > + def set_latency(self): > + """ Sets the module as an exclusive latency measurer """ > + self._latency = True > + > + > def set_donotrun(self): > """ set a module's donotrun field to True """ > self._donotrun = True > @@ -412,9 +418,14 @@ class RtEvalModules: > > self._logger.log(Log.INFO, f"Preparing {self._module_type} modules") > exclusive = 0 > + latency = False > for (modname, mod) in self.__modules: > if mod.is_exclusive() and mod.WorkloadWillRun(): > exclusive += 1 > + if mod._latency: > + if latency: > + raise RuntimeError("More than one exclusive latency test") > + latency = True > for (modname, mod) in self.__modules: > if exclusive >= 1: > if exclusive != 1: > diff --git a/rteval/modules/measurement/cyclictest.py b/rteval/modules/measurement/cyclictest.py > index 3a34c1b988d6..a9f5b0c4fba7 100644 > --- a/rteval/modules/measurement/cyclictest.py > +++ b/rteval/modules/measurement/cyclictest.py > @@ -216,6 +216,7 @@ class Cyclictest(rtevalModulePrototype): > self.__started = False > self.__cyclicoutput = None > self.__breaktraceval = None > + self.set_latency() > > > @staticmethod > diff --git a/rteval/modules/measurement/timerlat.py b/rteval/modules/measurement/timerlat.py > index 19dd30732936..793b80cc0dac 100644 > --- a/rteval/modules/measurement/timerlat.py > +++ b/rteval/modules/measurement/timerlat.py > @@ -206,6 +206,7 @@ class Timerlat(rtevalModulePrototype): > logfnc=self._log) > self.__timerlatdata['system'].description = (f"({self.__numcores} cores) ") + info['0']['model name'] > self._log(Log.DEBUG, f"system using {self.__numcores} cpu cores") > + self.set_latency() > > > def _WorkloadSetup(self): > -- > 2.45.1 > > > We used to call them just measurement modules, so I see what you are trying to do, you are differentiating between measurement modules that measure latency such as cyclictest and rtla timerlat, as opposed to sysstat. However, the naming here is not good. self.set_latency() ? how about maybe, set_latency_module() ? It's a bit unwieldy in length, but it's clear that you are setting which module to run and not some kind of a latency. I'm applying this patch, but would appreciate you following up with a renmaing patch. Signed-off-by: John Kacur <jkacur@redhat.com>
diff --git a/rteval/modules/__init__.py b/rteval/modules/__init__.py index de1ddc4628c1..2a4eafae71c7 100644 --- a/rteval/modules/__init__.py +++ b/rteval/modules/__init__.py @@ -40,6 +40,7 @@ class rtevalModulePrototype(threading.Thread): "finished": threading.Event()} self._donotrun = False self._exclusive = False + self._latency = False self.__timestamps = {} self.__sleeptime = 2.0 @@ -67,6 +68,11 @@ class rtevalModulePrototype(threading.Thread): self._exclusive = True + def set_latency(self): + """ Sets the module as an exclusive latency measurer """ + self._latency = True + + def set_donotrun(self): """ set a module's donotrun field to True """ self._donotrun = True @@ -412,9 +418,14 @@ class RtEvalModules: self._logger.log(Log.INFO, f"Preparing {self._module_type} modules") exclusive = 0 + latency = False for (modname, mod) in self.__modules: if mod.is_exclusive() and mod.WorkloadWillRun(): exclusive += 1 + if mod._latency: + if latency: + raise RuntimeError("More than one exclusive latency test") + latency = True for (modname, mod) in self.__modules: if exclusive >= 1: if exclusive != 1: diff --git a/rteval/modules/measurement/cyclictest.py b/rteval/modules/measurement/cyclictest.py index 3a34c1b988d6..a9f5b0c4fba7 100644 --- a/rteval/modules/measurement/cyclictest.py +++ b/rteval/modules/measurement/cyclictest.py @@ -216,6 +216,7 @@ class Cyclictest(rtevalModulePrototype): self.__started = False self.__cyclicoutput = None self.__breaktraceval = None + self.set_latency() @staticmethod diff --git a/rteval/modules/measurement/timerlat.py b/rteval/modules/measurement/timerlat.py index 19dd30732936..793b80cc0dac 100644 --- a/rteval/modules/measurement/timerlat.py +++ b/rteval/modules/measurement/timerlat.py @@ -206,6 +206,7 @@ class Timerlat(rtevalModulePrototype): logfnc=self._log) self.__timerlatdata['system'].description = (f"({self.__numcores} cores) ") + info['0']['model name'] self._log(Log.DEBUG, f"system using {self.__numcores} cpu cores") + self.set_latency() def _WorkloadSetup(self):
Latency modules will step on each other's toes if run at the same time (on the same CPU, though that's an enhancement for later), so only run one of them. A priority mechanism allows selecting Signed-off-by: Crystal Wood <crwood@redhat.com> --- rteval/modules/__init__.py | 11 +++++++++++ rteval/modules/measurement/cyclictest.py | 1 + rteval/modules/measurement/timerlat.py | 1 + 3 files changed, 13 insertions(+)