X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0d81952833f3bd1d1331c5430f762c05181948d0..dc122c0fb3802061bc2fdb4abd50bf02a224cfdc:/include/smpi/smpi.h diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h index f3cdf0ee90..0322577b82 100644 --- a/include/smpi/smpi.h +++ b/include/smpi/smpi.h @@ -17,6 +17,7 @@ #include #ifdef __cplusplus +#include #include #endif @@ -39,7 +40,7 @@ SG_BEGIN_DECL #define MPI_MAX_PROCESSOR_NAME 100 #define MPI_MAX_NAME_STRING 100 #define MPI_MAX_ERROR_STRING 100 -#define MPI_MAX_DATAREP_STRIN 100 +#define MPI_MAX_DATAREP_STRING 128 #define MPI_MAX_INFO_KEY 100 #define MPI_MAX_INFO_VAL 100 #define MPI_MAX_OBJECT_NAME 100 @@ -153,6 +154,7 @@ enum ERROR_ENUM { #define MPI_TAG_LB -6 #define MPI_UNIVERSE_SIZE -7 #define MPI_LASTUSEDCODE -8 +#define MPI_KEYVAL_INVALID -9 #define MPI_MODE_NOSTORE 0x1 #define MPI_MODE_NOPUT 0x2 @@ -160,15 +162,10 @@ enum ERROR_ENUM { #define MPI_MODE_NOSUCCEED 0x8 #define MPI_MODE_NOCHECK 0x10 -#define MPI_KEYVAL_INVALID 0 #define MPI_NULL_COPY_FN NULL #define MPI_NULL_DELETE_FN NULL #define MPI_ERR_LASTCODE 74 -#define MPI_CXX_BOOL MPI_DATATYPE_NULL -#define MPI_CXX_FLOAT_COMPLEX MPI_DATATYPE_NULL -#define MPI_CXX_DOUBLE_COMPLEX MPI_DATATYPE_NULL -#define MPI_CXX_LONG_DOUBLE_COMPLEX MPI_DATATYPE_NULL #define MPI_REAL2 MPI_DATATYPE_NULL #define MPI_COMPLEX4 MPI_DATATYPE_NULL @@ -210,7 +207,6 @@ enum ERROR_ENUM { #define MPI_SEEK_SET 600 #define MPI_SEEK_CUR 602 #define MPI_SEEK_END 604 -#define MPI_MAX_DATAREP_STRING 128 #define MPI_WIN_BASE -1 #define MPI_WIN_SIZE -2 @@ -308,6 +304,10 @@ extern SMPI_Datatype smpi_MPI_INTEGER4; extern SMPI_Datatype smpi_MPI_INTEGER8; extern SMPI_Datatype smpi_MPI_INTEGER16; extern SMPI_Datatype smpi_MPI_COUNT; +extern SMPI_Datatype smpi_MPI_CXX_BOOL; +extern SMPI_Datatype smpi_MPI_MPI_CXX_FLOAT_COMPLEX; +extern SMPI_Datatype smpi_MPI_MPI_CXX_DOULE_COMPLEX; +extern SMPI_Datatype smpi_MPI_MPI_CXX_LONG_DOUBLE_COMPLEX; #define MPI_DATATYPE_NULL SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_DATATYPE_NULL) #define MPI_CHAR SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_CHAR) @@ -369,6 +369,18 @@ extern SMPI_Datatype smpi_MPI_COUNT; #define MPI_INTEGER16 SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_INTEGER16) #define MPI_COUNT SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_COUNT) +#if defined(c_plusplus) || defined(__cplusplus) +#define MPI_CXX_BOOL SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_CXX_BOOL) +#define MPI_CXX_FLOAT_COMPLEX SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_CXX_FLOAT_COMPLEX) +#define MPI_CXX_DOUBLE_COMPLEX SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_CXX_DOUBLE_COMPLEX) +#define MPI_CXX_LONG_DOUBLE_COMPLEX SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_CXX_LONG_DOUBLE_COMPLEX) +#else +#define MPI_CXX_BOOL MPI_DATATYPE_NULL +#define MPI_CXX_FLOAT_COMPLEX MPI_DATATYPE_NULL +#define MPI_CXX_DOUBLE_COMPLEX MPI_DATATYPE_NULL +#define MPI_CXX_LONG_DOUBLE_COMPLEX MPI_DATATYPE_NULL +#endif + //defines for fortran compatibility #if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__) || defined(__aarch64__) #define MPI_INTEGER MPI_INT @@ -1037,8 +1049,9 @@ MPI_CALL(XBT_PUBLIC int, MPI_Dist_graph_create, (MPI_Comm comm_old, int n, const const int* weights, MPI_Info info, int reorder, MPI_Comm* comm_dist_graph)); MPI_CALL(XBT_PUBLIC int, MPI_Dist_graph_create_adjacent, (MPI_Comm comm_old, int indegree, const int* sources, const int* sourceweights, int outdegree, const int* destinations, const int* destweights, MPI_Info info, int reorder, MPI_Comm* comm_dist_graph)); -MPI_CALL(XBT_PUBLIC int, MPI_Dist_graph_neighbors, (MPI_Comm comm, int maxindegree, int* sources, int* sourceweights, - int maxoutdegree, int* destinations, int* destweights)); +MPI_CALL(XBT_PUBLIC int, MPI_Dist_graph_neighbors, + (MPI_Comm comm, int maxindegree, int* sources, int* sourceweights, int maxoutdegree, int* destinations, + int* destweights)); MPI_CALL(XBT_PUBLIC int, MPI_Dist_graph_neighbors_count, (MPI_Comm comm, int *indegree, int *outdegree, int *weighted)); MPI_CALL(XBT_PUBLIC int, MPI_Win_test, (MPI_Win win, int* flag)); @@ -1137,12 +1150,15 @@ XBT_PUBLIC void smpi_execute_flops_benched(double flops); XBT_PUBLIC void smpi_execute(double duration); XBT_PUBLIC void smpi_execute_benched(double duration); +XBT_PUBLIC void smpi_bench_begin(); +XBT_PUBLIC void smpi_bench_end(); + XBT_PUBLIC unsigned long long smpi_rastro_resolution(); XBT_PUBLIC unsigned long long smpi_rastro_timestamp(); -XBT_PUBLIC void smpi_sample_1(int global, const char* file, int line, int iters, double threshold); -XBT_PUBLIC int smpi_sample_2(int global, const char* file, int line, int iter_count); -XBT_PUBLIC void smpi_sample_3(int global, const char* file, int line); -XBT_PUBLIC int smpi_sample_exit(int global, const char* file, int line, int iter_count); +XBT_PUBLIC void smpi_sample_1(int global, const char* file, const char* tag, int iters, double threshold); +XBT_PUBLIC int smpi_sample_2(int global, const char* file, const char* tag, int iter_count); +XBT_PUBLIC void smpi_sample_3(int global, const char* file, const char* tag); +XBT_PUBLIC int smpi_sample_exit(int global, const char* file, const char* tag, int iter_count); /** * Need a public setter for SMPI copy_callback function, so users can define * their own while still using default SIMIX_copy_callback for S4U copies. @@ -1162,7 +1178,12 @@ XBT_PUBLIC void smpi_trace_set_call_location__(const char* file, const int* line #define SMPI_ITER_NAME1(line) _XBT_CONCAT(iter_count, line) #define SMPI_ITER_NAME(line) SMPI_ITER_NAME1(line) -#define SMPI_SAMPLE_LOOP(loop_init, loop_end, loop_iter, global, iters, thres) \ +#define SMPI_CTAG_NAME1(line) _XBT_CONCAT(ctag, line) +#define SMPI_CTAG_NAME(line) SMPI_CTAG_NAME1(line) + +#define SMPI_SAMPLE_LOOP(loop_init, loop_end, loop_iter, global, iters, thres, tag) \ + char SMPI_CTAG_NAME(__LINE__) [132]; \ + snprintf( SMPI_CTAG_NAME(__LINE__), 132, "%s%d", tag, __LINE__); \ int SMPI_ITER_NAME(__LINE__) = 0; \ { \ loop_init; \ @@ -1171,14 +1192,20 @@ XBT_PUBLIC void smpi_trace_set_call_location__(const char* file, const int* line (loop_iter); \ } \ } \ - for (loop_init; (loop_end) ? (smpi_sample_1((global), __FILE__, __LINE__, (iters), (thres)), \ - (smpi_sample_2((global), __FILE__, __LINE__, SMPI_ITER_NAME(__LINE__)))) \ - : smpi_sample_exit((global), __FILE__, __LINE__, SMPI_ITER_NAME(__LINE__)); \ - smpi_sample_3((global), __FILE__, __LINE__), (loop_iter)) + for ( loop_init; \ + (loop_end) ? (smpi_sample_1((global), __FILE__, SMPI_CTAG_NAME(__LINE__), (iters), (thres)) \ + , (smpi_sample_2((global), __FILE__, SMPI_CTAG_NAME(__LINE__), SMPI_ITER_NAME(__LINE__)))) \ + : smpi_sample_exit((global), __FILE__, SMPI_CTAG_NAME(__LINE__), SMPI_ITER_NAME(__LINE__)); \ + smpi_sample_3((global), __FILE__, SMPI_CTAG_NAME(__LINE__)), (loop_iter) ) + #define SMPI_SAMPLE_LOCAL(loop_init, loop_end, loop_iter, iters, thres) \ - SMPI_SAMPLE_LOOP(loop_init, (loop_end), (loop_iter), 0, (iters), (thres)) + SMPI_SAMPLE_LOOP(loop_init, (loop_end), (loop_iter), 0, (iters), (thres), "") +#define SMPI_SAMPLE_LOCAL_TAG(loop_init, loop_end, loop_iter, iters, thres, tag) \ + SMPI_SAMPLE_LOOP(loop_init, (loop_end), (loop_iter), 0, (iters), (thres), tag) #define SMPI_SAMPLE_GLOBAL(loop_init, loop_end, loop_iter, iters, thres) \ - SMPI_SAMPLE_LOOP(loop_init, (loop_end), (loop_iter), 1, (iters), (thres)) + SMPI_SAMPLE_LOOP(loop_init, (loop_end), (loop_iter), 1, (iters), (thres), "") +#define SMPI_SAMPLE_GLOBAL_TAG(loop_init, loop_end, loop_iter, iters, thres, tag) \ + SMPI_SAMPLE_LOOP(loop_init, (loop_end), (loop_iter), 1, (iters), (thres), tag) #define SMPI_SAMPLE_DELAY(duration) for(smpi_execute(duration); 0; ) #define SMPI_SAMPLE_FLOPS(flops) for(smpi_execute_flops(flops); 0; ) XBT_PUBLIC void* smpi_shared_malloc(size_t size, const char* file, int line); @@ -1215,7 +1242,7 @@ XBT_PUBLIC void SMPI_thread_create(); SG_END_DECL -/* C++ declarations for shared_malloc */ +/* C++ declarations for shared_malloc and default copy buffer callback */ #ifdef __cplusplus XBT_PUBLIC int smpi_is_shared(const void* ptr, std::vector>& private_blocks, size_t* offset); @@ -1223,6 +1250,31 @@ std::vector> shift_and_frame_private_blocks(const std: size_t offset, size_t buff_size); std::vector> merge_private_blocks(const std::vector>& src, const std::vector>& dst); + +/* May be used by S4U simulations to manually initialize SMPI */ +XBT_PUBLIC void smpi_comm_copy_buffer_callback(simgrid::kernel::activity::CommImpl* comm, void* buff, + size_t buff_size); + +/** + * @brief Callback to set cost for SMPI operations (send, recv, isend) + * + * This callback replaces the configuration parameters smpi/or, smpi/os, smpi/ois. + * It offers more flexibility for cost functions. + * + * @param size Size of message being received/sent + * @param source Source host + * @param dst Destination host + */ +using SmpiOpCostCb = std::function; +/** @brief SMPI functions that accept cost functions */ +enum class SmpiOperation { RECV = 2, SEND = 1, ISEND = 0 }; +/** + * @brief Register a cost callback for some SMPI function (MPI_Send, MPI_ISend or MPI_Recv) + * + * @param op SMPI function + * @param cb User's callback + */ +XBT_PUBLIC void smpi_register_op_cost_callback(SmpiOperation op, const SmpiOpCostCb& cb); #endif -#endif +#endif