[Mlir-commits] [mlir] [mlir][sparse] fix mismatch between `enter/exitWhileLoop` (PR #79493)

[Peiming Liu]

https://github.com/PeimingLiu updated https://github.com/llvm/llvm-project/pull/79493

>From 549991e0f91214c469f17580babca605ecf79c6d Mon Sep 17 00:00:00 2001
From: Peiming Liu <peiming at google.com>
Date: Thu, 25 Jan 2024 20:00:56 +0000
Subject: [PATCH 1/2] [mlir][sparse] fix mismatch between enter/exitWhileLoop

---
 mlir/lib/Dialect/SparseTensor/Transforms/Utils/LoopEmitter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mlir/lib/Dialect/SparseTensor/Transforms/Utils/LoopEmitter.cpp b/mlir/lib/Dialect/SparseTensor/Transforms/Utils/LoopEmitter.cpp
index 0ce6a9efce1c81..6d832fdc0c2201 100644
--- a/mlir/lib/Dialect/SparseTensor/Transforms/Utils/LoopEmitter.cpp
+++ b/mlir/lib/Dialect/SparseTensor/Transforms/Utils/LoopEmitter.cpp
@@ -599,7 +599,7 @@ Operation *LoopEmitter::enterCoIterationOverTensorsAtLvls(
 
   // NOTE: we can also prepare for next dim here in advance
   // Pushes the loop into stack.
-  loopStack.emplace_back(tidLvls, l, builder.getInsertionBlock(), iv, loopTag);
+  loopStack.emplace_back(tls, l, builder.getInsertionBlock(), iv, loopTag);
   return l;
 }
 

>From 5bedcb5a34b2fc381cefced2a4af314604b4ab08 Mon Sep 17 00:00:00 2001
From: Peiming Liu <peiming at google.com>
Date: Thu, 25 Jan 2024 20:03:04 +0000
Subject: [PATCH 2/2] re-enable tests

---
 mlir/test/Integration/Dialect/SparseTensor/CPU/reshape_dot.mlir | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/reshape_dot.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/reshape_dot.mlir
index 15427a373b10b9..689428c23f7d78 100644
--- a/mlir/test/Integration/Dialect/SparseTensor/CPU/reshape_dot.mlir
+++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/reshape_dot.mlir
@@ -17,8 +17,6 @@
 // DEFINE: %{env} =
 //--------------------------------------------------------------------------------------------------
 
-// UNSUPPORTED: target={{.*}}
-
 // RUN: %{compile} | %{env} %{run} | FileCheck %s
 //
 // Do the same run, but now with direct IR generation.