Skip to content

Commit 3fca424

Browse files
kbenziekbenzie
authored
Merge pull request #1631 from npmiller/fix-virtual-mem-cts
[CTS] Fix virtual mem enqueue test
2 parents f2a8155 + 1a96444 commit 3fca424

File tree

2 files changed

+8
-56
lines changed

2 files changed

+8
-56
lines changed

‎test/conformance/enqueue/enqueue_adapter_cuda.match

Lines changed: 7 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,10 @@
11
urEnqueueKernelLaunchTest.InvalidKernelArgs/NVIDIA_CUDA_BACKEND___{{.*}}_
22
urEnqueueKernelLaunchKernelWgSizeTest.NonMatchingLocalSize/NVIDIA_CUDA_BACKEND___{{.*}}_
33
urEnqueueKernelLaunchKernelSubGroupTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}_
4-
{{OPT}}urEnqueueKernelLaunchWithVirtualMemory.Success/NVIDIA_CUDA_BACKEND___{{.*}}_
5-
{{OPT}}urEnqueueMemBufferCopyRectTest.InvalidSize/NVIDIA_CUDA_BACKEND___{{.*}}_
6-
{{OPT}}urEnqueueMemBufferFillTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}___size__256__patternSize__256
7-
{{OPT}}urEnqueueMemBufferFillTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}___size__1024__patternSize__256
8-
{{OPT}}urEnqueueMemBufferReadRectTest.InvalidSize/NVIDIA_CUDA_BACKEND___{{.*}}_
9-
{{OPT}}urEnqueueMemBufferWriteRectTest.InvalidSize/NVIDIA_CUDA_BACKEND___{{.*}}_
10-
{{OPT}}urEnqueueMemImageCopyTest.InvalidSize/NVIDIA_CUDA_BACKEND___{{.*}}___1D
11-
{{OPT}}urEnqueueMemImageCopyTest.InvalidSize/NVIDIA_CUDA_BACKEND___{{.*}}___2D
12-
{{OPT}}urEnqueueMemImageCopyTest.InvalidSize/NVIDIA_CUDA_BACKEND___{{.*}}___3D
13-
{{OPT}}urEnqueueMemImageReadTest.InvalidOrigin1D/NVIDIA_CUDA_BACKEND___{{.*}}_
14-
{{OPT}}urEnqueueMemImageReadTest.InvalidOrigin2D/NVIDIA_CUDA_BACKEND___{{.*}}_
15-
{{OPT}}urEnqueueMemImageReadTest.InvalidOrigin3D/NVIDIA_CUDA_BACKEND___{{.*}}_
16-
{{OPT}}urEnqueueMemImageReadTest.InvalidRegion1D/NVIDIA_CUDA_BACKEND___{{.*}}_
17-
{{OPT}}urEnqueueMemImageReadTest.InvalidRegion2D/NVIDIA_CUDA_BACKEND___{{.*}}_
18-
{{OPT}}urEnqueueMemImageReadTest.InvalidRegion3D/NVIDIA_CUDA_BACKEND___{{.*}}_
19-
{{OPT}}urEnqueueMemImageWriteTest.InvalidOrigin1D/NVIDIA_CUDA_BACKEND___{{.*}}_
20-
{{OPT}}urEnqueueMemImageWriteTest.InvalidOrigin2D/NVIDIA_CUDA_BACKEND___{{.*}}_
21-
{{OPT}}urEnqueueMemImageWriteTest.InvalidOrigin3D/NVIDIA_CUDA_BACKEND___{{.*}}_
22-
{{OPT}}urEnqueueMemImageWriteTest.InvalidRegion1D/NVIDIA_CUDA_BACKEND___{{.*}}_
23-
{{OPT}}urEnqueueMemImageWriteTest.InvalidRegion2D/NVIDIA_CUDA_BACKEND___{{.*}}_
24-
{{OPT}}urEnqueueMemImageWriteTest.InvalidRegion3D/NVIDIA_CUDA_BACKEND___{{.*}}_
25-
{{OPT}}urEnqueueUSMFill2DTestWithParam.Success/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1__width__1__height__1__patternSize__1
26-
{{OPT}}urEnqueueUSMFill2DTestWithParam.Success/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1024__width__256__height__1__patternSize__256
27-
{{OPT}}urEnqueueUSMFill2DTestWithParam.Success/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1024__width__256__height__1__patternSize__4
28-
{{OPT}}urEnqueueUSMFill2DTestWithParam.Success/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1024__width__57__height__1__patternSize__1
29-
{{OPT}}urEnqueueUSMFill2DTestWithParam.Success/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1024__width__1024__height__1__patternSize__256
30-
{{OPT}}urEnqueueUSMFill2DTestWithParam.Success/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1024__width__1024__height__1__patternSize__1024
31-
{{OPT}}urEnqueueUSMFill2DTestWithParam.Success/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1024__width__256__height__256__patternSize__1
32-
{{OPT}}urEnqueueUSMFill2DTestWithParam.Success/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1024__width__256__height__256__patternSize__256
33-
{{OPT}}urEnqueueUSMFill2DTestWithParam.Success/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1024__width__256__height__256__patternSize__65536
34-
{{OPT}}urEnqueueUSMFill2DTestWithParam.Success/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__234__width__233__height__1__patternSize__1
35-
{{OPT}}urEnqueueUSMFill2DTestWithParam.Success/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__234__width__233__height__35__patternSize__1
36-
{{OPT}}urEnqueueUSMFill2DTestWithParam.Success/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1024__width__256__height__35__patternSize__128
37-
{{OPT}}urEnqueueUSMFill2DNegativeTest.OutOfBounds/NVIDIA_CUDA_BACKEND___{{.*}}_
38-
{{OPT}}urEnqueueUSMAdviseWithParamTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}___UR_USM_ADVICE_FLAG_DEFAULT
39-
{{OPT}}urEnqueueUSMAdviseTest.MultipleParamsSuccess/NVIDIA_CUDA_BACKEND___{{.*}}_
40-
{{OPT}}urEnqueueUSMMemcpy2DTestWithParam.SuccessBlocking/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1__width__1__height__1
41-
{{OPT}}urEnqueueUSMMemcpy2DTestWithParam.SuccessBlocking/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1024__width__256__height__1
42-
{{OPT}}urEnqueueUSMMemcpy2DTestWithParam.SuccessBlocking/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1024__width__1024__height__1
43-
{{OPT}}urEnqueueUSMMemcpy2DTestWithParam.SuccessBlocking/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1024__width__256__height__256
44-
{{OPT}}urEnqueueUSMMemcpy2DTestWithParam.SuccessBlocking/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__234__width__233__height__23
45-
{{OPT}}urEnqueueUSMMemcpy2DTestWithParam.SuccessBlocking/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__234__width__233__height__1
46-
{{OPT}}urEnqueueUSMMemcpy2DTestWithParam.SuccessNonBlocking/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1__width__1__height__1
47-
{{OPT}}urEnqueueUSMMemcpy2DTestWithParam.SuccessNonBlocking/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1024__width__256__height__1
48-
{{OPT}}urEnqueueUSMMemcpy2DTestWithParam.SuccessNonBlocking/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1024__width__1024__height__1
49-
{{OPT}}urEnqueueUSMMemcpy2DTestWithParam.SuccessNonBlocking/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1024__width__256__height__256
50-
{{OPT}}urEnqueueUSMMemcpy2DTestWithParam.SuccessNonBlocking/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__234__width__233__height__23
51-
{{OPT}}urEnqueueUSMMemcpy2DTestWithParam.SuccessNonBlocking/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__234__width__233__height__1
52-
{{OPT}}urEnqueueUSMMemcpy2DNegativeTest.InvalidNullHandleQueue/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1__width__1__height__1
53-
{{OPT}}urEnqueueUSMMemcpy2DNegativeTest.InvalidNullPointer/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1__width__1__height__1
54-
{{OPT}}urEnqueueUSMMemcpy2DNegativeTest.InvalidSize/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1__width__1__height__1
55-
{{OPT}}urEnqueueUSMMemcpy2DNegativeTest.InvalidEventWaitList/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1__width__1__height__1
56-
{{OPT}}urEnqueueUSMPrefetchWithParamTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}___UR_USM_MIGRATION_FLAG_DEFAULT
57-
{{OPT}}urEnqueueUSMPrefetchWithParamTest.CheckWaitEvent/NVIDIA_CUDA_BACKEND___{{.*}}___UR_USM_MIGRATION_FLAG_DEFAULT
58-
{{OPT}}{{Segmentation fault|Aborted}}
4+
urEnqueueMemBufferMapTestWithWriteFlagParam.SuccessWrite/NVIDIA_CUDA_BACKEND___{{.*}}___UR_MAP_FLAG_WRITE_INVALIDATE_REGION
5+
urEnqueueUSMAdviseWithParamTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}___UR_USM_ADVICE_FLAG_DEFAULT
6+
urEnqueueUSMAdviseTest.MultipleParamsSuccess/NVIDIA_CUDA_BACKEND___{{.*}}_
7+
urEnqueueUSMPrefetchWithParamTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}___UR_USM_MIGRATION_FLAG_DEFAULT
8+
urEnqueueUSMPrefetchWithParamTest.CheckWaitEvent/NVIDIA_CUDA_BACKEND___{{.*}}___UR_USM_MIGRATION_FLAG_DEFAULT
9+
urEnqueueTimestampRecordingExpTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}_
10+
urEnqueueTimestampRecordingExpTest.SuccessBlocking/NVIDIA_CUDA_BACKEND___{{.*}}_

‎test/conformance/enqueue/urEnqueueKernelLaunch.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ TEST_P(urEnqueueKernelLaunchWithVirtualMemory, Success) {
364364
size_t global_size = alloc_size / sizeof(uint32_t);
365365
uint32_t fill_val = 42;
366366

367-
ASSERT_SUCCESS(urKernelSetArgPointer(kernel, 0, nullptr, virtual_ptr));
367+
ASSERT_SUCCESS(urKernelSetArgPointer(kernel, 0, nullptr, &virtual_ptr));
368368
ASSERT_SUCCESS(
369369
urKernelSetArgValue(kernel, 1, sizeof(fill_val), nullptr, &fill_val));
370370

0 commit comments

Comments
 (0)