Fix timestamp conversion by using correct timestamp size mask

Signed-off-by: Bartosz Dunajski <[email protected]>

Author: BartoszDunajski

opencl/test/unit_test/helpers/hw_helper_tests_xehp_and_later.cpp

@@ -32,11 +32,12 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, WhenGettingMaxBarriersPer
 }
 
 HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, givenHwHelperWhenGetGpuTimeStampInNSIsCalledThenOnlyLow32BitsFromTimeStampAreUsedAndCorrectValueIsReturned) {
+    constexpr uint64_t mask = static_cast<uint64_t>(std::numeric_limits<typename FamilyType::TimestampPacketType>::max());
 
     auto &helper = HwHelper::get(renderCoreFamily);
     auto timeStamp = 0x00ff'ffff'ffff;
     auto frequency = 123456.0;
-    auto result = static_cast<uint64_t>((timeStamp & 0xffff'ffff) * frequency);
+    auto result = static_cast<uint64_t>((timeStamp & mask) * frequency);
 
     EXPECT_EQ(result, helper.getGpuTimeStampInNS(timeStamp, frequency));
 }

shared/source/helpers/hw_helper_xehp_and_later.inl

@@ -139,7 +139,9 @@ uint32_t HwHelperHw<GfxFamily>::calculateAvailableThreadCount(PRODUCT_FAMILY fam
 
 template <typename GfxFamily>
 uint64_t HwHelperHw<GfxFamily>::getGpuTimeStampInNS(uint64_t timeStamp, double frequency) const {
-    return static_cast<uint64_t>((timeStamp & 0xffff'ffff) * frequency);
+    constexpr uint64_t mask = static_cast<uint64_t>(std::numeric_limits<typename GfxFamily::TimestampPacketType>::max());
+
+    return static_cast<uint64_t>((timeStamp & mask) * frequency);
 }
 
 constexpr uint32_t planarYuvMaxHeight = 16128;