From c15d4c3e06663241cfa24bf36be070926e397adc Mon Sep 17 00:00:00 2001 From: foreman Date: Mon, 23 Sep 2019 14:05:41 -0400 Subject: [PATCH] P4 to Git Change 2002571 by gandryey@gera-win10 on 2019/09/23 13:57:22 SWDEV-86035 - Integrate PAL from //depot/stg/pal_prm/... interface version 535, gpuopen version 41. - pal_prm: CL#1997577. Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/codeSanitizerConfig/customerSS/keyword-regexes.txt#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/codeSanitizerConfig/openSourceNpi/keyword-regexes.txt#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/codeSanitizerConfig/openSourceNpi/strip-config.txt#4 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/core/pal.h#52 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/core/palLib.h#99 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/scpc/scpcLib.h#38 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/scpc/scpcShader.h#29 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/inc/util/palCacheLayer.h#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/res/ver.h#97 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/addrMgr/addrMgr2/addrMgr2.cpp#57 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/cmdAllocator.cpp#23 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/device.cpp#91 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/gpuMemory.cpp#51 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9DepthStencilView.cpp#49 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9Device.cpp#102 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9PerfCtrInfo.cpp#47 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/gfx9/gfx9UniversalCmdBuffer.cpp#99 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/rpm/rsrcProcMgr.cpp#79 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/gfxip/scpc/compileHelper.cpp#42 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/hw/videoip/vcn2/vcn2JpegDecodeCmdBuffer.cpp#5 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/imported/addrlib/codeSanitizerConfig/openSourceNpi/strip-config.txt#3 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/imported/addrlib/src/gfx10/gfx10SwizzlePattern.h#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/imported/addrlib/src/gfx10/gfx10addrlib.cpp#16 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/imported/addrlib/src/gfx10/gfx10addrlib.h#12 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/layers/cmdBufferLogger/cmdBufferLoggerCmdBuffer.h#54 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/layers/gpuProfiler/gpuProfilerQueueFileLogger.cpp#58 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/layers/interfaceLogger/interfaceLoggerLogContext.cpp#54 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/platform.cpp#51 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/core/platform.h#39 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/gpuUtil/gpaSession.cpp#58 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/util/memoryCacheLayer.cpp#7 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbe/src/util/memoryCacheLayer.h#6 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbedefs#51 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#165 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palgpuopen.cpp#17 edit [ROCm/clr commit: ab3fd77bf46be17e2c5965e9222bdb85177e6748] --- projects/clr/rocclr/runtime/device/pal/paldevice.cpp | 1 + projects/clr/rocclr/runtime/device/pal/palgpuopen.cpp | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/projects/clr/rocclr/runtime/device/pal/paldevice.cpp b/projects/clr/rocclr/runtime/device/pal/paldevice.cpp index f4aa0fcb0a..8e588ea17c 100644 --- a/projects/clr/rocclr/runtime/device/pal/paldevice.cpp +++ b/projects/clr/rocclr/runtime/device/pal/paldevice.cpp @@ -1314,6 +1314,7 @@ bool Device::init() { info.flags.enableSvmMode = true; #endif #endif + info.flags.supportRgpTraces = true; info.pSettingsPath = "OCL"; info.maxSvmSize = static_cast(OCL_SET_SVM_SIZE * Mi); diff --git a/projects/clr/rocclr/runtime/device/pal/palgpuopen.cpp b/projects/clr/rocclr/runtime/device/pal/palgpuopen.cpp index c40b0946b9..bf3f6581f7 100644 --- a/projects/clr/rocclr/runtime/device/pal/palgpuopen.cpp +++ b/projects/clr/rocclr/runtime/device/pal/palgpuopen.cpp @@ -197,13 +197,7 @@ void RgpCaptureMgr::Finalize() { // picked as the target of an eventual VkDevice, this check is imperfect. // In mixed-GPU situations where an unsupported GPU is picked for tracing, // trace capture will fail with an error. - bool hw_support_tracing = false; - - if ((rgp_server_->EnableTraces() == DevDriver::Result::Success)) { - if (GpuSupportsTracing(device_.properties(), device_.settings())) { - hw_support_tracing = true; - } - } + bool hw_support_tracing = GpuSupportsTracing(device_.properties(), device_.settings()); if (hw_support_tracing == false) { rgp_server_->DisableTraces();