diff --git a/projects/clr/rocclr/compiler/lib/utils/v0_8/libUtils.cpp b/projects/clr/rocclr/compiler/lib/utils/v0_8/libUtils.cpp
index d6427e5e29..2418ed843e 100644
--- a/projects/clr/rocclr/compiler/lib/utils/v0_8/libUtils.cpp
+++ b/projects/clr/rocclr/compiler/lib/utils/v0_8/libUtils.cpp
@@ -18,7 +18,10 @@ static const std::string sgfx700 = "AMD:AMDGPU:7:0:0";
 static const std::string sgfx701 = "AMD:AMDGPU:7:0:1";
 static const std::string sgfx800 = "AMD:AMDGPU:8:0:0";
 static const std::string sgfx801 = "AMD:AMDGPU:8:0:1";
+static const std::string sgfx804 = "AMD:AMDGPU:8:0:4";
+static const std::string sgfx810 = "AMD:AMDGPU:8:1:0";
 static const std::string sgfx900 = "AMD:AMDGPU:9:0:0";
+static const std::string sgfx901 = "AMD:AMDGPU:9:0:1";
 
 // Utility function to set a flag in option structure
 // of the aclDevCaps.
@@ -537,12 +540,13 @@ const std::string &getIsaTypeName(const aclTargetInfo *target)
         case VI_TONGA_P_A0: return sgfx800;
         case VI_ELLESMERE_P_A0:
         case VI_BAFFIN_M_A0:
