From 9dbdbd50f23b6ce38cd9c285fc2a4357b7e4862f Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Thu, 3 Jul 2025 12:20:05 +0000 Subject: [PATCH] test: mock file system in file logger tests Related-To: NEO-14110 Signed-off-by: Mateusz Jablonski --- .../unit_test/utilities/file_logger_tests.cpp | 3 --- .../unit_test/utilities/file_logger_tests.h | 6 ++--- shared/test/common/utilities/logger_tests.h | 12 ---------- .../linux/file_logger_linux_tests.cpp | 4 ---- .../windows/file_logger_win_tests.cpp | 24 +++++++++---------- .../test/unit_test/utilities/logger_tests.cpp | 10 -------- 6 files changed, 14 insertions(+), 45 deletions(-) diff --git a/opencl/test/unit_test/utilities/file_logger_tests.cpp b/opencl/test/unit_test/utilities/file_logger_tests.cpp index 3245bfd771..5e33b802ca 100644 --- a/opencl/test/unit_test/utilities/file_logger_tests.cpp +++ b/opencl/test/unit_test/utilities/file_logger_tests.cpp @@ -151,7 +151,6 @@ TEST(FileLogger, GivenMdiWhenDumpingKernelArgsThenFileIsCreated) { flags.DumpKernelArgs.set(true); FullyEnabledFileLogger fileLogger(testFile, flags); FullyEnabledClFileLogger clFileLogger(fileLogger, flags); - fileLogger.useRealFiles(false); clFileLogger.dumpKernelArgs(multiDispatchInfo.get()); @@ -216,7 +215,6 @@ TEST(FileLogger, GivenImmediateWhenDumpingKernelArgsThenFileIsCreated) { flags.DumpKernelArgs.set(true); FullyEnabledFileLogger fileLogger(testFile, flags); FullyEnabledClFileLogger clFileLogger(fileLogger, flags); - fileLogger.useRealFiles(false); clFileLogger.dumpKernelArgs(multiDispatchInfo.get()); @@ -332,7 +330,6 @@ TEST(FileLogger, GivenBufferWhenDumpingKernelArgsThenFileIsCreated) { flags.DumpKernelArgs.set(true); FullyEnabledFileLogger fileLogger(testFile, flags); FullyEnabledClFileLogger clFileLogger(fileLogger, flags); - fileLogger.useRealFiles(false); clFileLogger.dumpKernelArgs(multiDispatchInfo.get()); diff --git a/opencl/test/unit_test/utilities/file_logger_tests.h b/opencl/test/unit_test/utilities/file_logger_tests.h index a5fa01719f..93ba30caee 100644 --- a/opencl/test/unit_test/utilities/file_logger_tests.h +++ b/opencl/test/unit_test/utilities/file_logger_tests.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2024 Intel Corporation + * Copyright (C) 2019-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -20,7 +20,7 @@ template class TestClFileLogger : public NEO::ClFileLogger { public: TestClFileLogger(TestFileLogger &baseLoggerInm, const NEO::DebugVariables &flags) - : NEO::ClFileLogger(baseLoggerInm, flags), baseLogger(baseLoggerInm) { baseLogger.useRealFiles(false); } + : NEO::ClFileLogger(baseLoggerInm, flags), baseLogger(baseLoggerInm) {} protected: TestFileLogger &baseLogger; @@ -39,4 +39,4 @@ class TestLoggerApiEnterWrapper : public NEO::LoggerApiEnterWrapper; -using FullyDisabledClFileLogger = TestClFileLogger; \ No newline at end of file +using FullyDisabledClFileLogger = TestClFileLogger; diff --git a/shared/test/common/utilities/logger_tests.h b/shared/test/common/utilities/logger_tests.h index 51b0e0f315..4decae0967 100644 --- a/shared/test/common/utilities/logger_tests.h +++ b/shared/test/common/utilities/logger_tests.h @@ -35,19 +35,10 @@ class TestFileLogger : public NEO::FileLogger { } } - void useRealFiles(bool value) { - mockFileSystem = !value; - } - void writeToFile(std::string filename, const char *str, size_t length, std::ios_base::openmode mode) override { - - if (mockFileSystem == false) { - NEO::FileLogger::writeToFile(filename, str, length, mode); - return; - } writeDataToFile(filename.c_str(), std::string_view(str, length)); } @@ -62,9 +53,6 @@ class TestFileLogger : public NEO::FileLogger { std::string getFileString(std::string filename) { return NEO::virtualFileList[filename].str(); } - - protected: - bool mockFileSystem = false; }; using FullyEnabledFileLogger = TestFileLogger; diff --git a/shared/test/unit_test/os_interface/linux/file_logger_linux_tests.cpp b/shared/test/unit_test/os_interface/linux/file_logger_linux_tests.cpp index 6fe2a9486c..5b6d66940e 100644 --- a/shared/test/unit_test/os_interface/linux/file_logger_linux_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/file_logger_linux_tests.cpp @@ -23,7 +23,6 @@ TEST(FileLogger, GivenLogAllocationMemoryPoolFlagThenLogsCorrectInfo) { DebugVariables flags; flags.LogAllocationMemoryPool.set(true); FullyEnabledFileLogger fileLogger(testFile, flags); - fileLogger.useRealFiles(false); // Log file not created bool logFileCreated = virtualFileExists(fileLogger.getLogFileName()); @@ -91,7 +90,6 @@ TEST(FileLogger, givenLogAllocationStdoutWhenLogAllocationThenLogToStdoutInstead flags.LogAllocationMemoryPool.set(true); flags.LogAllocationStdout.set(true); FullyEnabledFileLogger fileLogger(testFile, flags); - fileLogger.useRealFiles(false); // Log file not created bool logFileCreated = virtualFileExists(fileLogger.getLogFileName()); @@ -153,7 +151,6 @@ TEST(FileLogger, GivenDrmAllocationWithoutBOThenNoHandleLogged) { DebugVariables flags; flags.LogAllocationMemoryPool.set(true); FullyEnabledFileLogger fileLogger(testFile, flags); - fileLogger.useRealFiles(false); // Log file not created bool logFileCreated = virtualFileExists(fileLogger.getLogFileName()); @@ -190,7 +187,6 @@ TEST(FileLogger, GivenLogAllocationMemoryPoolFlagSetFalseThenAllocationIsNotLogg DebugVariables flags; flags.LogAllocationMemoryPool.set(false); FullyEnabledFileLogger fileLogger(testFile, flags); - fileLogger.useRealFiles(false); // Log file not created bool logFileCreated = virtualFileExists(fileLogger.getLogFileName()); 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 a8321a1b55..273e7ba05d 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 @@ -62,19 +62,17 @@ TEST_F(FileLoggerTests, GivenLogAllocationMemoryPoolFlagThenLogsCorrectInfo) { std::stringstream totalLocalMemoryCheck; totalLocalMemoryCheck << "Total lmem allocated: " << std::dec << executionEnvironment->memoryManager->getUsedLocalMemorySize(0); - if (fileLogger.wasFileCreated(fileLogger.getLogFileName())) { - auto str = fileLogger.getFileString(fileLogger.getLogFileName()); - EXPECT_TRUE(str.find(threadIDCheck.str()) != std::string::npos); - EXPECT_TRUE(str.find("Handle: 4") != std::string::npos); - 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); - EXPECT_TRUE(str.find(totalLocalMemoryCheck.str()) != std::string::npos); - } + ASSERT_TRUE(fileLogger.wasFileCreated(fileLogger.getLogFileName())); + auto str = fileLogger.getFileString(fileLogger.getLogFileName()); + EXPECT_TRUE(str.find(threadIDCheck.str()) != std::string::npos); + EXPECT_TRUE(str.find("Handle: 4") != std::string::npos); + 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("Type: BUFFER") != std::string::npos); + EXPECT_TRUE(str.find("Size: 777") != std::string::npos); + EXPECT_TRUE(str.find(totalSystemMemoryCheck.str()) != std::string::npos); + EXPECT_TRUE(str.find(totalLocalMemoryCheck.str()) != std::string::npos); } TEST_F(FileLoggerTests, GivenLogAllocationMemoryPoolFlagSetFalseThenAllocationIsNotLogged) { diff --git a/shared/test/unit_test/utilities/logger_tests.cpp b/shared/test/unit_test/utilities/logger_tests.cpp index 04cefa70ea..31658f6122 100644 --- a/shared/test/unit_test/utilities/logger_tests.cpp +++ b/shared/test/unit_test/utilities/logger_tests.cpp @@ -53,7 +53,6 @@ TEST(FileLogger, GivenFullyDisabledFileLoggerIsCreatedThenItIsDisabled) { TEST(FileLogger, GivenFileLoggerWhenSettingFileNameThenCorrectFilenameIsSet) { DebugVariables flags; FullyEnabledFileLogger fileLogger(std::string(""), flags); - fileLogger.useRealFiles(false); fileLogger.setLogFileName("new_filename"); EXPECT_STREQ("new_filename", fileLogger.getLogFileName()); } @@ -62,7 +61,6 @@ TEST(FileLogger, GivenEnabledDebugFunctinalityWhenLoggingApiCallsThenDumpToFile) DebugVariables flags; flags.LogApiCalls.set(true); FullyEnabledFileLogger fileLogger(std::string("test.log"), flags); - fileLogger.useRealFiles(false); fileLogger.logApiCall("searchString", true, 0); fileLogger.logApiCall("searchString2", false, 0); @@ -122,7 +120,6 @@ TEST(FileLogger, GivenCorrectFilenameFileWhenLoggingApiCallsThenFileIsCreated) { std::string testFile = "testfile"; DebugVariables flags; FullyEnabledFileLogger fileLogger(testFile, flags); - fileLogger.useRealFiles(false); fileLogger.writeToFile(testFile, "test", 4, std::fstream::out); EXPECT_TRUE(virtualFileExists(fileLogger.getLogFileName())); @@ -136,7 +133,6 @@ TEST(FileLogger, GivenSameFileNameWhenCreatingNewInstanceThenOldFileIsRemoved) { DebugVariables flags; flags.LogApiCalls.set(true); FullyEnabledFileLogger fileLogger(testFile, flags); - fileLogger.useRealFiles(false); fileLogger.writeToFile(fileLogger.getLogFileName(), "test", 4, std::fstream::out); EXPECT_TRUE(virtualFileExists(fileLogger.getLogFileName())); @@ -149,7 +145,6 @@ TEST(FileLogger, GivenSameFileNameWhenCreatingNewFullyDisabledLoggerThenOldFileI DebugVariables flags; flags.LogApiCalls.set(true); FullyEnabledFileLogger fileLogger(testFile, flags); - fileLogger.useRealFiles(false); fileLogger.writeToFile(fileLogger.getLogFileName(), "test", 4, std::fstream::out); EXPECT_TRUE(virtualFileExists(fileLogger.getLogFileName())); @@ -166,7 +161,6 @@ TEST(FileLogger, GivenFlagIsFalseWhenLoggingThenOnlyCustomLogsAreDumped) { flags.LogApiCalls.set(false); FullyEnabledFileLogger fileLogger(testFile, flags); - fileLogger.useRealFiles(false); // Log file not created bool logFileCreated = virtualFileExists(fileLogger.getLogFileName()); @@ -265,7 +259,6 @@ TEST(FileLogger, WhenDumpingKernelThenFileIsCreated) { DebugVariables flags; flags.DumpKernels.set(true); FullyEnabledFileLogger fileLogger(testFile, flags); - fileLogger.useRealFiles(false); std::string kernelDumpFile = "testDumpKernel"; // test kernel dumping @@ -290,7 +283,6 @@ TEST(FileLogger, WhenDumpingBinaryFileThenFileIsCreated) { DebugVariables flags; flags.DumpKernels.set(true); FullyEnabledFileLogger fileLogger(testFile, flags); - fileLogger.useRealFiles(false); std::string programDumpFile = "programBinary.bin"; size_t length = 4; unsigned char binary[4]; @@ -436,7 +428,6 @@ TEST(FileLogger, givenEnabledLogWhenLogDebugStringCalledThenStringIsWrittenToFil std::string testFile = "testfile"; DebugVariables flags; FullyEnabledFileLogger fileLogger(testFile, flags); - fileLogger.useRealFiles(false); fileLogger.logDebugString(true, "test log"); EXPECT_EQ(std::string("test log"), fileLogger.getFileString(testFile)); @@ -560,7 +551,6 @@ TEST(AllocationTypeLoggingSingle, givenLogAllocationTypeWhenLoggingAllocationThe flags.LogAllocationType.set(1); FullyEnabledFileLogger fileLogger(testFile, flags); - fileLogger.useRealFiles(false); GraphicsAllocation graphicsAllocation(0, 1u /*num gmms*/, AllocationType::commandBuffer, nullptr, 0, 0, MemoryPool::memoryNull, MemoryManager::maxOsContextCount, 0llu);