kfdtest: Use SDMA engine information directly from the node

Change-Id: Icd391c8e821fb0ff5a1094f21b880a97e6d417a3
Signed-off-by: Yong Zhao <Yong.Zhao@amd.com>
This commit is contained in:
Yong Zhao
2019-06-07 17:03:34 -04:00
parent be6ff2cdff
commit b507911ccd
4 changed files with 11 additions and 10 deletions
+2 -1
View File
@@ -63,7 +63,8 @@ void KFDBaseComponentTest::SetUp() {
g_TestGPUFamilyId = FamilyIdFromNode(nodeProperties);
GetSdmaInfo(nodeProperties, &m_numSdmaEngines, &m_numSdmaQueuesPerEngine);
GetSdmaInfo(nodeProperties, &m_numSdmaEngines, &m_numSdmaXgmiEngines,
&m_numSdmaQueuesPerEngine);
m_FamilyId = g_TestGPUFamilyId;
@@ -61,6 +61,7 @@ class KFDBaseComponentTest : public testing::Test {
HsaSystemProperties m_SystemProperties;
unsigned int m_FamilyId;
unsigned int m_numSdmaEngines;
unsigned int m_numSdmaXgmiEngines;
unsigned int m_numSdmaQueuesPerEngine;
HsaMemFlags m_MemoryFlags;
HsaNodeInfo m_NodeInfo;
+7 -9
View File
@@ -128,22 +128,20 @@ unsigned int FamilyIdFromNode(const HsaNodeProperties *props) {
void GetSdmaInfo(const HsaNodeProperties *props,
unsigned int *p_num_sdma_engines,
unsigned int *p_num_sdma_xgmi_engines,
unsigned int *p_num_sdma_queues_per_engine) {
int num_sdma_engines = 2;
int num_sdma_queues_per_engine = 2;
switch (props->EngineId.ui32.Major) {
case 9:
if (props->EngineId.ui32.Stepping == 2) // RAVEN
num_sdma_engines = 1;
else if (props->EngineId.ui32.Stepping == 6) // VEGA20
if (props->EngineId.ui32.Major == 9) {
if (props->EngineId.ui32.Stepping == 6) // VEGA20
num_sdma_queues_per_engine = 8;
break;
}
if (p_num_sdma_engines)
*p_num_sdma_engines = num_sdma_engines;
*p_num_sdma_engines = props->NumSdmaEngines;
if (p_num_sdma_xgmi_engines)
*p_num_sdma_xgmi_engines = props->NumSdmaXgmiEngines;
if (p_num_sdma_queues_per_engine)
*p_num_sdma_queues_per_engine = num_sdma_queues_per_engine;
+1
View File
@@ -52,6 +52,7 @@ unsigned int FamilyIdFromNode(const HsaNodeProperties *props);
void GetSdmaInfo(const HsaNodeProperties *props,
unsigned int *p_num_sdma_engines,
unsigned int *p_num_sdma_xgmi_engines,
unsigned int *p_num_sdma_queues_per_engine);
class HsaMemoryBuffer {