Skip to content
Closed
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
10 changes: 6 additions & 4 deletions benchmark/nixlbench/src/utils/utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1081,10 +1081,12 @@ xferBenchUtils::printStats(bool is_target,
double avg_latency = 0, throughput_gb = 0;
double totalbw = 0;

int num_iter = xferBenchConfig::num_iter;
int total_iter = xferBenchConfig::num_iter;
int per_thread_iter = total_iter / xferBenchConfig::num_threads;

if (block_size > LARGE_BLOCK_SIZE) {
num_iter /= xferBenchConfig::large_blk_iter_ftr;
total_iter /= xferBenchConfig::large_blk_iter_ftr;
per_thread_iter /= xferBenchConfig::large_blk_iter_ftr;
}

// Targets don't participate in reduction - they have no throughput to contribute
Expand All @@ -1094,8 +1096,8 @@ xferBenchUtils::printStats(bool is_target,

double total_duration = stats.total_duration.avg();

total_data_transferred = ((block_size * batch_size) * num_iter); // In Bytes
avg_latency = (total_duration / (num_iter * batch_size)); // In microsec
total_data_transferred = ((block_size * batch_size) * total_iter); // In Bytes
avg_latency = (total_duration / (per_thread_iter * batch_size)); // In microsec
if (IS_PAIRWISE_AND_MG() ||
(IS_PAIRWISE_AND_SG() && xferBenchConfig::num_initiator_dev > 1 && rt->getSize() == 1)) {
total_data_transferred *= xferBenchConfig::num_initiator_dev; // In Bytes
Expand Down
61 changes: 31 additions & 30 deletions benchmark/nixlbench/src/worker/nixl/nixl_worker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -973,9 +973,9 @@ xferBenchNixlWorker::allocateMemory(int num_threads) {
if (seg_type == DRAM_SEG && xferBenchConfig::check_consistency) {
for (auto &iov : iov_list) {
if (isInitiator()) {
memset((void *)iov.addr, XFERBENCH_INITIATOR_BUFFER_ELEMENT, buffer_size);
memset((void *)iov.addr, XFERBENCH_INITIATOR_BUFFER_ELEMENT, iov.len);
} else if (isTarget()) {
memset((void *)iov.addr, XFERBENCH_TARGET_BUFFER_ELEMENT, buffer_size);
memset((void *)iov.addr, XFERBENCH_TARGET_BUFFER_ELEMENT, iov.len);
}
}
}
Expand All @@ -990,52 +990,53 @@ xferBenchNixlWorker::deallocateMemory(std::vector<std::vector<xferBenchIOV>> &io


opt_args.backends.push_back(backend_engine);
for (auto &iov_list : iov_lists) {
nixl_reg_dlist_t desc_list(seg_type);
iovListToNixlRegDlist(iov_list, desc_list);
CHECK_NIXL_ERROR(agent->deregisterMem(desc_list, &opt_args), "deregisterMem failed");

for (auto &iov : iov_list) {
switch (seg_type) {
case DRAM_SEG:
cleanupBasicDescDram(iov);
break;
case VRAM_SEG:
cleanupBasicDescVram(iov);
break;
default:
std::cerr << "Unsupported mem type: " << seg_type << std::endl;
exit(EXIT_FAILURE);
}
}
}

if (xferBenchConfig::isObjStorageBackend()) {
for (auto &iov_list : remote_iovs) {
for (auto &iov : iov_list) {
cleanupBasicDescObj(iov);
}
nixl_reg_dlist_t desc_list(OBJ_SEG);
iovListToNixlRegDlist(iov_list, desc_list);
CHECK_NIXL_ERROR(agent->deregisterMem(desc_list, &opt_args), "deregisterMem failed");
for (auto &iov : iov_list) {
cleanupBasicDescObj(iov);
}
}
} else if (xferBenchConfig::backend == XFERBENCH_BACKEND_GUSLI) {
for (auto &iov_list : remote_iovs) {
for (auto &iov : iov_list) {
cleanupBasicDescBlk(iov);
}
nixl_reg_dlist_t desc_list(BLK_SEG);
iovListToNixlRegDlist(iov_list, desc_list);
CHECK_NIXL_ERROR(agent->deregisterMem(desc_list, &opt_args), "deregisterMem failed");
for (auto &iov : iov_list) {
cleanupBasicDescBlk(iov);
}
}
} else if (xferBenchConfig::isStorageBackend()) {
for (auto &iov_list : remote_iovs) {
for (auto &iov : iov_list) {
cleanupBasicDescFile(iov);
}
nixl_reg_dlist_t desc_list(FILE_SEG);
iovListToNixlRegDlist(iov_list, desc_list);
CHECK_NIXL_ERROR(agent->deregisterMem(desc_list, &opt_args), "deregisterMem failed");
for (auto &iov : iov_list) {
cleanupBasicDescFile(iov);
}
}
Comment thread
devin-ai-integration[bot] marked this conversation as resolved.
}

for (auto &iov_list : iov_lists) {
nixl_reg_dlist_t desc_list(seg_type);
iovListToNixlRegDlist(iov_list, desc_list);
CHECK_NIXL_ERROR(agent->deregisterMem(desc_list, &opt_args), "deregisterMem failed");

for (auto &iov : iov_list) {
switch (seg_type) {
case DRAM_SEG:
cleanupBasicDescDram(iov);
break;
case VRAM_SEG:
cleanupBasicDescVram(iov);
break;
default:
std::cerr << "Unsupported mem type: " << seg_type << std::endl;
exit(EXIT_FAILURE);
}
}
}
}
Expand Down
Loading