From 7cd22e8785e00aac9ef0f2e2b5ec89c76cfd0e44 Mon Sep 17 00:00:00 2001 From: xinhui pan Date: Thu, 16 Aug 2018 15:32:08 +0800 Subject: [PATCH] kfdtest: use HSAuint64 instead of unsigned HSAint64 This should fix gtest compile errors. code like below has trouble, typedef char char8; typedef unsigned char uchar8; ASSERT_NE((uchar8)1, 0); ASSERT_NE((unsigned char8)1, 0); // compile error here or ASSERT_NE((unsigned char8)1, 0); ASSERT_NE((uchar8)1, 0); // compile error here HSA[u]int64 are alias. So ASSERT_XX((unsigned HSAint64)..) with ASSERT_XX((HSAuint64)..) fail to compile. Change-Id: I4c24bc699a69bd4f37c4bc8aaaa9f1a92a24a33e Signed-off-by: xinhui pan [ROCm/ROCR-Runtime commit: 163fa2f3aa40e5327e6c87c5a4b4f0faf21b0417] --- projects/rocr-runtime/tests/kfdtest/src/KFDQMTest.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/rocr-runtime/tests/kfdtest/src/KFDQMTest.cpp b/projects/rocr-runtime/tests/kfdtest/src/KFDQMTest.cpp index 1d0eb6fe38..30bc5416ed 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/KFDQMTest.cpp +++ b/projects/rocr-runtime/tests/kfdtest/src/KFDQMTest.cpp @@ -1084,7 +1084,7 @@ TEST_F(KFDQMTest, QueueLatency) { HSAuint64 *qts; int i = 0; - ASSERT_NE((unsigned HSAint64)queue_latency_arr, 0); + ASSERT_NE((HSAuint64)queue_latency_arr, 0); int defaultGPUNode = m_NodeInfo.HsaDefaultGPUNode(); ASSERT_GE(defaultGPUNode, 0) << "failed to get default GPU Node"; @@ -1110,7 +1110,7 @@ TEST_F(KFDQMTest, QueueLatency) { i = 0; do { queue.PlacePacket(PM4ReleaseMemoryPacket(true, - (unsigned HSAint64)&qts[i], + (HSAuint64)&qts[i], 0, true, 1)); @@ -1137,7 +1137,7 @@ TEST_F(KFDQMTest, QueueLatency) { i = 0; do { queue.PlacePacket(PM4ReleaseMemoryPacket(true, - (unsigned HSAint64)&qts[i], + (HSAuint64)&qts[i], 0, true, 1));