P4 to Git Change 1718337 by gandryey@gera-w8 on 2018/12/10 15:30:30
SWDEV-162389 - Prepare the runtime code for enabling COMGR by default in the non-LC workspace - Make sure OCL runtime can dynamically switch between HSAIL and LC paths - For now use the both WITH_LIGHTNING_COMPILER and USE_COMGR_LIBRARY defines to identify LC specific code. The clean-up will come later Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/build/Makefile.api#179 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#238 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#327 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.cpp#14 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.hpp#10 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#19 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.hpp#12 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuresource.cpp#249 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#118 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#74 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#85 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#63 edit ... //depot/stg/opencl/drivers/opencl/runtime/platform/program.cpp#101 edit
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
#include "platform/memory.hpp"
|
||||
#include "devwavelimiter.hpp"
|
||||
|
||||
#if defined(WITH_LIGHTNING_COMPILER)
|
||||
#if defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
|
||||
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)
|
||||
#endif // defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
|
||||
|
||||
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)
|
||||
#if defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
|
||||
#if defined(USE_COMGR_LIBRARY)
|
||||
void InitParameters(const amd_comgr_metadata_node_t kernelMD, uint32_t argBufferSize);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user