Revert change to use isVectorIntrinsicWithScalarOpAtArg for return type

Author: tex3d

llvm/lib/CodeGen/ReplaceWithVeclib.cpp

@@ -103,24 +103,21 @@ static bool replaceWithCallToVeclib(const TargetLibraryInfo &TLI,
   Intrinsic::ID IID = II->getIntrinsicID();
   if (IID == Intrinsic::not_intrinsic)
     return false;
-
-  // RetIsScalar: Return type is not widened.
-  bool RetIsScalar = isVectorIntrinsicWithScalarOpAtArg(IID, -1);
   Type *RetTy = II->getType();
   Type *ScalarRetTy = RetTy->getScalarType();
-
-  // Compute the argument types of the corresponding scalar call and check that
-  // all vector operands match the previously found EC.
-  SmallVector<Type *, 8> ScalarArgTypes;
+  // At the moment VFABI assumes the return type is always widened unless it is
+  // a void type.
   auto *VTy = dyn_cast<VectorType>(RetTy);
-  ElementCount EC(!RetIsScalar && VTy ? VTy->getElementCount()
-                                      : ElementCount::getFixed(0));
+  ElementCount EC(VTy ? VTy->getElementCount() : ElementCount::getFixed(0));
 
   // OloadTys collects types used in scalar intrinsic overload name.
   SmallVector<Type *, 3> OloadTys;
   if (!RetTy->isVoidTy() && isVectorIntrinsicWithOverloadTypeAtArg(IID, -1))
-    OloadTys.push_back(RetIsScalar ? RetTy : ScalarRetTy);
+    OloadTys.push_back(ScalarRetTy);
 
+  // Compute the argument types of the corresponding scalar call and check that
+  // all vector operands match the previously found EC.
+  SmallVector<Type *, 8> ScalarArgTypes;
   for (auto Arg : enumerate(II->args())) {
     auto *ArgTy = Arg.value()->getType();
     bool IsOloadTy = isVectorIntrinsicWithOverloadTypeAtArg(IID, Arg.index());