Skip to content

Commit 2935931

Browse files
KonstantyMisiakKonstantyMisiak
authored
refactor: use test_harness for MemAdvise, Prefetch and CmdListSync (#308)
Signed-off-by: Misiak, Konstanty <[email protected]>
1 parent 9426647 commit 2935931

File tree

6 files changed

+67
-98
lines changed

6 files changed

+67
-98
lines changed

‎conformance_tests/core/test_cmdlist/src/test_cmdlist_immediate.cpp‎

Lines changed: 40 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,7 @@ LZT_TEST_P(
159159
if (useEventsToSynchronize) {
160160
EXPECT_ZE_RESULT_SUCCESS(zeEventHostSynchronize(event0, timeout));
161161
} else {
162-
EXPECT_ZE_RESULT_SUCCESS(
163-
zeCommandListHostSynchronize(cmdlist_immediate, timeout));
162+
lzt::synchronize_command_list_host(cmdlist_immediate, timeout);
164163
EXPECT_ZE_RESULT_SUCCESS(zeEventQueryStatus(event0));
165164
}
166165

@@ -185,8 +184,7 @@ RunAppendMemorySetInstructionTest(ze_command_list_handle_t cmdlist_immediate,
185184

186185
if (mode != ZE_COMMAND_QUEUE_MODE_SYNCHRONOUS) {
187186
const uint64_t timeout = UINT64_MAX - 1;
188-
EXPECT_ZE_RESULT_SUCCESS(
189-
zeCommandListHostSynchronize(cmdlist_immediate, timeout));
187+
lzt::synchronize_command_list_host(cmdlist_immediate, timeout);
190188
}
191189

192190
for (size_t i = 0; i < size * sizeof(int); i++) {
@@ -251,8 +249,7 @@ void zeImmediateCommandListExecutionTests::
251249
if (useEventsToSynchronize) {
252250
EXPECT_ZE_RESULT_SUCCESS(zeEventHostSynchronize(event0, timeout));
253251
} else {
254-
EXPECT_ZE_RESULT_SUCCESS(
255-
zeCommandListHostSynchronize(cmdlist_immediate, timeout));
252+
lzt::synchronize_command_list_host(cmdlist_immediate, timeout);
256253
EXPECT_ZE_RESULT_SUCCESS(zeEventQueryStatus(event0));
257254
}
258255
for (size_t i = 0; i < size; i++) {
@@ -319,8 +316,7 @@ static void RunAppendLaunchKernel(ze_command_list_handle_t cmdlist_immediate,
319316
}
320317

321318
if (mode != ZE_COMMAND_QUEUE_MODE_SYNCHRONOUS) {
322-
EXPECT_ZE_RESULT_SUCCESS(
323-
zeCommandListHostSynchronize(cmdlist_immediate, timeout));
319+
lzt::synchronize_command_list_host(cmdlist_immediate, timeout);
324320
}
325321
for (size_t i = 0; i < size; i++) {
326322
EXPECT_EQ(static_cast<int *>(buffer)[i], (addval + totalVal));
@@ -471,8 +467,7 @@ LZT_TEST_P(
471467
if (useEventsToSynchronize) {
472468
zeEventHostSynchronize(event0, timeout);
473469
} else {
474-
EXPECT_ZE_RESULT_SUCCESS(
475-
zeCommandListHostSynchronize(cmdlist_immediate, timeout));
470+
lzt::synchronize_command_list_host(cmdlist_immediate, timeout);
476471
EXPECT_ZE_RESULT_SUCCESS(zeEventQueryStatus(event0));
477472
}
478473
zeEventHostReset(event0);
@@ -484,8 +479,7 @@ LZT_TEST_P(
484479
if (useEventsToSynchronize) {
485480
zeEventHostSynchronize(event0, timeout);
486481
} else {
487-
EXPECT_ZE_RESULT_SUCCESS(
488-
zeCommandListHostSynchronize(cmdlist_immediate, timeout));
482+
lzt::synchronize_command_list_host(cmdlist_immediate, timeout);
489483
EXPECT_ZE_RESULT_SUCCESS(zeEventQueryStatus(event0));
490484
}
491485
}
@@ -511,8 +505,7 @@ static void RunAppendMemoryCopy(ze_command_list_handle_t cmdlist_immediate,
511505
lzt::size_in_bytes(host_memory2), nullptr);
512506

513507
if (mode != ZE_COMMAND_QUEUE_MODE_SYNCHRONOUS) {
514-
EXPECT_ZE_RESULT_SUCCESS(
515-
zeCommandListHostSynchronize(cmdlist_immediate, timeout));
508+
lzt::synchronize_command_list_host(cmdlist_immediate, timeout);
516509
}
517510
lzt::validate_data_pattern(host_memory2.data(), size, 1);
518511
lzt::free_memory(device_memory);
@@ -581,8 +574,7 @@ LZT_TEST_P(
581574
if (useEventsToSynchronize) {
582575
zeEventHostSynchronize(host_to_dev_event[i], timeout);
583576
} else {
584-
EXPECT_ZE_RESULT_SUCCESS(
585-
zeCommandListHostSynchronize(mulcmdlist_immediate[i], timeout));
577+
lzt::synchronize_command_list_host(mulcmdlist_immediate[i], timeout);
586578
EXPECT_ZE_RESULT_SUCCESS(zeEventQueryStatus(host_to_dev_event[i]));
587579
}
588580
}
@@ -638,8 +630,7 @@ static void RunMultipleAppendMemoryCopy(ze_command_queue_mode_t mode) {
638630

639631
for (uint32_t i = 0; i < num_cmdq; i++) {
640632
if (mode != ZE_COMMAND_QUEUE_MODE_SYNCHRONOUS) {
641-
EXPECT_ZE_RESULT_SUCCESS(
642-
zeCommandListHostSynchronize(mulcmdlist_immediate[i], timeout));
633+
lzt::synchronize_command_list_host(mulcmdlist_immediate[i], timeout);
643634
}
644635
}
645636

@@ -686,8 +677,7 @@ LZT_TEST_P(
686677
if (useEventsToSynchronize) {
687678
zeEventHostSynchronize(event0, timeout);
688679
} else {
689-
EXPECT_ZE_RESULT_SUCCESS(
690-
zeCommandListHostSynchronize(cmdlist_immediate, timeout));
680+
lzt::synchronize_command_list_host(cmdlist_immediate, timeout);
691681
EXPECT_ZE_RESULT_SUCCESS(zeEventQueryStatus(event0));
692682
}
693683
zeEventHostReset(event0);
@@ -700,8 +690,7 @@ LZT_TEST_P(
700690
if (useEventsToSynchronize) {
701691
zeEventHostSynchronize(event0, timeout);
702692
} else {
703-
EXPECT_ZE_RESULT_SUCCESS(
704-
zeCommandListHostSynchronize(cmdlist_immediate, timeout));
693+
lzt::synchronize_command_list_host(cmdlist_immediate, timeout);
705694
EXPECT_ZE_RESULT_SUCCESS(zeEventQueryStatus(event0));
706695
}
707696
zeEventHostReset(event0);
@@ -716,8 +705,7 @@ LZT_TEST_P(
716705
if (useEventsToSynchronize) {
717706
zeEventHostSynchronize(event0, timeout);
718707
} else {
719-
EXPECT_ZE_RESULT_SUCCESS(
720-
zeCommandListHostSynchronize(cmdlist_immediate, timeout));
708+
lzt::synchronize_command_list_host(cmdlist_immediate, timeout);
721709
EXPECT_ZE_RESULT_SUCCESS(zeEventQueryStatus(event0));
722710
}
723711
zeEventHostReset(event0);
@@ -763,8 +751,7 @@ static void RunAppendImageCopy(ze_command_list_handle_t cmdlist_immediate,
763751
img.dflt_device_image_, nullptr);
764752

765753
if (mode != ZE_COMMAND_QUEUE_MODE_SYNCHRONOUS) {
766-
EXPECT_ZE_RESULT_SUCCESS(
767-
zeCommandListHostSynchronize(cmdlist_immediate, timeout));
754+
lzt::synchronize_command_list_host(cmdlist_immediate, timeout);
768755
}
769756

770757
// Validate the result of the above operations:
@@ -802,8 +789,7 @@ LZT_TEST_P(
802789
if (useEventsToSynchronize) {
803790
EXPECT_ZE_RESULT_SUCCESS(zeEventHostSynchronize(event1, timeout));
804791
} else {
805-
EXPECT_ZE_RESULT_SUCCESS(
806-
zeCommandListHostSynchronize(cmdlist_immediate, timeout));
792+
lzt::synchronize_command_list_host(cmdlist_immediate, timeout);
807793
ASSERT_ZE_RESULT_SUCCESS(zeEventQueryStatus(event1));
808794
}
809795
}
@@ -831,8 +817,7 @@ static void RunAppendEventReset(ze_command_list_handle_t cmdlist_immediate,
831817
if (useEventsToSynchronize) {
832818
EXPECT_ZE_RESULT_SUCCESS(zeEventHostSynchronize(event1, timeout));
833819
} else {
834-
EXPECT_ZE_RESULT_SUCCESS(
835-
zeCommandListHostSynchronize(cmdlist_immediate, timeout));
820+
lzt::synchronize_command_list_host(cmdlist_immediate, timeout);
836821
ASSERT_ZE_RESULT_SUCCESS(zeEventQueryStatus(event1));
837822
}
838823
}
@@ -872,8 +857,7 @@ LZT_TEST_P(
872857
zeCommandListAppendBarrier(cmdlist_immediate, event1, 0, nullptr);
873858
EXPECT_ZE_RESULT_SUCCESS(zeEventHostSynchronize(event1, timeout));
874859
} else {
875-
EXPECT_ZE_RESULT_SUCCESS(
876-
zeCommandListHostSynchronize(cmdlist_immediate, timeout));
860+
lzt::synchronize_command_list_host(cmdlist_immediate, timeout);
877861
}
878862
}
879863
EXPECT_ZE_RESULT_SUCCESS(zeEventHostSynchronize(event0, timeout));
@@ -899,8 +883,7 @@ static void RunAppendSignalEvent(ze_command_list_handle_t cmdlist_immediate,
899883
zeCommandListAppendBarrier(cmdlist_immediate, event1, 0, nullptr);
900884
EXPECT_ZE_RESULT_SUCCESS(zeEventHostSynchronize(event1, timeout));
901885
} else {
902-
EXPECT_ZE_RESULT_SUCCESS(
903-
zeCommandListHostSynchronize(cmdlist_immediate, timeout));
886+
lzt::synchronize_command_list_host(cmdlist_immediate, timeout);
904887
}
905888
}
906889
EXPECT_ZE_RESULT_SUCCESS(zeEventHostSynchronize(event0, timeout));
@@ -981,10 +964,8 @@ LZT_TEST_P(
981964
GivenImmediateCommandListWhenAppendMemoryPrefetchThenSuccessIsReturned) {
982965
size_t size = 4096;
983966
void *memory = lzt::allocate_shared_memory(size);
984-
EXPECT_ZE_RESULT_SUCCESS(
985-
zeCommandListAppendMemoryPrefetch(cmdlist_immediate, memory, size));
986-
EXPECT_ZE_RESULT_SUCCESS(
987-
zeCommandListHostSynchronize(cmdlist_immediate, timeout));
967+
lzt::append_memory_prefetch(cmdlist_immediate, memory, size);
968+
lzt::synchronize_command_list_host(cmdlist_immediate, timeout);
988969
lzt::free_memory(memory);
989970
}
990971

@@ -994,10 +975,8 @@ LZT_TEST_P(
994975
SKIP_IF_SHARED_SYSTEM_ALLOC_UNSUPPORTED();
995976
size_t size = 4096;
996977
void *memory = lzt::aligned_malloc(size, 1);
997-
EXPECT_ZE_RESULT_SUCCESS(
998-
zeCommandListAppendMemoryPrefetch(cmdlist_immediate, memory, size));
999-
EXPECT_ZE_RESULT_SUCCESS(
1000-
zeCommandListHostSynchronize(cmdlist_immediate, timeout));
978+
lzt::append_memory_prefetch(cmdlist_immediate, memory, size);
979+
lzt::synchronize_command_list_host(cmdlist_immediate, timeout);
1001980
lzt::aligned_free(memory);
1002981
}
1003982

@@ -1007,10 +986,8 @@ static void RunAppendMemoryPrefetch(ze_command_list_handle_t cmdlist_immediate,
1007986
size_t size = 4096;
1008987
void *memory = lzt::allocate_shared_memory_with_allocator_selector(
1009988
size, is_shared_system);
1010-
EXPECT_ZE_RESULT_SUCCESS(
1011-
zeCommandListAppendMemoryPrefetch(cmdlist_immediate, memory, size));
1012-
EXPECT_ZE_RESULT_SUCCESS(
1013-
zeCommandListHostSynchronize(cmdlist_immediate, timeout));
989+
lzt::append_memory_prefetch(cmdlist_immediate, memory, size);
990+
lzt::synchronize_command_list_host(cmdlist_immediate, timeout);
1014991
lzt::free_memory_with_allocator_selector(memory, is_shared_system);
1015992
}
1016993

@@ -1037,11 +1014,10 @@ LZT_TEST_P(zeImmediateCommandListExecutionTests,
10371014
GivenImmediateCommandListWhenAppendMemAdviseThenSuccessIsReturned) {
10381015
size_t size = 4096;
10391016
void *memory = lzt::allocate_shared_memory(size);
1040-
EXPECT_ZE_RESULT_SUCCESS(zeCommandListAppendMemAdvise(
1041-
cmdlist_immediate, lzt::zeDevice::get_instance()->get_device(), memory,
1042-
size, ZE_MEMORY_ADVICE_SET_READ_MOSTLY));
1043-
EXPECT_ZE_RESULT_SUCCESS(
1044-
zeCommandListHostSynchronize(cmdlist_immediate, timeout));
1017+
lzt::append_memory_advise(cmdlist_immediate,
1018+
lzt::zeDevice::get_instance()->get_device(), memory,
1019+
size, ZE_MEMORY_ADVICE_SET_READ_MOSTLY);
1020+
lzt::synchronize_command_list_host(cmdlist_immediate, timeout);
10451021
lzt::free_memory(memory);
10461022
}
10471023

@@ -1051,11 +1027,10 @@ LZT_TEST_P(
10511027
SKIP_IF_SHARED_SYSTEM_ALLOC_UNSUPPORTED();
10521028
size_t size = 4096;
10531029
void *memory = lzt::aligned_malloc(size, 1);
1054-
EXPECT_ZE_RESULT_SUCCESS(zeCommandListAppendMemAdvise(
1055-
cmdlist_immediate, lzt::zeDevice::get_instance()->get_device(), memory,
1056-
size, ZE_MEMORY_ADVICE_SET_READ_MOSTLY));
1057-
EXPECT_ZE_RESULT_SUCCESS(
1058-
zeCommandListHostSynchronize(cmdlist_immediate, timeout));
1030+
lzt::append_memory_advise(cmdlist_immediate,
1031+
lzt::zeDevice::get_instance()->get_device(), memory,
1032+
size, ZE_MEMORY_ADVICE_SET_READ_MOSTLY);
1033+
lzt::synchronize_command_list_host(cmdlist_immediate, timeout);
10591034
lzt::aligned_free(memory);
10601035
}
10611036

@@ -1064,11 +1039,10 @@ static void RunAppendMemAdvise(ze_command_list_handle_t cmdlist_immediate,
10641039
size_t size = 4096;
10651040
void *memory = lzt::allocate_shared_memory_with_allocator_selector(
10661041
size, is_shared_system);
1067-
EXPECT_ZE_RESULT_SUCCESS(zeCommandListAppendMemAdvise(
1068-
cmdlist_immediate, lzt::zeDevice::get_instance()->get_device(), memory,
1069-
size, ZE_MEMORY_ADVICE_SET_READ_MOSTLY));
1070-
EXPECT_ZE_RESULT_SUCCESS(
1071-
zeCommandListHostSynchronize(cmdlist_immediate, timeout));
1042+
lzt::append_memory_advise(cmdlist_immediate,
1043+
lzt::zeDevice::get_instance()->get_device(), memory,
1044+
size, ZE_MEMORY_ADVICE_SET_READ_MOSTLY);
1045+
lzt::synchronize_command_list_host(cmdlist_immediate, timeout);
10721046
lzt::free_memory_with_allocator_selector(memory, is_shared_system);
10731047
}
10741048

@@ -1173,8 +1147,7 @@ LZT_TEST_P(
11731147
if (useEventsToSynchronize) {
11741148
lzt::event_host_synchronize(hEvent4, UINT64_MAX);
11751149
} else {
1176-
EXPECT_ZE_RESULT_SUCCESS(
1177-
zeCommandListHostSynchronize(cmdlist_immediate_3, UINT64_MAX));
1150+
lzt::synchronize_command_list_host(cmdlist_immediate_3, UINT64_MAX);
11781151
EXPECT_ZE_RESULT_SUCCESS(zeEventQueryStatus(hEvent4));
11791152
}
11801153

@@ -1238,8 +1211,7 @@ static void RunMultipleDependentCommandLists(ze_command_queue_mode_t mode) {
12381211
lzt::append_image_copy_to_mem(cmdlist_immediate_3, output.raw_data(),
12391212
output_xeimage, nullptr);
12401213

1241-
EXPECT_ZE_RESULT_SUCCESS(
1242-
zeCommandListHostSynchronize(cmdlist_immediate_3, UINT64_MAX));
1214+
lzt::synchronize_command_list_host(cmdlist_immediate_3, UINT64_MAX);
12431215

12441216
// Verfy A matches B
12451217
EXPECT_EQ(0,
@@ -1324,8 +1296,7 @@ LZT_TEST_P(
13241296
if (useEventsToSynchronize) {
13251297
EXPECT_ZE_RESULT_SUCCESS(zeEventHostSynchronize(event0, timeout));
13261298
} else {
1327-
EXPECT_ZE_RESULT_SUCCESS(
1328-
zeCommandListHostSynchronize(cmdlist_immediate, timeout));
1299+
lzt::synchronize_command_list_host(cmdlist_immediate, timeout);
13291300
}
13301301

13311302
EXPECT_ZE_RESULT_SUCCESS(zeEventHostReset(event0));
@@ -1352,8 +1323,7 @@ LZT_TEST_P(
13521323
if (useEventsToSynchronize) {
13531324
EXPECT_ZE_RESULT_SUCCESS(zeEventHostSynchronize(event0, timeout));
13541325
} else {
1355-
EXPECT_ZE_RESULT_SUCCESS(
1356-
zeCommandListHostSynchronize(cmdlist_immediate, timeout));
1326+
lzt::synchronize_command_list_host(cmdlist_immediate, timeout);
13571327
EXPECT_ZE_RESULT_SUCCESS(zeEventQueryStatus(event0));
13581328
}
13591329
EXPECT_ZE_RESULT_SUCCESS(zeEventHostReset(event0));
@@ -1444,8 +1414,7 @@ RunIclAndRclAppendOperations(ze_command_list_handle_t cmdlist_immediate,
14441414
lzt::append_memory_set(cmdlist_immediate, device_memory, &zero,
14451415
bufsize * sizeof(uint8_t), nullptr);
14461416
if (mode != ZE_COMMAND_QUEUE_MODE_SYNCHRONOUS) {
1447-
EXPECT_ZE_RESULT_SUCCESS(
1448-
zeCommandListHostSynchronize(cmdlist_immediate, timeout));
1417+
lzt::synchronize_command_list_host(cmdlist_immediate, timeout);
14491418
}
14501419
}
14511420

0 commit comments

Comments
 (0)