teshsuite: smpi: MBI: Merge change form MBI.

[simgrid.git] / teshsuite / smpi / MBI / RMARemoteLocalConcurrencyGenerator.py

diff --git a/teshsuite/smpi/MBI/RMARemoteLocalConcurrencyGenerator.py b/teshsuite/smpi/MBI/RMARemoteLocalConcurrencyGenerator.py
index 5f20134..5df6ef3 100755 (executable)
--- a/teshsuite/smpi/MBI/RMARemoteLocalConcurrencyGenerator.py
+++ b/teshsuite/smpi/MBI/RMARemoteLocalConcurrencyGenerator.py
@@ -35,7 +35,7 @@ END_MBI_TESTS
 #include <stdio.h>
 #include <stdlib.h>
 
-#define N 1
+#define N 10
 
 int main(int argc, char **argv) {
   int nprocs = -1;
@@ -52,11 +52,12 @@ int main(int argc, char **argv) {
     printf("MBI ERROR: This test needs at least 2 processes to produce a bug!\\n");
 
   MPI_Datatype type = MPI_INT;
-  int target = 1;
+  int target = 1 - rank;
 
   MPI_Win_create(&winbuf, 100 * sizeof(int), sizeof(int), MPI_INFO_NULL, MPI_COMM_WORLD, &win);
 
   @{init1}@
+  @{init2}@
 
   @{epoch}@
 
@@ -64,7 +65,6 @@ int main(int argc, char **argv) {
     @{operation1}@ /* MBIERROR1 */
   }
   if(rank == 1){
-    target = 0;
     @{operation2}@ /* MBIERROR2 */
   }
 
@@ -80,7 +80,7 @@ int main(int argc, char **argv) {
 
 for e in gen.epoch:
     for p1 in gen.get:
-        for p2 in gen.put + gen.rstore + gen.rload + gen.get:
+        for p2 in gen.put + gen.rstore + gen.rload + gen.get :
             patterns = {}
             patterns = {'e': e, 'p1': p1, 'p2': p2}
             patterns['generatedby'] = f'DO NOT EDIT: this file was generated by {os.path.basename(sys.argv[0])}. DO NOT EDIT.'
@@ -92,7 +92,8 @@ for e in gen.epoch:
             patterns['finEpoch'] = gen.finEpoch[e]("1")
             patterns['init1'] = gen.init[p1]("1")
             patterns['operation1'] = gen.operation[p1]("1")
-            patterns['operation2'] = gen.operation[p2]("1")
+            patterns['init2'] = gen.init[p2]("2")
+            patterns['operation2'] = gen.operation[p2]("2")
 
             # Generate a data race (Get + Get/load/store/Put)
             replace = patterns.copy()
@@ -103,16 +104,22 @@ for e in gen.epoch:
 
             # Replace Put and Get first argument
             if p2 in gen.put:
-                replace['operation2'] = 'MPI_Put(&winbuf[20], N, MPI_INT, target, 0, N, type, win);'
-            if p2 in gen.get:
-                replace['operation2'] = 'MPI_Get(&winbuf[20], N, MPI_INT, target, 0, N, type, win);'
+                replace['operation2'] = 'MPI_Put(&winbuf[5], N, MPI_INT, target, 0, N, type, win);'
+                replace['outcome'] = 'OK'
+                replace['errormsg'] = 'OK'
+            elif p2 in gen.get:
+                replace['operation2'] = 'MPI_Get(&winbuf[5], N, MPI_INT, target, 0, N, type, win);'
+            elif p2 in gen.rload:
+                replace['outcome'] = 'OK'
+                replace['errormsg'] = 'OK'
 
-            gen.make_file(template, f'GlobalConcurrency_rl_{e}_{p1}_{p2}_nok.c', replace)
+            ok = 'ok' if replace['outcome'] == 'OK' else 'nok'
+            gen.make_file(template, f'GlobalConcurrency_rl_{e}_{p1}_{p2}_{ok}.c', replace)
 
 
 for e in gen.epoch:
     for p1 in gen.put:
-        for p2 in gen.rstore + gen.rload + gen.put:
+        for p2 in gen.rstore + gen.rload + gen.put + gen.get:
             patterns = {}
             patterns = {'e': e, 'p1': p1, 'p2': p2}
             patterns['generatedby'] = f'DO NOT EDIT: this file was generated by {os.path.basename(sys.argv[0])}. DO NOT EDIT.'
@@ -124,7 +131,8 @@ for e in gen.epoch:
             patterns['finEpoch'] = gen.finEpoch[e]("1")
             patterns['init1'] = gen.init[p1]("1")
             patterns['operation1'] = gen.operation[p1]("1")
-            patterns['operation2'] = gen.operation[p2]("1")
+            patterns['init2'] = gen.init[p2]("2")
+            patterns['operation2'] = gen.operation[p2]("2")
 
             # Generate a data race (Put + store)
             replace = patterns.copy()
@@ -133,8 +141,10 @@ for e in gen.epoch:
             replace['outcome'] = 'ERROR: GlobalConcurrency'
             replace['errormsg'] = 'Global Concurrency error. @{p2}@ at @{filename}@:@{line:MBIERROR2}@ conflicts with @{p1}@ line @{line:MBIERROR1}@'
 
-            # Replace Put first argument
+            # Replace Put/Get first argument
             if p2 in gen.put:
-                replace['operation2'] = 'MPI_Put(&winbuf[20], N, MPI_INT, target, 0, N, type, win);'
+              replace['operation2'] = 'MPI_Put(&winbuf[5], N, MPI_INT, target, 0, N, type, win);'
+            elif p2 in gen.get:
+              replace['operation2'] = 'MPI_Get(&winbuf[5], N, MPI_INT, target, 0, N, type, win);'
 
             gen.make_file(template, f'GlobalConcurrency_rl_{e}_{p1}_{p2}_nok.c', replace)