P4 to Git Change 1303600 by lmoriche@lmoriche_opencl_dev on 2016/08/16 15:57:53

SWDEV-94610 - Minor cleanups:
	- Removed unnecessary/unused variables.
	- Consolidated the compile line options for HSAIL/LC.
	- Restored the HSA code object and program destruction.
	- Fixed the build log reporting.

	Testing: http://ocltc.amd.com:8111/viewModification.html?modId=75117&personal=true&buildTypeId=&tab=vcsModificationBuilds&show_all_builds=true

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/roccompiler.cpp#6 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#8 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.hpp#6 edit

rocclr/runtime/device/rocm/rocprogram.hpp

@@ -110,9 +110,6 @@ namespace roc {
         }
 
     protected:
-        //! log and append to build log an error from runtime
-        void hsaError(const char *msg, hsa_status_t status = HSA_STATUS_SUCCESS);
-
         //! pre-compile setup for GPU
         virtual bool initBuild(amd::option::Options* options);
 
@@ -206,14 +203,9 @@ namespace roc {
         HSAILProgram& operator=(const HSAILProgram&);
 
         //! Returns all the options to be appended while passing to the
-        //compiler library
+        //compiler
         std::string hsailOptions();
 
-#if defined(WITH_LIGHTNING_COMPILER)
-        //! append all the HSAIL options to the compiler library
-        void        appendHsailOptions(std::vector<std::string>& options);
-#endif // defined(WITH_LIGHTNING_COMPILER)
-
         std::string     openCLSource_; //!< Original OpenCL source
         std::string     hsailProgram_;     //!< HSAIL program after compilation.
         std::string     llvmBinary_;    //!< LLVM IR binary code
@@ -229,13 +221,7 @@ namespace roc {
         hsa_executable_t hsaExecutable_; //!< Handle to HSA executable
 
 #if defined(WITH_LIGHTNING_COMPILER)
-        hsa_code_object_t lcProgramCodeObject_; //!< Handle to LC code object
-        hsa_executable_t  lcExecutable_;        //!< Handle to LC executable
-
         CodeObjBinary*    codeObjBinary_;       //! Binary for the code object
-
-        void*             lcBinaryElf_;         //!< memory store the ELF code object
-        size_t            lcBinaryElfSize_;     //!< size of the ELF code object
 #endif // defined(WITH_LIGHTNING_COMPILER)
     };