Skip to content

Commit aff0ea9

Browse files
BartoszDunajskiCompute-Runtime-Automation
BartoszDunajski
authored and
Compute-Runtime-Automation
committed
Enable signed/unsigned mismatch warning for MSVC
Signed-off-by: Bartosz Dunajski <[email protected]>
1 parent 3007159 commit aff0ea9

File tree

11 files changed

+70
-70
lines changed

11 files changed

+70
-70
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ if(MSVC)
529529
if(NOT CMAKE_CXX_FLAGS MATCHES "/WX")
530530
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
531531
if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
532-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /we4189")
532+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /we4189 /we4388")
533533
endif()
534534
endif()
535535

‎level_zero/tools/test/unit_tests/sources/debug/windows/test_debug_api_windows.cpp‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ TEST_F(DebugApiWindowsTest, givenDebugSessionInitializeCalledAndDebugAttachNtSta
215215

216216
EXPECT_EQ(ZE_RESULT_ERROR_UNKNOWN, result);
217217
EXPECT_FALSE(session->moduleDebugAreaCaptured);
218-
EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]);
218+
EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]);
219219
}
220220

221221
TEST_F(DebugApiWindowsTest, givenDebugSessionInitializeCalledAndDebugAttachEscapeReturnStatusIsFailedThenErrorUnsupportedFetaureReturned) {
@@ -229,7 +229,7 @@ TEST_F(DebugApiWindowsTest, givenDebugSessionInitializeCalledAndDebugAttachEscap
229229

230230
EXPECT_EQ(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE, result);
231231
EXPECT_FALSE(session->moduleDebugAreaCaptured);
232-
EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]);
232+
EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]);
233233
}
234234

235235
TEST_F(DebugApiWindowsTest, givenDebugSessionInitializeCalledAndEventQueueIsEmptyThenAttachDebuggerAndReadEventEscapesAreInvokedAndErrorNotAvailableReturned) {
@@ -244,8 +244,8 @@ TEST_F(DebugApiWindowsTest, givenDebugSessionInitializeCalledAndEventQueueIsEmpt
244244

245245
EXPECT_EQ(ZE_RESULT_ERROR_NOT_AVAILABLE, result);
246246
EXPECT_FALSE(session->moduleDebugAreaCaptured);
247-
EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]);
248-
EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_EVENT]);
247+
EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]);
248+
EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_EVENT]);
249249
}
250250

251251
TEST_F(DebugApiWindowsTest, givenDebugSessionInitializeCalledAndEventQueueIsNotAmptyAndModuleDebugAreaIsNotCapturedThenAttachDebuggerAndReadEventEscapesAreInvokedAndErrorNotAvailableReturned) {
@@ -260,8 +260,8 @@ TEST_F(DebugApiWindowsTest, givenDebugSessionInitializeCalledAndEventQueueIsNotA
260260

261261
EXPECT_EQ(ZE_RESULT_ERROR_NOT_AVAILABLE, result);
262262
EXPECT_FALSE(session->moduleDebugAreaCaptured);
263-
EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]);
264-
EXPECT_EQ(2, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_EVENT]);
263+
EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]);
264+
EXPECT_EQ(2u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_EVENT]);
265265
}
266266

267267
TEST_F(DebugApiWindowsTest, givenDebugSessionInitializeCalledAndEventQueueIsNotAmptyAndReadAllocationDataFailedThenAttachDebuggerAndReadEventAndReadAllocationDataEscapesAreInvokedAndResultUnknownIsReturned) {
@@ -284,9 +284,9 @@ TEST_F(DebugApiWindowsTest, givenDebugSessionInitializeCalledAndEventQueueIsNotA
284284

285285
EXPECT_EQ(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE, result);
286286
EXPECT_FALSE(session->moduleDebugAreaCaptured);
287-
EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]);
288-
EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_EVENT]);
289-
EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_ALLOCATION_DATA]);
287+
EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]);
288+
EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_EVENT]);
289+
EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_ALLOCATION_DATA]);
290290
}
291291

