X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f9e6853d2c5b7b867211700bc12f0ee57f640b30..0a14591b7a8a433bff7aeca6b7b430b7ae27336b:/src/smpi/smpi_global.c diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c index 60e550f84d..84d0a7ec10 100644 --- a/src/smpi/smpi_global.c +++ b/src/smpi/smpi_global.c @@ -72,6 +72,7 @@ void smpi_process_init(int *argc, char ***argv) #ifdef SMPI_F2C smpi_current_rank = index; #endif + data = smpi_process_remote_data(index); simcall_process_set_data(proc, data); if (*argc > 2) { @@ -85,6 +86,11 @@ void smpi_process_init(int *argc, char ***argv) // set the process attached to the mailbox simcall_rdv_set_receiver(data->mailbox_small, proc); XBT_DEBUG("<%d> New process in the game: %p", index, proc); + + if(smpi_privatize_global_variables){ + switch_data_segment(index); + } + } if (smpi_process_data() == NULL) xbt_die("smpi_process_data() returned NULL. You probably gave a NULL parameter to MPI_Init. Although it's required by MPI-2, this is currently not supported by SMPI."); @@ -93,6 +99,9 @@ void smpi_process_init(int *argc, char ***argv) void smpi_process_destroy(void) { int index = smpi_process_index(); + if(smpi_privatize_global_variables){ + switch_data_segment(index); + } process_data[index]->state = SMPI_FINALIZED; XBT_DEBUG("<%d> Process left the game", index); } @@ -296,7 +305,7 @@ MPI_Comm smpi_process_comm_self(void) smpi_process_data_t data = smpi_process_data(); if(data->comm_self==MPI_COMM_NULL){ MPI_Group group = smpi_group_new(1); - data->comm_self = smpi_comm_new(group); + data->comm_self = smpi_comm_new(group, NULL); smpi_group_set_mapping(group, smpi_process_index(), 0); } @@ -334,7 +343,7 @@ static void smpi_comm_copy_buffer_callback(smx_action_t comm, && ((char*)buff >= start_data_exe) && ((char*)buff < start_data_exe + size_data_exe ) ){ - XBT_WARN("Privatization : We are copying from a zone inside global memory... Saving data to temp buffer !"); + XBT_DEBUG("Privatization : We are copying from a zone inside global memory... Saving data to temp buffer !"); switch_data_segment(((smpi_process_data_t)SIMIX_process_get_data(comm->comm.src_proc))->index); tmpbuff = (void*)xbt_malloc(buff_size); memcpy(tmpbuff, buff, buff_size); @@ -345,7 +354,7 @@ static void smpi_comm_copy_buffer_callback(smx_action_t comm, && ((char*)comm->comm.dst_buff >= start_data_exe) && ((char*)comm->comm.dst_buff < start_data_exe + size_data_exe ) ){ - XBT_WARN("Privatization : We are copying to a zone inside global memory - Switch data segment"); + XBT_DEBUG("Privatization : We are copying to a zone inside global memory - Switch data segment"); switch_data_segment(((smpi_process_data_t)SIMIX_process_get_data(comm->comm.dst_proc))->index); } @@ -358,7 +367,7 @@ static void smpi_comm_copy_buffer_callback(smx_action_t comm, //It seems that the request is used after the call there this should //be free somewhereelse but where??? //xbt_free(comm->comm.src_data);// inside SMPI the request is keep - //inside the user data and should be free + //inside the user data and should be free comm->comm.src_buff = NULL; } @@ -366,6 +375,20 @@ static void smpi_comm_copy_buffer_callback(smx_action_t comm, } +static void smpi_check_options(){ + //check correctness of MPI parameters + + xbt_assert(sg_cfg_get_int("smpi/async_small_thres") <= + sg_cfg_get_int("smpi/send_is_detached_thres")); + + if (sg_cfg_is_default_value("smpi/running_power")) { + XBT_INFO("You did not set the power of the host running the simulation. " + "The timings will certainly not be accurate. " + "Use the option \"--cfg=smpi/running_power:\" to set its value." + "Check http://simgrid.org/simgrid/latest/doc/options.html#options_smpi_bench for more information. "); + } +} + void smpi_global_init(void) { int i; @@ -391,7 +414,7 @@ void smpi_global_init(void) process_data[i]->sampling = 0; } group = smpi_group_new(process_count); - MPI_COMM_WORLD = smpi_comm_new(group); + MPI_COMM_WORLD = smpi_comm_new(group, NULL); MPI_UNIVERSE_SIZE = smpi_comm_size(MPI_COMM_WORLD); for (i = 0; i < process_count; i++) { smpi_group_set_mapping(group, i, i); @@ -469,15 +492,7 @@ int __attribute__ ((weak)) MAIN__() }; #endif -int smpi_main(int (*realmain) (int argc, char *argv[]), int argc, char *argv[]) -{ - srand(SMPI_RAND_SEED); - - if (getenv("SMPI_PRETEND_CC") != NULL) { - /* Hack to ensure that smpicc can pretend to be a simple - * compiler. Particularly handy to pass it to the configuration tools */ - return 0; - } +static void smpi_init_logs(){ /* Connect log categories. See xbt/log.c */ XBT_LOG_CONNECT(smpi); /* Keep this line as soon as possible in this @@ -500,6 +515,102 @@ int smpi_main(int (*realmain) (int argc, char *argv[]), int argc, char *argv[]) XBT_LOG_CONNECT(smpi_pmpi); XBT_LOG_CONNECT(smpi_replay); +} + + +static void smpi_init_options(){ + int gather_id = find_coll_description(mpi_coll_gather_description, + sg_cfg_get_string("smpi/gather")); + mpi_coll_gather_fun = (int (*)(void *, int, MPI_Datatype, + void *, int, MPI_Datatype, int, MPI_Comm)) + mpi_coll_gather_description[gather_id].coll; + + int allgather_id = find_coll_description(mpi_coll_allgather_description, + sg_cfg_get_string("smpi/allgather")); + mpi_coll_allgather_fun = (int (*)(void *, int, MPI_Datatype, + void *, int, MPI_Datatype, MPI_Comm)) + mpi_coll_allgather_description[allgather_id].coll; + + int allgatherv_id = find_coll_description(mpi_coll_allgatherv_description, + sg_cfg_get_string("smpi/allgatherv")); + mpi_coll_allgatherv_fun = (int (*)(void *, int, MPI_Datatype, void *, int *, + int *, MPI_Datatype, MPI_Comm)) + mpi_coll_allgatherv_description[allgatherv_id].coll; + + int allreduce_id = find_coll_description(mpi_coll_allreduce_description, + sg_cfg_get_string("smpi/allreduce")); + mpi_coll_allreduce_fun = (int (*)(void *sbuf, void *rbuf, int rcount, + MPI_Datatype dtype, MPI_Op op, + MPI_Comm comm)) + mpi_coll_allreduce_description[allreduce_id].coll; + + int alltoall_id = find_coll_description(mpi_coll_alltoall_description, + sg_cfg_get_string("smpi/alltoall")); + mpi_coll_alltoall_fun = (int (*)(void *, int, MPI_Datatype, + void *, int, MPI_Datatype, MPI_Comm)) + mpi_coll_alltoall_description[alltoall_id].coll; + + int alltoallv_id = find_coll_description(mpi_coll_alltoallv_description, + sg_cfg_get_string("smpi/alltoallv")); + mpi_coll_alltoallv_fun = (int (*)(void *, int *, int *, MPI_Datatype, + void *, int *, int *, MPI_Datatype, + MPI_Comm)) + mpi_coll_alltoallv_description[alltoallv_id].coll; + + int bcast_id = find_coll_description(mpi_coll_bcast_description, + sg_cfg_get_string("smpi/bcast")); + mpi_coll_bcast_fun = (int (*)(void *buf, int count, MPI_Datatype datatype, + int root, MPI_Comm com)) + mpi_coll_bcast_description[bcast_id].coll; + + int reduce_id = find_coll_description(mpi_coll_reduce_description, + sg_cfg_get_string("smpi/reduce")); + mpi_coll_reduce_fun = (int (*)(void *buf, void *rbuf, int count, + MPI_Datatype datatype, MPI_Op op, + int root, MPI_Comm comm)) + mpi_coll_reduce_description[reduce_id].coll; + + int reduce_scatter_id = + find_coll_description(mpi_coll_reduce_scatter_description, + sg_cfg_get_string("smpi/reduce_scatter")); + mpi_coll_reduce_scatter_fun = (int (*)(void *sbuf, void *rbuf, int *rcounts, + MPI_Datatype dtype, MPI_Op op, + MPI_Comm comm)) + mpi_coll_reduce_scatter_description[reduce_scatter_id].coll; + + int scatter_id = find_coll_description(mpi_coll_scatter_description, + sg_cfg_get_string("smpi/scatter")); + mpi_coll_scatter_fun = (int (*)(void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + int root, MPI_Comm comm)) + mpi_coll_scatter_description[scatter_id].coll; + + int barrier_id = find_coll_description(mpi_coll_barrier_description, + sg_cfg_get_string("smpi/barrier")); + mpi_coll_barrier_fun = (int (*)(MPI_Comm comm)) + mpi_coll_barrier_description[barrier_id].coll; + + smpi_cpu_threshold = sg_cfg_get_double("smpi/cpu_threshold"); + smpi_running_power = sg_cfg_get_double("smpi/running_power"); + smpi_privatize_global_variables = sg_cfg_get_boolean("smpi/privatize_global_variables"); + if (smpi_cpu_threshold < 0) + smpi_cpu_threshold = DBL_MAX; + +} + +int smpi_main(int (*realmain) (int argc, char *argv[]), int argc, char *argv[]) +{ + srand(SMPI_RAND_SEED); + + if (getenv("SMPI_PRETEND_CC") != NULL) { + /* Hack to ensure that smpicc can pretend to be a simple + * compiler. Particularly handy to pass it to the configuration tools */ + return 0; + } + + smpi_init_logs(); + #ifdef HAVE_TRACING TRACE_global_init(&argc, argv); @@ -509,96 +620,21 @@ int smpi_main(int (*realmain) (int argc, char *argv[]), int argc, char *argv[]) SIMIX_global_init(&argc, argv); -#ifdef HAVE_TRACING - TRACE_start(); -#endif - // parse the platform file: get the host list SIMIX_create_environment(argv[1]); - + SIMIX_comm_set_copy_data_callback(&smpi_comm_copy_buffer_callback); SIMIX_function_register_default(realmain); SIMIX_launch_application(argv[2]); - int gather_id = find_coll_description(mpi_coll_gather_description, - sg_cfg_get_string("smpi/gather")); - mpi_coll_gather_fun = (int (*)(void *, int, MPI_Datatype, - void *, int, MPI_Datatype, int, MPI_Comm)) - mpi_coll_gather_description[gather_id].coll; - - int allgather_id = find_coll_description(mpi_coll_allgather_description, - sg_cfg_get_string("smpi/allgather")); - mpi_coll_allgather_fun = (int (*)(void *, int, MPI_Datatype, - void *, int, MPI_Datatype, MPI_Comm)) - mpi_coll_allgather_description[allgather_id].coll; - - int allgatherv_id = find_coll_description(mpi_coll_allgatherv_description, - sg_cfg_get_string("smpi/allgatherv")); - mpi_coll_allgatherv_fun = (int (*)(void *, int, MPI_Datatype, void *, int *, - int *, MPI_Datatype, MPI_Comm)) - mpi_coll_allgatherv_description[allgatherv_id].coll; - - int allreduce_id = find_coll_description(mpi_coll_allreduce_description, - sg_cfg_get_string("smpi/allreduce")); - mpi_coll_allreduce_fun = (int (*)(void *sbuf, void *rbuf, int rcount, - MPI_Datatype dtype, MPI_Op op, - MPI_Comm comm)) - mpi_coll_allreduce_description[allreduce_id].coll; - - int alltoall_id = find_coll_description(mpi_coll_alltoall_description, - sg_cfg_get_string("smpi/alltoall")); - mpi_coll_alltoall_fun = (int (*)(void *, int, MPI_Datatype, - void *, int, MPI_Datatype, MPI_Comm)) - mpi_coll_alltoall_description[alltoall_id].coll; - - int alltoallv_id = find_coll_description(mpi_coll_alltoallv_description, - sg_cfg_get_string("smpi/alltoallv")); - mpi_coll_alltoallv_fun = (int (*)(void *, int *, int *, MPI_Datatype, - void *, int *, int *, MPI_Datatype, - MPI_Comm)) - mpi_coll_alltoallv_description[alltoallv_id].coll; - - int bcast_id = find_coll_description(mpi_coll_bcast_description, - sg_cfg_get_string("smpi/bcast")); - mpi_coll_bcast_fun = (int (*)(void *buf, int count, MPI_Datatype datatype, - int root, MPI_Comm com)) - mpi_coll_bcast_description[bcast_id].coll; - - int reduce_id = find_coll_description(mpi_coll_reduce_description, - sg_cfg_get_string("smpi/reduce")); - mpi_coll_reduce_fun = (int (*)(void *buf, void *rbuf, int count, - MPI_Datatype datatype, MPI_Op op, - int root, MPI_Comm comm)) - mpi_coll_reduce_description[reduce_id].coll; - - int reduce_scatter_id = - find_coll_description(mpi_coll_reduce_scatter_description, - sg_cfg_get_string("smpi/reduce_scatter")); - mpi_coll_reduce_scatter_fun = (int (*)(void *sbuf, void *rbuf, int *rcounts, - MPI_Datatype dtype, MPI_Op op, - MPI_Comm comm)) - mpi_coll_reduce_scatter_description[reduce_scatter_id].coll; - - int scatter_id = find_coll_description(mpi_coll_scatter_description, - sg_cfg_get_string("smpi/scatter")); - mpi_coll_scatter_fun = (int (*)(void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - int root, MPI_Comm comm)) - mpi_coll_scatter_description[scatter_id].coll; - - int barrier_id = find_coll_description(mpi_coll_barrier_description, - sg_cfg_get_string("smpi/barrier")); - mpi_coll_barrier_fun = (int (*)(MPI_Comm comm)) - mpi_coll_barrier_description[barrier_id].coll; - - smpi_cpu_threshold = sg_cfg_get_double("smpi/cpu_threshold"); - smpi_running_power = sg_cfg_get_double("smpi/running_power"); - smpi_privatize_global_variables = sg_cfg_get_boolean("smpi/privatize_global_variables"); - if (smpi_cpu_threshold < 0) - smpi_cpu_threshold = DBL_MAX; + smpi_init_options(); smpi_global_init(); + smpi_check_options(); + + if(smpi_privatize_global_variables) + smpi_initialize_global_memory_segments(); + /* Clean IO before the run */ fflush(stdout); fflush(stderr);