Skip to content

Commit 109414b

Browse files
isaacaultisaacault
committed
Address Feedback
* [[maybe_unused]] flag added to pi_level_zero * pi_hip piSamplerCreate updated for API change * Macro used for image format switch cases * Added punctuation to comments
1 parent fc60063 commit 109414b

File tree

6 files changed

+179
-213
lines changed

6 files changed

+179
-213
lines changed

‎sycl/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ set(SYCL_MAJOR_VERSION 7)
3636
set(SYCL_MINOR_VERSION 0)
3737
set(SYCL_PATCH_VERSION 0)
3838

39-
set(SYCL_DEV_ABI_VERSION 5)
39+
set(SYCL_DEV_ABI_VERSION 6)
4040
if (SYCL_ADD_DEV_VERSION_POSTFIX)
4141
set(SYCL_VERSION_POSTFIX "-${SYCL_DEV_ABI_VERSION}")
4242
endif()

‎sycl/plugins/hip/pi_hip.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4176,14 +4176,23 @@ pi_result hip_piextEventCreateWithNativeHandle(pi_native_handle nativeHandle,
41764176
///
41774177
/// \param[in] context The context the sampler is created for.
41784178
/// \param[in] sampler_properties The properties for the sampler.
4179+
/// \param[in] minMipmapLevelClamp The minimum mipmap clamp level.
4180+
/// \param[in] maxMipmapLevelClamp The maximum mipmap clamp level.
4181+
/// \param[in] maxAnisotropy The maximum anisotropy.
41794182
/// \param[out] result_sampler Set to the resulting sampler object.
41804183
///
41814184
/// \return PI_SUCCESS on success. PI_ERROR_INVALID_VALUE if given an invalid
41824185
/// property
41834186
/// or if there is multiple of properties from the same category.
41844187
pi_result hip_piSamplerCreate(pi_context context,
41854188
const pi_sampler_properties *sampler_properties,
4189+
const float minMipmapLevelClamp,
4190+
const float maxMipmapLevelClamp,
4191+
const float maxAnisotropy,
41864192
pi_sampler *result_sampler) {
4193+
(void)minMipmapLevelClamp;
4194+
(void)maxMipmapLevelClamp;
4195+
(void)maxAnisotropy;
41874196
std::unique_ptr<_pi_sampler> retImplSampl{new _pi_sampler(context)};
41884197

41894198
bool propSeen[3] = {false, false, false};

‎sycl/plugins/level_zero/pi_level_zero.cpp

Lines changed: 99 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -390,9 +390,10 @@ pi_result piKernelGetInfo(pi_kernel Kernel, pi_kernel_info ParamName,
390390
ParamValueSizeRet);
391391
}
392392

393-
pi_result piextMemUnsampledImageHandleDestroy(pi_context context,
394-
pi_device device,
395-
pi_image_handle handle) {
393+
pi_result
394+
piextMemUnsampledImageHandleDestroy([[maybe_unused]] pi_context context,
395+
[[maybe_unused]] pi_device device,
396+
[[maybe_unused]] pi_image_handle handle) {
396397

397398
assert(context != nullptr);
398399
assert(device != nullptr);
@@ -405,9 +406,10 @@ pi_result piextMemUnsampledImageHandleDestroy(pi_context context,
405406
return retErr;
406407
}
407408

408-
pi_result piextMemSampledImageHandleDestroy(pi_context context,
409-
pi_device device,
410-
pi_image_handle handle) {
409+
pi_result
410+
piextMemSampledImageHandleDestroy([[maybe_unused]] pi_context context,
411+
[[maybe_unused]] pi_device device,
412+
[[maybe_unused]] pi_image_handle handle) {
411413

412414
assert(context != nullptr);
413415
assert(device != nullptr);
@@ -420,10 +422,11 @@ pi_result piextMemSampledImageHandleDestroy(pi_context context,
420422
return retErr;
421423
}
422424

423-
pi_result piextMemImageAllocate(pi_context context, pi_device device,
424-
pi_image_format *image_format,
425-
pi_image_desc *image_desc,
426-
pi_image_mem_handle *ret_mem) {
425+
pi_result piextMemImageAllocate([[maybe_unused]] pi_context context,
426+
[[maybe_unused]] pi_device device,
427+
[[maybe_unused]] pi_image_format *image_format,
428+
[[maybe_unused]] pi_image_desc *image_desc,
429+
[[maybe_unused]] pi_image_mem_handle *ret_mem) {
427430

428431
assert(context != nullptr);
429432
assert(device != nullptr);
@@ -437,10 +440,12 @@ pi_result piextMemImageAllocate(pi_context context, pi_device device,
437440
return retErr;
438441
}
439442

440-
pi_result piextMemMipmapGetLevel(pi_context context, pi_device device,
441-
pi_image_mem_handle mip_mem,
442-
unsigned int level,
443-
pi_image_mem_handle *ret_mem) {
443+
pi_result
444+
piextMemMipmapGetLevel([[maybe_unused]] pi_context context,
445+
[[maybe_unused]] pi_device device,
446+
[[maybe_unused]] pi_image_mem_handle mip_mem,
447+
[[maybe_unused]] unsigned int level,
448+
[[maybe_unused]] pi_image_mem_handle *ret_mem) {
444449

445450
assert(context != nullptr);
446451
assert(device != nullptr);
@@ -452,8 +457,10 @@ pi_result piextMemMipmapGetLevel(pi_context context, pi_device device,
452457
return retErr;
453458
}
454459

455-
pi_result piextMemImageFree(pi_context context, pi_device device,
456-
pi_image_mem_handle memory_handle) {
460+
pi_result
461+
piextMemImageFree([[maybe_unused]] pi_context context,
462+
[[maybe_unused]] pi_device device,
463+
[[maybe_unused]] pi_image_mem_handle memory_handle) {
457464

458465
assert(context != nullptr);
459466
assert(device != nullptr);
@@ -465,8 +472,10 @@ pi_result piextMemImageFree(pi_context context, pi_device device,
465472
return retErr;
466473
}
467474

468-
pi_result piextMemMipmapFree(pi_context context, pi_device device,
469-
pi_image_mem_handle memory_handle) {
475+
pi_result
476+
piextMemMipmapFree([[maybe_unused]] pi_context context,
477+
[[maybe_unused]] pi_device device,
478+
[[maybe_unused]] pi_image_mem_handle memory_handle) {
470479

471480
assert(context != nullptr);
472481
assert(device != nullptr);
@@ -478,11 +487,12 @@ pi_result piextMemMipmapFree(pi_context context, pi_device device,
478487
return retErr;
479488
}
480489

481-
pi_result piextMemUnsampledImageCreate(pi_context context, pi_device device,
482-
pi_image_mem_handle img_mem,
483-
pi_image_format *image_format,
484-
pi_image_desc *desc, pi_mem *ret_mem,
485-
pi_image_handle *ret_handle) {
490+
pi_result piextMemUnsampledImageCreate(
491+
[[maybe_unused]] pi_context context, [[maybe_unused]] pi_device device,
492+
[[maybe_unused]] pi_image_mem_handle img_mem,
493+
[[maybe_unused]] pi_image_format *image_format,
494+
[[maybe_unused]] pi_image_desc *desc, [[maybe_unused]] pi_mem *ret_mem,
495+
[[maybe_unused]] pi_image_handle *ret_handle) {
486496

487497
assert(context != nullptr);
488498
assert(device != nullptr);
@@ -496,9 +506,10 @@ pi_result piextMemUnsampledImageCreate(pi_context context, pi_device device,
496506
return retErr;
497507
}
498508

499-
pi_result piextMemImportOpaqueFD(pi_context context, pi_device device,
500-
size_t size, int file_descriptor,
501-
pi_interop_mem_handle *ret_handle) {
509+
pi_result piextMemImportOpaqueFD(
510+
[[maybe_unused]] pi_context context, [[maybe_unused]] pi_device device,
511+
[[maybe_unused]] size_t size, [[maybe_unused]] int file_descriptor,
512+
[[maybe_unused]] pi_interop_mem_handle *ret_handle) {
502513
assert(context);
503514
assert(device);
504515
assert(file_descriptor);
@@ -509,10 +520,10 @@ pi_result piextMemImportOpaqueFD(pi_context context, pi_device device,
509520
return retErr;
510521
}
511522

512-
pi_result
513-
piextImportExternalSemaphoreOpaqueFD(pi_context context, pi_device device,
514-
int file_descriptor,
515-
pi_interop_semaphore_handle *ret_handle) {
523+
pi_result piextImportExternalSemaphoreOpaqueFD(
524+
[[maybe_unused]] pi_context context, [[maybe_unused]] pi_device device,
525+
[[maybe_unused]] int file_descriptor,
526+
[[maybe_unused]] pi_interop_semaphore_handle *ret_handle) {
516527
assert(context);
517528
assert(device);
518529
assert(ret_handle);
@@ -522,9 +533,9 @@ piextImportExternalSemaphoreOpaqueFD(pi_context context, pi_device device,
522533
return retErr;
523534
}
524535

525-
pi_result
526-
piextDestroyExternalSemaphore(pi_context context, pi_device device,
527-
pi_interop_semaphore_handle sem_handle) {
536+
pi_result piextDestroyExternalSemaphore(
537+
[[maybe_unused]] pi_context context, [[maybe_unused]] pi_device device,
538+
[[maybe_unused]] pi_interop_semaphore_handle sem_handle) {
528539
assert(context);
529540
assert(device);
530541
assert(sem_handle);
@@ -534,11 +545,12 @@ piextDestroyExternalSemaphore(pi_context context, pi_device device,
534545
return retErr;
535546
}
536547

537-
pi_result piextWaitExternalSemaphore(pi_queue command_queue,
538-
pi_interop_semaphore_handle sem_handle,
539-
pi_uint32 num_events_in_wait_list,
540-
const pi_event *event_wait_list,
541-
pi_event *event) {
548+
pi_result piextWaitExternalSemaphore(
549+
[[maybe_unused]] pi_queue command_queue,
550+
[[maybe_unused]] pi_interop_semaphore_handle sem_handle,
551+
[[maybe_unused]] pi_uint32 num_events_in_wait_list,
552+
[[maybe_unused]] const pi_event *event_wait_list,
553+
[[maybe_unused]] pi_event *event) {
542554
assert(command_queue);
543555
assert(sem_handle);
544556
die("piextWaitExternalSemaphore not implemented on level zero "
@@ -547,11 +559,12 @@ pi_result piextWaitExternalSemaphore(pi_queue command_queue,
547559
return retErr;
548560
}
549561

550-
pi_result piextSignalExternalSemaphore(pi_queue command_queue,
551-
pi_interop_semaphore_handle sem_handle,
552-
pi_uint32 num_events_in_wait_list,
553-
const pi_event *event_wait_list,
554-
pi_event *event) {
562+
pi_result piextSignalExternalSemaphore(
563+
[[maybe_unused]] pi_queue command_queue,
564+
[[maybe_unused]] pi_interop_semaphore_handle sem_handle,
565+
[[maybe_unused]] pi_uint32 num_events_in_wait_list,
566+
[[maybe_unused]] const pi_event *event_wait_list,
567+
[[maybe_unused]] pi_event *event) {
555568
assert(command_queue);
556569
assert(sem_handle);
557570
die("piextSignalExternalSemaphore not implemented on level zero "
@@ -560,11 +573,13 @@ pi_result piextSignalExternalSemaphore(pi_queue command_queue,
560573
return retErr;
561574
}
562575

563-
pi_result piextMemMapExternalArray(pi_context context, pi_device device,
564-
pi_image_format *image_format,
565-
pi_image_desc *image_desc,
566-
pi_interop_mem_handle mem_handle,
567-
pi_image_mem_handle *ret_mem) {
576+
pi_result
577+
piextMemMapExternalArray([[maybe_unused]] pi_context context,
578+
[[maybe_unused]] pi_device device,
579+
[[maybe_unused]] pi_image_format *image_format,
580+
[[maybe_unused]] pi_image_desc *image_desc,
581+
[[maybe_unused]] pi_interop_mem_handle mem_handle,
582+
[[maybe_unused]] pi_image_mem_handle *ret_mem) {
568583
assert(context);
569584
assert(device);
570585
assert(image_format);
@@ -578,8 +593,10 @@ pi_result piextMemMapExternalArray(pi_context context, pi_device device,
578593
return retErr;
579594
}
580595

581-
pi_result piextMemReleaseInterop(pi_context context, pi_device device,
582-
pi_interop_mem_handle ext_mem) {
596+
pi_result
597+
piextMemReleaseInterop([[maybe_unused]] pi_context context,
598+
[[maybe_unused]] pi_device device,
599+
[[maybe_unused]] pi_interop_mem_handle ext_mem) {
583600
assert(context);
584601
assert(ext_mem);
585602

@@ -588,12 +605,13 @@ pi_result piextMemReleaseInterop(pi_context context, pi_device device,
588605
return retErr;
589606
}
590607

591-
pi_result piextMemSampledImageCreate(pi_context context, pi_device device,
592-
pi_image_mem_handle img_mem,
593-
pi_image_format *format,
594-
pi_image_desc *desc, pi_sampler sampler,
595-
pi_mem *ret_mem,
596-
pi_image_handle *ret_handle) {
608+
pi_result piextMemSampledImageCreate(
609+
[[maybe_unused]] pi_context context, [[maybe_unused]] pi_device device,
610+
[[maybe_unused]] pi_image_mem_handle img_mem,
611+
[[maybe_unused]] pi_image_format *format,
612+
[[maybe_unused]] pi_image_desc *desc, [[maybe_unused]] pi_sampler sampler,
613+
[[maybe_unused]] pi_mem *ret_mem,
614+
[[maybe_unused]] pi_image_handle *ret_handle) {
597615
assert(context != nullptr);
598616
assert(device != nullptr);
599617
assert(img_mem != nullptr);
@@ -606,13 +624,20 @@ pi_result piextMemSampledImageCreate(pi_context context, pi_device device,
606624
return retErr;
607625
}
608626

609-
pi_result piextMemImageCopy(
610-
pi_queue command_queue, void *dst_ptr, void *src_ptr,
611-
const pi_image_format *image_format, const pi_image_desc *image_desc,
612-
const pi_image_copy_flags flags, pi_image_offset src_offset,
613-
pi_image_offset dst_offset, pi_image_region copy_extent,
614-
pi_image_region host_extent, pi_uint32 num_events_in_wait_list,
615-
const pi_event *event_wait_list, pi_event *event) {
627+
pi_result
628+
piextMemImageCopy([[maybe_unused]] pi_queue command_queue,
629+
[[maybe_unused]] void *dst_ptr,
630+
[[maybe_unused]] void *src_ptr,
631+
[[maybe_unused]] const pi_image_format *image_format,
632+
[[maybe_unused]] const pi_image_desc *image_desc,
633+
[[maybe_unused]] const pi_image_copy_flags flags,
634+
[[maybe_unused]] pi_image_offset src_offset,
635+
[[maybe_unused]] pi_image_offset dst_offset,
636+
[[maybe_unused]] pi_image_region copy_extent,
637+
[[maybe_unused]] pi_image_region host_extent,
638+
[[maybe_unused]] pi_uint32 num_events_in_wait_list,
639+
[[maybe_unused]] const pi_event *event_wait_list,
640+
[[maybe_unused]] pi_event *event) {
616641
assert(command_queue != nullptr);
617642
assert(dst_ptr != nullptr);
618643
assert(src_ptr != nullptr);
@@ -623,9 +648,11 @@ pi_result piextMemImageCopy(
623648
return retErr;
624649
}
625650

626-
pi_result piextMemImageGetInfo(const pi_image_mem_handle mem_handle,
627-
pi_image_info param_name, void *param_value,
628-
size_t *param_value_size_ret) {
651+
pi_result
652+
piextMemImageGetInfo([[maybe_unused]] const pi_image_mem_handle mem_handle,
653+
[[maybe_unused]] pi_image_info param_name,
654+
[[maybe_unused]] void *param_value,
655+
[[maybe_unused]] size_t *param_value_size_ret) {
629656
assert(mem_handle);
630657

631658
die("piextMemImageGetInfo not implemented on level zero backend.\n");
@@ -1006,11 +1033,12 @@ pi_result piextUSMSharedAlloc(void **ResultPtr, pi_context Context,
10061033
Size, Alignment);
10071034
}
10081035

1009-
pi_result piextUSMPitchedAlloc(void **result_ptr, size_t *result_pitch,
1010-
pi_context context, pi_device device,
1011-
pi_usm_mem_properties *properties,
1012-
size_t width_in_bytes, size_t height,
1013-
unsigned int element_size_bytes) {
1036+
pi_result piextUSMPitchedAlloc(
1037+
[[maybe_unused]] void **result_ptr, [[maybe_unused]] size_t *result_pitch,
1038+
[[maybe_unused]] pi_context context, [[maybe_unused]] pi_device device,
1039+
[[maybe_unused]] pi_usm_mem_properties *properties,
1040+
[[maybe_unused]] size_t width_in_bytes, [[maybe_unused]] size_t height,
1041+
[[maybe_unused]] unsigned int element_size_bytes) {
10141042
die("piextUSMPitchedAlloc: not implemented");
10151043

10161044
assert(result_ptr != nullptr);

0 commit comments

Comments
 (0)