Skip to content

Commit 3ea242c

Browse files
martygrantmartygrant
authored
Merge pull request #2613 from oneapi-src/revert-2549-martin/memimage-info-unswitch
Revert "Move urMemImageGetInfo success test from a switch to individual test"
2 parents 45913da + a974fce commit 3ea242c

File tree

10 files changed

+114
-381
lines changed

10 files changed

+114
-381
lines changed

‎include/ur_api.h

+2-8
Original file line numberDiff line numberDiff line change
@@ -3324,12 +3324,6 @@ typedef enum ur_image_info_t {
33243324
UR_IMAGE_INFO_HEIGHT = 5,
33253325
/// [size_t] image depth
33263326
UR_IMAGE_INFO_DEPTH = 6,
3327-
/// [size_t] array size
3328-
UR_IMAGE_INFO_ARRAY_SIZE = 7,
3329-
/// [uint32_t] number of MIP levels
3330-
UR_IMAGE_INFO_NUM_MIP_LEVELS = 8,
3331-
/// [uint32_t] number of samples
3332-
UR_IMAGE_INFO_NUM_SAMPLES = 9,
33333327
/// @cond
33343328
UR_IMAGE_INFO_FORCE_UINT32 = 0x7fffffff
33353329
/// @endcond
@@ -3843,7 +3837,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urMemGetInfo(
38433837
/// - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
38443838
/// + `NULL == hMemory`
38453839
/// - ::UR_RESULT_ERROR_INVALID_ENUMERATION
3846-
/// + `::UR_IMAGE_INFO_NUM_SAMPLES < propName`
3840+
/// + `::UR_IMAGE_INFO_DEPTH < propName`
38473841
/// - ::UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION
38483842
/// + If `propName` is not supported by the adapter.
38493843
/// - ::UR_RESULT_ERROR_INVALID_SIZE
@@ -9505,7 +9499,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urBindlessImagesImageCopyExp(
95059499
/// - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
95069500
/// + `NULL == hContext`
95079501
/// - ::UR_RESULT_ERROR_INVALID_ENUMERATION
9508-
/// + `::UR_IMAGE_INFO_NUM_SAMPLES < propName`
9502+
/// + `::UR_IMAGE_INFO_DEPTH < propName`
95099503
/// - ::UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION
95109504
/// + If `propName` is not supported by the adapter.
95119505
/// - ::UR_RESULT_ERROR_INVALID_SIZE

‎include/ur_print.hpp

-48
Original file line numberDiff line numberDiff line change
@@ -6466,15 +6466,6 @@ inline std::ostream &operator<<(std::ostream &os, enum ur_image_info_t value) {
64666466
case UR_IMAGE_INFO_DEPTH:
64676467
os << "UR_IMAGE_INFO_DEPTH";
64686468
break;
6469-
case UR_IMAGE_INFO_ARRAY_SIZE:
6470-
os << "UR_IMAGE_INFO_ARRAY_SIZE";
6471-
break;
6472-
case UR_IMAGE_INFO_NUM_MIP_LEVELS:
6473-
os << "UR_IMAGE_INFO_NUM_MIP_LEVELS";
6474-
break;
6475-
case UR_IMAGE_INFO_NUM_SAMPLES:
6476-
os << "UR_IMAGE_INFO_NUM_SAMPLES";
6477-
break;
64786469
default:
64796470
os << "unknown enumerator";
64806471
break;
@@ -6583,45 +6574,6 @@ inline ur_result_t printTagged(std::ostream &os, const void *ptr,
65836574

65846575
os << ")";
65856576
} break;
6586-
case UR_IMAGE_INFO_ARRAY_SIZE: {
6587-
const size_t *tptr = (const size_t *)ptr;
6588-
if (sizeof(size_t) > size) {
6589-
os << "invalid size (is: " << size << ", expected: >=" << sizeof(size_t)
6590-
<< ")";
6591-
return UR_RESULT_ERROR_INVALID_SIZE;
6592-
}
6593-
os << (const void *)(tptr) << " (";
6594-
6595-
os << *tptr;
6596-
6597-
os << ")";
6598-
} break;
6599-
case UR_IMAGE_INFO_NUM_MIP_LEVELS: {
6600-
const uint32_t *tptr = (const uint32_t *)ptr;
6601-
if (sizeof(uint32_t) > size) {
6602-
os << "invalid size (is: " << size << ", expected: >=" << sizeof(uint32_t)
6603-
<< ")";
6604-
return UR_RESULT_ERROR_INVALID_SIZE;
6605-
}
6606-
os << (const void *)(tptr) << " (";
6607-
6608-
os << *tptr;
6609-
6610-
os << ")";
6611-
} break;
6612-
case UR_IMAGE_INFO_NUM_SAMPLES: {
6613-
const uint32_t *tptr = (const uint32_t *)ptr;
6614-
if (sizeof(uint32_t) > size) {
6615-
os << "invalid size (is: " << size << ", expected: >=" << sizeof(uint32_t)
6616-
<< ")";
6617-
return UR_RESULT_ERROR_INVALID_SIZE;
6618-
}
6619-
os << (const void *)(tptr) << " (";
6620-
6621-
os << *tptr;
6622-
6623-
os << ")";
6624-
} break;
66256577
default:
66266578
os << "unknown enumerator";
66276579
return UR_RESULT_ERROR_INVALID_ENUMERATION;

‎scripts/core/memory.yml

-6
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,6 @@ etors:
160160
desc: "[size_t] image height"
161161
- name: DEPTH
162162
desc: "[size_t] image depth"
163-
- name: ARRAY_SIZE
164-
desc: "[size_t] array size"
165-
- name: NUM_MIP_LEVELS
166-
desc: "[uint32_t] number of MIP levels"
167-
- name: NUM_SAMPLES
168-
desc: "[uint32_t] number of samples"
169163
--- #--------------------------------------------------------------------------
170164
type: struct
171165
desc: "Image format including channel layout and data type"

‎source/adapters/opencl/memory.cpp

-99
Original file line numberDiff line numberDiff line change
@@ -10,92 +10,6 @@
1010

1111
#include "common.hpp"
1212

13-
#include <unordered_map>
14-
15-
const std::unordered_map<ur_image_channel_order_t, cl_channel_order>
16-
ChannelOrderMap = {
17-
{UR_IMAGE_CHANNEL_ORDER_A, CL_A},
18-
{UR_IMAGE_CHANNEL_ORDER_R, CL_R},
19-
{UR_IMAGE_CHANNEL_ORDER_RG, CL_RG},
20-
{UR_IMAGE_CHANNEL_ORDER_RA, CL_RA},
21-
{UR_IMAGE_CHANNEL_ORDER_RGB, CL_RGB},
22-
{UR_IMAGE_CHANNEL_ORDER_RGBA, CL_RGBA},
23-
{UR_IMAGE_CHANNEL_ORDER_BGRA, CL_BGRA},
24-
{UR_IMAGE_CHANNEL_ORDER_ARGB, CL_ARGB},
25-
{UR_IMAGE_CHANNEL_ORDER_ABGR, CL_ABGR},
26-
{UR_IMAGE_CHANNEL_ORDER_INTENSITY, CL_INTENSITY},
27-
{UR_IMAGE_CHANNEL_ORDER_LUMINANCE, CL_LUMINANCE},
28-
{UR_IMAGE_CHANNEL_ORDER_RX, CL_Rx},
29-
{UR_IMAGE_CHANNEL_ORDER_RGX, CL_RGx},
30-
{UR_IMAGE_CHANNEL_ORDER_RGBX, CL_RGBx},
31-
{UR_IMAGE_CHANNEL_ORDER_SRGBA, CL_sRGBA},
32-
};
33-
34-
const std::unordered_map<ur_image_channel_type_t, cl_channel_type>
35-
ChannelTypeMap = {
36-
{UR_IMAGE_CHANNEL_TYPE_SNORM_INT8, CL_SNORM_INT8},
37-
{UR_IMAGE_CHANNEL_TYPE_SNORM_INT16, CL_SNORM_INT16},
38-
{UR_IMAGE_CHANNEL_TYPE_UNORM_INT8, CL_UNORM_INT8},
39-
{UR_IMAGE_CHANNEL_TYPE_UNORM_INT16, CL_UNORM_INT16},
40-
{UR_IMAGE_CHANNEL_TYPE_UNORM_SHORT_565, CL_UNORM_SHORT_565},
41-
{UR_IMAGE_CHANNEL_TYPE_UNORM_SHORT_555, CL_UNORM_SHORT_555},
42-
{UR_IMAGE_CHANNEL_TYPE_INT_101010, CL_UNORM_INT_101010},
43-
{UR_IMAGE_CHANNEL_TYPE_SIGNED_INT8, CL_SIGNED_INT8},
44-
{UR_IMAGE_CHANNEL_TYPE_SIGNED_INT16, CL_SIGNED_INT16},
45-
{UR_IMAGE_CHANNEL_TYPE_SIGNED_INT32, CL_SIGNED_INT32},
46-
{UR_IMAGE_CHANNEL_TYPE_UNSIGNED_INT8, CL_UNSIGNED_INT8},
47-
{UR_IMAGE_CHANNEL_TYPE_UNSIGNED_INT16, CL_UNSIGNED_INT16},
48-
{UR_IMAGE_CHANNEL_TYPE_UNSIGNED_INT32, CL_UNSIGNED_INT32},
49-
{UR_IMAGE_CHANNEL_TYPE_HALF_FLOAT, CL_HALF_FLOAT},
50-
{UR_IMAGE_CHANNEL_TYPE_FLOAT, CL_FLOAT},
51-
};
52-
53-
cl_image_format mapURImageFormatToCL(const ur_image_format_t &PImageFormat) {
54-
cl_image_format CLImageFormat = {UR_IMAGE_CHANNEL_ORDER_FORCE_UINT32,
55-
UR_IMAGE_CHANNEL_TYPE_FORCE_UINT32};
56-
57-
auto channelOrderIt = ChannelOrderMap.find(PImageFormat.channelOrder);
58-
if (channelOrderIt != ChannelOrderMap.end()) {
59-
CLImageFormat.image_channel_order = channelOrderIt->second;
60-
}
61-
62-
auto channelTypeIt = ChannelTypeMap.find(PImageFormat.channelType);
63-
if (channelTypeIt != ChannelTypeMap.end()) {
64-
CLImageFormat.image_channel_data_type = channelTypeIt->second;
65-
}
66-
67-
return CLImageFormat;
68-
}
69-
70-
ur_image_format_t mapCLImageFormatToUR(const cl_image_format *PImageFormat) {
71-
ur_image_format_t URImageFormat = {UR_IMAGE_CHANNEL_ORDER_FORCE_UINT32,
72-
UR_IMAGE_CHANNEL_TYPE_FORCE_UINT32};
73-
74-
auto reverseChannelOrderIt =
75-
std::find_if(ChannelOrderMap.begin(), ChannelOrderMap.end(),
76-
[PImageFormat](const auto &pair) {
77-
return pair.second == PImageFormat->image_channel_order;
78-
});
79-
if (reverseChannelOrderIt != ChannelOrderMap.end()) {
80-
URImageFormat.channelOrder = reverseChannelOrderIt->first;
81-
}
82-
83-
URImageFormat.channelOrder = (reverseChannelOrderIt != ChannelOrderMap.end())
84-
? reverseChannelOrderIt->first
85-
: UR_IMAGE_CHANNEL_ORDER_FORCE_UINT32;
86-
87-
auto reverseChannelTypeIt = std::find_if(
88-
ChannelTypeMap.begin(), ChannelTypeMap.end(),
89-
[PImageFormat](const auto &pair) {
90-
return pair.second == PImageFormat->image_channel_data_type;
91-
});
92-
if (reverseChannelTypeIt != ChannelTypeMap.end()) {
93-
URImageFormat.channelType = reverseChannelTypeIt->first;
94-
}
95-
96-
return URImageFormat;
97-
}
98-
9913
cl_image_format mapURImageFormatToCL(const ur_image_format_t *PImageFormat) {
10014
cl_image_format CLImageFormat;
10115
switch (PImageFormat->channelOrder) {
@@ -260,12 +174,6 @@ cl_int mapURMemImageInfoToCL(ur_image_info_t URPropName) {
260174
return CL_IMAGE_HEIGHT;
261175
case UR_IMAGE_INFO_DEPTH:
262176
return CL_IMAGE_DEPTH;
263-
case UR_IMAGE_INFO_ARRAY_SIZE:
264-
return CL_IMAGE_ARRAY_SIZE;
265-
case UR_IMAGE_INFO_NUM_MIP_LEVELS:
266-
return CL_IMAGE_NUM_MIP_LEVELS;
267-
case UR_IMAGE_INFO_NUM_SAMPLES:
268-
return CL_IMAGE_NUM_SAMPLES;
269177
default:
270178
return -1;
271179
}
@@ -489,14 +397,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urMemImageGetInfo(ur_mem_handle_t hMemory,
489397
CL_RETURN_ON_FAILURE(ClResult);
490398
if (pPropSizeRet) {
491399
*pPropSizeRet = CheckPropSize;
492-
} else {
493-
if (propName == UR_IMAGE_INFO_FORMAT) {
494-
ur_image_format_t format = mapCLImageFormatToUR(
495-
reinterpret_cast<const cl_image_format *>(pPropValue));
496-
return ReturnValue(format);
497-
}
498400
}
499-
500401
return UR_RESULT_SUCCESS;
501402
}
502403

‎source/loader/layers/validation/ur_valddi.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1470,7 +1470,7 @@ __urdlllocal ur_result_t UR_APICALL urMemImageGetInfo(
14701470
if (pPropValue == NULL && pPropSizeRet == NULL)
14711471
return UR_RESULT_ERROR_INVALID_NULL_POINTER;
14721472

1473-
if (UR_IMAGE_INFO_NUM_SAMPLES < propName)
1473+
if (UR_IMAGE_INFO_DEPTH < propName)
14741474
return UR_RESULT_ERROR_INVALID_ENUMERATION;
14751475

14761476
if (propSize == 0 && pPropValue != NULL)
@@ -7069,7 +7069,7 @@ __urdlllocal ur_result_t UR_APICALL urBindlessImagesImageGetInfoExp(
70697069
if (pPropValue == NULL && pPropSizeRet == NULL)
70707070
return UR_RESULT_ERROR_INVALID_NULL_POINTER;
70717071

7072-
if (UR_IMAGE_INFO_NUM_SAMPLES < propName)
7072+
if (UR_IMAGE_INFO_DEPTH < propName)
70737073
return UR_RESULT_ERROR_INVALID_ENUMERATION;
70747074
}
70757075

‎source/loader/ur_libapi.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1943,7 +1943,7 @@ ur_result_t UR_APICALL urMemGetInfo(
19431943
/// - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
19441944
/// + `NULL == hMemory`
19451945
/// - ::UR_RESULT_ERROR_INVALID_ENUMERATION
1946-
/// + `::UR_IMAGE_INFO_NUM_SAMPLES < propName`
1946+
/// + `::UR_IMAGE_INFO_DEPTH < propName`
19471947
/// - ::UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION
19481948
/// + If `propName` is not supported by the adapter.
19491949
/// - ::UR_RESULT_ERROR_INVALID_SIZE
@@ -7120,7 +7120,7 @@ ur_result_t UR_APICALL urBindlessImagesImageCopyExp(
71207120
/// - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
71217121
/// + `NULL == hContext`
71227122
/// - ::UR_RESULT_ERROR_INVALID_ENUMERATION
7123-
/// + `::UR_IMAGE_INFO_NUM_SAMPLES < propName`
7123+
/// + `::UR_IMAGE_INFO_DEPTH < propName`
71247124
/// - ::UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION
71257125
/// + If `propName` is not supported by the adapter.
71267126
/// - ::UR_RESULT_ERROR_INVALID_SIZE

‎source/ur_api.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1720,7 +1720,7 @@ ur_result_t UR_APICALL urMemGetInfo(
17201720
/// - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
17211721
/// + `NULL == hMemory`
17221722
/// - ::UR_RESULT_ERROR_INVALID_ENUMERATION
1723-
/// + `::UR_IMAGE_INFO_NUM_SAMPLES < propName`
1723+
/// + `::UR_IMAGE_INFO_DEPTH < propName`
17241724
/// - ::UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION
17251725
/// + If `propName` is not supported by the adapter.
17261726
/// - ::UR_RESULT_ERROR_INVALID_SIZE
@@ -6249,7 +6249,7 @@ ur_result_t UR_APICALL urBindlessImagesImageCopyExp(
62496249
/// - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
62506250
/// + `NULL == hContext`
62516251
/// - ::UR_RESULT_ERROR_INVALID_ENUMERATION
6252-
/// + `::UR_IMAGE_INFO_NUM_SAMPLES < propName`
6252+
/// + `::UR_IMAGE_INFO_DEPTH < propName`
62536253
/// - ::UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION
62546254
/// + If `propName` is not supported by the adapter.
62556255
/// - ::UR_RESULT_ERROR_INVALID_SIZE

0 commit comments

Comments
 (0)