ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Remove #if OMPI_MCA_BTL_OPENIB_HAVE_SRQ. Always compile SRQ.

Просмотр исходного кода 
This commit was SVN r11537.
Этот коммит содержится в:
Gleb Natapov 2006-09-06 05:45:37 +00:00
родитель 4f05da21a1
Коммит 298c825592
3 изменённых файлов: 0 добавлений и 35 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
ompi/mca/btl/openib/btl_openib.c
Просмотреть файл

@ -139,7 +139,6 @@ int mca_btl_openib_size_queues( struct mca_btl_openib_module_t* openib_btl, size
int first_time = (0 == openib_btl->num_peers); int first_time = (0 == openib_btl->num_peers);
int rc; int rc;
openib_btl->num_peers += nprocs; openib_btl->num_peers += nprocs;
#ifdef OMPI_MCA_BTL_OPENIB_HAVE_SRQ
if(mca_btl_openib_component.use_srq) { if(mca_btl_openib_component.use_srq) {
openib_btl->rd_num = mca_btl_openib_component.rd_num + log2(nprocs) * mca_btl_openib_component.srq_rd_per_peer; openib_btl->rd_num = mca_btl_openib_component.rd_num + log2(nprocs) * mca_btl_openib_component.srq_rd_per_peer;
if(openib_btl->rd_num > mca_btl_openib_component.srq_rd_max) if(openib_btl->rd_num > mca_btl_openib_component.srq_rd_max)
@ -163,7 +162,6 @@ int mca_btl_openib_size_queues( struct mca_btl_openib_module_t* openib_btl, size
} }
} else } else
#endif
{ {
min_cq_size = ( mca_btl_openib_component.rd_num > (int32_t) mca_btl_openib_component.eager_rdma_num ? min_cq_size = ( mca_btl_openib_component.rd_num > (int32_t) mca_btl_openib_component.eager_rdma_num ?
mca_btl_openib_component.rd_num : (int32_t) mca_btl_openib_component.eager_rdma_num ) * mca_btl_openib_component.rd_num : (int32_t) mca_btl_openib_component.eager_rdma_num ) *
@ -683,17 +681,13 @@ int mca_btl_openib_put( mca_btl_base_module_t* btl,
rc = OMPI_SUCCESS; rc = OMPI_SUCCESS;
} }
#ifdef OMPI_MCA_BTL_OPENIB_HAVE_SRQ
if(mca_btl_openib_component.use_srq) { if(mca_btl_openib_component.use_srq) {
MCA_BTL_OPENIB_POST_SRR_HIGH(openib_btl, 1); MCA_BTL_OPENIB_POST_SRR_HIGH(openib_btl, 1);
MCA_BTL_OPENIB_POST_SRR_LOW(openib_btl, 1); MCA_BTL_OPENIB_POST_SRR_LOW(openib_btl, 1);
} else { } else {
#endif
MCA_BTL_OPENIB_ENDPOINT_POST_RR_HIGH(endpoint, 1); MCA_BTL_OPENIB_ENDPOINT_POST_RR_HIGH(endpoint, 1);
MCA_BTL_OPENIB_ENDPOINT_POST_RR_LOW(endpoint, 1); MCA_BTL_OPENIB_ENDPOINT_POST_RR_LOW(endpoint, 1);
#ifdef OMPI_MCA_BTL_OPENIB_HAVE_SRQ
} }
#endif
} }
return rc; return rc;
} }
@ -750,17 +744,13 @@ int mca_btl_openib_get( mca_btl_base_module_t* btl,
rc = ORTE_SUCCESS; rc = ORTE_SUCCESS;
} }
#ifdef OMPI_MCA_BTL_OPENIB_HAVE_SRQ
if(mca_btl_openib_component.use_srq) { if(mca_btl_openib_component.use_srq) {
MCA_BTL_OPENIB_POST_SRR_HIGH(openib_btl, 1); MCA_BTL_OPENIB_POST_SRR_HIGH(openib_btl, 1);
MCA_BTL_OPENIB_POST_SRR_LOW(openib_btl, 1); MCA_BTL_OPENIB_POST_SRR_LOW(openib_btl, 1);
} else { } else {
#endif
MCA_BTL_OPENIB_ENDPOINT_POST_RR_HIGH(endpoint, 1); MCA_BTL_OPENIB_ENDPOINT_POST_RR_HIGH(endpoint, 1);
MCA_BTL_OPENIB_ENDPOINT_POST_RR_LOW(endpoint, 1); MCA_BTL_OPENIB_ENDPOINT_POST_RR_LOW(endpoint, 1);
#ifdef OMPI_MCA_BTL_OPENIB_HAVE_SRQ
} }
#endif
} }
return rc; return rc;
} }
@ -774,7 +764,6 @@ int mca_btl_openib_create_cq_srq(mca_btl_openib_module_t *openib_btl)
/* Allocate Protection Domain */ /* Allocate Protection Domain */
openib_btl->poll_cq = false; openib_btl->poll_cq = false;
#ifdef OMPI_MCA_BTL_OPENIB_HAVE_SRQ
if(mca_btl_openib_component.use_srq) { if(mca_btl_openib_component.use_srq) {
struct ibv_srq_init_attr attr; struct ibv_srq_init_attr attr;
@ -801,7 +790,6 @@ int mca_btl_openib_create_cq_srq(mca_btl_openib_module_t *openib_btl)
openib_btl->srq_hp = NULL; openib_btl->srq_hp = NULL;
openib_btl->srq_lp = NULL; openib_btl->srq_lp = NULL;
} }
#endif
/* Create the low and high priority queue pairs */ /* Create the low and high priority queue pairs */
#if OMPI_MCA_BTL_OPENIB_IBV_CREATE_CQ_ARGS == 3 #if OMPI_MCA_BTL_OPENIB_IBV_CREATE_CQ_ARGS == 3

