activate mpich3 tests for post/wait/start/complete RMA calls

diff --git a/teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt
index f13b881..4064285 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt
@@ -22,7 +22,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN)
   add_executable(c2f2cwinf c2f2cwinf.f c2f2cwin.c)
   add_executable(wingetf wingetf.f)
   add_executable(winnamef winnamef.f)
-#  add_executable(winscale1f winscale1f.f)
+  add_executable(winscale1f winscale1f.f)
 #  add_executable(winscale2f winscale2f.f)
 
 target_link_libraries(winaccf simgrid mtest_f77)
@@ -35,7 +35,7 @@ target_link_libraries(c2f2cwinf simgrid mtest_f77)
 #target_link_libraries(winattrf simgrid mtest_f77)
 target_link_libraries(wingetf simgrid mtest_f77)
 target_link_libraries(winnamef simgrid mtest_f77)
-#target_link_libraries(winscale1f simgrid mtest_f77)
+target_link_libraries(winscale1f simgrid mtest_f77)
 #target_link_libraries(winscale2f simgrid mtest_f77)
 
 

diff --git a/teshsuite/smpi/mpich3-test/f77/rma/testlist b/teshsuite/smpi/mpich3-test/f77/rma/testlist
index 5d902cb..1e3dac2 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f77/rma/testlist
+++ b/teshsuite/smpi/mpich3-test/f77/rma/testlist
@@ -1,8 +1,7 @@
-#Needs post,start, complete, wait
-#winscale1f 4
+winscale1f 4
 winfencef 4
 wingetf   5
-#Needs post,start, complete, wait
+#Needs win_test
 #winscale2f 4
 #Needs win error handling
 #winerrf 1

diff --git a/teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt
index 6292467..9e1c984 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt
@@ -22,7 +22,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN)
   add_executable(c2f2cwinf90 c2f2cwinf90.f90 c2f902cwin.c)
   add_executable(wingetf90 wingetf90.f90)
   add_executable(winnamef90 winnamef90.f90)
-#  add_executable(winscale1f90 winscale1f90.f90)
+  add_executable(winscale1f90 winscale1f90.f90)
 #  add_executable(winscale2f90 winscale2f90.f90)
 
 target_link_libraries(winaccf90 simgrid mtest_f90)
@@ -35,7 +35,7 @@ target_link_libraries(c2f2cwinf90 simgrid mtest_f90)
 #target_link_libraries(winattrf90 simgrid mtest_f90)
 target_link_libraries(wingetf90 simgrid mtest_f90)
 target_link_libraries(winnamef90 simgrid mtest_f90)
-#target_link_libraries(winscale1f90 simgrid mtest_f90)
+target_link_libraries(winscale1f90 simgrid mtest_f90)
 #target_link_libraries(winscale2f90 simgrid mtest_f90)
 
 

diff --git a/teshsuite/smpi/mpich3-test/f90/rma/testlist b/teshsuite/smpi/mpich3-test/f90/rma/testlist
index e85fb84..337fe31 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f90/rma/testlist
+++ b/teshsuite/smpi/mpich3-test/f90/rma/testlist
@@ -1,6 +1,6 @@
 # This file generated by f77tof90
 #See ../../f77/rma/testlist for reasons of deactivation
-#winscale1f90 4
+winscale1f90 4
 winfencef90 4
 wingetf90 5
 #winscale2f90 4

diff --git a/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt b/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt
index bde731c..c5b39ec 100644 (file)
--- a/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt
@@ -17,7 +17,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   add_executable(accfence1 accfence1.c)
   add_executable(accfence2_am accfence2_am.c)
   add_executable(accfence2 accfence2.c)
-#  add_executable(accpscw1 accpscw1.c)
+  add_executable(accpscw1 accpscw1.c)
 #  add_executable(acc-loc acc-loc.c)
 #  add_executable(adlb_mimic1 adlb_mimic1.c)
   add_executable(allocmem allocmem.c)
