From 6da54291bfeca5bf99c4a8d5ffdf323690bd779a Mon Sep 17 00:00:00 2001 From: Oak Zeng Date: Mon, 21 Jan 2019 10:32:43 -0600 Subject: [PATCH] Revert "Create SDMA queue on specific engine" This reverts commit 6087fd7bca0e3b95ddb909fb5e4a2264fde48c70. Change-Id: Ia3e9db5fcba1fef80745c72c78b7c568b5c7315e Signed-off-by: Oak Zeng [ROCm/ROCR-Runtime commit: 1923d2e335cfc75b320e68905c1839f1dc4349e7] --- projects/rocr-runtime/tests/kfdtest/src/BaseQueue.cpp | 6 +----- projects/rocr-runtime/tests/kfdtest/src/BaseQueue.hpp | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/projects/rocr-runtime/tests/kfdtest/src/BaseQueue.cpp b/projects/rocr-runtime/tests/kfdtest/src/BaseQueue.cpp index 46e543ab9b..4aa9e843d2 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/BaseQueue.cpp +++ b/projects/rocr-runtime/tests/kfdtest/src/BaseQueue.cpp @@ -36,7 +36,7 @@ BaseQueue::~BaseQueue(void) { Destroy(); } -HSAKMT_STATUS BaseQueue::Create(unsigned int NodeId, unsigned int size, HSAuint64 *pointers, int sdmaEngineId) { +HSAKMT_STATUS BaseQueue::Create(unsigned int NodeId, unsigned int size, HSAuint64 *pointers) { HSAKMT_STATUS status; HSA_QUEUE_TYPE type = GetQueueType(); @@ -54,10 +54,6 @@ HSAKMT_STATUS BaseQueue::Create(unsigned int NodeId, unsigned int size, HSAuint6 m_Resources.Queue_write_ptr_aql = &pointers[1]; } - //TODO: How to get number of SDMA engine? - if (type == HSA_QUEUE_SDMA && sdmaEngineId >= 0 && sdmaEngineId < 8) - type = (HSA_QUEUE_TYPE) (HSA_QUEUE_SDMA_ENGINE0 + sdmaEngineId); - status = hsaKmtCreateQueue(NodeId, type, DEFAULT_QUEUE_PERCENTAGE, diff --git a/projects/rocr-runtime/tests/kfdtest/src/BaseQueue.hpp b/projects/rocr-runtime/tests/kfdtest/src/BaseQueue.hpp index c0dd1eb840..0e5b946290 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/BaseQueue.hpp +++ b/projects/rocr-runtime/tests/kfdtest/src/BaseQueue.hpp @@ -43,10 +43,9 @@ class BaseQueue { /** Create the queue. * @see hsaKmtCreateQueue * @param pointers is used only for creating AQL queues. Otherwise it is omitted. - * @param sdmaEngineId is used only for creating SDMA queues. -1 means let kfd kernel select a sdma engine */ virtual HSAKMT_STATUS Create(unsigned int NodeId, unsigned int size = DEFAULT_QUEUE_SIZE, - HSAuint64 *pointers = NULL, int sdmaEngineId = -1); + HSAuint64 *pointers = NULL); /** Update the queue. * @see hsaKmtUpdateQueue * @param percent New queue percentage