[CINN Frontend] Optimize user interface, polish fuse_pass classes (Pa…

…ddlePaddle#55705) * [CINN Frontend] Optimize user interface, polish fuse_pass classes" * Fix some compile error
wz1qqx · Jul 31, 2023 · 6b14a3c · 6b14a3c
1 parent 61ebbfd
commit 6b14a3c
Show file tree

Hide file tree

Showing 33 changed files with 1,643 additions and 1,062 deletions.
diff --git a/cmake/cinn/core.cmake b/cmake/cinn/core.cmake
@@ -433,28 +433,6 @@ function(download_and_uncompress INSTALL_DIR URL FILENAME)
     INSTALL_COMMAND "")
 endfunction()
 
-set(fusion_pass_file
-    ${CMAKE_CURRENT_BINARY_DIR}/paddle/cinn/hlir/pass/use_general_pass.h
-    CACHE INTERNAL "use_general_pass.h file")
-file(
-  WRITE ${fusion_pass_file}
-  "#include \"paddle/cinn/common/macros.h\" // Generated by the paddle/cinn/hlir/pass/CMakeLists.txt.  DO NOT EDIT!\n\n"
-)
-
-function(find_fusion_pass_register FILENAME ADD_PATH PATTERN)
-  # set op_name to OUTPUT
-  file(READ ${FILENAME} CONTENT)
-  string(REGEX MATCHALL "${PATTERN}\\([a-zA-Z0-9_]*," fusion_pass_patterns
-               "${CONTENT}")
-  if(NOT fusion_pass_patterns STREQUAL "")
-    foreach(pass_pattern ${fusion_pass_patterns})
-      string(REPLACE "${PATTERN}(" "" pass_pattern "${pass_pattern}")
-      string(REPLACE "," "" pass_pattern "${pass_pattern}")
-      file(APPEND ${ADD_PATH} "USE_FUSION_PASS(${pass_pattern});\n")
-    endforeach()
-  endif()
-endfunction()
-
 function(gather_srcs SRC_GROUP)
   set(options)
   set(oneValueArgs)
@@ -464,8 +442,6 @@ function(gather_srcs SRC_GROUP)
     set(${SRC_GROUP}
         "${${SRC_GROUP}};${CMAKE_CURRENT_SOURCE_DIR}/${cpp}"
         CACHE INTERNAL "")
-    find_fusion_pass_register("${CMAKE_CURRENT_SOURCE_DIR}/${cpp}"
-                              ${fusion_pass_file} "CINN_REGISTER_FUSION_PASS")
   endforeach()
 endfunction()
 

diff --git a/paddle/cinn/common/macros.h b/paddle/cinn/common/macros.h
@@ -67,17 +67,6 @@
                              __test_global_namespace_##uniq_name##__>::value, \
                 msg)
 
-#define CINN_REGISTER_FUSION_PASS(pass_name, pass_class)               \
-  STATIC_ASSERT_GLOBAL_NAMESPACE(                                      \
-      __reg_pass__##pass_name,                                         \
-      "CINN_REGISTER_FUSION_PASS must be called in global namespace"); \
-  static ::cinn::hlir::pass::FusionPassRegistrar<pass_class>           \
-      __pass_registrar_##pass_name##__(#pass_name);                    \
-  int TouchFusionPassRegistrar_##pass_name() {                         \
-    __pass_registrar_##pass_name##__.Touch();                          \
-    return 0;                                                          \
-  }
-
 #define USE_FUSION_PASS(pass_name)                               \
   STATIC_ASSERT_GLOBAL_NAMESPACE(                                \
       __use_fusion_pass_##pass_name,                             \

diff --git a/paddle/cinn/frontend/decomposer/test_helper.h b/paddle/cinn/frontend/decomposer/test_helper.h
@@ -30,7 +30,6 @@
 #include "paddle/cinn/hlir/framework/pass.h"
 #include "paddle/cinn/hlir/framework/tensor.h"
 #include "paddle/cinn/hlir/op/use_ops.h"
-#include "paddle/cinn/hlir/pass/use_general_pass.h"
 #include "paddle/cinn/hlir/pass/use_pass.h"
 
 namespace cinn::frontend {

diff --git a/paddle/cinn/frontend/interpreter.cc b/paddle/cinn/frontend/interpreter.cc
@@ -21,7 +21,6 @@
 #include "paddle/cinn/hlir/framework/graph.h"
 #include "paddle/cinn/hlir/framework/pass.h"
 #include "paddle/cinn/hlir/op/use_ops.h"
-#include "paddle/cinn/hlir/pass/use_general_pass.h"
 #include "paddle/cinn/hlir/pass/use_pass.h"
 #include "paddle/cinn/runtime/flags.h"
 

diff --git a/paddle/cinn/frontend/optimize.cc b/paddle/cinn/frontend/optimize.cc
@@ -26,7 +26,6 @@
 #include "paddle/cinn/hlir/framework/graph.h"
 #include "paddle/cinn/hlir/framework/pass.h"
 #include "paddle/cinn/hlir/framework/visualize_helper.h"
-#include "paddle/cinn/hlir/pass/use_general_pass.h"
 #include "paddle/cinn/hlir/pass/use_pass.h"
 #include "paddle/cinn/runtime/flags.h"
 

diff --git a/paddle/cinn/frontend/pass/test_helper.h b/paddle/cinn/frontend/pass/test_helper.h
@@ -24,7 +24,6 @@
 #include "paddle/cinn/frontend/program_pass.h"
 #include "paddle/cinn/hlir/framework/graph_compiler.h"
 #include "paddle/cinn/hlir/framework/pass.h"
-#include "paddle/cinn/hlir/pass/use_general_pass.h"
 #include "paddle/cinn/hlir/pass/use_pass.h"
 
 namespace cinn::frontend {

diff --git a/paddle/cinn/hlir/framework/pass.cc b/paddle/cinn/hlir/framework/pass.cc
@@ -15,7 +15,6 @@
 #include "paddle/cinn/hlir/framework/pass.h"
 
 #include "paddle/cinn/hlir/framework/visualize_helper.h"
-#include "paddle/cinn/hlir/pass/use_general_pass.h"
 #include "paddle/cinn/hlir/pass/use_pass.h"
 
 namespace cinn {

diff --git a/paddle/cinn/hlir/pass/CMakeLists.txt b/paddle/cinn/hlir/pass/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_subdirectory(general_fusion_merge_pass)
+
 core_gather_headers()
 
 gather_srcs(