Skip to content

Commit 7b8820f

Browse files
Simplify ults
Signed-off-by: Kamil Kopryk <[email protected]>
1 parent 7bbb43a commit 7b8820f

File tree

3 files changed

+3
-20
lines changed

3 files changed

+3
-20
lines changed

level_zero/core/test/unit_tests/sources/module/test_module.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1927,13 +1927,7 @@ TEST_F(ModuleTests, givenConstDataStringSectionWhenLinkingModuleThenSegmentIsPat
19271927

19281928
auto status = pModule->linkBinary();
19291929
EXPECT_TRUE(status);
1930-
1931-
constexpr bool is64Bit = sizeof(void *) == 8;
1932-
if (is64Bit) {
1933-
EXPECT_EQ(static_cast<uint64_t>(stringsAddr), *reinterpret_cast<uint64_t *>(patchAddr));
1934-
} else {
1935-
EXPECT_EQ(static_cast<uint32_t>(stringsAddr), *reinterpret_cast<uint32_t *>(patchAddr));
1936-
}
1930+
EXPECT_EQ(static_cast<size_t>(stringsAddr), *reinterpret_cast<size_t *>(patchAddr));
19371931
}
19381932

19391933
TEST_F(ModuleTests, givenImplicitArgsRelocationWhenLinkingModuleThenSegmentIsPatchedAndImplicitArgsAreRequired) {

opencl/test/unit_test/program/program_data_tests.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -723,13 +723,7 @@ TEST(ProgramStringSectionTest, WhenConstStringBufferIsPresentThenUseItForLinking
723723

724724
auto ret = program.linkBinary(&device->getDevice(), nullptr, nullptr, {constStringData, sizeof(constStringData)});
725725
EXPECT_EQ(CL_SUCCESS, ret);
726-
727-
constexpr bool is64Bit = sizeof(void *) == 8;
728-
if (is64Bit) {
729-
EXPECT_EQ(static_cast<uint64_t>(stringsAddr), *reinterpret_cast<uint64_t *>(patchAddr));
730-
} else {
731-
EXPECT_EQ(static_cast<uint32_t>(stringsAddr), *reinterpret_cast<uint32_t *>(patchAddr));
732-
}
726+
EXPECT_EQ(static_cast<size_t>(stringsAddr), *reinterpret_cast<size_t *>(patchAddr));
733727

734728
program.getKernelInfoArray(rootDeviceIndex).clear();
735729
}

shared/test/unit_test/compiler_interface/linker_tests.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1345,12 +1345,7 @@ TEST(LinkerTests, givenValidStringSymbolsAndRelocationsWhenPatchingThenItIsPrope
13451345
uintptr_t strAddr = stringSegment.gpuAddress + strSymbol.offset;
13461346
uintptr_t patchAddr = reinterpret_cast<uintptr_t>(instructionSegment) + static_cast<uintptr_t>(relocation.offset);
13471347

1348-
constexpr bool is64Bit = sizeof(void *) == 8;
1349-
if (is64Bit) {
1350-
EXPECT_EQ(static_cast<uint64_t>(strAddr), *reinterpret_cast<const uint64_t *>(patchAddr));
1351-
} else {
1352-
EXPECT_EQ(static_cast<uint32_t>(strAddr), *reinterpret_cast<const uint32_t *>(patchAddr));
1353-
}
1348+
EXPECT_EQ(static_cast<size_t>(strAddr), *reinterpret_cast<const size_t *>(patchAddr));
13541349
}
13551350

13561351
TEST(LinkerTests, givenValidSymbolsAndRelocationsWhenPatchingDataSegmentsThenTheyAreProperlyPatched) {

0 commit comments

Comments
 (0)