rebase

Change-Id: I77f0f79e2c1057fa48db53be37e8a74af50c42e8

Author: hassnaaHamdi

llvm/lib/CodeGen/CodeGenPrepare.cpp

@@ -6431,8 +6431,10 @@ bool CodeGenPrepare::optimizeUMulWithOverflow(Instruction *I) {
   unsigned VTHalfBitWidth = VTBitWidth / 2;
   auto *LegalTy = IntegerType::getIntNTy(I->getContext(), VTHalfBitWidth);
 
-  // Skip the optimizaiton if the type with HalfBitWidth is not legal for the target.
-  if (TLI->getTypeAction(I->getContext(), TLI->getValueType(*DL, LegalTy)) != TargetLowering::TypeLegal)
+  // Skip the optimizaiton if the type with HalfBitWidth is not legal for the
+  // target.
+  if (TLI->getTypeAction(I->getContext(), TLI->getValueType(*DL, LegalTy)) !=
+      TargetLowering::TypeLegal)
     return false;
 
   I->getParent()->setName("overflow.res");
@@ -6463,9 +6465,9 @@ bool CodeGenPrepare::optimizeUMulWithOverflow(Instruction *I) {
   auto *HiLHS = Builder.CreateTrunc(ShrHiLHS, LegalTy, "hi.lhs.trunc");
 
   auto *CmpLHS = Builder.CreateCmp(ICmpInst::ICMP_NE, HiLHS,
-                                       ConstantInt::getNullValue(LegalTy));
+                                   ConstantInt::getNullValue(LegalTy));
   auto *CmpRHS = Builder.CreateCmp(ICmpInst::ICMP_NE, HiRHS,
-                                         ConstantInt::getNullValue(LegalTy));
+                                   ConstantInt::getNullValue(LegalTy));
   auto *Or = Builder.CreateOr(CmpLHS, CmpRHS, "or.lhs.rhs");
   Builder.CreateCondBr(Or, OverflowBB, NoOverflowBB);
   OverflowoEntryBB->getTerminator()->eraseFromParent();