292292
TEST_F(DebugApiWindowsTest, givenDebugSessionInitializeCalledAndEventQueueIsNotAmptyAndReadAllocationDataSucceedAndModuleDebugAreaNotCapturedThenAttachDebuggerAndReadEventAndReadAllocationDataEscapesAreInvokedAndResultUnavailableIsReturned) {
@@ -308,9 +308,9 @@ TEST_F(DebugApiWindowsTest, givenDebugSessionInitializeCalledAndEventQueueIsNotA
308308

309309
EXPECT_EQ(ZE_RESULT_ERROR_NOT_AVAILABLE, result);
310310
EXPECT_FALSE(session->moduleDebugAreaCaptured);
311-
EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]);
312-
EXPECT_EQ(2, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_EVENT]);
313-
EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_ALLOCATION_DATA]);
311+
EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]);
312+
EXPECT_EQ(2u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_EVENT]);
313+
EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_ALLOCATION_DATA]);
314314
}
315315

316316
TEST_F(DebugApiWindowsTest, givenDebugSessionInitializeCalledAndEventQueueIsNotAmptyAndModuleDebugAreaIsCapturedThenAttachDebuggerAndReadEventEscapesAreInvokedAndResultSuccessReturned) {
@@ -336,9 +336,9 @@ TEST_F(DebugApiWindowsTest, givenDebugSessionInitializeCalledAndEventQueueIsNotA
336336

337337
EXPECT_EQ(ZE_RESULT_SUCCESS, result);
338338
EXPECT_TRUE(session->moduleDebugAreaCaptured);
339-
EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]);
340-
EXPECT_EQ(3, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_EVENT]);
341-
EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_ALLOCATION_DATA]);
339+
EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]);
340+
EXPECT_EQ(3u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_EVENT]);
341+
EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_ALLOCATION_DATA]);
342342
EXPECT_EQ(session->processId, config.pid);
343343
EXPECT_EQ(session->debugHandle, mockWddm->debugHandle);
344344
}
@@ -369,14 +369,14 @@ TEST_F(DebugApiWindowsTest, givenDebugSessionInitializedAndCloseConnectionCalled
369369
auto result = session->initialize();
370370

371371
EXPECT_EQ(ZE_RESULT_SUCCESS, result);
372-
EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]);
373-
EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_EVENT]);
374-
EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_ALLOCATION_DATA]);
372+
EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_ATTACH_DEBUGGER]);
373+
EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_EVENT]);
374+
EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_ALLOCATION_DATA]);
375375
EXPECT_EQ(session->processId, config.pid);
376376
EXPECT_EQ(session->debugHandle, mockWddm->debugHandle);
377377

378378
EXPECT_TRUE(session->closeConnection());
379-
EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_DETACH_DEBUGGER]);
379+
EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_DETACH_DEBUGGER]);
380380
}
381381

