From db1916dcbcd59d173b6c19e3fb35906a70cae964 Mon Sep 17 00:00:00 2001 From: foreman Date: Wed, 7 Jun 2017 11:19:18 -0400 Subject: [PATCH] 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 | 2 +- rocclr/runtime/device/pal/palprogram.cpp | 2 +- rocclr/runtime/device/pal/palprogram.hpp | 2 +- rocclr/runtime/device/rocm/rocprogram.hpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rocclr/runtime/device/pal/palkernel.hpp b/rocclr/runtime/device/pal/palkernel.hpp index e1fc12d868..c059b6d5bb 100644 --- a/rocclr/runtime/device/pal/palkernel.hpp +++ b/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; diff --git a/rocclr/runtime/device/pal/palprogram.cpp b/rocclr/runtime/device/pal/palprogram.cpp index d991536b96..53c3b4db1d 100644 --- a/rocclr/runtime/device/pal/palprogram.cpp +++ b/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" diff --git a/rocclr/runtime/device/pal/palprogram.hpp b/rocclr/runtime/device/pal/palprogram.hpp index 017124bd2a..4156bda612 100644 --- a/rocclr/runtime/device/pal/palprogram.hpp +++ b/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) diff --git a/rocclr/runtime/device/rocm/rocprogram.hpp b/rocclr/runtime/device/rocm/rocprogram.hpp index 6bde68594f..f3b6528bc5 100644 --- a/rocclr/runtime/device/rocm/rocprogram.hpp +++ b/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;