From 7b8820f23ef07d6d6957276914668d76eb329cc3 Mon Sep 17 00:00:00 2001
From: Kamil Kopryk <kamil.kopryk@intel.com>
Date: Wed, 17 Nov 2021 13:02:42 +0000
Subject: [PATCH] Simplify ults

Signed-off-by: Kamil Kopryk <kamil.kopryk@intel.com>
---
 .../core/test/unit_tests/sources/module/test_module.cpp   | 8 +-------
 opencl/test/unit_test/program/program_data_tests.cpp      | 8 +-------
 shared/test/unit_test/compiler_interface/linker_tests.cpp | 7 +------
 3 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/level_zero/core/test/unit_tests/sources/module/test_module.cpp b/level_zero/core/test/unit_tests/sources/module/test_module.cpp
index 3e81c24b59..a1fb479e72 100644
--- a/level_zero/core/test/unit_tests/sources/module/test_module.cpp
+++ b/level_zero/core/test/unit_tests/sources/module/test_module.cpp
@@ -1927,13 +1927,7 @@ TEST_F(ModuleTests, givenConstDataStringSectionWhenLinkingModuleThenSegmentIsPat
 
     auto status = pModule->linkBinary();
     EXPECT_TRUE(status);
-
-    constexpr bool is64Bit = sizeof(void *) == 8;
-    if (is64Bit) {
-        EXPECT_EQ(static_cast<uint64_t>(stringsAddr), *reinterpret_cast<uint64_t *>(patchAddr));
-    } else {
-        EXPECT_EQ(static_cast<uint32_t>(stringsAddr), *reinterpret_cast<uint32_t *>(patchAddr));
-    }
+    EXPECT_EQ(static_cast<size_t>(stringsAddr), *reinterpret_cast<size_t *>(patchAddr));
 }
 
 TEST_F(ModuleTests, givenImplicitArgsRelocationWhenLinkingModuleThenSegmentIsPatchedAndImplicitArgsAreRequired) {
diff --git a/opencl/test/unit_test/program/program_data_tests.cpp b/opencl/test/unit_test/program/program_data_tests.cpp
index 19c0fe3905..8e6c82b73c 100644
--- a/opencl/test/unit_test/program/program_data_tests.cpp
+++ b/opencl/test/unit_test/program/program_data_tests.cpp
@@ -723,13 +723,7 @@ TEST(ProgramStringSectionTest, WhenConstStringBufferIsPresentThenUseItForLinking
 
     auto ret = program.linkBinary(&device->getDevice(), nullptr, nullptr, {constStringData, sizeof(constStringData)});
     EXPECT_EQ(CL_SUCCESS, ret);
-
-    constexpr bool is64Bit = sizeof(void *) == 8;
-    if (is64Bit) {
-        EXPECT_EQ(static_cast<uint64_t>(stringsAddr), *reinterpret_cast<uint64_t *>(patchAddr));
-    } else {
-        EXPECT_EQ(static_cast<uint32_t>(stringsAddr), *reinterpret_cast<uint32_t *>(patchAddr));
-    }
+    EXPECT_EQ(static_cast<size_t>(stringsAddr), *reinterpret_cast<size_t *>(patchAddr));
 
     program.getKernelInfoArray(rootDeviceIndex).clear();
 }
diff --git a/shared/test/unit_test/compiler_interface/linker_tests.cpp b/shared/test/unit_test/compiler_interface/linker_tests.cpp
index 3d451e348c..3ab07b2745 100644
--- a/shared/test/unit_test/compiler_interface/linker_tests.cpp
+++ b/shared/test/unit_test/compiler_interface/linker_tests.cpp
@@ -1345,12 +1345,7 @@ TEST(LinkerTests, givenValidStringSymbolsAndRelocationsWhenPatchingThenItIsPrope
     uintptr_t strAddr = stringSegment.gpuAddress + strSymbol.offset;
     uintptr_t patchAddr = reinterpret_cast<uintptr_t>(instructionSegment) + static_cast<uintptr_t>(relocation.offset);
 
-    constexpr bool is64Bit = sizeof(void *) == 8;
-    if (is64Bit) {
-        EXPECT_EQ(static_cast<uint64_t>(strAddr), *reinterpret_cast<const uint64_t *>(patchAddr));
-    } else {
-        EXPECT_EQ(static_cast<uint32_t>(strAddr), *reinterpret_cast<const uint32_t *>(patchAddr));
-    }
+    EXPECT_EQ(static_cast<size_t>(strAddr), *reinterpret_cast<const size_t *>(patchAddr));
 }
 
 TEST(LinkerTests, givenValidSymbolsAndRelocationsWhenPatchingDataSegmentsThenTheyAreProperlyPatched) {