@@ -815,8 +815,7 @@ define void @foo(<2 x i8> %v1, <2 x i8> %v2) {
815
815
I->commute ();
816
816
EXPECT_EQ (I->getOperand (0 ), ArgV2);
817
817
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 ));
820
819
}
821
820
822
821
// getType
@@ -828,17 +827,16 @@ define void @foo(<2 x i8> %v1, <2 x i8> %v2) {
828
827
829
828
// getShuffleMask / getShuffleMaskForBitcode
830
829
{
831
- EXPECT_THAT (SVI->getShuffleMask (),
832
- testing::ContainerEq (ArrayRef<int >({0 , 2 })));
830
+ EXPECT_THAT (SVI->getShuffleMask (), testing::ElementsAre (0 , 2 ));
833
831
834
832
SmallVector<int , 2 > Result;
835
833
SVI->getShuffleMask (Result);
836
- EXPECT_THAT (Result, testing::ContainerEq (ArrayRef< int >({ 0 , 2 }) ));
834
+ EXPECT_THAT (Result, testing::ElementsAre ( 0 , 2 ));
837
835
838
836
Result.clear ();
839
837
sandboxir::ShuffleVectorInst::getShuffleMask (
840
838
SVI->getShuffleMaskForBitcode (), Result);
841
- EXPECT_THAT (Result, testing::ContainerEq (ArrayRef< int >({ 0 , 2 }) ));
839
+ EXPECT_THAT (Result, testing::ElementsAre ( 0 , 2 ));
842
840
}
843
841
844
842
// convertShuffleMaskForBitcode
@@ -847,15 +845,14 @@ define void @foo(<2 x i8> %v1, <2 x i8> %v2) {
847
845
ArrayRef<int >({2 , 3 }), ArgV1->getType (), Ctx);
848
846
SmallVector<int , 2 > Result;
849
847
sandboxir::ShuffleVectorInst::getShuffleMask (C, Result);
850
- EXPECT_THAT (Result, testing::ContainerEq (ArrayRef< int >({ 2 , 3 }) ));
848
+ EXPECT_THAT (Result, testing::ElementsAre ( 2 , 3 ));
851
849
}
852
850
853
851
// setShuffleMask
854
852
{
855
853
auto *I = CreateShuffleWithMask (0 , 1 );
856
854
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 ));
859
856
}
860
857
861
858
// 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) {
1107
1104
{
1108
1105
SmallVector<int , 4 > M = {0 , 2 , 1 , 3 };
1109
1106
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 ));
1111
1108
}
1112
1109
1113
1110
// isInterleave / isInterleaveMask
@@ -1119,7 +1116,7 @@ define void @foo(<2 x i8> %v1, <2 x i8> %v2) {
1119
1116
SmallVector<unsigned , 4 > StartIndexes;
1120
1117
EXPECT_TRUE (sandboxir::ShuffleVectorInst::isInterleaveMask (
1121
1118
I->getShuffleMask (), 2 , 4 , StartIndexes));
1122
- EXPECT_THAT (StartIndexes, testing::ContainerEq (ArrayRef< unsigned >({ 0 , 2 }) ));
1119
+ EXPECT_THAT (StartIndexes, testing::ElementsAre ( 0 , 2 ));
1123
1120
}
1124
1121
{
1125
1122
auto *I = CreateShuffleWithMask (0 , 3 , 1 , 2 );
0 commit comments