From aff0ea99a89a92d7592655ae76748fb2d37e308b Mon Sep 17 00:00:00 2001 From: Bartosz Dunajski Date: Wed, 29 Jun 2022 10:52:17 +0000 Subject: [PATCH] Enable signed/unsigned mismatch warning for MSVC Signed-off-by: Bartosz Dunajski --- CMakeLists.txt | 2 +- .../debug/windows/test_debug_api_windows.cpp | 78 +++++++++---------- .../windows/os_time_win_tests.cpp | 16 ++-- .../windows/registry_reader_tests.cpp | 10 +-- ..._manager_allocate_in_device_pool_tests.cpp | 2 +- .../windows/wddm_memory_manager_tests.cpp | 6 +- .../wddm_residency_controller_tests.cpp | 4 +- ...d_write_buffer_scenarios_windows_tests.cpp | 2 +- .../gl/windows/gl_reused_buffers_tests.cpp | 8 +- shared/test/common/mocks/mock_wddm.cpp | 2 +- .../windows/um_km_data_translator_tests.cpp | 10 +-- 11 files changed, 70 insertions(+), 70 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fd65ffde4b..12b30ed20c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -529,7 +529,7 @@ if(MSVC) if(NOT CMAKE_CXX_FLAGS MATCHES "/WX") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /we4189") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /we4189 /we4388") endif() endif() diff --git a/level_zero/tools/test/unit_tests/sources/debug/windows/test_debug_api_windows.cpp b/level_zero/tools/test/unit_tests/sources/debug/windows/test_debug_api_windows.cpp index 155abadba7..71bed6db86 100644 --- a/level_zero/tools/test/unit_tests/sources/debug/windows/test_debug_api_windows.cpp +++ b/level_zero/tools/test/unit_tests/sources/debug/windows/test_debug_api_windows.cpp @@ -215,7 +215,7 @@ TEST_F(DebugApiWindowsTest, givenDebugSessionInitializeCalledAndDebugAttachNtSta EXPECT_EQ(ZE_RESULT_ERROR_UNKNOWN, result); EXPECT_FALSE(session->moduleDebugAreaCaptured); - EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]); + EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]); } TEST_F(DebugApiWindowsTest, givenDebugSessionInitializeCalledAndDebugAttachEscapeReturnStatusIsFailedThenErrorUnsupportedFetaureReturned) { @@ -229,7 +229,7 @@ TEST_F(DebugApiWindowsTest, givenDebugSessionInitializeCalledAndDebugAttachEscap EXPECT_EQ(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE, result); EXPECT_FALSE(session->moduleDebugAreaCaptured); - EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]); + EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]); } TEST_F(DebugApiWindowsTest, givenDebugSessionInitializeCalledAndEventQueueIsEmptyThenAttachDebuggerAndReadEventEscapesAreInvokedAndErrorNotAvailableReturned) { @@ -244,8 +244,8 @@ TEST_F(DebugApiWindowsTest, givenDebugSessionInitializeCalledAndEventQueueIsEmpt EXPECT_EQ(ZE_RESULT_ERROR_NOT_AVAILABLE, result); EXPECT_FALSE(session->moduleDebugAreaCaptured); - EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]); - EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_EVENT]); + EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]); + EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_EVENT]); } TEST_F(DebugApiWindowsTest, givenDebugSessionInitializeCalledAndEventQueueIsNotAmptyAndModuleDebugAreaIsNotCapturedThenAttachDebuggerAndReadEventEscapesAreInvokedAndErrorNotAvailableReturned) { @@ -260,8 +260,8 @@ TEST_F(DebugApiWindowsTest, givenDebugSessionInitializeCalledAndEventQueueIsNotA EXPECT_EQ(ZE_RESULT_ERROR_NOT_AVAILABLE, result); EXPECT_FALSE(session->moduleDebugAreaCaptured); - EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]); - EXPECT_EQ(2, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_EVENT]); + EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]); + EXPECT_EQ(2u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_EVENT]); } TEST_F(DebugApiWindowsTest, givenDebugSessionInitializeCalledAndEventQueueIsNotAmptyAndReadAllocationDataFailedThenAttachDebuggerAndReadEventAndReadAllocationDataEscapesAreInvokedAndResultUnknownIsReturned) { @@ -284,9 +284,9 @@ TEST_F(DebugApiWindowsTest, givenDebugSessionInitializeCalledAndEventQueueIsNotA EXPECT_EQ(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE, result); EXPECT_FALSE(session->moduleDebugAreaCaptured); - EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]); - EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_EVENT]); - EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_ALLOCATION_DATA]); + EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]); + EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_EVENT]); + EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_ALLOCATION_DATA]); } TEST_F(DebugApiWindowsTest, givenDebugSessionInitializeCalledAndEventQueueIsNotAmptyAndReadAllocationDataSucceedAndModuleDebugAreaNotCapturedThenAttachDebuggerAndReadEventAndReadAllocationDataEscapesAreInvokedAndResultUnavailableIsReturned) { @@ -308,9 +308,9 @@ TEST_F(DebugApiWindowsTest, givenDebugSessionInitializeCalledAndEventQueueIsNotA EXPECT_EQ(ZE_RESULT_ERROR_NOT_AVAILABLE, result); EXPECT_FALSE(session->moduleDebugAreaCaptured); - EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]); - EXPECT_EQ(2, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_EVENT]); - EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_ALLOCATION_DATA]); + EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]); + EXPECT_EQ(2u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_EVENT]); + EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_ALLOCATION_DATA]); } TEST_F(DebugApiWindowsTest, givenDebugSessionInitializeCalledAndEventQueueIsNotAmptyAndModuleDebugAreaIsCapturedThenAttachDebuggerAndReadEventEscapesAreInvokedAndResultSuccessReturned) { @@ -336,9 +336,9 @@ TEST_F(DebugApiWindowsTest, givenDebugSessionInitializeCalledAndEventQueueIsNotA EXPECT_EQ(ZE_RESULT_SUCCESS, result); EXPECT_TRUE(session->moduleDebugAreaCaptured); - EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]); - EXPECT_EQ(3, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_EVENT]); - EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_ALLOCATION_DATA]); + EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]); + EXPECT_EQ(3u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_EVENT]); + EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_ALLOCATION_DATA]); EXPECT_EQ(session->processId, config.pid); EXPECT_EQ(session->debugHandle, mockWddm->debugHandle); } @@ -369,14 +369,14 @@ TEST_F(DebugApiWindowsTest, givenDebugSessionInitializedAndCloseConnectionCalled auto result = session->initialize(); EXPECT_EQ(ZE_RESULT_SUCCESS, result); - EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]); - EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_EVENT]); - EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_ALLOCATION_DATA]); + EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]); + EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_EVENT]); + EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_ALLOCATION_DATA]); EXPECT_EQ(session->processId, config.pid); EXPECT_EQ(session->debugHandle, mockWddm->debugHandle); EXPECT_TRUE(session->closeConnection()); - EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_DETACH_DEBUGGER]); + EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_DETACH_DEBUGGER]); } TEST_F(DebugApiWindowsTest, givenNtStatusFailedWhenReadAndHandleEventCalledThenResultUnknownIsReturned) { @@ -464,10 +464,10 @@ TEST_F(DebugApiWindowsTest, givenDebugDataEventTypeWhenReadAndHandleEventCalledT mockWddm->eventQueue[0].eventParamsBuffer.eventParamsBuffer.ReadCreateDebugDataParams.DataBufferPtr = 0xa000; mockWddm->eventQueue[0].eventParamsBuffer.eventParamsBuffer.ReadCreateDebugDataParams.DataSize = 8; EXPECT_EQ(ZE_RESULT_SUCCESS, session->readAndHandleEvent(100)); - EXPECT_EQ(1, session->allElfs.size()); + EXPECT_EQ(1u, session->allElfs.size()); auto elf = session->allElfs[0]; - EXPECT_EQ(elf.startVA, 0xa000); - EXPECT_EQ(elf.endVA, 0xa008); + EXPECT_EQ(elf.startVA, 0xa000u); + EXPECT_EQ(elf.endVA, 0xa008u); } TEST_F(DebugApiWindowsTest, givenContextCreateEventTypeWhenReadAndHandleEventCalledThenAllContextsIsSetCorrectly) { @@ -483,18 +483,18 @@ TEST_F(DebugApiWindowsTest, givenContextCreateEventTypeWhenReadAndHandleEventCal mockWddm->eventQueue[0].eventParamsBuffer.eventParamsBuffer.ContextCreateDestroyEventParams.IsCreated = 1; mockWddm->eventQueue[0].eventParamsBuffer.eventParamsBuffer.ContextCreateDestroyEventParams.IsSIPInstalled = 0; EXPECT_EQ(ZE_RESULT_SUCCESS, session->readAndHandleEvent(100)); - EXPECT_EQ(0, session->allContexts.size()); + EXPECT_EQ(0u, session->allContexts.size()); mockWddm->curEvent = 0; mockWddm->eventQueue[0].eventParamsBuffer.eventParamsBuffer.ContextCreateDestroyEventParams.IsSIPInstalled = 1; EXPECT_EQ(ZE_RESULT_SUCCESS, session->readAndHandleEvent(100)); - EXPECT_EQ(1, session->allContexts.size()); - EXPECT_EQ(1, session->allContexts.count(0xa000)); + EXPECT_EQ(1u, session->allContexts.size()); + EXPECT_EQ(1u, session->allContexts.count(0xa000)); mockWddm->curEvent = 0; mockWddm->eventQueue[0].eventParamsBuffer.eventParamsBuffer.ContextCreateDestroyEventParams.IsCreated = 0; EXPECT_EQ(ZE_RESULT_SUCCESS, session->readAndHandleEvent(100)); - EXPECT_EQ(0, session->allContexts.size()); + EXPECT_EQ(0u, session->allContexts.size()); } TEST(DebugSessionWindowsTest, whenTranslateNtStatusCalledThenCorrectZeResultReturned) { @@ -557,7 +557,7 @@ TEST_F(DebugApiWindowsTest, WhenCallingReadGpuMemoryThenMemoryIsRead) { char output[bufferSize] = {}; auto result = session->readGpuMemory(7, output, bufferSize, 0x1234); EXPECT_EQ(ZE_RESULT_SUCCESS, result); - EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_GFX_MEMORY]); + EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_GFX_MEMORY]); for (int i = 0; i < bufferSize; i++) { EXPECT_EQ(static_cast(0xaa), output[i]); @@ -572,8 +572,8 @@ TEST_F(DebugApiWindowsTest, WhenCallingWriteGpuMemoryThenMemoryIsWritten) { char input[bufferSize] = {'h', 'e', 'l', 'l', 'o'}; auto result = session->writeGpuMemory(7, input, bufferSize, 0x1234); ASSERT_EQ(ZE_RESULT_SUCCESS, result); - ASSERT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_WRITE_GFX_MEMORY]); - ASSERT_EQ(0, memcmp(input, mockWddm->testBuffer, bufferSize)); + ASSERT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_WRITE_GFX_MEMORY]); + ASSERT_EQ(0u, memcmp(input, mockWddm->testBuffer, bufferSize)); } TEST_F(DebugApiWindowsTest, GivenInvalidDebugHandleWhenWritingMemoryThenErrorIsReturned) { @@ -666,8 +666,8 @@ TEST_F(DebugApiWindowsTest, WhenCallingWriteMemoryForAllThreadThenMemoryIsWritte session->allContexts.insert(0x12345); retVal = session->writeMemory(thread, &desc, bufferSize, input); - ASSERT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_WRITE_GFX_MEMORY]); - ASSERT_EQ(0, memcmp(input, mockWddm->testBuffer, bufferSize)); + ASSERT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_WRITE_GFX_MEMORY]); + ASSERT_EQ(0u, memcmp(input, mockWddm->testBuffer, bufferSize)); EXPECT_EQ(ZE_RESULT_SUCCESS, retVal); } @@ -691,12 +691,12 @@ TEST_F(DebugApiWindowsTest, WhenCallingWriteMemoryForSingleThreadThenMemoryIsWri session->ensureThreadStopped(thread, EuThread::invalidHandle); auto retVal = session->writeMemory(thread, &desc, bufferSize, input); EXPECT_EQ(ZE_RESULT_ERROR_NOT_AVAILABLE, retVal); - ASSERT_EQ(0, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_WRITE_GFX_MEMORY]); + ASSERT_EQ(0u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_WRITE_GFX_MEMORY]); session->ensureThreadStopped(thread, 0x12345); retVal = session->writeMemory(thread, &desc, bufferSize, input); - ASSERT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_WRITE_GFX_MEMORY]); - ASSERT_EQ(0, memcmp(input, mockWddm->testBuffer, bufferSize)); + ASSERT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_WRITE_GFX_MEMORY]); + ASSERT_EQ(0u, memcmp(input, mockWddm->testBuffer, bufferSize)); EXPECT_EQ(ZE_RESULT_SUCCESS, retVal); } @@ -723,7 +723,7 @@ TEST_F(DebugApiWindowsTest, WhenCallingReadMemoryForAllThreadThenMemoryIsWritten session->allContexts.insert(0x12345); retVal = session->readMemory(thread, &desc, bufferSize, output); - ASSERT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_GFX_MEMORY]); + ASSERT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_GFX_MEMORY]); for (int i = 0; i < bufferSize; i++) { EXPECT_EQ(static_cast(0xaa), output[i]); } @@ -751,12 +751,12 @@ TEST_F(DebugApiWindowsTest, WhenCallingReadMemoryForSingleThreadThenMemoryIsRead session->ensureThreadStopped(thread, EuThread::invalidHandle); auto retVal = session->readMemory(thread, &desc, bufferSize, output); EXPECT_EQ(ZE_RESULT_ERROR_NOT_AVAILABLE, retVal); - ASSERT_EQ(0, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_GFX_MEMORY]); + ASSERT_EQ(0u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_GFX_MEMORY]); session->ensureThreadStopped(thread, 0x12345); retVal = session->readMemory(thread, &desc, bufferSize, output); - ASSERT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_GFX_MEMORY]); + ASSERT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_GFX_MEMORY]); for (int i = 0; i < bufferSize; i++) { EXPECT_EQ(static_cast(0xaa), output[i]); } @@ -790,12 +790,12 @@ TEST_F(DebugApiWindowsTest, WhenCallingReadMemoryForElfThenUnsupportedFeatureIsR desc.address = elfVaStart; desc.type = ZET_DEBUG_MEMORY_SPACE_TYPE_DEFAULT; auto retVal = session->readMemory(thread, &desc, bufferSize, output); - ASSERT_EQ(0, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_GFX_MEMORY]); + ASSERT_EQ(0u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_GFX_MEMORY]); EXPECT_EQ(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE, retVal); desc.address = elfVaEnd - 1; retVal = session->readMemory(thread, &desc, bufferSize, output); - ASSERT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_GFX_MEMORY]); + ASSERT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_GFX_MEMORY]); EXPECT_EQ(ZE_RESULT_SUCCESS, retVal); delete[] elfData; diff --git a/opencl/test/unit_test/os_interface/windows/os_time_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/os_time_win_tests.cpp index 01b67100e7..4e6ef06716 100644 --- a/opencl/test/unit_test/os_interface/windows/os_time_win_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/os_time_win_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -74,7 +74,7 @@ TEST(OSTimeWinTests, givenNoOSInterfaceWhenGetCpuTimeThenReturnsSuccess) { auto osTime(OSTime::create(nullptr)); auto error = osTime->getCpuTime(&time); EXPECT_TRUE(error); - EXPECT_NE(0, time); + EXPECT_NE(0u, time); } TEST(OSTimeWinTests, givenNoOSInterfaceWhenGetCpuGpuTimeThenReturnsError) { @@ -82,8 +82,8 @@ TEST(OSTimeWinTests, givenNoOSInterfaceWhenGetCpuGpuTimeThenReturnsError) { auto osTime(OSTime::create(nullptr)); auto success = osTime->getCpuGpuTime(&CPUGPUTime); EXPECT_FALSE(success); - EXPECT_EQ(0, CPUGPUTime.CPUTimeinNS); - EXPECT_EQ(0, CPUGPUTime.GPUTimeStamp); + EXPECT_EQ(0u, CPUGPUTime.CPUTimeinNS); + EXPECT_EQ(0u, CPUGPUTime.GPUTimeStamp); } TEST(OSTimeWinTests, givenOSInterfaceWhenGetCpuGpuTimeThenReturnsSuccess) { @@ -98,12 +98,12 @@ TEST(OSTimeWinTests, givenOSInterfaceWhenGetCpuGpuTimeThenReturnsSuccess) { auto osTime = OSTime::create(osInterface.get()); auto success = osTime->getCpuGpuTime(&CPUGPUTime01); EXPECT_TRUE(success); - EXPECT_NE(0, CPUGPUTime01.CPUTimeinNS); - EXPECT_NE(0, CPUGPUTime01.GPUTimeStamp); + EXPECT_NE(0u, CPUGPUTime01.CPUTimeinNS); + EXPECT_NE(0u, CPUGPUTime01.GPUTimeStamp); success = osTime->getCpuGpuTime(&CPUGPUTime02); EXPECT_TRUE(success); - EXPECT_NE(0, CPUGPUTime02.CPUTimeinNS); - EXPECT_NE(0, CPUGPUTime02.GPUTimeStamp); + EXPECT_NE(0u, CPUGPUTime02.CPUTimeinNS); + EXPECT_NE(0u, CPUGPUTime02.GPUTimeStamp); EXPECT_GT(CPUGPUTime02.GPUTimeStamp, CPUGPUTime01.GPUTimeStamp); EXPECT_GT(CPUGPUTime02.CPUTimeinNS, CPUGPUTime01.CPUTimeinNS); } diff --git a/opencl/test/unit_test/os_interface/windows/registry_reader_tests.cpp b/opencl/test/unit_test/os_interface/windows/registry_reader_tests.cpp index 444ae04d5e..70b9c3b267 100644 --- a/opencl/test/unit_test/os_interface/windows/registry_reader_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/registry_reader_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -80,28 +80,28 @@ TEST_F(DebugReaderWithRegistryAndEnvTest, givenIntDebugKeyWhenReadFromRegistrySu SysCalls::regOpenKeySuccessCount = 1u; SysCalls::regQueryValueSuccessCount = 1u; - EXPECT_EQ(1, registryReader.getSetting("settingSourceInt", 0)); + EXPECT_EQ(1u, registryReader.getSetting("settingSourceInt", 0)); } TEST_F(DebugReaderWithRegistryAndEnvTest, givenInt64DebugKeyWhenReadFromRegistrySucceedsThenReturnObtainedValue) { SysCalls::regOpenKeySuccessCount = 1u; SysCalls::regQueryValueSuccessCount = 1u; - EXPECT_EQ(0xffffffffeeeeeeee, registryReader.getSetting("settingSourceInt64", 0)); + EXPECT_EQ(0xeeeeeeee, registryReader.getSetting("settingSourceInt64", 0)); } TEST_F(DebugReaderWithRegistryAndEnvTest, givenIntDebugKeyWhenQueryValueFailsThenObtainValueFromEnv) { SysCalls::regOpenKeySuccessCount = 1u; SysCalls::regQueryValueSuccessCount = 0u; - EXPECT_EQ(2, registryReader.getSetting("settingSourceInt", 0)); + EXPECT_EQ(2u, registryReader.getSetting("settingSourceInt", 0)); } TEST_F(DebugReaderWithRegistryAndEnvTest, givenIntDebugKeyWhenOpenKeyFailsThenObtainValueFromEnv) { SysCalls::regOpenKeySuccessCount = 0u; SysCalls::regQueryValueSuccessCount = 0u; - EXPECT_EQ(2, registryReader.getSetting("settingSourceInt", 0)); + EXPECT_EQ(2u, registryReader.getSetting("settingSourceInt", 0)); } TEST_F(DebugReaderWithRegistryAndEnvTest, givenStringDebugKeyWhenReadFromRegistrySucceedsThenReturnObtainedValue) { diff --git a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.cpp index 44fb87b351..77afa01446 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.cpp @@ -450,7 +450,7 @@ TEST_F(WddmMemoryManagerSimpleTest, givenAllocationWithoutHighPriorityWhenMemory ASSERT_NE(nullptr, allocation); EXPECT_EQ(MemoryManager::AllocationStatus::Success, status); EXPECT_EQ(1u, wddm->setAllocationPriorityResult.called); - EXPECT_EQ(DXGI_RESOURCE_PRIORITY_NORMAL, wddm->setAllocationPriorityResult.uint64ParamPassed); + EXPECT_EQ(static_cast(DXGI_RESOURCE_PRIORITY_NORMAL), wddm->setAllocationPriorityResult.uint64ParamPassed); memoryManager->freeGraphicsMemory(allocation); } diff --git a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp index a2050b20a0..34fd9ba9a0 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp @@ -545,7 +545,7 @@ TEST_F(WddmMemoryManagerSimpleTest, givenNonZeroFenceValueOnSomeOfMultipleEngine memoryManager->handleFenceCompletion(allocation); EXPECT_EQ(1u, wddm->waitFromCpuResult.called); - EXPECT_EQ(129, wddm->waitFromCpuResult.uint64ParamPassed); + EXPECT_EQ(129u, wddm->waitFromCpuResult.uint64ParamPassed); EXPECT_EQ(lastEngineFence, wddm->waitFromCpuResult.monitoredFence); memoryManager->freeGraphicsMemory(allocation); @@ -1160,7 +1160,7 @@ TEST_F(WddmMemoryManagerTest, GivenUnAlignedPointerAndSizeWhenAllocate32BitMemor void *ptr = reinterpret_cast(0x1001); auto *gpuAllocation = memoryManager->allocate32BitGraphicsMemory(rootDeviceIndex, size, ptr, AllocationType::BUFFER); EXPECT_EQ(reinterpret_cast(0x1000), reinterpret_cast(gpuAllocation->getDefaultGmm()->resourceParams.pExistingSysMem)); - EXPECT_EQ(0x2000, gpuAllocation->getDefaultGmm()->resourceParams.ExistingSysMemSize); + EXPECT_EQ(0x2000u, gpuAllocation->getDefaultGmm()->resourceParams.ExistingSysMemSize); memoryManager->freeGraphicsMemory(gpuAllocation); } @@ -1575,7 +1575,7 @@ TEST_F(BufferWithWddmMemory, givenFragmentsThatAreNotInOrderWhenGraphicsAllocati osHandle->gpuPtr = gpuAdress; memoryManager->getHostPtrManager()->storeFragment(rootDeviceIndex, fragment); - auto offset = 80; + auto offset = 80u; auto allocationPtr = ptrOffset(ptr, offset); AllocationData allocationData; allocationData.size = size; diff --git a/opencl/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp index 3694335240..8ef9219743 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp @@ -242,11 +242,11 @@ TEST_F(WddmResidencyControllerTest, givenWddmResidencyControllerWhenCallingWasAl TEST_F(WddmResidencyControllerTest, givenWddmResidencyControllerThenUpdateLastTrimFenceValueUsesMonitoredFence) { *residencyController->getMonitoredFence().cpuAddress = 1234; residencyController->updateLastTrimFenceValue(); - EXPECT_EQ(1234, residencyController->lastTrimFenceValue); + EXPECT_EQ(1234u, residencyController->lastTrimFenceValue); *residencyController->getMonitoredFence().cpuAddress = 12345; residencyController->updateLastTrimFenceValue(); - EXPECT_EQ(12345, residencyController->lastTrimFenceValue); + EXPECT_EQ(12345u, residencyController->lastTrimFenceValue); } TEST_F(WddmResidencyControllerWithGdiTest, givenWddmResidencyControllerWhenItIsDestructedThenUnregisterTrimCallback) { diff --git a/opencl/test/unit_test/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp b/opencl/test/unit_test/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp index 10c39a0e26..48253e24d5 100644 --- a/opencl/test/unit_test/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp +++ b/opencl/test/unit_test/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp @@ -92,7 +92,7 @@ HWTEST_F(EnqueueBufferWindowsTest, givenMisalignedHostPtrWhenEnqueueReadBufferCa buffer->forceDisallowCPUCopy = true; auto retVal = cmdQ->enqueueReadBuffer(buffer.get(), CL_FALSE, 0, 4, misalignedPtr, nullptr, 0, nullptr, nullptr); EXPECT_EQ(CL_SUCCESS, retVal); - ASSERT_NE(0, cmdQ->lastEnqueuedKernels.size()); + ASSERT_NE(0u, cmdQ->lastEnqueuedKernels.size()); Kernel *kernel = cmdQ->lastEnqueuedKernels[0]; auto hostPtrAllocation = cmdQ->getGpgpuCommandStreamReceiver().getInternalAllocationStorage()->getTemporaryAllocations().peekHead(); diff --git a/opencl/test/unit_test/sharings/gl/windows/gl_reused_buffers_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_reused_buffers_tests.cpp index f1121467cd..f964de0353 100644 --- a/opencl/test/unit_test/sharings/gl/windows/gl_reused_buffers_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/windows/gl_reused_buffers_tests.cpp @@ -178,19 +178,19 @@ TEST_F(GlReusedBufferTests, givenMultipleBuffersAndGlobalShareHandleChangedWhenA auto graphicsAllocation1 = clBuffer1->getGraphicsAllocation(rootDeviceIndex); auto graphicsAllocation2 = clBuffer2->getGraphicsAllocation(rootDeviceIndex); ASSERT_EQ(graphicsAllocation1, graphicsAllocation2); - ASSERT_EQ(2, graphicsAllocation1->peekReuseCount()); - ASSERT_EQ(1, graphicsAllocationsForGlBufferReuse->size()); + ASSERT_EQ(2u, graphicsAllocation1->peekReuseCount()); + ASSERT_EQ(1u, graphicsAllocationsForGlBufferReuse->size()); bufferInfoOutput.globalShareHandle = 41; dllParam.loadBuffer(bufferInfoOutput); clBuffer1->peekSharingHandler()->acquire(clBuffer1.get(), rootDeviceIndex); auto newGraphicsAllocation = clBuffer1->getGraphicsAllocation(rootDeviceIndex); - EXPECT_EQ(1, graphicsAllocationsForGlBufferReuse->size()); + EXPECT_EQ(1u, graphicsAllocationsForGlBufferReuse->size()); EXPECT_EQ(newGraphicsAllocation, graphicsAllocationsForGlBufferReuse->at(0).second); clBuffer2->peekSharingHandler()->acquire(clBuffer2.get(), rootDeviceIndex); EXPECT_EQ(clBuffer2->getGraphicsAllocation(rootDeviceIndex), newGraphicsAllocation); - EXPECT_EQ(1, graphicsAllocationsForGlBufferReuse->size()); + EXPECT_EQ(1u, graphicsAllocationsForGlBufferReuse->size()); EXPECT_EQ(newGraphicsAllocation, graphicsAllocationsForGlBufferReuse->at(0).second); clBuffer1->peekSharingHandler()->release(clBuffer1.get(), rootDeviceIndex); diff --git a/shared/test/common/mocks/mock_wddm.cpp b/shared/test/common/mocks/mock_wddm.cpp index a57abc62cf..97a7f2c174 100644 --- a/shared/test/common/mocks/mock_wddm.cpp +++ b/shared/test/common/mocks/mock_wddm.cpp @@ -34,7 +34,7 @@ WddmMock::WddmMock(RootDeviceEnvironment &rootDeviceEnvironment) : Wddm(std::mak }; WddmMock::~WddmMock() { - EXPECT_EQ(0, reservedAddresses.size()); + EXPECT_EQ(0u, reservedAddresses.size()); } bool WddmMock::makeResident(const D3DKMT_HANDLE *handles, uint32_t count, bool cantTrimFurther, uint64_t *numberOfBytesToTrim, size_t totalSize) { diff --git a/shared/test/unit_test/os_interface/windows/um_km_data_translator_tests.cpp b/shared/test/unit_test/os_interface/windows/um_km_data_translator_tests.cpp index 4115e24b10..14e8874143 100644 --- a/shared/test/unit_test/os_interface/windows/um_km_data_translator_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/um_km_data_translator_tests.cpp @@ -281,7 +281,7 @@ TEST(WslUmKmDataTranslator, whenOpeningExistingHandleThenResourceInfoIsCopiedBas UmKmDataTempStorage gmmResInfoDst2(handleSize); gmmHandleAllocator->openHandle(gmmResourceInfoHandle, reinterpret_cast(gmmResInfoDst2.data()), sizeof(TOK_S_GMM_RESOURCE_INFO_WIN_STRUCT) + 4); - EXPECT_EQ(0, reinterpret_cast(reinterpret_cast(gmmResInfoDst2.data())->GetPrivateData())); + EXPECT_EQ(0u, reinterpret_cast(reinterpret_cast(gmmResInfoDst2.data())->GetPrivateData())); gmmHandleAllocator->destroyHandle(gmmResourceInfoHandle); } @@ -309,13 +309,13 @@ TEST(WslUmKmDataTranslator, whenTranslatingGraphicsPartitionThenResultIsBasedOnW dst.Heap32->Base = 0; auto ret = translatorV0->translateGmmGfxPartitioningToInternalRepresentation(&dst, sizeof(GMM_GFX_PARTITIONING), src); EXPECT_TRUE(ret); - EXPECT_EQ(7, dst.Heap32->Base); + EXPECT_EQ(7u, dst.Heap32->Base); src.Heap32->Base = 7; dst.Heap32->Base = 0; ret = translatorV1->translateGmmGfxPartitioningToInternalRepresentation(&dst, sizeof(GMM_GFX_PARTITIONING), src); EXPECT_FALSE(ret); - EXPECT_EQ(0, dst.Heap32->Base); + EXPECT_EQ(0u, dst.Heap32->Base); src.Heap32->Base = 7; dst.Heap32->Base = 0; @@ -327,13 +327,13 @@ TEST(WslUmKmDataTranslator, whenTranslatingGraphicsPartitionThenResultIsBasedOnW dst.Heap32->Base = 0; ret = translatorV0->translateGmmGfxPartitioningFromInternalRepresentation(dst, &src, sizeof(GMM_GFX_PARTITIONING)); EXPECT_TRUE(ret); - EXPECT_EQ(7, dst.Heap32->Base); + EXPECT_EQ(7u, dst.Heap32->Base); src.Heap32->Base = 7; dst.Heap32->Base = 0; ret = translatorV1->translateGmmGfxPartitioningFromInternalRepresentation(dst, &src, sizeof(GMM_GFX_PARTITIONING)); EXPECT_FALSE(ret); - EXPECT_EQ(0, dst.Heap32->Base); + EXPECT_EQ(0u, dst.Heap32->Base); src.Heap32->Base = 7; dst.Heap32->Base = 0;