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:
@@ -12,7 +12,7 @@
|
||||
#include "amd_comgr.h"
|
||||
#endif
|
||||
|
||||
#if defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
|
||||
#if defined(WITH_LIGHTNING_COMPILER)
|
||||
#include "driver/AmdCompiler.h"
|
||||
//#include "llvm/Support/AMDGPUMetadata.h"
|
||||
|
||||
@@ -28,7 +28,7 @@ namespace llvm {
|
||||
typedef llvm::AMDGPU::HSAMD::Metadata CodeObjectMD;
|
||||
typedef llvm::AMDGPU::HSAMD::Kernel::Metadata KernelMD;
|
||||
//typedef llvm::AMDGPU::HSAMD::Kernel::Arg::Metadata KernelArgMD;
|
||||
#endif // defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
|
||||
#endif // defined(WITH_LIGHTNING_COMPILER)
|
||||
|
||||
#ifndef LC_METADATA
|
||||
typedef char CodeObjectMD;
|
||||
@@ -264,10 +264,10 @@ class Program : public amd::HeapObject {
|
||||
|
||||
void setType(type_t newType) { type_ = newType; }
|
||||
|
||||
#if defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
|
||||
#if defined(WITH_LIGHTNING_COMPILER)
|
||||
//! Return a new transient compiler instance.
|
||||
static std::unique_ptr<amd::opencl_driver::Compiler> newCompilerInstance();
|
||||
#endif // defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
|
||||
#endif // defined(WITH_LIGHTNING_COMPILER)
|
||||
|
||||
/* \brief Returns the next stage to compile from, based on sections in binary,
|
||||
* also returns completeStages in a vector, which contains at least ACL_TYPE_DEFAULT,
|
||||
|
||||
Reference in New Issue
Block a user