From a372c1d4b1231f7fed6edacabed8d672ecdb7b0f Mon Sep 17 00:00:00 2001
From: foreman
Date: Wed, 2 Jan 2019 18:29:04 -0500
Subject: [PATCH] P4 to Git Change 1725257 by gandryey@gera-w8 on 2019/01/02
17:28:57
SWDEV-79445 - OCL generic changes and code clean-up
- Move the constructor body of LightningProgram to the header
Affected files ...
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#96 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.hpp#43 edit
[ROCm/clr commit: ad54eb030b278edc977389f519e12a018db59c63]
---
projects/clr/rocclr/runtime/device/rocm/rocprogram.cpp | 7 -------
projects/clr/rocclr/runtime/device/rocm/rocprogram.hpp | 7 ++++++-
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/projects/clr/rocclr/runtime/device/rocm/rocprogram.cpp b/projects/clr/rocclr/runtime/device/rocm/rocprogram.cpp
index 0acda80673..0fefb0b7d9 100644
--- a/projects/clr/rocclr/runtime/device/rocm/rocprogram.cpp
+++ b/projects/clr/rocclr/runtime/device/rocm/rocprogram.cpp
@@ -314,13 +314,6 @@ bool HSAILProgram::setKernels(amd::option::Options* options, void* binary, size_
#endif // defined(WITH_COMPILER_LIB)
#if defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
-LightningProgram::LightningProgram(roc::NullDevice& device)
- : roc::Program(device) {
- isLC_ = true;
- xnackEnabled_ = dev().deviceInfo().xnackEnabled_;
- machineTarget_ = dev().deviceInfo().machineTargetLC_;
-}
-
bool LightningProgram::createBinary(amd::option::Options* options) {
if (!clBinary()->createElfBinary(options->oVariables->BinEncrypt, type())) {
LogError("Failed to create ELF binary image!");
diff --git a/projects/clr/rocclr/runtime/device/rocm/rocprogram.hpp b/projects/clr/rocclr/runtime/device/rocm/rocprogram.hpp
index 5fe0c466de..b55ddf092b 100644
--- a/projects/clr/rocclr/runtime/device/rocm/rocprogram.hpp
+++ b/projects/clr/rocclr/runtime/device/rocm/rocprogram.hpp
@@ -80,7 +80,12 @@ private:
class LightningProgram : public roc::Program {
public:
- LightningProgram(roc::NullDevice& device);
+ LightningProgram(roc::NullDevice& device)
+ : roc::Program(device) {
+ isLC_ = true;
+ xnackEnabled_ = dev().deviceInfo().xnackEnabled_;
+ machineTarget_ = dev().deviceInfo().machineTargetLC_;
+ }
virtual ~LightningProgram() {}
protected: