Skip to content

Commit 7ef12fb

Browse files
committed
Check physical mem properties validity before passing to internal constructor in cuda. Update L0 match file.
1 parent a3d36e7 commit 7ef12fb

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

source/adapters/cuda/physical_mem.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@ UR_APIEXPORT ur_result_t UR_APICALL urPhysicalMemCreate(
3333
UR_CHECK_ERROR(Result);
3434
}
3535
try {
36-
*phPhysicalMem = new ur_physical_mem_handle_t_(ResHandle, hContext, hDevice,
37-
size, *pProperties);
36+
*phPhysicalMem = new ur_physical_mem_handle_t_(
37+
ResHandle, hContext, hDevice, size,
38+
pProperties ? *pProperties : ur_physical_mem_properties_t{});
3839
} catch (std::bad_alloc &) {
3940
return UR_RESULT_ERROR_OUT_OF_HOST_MEMORY;
4041
} catch (...) {
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
{{OPT}}urPhysicalMemCreateWithSizeParamTest.Success/*
22
urPhysicalMemCreateWithSizeParamTest.InvalidSize/*
3+
urPhysicalMemGetInfoTest.Context/*
4+
urPhysicalMemGetInfoTest.Device/*
5+
urPhysicalMemGetInfoTest.Size/*
6+
urPhysicalMemGetInfoTest.Properties/*

test/conformance/virtual_memory/virtual_memory_adapter_level_zero_v2.match

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ urPhysicalMemCreateWithFlagsParamTest.Success/*
33
urPhysicalMemCreateTest.InvalidNullHandleContext/*
44
urPhysicalMemCreateTest.InvalidNullHandleDevice/*
55
urPhysicalMemCreateTest.InvalidNullPointerPhysicalMem/*
6-
urPhysicalMemCreateTest.InvalidSize/*
6+
urPhysicalMemCreateWithSizeParamTest.InvalidSize/*
77
urPhysicalMemReleaseTest.Success/*
88
urPhysicalMemReleaseTest.InvalidNullHandlePhysicalMem/*
99
urPhysicalMemRetainTest.Success/*
@@ -18,7 +18,7 @@ urVirtualMemGetInfoTest.InvalidEnumerationInfo/*
1818
urVirtualMemGranularityGetInfoTest.Success/*__UR_VIRTUAL_MEM_GRANULARITY_INFO_MINIMUM
1919
urVirtualMemGranularityGetInfoTest.Success/*__UR_VIRTUAL_MEM_GRANULARITY_INFO_RECOMMENDED
2020
urVirtualMemGranularityGetInfoNegativeTest.InvalidSizePropSizeSmall/*
21-
urVirtualMemMapTest.Success/*
21+
urVirtualMemMapWithFlagsTest.Success/*
2222
urVirtualMemMapTest.InvalidNullHandleContext/*
2323
urVirtualMemMapTest.InvalidNullHandlePhysicalMem/*
2424
urVirtualMemMapTest.InvalidNullPointerStart/*
@@ -27,7 +27,7 @@ urVirtualMemReserveTestWithParam.SuccessNoStartPointer/*
2727
urVirtualMemReserveTestWithParam.SuccessWithStartPointer/*
2828
urVirtualMemReserveTest.InvalidNullHandleContext/*
2929
urVirtualMemReserveTest.InvalidNullPointer/*
30-
urVirtualMemSetAccessTest.Success/*
30+
urVirtualMemSetAccessWithFlagsTest.Success/*
3131
urVirtualMemSetAccessTest.InvalidNullHandleContext/*
3232
urVirtualMemSetAccessTest.InvalidNullPointerStart/*
3333
urVirtualMemUnmapTest.Success/*

0 commit comments

Comments
 (0)