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 928d5b7..5df6ef3 100755 (executable)
--- a/teshsuite/smpi/MBI/RMARemoteLocalConcurrencyGenerator.py
+++ b/teshsuite/smpi/MBI/RMARemoteLocalConcurrencyGenerator.py
@@ -1,7 +1,7 @@
 #! /usr/bin/python3
 import os
 import sys
-from generator_utils import *
+import generator_utils as gen
 
 template = """// @{generatedby}@
 /* ///////////////////////// The MPI Bugs Initiative ////////////////////////
@@ -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 */
   }
 
@@ -78,9 +78,9 @@ int main(int argc, char **argv) {
 """
 
 
-for e in epoch:
-    for p1 in get:
-        for p2 in put + rstore + rload + get :
+for e in gen.epoch:
+    for p1 in 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.'
@@ -88,31 +88,38 @@ for e in epoch:
             patterns['p1'] = p1
             patterns['p2'] = p2
             patterns['e'] = e
-            patterns['epoch'] = epoch[e]("1")
-            patterns['finEpoch'] = finEpoch[e]("1")
-            patterns['init1'] = init[p1]("1")
-            patterns['operation1'] = operation[p1]("1")
-            patterns['operation2'] = operation[p2]("1")
+            patterns['epoch'] = gen.epoch[e]("1")
+            patterns['finEpoch'] = gen.finEpoch[e]("1")
+            patterns['init1'] = gen.init[p1]("1")
+            patterns['operation1'] = gen.operation[p1]("1")
+            patterns['init2'] = gen.init[p2]("2")
+            patterns['operation2'] = gen.operation[p2]("2")
 
             # Generate a data race (Get + Get/load/store/Put)
-            replace = patterns
+            replace = patterns.copy()
             replace['shortdesc'] = 'Global Concurrency error.'
             replace['longdesc'] = 'Global Concurrency error. @{p2}@ conflicts with @{p1}@'
             replace['outcome'] = 'ERROR: GlobalConcurrency'
             replace['errormsg'] = 'Global Concurrency error. @{p2}@ at @{filename}@:@{line:MBIERROR2}@ conflicts with @{p1}@ line @{line:MBIERROR1}@'
 
             # Replace Put and Get first argument
-            if p2 in put:
-                replace['operation2'] = 'MPI_Put(&winbuf[20], N, MPI_INT, target, 0, N, type, win);'
-            if p2 in get:
-                replace['operation2'] = 'MPI_Get(&winbuf[20], N, MPI_INT, target, 0, N, type, win);'
-
-            make_file(template, f'GlobalConcurrency_rl_{e}_{p1}_{p2}_nok.c', replace)
-
-
-for e in epoch:
-    for p1 in put:
-        for p2 in rstore + rload + put:
+            if p2 in gen.put:
+                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'
+
+            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 + 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.'
@@ -120,21 +127,24 @@ for e in epoch:
             patterns['p1'] = p1
             patterns['p2'] = p2
             patterns['e'] = e
-            patterns['epoch'] = epoch[e]("1")
-            patterns['finEpoch'] = finEpoch[e]("1")
-            patterns['init1'] = init[p1]("1")
-            patterns['operation1'] = operation[p1]("1")
-            patterns['operation2'] = operation[p2]("1")
+            patterns['epoch'] = gen.epoch[e]("1")
+            patterns['finEpoch'] = gen.finEpoch[e]("1")
+            patterns['init1'] = gen.init[p1]("1")
+            patterns['operation1'] = gen.operation[p1]("1")
+            patterns['init2'] = gen.init[p2]("2")
+            patterns['operation2'] = gen.operation[p2]("2")
 
             # Generate a data race (Put + store)
-            replace = patterns
+            replace = patterns.copy()
             replace['shortdesc'] = 'Global Concurrency error.'
             replace['longdesc'] = 'Global Concurrency error. @{p2}@ conflicts with @{p1}@'
             replace['outcome'] = 'ERROR: GlobalConcurrency'
             replace['errormsg'] = 'Global Concurrency error. @{p2}@ at @{filename}@:@{line:MBIERROR2}@ conflicts with @{p1}@ line @{line:MBIERROR1}@'
 
-            # Replace Put first argument
-            if p2 in put:
-              replace['operation2'] = 'MPI_Put(&winbuf[20], N, MPI_INT, target, 0, N, type, win);'
+            # Replace Put/Get first argument
+            if p2 in gen.put:
+              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);'
 
-            make_file(template, f'GlobalConcurrency_rl_{e}_{p1}_{p2}_nok.c', replace)
+            gen.make_file(template, f'GlobalConcurrency_rl_{e}_{p1}_{p2}_nok.c', replace)