Skip to content

Commit f1505be

Browse files
slackitocjdb
authored andcommitted
[SandboxIR] Simplify matchers in ShuffleVectorInst unit test (NFC) (llvm#105596)
Replace instances of `testing::ContainerEq(ArrayRef<int>({1, 2, 3, 4}))` with `testing::ElementsAre(1, 2, 3, 4)` which is simpler and more readable.
1 parent 8ea354f commit f1505be

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

llvm/unittests/SandboxIR/SandboxIRTest.cpp

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -815,8 +815,7 @@ define void @foo(<2 x i8> %v1, <2 x i8> %v2) {
815815
I->commute();
816816
EXPECT_EQ(I->getOperand(0), ArgV2);
817817
EXPECT_EQ(I->getOperand(1), ArgV1);
818-
EXPECT_THAT(I->getShuffleMask(),
819-
testing::ContainerEq(ArrayRef<int>({2, 0})));
818+
EXPECT_THAT(I->getShuffleMask(), testing::ElementsAre(2, 0));
820819
}
821820

822821
// getType
@@ -828,17 +827,16 @@ define void @foo(<2 x i8> %v1, <2 x i8> %v2) {
828827

829828
// getShuffleMask / getShuffleMaskForBitcode
830829
{
831-
EXPECT_THAT(SVI->getShuffleMask(),
832-
testing::ContainerEq(ArrayRef<int>({0, 2})));
830+
EXPECT_THAT(SVI->getShuffleMask(), testing::ElementsAre(0, 2));
833831

834832
SmallVector<int, 2> Result;
835833
SVI->getShuffleMask(Result);
836-
EXPECT_THAT(Result, testing::ContainerEq(ArrayRef<int>({0, 2})));
834+
EXPECT_THAT(Result, testing::ElementsAre(0, 2));
837835

838836
Result.clear();
839837
sandboxir::ShuffleVectorInst::getShuffleMask(
840838
SVI->getShuffleMaskForBitcode(), Result);
841-
EXPECT_THAT(Result, testing::ContainerEq(ArrayRef<int>({0, 2})));
839+
EXPECT_THAT(Result, testing::ElementsAre(0, 2));
842840
}
843841

844842
// convertShuffleMaskForBitcode
@@ -847,15 +845,14 @@ define void @foo(<2 x i8> %v1, <2 x i8> %v2) {
847845
ArrayRef<int>({2, 3}), ArgV1->getType(), Ctx);
848846
SmallVector<int, 2> Result;
849847
sandboxir::ShuffleVectorInst::getShuffleMask(C, Result);
850-
EXPECT_THAT(Result, testing::ContainerEq(ArrayRef<int>({2, 3})));
848+
EXPECT_THAT(Result, testing::ElementsAre(2, 3));
851849
}
852850

853851
// setShuffleMask
854852
{
855853
auto *I = CreateShuffleWithMask(0, 1);
856854
I->setShuffleMask(ArrayRef<int>({2, 3}));
857-
EXPECT_THAT(I->getShuffleMask(),
858-
testing::ContainerEq(ArrayRef<int>({2, 3})));
855+
EXPECT_THAT(I->getShuffleMask(), testing::ElementsAre(2, 3));
859856
}
860857

861858
// The following functions check different mask properties. Note that most
@@ -1107,7 +1104,7 @@ define void @foo(<2 x i8> %v1, <2 x i8> %v2) {
11071104
{
11081105
SmallVector<int, 4> M = {0, 2, 1, 3};
11091106
ShuffleVectorInst::commuteShuffleMask(M, 2);
1110-
EXPECT_THAT(M, testing::ContainerEq(ArrayRef<int>({2, 0, 3, 1})));
1107+
EXPECT_THAT(M, testing::ElementsAre(2, 0, 3, 1));
11111108
}
11121109

11131110
// isInterleave / isInterleaveMask
@@ -1119,7 +1116,7 @@ define void @foo(<2 x i8> %v1, <2 x i8> %v2) {
11191116
SmallVector<unsigned, 4> StartIndexes;
11201117
EXPECT_TRUE(sandboxir::ShuffleVectorInst::isInterleaveMask(
11211118
I->getShuffleMask(), 2, 4, StartIndexes));
1122-
EXPECT_THAT(StartIndexes, testing::ContainerEq(ArrayRef<unsigned>({0, 2})));
1119+
EXPECT_THAT(StartIndexes, testing::ElementsAre(0, 2));
11231120
}
11241121
{
11251122
auto *I = CreateShuffleWithMask(0, 3, 1, 2);

0 commit comments

Comments
 (0)