@@ -58,13 +58,13 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
 #  add_executable(mcs-mutex mcs-mutex.c)
 #  add_executable(mixedsync mixedsync.c)
 #  add_executable(mutex_bench mutex_bench.c)
-#  add_executable(nullpscw nullpscw.c)
+  add_executable(nullpscw nullpscw.c)
 #  add_executable(pscw_ordering pscw_ordering.c)
 #  add_executable(put_base put_base.c)
 #  add_executable(put_bottom put_bottom.c)
   add_executable(putfence1 putfence1.c)
   add_executable(putfidx putfidx.c)
-#  add_executable(putpscw1 putpscw1.c)
+  add_executable(putpscw1 putpscw1.c)
 #  add_executable(req_example req_example.c)
 #  add_executable(reqops reqops.c)
 #  add_executable(rmanull rmanull.c)
@@ -82,17 +82,17 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   add_executable(test1_am test1_am.c)
   add_executable(test1 test1.c)
   add_executable(test1_dt test1_dt.c)
-#  add_executable(test2_am test2_am.c)
-#  add_executable(test2 test2.c)
+  add_executable(test2_am test2_am.c)
+  add_executable(test2 test2.c)
 #  add_executable(test3_am test3_am.c)
-#  add_executable(test3 test3.c)
+  add_executable(test3 test3.c)
 #  add_executable(test4_am test4_am.c)
 #  add_executable(test4 test4.c)
   add_executable(test5_am test5_am.c)
   add_executable(test5 test5.c)
   add_executable(transpose1 transpose1.c)
   add_executable(transpose2 transpose2.c)
-#  add_executable(transpose3 transpose3.c)
+  add_executable(transpose3 transpose3.c)
 #  add_executable(transpose4 transpose4.c)
 #  add_executable(transpose5 transpose5.c)
   add_executable(transpose6 transpose6.c)
@@ -115,7 +115,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   target_link_libraries(accfence1 simgrid mtest_c)
   target_link_libraries(accfence2_am simgrid mtest_c)
   target_link_libraries(accfence2 simgrid mtest_c)
-#  target_link_libraries(accpscw1 simgrid mtest_c)
+  target_link_libraries(accpscw1 simgrid mtest_c)
 #  target_link_libraries(acc-loc simgrid mtest_c)
 #  target_link_libraries(adlb_mimic1 simgrid mtest_c)
   target_link_libraries(allocmem simgrid mtest_c)
@@ -156,13 +156,13 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
 #  target_link_libraries(mcs-mutex simgrid mtest_c)
 #  target_link_libraries(mixedsync simgrid mtest_c)
 #  target_link_libraries(mutex_bench simgrid mtest_c)
-#  target_link_libraries(nullpscw simgrid mtest_c)
+  target_link_libraries(nullpscw simgrid mtest_c)
 #  target_link_libraries(pscw_ordering simgrid mtest_c)
 #  target_link_libraries(put_base simgrid mtest_c)
 #  target_link_libraries(put_bottom simgrid mtest_c)
   target_link_libraries(putfence1 simgrid mtest_c)
   target_link_libraries(putfidx simgrid mtest_c)
-#  target_link_libraries(putpscw1 simgrid mtest_c)
+  target_link_libraries(putpscw1 simgrid mtest_c)
 #  target_link_libraries(req_example simgrid mtest_c)
 #  target_link_libraries(reqops simgrid mtest_c)
 #  target_link_libraries(rma-contig simgrid mtest_c)
@@ -180,17 +180,17 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   target_link_libraries(test1_am simgrid mtest_c)
   target_link_libraries(test1 simgrid mtest_c)
   target_link_libraries(test1_dt simgrid mtest_c)
-#  target_link_libraries(test2_am simgrid mtest_c)
-#  target_link_libraries(test2 simgrid mtest_c)
+  target_link_libraries(test2_am simgrid mtest_c)
+  target_link_libraries(test2 simgrid mtest_c)
 #  target_link_libraries(test3_am simgrid mtest_c)
