Skip to content

Commit 53d4433

Browse files
kbenziekbenzie
authored
Merge pull request #1848 from RossBrunton/ross/fixreturn
[UR] Update some incorrect CL_RETURN_ON_FAILURE
2 parents 467351c + c1eeb58 commit 53d4433

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

‎source/adapters/opencl/device.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
348348
}
349349
case UR_DEVICE_INFO_DEVICE_ID: {
350350
bool Supported = false;
351-
CL_RETURN_ON_FAILURE(cl_adapter::checkDeviceExtensions(
351+
UR_RETURN_ON_FAILURE(cl_adapter::checkDeviceExtensions(
352352
cl_adapter::cast<cl_device_id>(hDevice), {"cl_khr_pci_bus_info"},
353353
Supported));
354354

@@ -365,7 +365,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
365365

366366
case UR_DEVICE_INFO_BACKEND_RUNTIME_VERSION: {
367367
oclv::OpenCLVersion Version;
368-
CL_RETURN_ON_FAILURE(cl_adapter::getDeviceVersion(
368+
UR_RETURN_ON_FAILURE(cl_adapter::getDeviceVersion(
369369
cl_adapter::cast<cl_device_id>(hDevice), Version));
370370

371371
const std::string Results = std::to_string(Version.getMajor()) + "." +
@@ -473,7 +473,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
473473
/* Corresponding OpenCL query is only available starting with OpenCL 2.1
474474
* and we have to emulate it on older OpenCL runtimes. */
475475
oclv::OpenCLVersion DevVer;
476-
CL_RETURN_ON_FAILURE(cl_adapter::getDeviceVersion(
476+
UR_RETURN_ON_FAILURE(cl_adapter::getDeviceVersion(
477477
cl_adapter::cast<cl_device_id>(hDevice), DevVer));
478478

479479
if (DevVer >= oclv::V2_1) {
@@ -503,7 +503,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
503503
* UR type: ur_device_fp_capability_flags_t */
504504
if (propName == UR_DEVICE_INFO_HALF_FP_CONFIG) {
505505
bool Supported;
506-
CL_RETURN_ON_FAILURE(cl_adapter::checkDeviceExtensions(
506+
UR_RETURN_ON_FAILURE(cl_adapter::checkDeviceExtensions(
507507
cl_adapter::cast<cl_device_id>(hDevice), {"cl_khr_fp16"}, Supported));
508508

509509
if (!Supported) {
@@ -523,7 +523,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
523523
/* This query is missing before OpenCL 3.0. Check version and handle
524524
* appropriately */
525525
oclv::OpenCLVersion DevVer;
526-
CL_RETURN_ON_FAILURE(cl_adapter::getDeviceVersion(
526+
UR_RETURN_ON_FAILURE(cl_adapter::getDeviceVersion(
527527
cl_adapter::cast<cl_device_id>(hDevice), DevVer));
528528

529529
/* Minimum required capability to be returned. For OpenCL 1.2, this is all
@@ -583,7 +583,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
583583
UR_MEMORY_SCOPE_CAPABILITY_FLAG_WORK_GROUP;
584584

585585
oclv::OpenCLVersion DevVer;
586-
CL_RETURN_ON_FAILURE(cl_adapter::getDeviceVersion(
586+
UR_RETURN_ON_FAILURE(cl_adapter::getDeviceVersion(
587587
cl_adapter::cast<cl_device_id>(hDevice), DevVer));
588588

589589
cl_device_atomic_capabilities CLCapabilities;
@@ -637,7 +637,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
637637
UR_MEMORY_ORDER_CAPABILITY_FLAG_ACQ_REL;
638638

639639
oclv::OpenCLVersion DevVer;
640-
CL_RETURN_ON_FAILURE(cl_adapter::getDeviceVersion(
640+
UR_RETURN_ON_FAILURE(cl_adapter::getDeviceVersion(
641641
cl_adapter::cast<cl_device_id>(hDevice), DevVer));
642642

643643
cl_device_atomic_capabilities CLCapabilities;
@@ -687,7 +687,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
687687
UR_MEMORY_SCOPE_CAPABILITY_FLAG_WORK_GROUP;
688688

689689
oclv::OpenCLVersion DevVer;
690-
CL_RETURN_ON_FAILURE(cl_adapter::getDeviceVersion(
690+
UR_RETURN_ON_FAILURE(cl_adapter::getDeviceVersion(
691691
cl_adapter::cast<cl_device_id>(hDevice), DevVer));
692692

693693
auto convertCapabilities =
@@ -755,7 +755,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
755755
}
756756
case UR_DEVICE_INFO_ATOMIC_64: {
757757
bool Supported = false;
758-
CL_RETURN_ON_FAILURE(cl_adapter::checkDeviceExtensions(
758+
UR_RETURN_ON_FAILURE(cl_adapter::checkDeviceExtensions(
759759
cl_adapter::cast<cl_device_id>(hDevice),
760760
{"cl_khr_int64_base_atomics", "cl_khr_int64_extended_atomics"},
761761
Supported));
@@ -773,7 +773,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
773773
}
774774
case UR_DEVICE_INFO_MEM_CHANNEL_SUPPORT: {
775775
bool Supported = false;
776-
CL_RETURN_ON_FAILURE(cl_adapter::checkDeviceExtensions(
776+
UR_RETURN_ON_FAILURE(cl_adapter::checkDeviceExtensions(
777777
cl_adapter::cast<cl_device_id>(hDevice),
778778
{"cl_intel_mem_channel_property"}, Supported));
779779

@@ -807,14 +807,14 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
807807
}
808808
case UR_DEVICE_INFO_HOST_PIPE_READ_WRITE_SUPPORTED: {
809809
bool Supported = false;
810-
CL_RETURN_ON_FAILURE(cl_adapter::checkDeviceExtensions(
810+
UR_RETURN_ON_FAILURE(cl_adapter::checkDeviceExtensions(
811811
cl_adapter::cast<cl_device_id>(hDevice),
812812
{"cl_intel_program_scope_host_pipe"}, Supported));
813813
return ReturnValue(Supported);
814814
}
815815
case UR_DEVICE_INFO_GLOBAL_VARIABLE_SUPPORT: {
816816
bool Supported = false;
817-
CL_RETURN_ON_FAILURE(cl_adapter::checkDeviceExtensions(
817+
UR_RETURN_ON_FAILURE(cl_adapter::checkDeviceExtensions(
818818
cl_adapter::cast<cl_device_id>(hDevice),
819819
{"cl_intel_global_variable_access"}, Supported));
820820
return ReturnValue(Supported);

‎source/adapters/opencl/program.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ urProgramCompile([[maybe_unused]] ur_context_handle_t hContext,
138138
ur_program_handle_t hProgram, const char *pOptions) {
139139

140140
std::unique_ptr<std::vector<cl_device_id>> DevicesInProgram;
141-
CL_RETURN_ON_FAILURE(getDevicesFromProgram(hProgram, DevicesInProgram));
141+
UR_RETURN_ON_FAILURE(getDevicesFromProgram(hProgram, DevicesInProgram));
142142

143143
CL_RETURN_ON_FAILURE(clCompileProgram(cl_adapter::cast<cl_program>(hProgram),
144144
DevicesInProgram->size(),
@@ -196,7 +196,7 @@ urProgramBuild([[maybe_unused]] ur_context_handle_t hContext,
196196
ur_program_handle_t hProgram, const char *pOptions) {
197197

198198
std::unique_ptr<std::vector<cl_device_id>> DevicesInProgram;
199-
CL_RETURN_ON_FAILURE(getDevicesFromProgram(hProgram, DevicesInProgram));
199+
UR_RETURN_ON_FAILURE(getDevicesFromProgram(hProgram, DevicesInProgram));
200200

201201
CL_RETURN_ON_FAILURE(clBuildProgram(
202202
cl_adapter::cast<cl_program>(hProgram), DevicesInProgram->size(),

‎source/adapters/opencl/sampler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ urSamplerGetInfo(ur_sampler_handle_t hSampler, ur_sampler_info_t propName,
165165
if (pPropValue && CheckPropSize != propSize) {
166166
return UR_RESULT_ERROR_INVALID_SIZE;
167167
}
168-
CL_RETURN_ON_FAILURE(Err);
168+
UR_RETURN_ON_FAILURE(Err);
169169
if (pPropSizeRet) {
170170
*pPropSizeRet = CheckPropSize;
171171
}

0 commit comments

Comments
 (0)