kfdtest: Consolidate logic for ASSERT vs EXPECT

ASSERT failures result in immediate termination of the test. EXPECT
returns a failure but continues execution. Reserve ASSERT for required
functionality (node initialization, queue creation, etc) where the rest
of the test cannot run if that call fails. Use EXPECT everywhere else

Change-Id: I1c11326fc3ae22b50fa83b07b3b49af1e1f4e69e


[ROCm/ROCR-Runtime commit: fe33461622]
Cette révision appartient à :
Kent Russell
2018-08-20 09:54:26 -04:00
Parent b86f145610
révision 52536ba23b
17 fichiers modifiés avec 208 ajouts et 209 suppressions
+7 -7
Voir le fichier
@@ -227,16 +227,16 @@ void KFDEvictTest::AmdgpuCommandSubmissionComputeNop(int rn) {
fenceStatus.ring = 0;
fenceStatus.fence = ibsRequest.seq_no;
ASSERT_EQ(0, amdgpu_cs_query_fence_status(&fenceStatus,
EXPECT_EQ(0, amdgpu_cs_query_fence_status(&fenceStatus,
g_TestTimeOut,
0, &expired));
ASSERT_EQ(0, amdgpu_bo_list_destroy(boList));
EXPECT_EQ(0, amdgpu_bo_list_destroy(boList));
ASSERT_EQ(0, amdgpu_bo_unmap_and_free(ibResultHandle, vaHandle,
EXPECT_EQ(0, amdgpu_bo_unmap_and_free(ibResultHandle, vaHandle,
ibResultMcAddress, PAGE_SIZE));
ASSERT_EQ(0, amdgpu_cs_ctx_free(contextHandle));
EXPECT_EQ(0, amdgpu_cs_ctx_free(contextHandle));
}
void KFDEvictTest::ForkChildProcesses(int nprocesses) {
@@ -283,7 +283,7 @@ void KFDEvictTest::WaitChildProcesses() {
m_ChildPids.erase(m_ChildPids.begin());
}
ASSERT_EQ(childExitOkNum, size);
EXPECT_EQ(childExitOkNum, size);
}
/* Child process or parent process finished successfully */
@@ -598,7 +598,7 @@ TEST_F(KFDEvictTest, QueueTest) {
/* Wait for shader to finish or timeout if shader has vm page fault */
dispatch0.SyncWithStatus(120000);
ASSERT_SUCCESS(pm4Queue.Destroy());
EXPECT_SUCCESS(pm4Queue.Destroy());
FreeAmdgpuBo(handle);
@@ -610,7 +610,7 @@ TEST_F(KFDEvictTest, QueueTest) {
/* Check if all wavefronts finished successfully */
for (i = 0; i < wavefront_num; i++)
ASSERT_EQ(0x5678, *(result + i));
EXPECT_EQ(0x5678, *(result + i));
WaitChildProcesses();