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
This commit is contained in:
foreman
2018-12-07 18:41:56 -05:00
parent 03d5d4b485
commit fd43c4fbfd
12 changed files with 95 additions and 97 deletions
+3 -3
View File
@@ -9,7 +9,7 @@
#include "platform/memory.hpp"
#include "devwavelimiter.hpp"
#if defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
#if defined(WITH_LIGHTNING_COMPILER)
namespace llvm {
namespace AMDGPU {
namespace HSAMD {
@@ -168,7 +168,7 @@ static const std::map<std::string,CodePropField> CodePropFieldMap =
{"NumSpilledVGPRs", CodePropField::NumSpilledVGPRs}
};
#endif // defined(USE_COMGR_LIBRARY)
#endif // defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
#endif // defined(WITH_LIGHTNING_COMPILER)
namespace amd {
namespace hsa {
@@ -370,7 +370,7 @@ class Kernel : public amd::HeapObject {
protected:
//! Initializes the abstraction layer kernel parameters
#if defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
#if defined(WITH_LIGHTNING_COMPILER)
#if defined(USE_COMGR_LIBRARY)
void InitParameters(const amd_comgr_metadata_node_t kernelMD, uint32_t argBufferSize);