P4 to Git Change 1184082 by todli@todli-win-opencl-kv1 on 2015/08/24 20:53:26

EPR #399601 - OpenCL Stoney BU changes: expose on Mainline

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings.h#34 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_amdil.h#29 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_amdil64.h#26 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_hsail.h#25 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_hsail64.h#20 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudefs.hpp#127 edit


[ROCm/clr commit: 5df531e9c8]

projects/clr/rocclr/compiler/lib/utils/v0_8/target_mappings.h

@@ -193,7 +193,7 @@ static const char* calTargetMapping[] = {
       "Hainan", "Hawaii",
       "Iceland", "Tonga", "Mullins", "Fiji",
       "Carrizo", "", "",
-      "",  "",
+      "",  "Dummy",
     };
 
 #include "utils/v0_8/target_mappings_amdil.h"

projects/clr/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil.h

@@ -90,7 +90,7 @@ static const TargetMapping AMDILTargetMapping_0_8[] = {
   UnknownTarget,
   UnknownTarget,
   UnknownTarget,
-  UnknownTarget,
+  { "CZ", "Dummy",      "dummy",   amd::GPU_Library_CI,        STONEY_A0,               F_SI_BASE, true, true, FAMILY_CZ },
   { "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 },

projects/clr/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil64.h

@@ -41,7 +41,7 @@ static const TargetMapping AMDIL64TargetMapping_0_8[] = {
   UnknownTarget,
   UnknownTarget,
   UnknownTarget,
-  UnknownTarget,
+  { "CZ", "Dummy",     "dummy",     amd::GPU64_Library_CI, STONEY_A0,          F_SI_64BIT_PTR, true,  true,  FAMILY_CZ },
   { "CZ", "Carrizo",   "carrizo",   amd::GPU64_Library_CI, CARRIZO_A0,         F_SI_64BIT_PTR, true,  true,  FAMILY_CZ },
   { "VI", "Iceland",    "iceland",  amd::GPU64_Library_CI, VI_ICELAND_M_A0,    F_SI_64BIT_PTR, true,  true,  FAMILY_VI },
   { "VI", "Tonga",      "tonga",    amd::GPU64_Library_CI, VI_TONGA_P_A0,      F_SI_64BIT_PTR, true,  true,  FAMILY_VI },

projects/clr/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail.h

@@ -28,7 +28,7 @@ static const TargetMapping HSAILTargetMapping_0_8[] = {
   UnknownTarget,
   UnknownTarget,
   UnknownTarget,
-  UnknownTarget,
+  { "CZ", "Dummy",   "generic", amd::GPU_Library_HSAIL, STONEY_A0, 0,       true, true,  FAMILY_CZ },
   { "CZ", "Carrizo", "generic", amd::GPU_Library_HSAIL, CARRIZO_A0,      0, true, true,  FAMILY_CZ },
   { "VI", "Fiji",    "generic", amd::GPU_Library_HSAIL, VI_FIJI_P_A0,    0, true, true,  FAMILY_VI },
   InvalidTarget

projects/clr/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail64.h

@@ -27,7 +27,7 @@ static const TargetMapping HSAIL64TargetMapping_0_8[] = {
   UnknownTarget,
   UnknownTarget,
   UnknownTarget,
-  UnknownTarget,
+  { "CZ", "Dummy",   "generic", amd::GPU_Library_HSAIL, STONEY_A0, 0,       true, true, FAMILY_CZ },
   { "CZ", "Carrizo", "generic", amd::GPU_Library_HSAIL, CARRIZO_A0,      0, true, true,  FAMILY_CZ },
   { "VI", "Fiji",    "generic", amd::GPU_Library_HSAIL, VI_FIJI_P_A0,    0, true, true,  FAMILY_VI },
   InvalidTarget

projects/clr/rocclr/runtime/device/gpu/gpudefs.hpp

@@ -127,7 +127,7 @@ static const AMDDeviceInfo DeviceInfo[] = {
 /* CAL_TARGET_ELLESMERE */  { ED_ATI_CAL_MACHINE_ELLESMERE_ISA, "",  "",    4, 16, 1, 256, 64 * Ki, 32, 800 },
 /* CAL_TARGET_BAFFIN */     { ED_ATI_CAL_MACHINE_BAFFIN_ISA,    "",     "",    4, 16, 1, 256, 64 * Ki, 32, 800 },
 /* CAL_TARGET_GREENLAND */  { ED_ATI_CAL_MACHINE_GREENLAND_ISA, "",  "",   4, 16, 1, 256, 64 * Ki, 32, 900 },
-/* CAL_TARGET_STONEY */     { ED_ATI_CAL_MACHINE_STONEY_ISA,    "",     "",    4, 16, 1, 256, 64 * Ki, 32, 800 },
+/* CAL_TARGET_STONEY */     { ED_ATI_CAL_MACHINE_STONEY_ISA,    "Dummy",                   "dummy",     4, 16, 1, 256, 64 * Ki, 32, 800 },
 };
 
 static const char* Gfx700 = "AMD:AMDGPU:7:0:0";