Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions fabtests/benchmarks/msg_pingpong.c
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ int main(int argc, char **argv)
int op, ret;

opts = INIT_OPTS;
opts.options |= FT_OPT_NO_PREPOSTED_AUX_RX;

hints = fi_allocinfo();
if (!hints)
Expand Down
1 change: 1 addition & 0 deletions fabtests/benchmarks/rdm_bw.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ int main(int argc, char **argv)

opts = INIT_OPTS;
opts.options |= FT_OPT_BW;
opts.options |= FT_OPT_NO_PREPOSTED_AUX_RX;

hints = fi_allocinfo();
if (!hints)
Expand Down
1 change: 1 addition & 0 deletions fabtests/benchmarks/rdm_bw_mt.c
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,7 @@ int main(int argc, char **argv)

opts = INIT_OPTS;
opts.options |= FT_OPT_OOB_CTRL;
opts.options |= FT_OPT_NO_PREPOSTED_AUX_RX;

hints = fi_allocinfo();
if (!hints)
Expand Down
1 change: 1 addition & 0 deletions fabtests/benchmarks/rdm_tagged_bw.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ int main(int argc, char **argv)

opts = INIT_OPTS;
opts.options |= FT_OPT_BW;
opts.options |= FT_OPT_NO_PREPOSTED_AUX_RX;

hints = fi_allocinfo();
if (!hints)
Expand Down
1 change: 1 addition & 0 deletions fabtests/benchmarks/rdm_tagged_pingpong.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ int main(int argc, char **argv)
int op, ret;

opts = INIT_OPTS;
opts.options |= FT_OPT_NO_PREPOSTED_AUX_RX;

hints = fi_allocinfo();
if (!hints)
Expand Down
13 changes: 10 additions & 3 deletions fabtests/common/shared.c
Original file line number Diff line number Diff line change
Expand Up @@ -1519,8 +1519,13 @@ int ft_enable_ep_recv(void)
if (ret)
return ret;

if (!ft_check_opts(FT_OPT_SKIP_MSG_ALLOC) &&
(fi->caps & (FI_MSG | FI_TAGGED))) {
if ((opts.options & FT_OPT_NO_PREPOSTED_AUX_RX) &&
(opts.options & FT_OPT_OOB_ADDR_EXCH)) {
return 0;
}

if ((!ft_check_opts(FT_OPT_SKIP_MSG_ALLOC) &&
(fi->caps & (FI_MSG | FI_TAGGED)))) {
/* Initial receive will get remote address for unconnected EPs */
ret = ft_post_rx(ep, MAX(rx_size, FT_MAX_CTRL_MSG), &rx_ctx);
if (ret)
Expand Down Expand Up @@ -3414,7 +3419,7 @@ void ft_usage(char *name, char *desc)
void ft_hmem_usage()
{
FT_PRINT_OPTS_USAGE("-D <device_iface>", "Specify device interface: "
"e.g. cuda, ze, neuron, synapseai (default: None). "
"e.g. cuda, ze, neuron, synapseai, rocr (default: None). "
"Automatically enables FI_HMEM (-H)");
FT_PRINT_OPTS_USAGE("-i <device_id>", "Specify which device to use (default: 0)");
FT_PRINT_OPTS_USAGE("-H", "Enable provider FI_HMEM support");
Expand Down Expand Up @@ -3576,6 +3581,8 @@ void ft_parse_hmem_opts(int op, char *optarg, struct ft_opts *opts)
opts->iface = FI_HMEM_CUDA;
else if (!strncasecmp("neuron", optarg, 6))
opts->iface = FI_HMEM_NEURON;
else if (!strncasecmp("rocr", optarg, 4))
opts->iface = FI_HMEM_ROCR;
else if (!strncasecmp("synapseai", optarg, 9)) {
opts->iface = FI_HMEM_SYNAPSEAI;
opts->options |= FT_OPT_REG_DMABUF_MR;
Expand Down
1 change: 1 addition & 0 deletions fabtests/include/shared.h
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ enum {
FT_OPT_REG_DMABUF_MR = 1 << 27,
FT_OPT_NO_PRE_POSTED_RX = 1 << 28,
FT_OPT_OOB_CTRL = FT_OPT_OOB_SYNC | FT_OPT_OOB_ADDR_EXCH,
FT_OPT_NO_PREPOSTED_AUX_RX = 1 << 29,
};

/* for RMA tests --- we want to be able to select fi_writedata, but there is no
Expand Down