Skip to content

Commit b3fcc72

Browse files
committed
Fix sign-comparison warnings in unit test EXPECTs
1 parent 0ed4cf4 commit b3fcc72

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1197,7 +1197,7 @@ TEST_F(OpenMPIRBuilderTest, TileSingleLoop) {
11971197
OMPBuilder.finalize();
11981198
EXPECT_FALSE(verifyModule(*M, &errs()));
11991199

1200-
EXPECT_EQ(GenLoops.size(), 2);
1200+
EXPECT_EQ(GenLoops.size(), 2u);
12011201
CanonicalLoopInfo *Floor = GenLoops[0];
12021202
CanonicalLoopInfo *Tile = GenLoops[1];
12031203

@@ -1264,7 +1264,7 @@ TEST_F(OpenMPIRBuilderTest, TileNestedLoops) {
12641264
OMPBuilder.finalize();
12651265
EXPECT_FALSE(verifyModule(*M, &errs()));
12661266

1267-
EXPECT_EQ(GenLoops.size(), 4);
1267+
EXPECT_EQ(GenLoops.size(), 4u);
12681268
CanonicalLoopInfo *Floor1 = GenLoops[0];
12691269
CanonicalLoopInfo *Floor2 = GenLoops[1];
12701270
CanonicalLoopInfo *Tile1 = GenLoops[2];
@@ -1366,7 +1366,7 @@ TEST_F(OpenMPIRBuilderTest, TileNestedLoopsWithBounds) {
13661366
OMPBuilder.finalize();
13671367
EXPECT_FALSE(verifyModule(*M, &errs()));
13681368

1369-
EXPECT_EQ(GenLoops.size(), 4);
1369+
EXPECT_EQ(GenLoops.size(), 4u);
13701370
CanonicalLoopInfo *Floor0 = GenLoops[0];
13711371
CanonicalLoopInfo *Floor1 = GenLoops[1];
13721372
CanonicalLoopInfo *Tile0 = GenLoops[2];
@@ -1476,42 +1476,42 @@ TEST_F(OpenMPIRBuilderTest, TileSingleLoopCounts) {
14761476
};
14771477

14781478
// Empty iteration domain.
1479-
EXPECT_EQ(GetFloorCount(0, 0, 1, false, false, 7), 0);
1480-
EXPECT_EQ(GetFloorCount(0, -1, 1, false, true, 7), 0);
1481-
EXPECT_EQ(GetFloorCount(-1, -1, -1, true, false, 7), 0);
1482-
EXPECT_EQ(GetFloorCount(-1, 0, -1, true, true, 7), 0);
1483-
EXPECT_EQ(GetFloorCount(-1, -1, 3, true, false, 7), 0);
1479+
EXPECT_EQ(GetFloorCount(0, 0, 1, false, false, 7), 0u);
1480+
EXPECT_EQ(GetFloorCount(0, -1, 1, false, true, 7), 0u);
1481+
EXPECT_EQ(GetFloorCount(-1, -1, -1, true, false, 7), 0u);
1482+
EXPECT_EQ(GetFloorCount(-1, 0, -1, true, true, 7), 0u);
1483+
EXPECT_EQ(GetFloorCount(-1, -1, 3, true, false, 7), 0u);
14841484

14851485
// Only complete tiles.
1486-
EXPECT_EQ(GetFloorCount(0, 14, 1, false, false, 7), 2);
1487-
EXPECT_EQ(GetFloorCount(0, 14, 1, false, false, 7), 2);
1488-
EXPECT_EQ(GetFloorCount(1, 15, 1, false, false, 7), 2);
1489-
EXPECT_EQ(GetFloorCount(0, -14, -1, true, false, 7), 2);
1490-
EXPECT_EQ(GetFloorCount(-1, -14, -1, true, true, 7), 2);
1491-
EXPECT_EQ(GetFloorCount(0, 3 * 7 * 2, 3, false, false, 7), 2);
1486+
EXPECT_EQ(GetFloorCount(0, 14, 1, false, false, 7), 2u);
1487+
EXPECT_EQ(GetFloorCount(0, 14, 1, false, false, 7), 2u);
1488+
EXPECT_EQ(GetFloorCount(1, 15, 1, false, false, 7), 2u);
1489+
EXPECT_EQ(GetFloorCount(0, -14, -1, true, false, 7), 2u);
1490+
EXPECT_EQ(GetFloorCount(-1, -14, -1, true, true, 7), 2u);
1491+
EXPECT_EQ(GetFloorCount(0, 3 * 7 * 2, 3, false, false, 7), 2u);
14921492

14931493
// Only a partial tile.
1494-
EXPECT_EQ(GetFloorCount(0, 1, 1, false, false, 7), 1);
1495-
EXPECT_EQ(GetFloorCount(0, 6, 1, false, false, 7), 1);
1496-
EXPECT_EQ(GetFloorCount(-1, 1, 3, true, false, 7), 1);
1497-
EXPECT_EQ(GetFloorCount(-1, -2, -1, true, false, 7), 1);
1498-
EXPECT_EQ(GetFloorCount(0, 2, 3, false, false, 7), 1);
1494+
EXPECT_EQ(GetFloorCount(0, 1, 1, false, false, 7), 1u);
1495+
EXPECT_EQ(GetFloorCount(0, 6, 1, false, false, 7), 1u);
1496+
EXPECT_EQ(GetFloorCount(-1, 1, 3, true, false, 7), 1u);
1497+
EXPECT_EQ(GetFloorCount(-1, -2, -1, true, false, 7), 1u);
1498+
EXPECT_EQ(GetFloorCount(0, 2, 3, false, false, 7), 1u);
14991499

15001500
// Complete and partial tiles.
1501-
EXPECT_EQ(GetFloorCount(0, 13, 1, false, false, 7), 2);
1502-
EXPECT_EQ(GetFloorCount(0, 15, 1, false, false, 7), 3);
1503-
EXPECT_EQ(GetFloorCount(-1, -14, -1, true, false, 7), 2);
1504-
EXPECT_EQ(GetFloorCount(0, 3 * 7 * 5 - 1, 3, false, false, 7), 5);
1505-
EXPECT_EQ(GetFloorCount(-1, -3 * 7 * 5, -3, true, false, 7), 5);
1501+
EXPECT_EQ(GetFloorCount(0, 13, 1, false, false, 7), 2u);
1502+
EXPECT_EQ(GetFloorCount(0, 15, 1, false, false, 7), 3u);
1503+
EXPECT_EQ(GetFloorCount(-1, -14, -1, true, false, 7), 2u);
1504+
EXPECT_EQ(GetFloorCount(0, 3 * 7 * 5 - 1, 3, false, false, 7), 5u);
1505+
EXPECT_EQ(GetFloorCount(-1, -3 * 7 * 5, -3, true, false, 7), 5u);
15061506

15071507
// Close to 16-bit integer range.
1508-
EXPECT_EQ(GetFloorCount(0, 0xFFFF, 1, false, false, 1), 0xFFFF);
1509-
EXPECT_EQ(GetFloorCount(0, 0xFFFF, 1, false, false, 7), 0xFFFF / 7 + 1);
1510-
EXPECT_EQ(GetFloorCount(0, 0xFFFE, 1, false, true, 7), 0xFFFF / 7 + 1);
1511-
EXPECT_EQ(GetFloorCount(-0x8000, 0x7FFF, 1, true, false, 7), 0xFFFF / 7 + 1);
1512-
EXPECT_EQ(GetFloorCount(-0x7FFF, 0x7FFF, 1, true, true, 7), 0xFFFF / 7 + 1);
1513-
EXPECT_EQ(GetFloorCount(0, 0xFFFE, 1, false, false, 0xFFFF), 1);
1514-
EXPECT_EQ(GetFloorCount(-0x8000, 0x7FFF, 1, true, false, 0xFFFF), 1);
1508+
EXPECT_EQ(GetFloorCount(0, 0xFFFF, 1, false, false, 1), 0xFFFFu);
1509+
EXPECT_EQ(GetFloorCount(0, 0xFFFF, 1, false, false, 7), 0xFFFFu / 7 + 1);
1510+
EXPECT_EQ(GetFloorCount(0, 0xFFFE, 1, false, true, 7), 0xFFFFu / 7 + 1);
1511+
EXPECT_EQ(GetFloorCount(-0x8000, 0x7FFF, 1, true, false, 7), 0xFFFFu / 7 + 1);
1512+
EXPECT_EQ(GetFloorCount(-0x7FFF, 0x7FFF, 1, true, true, 7), 0xFFFFu / 7 + 1);
1513+
EXPECT_EQ(GetFloorCount(0, 0xFFFE, 1, false, false, 0xFFFF), 1u);
1514+
EXPECT_EQ(GetFloorCount(-0x8000, 0x7FFF, 1, true, false, 0xFFFF), 1u);
15151515

15161516
// Finalize the function.
15171517
Builder.CreateRetVoid();

0 commit comments

Comments
 (0)