382382
TEST_F(DebugApiWindowsTest, givenNtStatusFailedWhenReadAndHandleEventCalledThenResultUnknownIsReturned) {
@@ -464,10 +464,10 @@ TEST_F(DebugApiWindowsTest, givenDebugDataEventTypeWhenReadAndHandleEventCalledT
464464
mockWddm->eventQueue[0].eventParamsBuffer.eventParamsBuffer.ReadCreateDebugDataParams.DataBufferPtr = 0xa000;
465465
mockWddm->eventQueue[0].eventParamsBuffer.eventParamsBuffer.ReadCreateDebugDataParams.DataSize = 8;
466466
EXPECT_EQ(ZE_RESULT_SUCCESS, session->readAndHandleEvent(100));
467-
EXPECT_EQ(1, session->allElfs.size());
467+
EXPECT_EQ(1u, session->allElfs.size());
468468
auto elf = session->allElfs[0];
469-
EXPECT_EQ(elf.startVA, 0xa000);
470-
EXPECT_EQ(elf.endVA, 0xa008);
469+
EXPECT_EQ(elf.startVA, 0xa000u);
470+
EXPECT_EQ(elf.endVA, 0xa008u);
471471
}
472472

473473
TEST_F(DebugApiWindowsTest, givenContextCreateEventTypeWhenReadAndHandleEventCalledThenAllContextsIsSetCorrectly) {
@@ -483,18 +483,18 @@ TEST_F(DebugApiWindowsTest, givenContextCreateEventTypeWhenReadAndHandleEventCal
483483
mockWddm->eventQueue[0].eventParamsBuffer.eventParamsBuffer.ContextCreateDestroyEventParams.IsCreated = 1;
484484
mockWddm->eventQueue[0].eventParamsBuffer.eventParamsBuffer.ContextCreateDestroyEventParams.IsSIPInstalled = 0;
485485
EXPECT_EQ(ZE_RESULT_SUCCESS, session->readAndHandleEvent(100));
486-
EXPECT_EQ(0, session->allContexts.size());
486+
EXPECT_EQ(0u, session->allContexts.size());
487487

488488
mockWddm->curEvent = 0;
489489
mockWddm->eventQueue[0].eventParamsBuffer.eventParamsBuffer.ContextCreateDestroyEventParams.IsSIPInstalled = 1;
490490
EXPECT_EQ(ZE_RESULT_SUCCESS, session->readAndHandleEvent(100));
491-
EXPECT_EQ(1, session->allContexts.size());
492-
EXPECT_EQ(1, session->allContexts.count(0xa000));
491+
EXPECT_EQ(1u, session->allContexts.size());
492+
EXPECT_EQ(1u, session->allContexts.count(0xa000));
493493

494494
mockWddm->curEvent = 0;
495495
mockWddm->eventQueue[0].eventParamsBuffer.eventParamsBuffer.ContextCreateDestroyEventParams.IsCreated = 0;
496496
EXPECT_EQ(ZE_RESULT_SUCCESS, session->readAndHandleEvent(100));
497-
EXPECT_EQ(0, session->allContexts.size());
497+
EXPECT_EQ(0u, session->allContexts.size());
498498
}
499499

500500
TEST(DebugSessionWindowsTest, whenTranslateNtStatusCalledThenCorrectZeResultReturned) {
@@ -557,7 +557,7 @@ TEST_F(DebugApiWindowsTest, WhenCallingReadGpuMemoryThenMemoryIsRead) {
557557
char output[bufferSize] = {};
558558
auto result = session->readGpuMemory(7, output, bufferSize, 0x1234);
559559
EXPECT_EQ(ZE_RESULT_SUCCESS, result);
560-
EXPECT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_GFX_MEMORY]);
560+
EXPECT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_GFX_MEMORY]);
561561

562562
for (int i = 0; i < bufferSize; i++) {
563563
EXPECT_EQ(static_cast<char>(0xaa), output[i]);
@@ -572,8 +572,8 @@ TEST_F(DebugApiWindowsTest, WhenCallingWriteGpuMemoryThenMemoryIsWritten) {
572572
char input[bufferSize] = {'h', 'e', 'l', 'l', 'o'};
573573
auto result = session->writeGpuMemory(7, input, bufferSize, 0x1234);
574574
ASSERT_EQ(ZE_RESULT_SUCCESS, result);
575-
ASSERT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_WRITE_GFX_MEMORY]);
576-
ASSERT_EQ(0, memcmp(input, mockWddm->testBuffer, bufferSize));
575+
ASSERT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_WRITE_GFX_MEMORY]);
576+
ASSERT_EQ(0u, memcmp(input, mockWddm->testBuffer, bufferSize));
577577
}
578578

579579
TEST_F(DebugApiWindowsTest, GivenInvalidDebugHandleWhenWritingMemoryThenErrorIsReturned) {
@@ -666,8 +666,8 @@ TEST_F(DebugApiWindowsTest, WhenCallingWriteMemoryForAllThreadThenMemoryIsWritte
666666
session->allContexts.insert(0x12345);
667667

668668
retVal = session->writeMemory(thread, &desc, bufferSize, input);
669-
ASSERT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_WRITE_GFX_MEMORY]);
670-
ASSERT_EQ(0, memcmp(input, mockWddm->testBuffer, bufferSize));
669+
ASSERT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_WRITE_GFX_MEMORY]);
670+
ASSERT_EQ(0u, memcmp(input, mockWddm->testBuffer, bufferSize));
671671
EXPECT_EQ(ZE_RESULT_SUCCESS, retVal);
672672
}
673673

@@ -691,12 +691,12 @@ TEST_F(DebugApiWindowsTest, WhenCallingWriteMemoryForSingleThreadThenMemoryIsWri
691691
session->ensureThreadStopped(thread, EuThread::invalidHandle);
692692
auto retVal = session->writeMemory(thread, &desc, bufferSize, input);
693693
EXPECT_EQ(ZE_RESULT_ERROR_NOT_AVAILABLE, retVal);
694-
ASSERT_EQ(0, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_WRITE_GFX_MEMORY]);
694+
ASSERT_EQ(0u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_WRITE_GFX_MEMORY]);
695695

