X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/48eb2f1b9262fc74f527816c348ed2aa6efa9f65..5422a5f5f25d733a237a88508ad66999c25b2839:/src/smpi/colls/smpi_automatic_selector.cpp diff --git a/src/smpi/colls/smpi_automatic_selector.cpp b/src/smpi/colls/smpi_automatic_selector.cpp index 3ffffa0278..8e816ca2f3 100644 --- a/src/smpi/colls/smpi_automatic_selector.cpp +++ b/src/smpi/colls/smpi_automatic_selector.cpp @@ -1,54 +1,46 @@ -/* Copyright (c) 2013-2017. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ #include - #include -#include "colls_private.h" -#include "smpi_process.hpp" - +#include "colls_private.hpp" +#include "src/smpi/include/smpi_actor.hpp" //attempt to do a quick autotuning version of the collective, - -#define TRACE_AUTO_COLL(cat) \ - if (TRACE_is_enabled()) { \ - type_t type = PJ_type_get_or_null(#cat, PJ_type_get_root()); \ - if (not type) { \ - type = PJ_type_event_new(#cat, PJ_type_get_root()); \ - } \ - char cont_name[25]; \ - snprintf(cont_name, 25, "rank-%d", smpi_process()->index()); \ - value* val = value::get_or_new(Colls::mpi_coll_##cat##_description[i].name, "1.0 1.0 1.0", type); \ - new NewEvent(SIMIX_get_clock(), PJ_container_get(cont_name), type, val); \ - } - #define AUTOMATIC_COLL_BENCH(cat, ret, args, args2) \ - ret Coll_##cat##_automatic::cat(COLL_UNPAREN args) \ + ret _XBT_CONCAT2(cat, __automatic)(COLL_UNPAREN args) \ { \ double time1, time2, time_min = DBL_MAX; \ int min_coll = -1, global_coll = -1; \ - int i; \ double buf_in, buf_out, max_min = DBL_MAX; \ - for (i = 0; Colls::mpi_coll_##cat##_description[i].name; i++) { \ - if (not strcmp(Colls::mpi_coll_##cat##_description[i].name, "automatic")) \ + auto descriptions = simgrid::smpi::colls::get_smpi_coll_descriptions(_XBT_STRINGIFY(cat)); \ + for (unsigned long i = 0; i < descriptions->size(); i++) { \ + auto desc = &descriptions->at(i); \ + if (desc->name == "automatic" || desc->name == "default") \ continue; \ - if (not strcmp(Colls::mpi_coll_##cat##_description[i].name, "default")) \ - continue; \ - Coll_barrier_default::barrier(comm); \ - TRACE_AUTO_COLL(cat) \ + barrier__default(comm); \ + if (TRACE_is_enabled()) { \ + simgrid::instr::EventType* type = \ + simgrid::instr::Container::get_root()->type_->by_name_or_create( \ + _XBT_STRINGIFY(cat)); \ + \ + std::string cont_name = std::string("rank-" + std::to_string(simgrid::s4u::this_actor::get_pid())); \ + type->add_entity_value(desc->name, "1.0 1.0 1.0"); \ + new simgrid::instr::NewEvent(SIMIX_get_clock(), simgrid::instr::Container::by_name(cont_name), type, \ + type->get_entity_value(desc->name)); \ + } \ time1 = SIMIX_get_clock(); \ try { \ - ((int(*) args)Colls::mpi_coll_##cat##_description[i].coll) args2; \ + ((int(*) args)desc->coll) args2; \ } catch (std::exception & ex) { \ continue; \ } \ time2 = SIMIX_get_clock(); \ buf_out = time2 - time1; \ - Coll_reduce_default::reduce((void*)&buf_out, (void*)&buf_in, 1, MPI_DOUBLE, MPI_MAX, 0, comm); \ + reduce__default((void*)&buf_out, (void*)&buf_in, 1, MPI_DOUBLE, MPI_MAX, 0, comm); \ if (time2 - time1 < time_min) { \ min_coll = i; \ time_min = time2 - time1; \ @@ -62,28 +54,28 @@ } \ if (comm->rank() == 0) { \ XBT_WARN("For rank 0, the quickest was %s : %f , but global was %s : %f at max", \ - Colls::mpi_coll_##cat##_description[min_coll].name, time_min, \ - Colls::mpi_coll_##cat##_description[global_coll].name, max_min); \ + descriptions->at(min_coll).name.c_str(), time_min, descriptions->at(global_coll).name.c_str(), \ + max_min); \ } else \ - XBT_WARN("The quickest %s was %s on rank %d and took %f", #cat, \ - Colls::mpi_coll_##cat##_description[min_coll].name, comm->rank(), time_min); \ + XBT_WARN("The quickest " _XBT_STRINGIFY(cat) " was %s on rank %d and took %f", \ + descriptions->at(min_coll).name.c_str(), comm->rank(), time_min); \ return (min_coll != -1) ? MPI_SUCCESS : MPI_ERR_INTERN; \ } namespace simgrid{ namespace smpi{ -COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_ALLGATHERV_SIG, (send_buff, send_count, send_type, recv_buff, recv_count, recv_disps, recv_type, comm)); -COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_ALLREDUCE_SIG, (sbuf, rbuf, rcount, dtype, op, comm)); -COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_GATHER_SIG, (send_buff, send_count, send_type, recv_buff, recv_count, recv_type, root, comm)); -COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_ALLGATHER_SIG, (send_buff,send_count,send_type,recv_buff,recv_count,recv_type,comm)); -COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_ALLTOALL_SIG,(send_buff, send_count, send_type, recv_buff, recv_count, recv_type,comm)); -COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_ALLTOALLV_SIG, (send_buff, send_counts, send_disps, send_type, recv_buff, recv_counts, recv_disps, recv_type, comm)); -COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_BCAST_SIG , (buf, count, datatype, root, comm)); -COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_REDUCE_SIG,(buf,rbuf, count, datatype, op, root, comm)); -COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_REDUCE_SCATTER_SIG ,(sbuf,rbuf, rcounts,dtype,op,comm)); -COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_SCATTER_SIG ,(sendbuf, sendcount, sendtype,recvbuf, recvcount, recvtype,root, comm)); -COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_BARRIER_SIG,(comm)); +COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_ALLGATHERV_SIG, (send_buff, send_count, send_type, recv_buff, recv_count, recv_disps, recv_type, comm)) +COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_ALLREDUCE_SIG, (sbuf, rbuf, rcount, dtype, op, comm)) +COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_GATHER_SIG, (send_buff, send_count, send_type, recv_buff, recv_count, recv_type, root, comm)) +COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_ALLGATHER_SIG, (send_buff,send_count,send_type,recv_buff,recv_count,recv_type,comm)) +COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_ALLTOALL_SIG,(send_buff, send_count, send_type, recv_buff, recv_count, recv_type,comm)) +COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_ALLTOALLV_SIG, (send_buff, send_counts, send_disps, send_type, recv_buff, recv_counts, recv_disps, recv_type, comm)) +COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_BCAST_SIG , (buf, count, datatype, root, comm)) +COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_REDUCE_SIG,(buf,rbuf, count, datatype, op, root, comm)) +COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_REDUCE_SCATTER_SIG ,(sbuf,rbuf, rcounts,dtype,op,comm)) +COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_SCATTER_SIG ,(sendbuf, sendcount, sendtype,recvbuf, recvcount, recvtype,root, comm)) +COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_BARRIER_SIG,(comm)) } }