From 5a04d1e10af32dd3b001963cee6e15a8b40ebe24 Mon Sep 17 00:00:00 2001 From: Lukasz Jobczyk Date: Wed, 5 Mar 2025 09:12:11 +0000 Subject: [PATCH] refactor: Print unknown gmm usage type value Signed-off-by: Lukasz Jobczyk --- shared/source/gmm_helper/gmm.cpp | 6 +++--- shared/source/gmm_helper/gmm.h | 5 +++-- .../os_interface/windows/file_logger_win_tests.cpp | 4 +++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/shared/source/gmm_helper/gmm.cpp b/shared/source/gmm_helper/gmm.cpp index 645c4a7499..fd2e4b8e08 100644 --- a/shared/source/gmm_helper/gmm.cpp +++ b/shared/source/gmm_helper/gmm.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2024 Intel Corporation + * Copyright (C) 2018-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -445,7 +445,7 @@ void Gmm::applyDebugOverrides() { } } -const char *Gmm::getUsageTypeString() { +std::string Gmm::getUsageTypeString() { switch (resourceParams.Usage) { case GMM_RESOURCE_USAGE_TYPE_ENUM::GMM_RESOURCE_USAGE_OCL_SYSTEM_MEMORY_BUFFER_CACHELINE_MISALIGNED: return "GMM_RESOURCE_USAGE_OCL_SYSTEM_MEMORY_BUFFER_CACHELINE_MISALIGNED"; @@ -464,7 +464,7 @@ const char *Gmm::getUsageTypeString() { case GMM_RESOURCE_USAGE_TYPE_ENUM::GMM_RESOURCE_USAGE_OCL_IMAGE: return "GMM_RESOURCE_USAGE_OCL_IMAGE"; default: - return "UNKNOWN GMM USAGE TYPE"; + return "UNKNOWN GMM USAGE TYPE " + std::to_string(resourceParams.Usage); } } } // namespace NEO diff --git a/shared/source/gmm_helper/gmm.h b/shared/source/gmm_helper/gmm.h index 8a089a083a..c6d27cc3f0 100644 --- a/shared/source/gmm_helper/gmm.h +++ b/shared/source/gmm_helper/gmm.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2024 Intel Corporation + * Copyright (C) 2018-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,6 +10,7 @@ #include #include +#include namespace NEO { enum class ImagePlane; @@ -71,7 +72,7 @@ class Gmm { GMM_RESCREATE_PARAMS resourceParams = {}; std::unique_ptr gmmResourceInfo; - const char *getUsageTypeString(); + std::string getUsageTypeString(); void setCompressionEnabled(bool compresionEnabled) { this->compressionEnabled = compresionEnabled; } bool isCompressionEnabled() const { return compressionEnabled; } diff --git a/shared/test/unit_test/os_interface/windows/file_logger_win_tests.cpp b/shared/test/unit_test/os_interface/windows/file_logger_win_tests.cpp index 85ac375240..a8321a1b55 100644 --- a/shared/test/unit_test/os_interface/windows/file_logger_win_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/file_logger_win_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2024 Intel Corporation + * Copyright (C) 2019-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -36,6 +36,7 @@ TEST_F(FileLoggerTests, GivenLogAllocationMemoryPoolFlagThenLogsCorrectInfo) { allocation.setAllocationType(AllocationType::buffer); allocation.memoryPool = MemoryPool::system64KBPages; allocation.getDefaultGmm()->resourceParams.Flags.Info.NonLocalOnly = 0; + allocation.getDefaultGmm()->resourceParams.Usage = GMM_RESOURCE_USAGE_HEAP_STATELESS_DATA_PORT_L1_CACHED; allocation.setGpuAddress(0x12345); allocation.size = 777u; @@ -68,6 +69,7 @@ TEST_F(FileLoggerTests, GivenLogAllocationMemoryPoolFlagThenLogsCorrectInfo) { EXPECT_TRUE(str.find(memoryPoolCheck.str()) != std::string::npos); EXPECT_TRUE(str.find(gpuAddressCheck.str()) != std::string::npos); EXPECT_TRUE(str.find(rootDeviceIndexCheck.str()) != std::string::npos); + EXPECT_TRUE(str.find("UNKNOWN GMM USAGE TYPE 40") != std::string::npos); EXPECT_TRUE(str.find("Type: BUFFER") != std::string::npos); EXPECT_TRUE(str.find("Size: 777") != std::string::npos); EXPECT_TRUE(str.find(totalSystemMemoryCheck.str()) != std::string::npos);