P4 to Git Change 1613522 by gandryey@gera-ocl-lc on 2018/10/02 11:44:38

SWDEV-79445 - OCL generic changes and code clean-up
	Program compilation clean-up. Step#7:
	- Introduce a new key to control the compilation path dynamically
	- InitBuild/finiBuild clean-up

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_device.cpp#73 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#231 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#321 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#9 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.hpp#7 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#245 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.hpp#78 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#111 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#67 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.hpp#25 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#80 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.hpp#36 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#58 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.cpp#43 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#93 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.hpp#41 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocsettings.cpp#37 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/program.cpp#96 edit
... //depot/stg/opencl/drivers/opencl/runtime/utils/flags.hpp#299 edit

rocclr/runtime/device/rocm/rocprogram.hpp

@@ -12,16 +12,6 @@
 #include <iostream>
 #include "rocdevice.hpp"
 
-#if defined(WITH_LIGHTNING_COMPILER)
-#include "driver/AmdCompiler.h"
-#include "llvm/Support/AMDGPUMetadata.h"
-
-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)
-
 //! \namespace roc HSA Device Implementation
 namespace roc {
 
@@ -50,12 +40,6 @@ class Program : public device::Program {
   hsa_executable_t hsaExecutable() const { return hsaExecutable_; }
 
  protected:
-  //! pre-compile setup for GPU
-  virtual bool initBuild(amd::option::Options* options);
-
-  //! post-compile setup for GPU
-  virtual bool finiBuild(bool isBuildGood);
-
   /*! \brief Compiles LLVM binary to HSAIL code (compiler backend: link+opt+codegen)
    *
    *  \return The build error code
@@ -66,11 +50,6 @@ class Program : public device::Program {
 
   virtual const aclTargetInfo& info(const char* str = "") { return info_; }
 
-  virtual bool isElf(const char* bin) const {
-    return amd::isElfMagic(bin);
-    // return false;
-  }
-
  protected:
   //! Disable default copy constructor
   Program(const Program&) = delete;