rebasing

Author: fschlimb

llvm/lib/Target/X86/X86FastISel.cpp

@@ -3542,7 +3542,9 @@ bool X86FastISel::fastLowerCall(CallLoweringInfo &CLI) {
 
     MIB = BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, MIMD, TII.get(CallOpc));
     if (NeedLoad)
-      MIB.addReg(Is64Bit ? X86::RIP : 0).addImm(1).addReg(0);
+      MIB.addReg(Is64Bit ? static_cast<unsigned>(X86::RIP) : 0U)
+          .addImm(1)
+          .addReg(0);
     if (Symbol)
       MIB.addSym(Symbol, OpFlags);
     else

llvm/lib/Target/X86/X86ISelLowering.cpp

@@ -29975,14 +29975,9 @@ static SDValue LowerShift(SDValue Op, const X86Subtarget &Subtarget,
           MVT::getVectorVT(NarrowScalarVT, WideNumElts), dl, AmtWideElts);
       AmtWide = DAG.getZExtOrTrunc(AmtWide, dl, WideVT);
       // Perform the actual shift.
-<<<<<<< HEAD
-      unsigned LogicalOpc = Opc == ISD::SRA ? ISD::SRL : Opc;
-      SDValue ShiftedR = DAG.getNode(LogicalOpc, dl, WideVT, RWide, AmtWide);
-=======
       unsigned LogicalOpc =
           Opc == ISD::SRA ? static_cast<unsigned>(ISD::SRL) : Opc;
-      SDValue ShiftedR = DAG.getNode(LogicalOpc, dl, VT16, R16, Amt16);
->>>>>>> ae2283c2c014 (static_cast)
+      SDValue ShiftedR = DAG.getNode(LogicalOpc, dl, WideVT, RWide, AmtWide);
       // Now we need to construct a mask which will "drop" bits that get
       // shifted past the LSB/MSB. For a logical shift left, it will look
       // like:

mlir/lib/Dialect/Linalg/Transforms/Vectorization.cpp

@@ -840,13 +840,13 @@ enum VectorMemoryAccessKind { ScalarBroadcast, Contiguous, Gather };
 /// TODO: Statically shaped loops + vector masking
 static uint64_t getTrailingNonUnitLoopDimIdx(LinalgOp linalgOp) {
   SmallVector<int64_t> loopRanges = linalgOp.getStaticLoopRanges();
-  assert(linalgOp.hasDynamicShape() ||
-         llvm::count_if(loopRanges, [](int64_t dim) { return dim != 1; }) ==
-                 1 &&
-             "For statically shaped Linalg Ops, only one "
-             "non-unit loop dim is expected");
+  assert(
+      (linalgOp.hasDynamicShape() ||
+       llvm::count_if(loopRanges, [](int64_t dim) { return dim != 1; }) == 1) &&
+      "For statically shaped Linalg Ops, only one "
+      "non-unit loop dim is expected");
 
-  size_t idx = loopRanges.size() - 1;
+  ssize_t idx = loopRanges.size() - 1;
   for (; idx >= 0; idx--)
     if (loopRanges[idx] != 1)
       break;