Use std::array

Author: preames

llvm/include/llvm/Analysis/VectorUtils.h

@@ -210,7 +210,7 @@ bool getShuffleDemandedElts(int SrcWidth, ArrayRef<int> Mask,
 /// will be matched a slide by 0.  The output parameter provides the source
 /// (-1 means no source), and slide direction for each slide.
 bool isMaskedSlidePair(ArrayRef<int> Mask, int NumElts,
-                       std::pair<int, int> SrcInfo[2]);
+                       std::array<std::pair<int, int>, 2> &SrcInfo);
 
 /// Replace each shuffle mask index with the scaled sequential indices for an
 /// equivalent mask of narrowed elements. Mask elements that are less than 0

llvm/lib/Analysis/VectorUtils.cpp

@@ -414,7 +414,7 @@ bool llvm::getShuffleDemandedElts(int SrcWidth, ArrayRef<int> Mask,
 }
 
 bool llvm::isMaskedSlidePair(ArrayRef<int> Mask, int NumElts,
-                             std::pair<int, int> SrcInfo[2]) {
+                             std::array<std::pair<int, int>, 2> &SrcInfo) {
   const int SignalValue = NumElts * 2;
   SrcInfo[0] = {-1, SignalValue};
   SrcInfo[1] = {-1, SignalValue};

llvm/lib/Target/RISCV/RISCVISelLowering.cpp

@@ -4562,7 +4562,7 @@ static bool isInterleaveShuffle(ArrayRef<int> Mask, MVT VT, int &EvenSrc,
 
 /// Is this mask representing a masked combination of two slides?
 static bool isMaskedSlidePair(ArrayRef<int> Mask,
-                              std::pair<int, int> SrcInfo[2]) {
+                              std::array<std::pair<int, int>, 2> &SrcInfo) {
   if (!llvm::isMaskedSlidePair(Mask, Mask.size(), SrcInfo))
     return false;
 
@@ -4580,7 +4580,8 @@ static bool isMaskedSlidePair(ArrayRef<int> Mask,
 
 // Exactly matches the semantics of a previously existing custom matcher
 // to allow migration to new matcher without changing output.
-static bool isElementRotate(std::pair<int, int> SrcInfo[2], unsigned NumElts) {
+static bool isElementRotate(std::array<std::pair<int, int>, 2> &SrcInfo,
+                            unsigned NumElts) {
   if (SrcInfo[1].first == -1)
     return true;
   return SrcInfo[0].second < 0 && SrcInfo[1].second > 0 &&
@@ -5581,7 +5582,7 @@ static SDValue lowerVECTOR_SHUFFLE(SDValue Op, SelectionDAG &DAG,
   // without masking.  Avoid matching bit rotates (which are not also element
   // rotates) as slide pairs.  This is a performance heuristic, not a
   // functional check.
-  std::pair<int, int> SrcInfo[2];
+  std::array<std::pair<int, int>, 2> SrcInfo;
   unsigned RotateAmt;
   MVT RotateVT;
   if (::isMaskedSlidePair(Mask, SrcInfo) &&
@@ -5941,7 +5942,7 @@ bool RISCVTargetLowering::isShuffleMaskLegal(ArrayRef<int> M, EVT VT) const {
   if (SVT.getScalarType() == MVT::i1)
     return false;
 
-  std::pair<int, int> SrcInfo[2];
+  std::array<std::pair<int, int>, 2> SrcInfo;
   int Dummy1, Dummy2;
   return ShuffleVectorInst::isReverseMask(M, NumElts) ||
          (::isMaskedSlidePair(M, SrcInfo) &&

llvm/lib/Target/RISCV/RISCVTargetTransformInfo.cpp

@@ -500,7 +500,7 @@ InstructionCost RISCVTTIImpl::getSlideCost(FixedVectorType *Tp,
     return IsVI ? RISCV::VSLIDEUP_VI : RISCV::VSLIDEUP_VX;
   };
 
-  std::pair<int, int> SrcInfo[2];
+  std::array<std::pair<int, int>, 2> SrcInfo;
   if (!isMaskedSlidePair(Mask, NumElts, SrcInfo))
     return InstructionCost::getInvalid();