Tests: Limit test.build_jobs based on number of tests running
This commit is contained in:
parent
22290a74c2
commit
6f96ff8df6
|
|
@ -1416,7 +1416,8 @@ class VlTest:
|
||||||
entering=self.obj_dir,
|
entering=self.obj_dir,
|
||||||
cmd=[
|
cmd=[
|
||||||
os.environ['MAKE'],
|
os.environ['MAKE'],
|
||||||
(("-j " + str(Args.driver_build_jobs)) if Args.driver_build_jobs else ""),
|
(("-j " +
|
||||||
|
str(Args.driver_build_jobs_n)) if Args.driver_build_jobs_n else ""),
|
||||||
"-C " + self.obj_dir,
|
"-C " + self.obj_dir,
|
||||||
"-f " + os.path.abspath(os.path.dirname(__file__)) + "/Makefile_obj",
|
"-f " + os.path.abspath(os.path.dirname(__file__)) + "/Makefile_obj",
|
||||||
("" if self.verbose else "--no-print-directory"),
|
("" if self.verbose else "--no-print-directory"),
|
||||||
|
|
@ -1673,6 +1674,10 @@ class VlTest:
|
||||||
VlTest._cached_aslr_off = ""
|
VlTest._cached_aslr_off = ""
|
||||||
return VlTest._cached_aslr_off
|
return VlTest._cached_aslr_off
|
||||||
|
|
||||||
|
@property
|
||||||
|
def build_jobs(self) -> str:
|
||||||
|
return "--build-jobs " + str(Args.driver_build_jobs_n)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def driver_verilator_flags(self) -> list:
|
def driver_verilator_flags(self) -> list:
|
||||||
return Args.passdown_verilator_flags
|
return Args.passdown_verilator_flags
|
||||||
|
|
@ -3075,8 +3080,8 @@ if __name__ == '__main__':
|
||||||
|
|
||||||
forker = Forker(Args.jobs)
|
forker = Forker(Args.jobs)
|
||||||
|
|
||||||
Args.driver_build_jobs = None
|
|
||||||
if len(Arg_Tests) >= 2 and Args.jobs >= 2:
|
if len(Arg_Tests) >= 2 and Args.jobs >= 2:
|
||||||
|
Args.driver_build_jobs_n = 2
|
||||||
# Read supported into master process, so don't call every subprocess
|
# Read supported into master process, so don't call every subprocess
|
||||||
Capabilities.warmup_cache()
|
Capabilities.warmup_cache()
|
||||||
# Without this tests such as t_debug_sigsegv_bt_bad.py will occasionally
|
# Without this tests such as t_debug_sigsegv_bt_bad.py will occasionally
|
||||||
|
|
@ -3086,6 +3091,6 @@ if __name__ == '__main__':
|
||||||
sys.stdin = open("/dev/null", 'r', encoding="utf8") # pylint: disable=consider-using-with
|
sys.stdin = open("/dev/null", 'r', encoding="utf8") # pylint: disable=consider-using-with
|
||||||
else:
|
else:
|
||||||
# Speed up single-test makes
|
# Speed up single-test makes
|
||||||
Args.driver_build_jobs = calc_jobs()
|
Args.driver_build_jobs_n = calc_jobs()
|
||||||
|
|
||||||
run_them()
|
run_them()
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ if re.search(r'clang', test.cxx_version):
|
||||||
test.skip("uvm_regex.cc from upstream has clang warnings")
|
test.skip("uvm_regex.cc from upstream has clang warnings")
|
||||||
|
|
||||||
test.compile(verilator_flags2=[
|
test.compile(verilator_flags2=[
|
||||||
"--binary", "--build-jobs 4", "--vpi", "+define+T_V2017_1_0", "+incdir+t/uvm/v2017_1_0",
|
"--binary", test.build_jobs, "--vpi", "+define+T_V2017_1_0", "+incdir+t/uvm/v2017_1_0",
|
||||||
test.pli_filename
|
test.pli_filename
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ if re.search(r'clang', test.cxx_version):
|
||||||
test.skip("uvm_regex.cc from upstream has clang warnings")
|
test.skip("uvm_regex.cc from upstream has clang warnings")
|
||||||
|
|
||||||
test.compile(verilator_flags2=[
|
test.compile(verilator_flags2=[
|
||||||
"--binary", "--build-jobs 4", "--vpi", "+define+T_V2020_3_1", "+incdir+t/uvm/v2020_3_1",
|
"--binary", test.build_jobs, "--vpi", "+define+T_V2020_3_1", "+incdir+t/uvm/v2020_3_1",
|
||||||
test.pli_filename
|
test.pli_filename
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue