AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Sort the ROCr gpu index based on BDF"

Browse Source 
Fix 'rdcd diag' compute and system tests.
This reverts commit 61a2773875.

Change-Id: Ia092c46649c1d6338fb96ffe7e6feba4b045f027
This commit is contained in:
Galantsev, Dmitrii
2024-02-16 14:09:44 -06:00
parent d1400df06c
commit 662cc0f8b2
1 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rdc_libs/rdc_modules/rdc_rocr/TestBase.cc
+1 -17
View File
@@ -127,23 +127,7 @@ hsa_status_t TestBase::get_agent_by_gpu_index(uint32_t gpu_index, hsa_agent_t* a
if (gpu_index >= gpus.size()) {
throw_if_error(err, "GPU index is too large.");
}
// sort based on bdf id
std::vector<std::pair<uint16_t, hsa_agent_t>> dv_to_id;
for (uint32_t dv_ind = 0; dv_ind < gpus.size(); ++dv_ind) {
auto dev = gpus[dv_ind];
uint16_t bdf_id = 0;
err = hsa_agent_get_info(dev, (hsa_agent_info_t)HSA_AMD_AGENT_INFO_BDFID, &bdf_id);
throw_if_error(err, "fail to get gpu bdfid");
dv_to_id.push_back({bdf_id, dev});
}
// Stable sort to keep the order if bdf is equal.
std::stable_sort(dv_to_id.begin(), dv_to_id.end(),
[](const std::pair<uint16_t, hsa_agent_t>& p1,
const std::pair<uint16_t, hsa_agent_t>& p2) { return p1.first < p2.first; });
*agent = dv_to_id[gpu_index].second;
*agent = gpus[gpu_index];
return err;
}