-#  target_link_libraries(test3 simgrid mtest_c)
+  target_link_libraries(test3 simgrid mtest_c)
 #  target_link_libraries(test4_am simgrid mtest_c)
 #  target_link_libraries(test4 simgrid mtest_c)
   target_link_libraries(test5_am simgrid mtest_c)
   target_link_libraries(test5 simgrid mtest_c)
   target_link_libraries(transpose1 simgrid mtest_c)
   target_link_libraries(transpose2 simgrid mtest_c)
-#  target_link_libraries(transpose3 simgrid mtest_c)
+  target_link_libraries(transpose3 simgrid mtest_c)
 #  target_link_libraries(transpose4 simgrid mtest_c)
 #  target_link_libraries(transpose5 simgrid mtest_c)
   target_link_libraries(transpose6 simgrid mtest_c)
@@ -214,7 +214,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
  set_target_properties(accfence2_am PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
  set_target_properties(accfence2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(acc-loc PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(accpscw1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+ set_target_properties(accpscw1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(adlb_mimic1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
  set_target_properties(allocmem PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(attrorderwin PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
@@ -254,13 +254,13 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
 # set_target_properties(mcs-mutex PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(mixedsync PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(mutex_bench PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(nullpscw PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+ set_target_properties(nullpscw PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(pscw_ordering PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(put_base PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(put_bottom PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
  set_target_properties(putfence1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
  set_target_properties(putfidx PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(putpscw1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+ set_target_properties(putpscw1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(req_example PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(reqops PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(rmanull PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
@@ -278,17 +278,17 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
  set_target_properties(test1_am PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
  set_target_properties(test1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
  set_target_properties(test1_dt PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(test2_am PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(test2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+ set_target_properties(test2_am PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+ set_target_properties(test2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(test3_am PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(test3 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+ set_target_properties(test3 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(test4_am PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(test4 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
  set_target_properties(test5_am PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
  set_target_properties(test5 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
  set_target_properties(transpose1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
  set_target_properties(transpose2 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
-# set_target_properties(transpose3 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
+ set_target_properties(transpose3 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(transpose4 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
 # set_target_properties(transpose5 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")
  set_target_properties(transpose6 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}")

diff --git a/teshsuite/smpi/mpich3-test/rma/testlist b/teshsuite/smpi/mpich3-test/rma/testlist
index 8eac09d..e8185e5 100644 (file)
--- a/teshsuite/smpi/mpich3-test/rma/testlist
+++ b/teshsuite/smpi/mpich3-test/rma/testlist
@@ -9,21 +9,21 @@ accfence1 4
 #adlb_mimic1 3
 accfence2 4
 #Needs post
-#putpscw1 4
-#accpscw1 4
+putpscw1 4
+accpscw1 4
 #Needs get_group
 #getgroup 4
 transpose1 2
 transpose2 2
-#Needs post/start
-#transpose3 2
+transpose3 2
 #Needs lock/unlock
 #transpose5 2
 transpose6 1
 transpose7 2
 test1 2
-#Needs post/start
-#test2 2
+test2 2
+#this example will not run if the one-sided operations are simply
+#implemented on top of MPI_Isends and Irecvs -> won't work with SMPI.
 #test3 2
 #Needs lock, unlock
 #test4 2
@@ -37,12 +37,12 @@ test5 2
 #transpose4 2
 #fetchandadd 7
 #fetchandadd_tree 7
-#Needs start, complete
+#Needs MPI_Win_test
 #wintest 2
 #Needs lock, unlock
 #contig_displ 1
 test1_am 2
-#test2_am 2
+test2_am 2
 #test3_am 2
 #test4_am 2
 test5_am 2
@@ -51,7 +51,7 @@ test5_am 2
 accfence2_am 4
 test1_dt 2 timeLimit=30
 #Needs post/start
-#nullpscw 7
+nullpscw 7
 #Needs win_attr
 #attrorderwin 1
 #Needs MPI_Win_call_errhandler