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


[ROCm/clr commit: c513ed5207]

projects/clr/rocclr/runtime/device/rocm/rocprogram.hpp

@@ -18,7 +18,7 @@
 #include "HSAILItems.h"
 
 #if defined(WITH_LIGHTNING_COMPILER)
-#include "amdgpu_metadata.hpp"
+#include "AMDGPURuntimeMetadata.h"
 #include "driver/AmdCompiler.h"
 #endif // defined(WITH_LIGHTNING_COMPILER)
 
@@ -46,7 +46,7 @@ public:
 
 #if defined(WITH_LIGHTNING_COMPILER)
     //! Returns the program metadata.
-    const amd::hsa::code::Program::Metadata* metadata() const { return metadata_; }
+    const AMDGPU::RuntimeMD::Program::Metadata* metadata() const { return metadata_; }
 #endif // defined(WITH_LIGHTNING_COMPILER)
 
     //! Return a typecasted GPU device
@@ -169,7 +169,7 @@ private:
     hsa_executable_t hsaExecutable_; //!< Handle to HSA executable
 
 #if defined(WITH_LIGHTNING_COMPILER)
-    amd::hsa::code::Program::Metadata* metadata_; //!< Runtime metadata
+    AMDGPU::RuntimeMD::Program::Metadata* metadata_; //!< Runtime metadata
     //! Return a new transient compiler instance.
     static std::auto_ptr<amd::opencl_driver::Compiler> newCompilerInstance();
 #endif // defined(WITH_LIGHTNING_COMPILER)