diff --git a/projects/clr/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil.h b/projects/clr/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil.h
index 6979623a0d..bcfd493661 100644
--- a/projects/clr/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil.h
+++ b/projects/clr/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil.h
@@ -30,29 +30,29 @@ static const TargetMapping AMDILTargetMapping_0_8[] = {
   { "R7XX", "RV710", "rv710", amd::GPU_Library_7xx, LUIGI_APU_A11, F_RV710, false, false, FAMILY_RV7XX },
   { "R7XX", "RV740", "rv770", amd::GPU_Library_7xx, WALDEN_A11,    F_RV770, false, false, FAMILY_RV7XX },
   { "R7XX", "RV740", "rv770", amd::GPU_Library_7xx, WALDEN_A12,    F_RV770, false, true , FAMILY_RV7XX },
-  { "Evergreen", "Cypress", "cypress", amd::GPU_Library_Evergreen, CYPRESS_A11, F_EG_EXT, true , false, FAMILY_EVERGREEN },
-  { "Evergreen", "Cypress", "cypress", amd::GPU_Library_Evergreen, CYPRESS_A12, F_EG_EXT, true , true , FAMILY_EVERGREEN },
-  { "Evergreen", "Juniper", "juniper", amd::GPU_Library_Evergreen, JUNIPER_A11, F_JUNIPER, true , false, FAMILY_EVERGREEN },
-  { "Evergreen", "Juniper", "juniper", amd::GPU_Library_Evergreen, JUNIPER_A12, F_JUNIPER, true , true , FAMILY_EVERGREEN },
-  { "Evergreen", "Redwood", "redwood", amd::GPU_Library_Evergreen, REDWOOD_A11, F_REDWOOD, true , false, FAMILY_EVERGREEN },
-  { "Evergreen", "Redwood", "redwood", amd::GPU_Library_Evergreen, REDWOOD_A12, F_REDWOOD, true , true , FAMILY_EVERGREEN },
-  { "Evergreen", "Cedar",   "cedar",   amd::GPU_Library_Evergreen, CEDAR_A11,   F_CEDAR, true , false, FAMILY_EVERGREEN },
-  { "Evergreen", "Cedar",   "cedar",   amd::GPU_Library_Evergreen, CEDAR_A12,   F_CEDAR, true , true , FAMILY_EVERGREEN },
-  { "NI", "Cayman", "cayman", amd::GPU_Library_Evergreen, NI_CAYMAN_P_A11,       F_NI_EXT,  true , true , FAMILY_NI },
-  { "NI", "Barts",  "barts",  amd::GPU_Library_Evergreen, NI_BARTS_PM_A11,       F_NI_BASE, true , true , FAMILY_NI },
-  { "NI", "Turks",  "turks",  amd::GPU_Library_Evergreen, NI_TURKS_M_A11,        F_NI_BASE, true , true , FAMILY_NI },
-  { "NI", "Lombok", "turks",  amd::GPU_Library_Evergreen, NI_TURKS_LOMBOK_M_A11, F_NI_BASE, true , true , FAMILY_NI },
-  { "NI", "Caicos", "caicos", amd::GPU_Library_Evergreen, NI_CAICOS_V_A11,       F_NI_BASE, true , true , FAMILY_NI },
+  { "Evergreen", "Cypress", "cypress", amd::GPU_Library_Evergreen, CYPRESS_A11, F_EG_EXT, false , false, FAMILY_EVERGREEN },
+  { "Evergreen", "Cypress", "cypress", amd::GPU_Library_Evergreen, CYPRESS_A12, F_EG_EXT, false , true , FAMILY_EVERGREEN },
+  { "Evergreen", "Juniper", "juniper", amd::GPU_Library_Evergreen, JUNIPER_A11, F_JUNIPER, false , false, FAMILY_EVERGREEN },
+  { "Evergreen", "Juniper", "juniper", amd::GPU_Library_Evergreen, JUNIPER_A12, F_JUNIPER, false , true , FAMILY_EVERGREEN },
+  { "Evergreen", "Redwood", "redwood", amd::GPU_Library_Evergreen, REDWOOD_A11, F_REDWOOD, false , false, FAMILY_EVERGREEN },
+  { "Evergreen", "Redwood", "redwood", amd::GPU_Library_Evergreen, REDWOOD_A12, F_REDWOOD, false , true , FAMILY_EVERGREEN },
+  { "Evergreen", "Cedar",   "cedar",   amd::GPU_Library_Evergreen, CEDAR_A11,   F_CEDAR, false , false, FAMILY_EVERGREEN },
+  { "Evergreen", "Cedar",   "cedar",   amd::GPU_Library_Evergreen, CEDAR_A12,   F_CEDAR, false , true , FAMILY_EVERGREEN },
+  { "NI", "Cayman", "cayman", amd::GPU_Library_Evergreen, NI_CAYMAN_P_A11,       F_NI_EXT,  false , true , FAMILY_NI },
+  { "NI", "Barts",  "barts",  amd::GPU_Library_Evergreen, NI_BARTS_PM_A11,       F_NI_BASE, false , true , FAMILY_NI },
+  { "NI", "Turks",  "turks",  amd::GPU_Library_Evergreen, NI_TURKS_M_A11,        F_NI_BASE, false , true , FAMILY_NI },
+  { "NI", "Lombok", "turks",  amd::GPU_Library_Evergreen, NI_TURKS_LOMBOK_M_A11, F_NI_BASE, false , true , FAMILY_NI },
+  { "NI", "Caicos", "caicos", amd::GPU_Library_Evergreen, NI_CAICOS_V_A11,       F_NI_BASE, false , true , FAMILY_NI },
   { "NI", "Kauai",  "kauai",  amd::GPU_Library_Evergreen, KAUAI_A11,             F_NI_BASE, false, false, FAMILY_NI },
-  { "Sumo", "BeaverCreek", "redwood", amd::GPU_Library_Evergreen, SUPERSUMO_A0, F_REDWOOD, true , false, FAMILY_SUMO },
-  { "Sumo", "BeaverCreek", "redwood", amd::GPU_Library_Evergreen, SUPERSUMO_B0, F_REDWOOD, true , true , FAMILY_SUMO },
-  { "Sumo", "WinterPark",  "redwood", amd::GPU_Library_Evergreen,      SUMO_A0, F_REDWOOD, true , false, FAMILY_SUMO },
-  { "Sumo", "WinterPark",  "redwood", amd::GPU_Library_Evergreen,      SUMO_B0, F_REDWOOD, true , true , FAMILY_SUMO },
-  { "Sumo", "Loveland",    "cedar",   amd::GPU_Library_Evergreen,  WRESTLER_A0, F_REDWOOD, true , false, FAMILY_SUMO },
-  { "Sumo", "Loveland",    "cedar",   amd::GPU_Library_Evergreen,  WRESTLER_A1, F_REDWOOD, true , false, FAMILY_SUMO },
-  { "Sumo", "Loveland",    "cedar",   amd::GPU_Library_Evergreen,  WRESTLER_B0, F_REDWOOD, true , false, FAMILY_SUMO },
-  { "Sumo", "Loveland",    "cedar",   amd::GPU_Library_Evergreen,  WRESTLER_C0, F_REDWOOD, true , true , FAMILY_SUMO },
-  { "Sumo", "Bheem",       "cedar",   amd::GPU_Library_Evergreen,     BHEEM_A0, F_REDWOOD, true , true , FAMILY_SUMO }, 
+  { "Sumo", "BeaverCreek", "redwood", amd::GPU_Library_Evergreen, SUPERSUMO_A0, F_REDWOOD, false , false, FAMILY_SUMO },
+  { "Sumo", "BeaverCreek", "redwood", amd::GPU_Library_Evergreen, SUPERSUMO_B0, F_REDWOOD, false , true , FAMILY_SUMO },
+  { "Sumo", "WinterPark",  "redwood", amd::GPU_Library_Evergreen,      SUMO_A0, F_REDWOOD, false , false, FAMILY_SUMO },
+  { "Sumo", "WinterPark",  "redwood", amd::GPU_Library_Evergreen,      SUMO_B0, F_REDWOOD, false , true , FAMILY_SUMO },
+  { "Sumo", "Loveland",    "cedar",   amd::GPU_Library_Evergreen,  WRESTLER_A0, F_REDWOOD, false , false, FAMILY_SUMO },
+  { "Sumo", "Loveland",    "cedar",   amd::GPU_Library_Evergreen,  WRESTLER_A1, F_REDWOOD, false , false, FAMILY_SUMO },
+  { "Sumo", "Loveland",    "cedar",   amd::GPU_Library_Evergreen,  WRESTLER_B0, F_REDWOOD, false , false, FAMILY_SUMO },
+  { "Sumo", "Loveland",    "cedar",   amd::GPU_Library_Evergreen,  WRESTLER_C0, F_REDWOOD, false , true , FAMILY_SUMO },
+  { "Sumo", "Bheem",       "cedar",   amd::GPU_Library_Evergreen,     BHEEM_A0, F_REDWOOD, false , true , FAMILY_SUMO }, 
   { "SI", "Tahiti",    "tahiti",   amd::GPU_Library_SI, SI_TAHITI_P_A11,    F_SI_BASE, true ,false, FAMILY_SI },
   { "SI", "Tahiti",    "tahiti",   amd::GPU_Library_SI, SI_TAHITI_P_A0,     F_SI_BASE, true ,false, FAMILY_SI },
   { "SI", "Tahiti",    "tahiti",   amd::GPU_Library_SI, SI_TAHITI_P_A21,    F_SI_BASE, true ,false, FAMILY_SI },
@@ -67,15 +67,15 @@ static const TargetMapping AMDILTargetMapping_0_8[] = {
   { "SI", "Capeverde", "capeverde",   amd::GPU_Library_SI, SI_CAPEVERDE_M_A0,  F_SI_BASE, true ,false, FAMILY_SI },
   { "SI", "Capeverde", "capeverde",   amd::GPU_Library_SI, SI_CAPEVERDE_M_A12, F_SI_BASE, true ,false, FAMILY_SI },
   { "SI", "Capeverde", "capeverde",   amd::GPU_Library_SI, SI_CAPEVERDE_M_A1,  F_SI_BASE, true , true, FAMILY_SI },
-  { "TN", "Devastator", "trinity", amd::GPU_Library_Evergreen, TN_DEVASTATOR_M_A0,       F_NI_EXT, true, false, FAMILY_TN },
-  { "TN", "Devastator", "trinity", amd::GPU_Library_Evergreen, TN_DEVASTATOR_M_A1,       F_NI_EXT, true, true,  FAMILY_TN },
-  { "TN", "Devastator", "trinity", amd::GPU_Library_Evergreen, TN_DEVASTATOR_LITE_MV_A0, F_NI_EXT, true, false, FAMILY_TN },
-  { "TN", "Devastator", "trinity", amd::GPU_Library_Evergreen, TN_DEVASTATOR_LITE_MV_A1, F_NI_EXT, true, false, FAMILY_TN },
-  { "TN", "Devastator", "trinity", amd::GPU_Library_Evergreen, TN_DEVASTATOR_V_A0,       F_NI_EXT, true, false, FAMILY_TN },
-  { "TN", "Devastator", "trinity", amd::GPU_Library_Evergreen, TN_DEVASTATOR_V_A1,       F_NI_EXT, true, false, FAMILY_TN },
-  { "TN", "Scrapper",   "trinity", amd::GPU_Library_Evergreen, TN_SCRAPPER_V_A0,         F_NI_EXT, true, false, FAMILY_TN },
-  { "TN", "Scrapper",   "trinity", amd::GPU_Library_Evergreen, TN_SCRAPPER_V_A1,         F_NI_EXT, true, true,  FAMILY_TN },
-  { "TN", "Scrapper",   "trinity", amd::GPU_Library_Evergreen, TN_DVST_DUO_V_A0,         F_NI_EXT, true, false, FAMILY_TN },
+  { "TN", "Devastator", "trinity", amd::GPU_Library_Evergreen, TN_DEVASTATOR_M_A0,       F_NI_EXT, false, false, FAMILY_TN },
+  { "TN", "Devastator", "trinity", amd::GPU_Library_Evergreen, TN_DEVASTATOR_M_A1,       F_NI_EXT, false, true,  FAMILY_TN },
+  { "TN", "Devastator", "trinity", amd::GPU_Library_Evergreen, TN_DEVASTATOR_LITE_MV_A0, F_NI_EXT, false, false, FAMILY_TN },
+  { "TN", "Devastator", "trinity", amd::GPU_Library_Evergreen, TN_DEVASTATOR_LITE_MV_A1, F_NI_EXT, false, false, FAMILY_TN },
+  { "TN", "Devastator", "trinity", amd::GPU_Library_Evergreen, TN_DEVASTATOR_V_A0,       F_NI_EXT, false, false, FAMILY_TN },
+  { "TN", "Devastator", "trinity", amd::GPU_Library_Evergreen, TN_DEVASTATOR_V_A1,       F_NI_EXT, false, false, FAMILY_TN },
+  { "TN", "Scrapper",   "trinity", amd::GPU_Library_Evergreen, TN_SCRAPPER_V_A0,         F_NI_EXT, false, false, FAMILY_TN },
+  { "TN", "Scrapper",   "trinity", amd::GPU_Library_Evergreen, TN_SCRAPPER_V_A1,         F_NI_EXT, false, true,  FAMILY_TN },
+  { "TN", "Scrapper",   "trinity", amd::GPU_Library_Evergreen, TN_DVST_DUO_V_A0,         F_NI_EXT, false, false, FAMILY_TN },
   { "KV", "Spectre",    "spectre", amd::GPU_Library_CI,        KV_SPECTRE_A0,           F_SI_BASE, true, true, FAMILY_KV },
   { "KV", "Spooky",     "spooky",  amd::GPU_Library_CI,        KV_SPOOKY_A0,            F_SI_BASE, true, true, FAMILY_KV },
   { "KV", "Kalindi",    "kalindi", amd::GPU_Library_CI,        KB_KALINDI_A0,           F_SI_BASE, true, true, FAMILY_KV },
@@ -91,10 +91,10 @@ static const TargetMapping AMDILTargetMapping_0_8[] = {
   { "VI", "Goose",     "goose",   amd::GPU_Library_CI,        VI_BAFFIN_M_A0,          F_SI_BASE, true,  true, FAMILY_VI },
   UnknownTarget,
   { "CZ", "Carrizo",    "carrizo", amd::GPU_Library_CI,        CARRIZO_A0,              F_SI_BASE, true,  true, FAMILY_CZ },
-  { "TN", "Devastator", "trinity", amd::GPU_Library_Evergreen, TN_DEVASTATOR_W_A0,       F_NI_EXT, true, false, FAMILY_TN },
-  { "TN", "Devastator", "trinity", amd::GPU_Library_Evergreen, TN_DEVASTATOR_W_A1,       F_NI_EXT, true, false, FAMILY_TN },
-  { "TN", "Scrapper",   "trinity", amd::GPU_Library_Evergreen, TN_SCRAPPER_LV_A0,        F_NI_EXT, true, false, FAMILY_TN },
-  { "TN", "Scrapper",   "trinity", amd::GPU_Library_Evergreen, TN_SCRAPPER_LV_A1,        F_NI_EXT, true, false, FAMILY_TN },
+  { "TN", "Devastator", "trinity", amd::GPU_Library_Evergreen, TN_DEVASTATOR_W_A0,       F_NI_EXT, false, false, FAMILY_TN },
+  { "TN", "Devastator", "trinity", amd::GPU_Library_Evergreen, TN_DEVASTATOR_W_A1,       F_NI_EXT, false, false, FAMILY_TN },
+  { "TN", "Scrapper",   "trinity", amd::GPU_Library_Evergreen, TN_SCRAPPER_LV_A0,        F_NI_EXT, false, false, FAMILY_TN },
+  { "TN", "Scrapper",   "trinity", amd::GPU_Library_Evergreen, TN_SCRAPPER_LV_A1,        F_NI_EXT, false, false, FAMILY_TN },
 
   { "VI", "Iceland",    "iceland", amd::GPU_Library_CI,        VI_ICELAND_M_A0,         F_SI_BASE, true,  true, FAMILY_VI },
   { "VI", "Tonga",      "tonga",   amd::GPU_Library_CI,        VI_TONGA_P_A0,           F_SI_BASE, true,  true, FAMILY_VI },