Apply constexpr on global constant varaibles

When HIP_ENABLE_DEFERRED_LOADING=0, many global variables will be
referenced but they are not initialized in that early time. The patch
will use constexpr to initialze global constant varables in compile
time.

Change-Id: I9d538b7abc6a0ce700ec3332b97fc144db5fc1ef


[ROCm/clr commit: fdef6f722f]
Tá an tiomantas seo le fáil i:
Tao Sang
2020-07-14 20:10:24 -04:00
tiomanta ag Tao Sang
tuismitheoir 11f8a869f1
tiomantas 44eb207f8d
D'athraigh 62 comhad le 224 breiseanna agus 227 scriosta
+2 -2
Féach ar an gComhad
@@ -900,7 +900,7 @@ typedef struct ChannelTypeMap {
hsa_ext_image_channel_type_t hsa_channel_type;
} ChannelTypeMap;
static const ChannelOrderMap kChannelOrderMapping[] = {
static constexpr ChannelOrderMap kChannelOrderMapping[] = {
{CL_R, HSA_EXT_IMAGE_CHANNEL_ORDER_R},
{CL_A, HSA_EXT_IMAGE_CHANNEL_ORDER_A},
{CL_RG, HSA_EXT_IMAGE_CHANNEL_ORDER_RG},
@@ -923,7 +923,7 @@ static const ChannelOrderMap kChannelOrderMapping[] = {
{CL_ABGR, HSA_EXT_IMAGE_CHANNEL_ORDER_ABGR},
};
static const ChannelTypeMap kChannelTypeMapping[] = {
static constexpr ChannelTypeMap kChannelTypeMapping[] = {
{CL_SNORM_INT8, HSA_EXT_IMAGE_CHANNEL_TYPE_SNORM_INT8},
{CL_SNORM_INT16, HSA_EXT_IMAGE_CHANNEL_TYPE_SNORM_INT16},
{CL_UNORM_INT8, HSA_EXT_IMAGE_CHANNEL_TYPE_UNORM_INT8},