Refactor: Simplify boolean conditional return statements in lib/Transforms/Vectorize

[LegalizeAdulthood]

Summary

Use clang-tidy to simplify boolean conditional return statements

[mzolotukhin]

Hi Richard,

Thanks for cleaning this up. In the first spot I prefer the original version, but the rest look fine (and if you feel strong about the first place too, I don't mind committing the change there as well).

Please mention that it's NFC in the commit message.

Thanks,
Michael

lib/Transforms/Vectorize/BBVectorize.cpp

937–938

Here I prefer the original version, for me it seems more natural to express the logic.

lib/Transforms/Vectorize/LoopVectorize.cpp

4461–4462

LGTM.

lib/Transforms/Vectorize/SLPVectorizer.cpp

154–155

LGTM.

1643

LGTM.

[LegalizeAdulthood]

Updated to latest.

[LegalizeAdulthood]

In D10003#178196, @mzolotukhin wrote:

Hi Richard,

Thanks for cleaning this up. In the first spot I prefer the original version, but the rest look fine (and if you feel strong about the first place too, I don't mind committing the change there as well).

Please mention that it's NFC in the commit message.

I don't have commit access. Subsequent improvements to clang-tidy based on feedback from these reviews resulted in the one exception you noted no longer being generated as a simplification per LLVM/Clang coding preferences.

[mzolotukhin]

Thanks! I committed it for you in r251206.

Michael

lib/Transforms/Vectorize/BBVectorize.cpp

if (T1->isX86_FP80Ty() || T1->isPPC_FP128Ty() || T1->isX86_MMXTy())
       return false;
     if (T2->isX86_FP80Ty() || T2->isPPC_FP128Ty() || T2->isX86_MMXTy())
       return false;
 
     if (!Config.VectorizePointers && (T1->getScalarType()->isPointerTy() ||
                                       T2->getScalarType()->isPointerTy()))
       return false;
 
-    if (!TTI && (T1->getPrimitiveSizeInBits() >= Config.VectorBits ||
-                 T2->getPrimitiveSizeInBits() >= Config.VectorBits))
-      return false;
-
-    return true;
+    return TTI || (T1->getPrimitiveSizeInBits() < Config.VectorBits &&
+                   T2->getPrimitiveSizeInBits() < Config.VectorBits);
   }
 
   // This function returns true if the two provided instructions are compatible
   // (meaning that they can be fused into a vector instruction). This assumes
   // that I has already been determined to be vectorizable and that J is not
   // in the use dag of I.
   bool BBVectorize::areInstsCompatible(Instruction *I, Instruction *J,
                        bool IsSimpleLoadStore, bool NonPow2Len,

lib/Transforms/Vectorize/LoopVectorize.cpp

if (APStepVal.getBitWidth() > 64)
     return true;
 
   int64_t StepVal = APStepVal.getSExtValue();
 
   return StepVal > MaxMergeDistance;
 }
 
 static bool isStrideMul(Instruction *I, LoopVectorizationLegality *Legal) {
-  if (Legal->hasStride(I->getOperand(0)) || Legal->hasStride(I->getOperand(1)))
-    return true;
-  return false;
+  return Legal->hasStride(I->getOperand(0)) ||
+         Legal->hasStride(I->getOperand(1));
 }
 
 unsigned
 LoopVectorizationCostModel::getInstructionCost(Instruction *I, unsigned VF) {
   // If we know that this instruction will remain uniform, check the cost of
   // the scalar version.
   if (Legal->isUniformAfterVectorization(I))
     VF = 1;

lib/Transforms/Vectorize/SLPVectorizer.cpp

default:
     return 0;
   }
 }
 
 ///\returns bool representing if Opcode \p Op can be part
 /// of an alternate sequence which can later be merged as
 /// a ShuffleVector instruction.
 static bool canCombineAsAltInst(unsigned Op) {
-  if (Op == Instruction::FAdd || Op == Instruction::FSub ||
-      Op == Instruction::Sub || Op == Instruction::Add)
-    return true;
-  return false;
+  return Op == Instruction::FAdd || Op == Instruction::FSub ||
+         Op == Instruction::Sub || Op == Instruction::Add;
 }
 
 /// \returns ShuffleVector instruction if intructions in \p VL have
 ///  alternate fadd,fsub / fsub,fadd/add,sub/sub,add sequence.
 /// (i.e. e.g. opcodes of fadd,fsub,fadd,fsub...)
 static unsigned isAltInst(ArrayRef<Value *> VL) {
   Instruction *I0 = dyn_cast<Instruction>(VL[0]);
   unsigned Opcode = I0->getOpcode();
bool BoUpSLP::isFullyVectorizableTinyTree() {
   if (VectorizableTree.size() != 2)
     return false;
 
   // Handle splat stores.
   if (!VectorizableTree[0].NeedToGather && isSplat(VectorizableTree[1].Scalars))
     return true;
 
   // Gathering cost would be too much for tiny trees.
-  if (VectorizableTree[0].NeedToGather || VectorizableTree[1].NeedToGather)
-    return false;
-
-  return true;
+  return !VectorizableTree[0].NeedToGather && !VectorizableTree[1].NeedToGather;
 }
 
 int BoUpSLP::getSpillCost() {
   // Walk from the bottom of the tree to the top, tracking which values are
   // live. When we see a call instruction that is not part of our tree,
   // query TTI to see if there is a cost to keeping values live over it
   // (for example, if spills and fills are required).
   unsigned BundleWidth = VectorizableTree.front().Scalars.size();