From cc09ab704c00c5177abdb6eedd2955eb04650bb3 Mon Sep 17 00:00:00 2001 From: degomme Date: Tue, 4 Apr 2017 10:06:04 +0200 Subject: [PATCH] activate tests --- teshsuite/smpi/mpich3-test/rma/CMakeLists.txt | 9 +++++---- teshsuite/smpi/mpich3-test/rma/fetch_and_op.c | 2 +- teshsuite/smpi/mpich3-test/rma/fetchandadd.c | 2 +- teshsuite/smpi/mpich3-test/rma/testlist | 17 +++++++++-------- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt b/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt index 9517016cbe..8557967ac0 100644 --- a/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt @@ -13,20 +13,21 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) 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 test3_am test4 test4_am test5_am test5 transpose1 transpose2 lockcontention2 transpose3 transpose4 transpose5 transpose6 transpose7 window_creation selfrma locknull win_info - at_complete acc-pairtype manyget large-small-acc lock_dt win_dynamic_acc + at_complete acc-pairtype manyget large-small-acc lock_dt win_dynamic_acc fetch_and_op flush lock_nested winname attrorderwin baseattrwin fkeyvalwin strided_acc_indexed strided_getacc_indexed + lockall_dt lockall_dt_flushall lock_dt_flush lockall_dt_flush lockall_dt_flushlocalall lockall_dt_flushlocal lock_dt_flushlocal 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 + # fkeyvalwin 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 # manyrma2 mcs-mutex mixedsync mutex_bench lockcontention3 # pscw_ordering put_base put_bottom req_example reqops rmanull rmazero rma-contig selfrma # strided_getacc_indexed_shared # win_flavors 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 - # lockall_dt_flushlocalall lockall_dt_flushlocal lock_contention_dt lock_dt_flush lock_dt_flushlocal + # win_shared_zerobyte aint derived-acc-flush_local large-acc-flush_local + # lock_contention_dt #racc_local_comp rput_local_comp win_shared_create win_shared_put_flush_get win_shared_rma_flush_load # wrma_flush_get add_executable(${file} ${file}.c) diff --git a/teshsuite/smpi/mpich3-test/rma/fetch_and_op.c b/teshsuite/smpi/mpich3-test/rma/fetch_and_op.c index bd10bb6017..97c986bece 100644 --- a/teshsuite/smpi/mpich3-test/rma/fetch_and_op.c +++ b/teshsuite/smpi/mpich3-test/rma/fetch_and_op.c @@ -41,7 +41,7 @@ #endif #define CMP(x, y) ((x - ((TYPE_C) (y))) > 1.0e-9) - +void reset_vars(TYPE_C * val_ptr, TYPE_C * res_ptr, MPI_Win win); void reset_vars(TYPE_C * val_ptr, TYPE_C * res_ptr, MPI_Win win) { int i, rank, nproc; diff --git a/teshsuite/smpi/mpich3-test/rma/fetchandadd.c b/teshsuite/smpi/mpich3-test/rma/fetchandadd.c index 493e158c6b..3323cd5ac3 100644 --- a/teshsuite/smpi/mpich3-test/rma/fetchandadd.c +++ b/teshsuite/smpi/mpich3-test/rma/fetchandadd.c @@ -80,7 +80,7 @@ int main(int argc, char *argv[]) for (i = 0; i < NTIMES; i++) { Get_nextval(win, val_array, get_type, rank, nprocs, counter_vals + i); - /* printf("Rank %d, counter %d\n", rank, value); */ + /* printf("Rank %d, counter %d\n", rank, localvalue); */ } MPI_Win_free(&win); diff --git a/teshsuite/smpi/mpich3-test/rma/testlist b/teshsuite/smpi/mpich3-test/rma/testlist index c7931c1deb..2398830910 100644 --- a/teshsuite/smpi/mpich3-test/rma/testlist +++ b/teshsuite/smpi/mpich3-test/rma/testlist @@ -34,13 +34,13 @@ lockcontention2 8 lockopts 2 #needs get_accumulate lock_dt 2 -#lock_dt_flush 2 -#lock_dt_flushlocal 2 -#lockall_dt 4 timeLimit=240 -#lockall_dt_flush 4 timeLimit=240 -#lockall_dt_flushall 4 timeLimit=240 -#lockall_dt_flushlocal 4 timeLimit=240 -#lockall_dt_flushlocalall 4 timeLimit=240 +lock_dt_flush 2 +lock_dt_flushlocal 2 +lockall_dt 4 timeLimit=240 +lockall_dt_flush 4 timeLimit=240 +lockall_dt_flushall 4 timeLimit=240 +lockall_dt_flushlocal 4 timeLimit=240 +lockall_dt_flushlocalall 4 timeLimit=240 #lock_contention_dt 4 timeLimit=240 transpose4 2 #fetchandadd 7 @@ -100,6 +100,7 @@ win_dynamic_acc 4 #linked_list 4 mpiversion=3.0 #linked_list_fop 4 mpiversion=3.0 #compare_and_swap 4 mpiversion=3.0 +fetch_and_op 4 #fetch_and_op_char 4 mpiversion=3.0 #fetch_and_op_short 4 mpiversion=3.0 #fetch_and_op_int 4 mpiversion=3.0 @@ -114,7 +115,7 @@ win_dynamic_acc 4 #get_accumulate_long_derived 4 mpiversion=3.0 #get_accumulate_short 4 mpiversion=3.0 #get_accumulate_short_derived 4 mpiversion=3.0 -#flush 4 mpiversion=3.0 +flush 4 #reqops 4 mpiversion=3.0 #req_example 4 mpiversion=3.0 win_info 4 -- 2.20.1