P4 to Git Change 1362323 by kzhuravl@kzhuravl-fiji-cl-on-lc on 2017/01/16 14:21:45

SWDEV-102713 - Update Runtime to Metadata 2.0.

	ReviewBoardURL: http://ocltc/reviews/r/11965/
	Testing: some OCL SDK samples.

	Change by Nikolay Haustov

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#30 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.hpp#8 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#29 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.hpp#15 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/amdgpu_metadata.cpp#7 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/amdgpu_metadata.hpp#6 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.cpp#19 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.hpp#12 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#52 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.hpp#19 edit

rocclr/runtime/device/pal/palprogram.hpp

@@ -8,7 +8,7 @@
 #include "amd_hsa_loader.hpp"
 
 #if defined(WITH_LIGHTNING_COMPILER)
-#include "libamdhsacode/amdgpu_metadata.hpp"
+#include "AMDGPURuntimeMetadata.h"
 #endif // defined(WITH_LIGHTNING_COMPILER)
 
 namespace amd {
@@ -301,7 +301,7 @@ public:
         metadata_(nullptr)
     {}
 
-    const amd::hsa::code::Program::Metadata* metadata() const {
+    const AMDGPU::RuntimeMD::Program::Metadata* metadata() const {
         return metadata_;
     }
 private:
@@ -340,7 +340,7 @@ protected:
     static std::auto_ptr<amd::opencl_driver::Compiler> newCompilerInstance();
 
 private:
-    amd::hsa::code::Program::Metadata* metadata_; //!< Runtime metadata
+    AMDGPU::RuntimeMD::Program::Metadata* metadata_; //!< Runtime metadata
 };
 #endif // defined(WITH_LIGHTNING_COMPILER)