P4 to Git Change 1717849 by gandryey@gera-w8 on 2018/12/07 18:26:42

SWDEV-162389 - Back out changelist 1717839 due to a weird link error in LiquidFlash for LC Windows build only

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#237 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#326 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.cpp#13 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.hpp#9 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#18 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.hpp#11 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuresource.cpp#248 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#117 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#73 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#84 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#62 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/program.cpp#100 edit
Αυτή η υποβολή περιλαμβάνεται σε:
foreman
2018-12-07 18:41:56 -05:00
γονέας 03d5d4b485
υποβολή fd43c4fbfd
12 αρχεία άλλαξαν με 95 προσθήκες και 97 διαγραφές
@@ -19,12 +19,12 @@
#include "hsa.h"
#include "hsa_ext_image.h"
#include "amd_hsa_loader.hpp"
#if defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
#if defined(WITH_LIGHTNING_COMPILER)
#include "llvm/Support/AMDGPUMetadata.h"
#include "driver/AmdCompiler.h"
#include "libraries.amdgcn.inc"
#include "gelf.h"
#endif // defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
#endif // defined(WITH_LIGHTNING_COMPILER)
namespace pal {
@@ -375,7 +375,7 @@ hsa_isa_t PALHSALoaderContext::IsaFromName(const char* name) {
}
bool PALHSALoaderContext::IsaSupportedByAgent(hsa_agent_t agent, hsa_isa_t isa) {
uint32_t gfxipVersion = GPU_ENABLE_LC ?
uint32_t gfxipVersion = IS_LIGHTNING ?
program_->dev().hwInfo()->gfxipVersionLC_ :
program_->dev().hwInfo()->gfxipVersion_;
uint32_t majorSrc = gfxipVersion / 10;
@@ -546,7 +546,7 @@ hsa_status_t PALHSALoaderContext::SamplerDestroy(hsa_agent_t agent,
return HSA_STATUS_SUCCESS;
}
#if defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
#if defined(WITH_LIGHTNING_COMPILER)
static hsa_status_t GetKernelNamesCallback(hsa_executable_t hExec, hsa_executable_symbol_t hSymbol,
void* data) {
@@ -575,20 +575,20 @@ static hsa_status_t GetKernelNamesCallback(hsa_executable_t hExec, hsa_executabl
return HSA_STATUS_SUCCESS;
}
#endif // defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
#endif // defined(WITH_LIGHTNING_COMPILER)
bool LightningProgram::createBinary(amd::option::Options* options) {
#if defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
#if defined(WITH_LIGHTNING_COMPILER)
if (!clBinary()->createElfBinary(options->oVariables->BinEncrypt, type())) {
LogError("Failed to create ELF binary image!");
return false;
}
#endif // defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
#endif // defined(WITH_LIGHTNING_COMPILER)
return true;
}
bool LightningProgram::setKernels(amd::option::Options* options, void* binary, size_t binSize) {
#if defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
#if defined(WITH_LIGHTNING_COMPILER)
hsa_agent_t agent;
agent.handle = 1;
@@ -654,7 +654,7 @@ bool LightningProgram::setKernels(amd::option::Options* options, void* binary, s
}
DestroySegmentCpuAccess();
#endif // defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
#endif // defined(WITH_LIGHTNING_COMPILER)
return true;
}