From 662cc0f8b2a287932a4390c77d79337cb0cdb586 Mon Sep 17 00:00:00 2001 From: "Galantsev, Dmitrii" Date: Fri, 16 Feb 2024 14:09:44 -0600 Subject: [PATCH] Revert "Sort the ROCr gpu index based on BDF" Fix 'rdcd diag' compute and system tests. This reverts commit 61a27738751bea774f9e8742176d19585ca279b8. Change-Id: Ia092c46649c1d6338fb96ffe7e6feba4b045f027 --- rdc_libs/rdc_modules/rdc_rocr/TestBase.cc | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/rdc_libs/rdc_modules/rdc_rocr/TestBase.cc b/rdc_libs/rdc_modules/rdc_rocr/TestBase.cc index 6f15642947..e32d9852cb 100644 --- a/rdc_libs/rdc_modules/rdc_rocr/TestBase.cc +++ b/rdc_libs/rdc_modules/rdc_rocr/TestBase.cc @@ -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> 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& p1, - const std::pair& p2) { return p1.first < p2.first; }); - - *agent = dv_to_id[gpu_index].second; - + *agent = gpus[gpu_index]; return err; }