From aec13e0fb33d478e41b9898f326c6b5526dbe6c9 Mon Sep 17 00:00:00 2001 From: Anusha Godavarthy Surya Date: Mon, 25 Nov 2019 16:51:49 +0530 Subject: [PATCH 1/2] replace array designator C99 [ROCm/clr commit: bc79c5636b909a826bf44e99b57e92ea40f1829e] --- .../include/hip/hcc_detail/texture_functions.h | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/projects/clr/hipamd/include/hip/hcc_detail/texture_functions.h b/projects/clr/hipamd/include/hip/hcc_detail/texture_functions.h index bb0a9e7223..cb90314819 100644 --- a/projects/clr/hipamd/include/hip/hcc_detail/texture_functions.h +++ b/projects/clr/hipamd/include/hip/hcc_detail/texture_functions.h @@ -157,8 +157,6 @@ union TData { #define TEXTURE_RETURN_UINT_XYZW return make_uint4(texel.u.x, texel.u.y, texel.u.z, texel.u.w); -#define HIP_AD_FORMAT_NOT_INITIALIZED 0 - #define TEXTURE_RETURN_FLOAT return (texFormatToSize[texRef.format] == 1)? texel.f.x : (float)texel.u.x/texFormatToSize[texRef.format]; #define TEXTURE_RETURN_FLOAT_X return (texFormatToSize[texRef.format] == 1)? make_float1(texel.f.x) : make_float1((float)texel.u.x/texFormatToSize[texRef.format]); @@ -169,17 +167,8 @@ union TData { extern "C" { - __device__ __constant__ static int texFormatToSize[] = { - [HIP_AD_FORMAT_NOT_INITIALIZED] = 1 , - [HIP_AD_FORMAT_UNSIGNED_INT8] = UCHAR_MAX , - [HIP_AD_FORMAT_UNSIGNED_INT16]= USHRT_MAX, - [HIP_AD_FORMAT_UNSIGNED_INT32]= 1 , - [HIP_AD_FORMAT_SIGNED_INT8] = SCHAR_MAX, - [HIP_AD_FORMAT_SIGNED_INT16] = SHRT_MAX, - [HIP_AD_FORMAT_SIGNED_INT32] = 1 , - [HIP_AD_FORMAT_HALF] = 1 , - [HIP_AD_FORMAT_FLOAT] = 1 -}; +// this is really a sparse array with only valid values being the ones indexed by the enum hipArray_Format(e.g. texFormatToSize[HIP_AD_FORMAT_UNSIGNED_INT8] = UCHAR_MAX) +__device__ __constant__ static int texFormatToSize[] = {1,UCHAR_MAX,USHRT_MAX,1,1,1,1,1,SCHAR_MAX,SHRT_MAX,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1}; __device__ __hip_float4_vector_value_type __ockl_image_sample_1D( From 35e4141eab894718d765560e68d951ddceef28d5 Mon Sep 17 00:00:00 2001 From: Maneesh Gupta Date: Sat, 21 Dec 2019 12:25:36 +0530 Subject: [PATCH 2/2] Update texture_functions.h Highlight valid and invalid values in texFormatToSize [ROCm/clr commit: 6c7ce07577da32e43a96f00b498e538fafd630b7] --- .../include/hip/hcc_detail/texture_functions.h | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/projects/clr/hipamd/include/hip/hcc_detail/texture_functions.h b/projects/clr/hipamd/include/hip/hcc_detail/texture_functions.h index cb90314819..8cb1088e0e 100644 --- a/projects/clr/hipamd/include/hip/hcc_detail/texture_functions.h +++ b/projects/clr/hipamd/include/hip/hcc_detail/texture_functions.h @@ -168,7 +168,20 @@ union TData { extern "C" { // this is really a sparse array with only valid values being the ones indexed by the enum hipArray_Format(e.g. texFormatToSize[HIP_AD_FORMAT_UNSIGNED_INT8] = UCHAR_MAX) -__device__ __constant__ static int texFormatToSize[] = {1,UCHAR_MAX,USHRT_MAX,1,1,1,1,1,SCHAR_MAX,SHRT_MAX,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1}; +__device__ __constant__ static int texFormatToSize[] = { + 1, /* HIP_AD_FORMAT_NOT_INITIALIZED */ + UCHAR_MAX, /* HIP_AD_FORMAT_UNSIGNED_INT8 */ + USHRT_MAX, /* HIP_AD_FORMAT_UNSIGNED_INT16 */ + 1, /* HIP_AD_FORMAT_UNSIGNED_INT32 */ + 1,1,1,1, /* Invalid values */ + SCHAR_MAX, /* HIP_AD_FORMAT_SIGNED_INT8 */ + SHRT_MAX, /* HIP_AD_FORMAT_SIGNED_INT16 */ + 1, /* HIP_AD_FORMAT_SIGNED_INT32 */ + 1,1,1,1,1, /* Invalid values */ + 1, /* HIP_AD_FORMAT_HALF */ + 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* Invalid values */ + 1 /* HIP_AD_FORMAT_FLOAT */ +}; __device__ __hip_float4_vector_value_type __ockl_image_sample_1D(