Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 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
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,17 @@ FILTER[core]=\
# using wallclock to measure performance is always risky, there are just too many ASICs
# where this test is failing. Ideally we'll get better CU Masking coverage via rocrtst
#
# These CU Masking tests are excluded on all ASICs by default (via BLACKLIST_ALL_ASICS).
# ASICs where they are expected to pass (e.g. gfx1250) use BLACKLIST_ALL_ASICS_NO_CU_MASK
# instead, so the tests are still executed for those profiles.
CU_MASKING_BLACKLIST=\
"KFDQMTest.BasicCuMaskingLinear:"\
"KFDQMTest.BasicCuMaskingEven"

# The CheckZeroInitializationVram test is no longer expected to pass as KFD no longer
# clears memory at allocation time.
PERMANENT_BLACKLIST_ALL_ASICS=\
"-${FILTER[pm]}:"\
"KFDQMTest.BasicCuMaskingLinear:"\
"KFDQMTest.BasicCuMaskingEven:"\
"RDMATest.GPUDirect:"\
"KFDLocalMemoryTest.CheckZeroInitializationVram"

Expand Down Expand Up @@ -74,10 +79,16 @@ TEMPORARY_BLACKLIST_ALL_ASICS=\
"KFDDBGTest.SuspendQueues:"\
"KFDDBGTest.HitAddressWatch"

BLACKLIST_ALL_ASICS=\
# Base all-ASIC blacklist without the CU masking tests. Profiles for ASICs that are
# expected to pass CU masking (e.g. gfx1250) build on this instead of BLACKLIST_ALL_ASICS.
BLACKLIST_ALL_ASICS_NO_CU_MASK=\
"$PERMANENT_BLACKLIST_ALL_ASICS:"\
"$TEMPORARY_BLACKLIST_ALL_ASICS"

BLACKLIST_ALL_ASICS=\
"$BLACKLIST_ALL_ASICS_NO_CU_MASK:"\
"$CU_MASKING_BLACKLIST"

# SDMA-based tests (KFDIPCTest.BasicTest, KFDQM.*Sdma*, KFDMemoryTest.MMBench) are all
# disabled on non-Hawaii due to SDMA instability - SWDEV-101666
SDMA_BLACKLIST=\
Expand Down Expand Up @@ -356,10 +367,9 @@ FILTER[gfx1201]=\
"$BLACKLIST_GFX12"

FILTER[gfx1250]=\
"$BLACKLIST_ALL_ASICS:"\
"$BLACKLIST_ALL_ASICS_NO_CU_MASK:"\
"$BLACKLIST_GFX12:"\
"KFDEventTest.SignalInvalidEvent:"\
"KFDQMTest.ExtendedCuMasking:"\
"KFDQMTest.MultipleCpQueuesStressDispatch:"\
"KFDCWSRTest.InternalRegTest:"\
"KFDEvictTest.QueueTest:"\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ BaseQueue::~BaseQueue(void) {
Destroy();
}

HSAKMT_STATUS BaseQueue::Create(unsigned int NodeId, unsigned int size, HSAuint64 *pointers) {
HSAKMT_STATUS BaseQueue::Create(unsigned int NodeId, unsigned int size, HSAuint64 *pointers,
unsigned int queuePercentage) {
HSAKMT_STATUS status;
HSA_QUEUE_TYPE type = GetQueueType();

Expand All @@ -61,7 +62,7 @@ HSAKMT_STATUS BaseQueue::Create(unsigned int NodeId, unsigned int size, HSAuint6
status = HSAKMT_CALL(hsaKmtCreateQueueExt, m_KFDContext,
NodeId,
type,
DEFAULT_QUEUE_PERCENTAGE,
queuePercentage,
DEFAULT_PRIORITY,
m_SdmaEngineId,
m_QueueBuf->As<unsigned int*>(),
Expand All @@ -72,7 +73,7 @@ HSAKMT_STATUS BaseQueue::Create(unsigned int NodeId, unsigned int size, HSAuint6
status = HSAKMT_CALL(hsaKmtCreateQueue, m_KFDContext,
NodeId,
type,
DEFAULT_QUEUE_PERCENTAGE,
queuePercentage,
DEFAULT_PRIORITY,
m_QueueBuf->As<unsigned int*>(),
m_QueueBuf->Size(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,12 @@ class BaseQueue {
/** Create the queue.
* @see hsaKmtCreateQueue
* @param pointers is used only for creating AQL queues. Otherwise it is omitted.
* @param queuePercentage Queue percentage. For PM4 queues bits 8-15 select
* the target XCC (pm4_target_xcc) on multi-XCC nodes.
*/
virtual HSAKMT_STATUS Create(unsigned int NodeId, unsigned int size = DEFAULT_QUEUE_SIZE,
HSAuint64 *pointers = NULL);
HSAuint64 *pointers = NULL,
unsigned int queuePercentage = DEFAULT_QUEUE_PERCENTAGE);
/** Update the queue.
* @see hsaKmtUpdateQueue
* @param percent New queue percentage
Expand Down
Loading
Loading