696696
session->ensureThreadStopped(thread, 0x12345);
697697
retVal = session->writeMemory(thread, &desc, bufferSize, input);
698-
ASSERT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_WRITE_GFX_MEMORY]);
699-
ASSERT_EQ(0, memcmp(input, mockWddm->testBuffer, bufferSize));
698+
ASSERT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_WRITE_GFX_MEMORY]);
699+
ASSERT_EQ(0u, memcmp(input, mockWddm->testBuffer, bufferSize));
700700
EXPECT_EQ(ZE_RESULT_SUCCESS, retVal);
701701
}
702702

@@ -723,7 +723,7 @@ TEST_F(DebugApiWindowsTest, WhenCallingReadMemoryForAllThreadThenMemoryIsWritten
723723
session->allContexts.insert(0x12345);
724724

725725
retVal = session->readMemory(thread, &desc, bufferSize, output);
726-
ASSERT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_GFX_MEMORY]);
726+
ASSERT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_GFX_MEMORY]);
727727
for (int i = 0; i < bufferSize; i++) {
728728
EXPECT_EQ(static_cast<char>(0xaa), output[i]);
729729
}
@@ -751,12 +751,12 @@ TEST_F(DebugApiWindowsTest, WhenCallingReadMemoryForSingleThreadThenMemoryIsRead
751751
session->ensureThreadStopped(thread, EuThread::invalidHandle);
752752
auto retVal = session->readMemory(thread, &desc, bufferSize, output);
753753
EXPECT_EQ(ZE_RESULT_ERROR_NOT_AVAILABLE, retVal);
754-
ASSERT_EQ(0, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_GFX_MEMORY]);
754+
ASSERT_EQ(0u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_GFX_MEMORY]);
755755

756756
session->ensureThreadStopped(thread, 0x12345);
757757

758758
retVal = session->readMemory(thread, &desc, bufferSize, output);
759-
ASSERT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_GFX_MEMORY]);
759+
ASSERT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_GFX_MEMORY]);
760760
for (int i = 0; i < bufferSize; i++) {
761761
EXPECT_EQ(static_cast<char>(0xaa), output[i]);
762762
}
@@ -790,12 +790,12 @@ TEST_F(DebugApiWindowsTest, WhenCallingReadMemoryForElfThenUnsupportedFeatureIsR
790790
desc.address = elfVaStart;
791791
desc.type = ZET_DEBUG_MEMORY_SPACE_TYPE_DEFAULT;
792792
auto retVal = session->readMemory(thread, &desc, bufferSize, output);
793-
ASSERT_EQ(0, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_GFX_MEMORY]);
793+
ASSERT_EQ(0u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_GFX_MEMORY]);
794794
EXPECT_EQ(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE, retVal);
795795

796796
desc.address = elfVaEnd - 1;
797797
retVal = session->readMemory(thread, &desc, bufferSize, output);
798-
ASSERT_EQ(1, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_GFX_MEMORY]);
798+
ASSERT_EQ(1u, mockWddm->dbgUmdEscapeActionCalled[DBGUMD_ACTION_READ_GFX_MEMORY]);
799799
EXPECT_EQ(ZE_RESULT_SUCCESS, retVal);
800800

801801
delete[] elfData;

‎opencl/test/unit_test/os_interface/windows/os_time_win_tests.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2018-2021 Intel Corporation
2+
* Copyright (C) 2018-2022 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -74,16 +74,16 @@ TEST(OSTimeWinTests, givenNoOSInterfaceWhenGetCpuTimeThenReturnsSuccess) {
7474
auto osTime(OSTime::create(nullptr));
7575
auto error = osTime->getCpuTime(&time);
7676
EXPECT_TRUE(error);
77-
EXPECT_NE(0, time);
77+
EXPECT_NE(0u, time);
7878
}
7979