5
ompi/mca/btl/openib/btl_openib.h
Просмотреть файл

@ -182,12 +182,10 @@ struct mca_btl_openib_module_t {
bool poll_cq; bool poll_cq;
#ifdef OMPI_MCA_BTL_OPENIB_HAVE_SRQ
struct ibv_srq *srq_hp; struct ibv_srq *srq_hp;
struct ibv_srq *srq_lp; struct ibv_srq *srq_lp;
int32_t srd_posted_hp; int32_t srd_posted_hp;
int32_t srd_posted_lp; int32_t srd_posted_lp;
#endif
int32_t num_peers; int32_t num_peers;
int32_t rd_num; int32_t rd_num;
int32_t rd_low; int32_t rd_low;
@ -410,7 +408,6 @@ extern void mca_btl_openib_send_frag_return(
int mca_btl_openib_create_cq_srq(mca_btl_openib_module_t* openib_btl); int mca_btl_openib_create_cq_srq(mca_btl_openib_module_t* openib_btl);
#ifdef OMPI_MCA_BTL_OPENIB_HAVE_SRQ
#define MCA_BTL_OPENIB_POST_SRR_HIGH(openib_btl, additional) \ #define MCA_BTL_OPENIB_POST_SRR_HIGH(openib_btl, additional) \
{ \ { \
@ -476,8 +473,6 @@ int mca_btl_openib_create_cq_srq(mca_btl_openib_module_t* openib_btl);
} while(0);\ } while(0);\
} }
#endif
#define BTL_OPENIB_HP_QP 0 #define BTL_OPENIB_HP_QP 0
#define BTL_OPENIB_LP_QP 1 #define BTL_OPENIB_LP_QP 1

18
ompi/mca/btl/openib/btl_openib_endpoint.c
Просмотреть файл

