From 09b899b079e6aa50f17d39f32c2ccb22dd22bfbd Mon Sep 17 00:00:00 2001 From: Eric Huang Date: Thu, 21 Nov 2024 11:35:11 -0500 Subject: [PATCH] kfdtest: increase test timeout and optimize evict tests timeout there are some timeout issues of evict tests on recent new boards, it is to solve those issues and optimize evict timeout, as well as to give user a chance to change timeout in command line. Signed-off-by: Eric Huang Change-Id: I2f40c8ea809c55675b0d0b62296b663481e5fb16 --- libhsakmt/tests/kfdtest/src/KFDEvictTest.cpp | 2 +- libhsakmt/tests/kfdtest/src/KFDSVMEvictTest.cpp | 2 +- libhsakmt/tests/kfdtest/src/KFDTestMain.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libhsakmt/tests/kfdtest/src/KFDEvictTest.cpp b/libhsakmt/tests/kfdtest/src/KFDEvictTest.cpp index 40024510b6..c0962f96b7 100644 --- a/libhsakmt/tests/kfdtest/src/KFDEvictTest.cpp +++ b/libhsakmt/tests/kfdtest/src/KFDEvictTest.cpp @@ -486,7 +486,7 @@ TEST_F(KFDEvictTest, QueueTest) { addrBuffer.Fill(0x5678); /* Wait for shader to finish or timeout if shader has vm page fault */ - EXPECT_EQ(0, dispatch0.SyncWithStatus(180000)); + EXPECT_EQ(0, dispatch0.SyncWithStatus(g_TestTimeOut * 5)); EXPECT_SUCCESS(pm4Queue.Destroy()); diff --git a/libhsakmt/tests/kfdtest/src/KFDSVMEvictTest.cpp b/libhsakmt/tests/kfdtest/src/KFDSVMEvictTest.cpp index dc115e5697..5c592351ed 100644 --- a/libhsakmt/tests/kfdtest/src/KFDSVMEvictTest.cpp +++ b/libhsakmt/tests/kfdtest/src/KFDSVMEvictTest.cpp @@ -399,7 +399,7 @@ TEST_P(KFDSVMEvictTest, QueueTest) { addrBuffer.Fill(0x5678); /* wait for shader to finish or timeout if shade has vm page fault */ - dispatch0.SyncWithStatus(120000); + dispatch0.SyncWithStatus(g_TestTimeOut * 5); ASSERT_SUCCESS(pm4Queue.Destroy()); /* LOG() << m_psName << "free buffer" << std::endl; */ diff --git a/libhsakmt/tests/kfdtest/src/KFDTestMain.cpp b/libhsakmt/tests/kfdtest/src/KFDTestMain.cpp index 022b2df152..8d2cb40fff 100644 --- a/libhsakmt/tests/kfdtest/src/KFDTestMain.cpp +++ b/libhsakmt/tests/kfdtest/src/KFDTestMain.cpp @@ -27,7 +27,7 @@ #include "GoogleTestExtension.hpp" #include "OSWrapper.hpp" -#define KFD_TEST_DEFAULT_TIMEOUT 10000 +#define KFD_TEST_DEFAULT_TIMEOUT 60000 std::ostream& operator << (std::ostream& out, TESTPROFILE profile) { switch (profile) {