From 29460e9538c2282b238bfe40cc3adbcd04bce01b Mon Sep 17 00:00:00 2001 From: foreman Date: Mon, 30 Sep 2019 14:50:20 -0400 Subject: [PATCH] P4 to Git Change 2006492 by vsytchen@vsytchen-remote-ocl-win10 on 2019/09/30 14:44:04 SWDEV-192384 - [HIP CQE][HIPonPAL][19.40] hipBindTexRef1DFetch, hipTextureRef2D are failed on all ASICs for both Win/Lnx 1. Don't ignore the PAL_ALWAYS_RESIDENT flag for HIP. ReviewBoardURL = http://ocltc.amd.com/reviews/r/18061/diff/ Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#101 edit [ROCm/clr commit: d6be390e0a670d9cc17cbbe57c52dd043ef69f5c] --- projects/clr/rocclr/runtime/device/pal/palsettings.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/clr/rocclr/runtime/device/pal/palsettings.cpp b/projects/clr/rocclr/runtime/device/pal/palsettings.cpp index 8ea11b3954..8d8b0ad4f6 100644 --- a/projects/clr/rocclr/runtime/device/pal/palsettings.cpp +++ b/projects/clr/rocclr/runtime/device/pal/palsettings.cpp @@ -152,7 +152,7 @@ Settings::Settings() { imageBufferWar_ = false; disableSdma_ = PAL_DISABLE_SDMA; mallPolicy_ = 0; - alwaysResident_ = amd::IS_HIP ? true : ((!flagIsDefault(PAL_ALWAYS_RESIDENT)) ? PAL_ALWAYS_RESIDENT : false); + alwaysResident_ = amd::IS_HIP ? true : false; } bool Settings::create(const Pal::DeviceProperties& palProp, @@ -557,6 +557,10 @@ void Settings::override() { if (!flagIsDefault(PAL_MALL_POLICY)) { mallPolicy_ = PAL_MALL_POLICY; } + + if (!flagIsDefault(PAL_ALWAYS_RESIDENT)) { + alwaysResident_ = PAL_ALWAYS_RESIDENT; + } } } // namespace pal