Skip to content

Commit 004b011

Browse files
authored
test: shrd sys alloc tests for *MemoryPrefetch (#215)
Related to VLCLJ-2515 Signed-off-by: Bagria, Narendra <[email protected]>
1 parent 894cef2 commit 004b011

File tree

2 files changed

+52
-11
lines changed

2 files changed

+52
-11
lines changed

conformance_tests/core/test_cmdlist/src/test_cmdlist_immediate.cpp

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -971,24 +971,49 @@ TEST_P(zeImmediateCommandListExecutionTests,
971971
lzt::free_memory(memory);
972972
}
973973

974+
TEST_P(
975+
zeImmediateCommandListExecutionTests,
976+
GivenImmediateCommandListWhenAppendMemoryPrefetchThenSuccessIsReturnedWithSharedSystemAllocator) {
977+
SKIP_IF_SHARED_SYSTEM_ALLOC_UNSUPPORTED();
978+
size_t size = 4096;
979+
void *memory = lzt::aligned_malloc(size, 1);
980+
EXPECT_EQ(ZE_RESULT_SUCCESS,
981+
zeCommandListAppendMemoryPrefetch(cmdlist_immediate, memory, size));
982+
EXPECT_EQ(ZE_RESULT_SUCCESS,
983+
zeCommandListHostSynchronize(cmdlist_immediate, timeout));
984+
lzt::aligned_free(memory);
985+
}
986+
974987
static void RunAppendMemoryPrefetch(ze_command_list_handle_t cmdlist_immediate,
975-
const uint64_t timeout) {
988+
const uint64_t timeout,
989+
bool is_shared_system) {
976990
size_t size = 4096;
977-
void *memory = lzt::allocate_shared_memory(size);
991+
void *memory = lzt::allocate_shared_memory_with_allocator_selector(
992+
size, is_shared_system);
978993
EXPECT_EQ(ZE_RESULT_SUCCESS,
979994
zeCommandListAppendMemoryPrefetch(cmdlist_immediate, memory, size));
980995
EXPECT_EQ(ZE_RESULT_SUCCESS,
981996
zeCommandListHostSynchronize(cmdlist_immediate, timeout));
982-
lzt::free_memory(memory);
997+
lzt::free_memory_with_allocator_selector(memory, is_shared_system);
983998
}
984999

9851000
TEST_F(
9861001
zeImmediateCommandListInOrderExecutionTests,
9871002
GivenInOrderImmediateCommandListWhenAppendMemoryPrefetchThenSuccessIsReturned) {
9881003
const uint64_t timeout = UINT64_MAX - 1;
989-
RunAppendMemoryPrefetch(cmdlist_immediate_default_mode, timeout);
990-
RunAppendMemoryPrefetch(cmdlist_immediate_sync_mode, 0);
991-
RunAppendMemoryPrefetch(cmdlist_immediate_async_mode, timeout);
1004+
RunAppendMemoryPrefetch(cmdlist_immediate_default_mode, timeout, false);
1005+
RunAppendMemoryPrefetch(cmdlist_immediate_sync_mode, 0, false);
1006+
RunAppendMemoryPrefetch(cmdlist_immediate_async_mode, timeout, false);
1007+
}
1008+
1009+
TEST_F(
1010+
zeImmediateCommandListInOrderExecutionTests,
1011+
GivenInOrderImmediateCommandListWhenAppendMemoryPrefetchThenSuccessIsReturnedWithSharedSystemAllocator) {
1012+
SKIP_IF_SHARED_SYSTEM_ALLOC_UNSUPPORTED();
1013+
const uint64_t timeout = UINT64_MAX - 1;
1014+
RunAppendMemoryPrefetch(cmdlist_immediate_default_mode, timeout, true);
1015+
RunAppendMemoryPrefetch(cmdlist_immediate_sync_mode, 0, true);
1016+
RunAppendMemoryPrefetch(cmdlist_immediate_async_mode, timeout, true);
9921017
}
9931018

9941019
TEST_P(zeImmediateCommandListExecutionTests,

conformance_tests/core/test_copy/src/test_copy.cpp

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1349,10 +1349,12 @@ TEST_F(
13491349

13501350
class zeCommandListAppendMemoryPrefetchTests : public ::testing::Test {
13511351
protected:
1352-
void RunGivenMemoryPrefetchWhenWritingFromDeviceTest(bool is_immediate) {
1352+
void RunGivenMemoryPrefetchWhenWritingFromDeviceTest(bool is_immediate,
1353+
bool is_shared_system) {
13531354
const size_t size = 16;
13541355
const uint8_t value = 0x55;
1355-
void *memory = allocate_shared_memory(size);
1356+
void *memory = lzt::allocate_shared_memory_with_allocator_selector(
1357+
size, is_shared_system);
13561358
memset(memory, 0xaa, size);
13571359
auto cmd_bundle = lzt::create_command_bundle(is_immediate);
13581360

@@ -1366,20 +1368,34 @@ class zeCommandListAppendMemoryPrefetchTests : public ::testing::Test {
13661368
ASSERT_EQ(value, ((uint8_t *)memory)[i]);
13671369
}
13681370

1369-
free_memory(memory);
1371+
free_memory_with_allocator_selector(memory, is_shared_system);
13701372
lzt::destroy_command_bundle(cmd_bundle);
13711373
}
13721374
};
13731375

13741376
TEST_F(zeCommandListAppendMemoryPrefetchTests,
13751377
GivenMemoryPrefetchWhenWritingFromDeviceThenDataisCorrectFromHost) {
1376-
RunGivenMemoryPrefetchWhenWritingFromDeviceTest(false);
1378+
RunGivenMemoryPrefetchWhenWritingFromDeviceTest(false, false);
13771379
}
13781380

13791381
TEST_F(
13801382
zeCommandListAppendMemoryPrefetchTests,
13811383
GivenMemoryPrefetchWhenWritingFromDeviceOnImmediateCmdListThenDataisCorrectFromHost) {
1382-
RunGivenMemoryPrefetchWhenWritingFromDeviceTest(true);
1384+
RunGivenMemoryPrefetchWhenWritingFromDeviceTest(true, false);
1385+
}
1386+
1387+
TEST_F(
1388+
zeCommandListAppendMemoryPrefetchTests,
1389+
GivenMemoryPrefetchWhenWritingFromDeviceThenDataisCorrectFromHostWithSharedSystemAllocator) {
1390+
SKIP_IF_SHARED_SYSTEM_ALLOC_UNSUPPORTED();
1391+
RunGivenMemoryPrefetchWhenWritingFromDeviceTest(false, true);
1392+
}
1393+
1394+
TEST_F(
1395+
zeCommandListAppendMemoryPrefetchTests,
1396+
GivenMemoryPrefetchWhenWritingFromDeviceOnImmediateCmdListThenDataisCorrectFromHostWithSharedSystemAllocator) {
1397+
SKIP_IF_SHARED_SYSTEM_ALLOC_UNSUPPORTED();
1398+
RunGivenMemoryPrefetchWhenWritingFromDeviceTest(true, true);
13831399
}
13841400

13851401
class zeCommandListAppendMemAdviseTests

0 commit comments

Comments
 (0)