From 768bd50cd2fe0a3564d32cd06eee2ec75d6758de Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Tue, 30 Jul 2019 20:19:47 -0400 Subject: [PATCH] kfdtest: Improve the printing message for CuMasking tests Decimal is better than hex in this case. Change-Id: Ic15a9373e99160880b98d3dcd6827d551c87b77a Signed-off-by: Yong Zhao [ROCm/ROCR-Runtime commit: 3e4c42ef13a966eb99756f0488aec9af2d9c78ee] --- .../tests/kfdtest/scripts/kfdtest.exclude | 2 +- .../rocr-runtime/tests/kfdtest/src/KFDQMTest.cpp | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/rocr-runtime/tests/kfdtest/scripts/kfdtest.exclude b/projects/rocr-runtime/tests/kfdtest/scripts/kfdtest.exclude index 9008339a3e..c688faf498 100644 --- a/projects/rocr-runtime/tests/kfdtest/scripts/kfdtest.exclude +++ b/projects/rocr-runtime/tests/kfdtest/scripts/kfdtest.exclude @@ -5,7 +5,7 @@ # stresses memory management in unusual ways by having lots of memory allocated but # not mapped, which is not relevant to compute applications over ROCr. # -# CU Masking Linear/Split are not working correctly due to how the HW distributes work over CUs. +# CU Masking Linear are not working correctly due to how the HW distributes work over CUs. # They are available for testing but are not currently expected to pass on CI/VI/AI. # # The CheckZeroInitializationVram test is no longer expected to pass as KFD no longer diff --git a/projects/rocr-runtime/tests/kfdtest/src/KFDQMTest.cpp b/projects/rocr-runtime/tests/kfdtest/src/KFDQMTest.cpp index 48e4fbb098..9b036193d0 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/KFDQMTest.cpp +++ b/projects/rocr-runtime/tests/kfdtest/src/KFDQMTest.cpp @@ -655,10 +655,10 @@ TEST_F(KFDQMTest, BasicCuMaskingLinear) { const HsaNodeProperties *pNodeProperties = m_NodeInfo.GetNodeProperties(defaultGPUNode); uint32_t ActiveCU = (pNodeProperties->NumFComputeCores / pNodeProperties->NumSIMDPerCU); uint32_t numSEs = pNodeProperties->NumShaderBanks; - LOG() << std::hex << "# Compute cores: 0x" << pNodeProperties->NumFComputeCores << std::endl; - LOG() << std::hex << "# SIMDs per CPU: 0x" << pNodeProperties->NumSIMDPerCU << std::endl; - LOG() << std::hex << "# Shader engines: 0x" << numSEs << std::endl; - LOG() << std::hex << "# Active CUs: 0x" << ActiveCU << std::endl; + LOG() << std::dec << "# Compute cores: " << pNodeProperties->NumFComputeCores << std::endl; + LOG() << std::dec << "# SIMDs per CU: " << pNodeProperties->NumSIMDPerCU << std::endl; + LOG() << std::dec << "# Shader engines: " << numSEs << std::endl; + LOG() << std::dec << "# Active CUs: " << ActiveCU << std::endl; HSAint64 TimewithCU1, TimewithCU; uint32_t maskNumDwords = (ActiveCU + 31) / 32; /* Round up to the nearest multiple of 32 */ uint32_t maskNumBits = maskNumDwords * 32; @@ -718,10 +718,10 @@ TEST_F(KFDQMTest, BasicCuMaskingEven) { return; } - LOG() << std::hex << "# Compute cores: 0x" << pNodeProperties->NumFComputeCores << std::endl; - LOG() << std::hex << "# SIMDs per CPU: 0x" << pNodeProperties->NumSIMDPerCU << std::endl; - LOG() << std::hex << "# Shader engines: 0x" << numShaderEngines << std::endl; - LOG() << std::hex << "# Active CUs: 0x" << ActiveCU << std::endl; + LOG() << std::dec << "# Compute cores: " << pNodeProperties->NumFComputeCores << std::endl; + LOG() << std::dec << "# SIMDs per CU: " << pNodeProperties->NumSIMDPerCU << std::endl; + LOG() << std::dec << "# Shader engines: " << numShaderEngines << std::endl; + LOG() << std::dec << "# Active CUs: " << ActiveCU << std::endl; HSAint64 TimewithCU1, TimewithCU; uint32_t maskNumDwords = (ActiveCU + 31) / 32; /* Round up to the nearest multiple of 32 */ uint32_t maskNumBits = maskNumDwords * 32;