Skip to content

master: portals4: fix compiler warnings in all the Portals4 components #9391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 28, 2021
Merged

master: portals4: fix compiler warnings in all the Portals4 components #9391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ompi/mca/coll/portals4/coll_portals4_component.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,11 @@ portals4_module_enable(mca_coll_base_module_t *module,
return OMPI_SUCCESS;
}


#if OPAL_ENABLE_DEBUG
/* These string maps are only used for debugging output.
* They will be compiled-out when OPAL is configured
* without --enable-debug.
*/
static char *failtype[] = {
"PTL_NI_OK",
"PTL_NI_PERM_VIOLATION",
Expand Down Expand Up @@ -695,6 +699,7 @@ static char *evname[] = {
"PTL_EVENT_SEARCH",
"PTL_EVENT_LINK"
};
#endif

/* Target EQ */
static int
Expand Down
28 changes: 11 additions & 17 deletions ompi/mca/coll/portals4/coll_portals4_gather.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ static ompi_coll_portals4_tree_t*
ompi_coll_portals4_build_in_order_bmtree( struct ompi_communicator_t* comm,
int root )
{
int childs = 0, rank, vrank, vparent, size, mask = 1, remote, i;
int childs = 0, rank, vrank, vparent, size, mask = 1, remote;
ompi_coll_portals4_tree_t *bmtree;

/*
Expand All @@ -97,7 +97,7 @@ ompi_coll_portals4_build_in_order_bmtree( struct ompi_communicator_t* comm,
bmtree->tree_bmtree = 1;
bmtree->tree_root = MPI_UNDEFINED;
bmtree->tree_nextsize = MPI_UNDEFINED;
for(i=0;i<MAXTREEFANOUT;i++) {
for(int i = 0; i < MAXTREEFANOUT; i++) {
bmtree->tree_next[i] = -1;
}

Expand Down Expand Up @@ -520,8 +520,6 @@ ompi_coll_portals4_gather_intra_binomial_top(const void *sbuf, int scount, struc

int vrank=-1;

int32_t i=0;

ompi_coll_portals4_tree_t* bmtree;

int32_t expected_ops =0;
Expand Down Expand Up @@ -606,7 +604,7 @@ ompi_coll_portals4_gather_intra_binomial_top(const void *sbuf, int scount, struc
"%s:%d: packed_size=%lu, fragment_size=%lu",
__FILE__, __LINE__, request->u.gather.packed_size, mca_coll_portals4_component.ni_limits.max_msg_size));

for (int i =0; i < bmtree->tree_nextsize; i++) {
for (int i = 0; i < bmtree->tree_nextsize; i++) {
int child_vrank = VRANK(bmtree->tree_next[i], request->u.gather.root_rank, request->u.gather.size);
int sub_tree_size = get_tree_numdescendants_of(comm, child_vrank) + 1;
ptl_size_t local_number_of_fragment = ((sub_tree_size * request->u.gather.packed_size) + mca_coll_portals4_component.ni_limits.max_msg_size -1) / mca_coll_portals4_component.ni_limits.max_msg_size;
Expand Down Expand Up @@ -688,7 +686,7 @@ ompi_coll_portals4_gather_intra_binomial_top(const void *sbuf, int scount, struc
/************************************/
/* put Recv-ACK to each child */
/************************************/
for (i=0;i<bmtree->tree_nextsize;i++) {
for (int i = 0; i < bmtree->tree_nextsize; i++) {
int32_t child=bmtree->tree_next[i];
ret = PtlTriggeredPut(request->u.gather.sync_mdh,
0,
Expand Down Expand Up @@ -730,7 +728,7 @@ ompi_coll_portals4_gather_intra_binomial_top(const void *sbuf, int scount, struc
/**********************************/
/* put RTR to each child */
/**********************************/
for (i=0;i<bmtree->tree_nextsize;i++) {
for (int i = 0; i < bmtree->tree_nextsize; i++) {
int32_t child=bmtree->tree_next[i];
ret = PtlTriggeredPut(request->u.gather.sync_mdh,
0,
Expand All @@ -750,7 +748,7 @@ ompi_coll_portals4_gather_intra_binomial_top(const void *sbuf, int scount, struc
/**********************************/
/* put RTR to each child */
/**********************************/
for (i=0;i<bmtree->tree_nextsize;i++) {
for (int i = 0; i < bmtree->tree_nextsize; i++) {
int32_t child=bmtree->tree_next[i];
ret = PtlPut(request->u.gather.sync_mdh,
0,
Expand Down Expand Up @@ -818,8 +816,6 @@ ompi_coll_portals4_gather_intra_linear_top(const void *sbuf, int scount, struct

int8_t i_am_root;

int32_t i=0;

int32_t expected_ops =0;
int32_t expected_acks=0;

Expand Down Expand Up @@ -975,7 +971,7 @@ ompi_coll_portals4_gather_intra_linear_top(const void *sbuf, int scount, struct
/* root puts Recv-ACK to all other ranks */
/*****************************************/
if (i_am_root) {
for (i=0;i<request->u.gather.size;i++) {
for (int i = 0; i < request->u.gather.size; i++) {
if (i == request->u.gather.root_rank) { continue; }
ret = PtlTriggeredPut(request->u.gather.sync_mdh,
0,
Expand Down Expand Up @@ -1019,7 +1015,7 @@ ompi_coll_portals4_gather_intra_linear_top(const void *sbuf, int scount, struct
/* root puts RTR to all other ranks */
/************************************/
if (i_am_root) {
for (i=0;i<request->u.gather.size;i++) {
for (int i = 0; i < request->u.gather.size; i++) {
if (i == request->u.gather.root_rank) { continue; }
ret = PtlTriggeredPut(request->u.gather.sync_mdh,
0,
Expand All @@ -1041,7 +1037,7 @@ ompi_coll_portals4_gather_intra_linear_top(const void *sbuf, int scount, struct
/* root puts RTR to all other ranks */
/************************************/
if (i_am_root) {
for (i=0;i<request->u.gather.size;i++) {
for (int i = 0; i < request->u.gather.size; i++) {
if (i == request->u.gather.root_rank) { continue; }
ret = PtlPut(request->u.gather.sync_mdh,
0,
Expand Down Expand Up @@ -1093,7 +1089,6 @@ ompi_coll_portals4_gather_intra_binomial_bottom(struct ompi_communicator_t *comm
ompi_coll_portals4_request_t *request)
{
int ret, line;
int i;

OPAL_OUTPUT_VERBOSE((10, ompi_coll_base_framework.framework_output,
"coll:portals4:gather_intra_binomial_bottom enter rank %d", request->u.gather.my_rank));
Expand All @@ -1109,7 +1104,7 @@ ompi_coll_portals4_gather_intra_binomial_bottom(struct ompi_communicator_t *comm
struct iovec iov;
size_t max_data;

for (i=0;i<request->u.gather.size;i++) {
for (int i = 0; i < request->u.gather.size; i++) {
uint64_t offset = request->u.gather.unpack_dst_extent * request->u.gather.unpack_dst_count * ((request->u.gather.my_rank + i) % request->u.gather.size);

opal_output_verbose(30, ompi_coll_base_framework.framework_output,
Expand Down Expand Up @@ -1161,7 +1156,6 @@ ompi_coll_portals4_gather_intra_linear_bottom(struct ompi_communicator_t *comm,
ompi_coll_portals4_request_t *request)
{
int ret, line;
int i;

OPAL_OUTPUT_VERBOSE((10, ompi_coll_base_framework.framework_output,
"coll:portals4:gather_intra_linear_bottom enter rank %d", request->u.gather.my_rank));
Expand All @@ -1177,7 +1171,7 @@ ompi_coll_portals4_gather_intra_linear_bottom(struct ompi_communicator_t *comm,
struct iovec iov;
size_t max_data;

for (i=0;i<request->u.gather.size;i++) {
for (int i = 0; i < request->u.gather.size; i++) {
ompi_coll_portals4_create_recv_converter (&request->u.gather.recv_converter,
request->u.gather.unpack_dst_buf + (request->u.gather.unpack_dst_extent*request->u.gather.unpack_dst_count*i),
ompi_comm_peer_lookup(comm, request->u.gather.my_rank),
Expand Down
2 changes: 1 addition & 1 deletion ompi/mca/coll/portals4/coll_portals4_request.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ request_free(struct ompi_request_t **ompi_req)
ompi_coll_portals4_request_t *request =
(ompi_coll_portals4_request_t*) *ompi_req;

if (true != request->super.req_complete) {
if (!REQUEST_COMPLETE(&request->super)) {
return MPI_ERR_REQUEST;
}

Expand Down
1 change: 0 additions & 1 deletion ompi/mca/coll/portals4/coll_portals4_request.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@ OBJ_CLASS_DECLARATION(ompi_coll_portals4_request_t);
req = (ompi_coll_portals4_request_t*) item; \
OMPI_REQUEST_INIT(&req->super, false); \
req->super.req_mpi_object.comm = comm; \
req->super.req_complete = false; \
req->super.req_state = OMPI_REQUEST_ACTIVE; \
} while (0)

Expand Down
55 changes: 25 additions & 30 deletions ompi/mca/mtl/portals4/mtl_portals4_component.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,36 +229,6 @@ ompi_mtl_portals4_component_open(void)
sizeof(ompi_mtl_portals4_request_t) -
sizeof(struct mca_mtl_request_t);

opal_output_verbose(1, ompi_mtl_base_framework.framework_output,
"Flow control: "
#if OMPI_MTL_PORTALS4_FLOW_CONTROL
"yes"
#else
"no"
#endif
);
opal_output_verbose(1, ompi_mtl_base_framework.framework_output,
"Max message size: %lu", (unsigned long)
ompi_mtl_portals4.max_msg_size_mtl);
opal_output_verbose(1, ompi_mtl_base_framework.framework_output,
"Short limit: %d", (int)
ompi_mtl_portals4.short_limit);
opal_output_verbose(1, ompi_mtl_base_framework.framework_output,
"Eager limit: %d", (int)
ompi_mtl_portals4.eager_limit);
opal_output_verbose(1, ompi_mtl_base_framework.framework_output,
"Short receive blocks: %d",
ompi_mtl_portals4.recv_short_num);
opal_output_verbose(1, ompi_mtl_base_framework.framework_output,
"Send queue size: %d", ompi_mtl_portals4.send_queue_size);
opal_output_verbose(1, ompi_mtl_base_framework.framework_output,
"Recv queue size: %d", ompi_mtl_portals4.recv_queue_size);
opal_output_verbose(1, ompi_mtl_base_framework.framework_output,
"Long protocol: %s",
(ompi_mtl_portals4.protocol == eager) ? "Eager" :
(ompi_mtl_portals4.protocol == rndv) ? "Rendezvous" :
"Other");

OBJ_CONSTRUCT(&ompi_mtl_portals4.fl_message, opal_free_list_t);
opal_free_list_init(&ompi_mtl_portals4.fl_message,
sizeof(ompi_mtl_portals4_message_t) +
Expand Down Expand Up @@ -291,6 +261,31 @@ ompi_mtl_portals4_component_open(void)
ompi_mtl_portals4.use_flowctl=0;
#endif

opal_output_verbose(1, ompi_mtl_base_framework.framework_output,
"Flow control: %s",
ompi_mtl_portals4.use_flowctl ? "yes" : "no");
opal_output_verbose(1, ompi_mtl_base_framework.framework_output,
"Max message size: %lu", (unsigned long)
ompi_mtl_portals4.max_msg_size_mtl);
opal_output_verbose(1, ompi_mtl_base_framework.framework_output,
"Short limit: %d", (int)
ompi_mtl_portals4.short_limit);
opal_output_verbose(1, ompi_mtl_base_framework.framework_output,
"Eager limit: %d", (int)
ompi_mtl_portals4.eager_limit);
opal_output_verbose(1, ompi_mtl_base_framework.framework_output,
"Short receive blocks: %d",
ompi_mtl_portals4.recv_short_num);
opal_output_verbose(1, ompi_mtl_base_framework.framework_output,
"Send queue size: %d", ompi_mtl_portals4.send_queue_size);
opal_output_verbose(1, ompi_mtl_base_framework.framework_output,
"Recv queue size: %d", ompi_mtl_portals4.recv_queue_size);
opal_output_verbose(1, ompi_mtl_base_framework.framework_output,
"Long protocol: %s",
(ompi_mtl_portals4.protocol == eager) ? "Eager" :
(ompi_mtl_portals4.protocol == rndv) ? "Rendezvous" :
"Other");

return OMPI_SUCCESS;
}

Expand Down
2 changes: 1 addition & 1 deletion ompi/mca/mtl/portals4/mtl_portals4_flowctl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ OBJ_CLASS_DECLARATION(ompi_mtl_portals4_pending_request_t);


struct ompi_mtl_portals4_flowctl_t {
int32_t flowctl_active;
opal_atomic_int32_t flowctl_active;

opal_atomic_int32_t send_slots;
int32_t max_send_slots;
Expand Down
4 changes: 2 additions & 2 deletions ompi/mca/mtl/portals4/mtl_portals4_recv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ ompi_mtl_portals4_irecv(struct mca_mtl_base_module_t* mtl,
ptl_request->super.type = portals4_req_recv;
ptl_request->super.event_callback = ompi_mtl_portals4_recv_progress;
#if OPAL_ENABLE_DEBUG
ptl_request->opcount = OPAL_THREAD_ADD_FETCH64((int64_t*) &ompi_mtl_portals4.recv_opcount, 1);
ptl_request->opcount = OPAL_THREAD_ADD_FETCH64((opal_atomic_int64_t*) &ompi_mtl_portals4.recv_opcount, 1);
ptl_request->hdr_data = 0;
#endif
ptl_request->buffer_ptr = (free_after) ? start : NULL;
Expand Down Expand Up @@ -549,7 +549,7 @@ ompi_mtl_portals4_imrecv(struct mca_mtl_base_module_t* mtl,
}

#if OPAL_ENABLE_DEBUG
ptl_request->opcount = OPAL_THREAD_ADD_FETCH64((int64_t*) &ompi_mtl_portals4.recv_opcount, 1);
ptl_request->opcount = OPAL_THREAD_ADD_FETCH64((opal_atomic_int64_t*) &ompi_mtl_portals4.recv_opcount, 1);
ptl_request->hdr_data = 0;
#endif
ptl_request->super.type = portals4_req_recv;
Expand Down
2 changes: 1 addition & 1 deletion ompi/mca/mtl/portals4/mtl_portals4_request.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ struct ompi_mtl_portals4_isend_request_t {
#endif
ptl_size_t length;
opal_atomic_int32_t pending_get;
opal_atomic_uint32_t event_count;
opal_atomic_int32_t event_count;
};
typedef struct ompi_mtl_portals4_isend_request_t ompi_mtl_portals4_isend_request_t;

Expand Down
6 changes: 3 additions & 3 deletions ompi/mca/mtl/portals4/mtl_portals4_send.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ ompi_mtl_portals4_callback(ptl_event_t *ev,
ompi_mtl_portals4_base_request_t* ptl_base_request,
bool *complete)
{
int retval = OMPI_SUCCESS, ret, val, add = 1;
int retval = OMPI_SUCCESS, ret = 0, val = 0, add = 1;
ompi_mtl_portals4_isend_request_t* ptl_request =
(ompi_mtl_portals4_isend_request_t*) ptl_base_request;

Expand Down Expand Up @@ -161,7 +161,7 @@ ompi_mtl_portals4_callback(ptl_event_t *ev,
ptl_request->me_h = PTL_INVALID_HANDLE;
add++;
}
val = OPAL_THREAD_ADD_FETCH32((int32_t*)&ptl_request->event_count, add);
val = OPAL_THREAD_ADD_FETCH32(&ptl_request->event_count, add);
assert(val <= 3);

if (val == 3) {
Expand Down Expand Up @@ -492,7 +492,7 @@ ompi_mtl_portals4_send_start(struct mca_mtl_base_module_t* mtl,
ret = ompi_mtl_datatype_pack(convertor, &start, &length, &free_after);
if (OMPI_SUCCESS != ret) return ret;

ptl_request->opcount = OPAL_THREAD_ADD_FETCH64((int64_t*)&ompi_mtl_portals4.opcount, 1);
ptl_request->opcount = OPAL_THREAD_ADD_FETCH64((opal_atomic_int64_t*)&ompi_mtl_portals4.opcount, 1);
ptl_request->buffer_ptr = (free_after) ? start : NULL;
ptl_request->length = length;
ptl_request->event_count = 0;
Expand Down
Loading