P4 to Git Change 1611775 by gandryey@gera-ocl-lc on 2018/09/27 18:02:54

SWDEV-79445 - OCL generic changes and code clean-up
	Program compilation clean-up. Step#6:
	- Move the second linkImpl() method to the abstraciton layer
	- Create the new setKernel virtual interface for the backend specific setup

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#320 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#8 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.hpp#6 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldefs.hpp#41 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#79 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.hpp#35 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#57 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#91 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.hpp#40 edit


[ROCm/clr commit: 8bbcc1c38a]

projects/clr/rocclr/runtime/device/devprogram.hpp

@@ -214,7 +214,7 @@ class Program : public amd::HeapObject {
   );
 
   //! Link the device program.
-  virtual bool linkImpl(amd::option::Options* options) = 0;
+  virtual bool linkImpl(amd::option::Options* options);
 
   //! Link the device programs.
   virtual bool linkImpl(const std::vector<Program*>& inputPrograms, amd::option::Options* options,
@@ -238,6 +238,9 @@ class Program : public amd::HeapObject {
 
   virtual bool isElf(const char* bin) const = 0;
 
+  virtual bool setKernels(
+    amd::option::Options* options, void* binary, size_t binSize) { return true; }
+
   //! Returns all the options to be appended while passing to the compiler library
   std::string ProcessOptions(amd::option::Options* options);
 
@@ -269,23 +272,29 @@ class Program : public amd::HeapObject {
   bool FindGlobalVarSize(void* binary, size_t binSize);
 
  private:
-   //! Compile the device program with LC path
-   bool compileImplLC(const std::string& sourceCode,
-     const std::vector<const std::string*>& headers,
-     const char** headerIncludeNames, amd::option::Options* options);
+  //! Compile the device program with LC path
+  bool compileImplLC(const std::string& sourceCode,
+    const std::vector<const std::string*>& headers,
+    const char** headerIncludeNames, amd::option::Options* options);
 
-   //! Compile the device program with HSAIL path
-   bool compileImplHSAIL(const std::string& sourceCode,
-     const std::vector<const std::string*>& headers,
-     const char** headerIncludeNames, amd::option::Options* options);
+  //! Compile the device program with HSAIL path
+  bool compileImplHSAIL(const std::string& sourceCode,
+    const std::vector<const std::string*>& headers,
+    const char** headerIncludeNames, amd::option::Options* options);
 
-   //! Link the device programs with HSAIL path
-   bool linkImplHSAIL(const std::vector<Program*>& inputPrograms,
-     amd::option::Options* options, bool createLibrary);
+  //! Link the device programs with LC path
+  bool linkImplLC(const std::vector<Program*>& inputPrograms,
+    amd::option::Options* options, bool createLibrary);
 
-   //! Link the device programs with LC path
-   bool linkImplLC(const std::vector<Program*>& inputPrograms,
-     amd::option::Options* options, bool createLibrary);
+  //! Link the device programs with HSAIL path
+  bool linkImplHSAIL(const std::vector<Program*>& inputPrograms,
+    amd::option::Options* options, bool createLibrary);
+
+  //! Link the device program with LC path
+  bool linkImplLC(amd::option::Options* options);
+
+  //! Link the device program with HSAIL path
+  bool linkImplHSAIL(amd::option::Options* options);
 
   //! Disable default copy constructor
   Program(const Program&);