diff --git a/projects/clr/rocclr/runtime/device/pal/paldefs.hpp b/projects/clr/rocclr/runtime/device/pal/paldefs.hpp
index 6547886042..79fec3b054 100644
--- a/projects/clr/rocclr/runtime/device/pal/paldefs.hpp
+++ b/projects/clr/rocclr/runtime/device/pal/paldefs.hpp
@@ -184,170 +184,170 @@ enum OclVersion {
 };
 
 struct MemoryFormat {
-    cl_image_format clFormat_;      //!< CL image format
-    Pal::Format     palFormat_;     //!< PAL image format
-    Pal::ChannelMapping palChannel_;//!< PAL channel mapping
+    cl_image_format     clFormat_;      //!< CL image format
+    Pal::ChNumFormat    palFormat_;     //!< PAL image format
+    Pal::ChannelMapping palChannel_;    //!< PAL channel mapping
 };
 
 static const MemoryFormat
 MemoryFormatMap[] = {
     // R
     { { CL_R,                       CL_UNORM_INT8 },
-      { Pal::ChFmt::R8,             Pal::NumFmt::Unorm },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::Zero,
+      Pal::ChNumFormat::X8_Unorm,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Zero,
           Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } },
     { { CL_R,                       CL_UNORM_INT16 },
-      { Pal::ChFmt::R16,            Pal::NumFmt::Unorm },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::Zero,
+        Pal::ChNumFormat::X16_Unorm,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Zero,
           Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } },
 
     { { CL_R,                       CL_SNORM_INT8 },
-      { Pal::ChFmt::R8,             Pal::NumFmt::Snorm },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::Zero,
+      Pal::ChNumFormat::X8_Snorm,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Zero,
           Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } },
     { { CL_R,                       CL_SNORM_INT16 },
-      { Pal::ChFmt::R16,            Pal::NumFmt::Snorm },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::Zero,
+      Pal::ChNumFormat::X16_Snorm,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Zero,
           Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } },
 
     { { CL_R,                       CL_SIGNED_INT8 },
-      { Pal::ChFmt::R8,             Pal::NumFmt::Sint },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::Zero,
+      Pal::ChNumFormat::X8_Sint,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Zero,
           Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } },
     { { CL_R,                       CL_SIGNED_INT16 },
-      { Pal::ChFmt::R16,            Pal::NumFmt::Sint },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::Zero,
+      Pal::ChNumFormat::X16_Sint,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Zero,
           Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } },
     { { CL_R,                       CL_SIGNED_INT32 },
-      { Pal::ChFmt::R32,            Pal::NumFmt::Sint },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::Zero,
+      Pal::ChNumFormat::X32_Sint,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Zero,
           Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } },
     { { CL_R,                       CL_UNSIGNED_INT8 },
-      { Pal::ChFmt::R8,             Pal::NumFmt::Uint },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::Zero,
+      Pal::ChNumFormat::X8_Uint,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Zero,
           Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } },
     { { CL_R,                       CL_UNSIGNED_INT16 },
-      { Pal::ChFmt::R16,            Pal::NumFmt::Uint },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::Zero,
+      Pal::ChNumFormat::X16_Uint,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Zero,
           Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } },
     { { CL_R,                       CL_UNSIGNED_INT32 },
-      { Pal::ChFmt::R32,            Pal::NumFmt::Uint },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::Zero,
+      Pal::ChNumFormat::X32_Uint,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Zero,
           Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } },
 
     { { CL_R,                       CL_HALF_FLOAT },
-      {  Pal::ChFmt::R16,           Pal::NumFmt::Float },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::Zero,
+      Pal::ChNumFormat::X16_Float,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Zero,
           Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } },
     { { CL_R,                       CL_FLOAT },
-      {  Pal::ChFmt::R32,           Pal::NumFmt::Float },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::Zero,
+      Pal::ChNumFormat::X32_Float,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Zero,
           Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } },
 
     // A
     { { CL_A,                       CL_UNORM_INT8 },
-      { Pal::ChFmt::R8,             Pal::NumFmt::Unorm },
+      Pal::ChNumFormat::X8_Unorm,
         { Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero,
-          Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::R } },
+          Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::X } },
     { { CL_A,                       CL_UNORM_INT16 },
-      { Pal::ChFmt::R16,            Pal::NumFmt::Unorm },
+      Pal::ChNumFormat::X16_Unorm,
         { Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero,
-          Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::R } },
+          Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::X } },
 
     { { CL_A,                       CL_SNORM_INT8 },
-      { Pal::ChFmt::R8,             Pal::NumFmt::Snorm },
+      Pal::ChNumFormat::X8_Snorm,
         { Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero,
-          Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::R } },
+          Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::X } },
     { { CL_A,                       CL_SNORM_INT16 },
-      { Pal::ChFmt::R16,            Pal::NumFmt::Snorm },
+      Pal::ChNumFormat::X16_Snorm,
         { Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero,
-          Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::R } },
+          Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::X } },
 
     { { CL_A,                       CL_SIGNED_INT8 },
-      { Pal::ChFmt::R8,             Pal::NumFmt::Sint },
+      Pal::ChNumFormat::X8_Sint,
         { Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero,
-          Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::R } },
+          Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::X } },
     { { CL_A,                       CL_SIGNED_INT16 },
-      { Pal::ChFmt::R16,            Pal::NumFmt::Sint },
+      Pal::ChNumFormat::X16_Sint,
         { Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero,
-          Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::R } },
+          Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::X } },
     { { CL_A,                       CL_SIGNED_INT32},
-      { Pal::ChFmt::R32,            Pal::NumFmt::Sint },
+      Pal::ChNumFormat::X32_Sint,
         { Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero,
-          Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::R } },
+          Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::X } },
     { { CL_A,                       CL_UNSIGNED_INT8 },
-      { Pal::ChFmt::R8,             Pal::NumFmt::Uint },
+      Pal::ChNumFormat::X8_Uint,
         { Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero,
-          Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::R } },
+          Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::X } },
     { { CL_A,                       CL_UNSIGNED_INT16 },
-      { Pal::ChFmt::R16,            Pal::NumFmt::Uint },
+      Pal::ChNumFormat::X16_Uint,
         { Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero,
-          Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::R } },
+          Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::X } },
     { { CL_A,                       CL_UNSIGNED_INT32},
-      { Pal::ChFmt::R32 ,           Pal::NumFmt::Uint },
+      Pal::ChNumFormat::X32_Uint,
         { Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero,
-          Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::R } },
+          Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::X } },
 
     { { CL_A,                       CL_HALF_FLOAT },
-      { Pal::ChFmt::R16,            Pal::NumFmt::Float },
+      Pal::ChNumFormat::X16_Float,
         { Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero,
-          Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::R } },
+          Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::X } },
     { { CL_A,                       CL_FLOAT },
-      { Pal::ChFmt::R32,            Pal::NumFmt::Float },
+      Pal::ChNumFormat::X32_Float,
         { Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::Zero,
-          Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::R } },
+          Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::X } },
 
     // RG
     { { CL_RG,                      CL_UNORM_INT8 },
-      { Pal::ChFmt::R8G8,           Pal::NumFmt::Unorm },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
+      Pal::ChNumFormat::X8Y8_Unorm,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
           Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } },
     { { CL_RG,                      CL_UNORM_INT16 },
-      { Pal::ChFmt::R16G16,         Pal::NumFmt::Unorm },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
+      Pal::ChNumFormat::X16Y16_Unorm,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
           Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } },
 
     { { CL_RG,                      CL_SNORM_INT8 },
-      { Pal::ChFmt::R8G8,           Pal::NumFmt::Snorm },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
+      Pal::ChNumFormat::X8Y8_Snorm,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
           Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } },
     { { CL_RG,                      CL_SNORM_INT16 },
-      { Pal::ChFmt::R16G16,         Pal::NumFmt::Snorm },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
+      Pal::ChNumFormat::X16Y16_Snorm,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
           Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } },
 
     { { CL_RG,                      CL_SIGNED_INT8 },
-      { Pal::ChFmt::R8G8,           Pal::NumFmt::Sint },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
+      Pal::ChNumFormat::X8Y8_Sint,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
           Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } },
     { { CL_RG,                      CL_SIGNED_INT16 },
-      { Pal::ChFmt::R16G16,         Pal::NumFmt::Sint },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
+      Pal::ChNumFormat::X16Y16_Sint,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
           Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } },
     { { CL_RG,                      CL_SIGNED_INT32},
-      { Pal::ChFmt::R32G32,         Pal::NumFmt::Sint },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
+      Pal::ChNumFormat::X32Y32_Sint,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
           Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } },
     { { CL_RG,                      CL_UNSIGNED_INT8 },
-      { Pal::ChFmt::R8G8,           Pal::NumFmt::Uint },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
+      Pal::ChNumFormat::X8Y8_Uint,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
           Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } },
     { { CL_RG,                      CL_UNSIGNED_INT16 },
-      { Pal::ChFmt::R16G16,         Pal::NumFmt::Uint },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
+      Pal::ChNumFormat::X16Y16_Uint,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
           Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } },
     { { CL_RG,                      CL_UNSIGNED_INT32},
-      { Pal::ChFmt::R32G32,         Pal::NumFmt::Uint },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
+      Pal::ChNumFormat::X32Y32_Uint,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
           Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } },
 
     { { CL_RG,                      CL_HALF_FLOAT },
-      { Pal::ChFmt::R16G16,         Pal::NumFmt::Float },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
+      Pal::ChNumFormat::X16Y16_Float,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
           Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } },
     { { CL_RG,                      CL_FLOAT },
-      { Pal::ChFmt::R32G32,         Pal::NumFmt::Float },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
+      Pal::ChNumFormat::X32Y32_Float,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
           Pal::ChannelSwizzle::Zero, Pal::ChannelSwizzle::One } },
 /*
     // RA
@@ -381,222 +381,222 @@ MemoryFormatMap[] = {
 */
     // RGB
     { { CL_RGB,                     CL_UNORM_INT_101010 },
-      { Pal::ChFmt::R10G10B10A2,    Pal::NumFmt::Unorm },
-        { Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::G,
-          Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::One } },
+      Pal::ChNumFormat::X10Y10Z10W2_Unorm,
+        { Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::Y,
+          Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::One } },
     { { CL_RGB,                     CL_UNSIGNED_INT8 },     // This is used only by blit kernel
-      { Pal::ChFmt::R8G8B8A8,       Pal::NumFmt::Uint },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
-          Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::One } },
+      Pal::ChNumFormat::X8Y8Z8W8_Uint,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
+          Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::One } },
 
     // RGBA
     { { CL_RGBA,                    CL_UNORM_INT8 },
-      { Pal::ChFmt::R8G8B8A8,       Pal::NumFmt::Unorm },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
-          Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::A } },
+      Pal::ChNumFormat::X8Y8Z8W8_Unorm,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
+          Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::W } },
     { { CL_RGBA,                    CL_UNORM_INT16 },
-      { Pal::ChFmt::R16G16B16A16,   Pal::NumFmt::Unorm },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
-          Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::A } },
+      Pal::ChNumFormat::X16Y16Z16W16_Unorm,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
+          Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::W } },
 
     { { CL_RGBA,                    CL_SNORM_INT8 },
-      { Pal::ChFmt::R8G8B8A8,       Pal::NumFmt::Snorm },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
-          Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::A } },
+      Pal::ChNumFormat::X8Y8Z8W8_Snorm,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
+          Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::W } },
     { { CL_RGBA,                    CL_SNORM_INT16 },
-      { Pal::ChFmt::R16G16B16A16,   Pal::NumFmt::Snorm },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
-          Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::A } },
+      Pal::ChNumFormat::X16Y16Z16W16_Snorm,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
+          Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::W } },
 
     { { CL_RGBA,                    CL_SIGNED_INT8 },
-      { Pal::ChFmt::R8G8B8A8,       Pal::NumFmt::Sint },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
-          Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::A } },
+      Pal::ChNumFormat::X8Y8Z8W8_Sint,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
+          Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::W } },
     { { CL_RGBA,                    CL_SIGNED_INT16 },
-      { Pal::ChFmt::R16G16B16A16,   Pal::NumFmt::Sint },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
-          Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::A } },
+      Pal::ChNumFormat::X16Y16Z16W16_Sint,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
+          Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::W } },
     { { CL_RGBA,                    CL_SIGNED_INT32 },
-      { Pal::ChFmt::R32G32B32A32,   Pal::NumFmt::Sint },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
-          Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::A } },
+      Pal::ChNumFormat::X32Y32Z32W32_Sint,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
+          Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::W } },
     { { CL_RGBA,                    CL_UNSIGNED_INT8 },
-      { Pal::ChFmt::R8G8B8A8,       Pal::NumFmt::Uint },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
-          Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::A } },
+      Pal::ChNumFormat::X8Y8Z8W8_Uint,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
+          Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::W } },
     { { CL_RGBA,                    CL_UNSIGNED_INT16 },
-      { Pal::ChFmt::R16G16B16A16,   Pal::NumFmt::Uint },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
-          Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::A } },
+      Pal::ChNumFormat::X16Y16Z16W16_Uint,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
+          Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::W } },
     { { CL_RGBA,                    CL_UNSIGNED_INT32},
-      { Pal::ChFmt::R32G32B32A32,  Pal::NumFmt::Uint },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
-          Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::A } },
+      Pal::ChNumFormat::X32Y32Z32W32_Uint,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
+          Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::W } },
 
     { { CL_RGBA,                    CL_HALF_FLOAT },
-      { Pal::ChFmt::R16G16B16A16,   Pal::NumFmt::Float },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
-          Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::A } },
+      Pal::ChNumFormat::X16Y16Z16W16_Float,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
+          Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::W } },
     { { CL_RGBA,                    CL_FLOAT },
-      { Pal::ChFmt::R32G32B32A32,   Pal::NumFmt::Float },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
-          Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::A } },
+      Pal::ChNumFormat::X32Y32Z32W32_Float,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
+          Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::W } },
 
     // ARGB
     { { CL_ARGB,                    CL_UNORM_INT8 },
-      { Pal::ChFmt::R8G8B8A8,       Pal::NumFmt::Unorm },
-        { Pal::ChannelSwizzle::G, Pal::ChannelSwizzle::B,
-          Pal::ChannelSwizzle::A, Pal::ChannelSwizzle::R } },
+      Pal::ChNumFormat::X8Y8Z8W8_Unorm,
+        { Pal::ChannelSwizzle::Y, Pal::ChannelSwizzle::Z,
+          Pal::ChannelSwizzle::W, Pal::ChannelSwizzle::X } },
     { { CL_ARGB,                    CL_SNORM_INT8 },
-      { Pal::ChFmt::R8G8B8A8,       Pal::NumFmt::Snorm },
-        { Pal::ChannelSwizzle::G, Pal::ChannelSwizzle::B,
-          Pal::ChannelSwizzle::A, Pal::ChannelSwizzle::R } },
+      Pal::ChNumFormat::X8Y8Z8W8_Snorm,
+        { Pal::ChannelSwizzle::Y, Pal::ChannelSwizzle::Z,
+          Pal::ChannelSwizzle::W, Pal::ChannelSwizzle::X } },
     { { CL_ARGB,                    CL_SIGNED_INT8 },
-      { Pal::ChFmt::R8G8B8A8,       Pal::NumFmt::Sint },
-        { Pal::ChannelSwizzle::G, Pal::ChannelSwizzle::B,
-          Pal::ChannelSwizzle::A, Pal::ChannelSwizzle::R } },
+      Pal::ChNumFormat::X8Y8Z8W8_Sint,
+        { Pal::ChannelSwizzle::Y, Pal::ChannelSwizzle::Z,
+          Pal::ChannelSwizzle::W, Pal::ChannelSwizzle::X } },
     { { CL_ARGB,                    CL_UNSIGNED_INT8 },
-      { Pal::ChFmt::R8G8B8A8,       Pal::NumFmt::Uint },
-        { Pal::ChannelSwizzle::G, Pal::ChannelSwizzle::B,
-          Pal::ChannelSwizzle::A, Pal::ChannelSwizzle::R } },
+      Pal::ChNumFormat::X8Y8Z8W8_Uint,
+        { Pal::ChannelSwizzle::Y, Pal::ChannelSwizzle::Z,
+          Pal::ChannelSwizzle::W, Pal::ChannelSwizzle::X } },
 
     // BGRA
     { { CL_BGRA,                    CL_UNORM_INT8 },
-      { Pal::ChFmt::B8G8R8A8,       Pal::NumFmt::Unorm },
-        { Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::G,
-          Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::A } },
+      Pal::ChNumFormat::X8Y8Z8W8_Unorm,
+        { Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::Y,
+          Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::W } },
     { { CL_BGRA,                    CL_SNORM_INT8 },
-      { Pal::ChFmt::B8G8R8A8,       Pal::NumFmt::Snorm },
-        { Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::G,
-          Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::A } },
+      Pal::ChNumFormat::X8Y8Z8W8_Snorm,
+        { Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::Y,
+          Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::W } },
     { { CL_BGRA,                    CL_SIGNED_INT8 },
-      { Pal::ChFmt::B8G8R8A8,       Pal::NumFmt::Sint },
-        { Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::G,
-          Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::A } },
+      Pal::ChNumFormat::X8Y8Z8W8_Sint,
+        { Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::Y,
+          Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::W } },
     { { CL_BGRA,                    CL_UNSIGNED_INT8 },
-      { Pal::ChFmt::B8G8R8A8,       Pal::NumFmt::Uint },
-        { Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::G,
-          Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::A } },
+      Pal::ChNumFormat::X8Y8Z8W8_Uint,
+        { Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::Y,
+          Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::W } },
 
     // LUMINANCE
     { { CL_LUMINANCE,               CL_SNORM_INT8 },
-      { Pal::ChFmt::R8,             Pal::NumFmt::Snorm },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R,
-          Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::One } },
+      Pal::ChNumFormat::X8_Snorm,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X,
+          Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::One } },
     { { CL_LUMINANCE,               CL_SNORM_INT16 },
-      { Pal::ChFmt::R16,            Pal::NumFmt::Snorm },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R,
-          Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::One } },
+      Pal::ChNumFormat::X16_Snorm,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X,
+          Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::One } },
     { { CL_LUMINANCE,               CL_UNORM_INT8 },
-      { Pal::ChFmt::R8,             Pal::NumFmt::Unorm },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R,
-          Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::One } },
+      Pal::ChNumFormat::X8_Unorm,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X,
+          Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::One } },
     { { CL_LUMINANCE,               CL_UNORM_INT16 },
-      { Pal::ChFmt::R16,            Pal::NumFmt::Unorm },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R,
-          Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::One } },
+      Pal::ChNumFormat::X16_Unorm,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X,
+          Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::One } },
     { { CL_LUMINANCE,               CL_HALF_FLOAT },
-      { Pal::ChFmt::R16,            Pal::NumFmt::Float },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R,
-          Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::One } },
+      Pal::ChNumFormat::X16_Float,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X,
+          Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::One } },
     { { CL_LUMINANCE,               CL_FLOAT },
-      { Pal::ChFmt::R32,            Pal::NumFmt::Float },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R,
-          Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::One } },
+      Pal::ChNumFormat::X32_Float,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X,
+          Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::One } },
 
     // INTENSITY
     { { CL_INTENSITY,               CL_SNORM_INT8 },
-      { Pal::ChFmt::R8,             Pal::NumFmt::Snorm },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R,
-          Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R } },
+      Pal::ChNumFormat::X8_Snorm,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X,
+          Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X } },
     { { CL_INTENSITY,               CL_SNORM_INT16 },
-      { Pal::ChFmt::R16,            Pal::NumFmt::Snorm },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R,
-          Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R } },
+      Pal::ChNumFormat::X16_Snorm,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X,
+          Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X } },
     { { CL_INTENSITY,               CL_UNORM_INT8 },
-      { Pal::ChFmt::R8,             Pal::NumFmt::Unorm },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R,
-          Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R } },
+      Pal::ChNumFormat::X8_Unorm,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X,
+          Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X } },
     { { CL_INTENSITY,               CL_UNORM_INT16 },
-      { Pal::ChFmt::R16,            Pal::NumFmt::Unorm },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R,
-          Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R } },
+      Pal::ChNumFormat::X16_Unorm,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X,
+          Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X } },
     { { CL_INTENSITY,               CL_HALF_FLOAT },
-      { Pal::ChFmt::R16,            Pal::NumFmt::Float },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R,
-          Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R } },
+      Pal::ChNumFormat::X16_Float,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X,
+          Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X } },
     { { CL_INTENSITY,               CL_FLOAT },
-      { Pal::ChFmt::R32,            Pal::NumFmt::Float },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R,
-          Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R } },
+      Pal::ChNumFormat::X32_Float,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X,
+          Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X } },
 
     // sRBGA
     { { CL_sRGBA,                   CL_UNORM_INT8 },
-      { Pal::ChFmt::R8G8B8A8,       Pal::NumFmt::Srgb },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
-          Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::A } },
+      Pal::ChNumFormat::X8Y8Z8W8_Srgb,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
+          Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::W } },
     { { CL_sRGBA,                   CL_UNSIGNED_INT8 },     // This is used only by blit kernel
-      { Pal::ChFmt::R8G8B8A8,       Pal::NumFmt::Uint },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
-          Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::A } },
+      Pal::ChNumFormat::X8Y8Z8W8_Uint,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
+          Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::W } },
 
     // sRBG
     { { CL_sRGB,                    CL_UNORM_INT8 },
-      { Pal::ChFmt::R8G8B8A8,       Pal::NumFmt::Srgb },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
-          Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::One } },
+      Pal::ChNumFormat::X8Y8Z8W8_Srgb,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
+          Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::One } },
     { { CL_sRGB,                    CL_UNSIGNED_INT8 },      // This is used only by blit kernel
-      { Pal::ChFmt::R8G8B8A8,       Pal::NumFmt::Uint },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
-          Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::One } },
+      Pal::ChNumFormat::X8Y8Z8W8_Uint,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
+          Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::One } },
 
     // sRBGx
     { { CL_sRGBx,                   CL_UNORM_INT8 },
-      { Pal::ChFmt::R8G8B8A8,       Pal::NumFmt::Srgb },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
-          Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::One } },
+      Pal::ChNumFormat::X8Y8Z8W8_Srgb,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
+          Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::One } },
     { { CL_sRGBx,                   CL_UNSIGNED_INT8 },     // This is used only by blit kernel
-      { Pal::ChFmt::R8G8B8A8,       Pal::NumFmt::Uint },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::G,
-          Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::One } },
+      Pal::ChNumFormat::X8Y8Z8W8_Uint,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
+          Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::One } },
 
     // sBGRA
     { { CL_sBGRA,                   CL_UNORM_INT8 },
-      { Pal::ChFmt::B8G8R8A8,       Pal::NumFmt::Srgb },
-        { Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::G,
-          Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::A } },
+      Pal::ChNumFormat::X8Y8Z8W8_Srgb,
+        { Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::Y,
+          Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::W } },
     { { CL_sBGRA,                   CL_UNSIGNED_INT8 },     // This is used only by blit kernel
-      { Pal::ChFmt::B8G8R8A8,       Pal::NumFmt::Uint },
-        { Pal::ChannelSwizzle::B, Pal::ChannelSwizzle::G,
-          Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::A } },
+      Pal::ChNumFormat::X8Y8Z8W8_Uint,
+        { Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::Y,
+          Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::W } },
 
     // DEPTH
     { { CL_DEPTH,                   CL_FLOAT },
-      { Pal::ChFmt::R32,            Pal::NumFmt::Float },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R,
-          Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R } },
+      Pal::ChNumFormat::X32_Float,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X,
+          Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X } },
     { { CL_DEPTH,                   CL_UNSIGNED_INT32 },    // This is used only by blit kernel
-      { Pal::ChFmt::R32,            Pal::NumFmt::Uint },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R,
-          Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R } },
+      Pal::ChNumFormat::X32_Uint,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X,
+          Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X } },
 
     { { CL_DEPTH,                   CL_UNORM_INT16 },
-      { Pal::ChFmt::R16,            Pal::NumFmt::Unorm },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R,
-          Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R } },
+      Pal::ChNumFormat::X16_Unorm,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X,
+          Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X } },
     { { CL_DEPTH,                   CL_UNSIGNED_INT16 },    // This is used only by blit kernel
-      { Pal::ChFmt::R16,            Pal::NumFmt::Uint },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R,
-          Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R } },
+      Pal::ChNumFormat::X16_Uint,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X,
+          Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X } },
 
     { { CL_DEPTH_STENCIL,           CL_UNORM_INT24 },
-      { Pal::ChFmt::R32,            Pal::NumFmt::Unorm },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R,
-          Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R } },
+      Pal::ChNumFormat::X32_Uint,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X,
+          Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X } },
     { { CL_DEPTH_STENCIL,           CL_FLOAT },
-      { Pal::ChFmt::R32,            Pal::NumFmt::Float },
-        { Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R,
-          Pal::ChannelSwizzle::R, Pal::ChannelSwizzle::R } }
+      Pal::ChNumFormat::X32_Float,
+        { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X,
+          Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X } }
 };
 
 } // namespace pal
