Solve merge conflicts and fixed tests after bump

Update TOSA mul legalization to always provide the new shift operand and refresh TorchToTosa tests for the updated signature.

Author: mgehre-amd

lib/Conversion/TorchToTosa/TosaLegalizeCommon.cpp

@@ -121,11 +121,8 @@ tosa::MulOp createMulOpAndCast(PatternRewriter &rewriter, Operation *op,
   rhs = promoteType(rewriter, rhs, outType);
   auto constShift =
       tosa::getTosaMulShiftConstTensor(rewriter, op, outType, shift);
-  if (constShift)
-    return tosa::CreateOpAndInfer<tosa::MulOp>(rewriter, op->getLoc(), outType,
-                                               lhs, rhs, constShift);
   return tosa::CreateOpAndInfer<tosa::MulOp>(rewriter, op->getLoc(), outType,
-                                             lhs, rhs, Value());
+                                             lhs, rhs, constShift);
 }
 
 template <>

lib/Conversion/TorchToTosa/TosaLegalizeUtils.cpp

@@ -164,15 +164,7 @@ Value getTosaConstTensorSingleF32(PatternRewriter &rewriter, Operation *op,
 }
 
 Value getTosaMulShiftConstTensor(PatternRewriter &rewriter, Operation *op,
-                                 Type resultType, int32_t shift) {
-  auto tensorType = dyn_cast_or_null<TensorType>(resultType);
-  if (!tensorType)
-    return Value();
-
-  auto elementType = tensorType.getElementType();
-  if (!isa<IntegerType>(elementType))
-    return Value();
-
+                                 Type /*resultType*/, int32_t shift) {
   auto shiftType = RankedTensorType::get({1}, rewriter.getI8Type());
   auto shiftAttr = DenseElementsAttr::get<int8_t>(
       shiftType, llvm::ArrayRef<int8_t>{static_cast<int8_t>(shift)});