diff --git a/opencl/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp index 423ec90692..78a6dcd47b 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp @@ -169,10 +169,10 @@ TEST_F(DrmBufferObjectTest, givenResidentBOWhenPrintExecutionBufferIsSetToTrueTh size_t expectedValue = 0; EXPECT_EQ(expectedValue, idx); - idx = output.find("Buffer Object = { handle: "); + idx = output.find("Buffer Object = { handle: BO-"); EXPECT_NE(std::string::npos, idx); - idx = output.find("Command Buffer Object = { handle: "); + idx = output.find("Command Buffer Object = { handle: BO-"); EXPECT_NE(std::string::npos, idx); } @@ -186,7 +186,7 @@ TEST_F(DrmBufferObjectTest, whenPrintBOCreateDestroyResultFlagIsSetAndCloseIsCal EXPECT_EQ(true, result); std::string output = testing::internal::GetCapturedStdout(); - size_t idx = output.find("Calling gem close on BO handle"); + size_t idx = output.find("Calling gem close on handle: BO-"); size_t expectedValue = 0; EXPECT_EQ(expectedValue, idx); } diff --git a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp index f8f5e22247..0f8735e024 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp @@ -476,7 +476,7 @@ TEST_F(DrmMemoryManagerTest, whenPrintBOCreateDestroyResultIsSetAndAllocUserptrI ASSERT_NE(nullptr, bo); std::string output = testing::internal::GetCapturedStdout(); - size_t idx = output.find("Created new BO with GEM_USERPTR, BO handle - "); + size_t idx = output.find("Created new BO with GEM_USERPTR, handle: BO-"); size_t expectedValue = 0; EXPECT_EQ(expectedValue, idx); diff --git a/shared/source/os_interface/linux/drm_buffer_object.cpp b/shared/source/os_interface/linux/drm_buffer_object.cpp index e02836c550..63ba18c3f8 100644 --- a/shared/source/os_interface/linux/drm_buffer_object.cpp +++ b/shared/source/os_interface/linux/drm_buffer_object.cpp @@ -61,7 +61,7 @@ bool BufferObject::close() { drm_gem_close close = {}; close.handle = this->handle; - printDebugString(DebugManager.flags.PrintBOCreateDestroyResult.get(), stdout, "Calling gem close on BO handle %d\n", this->handle); + printDebugString(DebugManager.flags.PrintBOCreateDestroyResult.get(), stdout, "Calling gem close on handle: BO-%d\n", this->handle); int ret = this->drm->ioctl(DRM_IOCTL_GEM_CLOSE, &close); if (ret != 0) { @@ -186,13 +186,13 @@ void BufferObject::printExecutionBuffer(drm_i915_gem_execbuffer2 &execbuf, const size_t i; for (i = 0; i < residencyCount; i++) { - logger << "Buffer Object = { handle: " << execObjectsStorage[i].handle + logger << "Buffer Object = { handle: BO-" << execObjectsStorage[i].handle << ", address range: 0x" << (void *)execObjectsStorage[i].offset << " - 0x" << (void *)ptrOffset(execObjectsStorage[i].offset, residency[i]->peekSize()) << ", flags: " << execObjectsStorage[i].flags << ", size: " << residency[i]->peekSize() << " }\n"; } - logger << "Command Buffer Object = { handle: " << execObjectsStorage[i].handle + logger << "Command Buffer Object = { handle: BO-" << execObjectsStorage[i].handle << ", address range: 0x" << (void *)execObjectsStorage[i].offset << " - 0x" << (void *)ptrOffset(execObjectsStorage[i].offset, this->peekSize()) << ", flags: " << execObjectsStorage[i].flags diff --git a/shared/source/os_interface/linux/drm_memory_manager.cpp b/shared/source/os_interface/linux/drm_memory_manager.cpp index 0dc009dc40..93d2b45f9e 100644 --- a/shared/source/os_interface/linux/drm_memory_manager.cpp +++ b/shared/source/os_interface/linux/drm_memory_manager.cpp @@ -177,7 +177,7 @@ NEO::BufferObject *DrmMemoryManager::allocUserptr(uintptr_t address, size_t size return nullptr; } - printDebugString(DebugManager.flags.PrintBOCreateDestroyResult.get(), stdout, "Created new BO with GEM_USERPTR, BO handle - %d\n", userptr.handle); + printDebugString(DebugManager.flags.PrintBOCreateDestroyResult.get(), stdout, "Created new BO with GEM_USERPTR, handle: BO-%d\n", userptr.handle); auto res = new (std::nothrow) BufferObject(&getDrm(rootDeviceIndex), userptr.handle, size, maxOsContextCount); if (!res) {