Windows: Use timestamp frequency from adapter info

Related-To: NEO-5435
Signed-off-by: Mateusz Jablonski <[email protected]>

Author: JablonskiMateusz

opencl/test/unit_test/device/device_win_timers_tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2020 Intel Corporation
+ * Copyright (C) 2017-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -30,11 +30,13 @@ TEST_F(MockOSTimeWinTest, WhenCreatingTimerThenResolutionIsSetCorrectly) {
 
     wddmMock->init();
 
+    wddmMock->timestampFrequency = 1000;
+
     std::unique_ptr<MockOSTimeWin> timeWin(new MockOSTimeWin(wddmMock));
 
     double res = 0.0;
     res = timeWin->getDynamicDeviceTimerResolution(device->getHardwareInfo());
-    EXPECT_EQ(res, 1e+09);
+    EXPECT_EQ(res, 1e+06);
 }
 
 } // namespace ULT

opencl/test/unit_test/mocks/mock_wddm.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -44,6 +44,7 @@ class WddmMock : public Wddm {
     using Wddm::residencyLogger;
     using Wddm::rootDeviceEnvironment;
     using Wddm::temporaryResources;
+    using Wddm::timestampFrequency;
     using Wddm::wddmInterface;
 
     WddmMock(std::unique_ptr<HwDeviceId> hwDeviceId, RootDeviceEnvironment &rootDeviceEnvironment) : Wddm(std::move(hwDeviceId), rootDeviceEnvironment) {}

shared/source/os_interface/windows/os_time_win.cpp

@@ -99,11 +99,9 @@ double OSTimeWin::getHostTimerResolution() const {
 }
 
 double OSTimeWin::getDynamicDeviceTimerResolution(HardwareInfo const &hwInfo) const {
-    double retVal = 0;
-    TimeStampDataHeader escapeInfo = {0};
-
-    if (runEscape(wddm, escapeInfo)) {
-        retVal = 1000000000.0 / (double)escapeInfo.m_Data.m_Out.gpuPerfFreq;
+    double retVal = 0u;
+    if (wddm) {
+        retVal = 1000000000.0 / static_cast<double>(wddm->getTimestampFrequency());
     }
 
     return retVal;

shared/source/os_interface/windows/wddm/wddm.cpp

@@ -150,6 +150,7 @@ bool Wddm::queryAdapterInfo() {
         systemSharedMemory = adapterInfo.SystemSharedMemory;
         dedicatedVideoMemory = adapterInfo.DedicatedVideoMemory;
         maxRenderFrequency = adapterInfo.MaxRenderFreq;
+        timestampFrequency = adapterInfo.GfxTimeStampFreq;
         instrumentationEnabled = adapterInfo.Caps.InstrumentationIsEnabled != 0;
     }
 

shared/source/os_interface/windows/wddm/wddm.h

@@ -161,6 +161,8 @@ class Wddm {
 
     const RootDeviceEnvironment &getRootDeviceEnvironment() const { return rootDeviceEnvironment; }
 
+    const uint32_t getTimestampFrequency() const { return timestampFrequency; }
+
   protected:
     std::unique_ptr<HwDeviceId> hwDeviceId;
     D3DKMT_HANDLE device = 0;
@@ -180,6 +182,7 @@ class Wddm {
     uint64_t systemSharedMemory = 0;
     uint64_t dedicatedVideoMemory = 0;
     uint32_t maxRenderFrequency = 0;
+    uint32_t timestampFrequency = 0u;
     bool instrumentationEnabled = false;
     std::string deviceRegistryPath;
     RootDeviceEnvironment &rootDeviceEnvironment;

shared/test/unit_test/mock_gdi/mock_gdi.cpp

@@ -291,6 +291,7 @@ NTSTATUS __stdcall D3DKMTQueryAdapterInfo(IN CONST D3DKMT_QUERYADAPTERINFO *quer
         adapterInfo->GfxMemorySize = 2181038080;
         adapterInfo->SystemSharedMemory = 4249540608;
         adapterInfo->SystemVideoMemory = 0;
+        adapterInfo->GfxTimeStampFreq = 1;
 
         adapterInfo->GfxPartition.Standard.Base = gAdapterInfo.GfxPartition.Standard.Base;
         adapterInfo->GfxPartition.Standard.Limit = gAdapterInfo.GfxPartition.Standard.Limit;

shared/test/unit_test/os_interface/windows/wddm_tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -39,6 +39,12 @@ TEST_F(WddmTests, whenInitializingWddmThenSetMinAddressToCorrectValue) {
     ASSERT_EQ(expectedMinAddress, wddm->getWddmMinAddress());
 }
 
+TEST_F(WddmTests, whenInitializingWddmThenSetTimestampFrequencyToCorrectValue) {
+    EXPECT_EQ(0u, wddm->timestampFrequency);
+    init();
+    EXPECT_EQ(1u, wddm->timestampFrequency);
+}
+
 TEST_F(WddmTests, givenWddmWhenPassesCorrectHandleToVerifySharedHandleThenReturnTrue) {
     init();
     D3DKMT_HANDLE handle = 1u;