X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e85fdc5e3b4e74c39e0255980cc7c15c1759c276..02a6df2bc7e1c28a70a33e28bf5589f6f90e4404:/teshsuite/smpi/MBI/generator_utils.py diff --git a/teshsuite/smpi/MBI/generator_utils.py b/teshsuite/smpi/MBI/generator_utils.py index 554c7bdbaf..3801ae271b 100644 --- a/teshsuite/smpi/MBI/generator_utils.py +++ b/teshsuite/smpi/MBI/generator_utils.py @@ -9,10 +9,11 @@ import re # Collectives coll = ['MPI_Barrier', 'MPI_Bcast', 'MPI_Reduce', 'MPI_Gather', 'MPI_Scatter', 'MPI_Scan', 'MPI_Exscan', 'MPI_Allgather', 'MPI_Allreduce', 'MPI_Allgatherv', 'MPI_Alltoall', 'MPI_Alltoallv'] icoll = ['MPI_Ibcast', 'MPI_Ireduce', 'MPI_Igather', 'MPI_Iscatter', 'MPI_Iscan', 'MPI_Iexscan', 'MPI_Iallgather', 'MPI_Iallreduce', 'MPI_Iallgatherv', 'MPI_Ialltoall', 'MPI_Ialltoallv'] +barrier = ['MPI_Barrier'] ibarrier = ['MPI_Ibarrier'] coll4op = ['MPI_Reduce', 'MPI_Allreduce'] icoll4op = ['MPI_Ireduce', 'MPI_Iallreduce'] -coll4root = ['MPI_Reduce', 'MPI_Bcast', 'MPI_Gather', 'MPI_Scatter'] +coll4root = ['MPI_Reduce', 'MPI_Bcast', 'MPI_Gather', 'MPI_Scatter'] icoll4root = ['MPI_Ireduce', 'MPI_Ibcast', 'MPI_Igather', 'MPI_Iscatter'] pcoll = [] tcoll = ['MPI_Comm_split', 'MPI_Op_create', 'MPI_Comm_dup', 'MPI_Type_contiguous', 'MPI_Comm_create', 'MPI_Group_excl'] # MPI_Comm_dup removed @@ -31,6 +32,7 @@ recv = ['MPI_Recv'] irecv = ['MPI_Irecv'] precv = ['MPI_Recv_init'] probe = ['MPI_Probe'] +sendrecv = ['MPI_Sendrecv'] # RMA epoch = ['MPI_Win_fence', 'MPI_Win_lock', 'MPI_Win_lock_all'] @@ -86,7 +88,7 @@ fini['MPI_Gather'] = lambda n: "" free['MPI_Gather'] = lambda n: "" write['MPI_Gather'] = lambda n: "" -init['MPI_Scatter'] = lambda n: f"int val{n}, buf{n}[buff_size];" +init['MPI_Scatter'] = lambda n: f"int val{n}, buf{n}[buff_size];\n memset(buf{n}, 0, sizeof(int)*buff_size);" start['MPI_Scatter'] = lambda n: "" operation['MPI_Scatter'] = lambda n: f"MPI_Scatter(&buf{n}, 1, type, &val{n}, 1, type, root, newcom);" fini['MPI_Scatter'] = lambda n: "" @@ -255,7 +257,7 @@ write['MPI_Ialltoallv'] = lambda n: f"rbuf{n}[0]++;" ### COLL:tools -init['MPI_Comm_split'] = lambda n: f'MPI_Comm com[size]; color = rank % 2; int key = 1;' +init['MPI_Comm_split'] = lambda n: 'MPI_Comm com[size]; int color = rank % 2; int key = 1;' start['MPI_Comm_split'] = lambda n: "" operation['MPI_Comm_split'] = lambda n: 'MPI_Comm_split(MPI_COMM_WORLD,color,key, &com[j]);' error['MPI_Comm_split'] = 'CommunicatorLeak' @@ -265,7 +267,7 @@ free['MPI_Comm_split'] = lambda n: "" init['MPI_Cart_get'] = lambda n: "" start['MPI_Cart_get'] = lambda n: "" -operation['MPI_Cart_get'] = lambda n: f'MPI_Cart_get(newcom, 2, dims, periods, coords);' +operation['MPI_Cart_get'] = lambda n: 'MPI_Cart_get(newcom, 2, dims, periods, coords);' write['MPI_Cart_get'] = lambda n: "" fini['MPI_Cart_get'] = lambda n: "" free['MPI_Cart_get'] = lambda n: "" @@ -295,7 +297,7 @@ error['MPI_Comm_create'] = 'CommunicatorLeak' fini['MPI_Comm_create'] = lambda n: "MPI_Comm_free(&com[j]);" free['MPI_Comm_create'] = lambda n: "" -init['MPI_Comm_dup'] = lambda n: f'MPI_Comm com[size];' +init['MPI_Comm_dup'] = lambda n: 'MPI_Comm com[size];' operation['MPI_Comm_dup'] = lambda n: 'MPI_Comm_dup(MPI_COMM_WORLD, &com[j]);' error['MPI_Comm_dup'] = 'CommunicatorLeak' fini['MPI_Comm_dup'] = lambda n: "MPI_Comm_free(&com[j]);" @@ -346,11 +348,17 @@ write['MPI_Recv'] = lambda n: "" init['MPI_Probe'] = lambda n: "" start['MPI_Probe'] = lambda n: "" -operation['MPI_Probe'] = lambda n: f'MPI_Probe(src, 0, newcom, &sta);' +operation['MPI_Probe'] = lambda n: 'MPI_Probe(src, 0, newcom, &sta);' fini['MPI_Probe'] = lambda n: "" free['MPI_Probe'] = lambda n: "" write['MPI_Probe'] = lambda n: "" +init['MPI_Sendrecv'] = lambda n: f'int sbuf{n}[N+2]={{rank}}; int rbuf{n}[N]={{rank}}; int * psbuf{n} = &sbuf{n}[0]; int * prbuf{n} = &rbuf{n}[0]; MPI_Status sta{n};' +start['MPI_Sendrecv'] = lambda n: "" +operation['MPI_Sendrecv'] = lambda n: f'MPI_Sendrecv(psbuf{n}, buff_size, type, dest, stag, prbuf{n}, buff_size, type, src, rtag, newcom, &sta{n});' +fini['MPI_Sendrecv'] = lambda n: "" +free['MPI_Sendrecv'] = lambda n: "" +write['MPI_Sendrecv'] = lambda n: f"prbuf{n} = &sbuf{n}[2];" ### P2P:nonblocking @@ -404,13 +412,13 @@ init['store'] = lambda n: f'int localbuf{n}[N] = {{0}};' operation['store'] = lambda n: f'localbuf{n}[0] = 8;' init['rstore'] = lambda n: "" -operation['rstore'] = lambda n: f'winbuf[20] = 12346;' +operation['rstore'] = lambda n: f'winbuf[5] = 12346;' init['load'] = lambda n: f'int localbuf{n}[N] = {{0}};' operation['load'] = lambda n: f'int load = localbuf{n}[0];' init['rload'] = lambda n: "" -operation['rload'] = lambda n: "int load = winbuf[20];" +operation['rload'] = lambda n: "int load = winbuf[5];" init['loadstore'] = lambda n: f'int localbuf{n}[N] = {{0}};' operation['loadstore'] = lambda n: f'if (localbuf{n}[0] % 2 == 0) localbuf{n}[0]++; ' @@ -433,23 +441,23 @@ def make_file(template, filename, replace): filename = filename.replace("_MPI_", "_") replace['filename'] = filename # Replace all variables that don't have a ':' in their name - while re.search("@\{[^@:]*\}@", output): - m = re.search("@\{([^@:]*)\}@", output) + while re.search(r'@\{[^@:]*\}@', output): + m = re.search(r'@\{([^@:]*)\}@', output) target = m.group(1) #print(f"Replace @{{{target}}}@") if target in replace.keys(): - output = re.sub(f'@\{{{target}\}}@', replace[target], output) + output = re.sub(fr'@\{{{target}\}}@', replace[target], output) #print(f"Replace {target} -> {replace[target]}") else: raise ValueError(f"Variable {target} used in template, but not defined.") # Now replace all variables with a ':' in their name: line targets are like that, and we don't want to resolve them before the others change the lines - while re.search("@\{([^:@]*):([^@]*)\}@", output): - m = re.search("@\{([^:@]*):([^@]*)\}@", output) + while re.search(r'@\{([^:@]*):([^@]*)\}@', output): + m = re.search(r'@\{([^:@]*):([^@]*)\}@', output) (kind, target) = (m.group(1), m.group(2)) if kind == 'line': replace = f'{find_line(output, target, filename)}' #print(f"Replace @{{line:{target}}}@ with '{replace}'") - output = re.sub(f'@\{{line:{target}\}}@', replace, output) + output = re.sub(fr'@\{{line:{target}\}}@', replace, output) else: raise ValueError(f"Unknown variable kind: {kind}:{target}")