-        case VI_FIJI_P_A0: return sgfx801;
+        case VI_FIJI_P_A0: return sgfx804;
       }
     case FAMILY_CZ:
       switch (Mapping.chip_enum) {
         default: return sgfx801;
         case CARRIZO_A0: return sgfx801;
+        case STONEY_A0:  return sgfx810;
       }
     case FAMILY_AI:
       switch (Mapping.chip_enum) {
diff --git a/projects/clr/rocclr/runtime/device/gpu/gpudefs.hpp b/projects/clr/rocclr/runtime/device/gpu/gpudefs.hpp
index 17dd6dda84..99488076f8 100644
--- a/projects/clr/rocclr/runtime/device/gpu/gpudefs.hpp
+++ b/projects/clr/rocclr/runtime/device/gpu/gpudefs.hpp
@@ -129,12 +129,26 @@ static const AMDDeviceInfo DeviceInfo[] = {
 /* CAL_TARGET_STONEY */     { ED_ATI_CAL_MACHINE_STONEY_ISA,    "Stoney",       "stoney",       4, 16, 1, 256, 64 * Ki, 32, 800 },
 };
 
+enum gfx_handle {
+    gfx700 = 700,
+    gfx701 = 701,
+    gfx702 = 702,
+    gfx800 = 800,
+    gfx801 = 801,
+    gfx804 = 804,
+    gfx810 = 810,
+    gfx900 = 900,
+    gfx901 = 901
+};
+
 static const char* Gfx700 = "AMD:AMDGPU:7:0:0";
 static const char* Gfx701 = "AMD:AMDGPU:7:0:1";
 static const char* Gfx800 = "AMD:AMDGPU:8:0:0";
 static const char* Gfx801 = "AMD:AMDGPU:8:0:1";
+static const char* Gfx804 = "AMD:AMDGPU:8:0:4";
 static const char* Gfx810 = "AMD:AMDGPU:8:1:0";
 static const char* Gfx900 = "AMD:AMDGPU:9:0:0";
+static const char* Gfx901 = "AMD:AMDGPU:9:0:1";
 
 // Supported OpenCL versions
 enum OclVersion {
diff --git a/projects/clr/rocclr/runtime/device/gpu/gpuprogram.cpp b/projects/clr/rocclr/runtime/device/gpu/gpuprogram.cpp
index 15a0a452ae..37fc985f45 100644
--- a/projects/clr/rocclr/runtime/device/gpu/gpuprogram.cpp
+++ b/projects/clr/rocclr/runtime/device/gpu/gpuprogram.cpp
@@ -2351,8 +2351,10 @@ hsa_isa_t ORCAHSALoaderContext::IsaFromName(const char *name) {
     if (!strcmp(Gfx701, name)) { isa.handle = gfx701; return isa; }
     if (!strcmp(Gfx800, name)) { isa.handle = gfx800; return isa; }
     if (!strcmp(Gfx801, name)) { isa.handle = gfx801; return isa; }
+    if (!strcmp(Gfx804, name)) { isa.handle = gfx804; return isa; }
     if (!strcmp(Gfx810, name)) { isa.handle = gfx810; return isa; }
     if (!strcmp(Gfx900, name)) { isa.handle = gfx900; return isa; }
+    if (!strcmp(Gfx901, name)) { isa.handle = gfx901; return isa; }
     return isa;
 }
 
@@ -2367,15 +2369,32 @@ bool ORCAHSALoaderContext::IsaSupportedByAgent(hsa_agent_t agent, hsa_isa_t isa)
         // gfx701 only differs from gfx700 by faster fp operations and can be loaded on either device.
         return isa.handle == gfx700 || isa.handle == gfx701;
     case gfx800:
-        if (ED_ATI_CAL_MACHINE_ICELAND_ISA == program_->dev().hwInfo()->machine_ ||
-            ED_ATI_CAL_MACHINE_TONGA_ISA == program_->dev().hwInfo()->machine_ ) {
+        switch (program_->dev().hwInfo()->machine_) {
+        case ED_ATI_CAL_MACHINE_ICELAND_ISA:
+        case ED_ATI_CAL_MACHINE_TONGA_ISA:
             return isa.handle == gfx800;
-        } else {
-            // gfx800 has only sgrps limited and can be loaded on later chips.
-            return isa.handle == gfx800 || isa.handle == gfx801;
+        case ED_ATI_CAL_MACHINE_CARRIZO_ISA:
+            return isa.handle == gfx801;
+        case ED_ATI_CAL_MACHINE_FIJI_ISA:
+        case ED_ATI_CAL_MACHINE_ELLESMERE_ISA:
+        case ED_ATI_CAL_MACHINE_BAFFIN_ISA:
+            // gfx800 ISA has only sgrps limited and can be loaded.
+            // gfx801 ISA has XNACK limitations and can be loaded.
+            return isa.handle == gfx800 || isa.handle == gfx801 || isa.handle == gfx804;
+        case ED_ATI_CAL_MACHINE_STONEY_ISA:
+            return isa.handle == gfx810;
+        default:
+            assert(0);
+            return false;
         }
     case gfx900:
-        return isa.handle == gfx900;
+        switch (program_->dev().hwInfo()->machine_) {
+        case ED_ATI_CAL_MACHINE_GREENLAND_ISA:
+            return isa.handle == gfx900 || isa.handle == gfx901;
+        default:
+            assert(0);
+            return false;
+        }
     }
 }
 
diff --git a/projects/clr/rocclr/runtime/device/gpu/gpuprogram.hpp b/projects/clr/rocclr/runtime/device/gpu/gpuprogram.hpp
index 8a244149d1..d57b7d2313 100644
--- a/projects/clr/rocclr/runtime/device/gpu/gpuprogram.hpp
+++ b/projects/clr/rocclr/runtime/device/gpu/gpuprogram.hpp
@@ -483,16 +483,6 @@ private:
 
     ORCAHSALoaderContext& operator=(const ORCAHSALoaderContext &c);
 
-    enum gfx_handle {
-        gfx700 = 700,
-        gfx701 = 701,
-        gfx702 = 702,
-        gfx800 = 800,
-        gfx801 = 801,
-        gfx810 = 810,
-        gfx900 = 900
-    };
-
     gpu::HSAILProgram* program_;
 };