From bf32fd5aa8b69c2e4f61643b42dbca68b94330df Mon Sep 17 00:00:00 2001 From: foreman Date: Mon, 30 Sep 2019 13:41:27 -0400 Subject: [PATCH] P4 to Git Change 2006447 by gandryey@gera-win10 on 2019/09/30 13:32:36 SWDEV-79445 - OCL generic changes and code clean-up - Allow to disable GPUOpen build Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/build/Makefile.pal#23 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbedefs#52 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#167 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palgpuopen.cpp#18 edit [ROCm/clr commit: 479429805856e98bed331832bbb893f81b0c2568] --- projects/clr/rocclr/runtime/device/pal/paldevice.cpp | 2 ++ projects/clr/rocclr/runtime/device/pal/palgpuopen.cpp | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/clr/rocclr/runtime/device/pal/paldevice.cpp b/projects/clr/rocclr/runtime/device/pal/paldevice.cpp index 772bc569c0..abb14d8627 100644 --- a/projects/clr/rocclr/runtime/device/pal/paldevice.cpp +++ b/projects/clr/rocclr/runtime/device/pal/paldevice.cpp @@ -1105,6 +1105,7 @@ bool Device::create(Pal::IDevice* device) { // Master function that handles developer callbacks from PAL. void PAL_STDCALL Device::PalDeveloperCallback(void* pPrivateData, const Pal::uint32 deviceIndex, Pal::Developer::CallbackType type, void* pCbData) { +#ifdef PAL_GPUOPEN_OCL VirtualGPU* gpu = nullptr; Device* device = static_cast(pPrivateData); const auto& barrier = *static_cast(pCbData); @@ -1143,6 +1144,7 @@ void PAL_STDCALL Device::PalDeveloperCallback(void* pPrivateData, const Pal::uin default: break; } +#endif // PAL_GPUOPEN_OCL } bool Device::initializeHeapResources() { diff --git a/projects/clr/rocclr/runtime/device/pal/palgpuopen.cpp b/projects/clr/rocclr/runtime/device/pal/palgpuopen.cpp index bf3f6581f7..11fae07d7d 100644 --- a/projects/clr/rocclr/runtime/device/pal/palgpuopen.cpp +++ b/projects/clr/rocclr/runtime/device/pal/palgpuopen.cpp @@ -22,6 +22,7 @@ #include "palFence.h" #include "palQueueSemaphore.h" +#ifdef PAL_GPUOPEN_OCL // gpuutil headers #include "gpuUtil/palGpaSession.h" @@ -819,5 +820,6 @@ void RgpCaptureMgr::WriteUserEventMarker(const VirtualGPU* gpu, WriteMarker(gpu, user_event_, markerSize); } +} // namespace pal -}; // namespace pal +#endif // PAL_GPUOPEN_OCL \ No newline at end of file