P4 to Git Change 1419386 by kzhuravl@kzhuravl-fiji-ocllc on 2017/06/07 11:13:10

SWDEV-94644 - Update runtime after the recent merge
	 - AMDGPUCodeObjectMetadata.h was moved to include/llvm/Support

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/build/Makefile.pal#11 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.hpp#12 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#40 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.hpp#18 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/build/Makefile.oclrocm#17 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.hpp#25 edit

rocclr/runtime/device/pal/palkernel.hpp

@@ -17,7 +17,7 @@
 #include "hsa.h"
 
 #if defined(WITH_LIGHTNING_COMPILER)
-#include "AMDGPUCodeObjectMetadata.h"
+#include "llvm/Support/AMDGPUCodeObjectMetadata.h"
 
 typedef llvm::AMDGPU::CodeObject::Kernel::Metadata KernelMD;
 typedef llvm::AMDGPU::CodeObject::Kernel::Arg::Metadata KernelArgMD;

rocclr/runtime/device/pal/palprogram.cpp

@@ -20,7 +20,7 @@
 #include "hsa_ext_image.h"
 #include "amd_hsa_loader.hpp"
 #if defined(WITH_LIGHTNING_COMPILER)
-#include "AMDGPUCodeObjectMetadata.h"
+#include "llvm/Support/AMDGPUCodeObjectMetadata.h"
 #include "driver/AmdCompiler.h"
 #include "libraries.amdgcn.inc"
 #include "gelf.h"

rocclr/runtime/device/pal/palprogram.hpp

@@ -8,7 +8,7 @@
 #include "amd_hsa_loader.hpp"
 
 #if defined(WITH_LIGHTNING_COMPILER)
-#include "AMDGPUCodeObjectMetadata.h"
+#include "llvm/Support/AMDGPUCodeObjectMetadata.h"
 
 typedef llvm::AMDGPU::CodeObject::Metadata CodeObjectMD;
 #endif  // defined(WITH_LIGHTNING_COMPILER)

rocclr/runtime/device/rocm/rocprogram.hpp

@@ -17,7 +17,7 @@
 #include "rocdevice.hpp"
 
 #if defined(WITH_LIGHTNING_COMPILER)
-#include "AMDGPUCodeObjectMetadata.h"
+#include "llvm/Support/AMDGPUCodeObjectMetadata.h"
 #include "driver/AmdCompiler.h"
 
 typedef llvm::AMDGPU::CodeObject::Metadata CodeObjectMD;