From bff48880e34a54e84035e9bedcfcaf458bcefb19 Mon Sep 17 00:00:00 2001 From: degomme Date: Mon, 20 Mar 2017 11:49:59 +0100 Subject: [PATCH] Activate Win_lock/unlock tests --- teshsuite/smpi/mpich3-test/rma/CMakeLists.txt | 16 +++---- .../smpi/mpich3-test/rma/lockcontention.c | 4 +- teshsuite/smpi/mpich3-test/rma/testlist | 45 +++++++++---------- 3 files changed, 31 insertions(+), 34 deletions(-) diff --git a/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt b/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt index e593b5561e..efe580ee27 100644 --- a/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt @@ -10,19 +10,19 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") - foreach(file accfence1 accfence2_am accfence2 accpscw1 allocmem epochtest getfence1 getgroup manyrma3 nullpscw - putfence1 putfidx putpscw1 test1_am test1 test1_dt test2_am test2 test3 test5_am test5 transpose1 transpose2 - transpose3 transpose5 transpose6 transpose7 window_creation + foreach(file accfence1 accfence2_am accfence2 accpscw1 allocmem epochtest getfence1 getgroup manyrma3 nullpscw lockcontention lockopts contig_displ + putfence1 putfidx putpscw1 test1_am test1 test1_dt test2_am test2 test3 test4 test5_am test5 transpose1 transpose2 lockcontention2 + transpose3 transpose4 transpose5 transpose6 transpose7 window_creation selfrma locknull at_complete acc-pairtype manyget large-small-acc - lock_nested winname attrorderwin baseattrwin fkeyvalwin) + lock_nested winname attrorderwin baseattrwin fkeyvalwin strided_acc_indexed + strided_acc_onelock strided_get_indexed strided_putget_indexed contention_put contention_putget) # not compiled files: acc-loc adlb_mimic1 badrma compare_and_swap contention_put # contention_putget contig_displ fence_shm fetchandadd_am fetchandadd fetchandadd_tree_am fetchandadd_tree # fetch_and_op fkeyvalwin flush get_acc_local get_accumulate linked_list_bench_lock_all # linked_list_bench_lock_excl linked_list_bench_lock_shr linked_list linked_list_fop linked_list_lockall - # lockcontention2 lockcontention3 lockcontention locknull lockopts manyrma2 mcs-mutex mixedsync mutex_bench - # pscw_ordering put_base put_bottom req_example reqops rmanull rmazero rma-contig selfrma strided_acc_indexed - # strided_acc_onelock strided_acc_subarray strided_getacc_indexed strided_getacc_indexed_shared strided_get_indexed - # strided_putget_indexed strided_putget_indexed_shared test3_am test4_am test4 transpose4 wincall + # manyrma2 mcs-mutex mixedsync mutex_bench lockcontention3 + # pscw_ordering put_base put_bottom req_example reqops rmanull rmazero rma-contig selfrma + # strided_acc_subarray strided_getacc_indexed strided_getacc_indexed_shared # win_dynamic_acc win_flavors win_info win_shared win_shared_noncontig win_shared_noncontig_put # win_large_shm win_zero wintest get-struct atomic_rmw_fop atomic_rmw_gacc rget-unlock atomic_get atomic_rmw_cas # win_shared_zerobyte aint derived-acc-flush_local large-acc-flush_local lockall_dt lockall_dt_flushall diff --git a/teshsuite/smpi/mpich3-test/rma/lockcontention.c b/teshsuite/smpi/mpich3-test/rma/lockcontention.c index 81651194c1..37105ac14f 100644 --- a/teshsuite/smpi/mpich3-test/rma/lockcontention.c +++ b/teshsuite/smpi/mpich3-test/rma/lockcontention.c @@ -14,8 +14,8 @@ optimization. */ -#define SIZE1 100 -#define SIZE2 200 +#define SIZE1 10 +#define SIZE2 20 int main(int argc, char *argv[]) { diff --git a/teshsuite/smpi/mpich3-test/rma/testlist b/teshsuite/smpi/mpich3-test/rma/testlist index 8e01cc7242..8525de3915 100644 --- a/teshsuite/smpi/mpich3-test/rma/testlist +++ b/teshsuite/smpi/mpich3-test/rma/testlist @@ -21,17 +21,18 @@ transpose7 2 test1 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 +#implemented on top of MPI_Isends and Irecvs +test3 2 +test4 2 test5 2 #Needs lock, unlock -#lockcontention 3 -#lockcontention2 4 -#lockcontention2 8 +lockcontention 3 +lockcontention2 4 +lockcontention2 8 +#Buggy one. #lockcontention3 8 -#lockopts 2 +lockopts 2 +#needs get_accumulate #lock_dt 2 #lock_dt_flush 2 #lock_dt_flushlocal 2 @@ -41,13 +42,12 @@ test5 2 #lockall_dt_flushlocal 4 timeLimit=240 #lockall_dt_flushlocalall 4 timeLimit=240 #lock_contention_dt 4 timeLimit=240 -#transpose4 2 +transpose4 2 #fetchandadd 7 #fetchandadd_tree 7 #Needs MPI_Win_test #wintest 2 -#Needs lock, unlock -#contig_displ 1 +contig_displ 1 test1_am 2 test2_am 2 #test3_am 2 @@ -64,28 +64,25 @@ attrorderwin 1 #wincall 2 baseattrwin 1 fkeyvalwin 1 -#Needs lock, unlock -#selfrma 1 +selfrma 1 #mixedsync 4 epochtest 3 -#Needs lock, unlock -#locknull 2 +locknull 2 #Needs MPI_Rput, rget, racumulate, MPI_Fetch_and_op, MPI_Compare_and_swap #rmanull 2 #rmazero 2 -#Needs lock, unlock -#strided_acc_indexed 2 -#strided_acc_onelock 2 +strided_acc_indexed 2 +strided_acc_onelock 2 +#needs MPI_Type_create_subarray #strided_acc_subarray 2 -#strided_get_indexed 2 -#strided_putget_indexed 4 +strided_get_indexed 2 +strided_putget_indexed 4 #strided_putget_indexed_shared 4 mpiversion=3.0 #strided_getacc_indexed 4 mpiversion=3.0 #strided_getacc_indexed_shared 4 mpiversion=3.0 window_creation 2 -#Needs lock, unlock -#contention_put 4 -#contention_putget 4 +contention_put 4 +contention_putget 4 #put_base 2 #put_bottom 2 #win_flavors 4 mpiversion=3.0 @@ -165,7 +162,7 @@ large-small-acc 2 #overlap_wins_gacc 3 #overlap_wins_fop 3 #overlap_wins_cas 3 -#lock_nested 3 +lock_nested 3 ## This test is not strictly correct. This was meant to test out the ## case when MPI_Test is not nonblocking. However, we ended up -- 2.20.1