From 08bc465307458960c04b22111af6311ef25d5555 Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Wed, 10 Dec 2025 13:48:59 +0000 Subject: [PATCH] refactor: return scratch ptr offset as optional Signed-off-by: Mateusz Jablonski --- shared/source/kernel/definitions/implicit_args.h | 4 ++-- shared/test/unit_test/kernel/implicit_args_helper_tests.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/shared/source/kernel/definitions/implicit_args.h b/shared/source/kernel/definitions/implicit_args.h index 256a186b9e..1d9eda708f 100644 --- a/shared/source/kernel/definitions/implicit_args.h +++ b/shared/source/kernel/definitions/implicit_args.h @@ -362,11 +362,11 @@ struct alignas(32) ImplicitArgs { } } - size_t getScratchPtrOffset() const { + std::optional getScratchPtrOffset() const { if (v1.header.structVersion == 1) { return offsetof(ImplicitArgsV1, scratchPtr); } - return 0; + return std::nullopt; } }; diff --git a/shared/test/unit_test/kernel/implicit_args_helper_tests.cpp b/shared/test/unit_test/kernel/implicit_args_helper_tests.cpp index c0b6bb00fc..67fbe690e0 100644 --- a/shared/test/unit_test/kernel/implicit_args_helper_tests.cpp +++ b/shared/test/unit_test/kernel/implicit_args_helper_tests.cpp @@ -249,7 +249,7 @@ TEST(ImplicitArgsV0Test, givenImplicitArgsV0WhenSettingFieldsThenCorrectFieldsAr EXPECT_EQ(32u, implicitArgs.getSimdWidth().value()); - EXPECT_EQ(0u, implicitArgs.getScratchPtrOffset()); + EXPECT_FALSE(implicitArgs.getScratchPtrOffset().has_value()); } TEST(ImplicitArgsV1Test, givenImplicitArgsV1WhenSettingFieldsThenCorrectFieldsAreSet) { @@ -353,7 +353,7 @@ TEST(ImplicitArgsV2Test, givenImplicitArgsV2WhenSettingFieldsThenCorrectFieldsAr EXPECT_EQ(0x1000123400u, implicitArgs.v2.rtGlobalBufferPtr); EXPECT_EQ(0x1234000u, implicitArgs.v2.syncBufferPtr); - EXPECT_EQ(0u, implicitArgs.getScratchPtrOffset()); + EXPECT_FALSE(implicitArgs.getScratchPtrOffset().has_value()); } TEST(ImplicitArgsV1Test, givenImplicitArgsWithUnknownVersionWhenSettingFieldsThenFieldsAreNotPopulated) {