P4 to Git Change 1295087 by asalmanp@asalmanp-opencl-stg on 2016/07/25 16:08:34

SWDEV-98211 - [Lexa][OCL] Add Lexa Support

	ReviewBoardURL = http://ocltc.amd.com/reviews/r/10900/

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/devState.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/scCompileBase.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/loaders/bif/amuabi/amuABI.h#3 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/loaders/bif/amuabi/amuABIMultiBinary.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings.h#10 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings_amdil.h#10 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings_amdil64.h#9 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings_hsail.h#9 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings_hsail64.h#9 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/bif/amuabi/amuABI.h#18 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/bif/amuabi/amuABIMultiBinary.cpp#18 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings.h#43 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_amdil.h#37 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_amdil64.h#33 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_hsail.h#33 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_hsail64.h#28 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/lib/Target/AMDIL/AMDIL.h#6 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/lib/Target/AMDIL/AMDILSubtarget.cpp#9 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/lib/Target/AMDIL/Internal/AMDILInternalDeviceFlags.h#5 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/lib/Target/AMDIL/Internal/InternalProcessors.td#9 edit
... //depot/stg/opencl/drivers/opencl/compiler/tools/driver/driver.cpp#62 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudefs.hpp#137 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#549 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#228 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#347 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#170 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/caltarget.h#3 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/binary/BIFEnumCheck.cpp#25 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/math/OCLMathFunc.cpp#23 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/runtime/OCLDeviceQueries.cpp#36 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/runtime/OCLPerfCounters.cpp#28 edit


[ROCm/clr commit: 8f5943e292]
This commit is contained in:
foreman
2016-07-25 16:20:18 -04:00
parent 884cf38d01
commit 088aa4a518
11 changed files with 15 additions and 1 deletions
@@ -127,6 +127,7 @@ static const AMDDeviceInfo DeviceInfo[] = {
/* CAL_TARGET_BAFFIN */ { ED_ATI_CAL_MACHINE_BAFFIN_ISA, "Baffin", "baffin", 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, "Stoney", "stoney", 4, 16, 1, 256, 64 * Ki, 32, 800 },
/* CAL_TARGET_LEXA */ { ED_ATI_CAL_MACHINE_LEXA_ISA, "Bee", "bee", 4, 16, 1, 256, 64 * Ki, 32, 800 },
};
enum gfx_handle {
@@ -154,6 +154,7 @@ NullDevice::create(CALtarget target)
case CAL_TARGET_BAFFIN:
case CAL_TARGET_GREENLAND:
case CAL_TARGET_STONEY:
case CAL_TARGET_LEXA:
calAttr.doublePrecision = CAL_TRUE;
calAttr.isOpenCL200Device = CAL_TRUE;
break;
@@ -2390,6 +2390,7 @@ bool ORCAHSALoaderContext::IsaSupportedByAgent(hsa_agent_t agent, hsa_isa_t isa)
case ED_ATI_CAL_MACHINE_FIJI_ISA:
case ED_ATI_CAL_MACHINE_ELLESMERE_ISA:
case ED_ATI_CAL_MACHINE_BAFFIN_ISA:
case ED_ATI_CAL_MACHINE_LEXA_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;
@@ -191,6 +191,7 @@ Settings::create(
case CAL_TARGET_FIJI:
case CAL_TARGET_ELLESMERE:
case CAL_TARGET_BAFFIN:
case CAL_TARGET_LEXA:
// Disable tiling aperture on VI+
linearPersistentImage_ = true;
// Keep this false even though we have support
@@ -493,6 +493,10 @@ CALGSLDevice::SetupContext(int32 &asic_id)
m_target = CAL_TARGET_STONEY;
m_elfmachine = ED_ATI_CAL_MACHINE_STONEY_ISA;
break;
case GSL_ATIASIC_ID_LEXA:
m_target = CAL_TARGET_LEXA;
m_elfmachine = ED_ATI_CAL_MACHINE_LEXA_ISA;
break;
default:
// 6XX is not supported
m_adp->deleteContext(temp_cs);
@@ -45,7 +45,8 @@ typedef enum CALtargetEnum {
CAL_TARGET_BAFFIN, /**< BAFFIN GPU ISA*/
CAL_TARGET_GREENLAND, /**< GREENLAND GPU ISA*/
CAL_TARGET_STONEY, /**< STONEY GPU ISA*/
CAL_TARGET_LAST = CAL_TARGET_STONEY, /**< last */
CAL_TARGET_LEXA, /**< LEXA GPU ISA*/
CAL_TARGET_LAST = CAL_TARGET_LEXA, /**< last */
//##END_PRIVATE##
} CALtarget;