From 55ae508ff67a6fb65c6e637af9897a53eec2fc7f Mon Sep 17 00:00:00 2001
From: Sayan Saha <sayans@mathworks.com>
Date: Mon, 13 Jan 2025 06:10:28 -0500
Subject: [PATCH] Rebase main

---
 lib/Conversion/TorchToTosa/TosaLegalizeUtils.cpp | 3 ++-
 projects/pt1/e2e_testing/xfail_sets.py           | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/Conversion/TorchToTosa/TosaLegalizeUtils.cpp b/lib/Conversion/TorchToTosa/TosaLegalizeUtils.cpp
index e382db2c062bc..af3635c7639af 100644
--- a/lib/Conversion/TorchToTosa/TosaLegalizeUtils.cpp
+++ b/lib/Conversion/TorchToTosa/TosaLegalizeUtils.cpp
@@ -390,7 +390,8 @@ LogicalResult tosaCastTensorToType(PatternRewriter &rewriter, Operation *op,
       auto floor = rewriter.create<tosa::FloorOp>(op->getLoc(), srcType, src);
       auto ceil = rewriter.create<tosa::CeilOp>(op->getLoc(), srcType, src);
 
-      auto zeroValue = tosa::getConstTensor<float>(rewriter, op, 0, {}).value();
+      auto zeroValue =
+          tosa::getConstTensor<float>(rewriter, op, 0, {}, srcElemTy).value();
 
       auto boolType = srcType.clone(rewriter.getIntegerType(1));
       auto isNegative = tosa::CreateOpAndInfer<tosa::GreaterOp>(
diff --git a/projects/pt1/e2e_testing/xfail_sets.py b/projects/pt1/e2e_testing/xfail_sets.py
index f7b5f5b119180..740286af6f6ad 100644
--- a/projects/pt1/e2e_testing/xfail_sets.py
+++ b/projects/pt1/e2e_testing/xfail_sets.py
@@ -3336,6 +3336,7 @@
 }
 
 FX_IMPORTER_TOSA_XFAIL_SET = {
+    "ScatterAddDynamicModule_basic",
     "UniformModule_basic",
     "UniformStaticShapeModule_basic",
     "AtenFftRfft2DLastDim_basic",
@@ -3545,9 +3546,6 @@
     "ElementwiseQuantizePerTensorUIntModule_basic",
     "ElementwiseSinhIntModule_basic",
     "ElementwiseSinhModule_basic",
-    "ElementwiseSpecialExpm1IntModule_basic",
-    "ElementwiseSpecialExpm1Module_basic",
-    "ElementwiseToDtypeF32ToI64Module_basic",
     "ElementwiseToDtypeI64ToUI8Module_basic",
     "EqIntModule_basic",
     "FloatImplicitModule_basic",