From ff07325e313003296d9007b6b533d033075e298f Mon Sep 17 00:00:00 2001 From: foreman Date: Wed, 3 Apr 2019 17:09:09 -0400 Subject: [PATCH] P4 to Git Change 1765557 by gandryey@gera-w8 on 2019/04/03 16:52:57 SWDEV-79445 - OCL generic changes and code clean-up - More changes to make sure runtime and LC could be built separately Affected files ... ... //depot/stg/opencl/drivers/opencl/Makefile#71 edit ... //depot/stg/opencl/drivers/opencl/compiler/Makefile#73 edit ... //depot/stg/opencl/drivers/opencl/library/build/Makefile.library#78 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#38 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#88 edit --- rocclr/runtime/device/devprogram.cpp | 2 +- rocclr/runtime/device/pal/palprogram.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rocclr/runtime/device/devprogram.cpp b/rocclr/runtime/device/devprogram.cpp index 99a1f1043d..d43d8daedc 100644 --- a/rocclr/runtime/device/devprogram.cpp +++ b/rocclr/runtime/device/devprogram.cpp @@ -14,10 +14,10 @@ #if defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY) #ifndef USE_COMGR_LIBRARY #include "driver/AmdCompiler.h" -#endif #include "libraries.amdgcn.inc" #include "opencl1.2-c.amdgcn.inc" #include "opencl2.0-c.amdgcn.inc" +#endif #endif // defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY) #include diff --git a/rocclr/runtime/device/pal/palprogram.cpp b/rocclr/runtime/device/pal/palprogram.cpp index 6862ff6fd7..a3429697ea 100644 --- a/rocclr/runtime/device/pal/palprogram.cpp +++ b/rocclr/runtime/device/pal/palprogram.cpp @@ -22,9 +22,9 @@ #if defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY) #ifndef USE_COMGR_LIBRARY #include "driver/AmdCompiler.h" +#include "libraries.amdgcn.inc" #endif #include "llvm/Support/AMDGPUMetadata.h" -#include "libraries.amdgcn.inc" #include "gelf.h" #endif // defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)