P4 to Git Change 1206247 by todli@todli-win-opencl-kv1 on 2015/11/01 04:30:43

SWDEV-77307 - OpenCL Stoney BU change: put real name on mainline

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings.h#4 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings_amdil.h#4 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings_amdil64.h#4 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings_hsail.h#4 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings_hsail64.h#4 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings.h#36 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_amdil.h#31 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_amdil64.h#28 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_hsail.h#27 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_hsail64.h#22 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/lib/Target/AMDIL/AMDILSubtarget.cpp#6 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/lib/Target/AMDIL/Internal/InternalProcessors.td#6 edit
... //depot/stg/opencl/drivers/opencl/compiler/tools/driver/driver.cpp#57 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudefs.hpp#130 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/runtime/OCLDeviceQueries.cpp#30 edit


[ROCm/clr commit: b85a57a4ae]
Cette révision appartient à :
foreman
2015-11-01 04:35:29 -05:00
Parent d3a08b64d6
révision 1eb0846b70
6 fichiers modifiés avec 6 ajouts et 6 suppressions
+1 -1
Voir le fichier
@@ -193,7 +193,7 @@ static const char* calTargetMapping[] = {
"Hainan", "Hawaii",
"Iceland", "Tonga", "Mullins", "Fiji",
"Carrizo", "Horse", "Goose",
"", "Dummy",
"", "Stoney",
};
#include "utils/v0_8/target_mappings_amdil.h"
+1 -1
Voir le fichier
@@ -90,7 +90,6 @@ static const TargetMapping AMDILTargetMapping_0_8[] = {
{ "VI", "Horse", "horse", amd::GPU_Library_CI, VI_ELLESMERE_P_A0, F_SI_BASE, true, true, FAMILY_VI },
{ "VI", "Goose", "goose", amd::GPU_Library_CI, VI_BAFFIN_M_A0, F_SI_BASE, true, true, FAMILY_VI },
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 },
@@ -101,6 +100,7 @@ static const TargetMapping AMDILTargetMapping_0_8[] = {
{ "VI", "Tonga", "tonga", amd::GPU_Library_CI, VI_TONGA_P_A0, F_SI_BASE, true, true, FAMILY_VI },
{ "CI", "Bonaire", "bonaire", amd::GPU_Library_CI, CI_BONAIRE_M_A1, F_SI_BASE, true, true, FAMILY_CI },
{ "VI", "Fiji", "fiji", amd::GPU_Library_CI, VI_FIJI_P_A0, F_SI_BASE, true, true, FAMILY_VI },
{ "CZ", "Stoney", "stoney", amd::GPU_Library_CI, STONEY_A0, F_SI_BASE, true, true, FAMILY_CZ },
InvalidTarget
};
+1 -1
Voir le fichier
@@ -41,12 +41,12 @@ static const TargetMapping AMDIL64TargetMapping_0_8[] = {
{ "VI", "Horse", "horse", amd::GPU64_Library_CI, VI_ELLESMERE_P_A0, F_SI_64BIT_PTR, true, true, FAMILY_VI },
{ "VI", "Goose", "goose", amd::GPU64_Library_CI, VI_BAFFIN_M_A0, F_SI_64BIT_PTR, true, true, FAMILY_VI },
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 },
{ "CI", "Bonaire", "bonaire", amd::GPU64_Library_CI, CI_BONAIRE_M_A0, F_SI_64BIT_PTR, true, true, FAMILY_CI },
{ "VI", "Fiji", "fiji", amd::GPU64_Library_CI, VI_FIJI_P_A0, F_SI_64BIT_PTR, true, true, FAMILY_VI },
{ "CZ", "Stoney", "stoney", amd::GPU64_Library_CI, STONEY_A0, F_SI_64BIT_PTR, true, true, FAMILY_CZ },
InvalidTarget
};
+1 -1
Voir le fichier
@@ -28,9 +28,9 @@ static const TargetMapping HSAILTargetMapping_0_8[] = {
{ "VI", "Horse", "generic", amd::GPU_Library_HSAIL, VI_ELLESMERE_P_A0, 0, true, true, FAMILY_VI },
{ "VI", "Goose", "generic", amd::GPU_Library_HSAIL, VI_BAFFIN_M_A0, 0, true, true, FAMILY_VI },
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 },
{ "CZ", "Stoney", "generic", amd::GPU_Library_HSAIL, STONEY_A0, 0, true, true, FAMILY_CZ },
InvalidTarget
};
+1 -1
Voir le fichier
@@ -27,9 +27,9 @@ static const TargetMapping HSAIL64TargetMapping_0_8[] = {
{ "VI", "Horse", "generic", amd::GPU_Library_HSAIL, VI_ELLESMERE_P_A0, 0, true, true, FAMILY_VI },
{ "VI", "Goose", "generic", amd::GPU_Library_HSAIL, VI_BAFFIN_M_A0, 0, true, true, FAMILY_VI },
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 },
{ "CZ", "Stoney", "generic", amd::GPU_Library_HSAIL, STONEY_A0, 0, true, true, FAMILY_CZ },
InvalidTarget
};
+1 -1
Voir le fichier
@@ -126,7 +126,7 @@ static const AMDDeviceInfo DeviceInfo[] = {
/* CAL_TARGET_ELLESMERE */ { ED_ATI_CAL_MACHINE_ELLESMERE_ISA, "Horse", "horse", 4, 16, 1, 256, 64 * Ki, 32, 800 },
/* CAL_TARGET_BAFFIN */ { ED_ATI_CAL_MACHINE_BAFFIN_ISA, "Goose", "goose", 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, "Dummy", "dummy", 4, 16, 1, 256, 64 * Ki, 32, 800 },
/* CAL_TARGET_STONEY */ { ED_ATI_CAL_MACHINE_STONEY_ISA, "Stoney", "stoney", 4, 16, 1, 256, 64 * Ki, 32, 800 },
};
static const char* Gfx700 = "AMD:AMDGPU:7:0:0";