kfdtest: Consolidate log messages for skipped tests

When skipping a test, the output should be:
Skipping test: <reason>.

This will allow for easier identification, automation and general readability

Change-Id: I98bda1c068f9dbc83aeea74f642b6101121f234d


[ROCm/ROCR-Runtime commit: f2bd7e1d52]
このコミットが含まれているのは:
Kent Russell
2018-08-13 10:18:04 -04:00
コミット b2e7a6e2a8
11個のファイルの変更58行の追加59行の削除
+1 -1
ファイルの表示
@@ -178,7 +178,7 @@ TEST_F(KFDCWSRTest, BasicTest) {
delete dispatch2;
} else {
LOG() << "Test is skipped for family ID 0x" << m_FamilyId << std::endl;
LOG() << "Skipping test: No CWSR present for family ID 0x" << m_FamilyId << "." << std::endl;
}
TEST_END
+1 -1
ファイルの表示
@@ -169,7 +169,7 @@ TEST_F(KFDDBGTest, BasicAddressWatch) {
ASSERT_SUCCESS(queue.Destroy());
ASSERT_SUCCESS(queue_flush.Destroy());
} else {
LOG() << "Test is skipped for family ID 0x" << m_FamilyId << std::endl;
LOG() << "Skipping test: Test not supported on family ID 0x" << m_FamilyId << "." << std::endl;
}
TEST_END
}
+6 -6
ファイルの表示
@@ -323,7 +323,7 @@ TEST_F(KFDEvictTest, BasicTest) {
HSAuint64 vramSize = GetVramSize(defaultGPUNode);
if (!vramSize) {
LOG() << "No VRAM found, skipping the test" << std::endl;
LOG() << "Skipping test: No VRAM found." << std::endl;
return;
} else {
LOG() << "Found VRAM of " << std::dec << (vramSize >> 20) << "MB" << std::endl;
@@ -338,7 +338,7 @@ TEST_F(KFDEvictTest, BasicTest) {
int rn = FindDRMRenderNode(defaultGPUNode);
if (rn < 0) {
LOG() << "Skipping test" << std::endl;
LOG() << "Skipping test: Could not find render node for default GPU." << std::endl;
return;
}
@@ -516,7 +516,7 @@ TEST_F(KFDEvictTest, QueueTest) {
/* Skip test for chip it doesn't have CWSR, which the test depends on */
if (m_FamilyId < FAMILY_VI || isTonga(pNodeProperties)) {
LOG() << std::hex << "Test is skipped for family ID 0x" << m_FamilyId << std::endl;
LOG() << std::hex << "Skipping test: No CWSR present for family ID 0x" << m_FamilyId << "." << std::endl;
return;
}
@@ -524,7 +524,7 @@ TEST_F(KFDEvictTest, QueueTest) {
HSAuint64 vramSize = GetVramSize(defaultGPUNode);
if (!vramSize) {
LOG() << "No VRAM found, skipping the test" << std::endl;
LOG() << "Skipping test: No VRAM found." << std::endl;
return;
} else {
LOG() << "Found VRAM of " << std::dec << (vramSize >> 20) << "MB." << std::endl;
@@ -535,7 +535,7 @@ TEST_F(KFDEvictTest, QueueTest) {
LOG() << "Found System RAM of " << std::dec << (GetSysMemSize() >> 20) << "MB" << std::endl;
if (count == 0) {
LOG() << "Not enough system memory, skipping the test" << std::endl;
LOG() << "Skipping test: Not enough system memory available." << std::endl;
return;
}
/* assert all buffer address can be stored within one page
@@ -548,7 +548,7 @@ TEST_F(KFDEvictTest, QueueTest) {
int rn = FindDRMRenderNode(defaultGPUNode);
if (rn < 0) {
LOG() << "Skipping test" << std::endl;
LOG() << "Skipping test: Could not find render node for default GPU." << std::endl;
return;
}
+7 -7
ファイルの表示
@@ -124,7 +124,7 @@ TEST_F(KFDExceptionTest, InvalidBadAddress) {
ASSERT_GE(defaultGPUNode, 0) << "failed to get default GPU Node";
if (m_FamilyId == FAMILY_RV) {
LOG() << "Skip the test on Raven due to IOMMU issues" << std::endl;
LOG() << "Skipping test: IOMMU issues on Raven." << std::endl;
return;
}
@@ -172,12 +172,12 @@ TEST_F(KFDExceptionTest, InvalidPPRWriteProtection) {
ASSERT_GE(defaultGPUNode, 0) << "failed to get default GPU Node";
if (is_dgpu()) {
LOG() << "Not an APU, no PPR available, skip the test" << std::endl;
LOG() << "Skipping test: Test requires APU." << std::endl;
return;
}
if (m_FamilyId == FAMILY_RV) {
LOG() << "Skip the test on Raven due to IOMMU issues" << std::endl;
LOG() << "Skipping test: IOMMU issues on Raven." << std::endl;
return;
}
@@ -223,12 +223,12 @@ TEST_F(KFDExceptionTest, InvalidPPRReadProtection) {
ASSERT_GE(defaultGPUNode, 0) << "failed to get default GPU Node";
if (is_dgpu()) {
LOG() << "Not an APU, no PPR available, skip the test" << std::endl;
LOG() << "Skipping test: Test requires APU." << std::endl;
return;
}
if (m_FamilyId == FAMILY_RV) {
LOG() << "Skip the test on Raven due to IOMMU issues" << std::endl;
LOG() << "Skipping test: IOMMU issues on Raven." << std::endl;
return;
}
@@ -275,7 +275,7 @@ TEST_F(KFDExceptionTest, InvalidWriteAddress) {
ASSERT_GE(defaultGPUNode, 0) << "failed to get default GPU Node";
if (m_FamilyId == FAMILY_RV) {
LOG() << "Skip the test on Raven due to IOMMU issues" << std::endl;
LOG() << "Skipping test: IOMMU issues on Raven." << std::endl;
return;
}
@@ -323,7 +323,7 @@ TEST_F(KFDExceptionTest, FaultStorm) {
ASSERT_GE(defaultGPUNode, 0) << "failed to get default GPU Node";
if (m_FamilyId == FAMILY_RV) {
LOG() << "Skip the test on Raven due to IOMMU issues" << std::endl;
LOG() << "Skipping test: IOMMU issues on Raven." << std::endl;
return;
}
+6 -6
ファイルの表示
@@ -36,7 +36,7 @@ TEST_F(KFDGraphicsInterop, RegisterGraphicsHandle) {
const HSAuint32 familyID = FamilyIdFromNode(pNodeProps);
if (isTonga(pNodeProps)) {
LOG() << "Skipping test: Tonga workaround in thunk returns incorrect allocation size" << std::endl;
LOG() << "Skipping test: Tonga workaround in thunk returns incorrect allocation size." << std::endl;
return;
}
@@ -47,7 +47,7 @@ TEST_F(KFDGraphicsInterop, RegisterGraphicsHandle) {
int rn = FindDRMRenderNode(defaultGPUNode);
if (rn < 0) {
LOG() << "Skipping test" << std::endl;
LOG() << "Skipping test: Could not find render node for default GPU node." << std::endl;
return;
}
@@ -141,13 +141,13 @@ TEST_F(KFDGraphicsInterop, RegisterForeignDeviceMem) {
TEST_START(TESTPROFILE_RUNALL)
if (!is_dgpu()) {
LOG() << "Skipping test: Supports only multi-dGPU system" << std::endl;
LOG() << "Skipping test: Only supported on multi-dGPU system." << std::endl;
return;
}
const std::vector<int> gpuNodes = m_NodeInfo.GetNodesWithGPU();
if (gpuNodes.size() < 2) {
LOG() << "Skipping test: Need at least two GPUs" << std::endl;
LOG() << "Skipping test: At least two GPUs are required." << std::endl;
return;
}
@@ -159,7 +159,7 @@ TEST_F(KFDGraphicsInterop, RegisterForeignDeviceMem) {
gpuNode2 = m_NodeInfo.FindLargeBarGPUNode();
if (gpuNode2 < 0) {
LOG() << "Skipping test: Need at least one large bar GPU" << std::endl;
LOG() << "Skipping test: At least one large bar GPU is required." << std::endl;
return;
}
if (gpuNode1 == gpuNode2) {
@@ -177,7 +177,7 @@ TEST_F(KFDGraphicsInterop, RegisterForeignDeviceMem) {
int rn = FindDRMRenderNode(gpuNode2);
if (rn < 0) {
LOG() << "Skipping test" << std::endl;
LOG() << "Skipping test: Cound not find render node for 2nd GPU." << std::endl;
return;
}
+3 -3
ファイルの表示
@@ -167,7 +167,7 @@ TEST_F(KFDIPCTest, BasicTest) {
ASSERT_GE(defaultGPUNode, 0) << "failed to get default GPU Node";
if (!GetVramSize(defaultGPUNode)) {
LOG() << "Skip the test because of no VRAM found" << std::endl;
LOG() << "Skipping test: No VRAM found." << std::endl;
return;
}
@@ -606,7 +606,7 @@ TEST_F(KFDIPCTest, CrossMemoryAttachTest) {
ASSERT_GE(defaultGPUNode, 0) << "failed to get default GPU Node";
if (!GetVramSize(defaultGPUNode)) {
LOG() << "Skip the test because of no VRAM found" << std::endl;
LOG() << "Skipping test: No VRAM found." << std::endl;
return;
}
@@ -670,7 +670,7 @@ TEST_F(KFDIPCTest, CMABasicTest) {
ASSERT_GE(defaultGPUNode, 0) << "failed to get default GPU Node";
if (!GetVramSize(defaultGPUNode)) {
LOG() << "Skip the test because of no VRAM found" << std::endl;
LOG() << "Skipping test: No VRAM found." << std::endl;
return;
}
+6 -6
ファイルの表示
@@ -64,7 +64,7 @@ TEST_F(KFDLocalMemoryTest, BasicTest) {
ASSERT_GE(defaultGPUNode, 0) << "failed to get default GPU Node";
if (!GetVramSize(defaultGPUNode)) {
LOG() << "No VRAM found, skipping the test" << std::endl;
LOG() << "Skipping test: No VRAM found." << std::endl;
return;
}
@@ -119,7 +119,7 @@ TEST_F(KFDLocalMemoryTest, VerifyContentsAfterUnmapAndMap) {
ASSERT_GE(defaultGPUNode, 0) << "failed to get default GPU Node";
if (!GetVramSize(defaultGPUNode)) {
LOG() << "No VRAM found, skipping the test" << std::endl;
LOG() << "Skipping test: No VRAM found." << std::endl;
return;
}
@@ -239,7 +239,7 @@ TEST_F(KFDLocalMemoryTest, Fragmentation) {
fbSize = GetVramSize(defaultGPUNode);
if (!fbSize) {
LOG() << "No VRAM found, skipping test." << std::endl;
LOG() << "Skipping test: No VRAM found." << std::endl;
return;
} else {
LOG() << "Found VRAM of " << std::dec << (fbSize >> 20) << "MB." << std::endl;
@@ -396,7 +396,7 @@ TEST_F(KFDLocalMemoryTest, CheckZeroInitializationVram) {
HSAuint64 vramSizeMB = GetVramSize(defaultGPUNode) >> 20;
if (!vramSizeMB) {
LOG() << "No VRAM found, skipping the test" << std::endl;
LOG() << "Skipping test: No VRAM found." << std::endl;
return;
}
@@ -450,7 +450,7 @@ TEST_F(KFDLocalMemoryTest, MapVramToGPUNodesTest) {
const std::vector<int> gpuNodes = m_NodeInfo.GetNodesWithGPU();
if (gpuNodes.size() < 2) {
LOG() << "Skipping test: Need at least two GPUs" << std::endl;
LOG() << "Skipping test: Test requires at least two GPUs." << std::endl;
return;
}
@@ -462,7 +462,7 @@ TEST_F(KFDLocalMemoryTest, MapVramToGPUNodesTest) {
dst_node = m_NodeInfo.FindLargeBarGPUNode();
if (dst_node < 0) {
LOG() << "Skipping test: Need at least one large bar GPU" << std::endl;
LOG() << "Skipping test: Test requires at least one large bar GPU." << std::endl;
return;
}
+12 -12
ファイルの表示
@@ -141,7 +141,7 @@ TEST_F(KFDMemoryTest, MMapLarge) {
TEST_START(TESTPROFILE_RUNALL)
if (!is_dgpu()) {
LOG() << "Skip the test on APU" << std::endl;
LOG() << "Skipping test: Test not supported on APU." << std::endl;
return;
}
@@ -207,13 +207,13 @@ TEST_F(KFDMemoryTest, MMapLarge) {
TEST_F(KFDMemoryTest, MapUnmapToNodes) {
TEST_START(TESTPROFILE_RUNALL)
if (m_FamilyId != FAMILY_AI) {
LOG() << "Skipping test: Test uses gfx9-based shader, skip on other ASICs" << std::endl;
LOG() << "Skipping test: GFX9-based shader not supported on other ASICs." << std::endl;
return;
}
const std::vector<int> gpuNodes = m_NodeInfo.GetNodesWithGPU();
if (gpuNodes.size() < 2) {
LOG() << "Skipping test: Need at least two GPUs" << std::endl;
LOG() << "Skipping test: At least two GPUs are required." << std::endl;
return;
}
HSAuint32 defaultGPUNode = m_NodeInfo.HsaDefaultGPUNode();
@@ -316,7 +316,7 @@ TEST_F(KFDMemoryTest, AccessPPRMem) {
ASSERT_GE(defaultGPUNode, 0) << "failed to get default GPU Node";
if (is_dgpu()) {
LOG() << "Not an APU, no PPR available, skip the test" << std::endl;
LOG() << "Skipping test: Test requires APU." << std::endl;
return;
}
@@ -353,7 +353,7 @@ TEST_F(KFDMemoryTest, AccessPPRMem) {
TEST_F(KFDMemoryTest, MemoryRegister) {
const HsaNodeProperties *pNodeProperties = m_NodeInfo.HsaDefaultGPUNodeProperties();
if (isTonga(pNodeProperties)) {
LOG() << "Skipping test: Workaround in thunk for Tonga causes failure:" << std::endl;
LOG() << "Skipping test: Workaround in thunk for Tonga causes failure." << std::endl;
return;
}
@@ -453,7 +453,7 @@ TEST_F(KFDMemoryTest, MemoryRegister) {
TEST_F(KFDMemoryTest, MemoryRegisterSamePtr) {
if (!is_dgpu()) {
LOG() << "Skipping test: Will run on APU once APU+dGPU supported:" << std::endl;
LOG() << "Skipping test: Will run on APU once APU+dGPU supported." << std::endl;
return;
}
@@ -529,7 +529,7 @@ TEST_F(KFDMemoryTest, MemoryRegisterSamePtr) {
TEST_F(KFDMemoryTest, FlatScratchAccess) {
TEST_START(TESTPROFILE_RUNALL)
if (m_FamilyId == FAMILY_CI || m_FamilyId == FAMILY_KV) {
LOG() << "Skipping test: Test uses VI-based shader, fails on CI" << std::endl;
LOG() << "Skipping test: VI-based shader not supported on other ASICs." << std::endl;
return;
}
@@ -784,7 +784,7 @@ void KFDMemoryTest::BigBufferVRAM(int defaultGPUNode, HSAuint64 granularityMB,
* the onerous memory swap operation. So we limit the buffer size that way.*/
TEST_F(KFDMemoryTest, BigBufferStressTest) {
if (!is_dgpu()) {
LOG() << "Skipping test: Running on APU fails and locks the system" << std::endl;
LOG() << "Skipping test: Running on APU fails and locks the system." << std::endl;
return;
}
TEST_REQUIRE_ENV_CAPABILITIES(ENVCAPS_64BITLINUX);
@@ -1236,12 +1236,12 @@ TEST_F(KFDMemoryTest, PtraceAccessInvisibleVram) {
char *hsaDebug = getenv("HSA_DEBUG");
if (!is_dgpu()) {
LOG() << "Skipping test: No VRAM on APU" << std::endl;
LOG() << "Skipping test: There is no VRAM on APU." << std::endl;
return;
}
if (!hsaDebug || !strcmp(hsaDebug, "0")) {
LOG() << "Skipping test: HSA_DEBUG environment variable not set" << std::endl;
LOG() << "Skipping test: HSA_DEBUG environment variable not set." << std::endl;
return;
}
@@ -1382,7 +1382,7 @@ TEST_F(KFDMemoryTest, SignalHandling) {
TEST_START(TESTPROFILE_RUNALL)
if (!is_dgpu()) {
LOG() << "Skip the test on APU" << std::endl;
LOG() << "Skipping test: Test not supported on APU." << std::endl;
return;
}
@@ -1547,7 +1547,7 @@ TEST_F(KFDMemoryTest, MMBandWidth) {
LOG() << "Found VRAM of " << std::dec << vramSizeMB << "MB." << std::endl;
if (!m_NodeInfo.IsGPUNodeLargeBar(defaultGPUNode) || !vramSizeMB) {
LOG() << "not a largebar system, skip!" << std::endl;
LOG() << "Skipping test: Test requires a large bar GPU." << std::endl;
return;
}
+3 -4
ファイルの表示
@@ -166,7 +166,7 @@ TEST_F(KFDPerfCountersTest, RegisterTrace) {
}
if (!priv_block_found) {
LOG() << "No privileged block is found. Skipping RegisterTrace test."
LOG() << "Skipping test: No privileged block is found."
<< std::endl;
return;
}
@@ -207,14 +207,13 @@ TEST_F(KFDPerfCountersTest, StartStopQueryTrace) {
}
if (!priv_block_found) {
LOG() << "No privileged block is found. Skipping StartStopQuery test."
LOG() << "Skipping test: No privileged block is found."
<< std::endl;
return;
}
if (getuid()) { /* Non-root */
LOG() << "Privileged counters requires the user as root." << std::endl
<< "Skipping StartStopQuery test." << std::endl;
LOG() << "Skipping test: Privileged counters requires the user as root." << std::endl;
return;
}
+12 -12
ファイルの表示
@@ -417,7 +417,7 @@ TEST_F(KFDQMTest, CreateQueueStressSingleThreaded) {
TEST_F(KFDQMTest, OverSubscribeCpQueues) {
TEST_START(TESTPROFILE_RUNALL)
if (m_FamilyId == FAMILY_CI || m_FamilyId == FAMILY_KV) {
LOG() << "Skipping test: CI doesn't have HW scheduling" << std::endl;
LOG() << "Skipping test: CI doesn't have HW scheduling." << std::endl;
return;
}
@@ -660,7 +660,7 @@ TEST_F(KFDQMTest, BasicCuMaskingLinear) {
ASSERT_TRUE((ratio >= CuNegVariance) && (ratio <= CuPosVariance));
}
} else {
LOG() << "Test is skipped for family ID 0x" << m_FamilyId << std::endl;
LOG() << "Skipping test: Test not supported for family ID 0x" << m_FamilyId << "." << std::endl;
}
TEST_END
@@ -683,7 +683,7 @@ TEST_F(KFDQMTest, BasicCuMaskingEven) {
uint32_t ActiveCU = (pNodeProperties->NumFComputeCores / pNodeProperties->NumSIMDPerCU);
uint32_t numShaderEngines = pNodeProperties->NumShaderBanks;
if (numShaderEngines == 1) {
LOG() << "Only 1 Shader Engine. Skipping test." << std::endl;
LOG() << "Skipping test: Only 1 Shader Engine present." << std::endl;
return;
}
@@ -731,7 +731,7 @@ TEST_F(KFDQMTest, BasicCuMaskingEven) {
ASSERT_TRUE((ratio >= CuNegVariance) && (ratio <= CuPosVariance));
}
} else {
LOG() << "Test is skipped for family ID 0x" << m_FamilyId << std::endl;
LOG() << "Skipping test: Test not supported for family ID 0x" << m_FamilyId << "." << std::endl;
}
TEST_END
@@ -741,7 +741,7 @@ TEST_F(KFDQMTest, QueuePriorityOnDifferentPipe) {
TEST_START(TESTPROFILE_RUNALL);
if (m_FamilyId < FAMILY_VI) {
LOG() << "Skipping test: Shader won't run on CI" << std::endl;
LOG() << "Skipping test: Shader won't run on CI." << std::endl;
return;
}
@@ -806,7 +806,7 @@ TEST_F(KFDQMTest, QueuePriorityOnSamePipe) {
TEST_START(TESTPROFILE_RUNALL);
if (m_FamilyId < FAMILY_VI) {
LOG() << "Skipping test: Shader won't run on CI" << std::endl;
LOG() << "Skipping test: Shader won't run on CI." << std::endl;
return;
}
@@ -1274,7 +1274,7 @@ TEST_F(KFDQMTest, Atomics) {
TEST_START(TESTPROFILE_RUNALL);
/* CI doesn't support Atomics. KV does, but gets its own FAMILY_KV def */
if (m_FamilyId == FAMILY_CI) {
LOG() << "Skipping test: CI doesn't support Atomics" << std::endl;
LOG() << "Skipping test: CI doesn't support Atomics." << std::endl;
return;
}
int defaultGPUNode = m_NodeInfo.HsaDefaultGPUNode();
@@ -1388,13 +1388,13 @@ static void sdma_fill(HSAint32 node, void *dst, unsigned int data, unsigned int
TEST_F(KFDQMTest, P2PTest) {
TEST_START(TESTPROFILE_RUNALL);
if (!is_dgpu()) {
LOG() << "Skipping test: Can't have 2 APUs on the same system" << std::endl;
LOG() << "Skipping test: Two GPUs are required, but no dGPUs are present." << std::endl;
return;
}
const std::vector<int> gpuNodes = m_NodeInfo.GetNodesWithGPU();
if (gpuNodes.size() < 2) {
LOG() << "Skipping test: Need at least two GPUs" << std::endl;
LOG() << "Skipping test: At least two GPUs are required." << std::endl;
return;
}
std::vector<HSAuint32> nodes;
@@ -1419,11 +1419,11 @@ TEST_F(KFDQMTest, P2PTest) {
nodes.push_back(g_TestNodeId);
nodes.push_back(g_TestDstNodeId);
if (!m_NodeInfo.IsGPUNodeLargeBar(nodes[1])) {
LOG() << "Skipping test: Dst GPU is not a large bar GPU" << std::endl;
LOG() << "Skipping test: Dst GPU is not a large bar GPU." << std::endl;
return;
}
if (nodes[0] == nodes[1]) {
LOG() << "Skipping test: Need different GPUs specified" << std::endl;
LOG() << "Skipping test: Different GPUs must be specified (2 GPUs required)." << std::endl;
return;
}
} else {
@@ -1433,7 +1433,7 @@ TEST_F(KFDQMTest, P2PTest) {
if (m_NodeInfo.IsGPUNodeLargeBar(gpuNodes.at(i)) && gpuNodes.at(i) != defaultGPU)
nodes.push_back(gpuNodes.at(i));
if (nodes.size() < 2) {
LOG() << "Skipping test: Need at least one large bar GPU" << std::endl;
LOG() << "Skipping test: Test requires at least one large bar GPU." << std::endl;
return;
}
}
+1 -1
ファイルの表示
@@ -116,7 +116,7 @@ TEST_F(KFDTopologyTest, GpuvmApertureValidate) {
pNodeProperties = m_NodeInfo.GetNodeProperties(GpuNodes.at(i));
if (pNodeProperties != NULL) {
if (!is_dgpu() && !(FamilyIdFromNode(pNodeProperties) == FAMILY_KV)) {
LOG() << "Skipping test: GPUVM framebuffer heap not exposed on APU except Kaveri" << std::endl;
LOG() << "Skipping test: GPUVM framebuffer heap not exposed on APU except Kaveri." << std::endl;
return;
}
HsaMemoryProperties *memoryProperties = new HsaMemoryProperties[pNodeProperties->NumMemoryBanks];