@@ -6476,14 +6478,14 @@ bool CodeGenPrepare::optimizeUMulWithOverflow(Instruction *I) {
   auto *ExtLoLHS = Builder.CreateZExt(LoLHS, Ty, "lo.lhs.ext");
   auto *ExtLoRHS = Builder.CreateZExt(LoRHS, Ty, "lo.rhs.ext");
   auto *Mul = Builder.CreateMul(ExtLoLHS, ExtLoRHS, "mul.no.overflow");
-  StructType *STy = StructType::get(I->getContext(),
-                        {Ty, IntegerType::getInt1Ty(I->getContext())});
+  StructType *STy = StructType::get(
+      I->getContext(), {Ty, IntegerType::getInt1Ty(I->getContext())});
   Value *StructValNoOverflow = PoisonValue::get(STy);
   StructValNoOverflow =
-  Builder.CreateInsertValue(StructValNoOverflow, Mul, {0});
+      Builder.CreateInsertValue(StructValNoOverflow, Mul, {0});
   StructValNoOverflow = Builder.CreateInsertValue(
       StructValNoOverflow, ConstantInt::getFalse(I->getContext()), {1});
-      Builder.CreateBr(OverflowResBB);
+  Builder.CreateBr(OverflowResBB);
 
   //------------------------------------------------------------------------------
   // BB overflow.res:
@@ -6528,8 +6530,10 @@ bool CodeGenPrepare::optimizeSMulWithOverflow(Instruction *I) {
   unsigned VTHalfBitWidth = VTBitWidth / 2;
   auto *LegalTy = IntegerType::getIntNTy(I->getContext(), VTHalfBitWidth);
 
-  // Skip the optimizaiton if the type with HalfBitWidth is not legal for the target.
-  if (TLI->getTypeAction(I->getContext(), TLI->getValueType(*DL, LegalTy)) != TargetLowering::TypeLegal)
+  // Skip the optimizaiton if the type with HalfBitWidth is not legal for the
+  // target.
+  if (TLI->getTypeAction(I->getContext(), TLI->getValueType(*DL, LegalTy)) !=
+      TargetLowering::TypeLegal)
     return false;
 
   I->getParent()->setName("overflow.res");
@@ -6554,13 +6558,13 @@ bool CodeGenPrepare::optimizeSMulWithOverflow(Instruction *I) {
   IRBuilder<> Builder(OverflowoEntryBB->getTerminator());
   auto *LoRHS = Builder.CreateTrunc(RHS, LegalTy, "lo.rhs");
   auto *SignLoRHS =
-  Builder.CreateAShr(LoRHS, VTHalfBitWidth - 1, "sign.lo.rhs");
+      Builder.CreateAShr(LoRHS, VTHalfBitWidth - 1, "sign.lo.rhs");
   auto *HiRHS = Builder.CreateLShr(RHS, VTHalfBitWidth, "rhs.lsr");
   HiRHS = Builder.CreateTrunc(HiRHS, LegalTy, "hi.rhs");
 
   auto *LoLHS = Builder.CreateTrunc(LHS, LegalTy, "lo.lhs");
   auto *SignLoLHS =
-  Builder.CreateAShr(LoLHS, VTHalfBitWidth - 1, "sign.lo.lhs");
+      Builder.CreateAShr(LoLHS, VTHalfBitWidth - 1, "sign.lo.lhs");
   auto *HiLHS = Builder.CreateLShr(LHS, VTHalfBitWidth, "lhs.lsr");
   HiLHS = Builder.CreateTrunc(HiLHS, LegalTy, "hi.lhs");
 
@@ -6576,14 +6580,14 @@ bool CodeGenPrepare::optimizeSMulWithOverflow(Instruction *I) {
   auto *ExtLoLHS = Builder.CreateSExt(LoLHS, Ty, "lo.lhs.ext");
   auto *ExtLoRHS = Builder.CreateSExt(LoRHS, Ty, "lo.rhs.ext");
   auto *Mul = Builder.CreateMul(ExtLoLHS, ExtLoRHS, "mul.no.overflow");
-  StructType * STy = StructType::get(I->getContext(),
-                        {Ty, IntegerType::getInt1Ty(I->getContext())});
+  StructType *STy = StructType::get(
+      I->getContext(), {Ty, IntegerType::getInt1Ty(I->getContext())});
   Value *StructValNoOverflow = PoisonValue::get(STy);
   StructValNoOverflow =
-  Builder.CreateInsertValue(StructValNoOverflow, Mul, {0});
+      Builder.CreateInsertValue(StructValNoOverflow, Mul, {0});
   StructValNoOverflow = Builder.CreateInsertValue(
       StructValNoOverflow, ConstantInt::getFalse(I->getContext()), {1});
-      Builder.CreateBr(OverflowResBB);
+  Builder.CreateBr(OverflowResBB);
 
   //------------------------------------------------------------------------------
   // BB overflow.res:

llvm/test/CodeGen/X86/umulo-128-legalisation-lowering.ll

@@ -38,8 +38,8 @@ define { i128, i8 } @muloti_test(i128 %l, i128 %r) unnamed_addr #0 {
 ; X86-NEXT:    .cfi_def_cfa_offset 16
 ; X86-NEXT:    pushl %esi
 ; X86-NEXT:    .cfi_def_cfa_offset 20
-; X86-NEXT:    subl $24, %esp
-; X86-NEXT:    .cfi_def_cfa_offset 44
+; X86-NEXT:    subl $28, %esp
+; X86-NEXT:    .cfi_def_cfa_offset 48
 ; X86-NEXT:    .cfi_offset %esi, -20
 ; X86-NEXT:    .cfi_offset %edi, -16
 ; X86-NEXT:    .cfi_offset %ebx, -12
@@ -147,7 +147,7 @@ define { i128, i8 } @muloti_test(i128 %l, i128 %r) unnamed_addr #0 {
 ; X86-NEXT:    andb $1, %al
 ; X86-NEXT:    movb %al, 16(%ecx)
 ; X86-NEXT:    movl %ecx, %eax
-; X86-NEXT:    addl $24, %esp
+; X86-NEXT:    addl $28, %esp
 ; X86-NEXT:    .cfi_def_cfa_offset 20
 ; X86-NEXT:    popl %esi
 ; X86-NEXT:    .cfi_def_cfa_offset 16