diff --git a/projects/clr/rocclr/runtime/device/pal/paldevice.cpp b/projects/clr/rocclr/runtime/device/pal/paldevice.cpp
index 75feb57feb..64e9c91c53 100644
--- a/projects/clr/rocclr/runtime/device/pal/paldevice.cpp
+++ b/projects/clr/rocclr/runtime/device/pal/paldevice.cpp
@@ -1040,6 +1040,7 @@ Device::init()
     size_t size = Pal::GetPlatformSize();
     platformObj = new char[size];
     Pal::PlatformCreateInfo  info = {};
+    //info.flags.disableGpuTimeout = true;
     info.pSettingsPath = "OCL";
 
     // PAL init
@@ -1106,7 +1107,7 @@ Device::xferMgr() const
     return xferQueue_->blitMgr();
 }
 
-Pal::Format
+Pal::ChNumFormat
 Device::getPalFormat(const amd::Image::Format& format, Pal::ChannelMapping* channel) const
 {
     // Find PAL format
diff --git a/projects/clr/rocclr/runtime/device/pal/paldevice.hpp b/projects/clr/rocclr/runtime/device/pal/paldevice.hpp
index 29c5c7efed..6bbd1bc50d 100644
--- a/projects/clr/rocclr/runtime/device/pal/paldevice.hpp
+++ b/projects/clr/rocclr/runtime/device/pal/paldevice.hpp
@@ -421,7 +421,7 @@ public:
     VirtualGPU* xferQueue() const { return xferQueue_; }
 
     //! Retrieves the internal format from the OCL format
-    Pal::Format getPalFormat(
+    Pal::ChNumFormat getPalFormat(
         const amd::Image::Format& format,   //! OCL image format
         Pal::ChannelMapping* channel
         ) const;
diff --git a/projects/clr/rocclr/runtime/device/pal/palresource.cpp b/projects/clr/rocclr/runtime/device/pal/palresource.cpp
index 94efefcec4..29269710b8 100644
--- a/projects/clr/rocclr/runtime/device/pal/palresource.cpp
+++ b/projects/clr/rocclr/runtime/device/pal/palresource.cpp
@@ -172,8 +172,8 @@ Resource::Resource(
     desc_.state_     = 0;
     desc_.type_      = Empty;
     desc_.width_     = amd::alignUp(size,
-        Pal::Formats::BytesPerPixel(Pal::ChFmt::R32)) /
-        Pal::Formats::BytesPerPixel(Pal::ChFmt::R32);
+        Pal::Formats::BytesPerPixel(Pal::ChNumFormat::X32_Uint)) /
+        Pal::Formats::BytesPerPixel(Pal::ChNumFormat::X32_Uint);
     desc_.height_    = 1;
     desc_.depth_     = 1;
     desc_.mipLevels_ = 1;
@@ -397,7 +397,7 @@ Resource::create(MemoryType memType, CreateParams* params)
     Pal::SubresId    ImgSubresId = { Pal::ImageAspect::Color, 0, 0 };
     Pal::SubresRange ImgSubresRange = { ImgSubresId, 1, 1 };
     Pal::ChannelMapping channels;
-    Pal::Format format = dev().getPalFormat(desc().format_, &channels);
+    Pal::ChNumFormat format = dev().getPalFormat(desc().format_, &channels);
 
     // This is a thread safe operation
     const_cast<Device&>(dev()).initializeHeapResources();
@@ -412,7 +412,7 @@ Resource::create(MemoryType memType, CreateParams* params)
     }
 
     // Get the element size
-    elementSize_ = Pal::Formats::BytesPerPixel(format.chFmt);
+    elementSize_ = Pal::Formats::BytesPerPixel(format);
     desc_.type_ = memType;
     if (memType == Scratch) {
         // use local memory for scratch buffer unless it is using HW DEBUG
@@ -510,7 +510,8 @@ Resource::create(MemoryType memType, CreateParams* params)
                 Pal::ImageCreateInfo    imgCreateInfo = {};
                 Pal::ExternalImageOpenInfo imgOpenInfo = {};
                 imgOpenInfo.resourceInfo = openInfo;
-                imgOpenInfo.format = format;
+                imgOpenInfo.swizzledFormat.format = format;
+                imgOpenInfo.swizzledFormat.swizzle = channels;
                 imgOpenInfo.flags.formatChangeSrd = true;
                 imgOpenInfo.usage.shaderRead = true;
                 imgOpenInfo.usage.shaderWrite = true;
@@ -532,7 +533,8 @@ Resource::create(MemoryType memType, CreateParams* params)
                 imgCreateInfo.flags.formatChangeSrd = true;
                 imgCreateInfo.usageFlags.shaderRead = true;
                 imgCreateInfo.usageFlags.shaderWrite = true;
-                imgCreateInfo.format    = format;
+                imgCreateInfo.swizzledFormat.format  = format;
+                imgCreateInfo.swizzledFormat.swizzle = channels;
                 imgCreateInfo.mipLevels = 1;
                 imgCreateInfo.samples   = 1;
                 imgCreateInfo.fragments = 1;
@@ -607,8 +609,8 @@ Resource::create(MemoryType memType, CreateParams* params)
                 Pal::ImageViewInfo viewInfo = {};
                 viewInfo.viewType = Pal::ImageViewType::Tex2d;
                 viewInfo.pImage = image_;
-                viewInfo.format = format;
-                viewInfo.channels = channels;
+                viewInfo.swizzledFormat.format = format;
+                viewInfo.swizzledFormat.swizzle = channels;
                 viewInfo.subresRange = ImgSubresRange;
                 dev().iDev()->CreateImageViewSrds(1, &viewInfo, hwState_);
 
@@ -627,7 +629,8 @@ Resource::create(MemoryType memType, CreateParams* params)
             viewInfo.gpuAddr = memRef_->iMem()->Desc().gpuVirtAddr + offset();
             viewInfo.range = memRef_->iMem()->Desc().size;
             viewInfo.stride = elementSize();
-            viewInfo.format = format;
+            viewInfo.swizzledFormat.format = format;
+            viewInfo.swizzledFormat.swizzle = channels;
             hwSrd_ = dev().srds().allocSrdSlot(reinterpret_cast<address*>(&hwState_));
             if ((0 == hwSrd_) && (memoryType() != ImageView)) {
                 return false;
@@ -643,7 +646,8 @@ Resource::create(MemoryType memType, CreateParams* params)
             Pal::ExternalImageOpenInfo imgOpenInfo = {};
             Pal::ImageCreateInfo    imgCreateInfo = {};
             imgOpenInfo.resourceInfo = openInfo;
-            imgOpenInfo.format = format;
+            imgOpenInfo.swizzledFormat.format = format;
+            imgOpenInfo.swizzledFormat.swizzle = channels;
             imgOpenInfo.flags.formatChangeSrd = true;
             imgOpenInfo.usage.shaderRead = true;
             imgOpenInfo.usage.shaderWrite = true;
@@ -668,8 +672,8 @@ Resource::create(MemoryType memType, CreateParams* params)
                 break;
             }
             viewInfo.pImage = image_;
-            viewInfo.format = format;
-            viewInfo.channels = channels;
+            viewInfo.swizzledFormat.format = format;
+            viewInfo.swizzledFormat.swizzle = channels;
             if ((type == InteropTextureViewLevel) ||
                 (type == InteropTextureViewCube)) {
                 ImgSubresRange.startSubres.mipLevel = mipLevel;
@@ -730,7 +734,8 @@ Resource::create(MemoryType memType, CreateParams* params)
             viewInfo.gpuAddr = memRef_->iMem()->Desc().gpuVirtAddr + offset();
             viewInfo.range = memRef_->iMem()->Desc().size;
             viewInfo.stride = elementSize();
-            viewInfo.format = format;
+            viewInfo.swizzledFormat.format = format;
+            viewInfo.swizzledFormat.swizzle = channels;
             //viewInfo.channels = channels;
             hwSrd_ = dev().srds().allocSrdSlot(reinterpret_cast<address*>(&hwState_));
             if ((0 == hwSrd_) && (memoryType() != ImageView)) {
@@ -798,8 +803,9 @@ Resource::create(MemoryType memType, CreateParams* params)
             imgCreateInfo.flags.formatChangeSrd = true;
             imgCreateInfo.usageFlags.shaderRead = true;
             imgCreateInfo.usageFlags.shaderWrite =
-                (format.numFmt == Pal::NumFmt::Srgb) ? false : true;
-            imgCreateInfo.format = format;
+                (format == Pal::ChNumFormat::X8Y8Z8W8_Srgb) ? false : true;
+            imgCreateInfo.swizzledFormat.format = format;
+            imgCreateInfo.swizzledFormat.swizzle = channels;
             imgCreateInfo.mipLevels     = (desc_.mipLevels_) ? desc_.mipLevels_ : 1;
             imgCreateInfo.samples   = 1;
             imgCreateInfo.fragments = 1;
@@ -868,8 +874,8 @@ Resource::create(MemoryType memType, CreateParams* params)
             return false;
         }
         viewInfo.pImage = image_;
-        viewInfo.format = format;
-        viewInfo.channels = channels;
+        viewInfo.swizzledFormat.format = format;
+        viewInfo.swizzledFormat.swizzle = channels;
         viewInfo.subresRange = ImgSubresRange;
         dev().iDev()->CreateImageViewSrds(1, &viewInfo, hwState_);
 
@@ -1101,22 +1107,22 @@ Resource::writeRawData(
         gpu.waitForEvent(&event);
     }
 }
-static const Pal::ChFmt ChannelFmt(uint bytesPerElement)
+static const Pal::ChNumFormat ChannelFmt(uint bytesPerElement)
 {
     if (bytesPerElement == 16) {
-        return Pal::ChFmt::R32G32B32A32;
+        return Pal::ChNumFormat::X32Y32Z32W32_Uint;
     }
     else if (bytesPerElement == 8) {
-        return Pal::ChFmt::R32G32;
+        return Pal::ChNumFormat::X32Y32_Uint;
     }
     else if (bytesPerElement == 4) {
-        return Pal::ChFmt::R32;
+        return Pal::ChNumFormat::X32_Uint;
     }
     else if (bytesPerElement == 2) {
-        return Pal::ChFmt::R16;
+        return Pal::ChNumFormat::X16_Uint;
     }
     else {
-        return Pal::ChFmt::R8;
+        return Pal::ChNumFormat::X8_Uint;
     }
 }
 
@@ -1135,19 +1141,10 @@ Resource::partialMemCopyTo(
     bool        result = true;
     EngineType  activeEngineID = gpu.engineID_;
     static const bool waitOnBusyEngine = true;
-    // \note timing issues in Linux with sync mode
-    bool        flush = true;
 
-    // Check if runtime can use async memory copy,
-    // even if a caller didn't request async
-    if (!desc().cardMemory_ || !dstResource.desc().cardMemory_) {
-        // Switch to SDMA engine
-        gpu.engineID_ = SdmaEngine;
-        flush = false;
-    }
-    else {
-        assert("Unsupported configuraiton!");
-    }
+    assert(!(desc().cardMemory_ && dstResource.desc().cardMemory_) &&
+        "Unsupported configuraiton!");
+    gpu.engineID_ = SdmaEngine;
 
     // Wait for the resources, since runtime may use async transfers
     wait(gpu, waitOnBusyEngine);
@@ -1233,16 +1230,18 @@ Resource::partialMemCopyTo(
     else {
         if (enableCopyRect) {
             Pal::TypedBufferCopyRegion copyRegion = {};
-            copyRegion.srcBuffer.format.chFmt = ChannelFmt(bytesPerElement);
-            copyRegion.srcBuffer.format.numFmt = Pal::NumFmt::Uint;
+            Pal::ChannelMapping channels = { Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y,
+                Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::W };
+            copyRegion.srcBuffer.swizzledFormat.format = ChannelFmt(bytesPerElement);
+            copyRegion.srcBuffer.swizzledFormat.swizzle = channels;
             copyRegion.srcBuffer.offset = calSrcOrigin[0] + offset();
             copyRegion.srcBuffer.rowPitch = calSrcOrigin[1];
             copyRegion.srcBuffer.depthPitch = calSrcOrigin[2];
             copyRegion.extent.width = calSize[0] / bytesPerElement;
             copyRegion.extent.height = calSize[1];
             copyRegion.extent.depth = calSize[2];
-            copyRegion.dstBuffer.format.chFmt = ChannelFmt(bytesPerElement);
-            copyRegion.dstBuffer.format.numFmt = Pal::NumFmt::Uint;
+            copyRegion.dstBuffer.swizzledFormat.format = ChannelFmt(bytesPerElement);
+            copyRegion.dstBuffer.swizzledFormat.swizzle = channels;
             copyRegion.dstBuffer.offset = calDstOrigin[0] + dstResource.offset();
             copyRegion.dstBuffer.rowPitch = calDstOrigin[1];
             copyRegion.dstBuffer.depthPitch = calDstOrigin[2];
@@ -1267,7 +1266,7 @@ Resource::partialMemCopyTo(
         dstResource.setBusy(gpu, event);
 
         // Update the global GPU event
-        gpu.setGpuEvent(event, (flush | flushDMA));
+        gpu.setGpuEvent(event, flushDMA);
     }
 
     // Restore the original engine
diff --git a/projects/clr/rocclr/runtime/device/pal/palresource.hpp b/projects/clr/rocclr/runtime/device/pal/palresource.hpp
index bb953b5a0d..5d89ca9850 100644
--- a/projects/clr/rocclr/runtime/device/pal/palresource.hpp
+++ b/projects/clr/rocclr/runtime/device/pal/palresource.hpp
@@ -361,7 +361,7 @@ public:
     uint64_t    hwSrd() const { return hwSrd_; }
 
     uint numComponents() const {
-        return Pal::Formats::NumComponents(image_->GetImageCreateInfo().format.chFmt); }
+        return Pal::Formats::NumComponents(image_->GetImageCreateInfo().swizzledFormat.format); }
 
 protected:
     uint    elementSize_;   //!< Size of a single element in bytes
diff --git a/projects/clr/rocclr/runtime/device/pal/palvirtual.cpp b/projects/clr/rocclr/runtime/device/pal/palvirtual.cpp
index 3ff86e744d..c3154a3bfb 100644
--- a/projects/clr/rocclr/runtime/device/pal/palvirtual.cpp
+++ b/projects/clr/rocclr/runtime/device/pal/palvirtual.cpp
@@ -170,7 +170,7 @@ VirtualGPU::Queue::submit(bool forceFlush)
 bool
 VirtualGPU::Queue::flush()
 {
-    std::vector<Pal::IGpuMemory*>   memRef;
+    std::vector<Pal::GpuMemoryRef>   memRefs;
     // Stop commands building
     if (Pal::Result::Success != iCmdBuffs_[cmdBufIdSlot_]->End()) {
         LogError("PAL failed to finalize a command buffer!");
@@ -180,12 +180,14 @@ VirtualGPU::Queue::flush()
     for (auto it = memReferences_.begin(); it != memReferences_.end(); ++it) {
         if (it->second & FirstMemoryReference) {
             it->second &= ~FirstMemoryReference;
-            memRef.push_back(it->first);
+            Pal::GpuMemoryRef   memRef = {};
+            memRef.pGpuMemory = it->first;
+            memRefs.push_back(memRef);
         }
     }
 
-    if (memRef.size() != 0) {
-        iDev_->AddGpuMemoryReferences(memRef.size(), &memRef[0], iQueue_,
+    if (memRefs.size() != 0) {
+        iDev_->AddGpuMemoryReferences(memRefs.size(), &memRefs[0], iQueue_,
              Pal::GpuMemoryRefCantTrim);
     }
 
@@ -254,19 +256,20 @@ VirtualGPU::Queue::flush()
         return false;
     }
 
-    memRef.clear();
+    memRefs.clear();
+    std::vector<Pal::IGpuMemory*>   iMems;
     // Remove old memory references
     for (auto it = memReferences_.begin(); it != memReferences_.end();) {
         if (it->second == cmdBufIdSlot_) {
-            memRef.push_back(it->first);
+            iMems.push_back(it->first);
             it = memReferences_.erase(it);
         }
         else {
             ++it;
         }
     }
-    if (memRef.size() != 0) {
-        iDev_->RemoveGpuMemoryReferences(memRef.size(), &memRef[0], iQueue_);
+    if (iMems.size() != 0) {
+        iDev_->RemoveGpuMemoryReferences(iMems.size(), &iMems[0], iQueue_);
     }
 
     return true;
diff --git a/projects/clr/rocclr/runtime/device/pal/palvirtual.hpp b/projects/clr/rocclr/runtime/device/pal/palvirtual.hpp
index be8539746a..c35bcb6318 100644
--- a/projects/clr/rocclr/runtime/device/pal/palvirtual.hpp
+++ b/projects/clr/rocclr/runtime/device/pal/palvirtual.hpp
@@ -69,7 +69,9 @@ public:
 
         void addMemRef(Pal::IGpuMemory* iMem) const
         {
-            iDev_->AddGpuMemoryReferences(1, &iMem, NULL,
+            Pal::GpuMemoryRef memRef = {};
+            memRef.pGpuMemory = iMem;
+            iDev_->AddGpuMemoryReferences(1, &memRef, NULL,
                 Pal::GpuMemoryRefCantTrim);
         }
         void removeMemRef(Pal::IGpuMemory* iMem) const