Skip to content

Commit 1724bae

Browse files
aarongreigaarongreig
committed
Fix CTS tests
1 parent e456967 commit 1724bae

File tree

10 files changed

+49
-40
lines changed

10 files changed

+49
-40
lines changed

‎source/adapters/cuda/queue.cpp

+11-9
Original file line numberDiff line numberDiff line change
@@ -284,17 +284,19 @@ UR_APIEXPORT ur_result_t UR_APICALL urQueueCreateWithNativeHandle(
284284
std::vector<CUstream> ComputeCuStreams(1, CuStream);
285285
std::vector<CUstream> TransferCuStreams(0);
286286

287+
auto isNativeHandleOwned =
288+
pProperties ? pProperties->isNativeHandleOwned : false;
289+
287290
// Create queue and set num_compute_streams to 1, as computeCuStreams has
288291
// valid stream
289-
*phQueue =
290-
new ur_queue_handle_t_{std::move(ComputeCuStreams),
291-
std::move(TransferCuStreams),
292-
hContext,
293-
hDevice,
294-
CuFlags,
295-
Flags,
296-
/*priority*/ 0,
297-
/*backend_owns*/ pProperties->isNativeHandleOwned};
292+
*phQueue = new ur_queue_handle_t_{std::move(ComputeCuStreams),
293+
std::move(TransferCuStreams),
294+
hContext,
295+
hDevice,
296+
CuFlags,
297+
Flags,
298+
/*priority*/ 0,
299+
/*backend_owns*/ isNativeHandleOwned};
298300
(*phQueue)->NumComputeStreams = 1;
299301

300302
return UR_RESULT_SUCCESS;

‎source/adapters/hip/memory.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,9 @@ UR_APIEXPORT ur_result_t UR_APICALL
302302
urMemGetNativeHandle(ur_mem_handle_t hMem, ur_device_handle_t Device,
303303
ur_native_handle_t *phNativeMem) {
304304
UR_ASSERT(Device != nullptr, UR_RESULT_ERROR_INVALID_NULL_HANDLE);
305+
if (hMem->isImage()) {
306+
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
307+
}
305308
#if defined(__HIP_PLATFORM_NVIDIA__)
306309
if (sizeof(BufferMem::native_type) > sizeof(ur_native_handle_t)) {
307310
// Check that all the upper bits that cannot be represented by

‎source/adapters/hip/queue.cpp

+11-9
Original file line numberDiff line numberDiff line change
@@ -318,17 +318,19 @@ UR_APIEXPORT ur_result_t UR_APICALL urQueueCreateWithNativeHandle(
318318
std::vector<hipStream_t> ComputeHIPStreams(1, HIPStream);
319319
std::vector<hipStream_t> TransferHIPStreams(0);
320320

321+
auto isNativeHandleOwned =
322+
pProperties ? pProperties->isNativeHandleOwned : false;
323+
321324
// Create queue and set num_compute_streams to 1, as computeHIPStreams has
322325
// valid stream
323-
*phQueue =
324-
new ur_queue_handle_t_{std::move(ComputeHIPStreams),
325-
std::move(TransferHIPStreams),
326-
hContext,
327-
hDevice,
328-
HIPFlags,
329-
Flags,
330-
/*priority*/ 0,
331-
/*backend_owns*/ pProperties->isNativeHandleOwned};
326+
*phQueue = new ur_queue_handle_t_{std::move(ComputeHIPStreams),
327+
std::move(TransferHIPStreams),
328+
hContext,
329+
hDevice,
330+
HIPFlags,
331+
Flags,
332+
/*priority*/ 0,
333+
/*backend_owns*/ isNativeHandleOwned};
332334
(*phQueue)->NumComputeStreams = 1;
333335

334336
return UR_RESULT_SUCCESS;

‎source/adapters/level_zero/kernel.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1100,8 +1100,8 @@ ur_result_t urKernelCreateWithNativeHandle(
11001100
ze_kernel_handle_t ZeKernel = ur_cast<ze_kernel_handle_t>(NativeKernel);
11011101
ur_kernel_handle_t_ *Kernel = nullptr;
11021102
try {
1103-
Kernel = new ur_kernel_handle_t_(ZeKernel, Properties->isNativeHandleOwned,
1104-
Context);
1103+
auto OwnNativeHandle = Properties ? Properties->isNativeHandleOwned : false;
1104+
Kernel = new ur_kernel_handle_t_(ZeKernel, OwnNativeHandle, Context);
11051105
if (Properties->isNativeHandleOwned) {
11061106
// If ownership is passed to the adapter we need to pass the kernel
11071107
// to this vector which is then used during ZeKernelRelease.

‎source/adapters/level_zero/program.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -959,9 +959,9 @@ ur_result_t urProgramCreateWithNativeHandle(
959959
// executable (state Object).
960960

961961
try {
962-
ur_program_handle_t_ *UrProgram =
963-
new ur_program_handle_t_(ur_program_handle_t_::Exe, Context, ZeModule,
964-
Properties->isNativeHandleOwned);
962+
auto OwnNativeHandle = Properties ? Properties->isNativeHandleOwned : false;
963+
ur_program_handle_t_ *UrProgram = new ur_program_handle_t_(
964+
ur_program_handle_t_::Exe, Context, ZeModule, OwnNativeHandle);
965965
*Program = reinterpret_cast<ur_program_handle_t>(UrProgram);
966966
} catch (const std::bad_alloc &) {
967967
return UR_RESULT_ERROR_OUT_OF_HOST_MEMORY;

‎source/adapters/opencl/ur_interface_loader.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ urGetMemProcAddrTable(ur_api_version_t Version, ur_mem_dditable_t *pDdiTable) {
158158
pDdiTable->pfnGetNativeHandle = urMemGetNativeHandle;
159159
pDdiTable->pfnImageCreate = urMemImageCreate;
160160
pDdiTable->pfnImageGetInfo = urMemImageGetInfo;
161+
pDdiTable->pfnImageCreateWithNativeHandle = urMemImageCreateWithNativeHandle;
161162
pDdiTable->pfnRelease = urMemRelease;
162163
pDdiTable->pfnRetain = urMemRetain;
163164
return UR_RESULT_SUCCESS;

‎test/conformance/event/event_adapter_native_cpu.match

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ urEventReleaseTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
2525
urEventGetNativeHandleTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
2626
urEventGetNativeHandleTest.InvalidNullPointerNativeEvent/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
2727
urEventCreateWithNativeHandleTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
28+
urEventCreateWithNativeHandleTest.SuccessWithProperties/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
2829
urEventSetCallbackTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
2930
urEventSetCallbackTest.ValidateParameters/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
3031
urEventSetCallbackTest.AllStates/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}

‎test/conformance/kernel/kernel_adapter_native_cpu.match

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ urKernelCreateTest.InvalidNullPointerName/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.
55
urKernelCreateTest.InvalidNullPointerKernel/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
66
urKernelCreateTest.InvalidKernelName/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
77
urKernelCreateWithNativeHandleTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
8+
urKernelCreateWithNativeHandleTest.SuccessWithProperties/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
89
urKernelCreateWithNativeHandleTest.InvalidNullHandleContext/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
910
urKernelCreateWithNativeHandleTest.InvalidNullPointerNativeKernel/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
1011
urKernelGetGroupInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__UR_KERNEL_GROUP_INFO_GLOBAL_WORK_SIZE

‎test/conformance/program/program_adapter_native_cpu.match

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
{{OPT}}urProgramCreateWithILTest.InvalidNullPointerProgram/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
2424
{{OPT}}urProgramCreateWithILTest.BuildInvalidProgram/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
2525
{{OPT}}urProgramCreateWithNativeHandleTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
26+
{{OPT}}urProgramCreateWithNativeHandleTest.SuccessWithProperties/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
2627
{{OPT}}urProgramCreateWithNativeHandleTest.InvalidNullHandleContext/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
2728
{{OPT}}urProgramCreateWithNativeHandleTest.InvalidNullPointerProgram/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
2829
{{OPT}}urProgramGetBuildInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__UR_PROGRAM_BUILD_INFO_STATUS

‎test/conformance/testing/include/uur/fixtures.h

+15-17
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,8 @@ struct urMemImageTest : urContextTest {
205205
if (!imageSupported) {
206206
GTEST_SKIP();
207207
}
208+
ASSERT_SUCCESS(urMemImageCreate(context, 0, &image_format, &image_desc,
209+
nullptr, &image));
208210
}
209211

210212
void TearDown() override {
@@ -214,23 +216,19 @@ struct urMemImageTest : urContextTest {
214216
UUR_RETURN_ON_FATAL_FAILURE(urContextTest::TearDown());
215217
}
216218

217-
ur_image_format_t image_format = {
218-
/*.channelOrder =*/UR_IMAGE_CHANNEL_ORDER_ARGB,
219-
/*.channelType =*/UR_IMAGE_CHANNEL_TYPE_UNORM_INT8,
220-
};
221-
ur_image_desc_t image_desc = {
222-
/*.stype =*/UR_STRUCTURE_TYPE_IMAGE_DESC,
223-
/*.pNext =*/nullptr,
224-
/*.type =*/UR_MEM_TYPE_IMAGE2D,
225-
/*.width =*/16,
226-
/*.height =*/16,
227-
/*.depth =*/1,
228-
/*.arraySize =*/1,
229-
/*.rowPitch =*/16 * sizeof(char[4]),
230-
/*.slicePitch =*/16 * 16 * sizeof(char[4]),
231-
/*.numMipLevel =*/0,
232-
/*.numSamples =*/0,
233-
};
219+
ur_image_format_t image_format = {UR_IMAGE_CHANNEL_ORDER_RGBA,
220+
UR_IMAGE_CHANNEL_TYPE_FLOAT};
221+
ur_image_desc_t image_desc = {UR_STRUCTURE_TYPE_IMAGE_DESC, // stype
222+
nullptr, // pNext
223+
UR_MEM_TYPE_IMAGE1D, // mem object type
224+
1024, // image width
225+
1, // image height
226+
1, // image depth
227+
1, // array size
228+
0, // row pitch
229+
0, // slice pitch
230+
0, // mip levels
231+
0}; // num samples
234232
ur_mem_handle_t image = nullptr;
235233
};
236234

0 commit comments

Comments
 (0)