From 2cfdff3f6fee0749185f2c1d93dc370dc1335fff Mon Sep 17 00:00:00 2001
From: zyfncg <zhangyunfei07@baidu.com>
Date: Wed, 10 Jan 2024 02:43:01 +0000
Subject: [PATCH 1/3] refine cmake for pass in cinn

---
 .../operator/transforms/CMakeLists.txt        | 50 +++----------------
 .../transforms/group_merge/CMakeLists.txt     | 13 -----
 paddle/fluid/pybind/CMakeLists.txt            |  9 +---
 3 files changed, 7 insertions(+), 65 deletions(-)
 delete mode 100644 paddle/cinn/hlir/dialect/operator/transforms/group_merge/CMakeLists.txt

diff --git a/paddle/cinn/hlir/dialect/operator/transforms/CMakeLists.txt b/paddle/cinn/hlir/dialect/operator/transforms/CMakeLists.txt
index 9b57f4f14edea..9ece0edc82c1b 100644
--- a/paddle/cinn/hlir/dialect/operator/transforms/CMakeLists.txt
+++ b/paddle/cinn/hlir/dialect/operator/transforms/CMakeLists.txt
@@ -1,50 +1,12 @@
-add_subdirectory(group_merge)
-
 if(NOT CINN_ONLY)
 
-  cinn_cc_library(
-    pd_to_cinn_pass
-    SRCS
-    pd_to_cinn_pass.cc
-    DEPS
-    drr
-    cinn_op_dialect
-    op_dialect_vjp)
-
-  cinn_cc_library(
-    add_broadcast_to_elementwise_pass
-    SRCS
-    add_broadcast_to_elementwise_pass.cc
-    DEPS
-    pir
-    cinn_op_dialect
-    op_dialect_vjp)
-
-  cinn_cc_library(
-    fuse_shape_ops_into_generate_shape_op_pass
-    SRCS
-    fuse_shape_ops_into_generate_shape_op_pass.cc
-    DEPS
-    pir
-    cinn_op_dialect
-    op_dialect_vjp)
+  file(GLOB_RECURSE cinn_transforms_srcs "*.cc")
 
-  cinn_cc_library(
-    fully_insert_broadcast_pass
-    SRCS
-    fully_insert_broadcast_pass.cc
-    DEPS
-    pir
-    cinn_op_dialect
-    op_dialect_vjp)
+  set(cinn_transforms_deps pir drr op_dialect cinn_op_dialect op_dialect_vjp)
 
-  cinn_cc_library(
-    split_generate_shape_into_shape_ops_pass
-    SRCS
-    split_generate_shape_into_shape_ops_pass.cc
-    DEPS
-    pir
-    cinn_op_dialect
-    op_dialect_vjp)
+  cc_library(
+    cinn_transforms
+    SRCS ${cinn_transforms_srcs}
+    DEPS ${cinn_transforms_deps})
 
 endif()
diff --git a/paddle/cinn/hlir/dialect/operator/transforms/group_merge/CMakeLists.txt b/paddle/cinn/hlir/dialect/operator/transforms/group_merge/CMakeLists.txt
deleted file mode 100644
index dd0b5f48308b5..0000000000000
--- a/paddle/cinn/hlir/dialect/operator/transforms/group_merge/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-if(NOT CINN_ONLY)
-  cinn_cc_library(
-    op_with_group_merge_pass
-    SRCS
-    group_with_group_merge_pass.cc
-    op_with_group_merge_pass.cc
-    cinn_group_lowering_pass.cc
-    tensor_node.cc
-    DEPS
-    op_dialect_vjp
-    pir_compiler
-    cinn_runtime_dialect)
-endif()
diff --git a/paddle/fluid/pybind/CMakeLists.txt b/paddle/fluid/pybind/CMakeLists.txt
index 08d8a22699e26..7a45ba0fbe878 100755
--- a/paddle/fluid/pybind/CMakeLists.txt
+++ b/paddle/fluid/pybind/CMakeLists.txt
@@ -50,14 +50,7 @@ set(PYBIND_DEPS
     auto_parallel)
 
 if(WITH_CINN)
-  set(PYBIND_DEPS
-      ${PYBIND_DEPS}
-      pir_transforms
-      op_with_group_merge_pass
-      add_broadcast_to_elementwise_pass
-      pd_to_cinn_pass
-      sub_graph_checker
-      split_generate_shape_into_shape_ops_pass)
+  set(PYBIND_DEPS ${PYBIND_DEPS} cinn_transforms)
 endif()
 
 if(WITH_PSCORE)

From 8628dce0e205d11841ec7e4e50b30740c5bb190b Mon Sep 17 00:00:00 2001
From: zyfncg <zhangyunfei07@baidu.com>
Date: Wed, 10 Jan 2024 06:12:16 +0000
Subject: [PATCH 2/3] add dependency in cmake

---
 paddle/cinn/hlir/dialect/operator/transforms/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/paddle/cinn/hlir/dialect/operator/transforms/CMakeLists.txt b/paddle/cinn/hlir/dialect/operator/transforms/CMakeLists.txt
index 9ece0edc82c1b..7b46cbe32913d 100644
--- a/paddle/cinn/hlir/dialect/operator/transforms/CMakeLists.txt
+++ b/paddle/cinn/hlir/dialect/operator/transforms/CMakeLists.txt
@@ -2,7 +2,8 @@ if(NOT CINN_ONLY)
 
   file(GLOB_RECURSE cinn_transforms_srcs "*.cc")
 
-  set(cinn_transforms_deps pir drr op_dialect cinn_op_dialect op_dialect_vjp)
+  set(cinn_transforms_deps pir drr op_dialect cinn_op_dialect op_dialect_vjp
+                           cinn_runtime_dialect)
 
   cc_library(
     cinn_transforms

From 7fb11d1b7767928b0b338af246862de72506c7f0 Mon Sep 17 00:00:00 2001
From: zyfncg <zhangyunfei07@baidu.com>
Date: Wed, 10 Jan 2024 06:46:45 +0000
Subject: [PATCH 3/3] add dependency in cmake

---
 .../hlir/dialect/operator/transforms/CMakeLists.txt    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/paddle/cinn/hlir/dialect/operator/transforms/CMakeLists.txt b/paddle/cinn/hlir/dialect/operator/transforms/CMakeLists.txt
index 7b46cbe32913d..8439775348a49 100644
--- a/paddle/cinn/hlir/dialect/operator/transforms/CMakeLists.txt
+++ b/paddle/cinn/hlir/dialect/operator/transforms/CMakeLists.txt
@@ -2,8 +2,14 @@ if(NOT CINN_ONLY)
 
   file(GLOB_RECURSE cinn_transforms_srcs "*.cc")
 
-  set(cinn_transforms_deps pir drr op_dialect cinn_op_dialect op_dialect_vjp
-                           cinn_runtime_dialect)
+  set(cinn_transforms_deps
+      pir
+      drr
+      op_dialect
+      cinn_op_dialect
+      op_dialect_vjp
+      cinn_runtime_dialect
+      pir_compiler)
 
   cc_library(
     cinn_transforms