Address code review comments

- Group permvarsi256/permvarsf256 with other AVX2 constexpr builtins - Remove unnecessary SrcIdx variable and use zero directly in pair construction

Author: chaitanyav

clang/include/clang/Basic/BuiltinsX86.td

@@ -603,11 +603,6 @@ let Features = "avx", Attributes = [NoThrow, Const, Constexpr, RequiredVectorWid
  def vec_set_v8si : X86Builtin<"_Vector<8, int>(_Vector<8, int>, int, _Constant int)">;
 }
 
-let Features = "avx2", Attributes = [NoThrow, Const, Constexpr, RequiredVectorWidth<256>] in {
- def permvarsi256 : X86Builtin<"_Vector<8, int>(_Vector<8, int>, _Vector<8, int>)">;
- def permvarsf256 : X86Builtin<"_Vector<8, float>(_Vector<8, float>, _Vector<8, int>)">;
-}
-
 let Features = "avx2", Attributes = [NoThrow, Const, RequiredVectorWidth<256>] in {
  def mpsadbw256 : X86Builtin<"_Vector<32, char>(_Vector<32, char>, _Vector<32, char>, _Constant char)">;
 
@@ -695,6 +690,9 @@ let Features = "avx2", Attributes = [NoThrow, Const, Constexpr, RequiredVectorWi
  def pshuflw256 : X86Builtin<"_Vector<16, short>(_Vector<16, short>, _Constant int)">;
  def pshufhw256 : X86Builtin<"_Vector<16, short>(_Vector<16, short>, _Constant int)">;
  def pshufd256 : X86Builtin<"_Vector<8, int>(_Vector<8, int>, _Constant int)">;
+
+ def permvarsi256 : X86Builtin<"_Vector<8, int>(_Vector<8, int>, _Vector<8, int>)">;
+ def permvarsf256 : X86Builtin<"_Vector<8, float>(_Vector<8, float>, _Vector<8, int>)">;
 }
 
 let Features = "avx2", Attributes = [NoThrow, Const, Constexpr, RequiredVectorWidth<128>] in {

clang/lib/AST/ByteCode/InterpBuiltin.cpp

@@ -4422,8 +4422,7 @@ bool InterpretBuiltin(InterpState &S, CodePtr OpPC, const CallExpr *Call,
  return interp__builtin_ia32_shuffle_generic(
  S, OpPC, Call, [](unsigned DstIdx, unsigned ShuffleMask) {
  int Offset = ShuffleMask & 0x7;
- unsigned SrcIdx = 0;
- return std::pair<unsigned, int>{SrcIdx, Offset};
+ return std::pair<unsigned, int>{0, Offset};
  });
  case X86::BI__builtin_ia32_permvarqi128:
  case X86::BI__builtin_ia32_permvarhi256:
@@ -4432,31 +4431,27 @@ bool InterpretBuiltin(InterpState &S, CodePtr OpPC, const CallExpr *Call,
  return interp__builtin_ia32_shuffle_generic(
  S, OpPC, Call, [](unsigned DstIdx, unsigned ShuffleMask) {
  int Offset = ShuffleMask & 0xF;
- unsigned SrcIdx = 0;
- return std::pair<unsigned, int>{SrcIdx, Offset};
+ return std::pair<unsigned, int>{0, Offset};
  });
  case X86::BI__builtin_ia32_permvardi256:
  case X86::BI__builtin_ia32_permvardf256:
  return interp__builtin_ia32_shuffle_generic(
  S, OpPC, Call, [](unsigned DstIdx, unsigned ShuffleMask) {
  int Offset = ShuffleMask & 0x3;
- unsigned SrcIdx = 0;
- return std::pair<unsigned, int>{SrcIdx, Offset};
+ return std::pair<unsigned, int>{0, Offset};
  });
  case X86::BI__builtin_ia32_permvarqi256:
  case X86::BI__builtin_ia32_permvarhi512:
  return interp__builtin_ia32_shuffle_generic(
  S, OpPC, Call, [](unsigned DstIdx, unsigned ShuffleMask) {
  int Offset = ShuffleMask & 0x1F;
- unsigned SrcIdx = 0;
- return std::pair<unsigned, int>{SrcIdx, Offset};
+ return std::pair<unsigned, int>{0, Offset};
  });
  case X86::BI__builtin_ia32_permvarqi512:
  return interp__builtin_ia32_shuffle_generic(
  S, OpPC, Call, [](unsigned DstIdx, unsigned ShuffleMask) {
  int Offset = ShuffleMask & 0x3F;
- unsigned SrcIdx = 0;
- return std::pair<unsigned, int>{SrcIdx, Offset};
+ return std::pair<unsigned, int>{0, Offset};
  });
  case X86::BI__builtin_ia32_vpermi2varq128:
  case X86::BI__builtin_ia32_vpermi2varpd128:

clang/lib/AST/ExprConstant.cpp

@@ -13560,8 +13560,7 @@ bool VectorExprEvaluator::VisitCallExpr(const CallExpr *E) {
  if (!evalShuffleGeneric(Info, E, R,
  [](unsigned DstIdx, unsigned ShuffleMask) {
  int Offset = ShuffleMask & 0x7;
- unsigned SrcIdx = 0;
- return std::pair<unsigned, int>{SrcIdx, Offset};
+ return std::pair<unsigned, int>{0, Offset};
  }))
  return false;
  return Success(R, E);
@@ -13574,8 +13573,7 @@ bool VectorExprEvaluator::VisitCallExpr(const CallExpr *E) {
  if (!evalShuffleGeneric(Info, E, R,
  [](unsigned DstIdx, unsigned ShuffleMask) {
  int Offset = ShuffleMask & 0xF;
- unsigned SrcIdx = 0;
- return std::pair<unsigned, int>{SrcIdx, Offset};
+ return std::pair<unsigned, int>{0, Offset};
  }))
  return false;
  return Success(R, E);
@@ -13586,8 +13584,7 @@ bool VectorExprEvaluator::VisitCallExpr(const CallExpr *E) {
  if (!evalShuffleGeneric(Info, E, R,
  [](unsigned DstIdx, unsigned ShuffleMask) {
  int Offset = ShuffleMask & 0x3;
- unsigned SrcIdx = 0;
- return std::pair<unsigned, int>{SrcIdx, Offset};
+ return std::pair<unsigned, int>{0, Offset};
  }))
  return false;
  return Success(R, E);
@@ -13598,8 +13595,7 @@ bool VectorExprEvaluator::VisitCallExpr(const CallExpr *E) {
  if (!evalShuffleGeneric(Info, E, R,
  [](unsigned DstIdx, unsigned ShuffleMask) {
  int Offset = ShuffleMask & 0x1F;
- unsigned SrcIdx = 0;
- return std::pair<unsigned, int>{SrcIdx, Offset};
+ return std::pair<unsigned, int>{0, Offset};
  }))
  return false;
  return Success(R, E);
@@ -13609,8 +13605,7 @@ bool VectorExprEvaluator::VisitCallExpr(const CallExpr *E) {
  if (!evalShuffleGeneric(Info, E, R,
  [](unsigned DstIdx, unsigned ShuffleMask) {
  int Offset = ShuffleMask & 0x3F;
- unsigned SrcIdx = 0;
- return std::pair<unsigned, int>{SrcIdx, Offset};
+ return std::pair<unsigned, int>{0, Offset};
  }))
  return false;
  return Success(R, E);