X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6e7cd3b98b151c28f744e0a778d7efb82e076c38..db41dc7d999a5792aca42198b5bc87edb2dbfcce:/src/smpi/bindings/smpi_pmpi_win.cpp diff --git a/src/smpi/bindings/smpi_pmpi_win.cpp b/src/smpi/bindings/smpi_pmpi_win.cpp index 16561b1456..a125ec9b0f 100644 --- a/src/smpi/bindings/smpi_pmpi_win.cpp +++ b/src/smpi/bindings/smpi_pmpi_win.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2023. 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. */ @@ -21,8 +21,8 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi_pmpi); CHECK_COUNT(6, target_count)\ CHECK_TYPE(7, target_datatype) -#define CHECK_TARGET_DISP(num)\ - if(win->dynamic()==0)\ +#define CHECK_TARGET_DISP(num) \ + if (not win->dynamic()) \ CHECK_NEGATIVE((num), MPI_ERR_RMA_RANGE, target_disp) /* PMPI User level calls */ @@ -30,8 +30,10 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi_pmpi); int PMPI_Win_create( void *base, MPI_Aint size, int disp_unit, MPI_Info info, MPI_Comm comm, MPI_Win *win){ int retval = 0; CHECK_COMM(5) + CHECK_BUFFER(1, base, size, MPI_BYTE) CHECK_NEGATIVE(2, MPI_ERR_OTHER, size) CHECK_NEGATIVE(3, MPI_ERR_OTHER, disp_unit) + CHECK_COLLECTIVE(comm, __func__) const SmpiBenchGuard suspend_bench; if (base == nullptr && size != 0){ retval= MPI_ERR_OTHER; @@ -49,7 +51,7 @@ int PMPI_Win_allocate( MPI_Aint size, int disp_unit, MPI_Info info, MPI_Comm com void* ptr = xbt_malloc(size); const SmpiBenchGuard suspend_bench; *static_cast(base) = ptr; - *win = new simgrid::smpi::Win( ptr, size, disp_unit, info, comm,1); + *win = new simgrid::smpi::Win(ptr, size, disp_unit, info, comm, true); return MPI_SUCCESS; } @@ -66,7 +68,7 @@ int PMPI_Win_allocate_shared( MPI_Aint size, int disp_unit, MPI_Info info, MPI_C simgrid::smpi::colls::bcast(&ptr, sizeof(void*), MPI_BYTE, 0, comm); simgrid::smpi::colls::barrier(comm); *static_cast(base) = (char*)ptr+rank*size; - *win = new simgrid::smpi::Win( ptr, size, disp_unit, info, comm,rank==0); + *win = new simgrid::smpi::Win(ptr, size, disp_unit, info, comm, rank == 0); return MPI_SUCCESS; } @@ -99,8 +101,14 @@ int PMPI_Win_detach(MPI_Win win, const void* base) int PMPI_Win_free( MPI_Win* win){ CHECK_NULL(1, MPI_ERR_WIN, win) CHECK_WIN(1, (*win)) + CHECK_COLLECTIVE((*win)->comm(), __func__) + if (_smpi_cfg_pedantic && (*win)->opened() == 1){//only check in pedantic mode, as it's not clear this is illegal + XBT_WARN("Attempt to destroy a MPI_Win too early -missing MPI_Win_fence ?"); + return MPI_ERR_WIN; + } const SmpiBenchGuard suspend_bench; - delete *win; + simgrid::smpi::Win::del(*win); + *win = MPI_WIN_NULL; return MPI_SUCCESS; } @@ -166,14 +174,12 @@ int PMPI_Get( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, MPI_Group group; win->get_group(&group); TRACE_smpi_comm_in(my_proc_id, __func__, - new simgrid::instr::Pt2PtTIData("Get", target_rank, origin_datatype->is_replayable() - ? origin_count - : origin_count * origin_datatype->size(), + new simgrid::instr::Pt2PtTIData("Get", target_rank, origin_count, simgrid::smpi::Datatype::encode(origin_datatype))); retval = win->get( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype); TRACE_smpi_comm_out(my_proc_id); - + return retval; } @@ -194,8 +200,7 @@ int PMPI_Rget( void *origin_addr, int origin_count, MPI_Datatype origin_datatype win->get_group(&group); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData( - "Rget", target_rank, - origin_datatype->is_replayable() ? origin_count : origin_count * origin_datatype->size(), + "Rget", target_rank, origin_count, simgrid::smpi::Datatype::encode(origin_datatype))); retval = win->get( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, @@ -220,9 +225,7 @@ int PMPI_Put(const void *origin_addr, int origin_count, MPI_Datatype origin_data win->get_group(&group); aid_t dst_traced = group->actor(target_rank); TRACE_smpi_comm_in(my_proc_id, __func__, - new simgrid::instr::Pt2PtTIData("Put", target_rank, origin_datatype->is_replayable() - ? origin_count - : origin_count * origin_datatype->size(), + new simgrid::instr::Pt2PtTIData("Put", target_rank, origin_count, simgrid::smpi::Datatype::encode(origin_datatype))); TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, SMPI_RMA_TAG, origin_count * origin_datatype->size()); @@ -251,8 +254,7 @@ int PMPI_Rput(const void *origin_addr, int origin_count, MPI_Datatype origin_dat aid_t dst_traced = group->actor(target_rank); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData( - "Rput", target_rank, - origin_datatype->is_replayable() ? origin_count : origin_count * origin_datatype->size(), + "Rput", target_rank, origin_count, simgrid::smpi::Datatype::encode(origin_datatype))); TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, SMPI_RMA_TAG, origin_count * origin_datatype->size()); @@ -279,8 +281,7 @@ int PMPI_Accumulate(const void *origin_addr, int origin_count, MPI_Datatype orig win->get_group(&group); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData( - "Accumulate", target_rank, - origin_datatype->is_replayable() ? origin_count : origin_count * origin_datatype->size(), + "Accumulate", target_rank, origin_count, simgrid::smpi::Datatype::encode(origin_datatype))); retval = win->accumulate( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, op); @@ -309,8 +310,7 @@ int PMPI_Raccumulate(const void *origin_addr, int origin_count, MPI_Datatype ori win->get_group(&group); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData( - "Raccumulate", target_rank, - origin_datatype->is_replayable() ? origin_count : origin_count * origin_datatype->size(), + "Raccumulate", target_rank, origin_count, simgrid::smpi::Datatype::encode(origin_datatype))); retval = win->accumulate( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, @@ -321,14 +321,16 @@ int PMPI_Raccumulate(const void *origin_addr, int origin_count, MPI_Datatype ori return retval; } -int PMPI_Get_accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, void *result_addr, -int result_count, MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, int target_count, -MPI_Datatype target_datatype, MPI_Op op, MPI_Win win){ - CHECK_COUNT(2, origin_count) - if(origin_count>0) - CHECK_TYPE(3, origin_datatype) - if (op != MPI_NO_OP) +int PMPI_Get_accumulate(const void* origin_addr, int origin_count, MPI_Datatype origin_datatype, void* result_addr, + int result_count, MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, + int target_count, MPI_Datatype target_datatype, MPI_Op op, MPI_Win win) +{ + if (op != MPI_NO_OP){ CHECK_BUFFER(1, origin_addr, origin_count, origin_datatype) + CHECK_COUNT(2, origin_count) + if(origin_count>0) + CHECK_TYPE(3, origin_datatype) + } CHECK_COUNT(5, result_count) CHECK_TYPE(6, result_datatype) CHECK_BUFFER(4, result_addr, result_count, result_datatype) @@ -347,8 +349,7 @@ MPI_Datatype target_datatype, MPI_Op op, MPI_Win win){ win->get_group(&group); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData( - "Get_accumulate", target_rank, - target_datatype->is_replayable() ? target_count : target_count * target_datatype->size(), + "Get_accumulate", target_rank, target_count, simgrid::smpi::Datatype::encode(target_datatype))); retval = win->get_accumulate( origin_addr, origin_count, origin_datatype, result_addr, @@ -360,15 +361,18 @@ MPI_Datatype target_datatype, MPI_Op op, MPI_Win win){ return retval; } - -int PMPI_Rget_accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, void *result_addr, -int result_count, MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, int target_count, -MPI_Datatype target_datatype, MPI_Op op, MPI_Win win, MPI_Request* request){ +int PMPI_Rget_accumulate(const void* origin_addr, int origin_count, MPI_Datatype origin_datatype, void* result_addr, + int result_count, MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, + int target_count, MPI_Datatype target_datatype, MPI_Op op, MPI_Win win, MPI_Request* request) +{ if(target_rank==MPI_PROC_NULL) *request = MPI_REQUEST_NULL; - CHECK_COUNT(2, origin_count) - CHECK_TYPE(3, origin_datatype) - CHECK_BUFFER(1, origin_addr, origin_count, origin_datatype) + if (op != MPI_NO_OP){ + CHECK_BUFFER(1, origin_addr, origin_count, origin_datatype) + CHECK_COUNT(2, origin_count) + if(origin_count>0) + CHECK_TYPE(3, origin_datatype) + } CHECK_COUNT(5, result_count) CHECK_TYPE(6, result_datatype) CHECK_BUFFER(4, result_addr, result_count, result_datatype) @@ -387,8 +391,7 @@ MPI_Datatype target_datatype, MPI_Op op, MPI_Win win, MPI_Request* request){ win->get_group(&group); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData( - "Rget_accumulate", target_rank, - target_datatype->is_replayable() ? target_count : target_count * target_datatype->size(), + "Rget_accumulate", target_rank, target_count, simgrid::smpi::Datatype::encode(target_datatype))); retval = win->get_accumulate( origin_addr, origin_count, origin_datatype, result_addr, @@ -423,8 +426,7 @@ int PMPI_Compare_and_swap(const void* origin_addr, void* compare_addr, void* res MPI_Group group; win->get_group(&group); TRACE_smpi_comm_in(my_proc_id, __func__, - new simgrid::instr::Pt2PtTIData("Compare_and_swap", target_rank, - datatype->is_replayable() ? 1 : datatype->size(), + new simgrid::instr::Pt2PtTIData("Compare_and_swap", target_rank, 1, simgrid::smpi::Datatype::encode(datatype))); retval = win->compare_and_swap(origin_addr, compare_addr, result_addr, datatype, target_rank, target_disp);