8080
TEST(OSTimeWinTests, givenNoOSInterfaceWhenGetCpuGpuTimeThenReturnsError) {
8181
TimeStampData CPUGPUTime = {0};
8282
auto osTime(OSTime::create(nullptr));
8383
auto success = osTime->getCpuGpuTime(&CPUGPUTime);
8484
EXPECT_FALSE(success);
85-
EXPECT_EQ(0, CPUGPUTime.CPUTimeinNS);
86-
EXPECT_EQ(0, CPUGPUTime.GPUTimeStamp);
85+
EXPECT_EQ(0u, CPUGPUTime.CPUTimeinNS);
86+
EXPECT_EQ(0u, CPUGPUTime.GPUTimeStamp);
8787
}
8888

8989
TEST(OSTimeWinTests, givenOSInterfaceWhenGetCpuGpuTimeThenReturnsSuccess) {
@@ -98,12 +98,12 @@ TEST(OSTimeWinTests, givenOSInterfaceWhenGetCpuGpuTimeThenReturnsSuccess) {
9898
auto osTime = OSTime::create(osInterface.get());
9999
auto success = osTime->getCpuGpuTime(&CPUGPUTime01);
100100
EXPECT_TRUE(success);
101-
EXPECT_NE(0, CPUGPUTime01.CPUTimeinNS);
102-
EXPECT_NE(0, CPUGPUTime01.GPUTimeStamp);
101+
EXPECT_NE(0u, CPUGPUTime01.CPUTimeinNS);
102+
EXPECT_NE(0u, CPUGPUTime01.GPUTimeStamp);
103103
success = osTime->getCpuGpuTime(&CPUGPUTime02);
104104
EXPECT_TRUE(success);
105-
EXPECT_NE(0, CPUGPUTime02.CPUTimeinNS);
106-
EXPECT_NE(0, CPUGPUTime02.GPUTimeStamp);
105+
EXPECT_NE(0u, CPUGPUTime02.CPUTimeinNS);
106+
EXPECT_NE(0u, CPUGPUTime02.GPUTimeStamp);
107107
EXPECT_GT(CPUGPUTime02.GPUTimeStamp, CPUGPUTime01.GPUTimeStamp);
108108
EXPECT_GT(CPUGPUTime02.CPUTimeinNS, CPUGPUTime01.CPUTimeinNS);
109109
}

‎opencl/test/unit_test/os_interface/windows/registry_reader_tests.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2018-2021 Intel Corporation
2+
* Copyright (C) 2018-2022 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -80,28 +80,28 @@ TEST_F(DebugReaderWithRegistryAndEnvTest, givenIntDebugKeyWhenReadFromRegistrySu
8080
SysCalls::regOpenKeySuccessCount = 1u;
8181
SysCalls::regQueryValueSuccessCount = 1u;
8282

83-
EXPECT_EQ(1, registryReader.getSetting("settingSourceInt", 0));
83+
EXPECT_EQ(1u, registryReader.getSetting("settingSourceInt", 0));
8484
}
8585

8686
TEST_F(DebugReaderWithRegistryAndEnvTest, givenInt64DebugKeyWhenReadFromRegistrySucceedsThenReturnObtainedValue) {
8787
SysCalls::regOpenKeySuccessCount = 1u;
8888
SysCalls::regQueryValueSuccessCount = 1u;
8989

90-
EXPECT_EQ(0xffffffffeeeeeeee, registryReader.getSetting("settingSourceInt64", 0));
90+
EXPECT_EQ(0xeeeeeeee, registryReader.getSetting("settingSourceInt64", 0));
9191
}
9292

9393
TEST_F(DebugReaderWithRegistryAndEnvTest, givenIntDebugKeyWhenQueryValueFailsThenObtainValueFromEnv) {
9494
SysCalls::regOpenKeySuccessCount = 1u;
9595
SysCalls::regQueryValueSuccessCount = 0u;
9696

97-
EXPECT_EQ(2, registryReader.getSetting("settingSourceInt", 0));
97+
EXPECT_EQ(2u, registryReader.getSetting("settingSourceInt", 0));
9898
}
9999

100100
TEST_F(DebugReaderWithRegistryAndEnvTest, givenIntDebugKeyWhenOpenKeyFailsThenObtainValueFromEnv) {
101101
SysCalls::regOpenKeySuccessCount = 0u;
102102
SysCalls::regQueryValueSuccessCount = 0u;
103103

104-
EXPECT_EQ(2, registryReader.getSetting("settingSourceInt", 0));
104+
EXPECT_EQ(2u, registryReader.getSetting("settingSourceInt", 0));
105105
}
106106

107107
TEST_F(DebugReaderWithRegistryAndEnvTest, givenStringDebugKeyWhenReadFromRegistrySucceedsThenReturnObtainedValue) {

‎opencl/test/unit_test/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ TEST_F(WddmMemoryManagerSimpleTest, givenAllocationWithoutHighPriorityWhenMemory
450450
ASSERT_NE(nullptr, allocation);
451451
EXPECT_EQ(MemoryManager::AllocationStatus::Success, status);
452452
EXPECT_EQ(1u, wddm->setAllocationPriorityResult.called);
453-
EXPECT_EQ(DXGI_RESOURCE_PRIORITY_NORMAL, wddm->setAllocationPriorityResult.uint64ParamPassed);
453+
EXPECT_EQ(static_cast<uint64_t>(DXGI_RESOURCE_PRIORITY_NORMAL), wddm->setAllocationPriorityResult.uint64ParamPassed);
454454

455455
memoryManager->freeGraphicsMemory(allocation);
456456
}

‎opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ TEST_F(WddmMemoryManagerSimpleTest, givenNonZeroFenceValueOnSomeOfMultipleEngine
545545

546546
memoryManager->handleFenceCompletion(allocation);
547547
EXPECT_EQ(1u, wddm->waitFromCpuResult.called);
548-
EXPECT_EQ(129, wddm->waitFromCpuResult.uint64ParamPassed);
548+
EXPECT_EQ(129u, wddm->waitFromCpuResult.uint64ParamPassed);
549549
EXPECT_EQ(lastEngineFence, wddm->waitFromCpuResult.monitoredFence);
550550

551551
memoryManager->freeGraphicsMemory(allocation);
@@ -1160,7 +1160,7 @@ TEST_F(WddmMemoryManagerTest, GivenUnAlignedPointerAndSizeWhenAllocate32BitMemor
11601160
void *ptr = reinterpret_cast<void *>(0x1001);
11611161
auto *gpuAllocation = memoryManager->allocate32BitGraphicsMemory(rootDeviceIndex, size, ptr, AllocationType::BUFFER);
11621162
EXPECT_EQ(reinterpret_cast<void *>(0x1000), reinterpret_cast<void *>(gpuAllocation->getDefaultGmm()->resourceParams.pExistingSysMem));
1163-
EXPECT_EQ(0x2000, gpuAllocation->getDefaultGmm()->resourceParams.ExistingSysMemSize);
1163+
EXPECT_EQ(0x2000u, gpuAllocation->getDefaultGmm()->resourceParams.ExistingSysMemSize);
11641164
memoryManager->freeGraphicsMemory(gpuAllocation);
11651165
}
11661166

@@ -1575,7 +1575,7 @@ TEST_F(BufferWithWddmMemory, givenFragmentsThatAreNotInOrderWhenGraphicsAllocati
15751575
osHandle->gpuPtr = gpuAdress;
15761576
memoryManager->getHostPtrManager()->storeFragment(rootDeviceIndex, fragment);
15771577

1578-
auto offset = 80;
1578+
auto offset = 80u;
15791579
auto allocationPtr = ptrOffset(ptr, offset);
15801580
AllocationData allocationData;
15811581
allocationData.size = size;

‎opencl/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,11 +242,11 @@ TEST_F(WddmResidencyControllerTest, givenWddmResidencyControllerWhenCallingWasAl
242242
TEST_F(WddmResidencyControllerTest, givenWddmResidencyControllerThenUpdateLastTrimFenceValueUsesMonitoredFence) {
243243
*residencyController->getMonitoredFence().cpuAddress = 1234;
244244
residencyController->updateLastTrimFenceValue();
245-
EXPECT_EQ(1234, residencyController->lastTrimFenceValue);
245+
EXPECT_EQ(1234u, residencyController->lastTrimFenceValue);
246246

247247
*residencyController->getMonitoredFence().cpuAddress = 12345;
248248
residencyController->updateLastTrimFenceValue();
249-
EXPECT_EQ(12345, residencyController->lastTrimFenceValue);
249+
EXPECT_EQ(12345u, residencyController->lastTrimFenceValue);
250250
}
251251

252252
TEST_F(WddmResidencyControllerWithGdiTest, givenWddmResidencyControllerWhenItIsDestructedThenUnregisterTrimCallback) {

0 commit comments

Comments
 (0)