[CINN] Fix name duplication for TileTransposeTactic (#72167)

lshpku · web-flow · commit 882e9da8643c · 2025-04-11T10:46:20.000+08:00
diff --git a/paddle/cinn/ir/schedule/impl/storage.cc b/paddle/cinn/ir/schedule/impl/storage.cc
@@ -12,11 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/cinn/common/macros.h"
 #include "paddle/cinn/ir/ir_analyzer/ir_analyzer.h"
 #include "paddle/cinn/ir/schedule/impl/ir_schedule.h"
-#include "paddle/cinn/runtime/intrinsic.h"
-#include "paddle/common/enforce.h"
+#include "paddle/cinn/lang/compute.h"
 /** \brief A macro that guards the beginning of each implementation of schedule
  */
 #define CINN_IR_SCHEDULE_BEGIN() try {
@@ -88,6 +86,17 @@ struct CacheReadRewriter : public ir::IRMutator<> {
   std::vector<Expr> parent_loops_;
 };
 
+Tensor MakeCacheTensor(const Tensor& tensor, const std::string& memory_type) {
+  std::string cache_name =
+      common::UniqName(tensor->name + "_" + memory_type + "_temp_buffer");
+  Tensor cache_tensor = lang::Compute(
+      tensor->shape,
+      [=](const std::vector<Expr>& dims) { return tensor(dims); },
+      cache_name);
+  cache_tensor->WithBuffer(memory_type);
+  return cache_tensor;
+}
+
 Expr MakeCacheBlock(const Expr& block,
                     const std::vector<Expr>& loops,
                     const Expr& read_expr,
diff --git a/paddle/cinn/ir/schedule/ir_schedule_util.cc b/paddle/cinn/ir/schedule/ir_schedule_util.cc
@@ -625,15 +625,6 @@ Expr GetNthAccessExpr(const Expr& block, int index, bool is_write) {
   }
 }
 
-Tensor MakeCacheTensor(const Tensor& tensor, const std::string& memory_type) {
-  auto cache_tensor = lang::Compute(
-      tensor->shape,
-      [=](const std::vector<Expr>& dims) { return tensor(dims); },
-      tensor->name + "_" + memory_type + "_temp_buffer");
-  cache_tensor->WithBuffer(memory_type);
-  return cache_tensor;
-}
-
 Expr MakeCacheBlock(const std::vector<IterRange>& buffer_ranges,
                     CacheBlockInfo* info,
                     const std::string& memory_type,
diff --git a/paddle/cinn/ir/schedule/ir_schedule_util.h b/paddle/cinn/ir/schedule/ir_schedule_util.h
@@ -190,14 +190,6 @@ std::vector<IterRange> CalculateTensorRegions(
  */
 Expr GetNthAccessExpr(const Expr& block, int index, bool is_write);
 
-/**
- * Make a tensor's cache tensor.
- * @param tensor The original tensor.
- * @param memory_type The memory type of the cache tensor.
- * @return return The tensor's cache tensor.
- */
-Tensor MakeCacheTensor(const Tensor& tensor, const std::string& memory_type);
-
 /**
  * Make a the cache tensor's block.
  * @param buffer_region The accessed region of cache tensor.
diff --git a/test/ir/pir/cinn/test_cinn_transpose.py b/test/ir/pir/cinn/test_cinn_transpose.py
@@ -111,6 +111,16 @@ def func(x, y):
 
         self.eval(func, [x, y])
 
+    def test_slice_021(self):
+        def func(x):
+            x1 = x[:, :48].transpose([0, 2, 1])
+            x2 = x.transpose([0, 2, 1])[:, :, 48:]
+            return x1 + x2
+
+        x = paddle.uniform([64, 96, 128])
+
+        self.eval(func, [x])
+
     def test_slice_reshape_021(self):
         def func(x, y):
             x = x[:, 64:192]
