We only ever do out-of-tree builds, so the kernel directory should not be
getting damaged except by incomplete extraction (which mrproper would
probably not fix) or external meddling. So, skip the mrproper and
instead re-extract if a "make clean" fails.
Also, add -j to cleancmd to further speed things up. Startup speed may
not seem all that important given how long rteval is typically run for,
but this helps make quick tests (e.g. while debugging things, or when
hunting a latency that shows up very quickly) less painful.
On my 12-cpu laptop, this patch saves about 15 seconds of startup time.
Signed-off-by: Crystal Wood <crwood@xxxxxxxxxx>
---
rteval/modules/loads/kcompile.py | 40 ++++++++++++++------------------
1 file changed, 18 insertions(+), 22 deletions(-)
diff --git a/rteval/modules/loads/kcompile.py b/rteval/modules/loads/kcompile.py
index de1539986723..db1941074157 100644
--- a/rteval/modules/loads/kcompile.py
+++ b/rteval/modules/loads/kcompile.py
@@ -54,7 +54,7 @@ class KBuildJob:
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"
+ self.cleancmd = f"make O={self.objdir} -C {self.kdir} clean allmodconfig -j${self.jobs}"
self.cleancmd += f"&& pushd {self.objdir} && {self.kdir}/scripts/config -d CONFIG_MODULE_SIG_SHA1 -e CONFIG_MODULE_SIG_SHA512 && popd && make O={self.objdir} -C {self.kdir} olddefconfig"
if self.binder:
self.runcmd = self.binder + " " + self.runcmd
@@ -90,8 +90,8 @@ class KBuildJob:
def clean(self, sin=None, sout=None, serr=None):
""" Runs command to clean any previous builds and configure kernel """
self.log(Log.DEBUG, f"cleaning objdir {self.objdir}")
- subprocess.call(self.cleancmd, shell=True,
- stdin=sin, stdout=sout, stderr=serr)
+ return subprocess.call(self.cleancmd, shell=True,
+ stdin=sin, stdout=sout, stderr=serr)
def run(self, sin=None, sout=None, serr=None):
""" Use Popen to launch a kcompile job """
@@ -234,6 +234,10 @@ class Kcompile(CommandLineLoad):
self.logger, self.cpus[n] if self.cpulist else None)
self.args.append(str(self.buildjobs[n])+";")
+ def _repair_tarball(self):
+ self._log(Log.DEBUG, "Invalid state in kernel build tree, reloading")
+ self._remove_build_dirs()
+ self._extract_tarball()
def _WorkloadBuild(self):
if self._donotrun:
@@ -246,30 +250,22 @@ class Kcompile(CommandLineLoad):
else:
out = err = null
- # clean up any damage from previous runs
- try:
- cmd = ["make", "-C", self.mydir, "mrproper"]
- ret = subprocess.call(cmd, stdin=null, stdout=out, stderr=err)
+ # clean up object dirs and make sure each has a config file
+ for n in self.nodes:
+ ret = self.buildjobs[n].clean(sin=null, sout=out, serr=err)
if ret:
- # if the above make failed, remove and reinstall the source tree
- self._log(Log.DEBUG, "Invalid state in kernel build tree, reloading")
- self._remove_build_dirs()
- self._extract_tarball()
- ret = subprocess.call(cmd, stdin=null, stdout=out, stderr=err)
- if ret:
- # give up
- raise rtevalRuntimeError(self, f"kcompile setup failed: {ret}")
- except KeyboardInterrupt as m:
- self._log(Log.DEBUG, "keyboard interrupt, aborting")
- return
- self._log(Log.DEBUG, "ready to run")
+ self._repair_tarball()
+ ret = self.buildjobs[n].clean(sin=null, sout=out, serr=err)
+ if ret:
+ raise rtevalRuntimeError(self, f"kcompile setup failed: {ret}")
+
if self._logging:
os.close(out)
os.close(err)
- # clean up object dirs and make sure each has a config file
- for n in self.nodes:
- self.buildjobs[n].clean(sin=null, sout=null, serr=null)
+
os.close(null)
+
+ self._log(Log.DEBUG, "ready to run")
self._setReady()
def _WorkloadPrepare(self):
--
2.43.0