@ -43,9 +43,7 @@ int mca_btl_openib_endpoint_create_qp(
mca_btl_openib_module_t* openib_btl, mca_btl_openib_module_t* openib_btl,
struct ibv_pd* pd, struct ibv_pd* pd,
struct ibv_cq* cq, struct ibv_cq* cq,
#if OMPI_MCA_BTL_OPENIB_HAVE_SRQ
struct ibv_srq* srq, struct ibv_srq* srq,
#endif
struct ibv_qp_attr* qp_attr, struct ibv_qp_attr* qp_attr,
struct ibv_qp** qp struct ibv_qp** qp
); );
@ -420,9 +418,7 @@ static int mca_btl_openib_endpoint_start_connect(mca_btl_base_endpoint_t* endpoi
if(OMPI_SUCCESS != (rc = mca_btl_openib_endpoint_create_qp(openib_btl, if(OMPI_SUCCESS != (rc = mca_btl_openib_endpoint_create_qp(openib_btl,
openib_btl->hca->ib_pd, openib_btl->hca->ib_pd,
openib_btl->ib_cq_hp, openib_btl->ib_cq_hp,
#ifdef OMPI_MCA_BTL_OPENIB_HAVE_SRQ
openib_btl->srq_hp, openib_btl->srq_hp,
#endif
endpoint->lcl_qp_attr_hp, endpoint->lcl_qp_attr_hp,
&endpoint->lcl_qp_hp))) { &endpoint->lcl_qp_hp))) {
BTL_ERROR(("error creating queue pair, error code %d", rc)); BTL_ERROR(("error creating queue pair, error code %d", rc));
@ -435,9 +431,7 @@ static int mca_btl_openib_endpoint_start_connect(mca_btl_base_endpoint_t* endpoi
if(OMPI_SUCCESS != (rc = mca_btl_openib_endpoint_create_qp(openib_btl, if(OMPI_SUCCESS != (rc = mca_btl_openib_endpoint_create_qp(openib_btl,
openib_btl->hca->ib_pd, openib_btl->hca->ib_pd,
openib_btl->ib_cq_lp, openib_btl->ib_cq_lp,
#ifdef OMPI_MCA_BTL_OPENIB_HAVE_SRQ
openib_btl->srq_lp, openib_btl->srq_lp,
#endif
endpoint->lcl_qp_attr_lp, endpoint->lcl_qp_attr_lp,
&endpoint->lcl_qp_lp))) { &endpoint->lcl_qp_lp))) {
BTL_ERROR(("error creating queue pair, error code %d", rc)); BTL_ERROR(("error creating queue pair, error code %d", rc));
@ -474,9 +468,7 @@ static int mca_btl_openib_endpoint_reply_start_connect(mca_btl_openib_endpoint_t
if(OMPI_SUCCESS != (rc = mca_btl_openib_endpoint_create_qp(openib_btl, if(OMPI_SUCCESS != (rc = mca_btl_openib_endpoint_create_qp(openib_btl,
openib_btl->hca->ib_pd, openib_btl->hca->ib_pd,
openib_btl->ib_cq_hp, openib_btl->ib_cq_hp,
#ifdef OMPI_MCA_BTL_OPENIB_HAVE_SRQ
openib_btl->srq_hp, openib_btl->srq_hp,
#endif
endpoint->lcl_qp_attr_hp, endpoint->lcl_qp_attr_hp,
&endpoint->lcl_qp_hp))) { &endpoint->lcl_qp_hp))) {
@ -490,9 +482,7 @@ static int mca_btl_openib_endpoint_reply_start_connect(mca_btl_openib_endpoint_t
if(OMPI_SUCCESS != (rc = mca_btl_openib_endpoint_create_qp(openib_btl, if(OMPI_SUCCESS != (rc = mca_btl_openib_endpoint_create_qp(openib_btl,
openib_btl->hca->ib_pd, openib_btl->hca->ib_pd,
openib_btl->ib_cq_lp, openib_btl->ib_cq_lp,
#ifdef OMPI_MCA_BTL_OPENIB_HAVE_SRQ
openib_btl->srq_lp, openib_btl->srq_lp,
#endif
endpoint->lcl_qp_attr_lp, endpoint->lcl_qp_attr_lp,
&endpoint->lcl_qp_lp))) { &endpoint->lcl_qp_lp))) {
@ -917,17 +907,13 @@ int mca_btl_openib_endpoint_connect(
MCA_BTL_IB_FRAG_ALLOC_CREDIT_WAIT(openib_btl, endpoint->hp_credit_frag, rc); MCA_BTL_IB_FRAG_ALLOC_CREDIT_WAIT(openib_btl, endpoint->hp_credit_frag, rc);
MCA_BTL_IB_FRAG_ALLOC_CREDIT_WAIT(openib_btl, endpoint->lp_credit_frag, rc); MCA_BTL_IB_FRAG_ALLOC_CREDIT_WAIT(openib_btl, endpoint->lp_credit_frag, rc);
#ifdef OMPI_MCA_BTL_OPENIB_HAVE_SRQ
if(mca_btl_openib_component.use_srq) { if(mca_btl_openib_component.use_srq) {
MCA_BTL_OPENIB_POST_SRR_HIGH(openib_btl, 1); MCA_BTL_OPENIB_POST_SRR_HIGH(openib_btl, 1);
MCA_BTL_OPENIB_POST_SRR_LOW(openib_btl, 1); MCA_BTL_OPENIB_POST_SRR_LOW(openib_btl, 1);
} else { } else {
#endif
MCA_BTL_OPENIB_ENDPOINT_POST_RR_HIGH(endpoint, 1); MCA_BTL_OPENIB_ENDPOINT_POST_RR_HIGH(endpoint, 1);
MCA_BTL_OPENIB_ENDPOINT_POST_RR_LOW(endpoint, 1); MCA_BTL_OPENIB_ENDPOINT_POST_RR_LOW(endpoint, 1);
#ifdef OMPI_MCA_BTL_OPENIB_HAVE_SRQ
} }
#endif
return OMPI_SUCCESS; return OMPI_SUCCESS;
} }
@ -942,9 +928,7 @@ int mca_btl_openib_endpoint_create_qp(
mca_btl_openib_module_t* openib_btl, mca_btl_openib_module_t* openib_btl,
struct ibv_pd* pd, struct ibv_pd* pd,
struct ibv_cq* cq, struct ibv_cq* cq,
#ifdef OMPI_MCA_BTL_OPENIB_HAVE_SRQ
struct ibv_srq* srq, struct ibv_srq* srq,
#endif
struct ibv_qp_attr* qp_attr, struct ibv_qp_attr* qp_attr,
struct ibv_qp** qp struct ibv_qp** qp
) )
@ -962,11 +946,9 @@ int mca_btl_openib_endpoint_create_qp(
qp_init_attr.cap.max_send_sge = mca_btl_openib_component.ib_sg_list_size; qp_init_attr.cap.max_send_sge = mca_btl_openib_component.ib_sg_list_size;
qp_init_attr.cap.max_recv_sge = mca_btl_openib_component.ib_sg_list_size; qp_init_attr.cap.max_recv_sge = mca_btl_openib_component.ib_sg_list_size;
qp_init_attr.qp_type = IBV_QPT_RC; qp_init_attr.qp_type = IBV_QPT_RC;
#ifdef OMPI_MCA_BTL_OPENIB_HAVE_SRQ
if(mca_btl_openib_component.use_srq) { if(mca_btl_openib_component.use_srq) {
qp_init_attr.srq = srq; qp_init_attr.srq = srq;
} }
#endif
my_qp = ibv_create_qp(pd, &qp_init_attr); my_qp = ibv_create_qp(pd, &qp_init_attr);
if(NULL == my_qp) { if(NULL == my_qp) {