From 342490f7aa81a13bb9f12c11588566674179b71d Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 21 Mar 2022 00:20:44 +0100 Subject: [PATCH] Resynchronize simgrid's MBI adapter from MBI project --- teshsuite/smpi/MBI/simgrid.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/teshsuite/smpi/MBI/simgrid.py b/teshsuite/smpi/MBI/simgrid.py index e08c7c9dd1..ec8911a70c 100644 --- a/teshsuite/smpi/MBI/simgrid.py +++ b/teshsuite/smpi/MBI/simgrid.py @@ -1,4 +1,4 @@ -# Copyright 2021-2022. The MBI project. All rights reserved. +# Copyright 2021-2022. The MBI project. All rights reserved. # This program is free software; you can redistribute it and/or modify it under the terms of the license (GNU GPL). import re @@ -49,8 +49,6 @@ class Tool(AbstractTool): outfile.write('\n') execcmd = execcmd.replace("mpirun", "smpirun -wrapper simgrid-mc -platform ./cluster.xml -analyze --cfg=smpi/finalization-barrier:on --cfg=smpi/list-leaks:10 --cfg=model-check/max-depth:10000 --cfg=smpi/pedantic:true") - if re.search("Concurrency", binary): # DPOR reduction in simgrid cannot deal with RMA calls as they contain mutexes - execcmd = execcmd.replace("smpirun", "smpirun --cfg=model-check/reduction:none") execcmd = execcmd.replace('${EXE}', binary) execcmd = execcmd.replace('$zero_buffer', "--cfg=smpi/buffering:zero") execcmd = execcmd.replace('$infty_buffer', "--cfg=smpi/buffering:infty") @@ -64,7 +62,7 @@ class Tool(AbstractTool): timeout=timeout, batchinfo=batchinfo) - def teardown(self): + def teardown(self): subprocess.run("find -type f -a -executable | xargs rm -f", shell=True, check=True) # Remove generated cruft (binary files) subprocess.run("rm -f smpitmp-* core", shell=True, check=True) @@ -86,6 +84,9 @@ class Tool(AbstractTool): if re.search('MC is currently not supported here', output): return 'failure' + if re.search('Collective communication mismatch', output): + return 'Collective mismatch' + if re.search('DEADLOCK DETECTED', output): return 'deadlock' if re.search('returned MPI_ERR', output): -- 2.20.1