SWDEV-1 - Switch PAL to the interface version 872

Change-Id: I71ef232ec7080b36dbffefb201429ab839645ac4
ROCm · May 22, 2024 · 2406b8c · 2406b8c
1 parent 44ed979
commit 2406b8c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/rocclr/cmake/ROCclrPAL.cmake b/rocclr/cmake/ROCclrPAL.cmake
@@ -20,7 +20,7 @@
 
 set(PAL_CLIENT "OCL")
 
-set(PAL_CLIENT_INTERFACE_MAJOR_VERSION     843)
+set(PAL_CLIENT_INTERFACE_MAJOR_VERSION     872)
 set(GPUOPEN_CLIENT_INTERFACE_MAJOR_VERSION 42)
 set(GPUOPEN_CLIENT_INTERFACE_MINOR_VERSION 0)
 set(AMD_DK_ROOT $ENV{DK_ROOT})

diff --git a/rocclr/device/pal/palsignal.cpp b/rocclr/device/pal/palsignal.cpp
@@ -127,7 +127,7 @@ uint64_t Signal::Wait(uint64_t value, device::Signal::Condition c, uint64_t time
     Pal::Result result = Pal::Result::Success;
 
     float timeoutInSec = timeout / (1000 * 1000);
-    result = event_.Wait(timeoutInSec);
+    result = event_.Wait(Util::fseconds{timeoutInSec});
 
     if ((result != Pal::Result::Success) && (result != Pal::Result::Timeout)) {
       return -1;

diff --git a/rocclr/device/pal/palvirtual.hpp b/rocclr/device/pal/palvirtual.hpp
@@ -156,7 +156,8 @@ class VirtualGPU : public device::VirtualDevice {
           amd::Os::yield();
           continue;
         }
-        result = iDev_->WaitForFences(1, &iCmdFences_[cbId], true, WaitTimeoutInNsec);
+        result = iDev_->WaitForFences(1, &iCmdFences_[cbId], true,
+                                      std::chrono::nanoseconds{WaitTimeoutInNsec});
         if (Pal::Result::Success == result) {
           break;
         } else if ((Pal::Result::NotReady == result) || (Pal::Result::Timeout == result)) {