P4 to Git Change 1776881 by jatang@jatang_win_pal_lc on 2019/05/01 11:04:10
SWDEV-174198 - Back out changelist 1776874. Need to wait for //depot/main/drivers/inc/asic_reg/ai_id.h promotion. Affected files ... ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/linker.cpp#161 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/libUtils.cpp#39 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings.h#58 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_hsail.h#54 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_hsail64.h#49 edit ... //depot/stg/opencl/drivers/opencl/compiler/tools/driver/driver.cpp#71 edit
This commit is contained in:
@@ -590,7 +590,6 @@ amdcl::OCLLinker::link(llvm::Module* input, std::vector<std::unique_ptr<llvm::Mo
|
||||
|| chip == "gfx905"
|
||||
|| chip == "gfx906"
|
||||
|| chip == "gfx907"
|
||||
|| chip == "gfx908"
|
||||
|| chip == "gfx1000"
|
||||
|| chip == "gfx1010"
|
||||
|| chip == "gfx1011"
|
||||
|
||||
@@ -30,7 +30,6 @@ static const std::string sgfx904 = "AMD:AMDGPU:9:0:4";
|
||||
static const std::string sgfx905 = "AMD:AMDGPU:9:0:5";
|
||||
static const std::string sgfx906 = "AMD:AMDGPU:9:0:6";
|
||||
static const std::string sgfx907 = "AMD:AMDGPU:9:0:7";
|
||||
static const std::string sgfx908 = "AMD:AMDGPU:9:0:8";
|
||||
static const std::string sgfx1000 = "AMD:AMDGPU:10:0:0";
|
||||
static const std::string sgfx1010 = "AMD:AMDGPU:10:1:0";
|
||||
static const std::string sgfx1011 = "AMD:AMDGPU:10:1:1";
|
||||
@@ -548,7 +547,6 @@ const std::string &getIsaTypeName(const aclTargetInfo *target)
|
||||
case 905: return sgfx905;
|
||||
case 906: return sgfx906;
|
||||
case 907: return sgfx907;
|
||||
case 908: return sgfx908;
|
||||
case 1000: return sgfx1000;
|
||||
case 1010: return sgfx1010;
|
||||
case 1011: return sgfx1011;
|
||||
@@ -618,7 +616,6 @@ int getIsaType(const aclTargetInfo *target)
|
||||
case AI_GREENLAND_P_A1: return Mapping.xnack_supported ? 901 : 900;
|
||||
case AI_VEGA12_P_A0: return Mapping.xnack_supported ? 905 : 904;
|
||||
case AI_VEGA20_P_A0: return Mapping.xnack_supported ? 907 : 906;
|
||||
case AI_MI100_P_A0: return 908;
|
||||
}
|
||||
case FAMILY_RV:
|
||||
switch (Mapping.chip_enum) {
|
||||
|
||||
@@ -217,7 +217,6 @@ static const char* calTargetMapping[] = {
|
||||
IF(IS_BRAHMA,"","gfx905"),
|
||||
IF(IS_BRAHMA,"","gfx906"),
|
||||
IF(IS_BRAHMA,"","gfx907"),
|
||||
IF(IS_BRAHMA,"","gfx908"),
|
||||
IF(IS_BRAHMA,"","gfx1000"),
|
||||
IF(IS_BRAHMA,"","gfx1010"),
|
||||
IF(IS_BRAHMA,"","gfx1011"),
|
||||
|
||||
@@ -51,7 +51,6 @@ static const TargetMapping HSAILTargetMapping_0_8[] = {
|
||||
{ "AI", "gfx905", "GFX9", amd::GPU_Library_HSAIL, AI_VEGA12_P_A0, F_AI_BASE, true, true, FAMILY_AI, true },
|
||||
{ "AI", "gfx906", "GFX9", amd::GPU_Library_HSAIL, AI_VEGA20_P_A0, F_AI_BASE, true, true, FAMILY_AI, false },
|
||||
{ "AI", "gfx907", "GFX9", amd::GPU_Library_HSAIL, AI_VEGA20_P_A0, F_AI_BASE, true, true, FAMILY_AI, true },
|
||||
{ "AI", "gfx908", "GFX9", amd::GPU_Library_HSAIL, AI_MI100_P_A0, F_AI_BASE, true, true, FAMILY_AI, true },
|
||||
{ "NV", "gfx1000", "GFX10", amd::GPU_Library_HSAIL, NV_NAVI10_LITE_P_A0, F_AI_BASE, true, true, FAMILY_NV, false },
|
||||
{ "NV", "gfx1010", "GFX10", amd::GPU_Library_HSAIL, NV_NAVI10_P_A0, F_AI_BASE, true, true, FAMILY_NV, false },
|
||||
{ "NV", "gfx1011", "GFX10", amd::GPU_Library_HSAIL, NV_NAVI12_P_A0, F_AI_BASE, true, true, FAMILY_NV, false },
|
||||
|
||||
@@ -50,7 +50,6 @@ static const TargetMapping HSAIL64TargetMapping_0_8[] = {
|
||||
{ "AI", "gfx905", "GFX9", amd::GPU_Library_HSAIL, AI_VEGA12_P_A0, F_AI_BASE, true, true, FAMILY_AI, true },
|
||||
{ "AI", "gfx906", "GFX9", amd::GPU_Library_HSAIL, AI_VEGA20_P_A0, F_AI_BASE, true, true, FAMILY_AI, false },
|
||||
{ "AI", "gfx907", "GFX9", amd::GPU_Library_HSAIL, AI_VEGA20_P_A0, F_AI_BASE, true, true, FAMILY_AI, true },
|
||||
{ "AI", "gfx908", "GFX9", amd::GPU_Library_HSAIL, AI_MI100_P_A0, F_AI_BASE, true, true, FAMILY_AI, true },
|
||||
{ "NV", "gfx1000", "GFX10", amd::GPU_Library_HSAIL, NV_NAVI10_LITE_P_A0, F_AI_BASE, true, true, FAMILY_NV, false },
|
||||
{ "NV", "gfx1010", "GFX10", amd::GPU_Library_HSAIL, NV_NAVI10_P_A0, F_AI_BASE, true, true, FAMILY_NV, false },
|
||||
{ "NV", "gfx1011", "GFX10", amd::GPU_Library_HSAIL, NV_NAVI12_P_A0, F_AI_BASE, true, true, FAMILY_NV, false },
|
||||
|
||||
Reference in New Issue
Block a user