From a0535772b53b58d2f2e2720ca6d7f0b4c96f8140 Mon Sep 17 00:00:00 2001 From: foreman Date: Fri, 6 Nov 2015 03:35:34 -0500 Subject: [PATCH] P4 to Git Change 1208253 by nhaustov@nhaustov_hsa on 2015/11/06 03:24:59 SWDEV-79309 - Clean up HSAIL backend and compiler library includes. Use libHSAIL headers directly, not via libHSAIL/ subdir. Also remove no longer present libBRIGDwarf subdir usage. Testing: pre-checkin Affected files ... ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/build/Makefile.common#36 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/v0_8/if_acl.cpp#85 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/build/Makefile.gpu#37 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/hsail_be.cpp#59 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/hsail_be.hpp#19 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/HSAIL/BRIGAsmPrinter.cpp#145 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/HSAIL/BRIGAsmPrinter.h#63 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/HSAIL/CMakeLists.txt#20 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/HSAIL/HSAILGlobalScopeInitializer.cpp#6 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/HSAIL/HSAILIPUniformAnalysis.h#12 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/HSAIL/HSAILISelDAGToDAG.cpp#56 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/HSAIL/HSAILISelLowering.cpp#101 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/HSAIL/HSAILInstrInfo.cpp#36 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/HSAIL/HSAILInstrInfo.h#15 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/HSAIL/HSAILKernelManager.cpp#44 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/HSAIL/HSAILKernelManager.h#12 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/HSAIL/HSAILOptimizeMemoryOps.cpp#33 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/HSAIL/HSAILUtilityFunctions.cpp#51 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/HSAIL/HSAILUtilityFunctions.h#41 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/HSAIL/LibHSAILAdapters.h#6 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/HSAIL/build/Makefile.hsail#18 edit --- rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp b/rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp index d1b8550d3a..9dd7d6e8ab 100644 --- a/rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp +++ b/rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp @@ -2,9 +2,9 @@ // Copyright (c) 2012 Advanced Micro Devices, Inc. All rights reserved. // #ifdef WITH_TARGET_HSAIL -#include "libHSAIL/HSAILBrigContainer.h" -#include "libHSAIL/HSAILDisassembler.h" -#include "libHSAIL/HSAILBrigObjectFile.h" +#include "HSAILBrigContainer.h" +#include "HSAILDisassembler.h" +#include "HSAILBrigObjectFile.h" //prevent macro redefinition in drivers\hsa\compiler\lib\promotions\oclutils\top.hpp //as it's already defined in drivers\hsa\compiler\llvm\include\llvm\Support\Format.h