Fix kunlun compile bug (#63307)

risemeup1 · tianshuo78520a · web-flow · commit 1afebc540063 · 2024-04-08T19:51:48.000+08:00
* Fix xpu build

* Fix xpu build

* Fix ir_op_test

* fix kunlun compile bug

* fix kunlun compile bug

---------

Co-authored-by: tianshuo78520a &lt;707759223@qq.com&gt;
diff --git a/cmake/external/rocksdb.cmake b/cmake/external/rocksdb.cmake
@@ -14,8 +14,6 @@
 
 include(ExternalProject)
 
-# find_package(jemalloc REQUIRED)
-
 set(ROCKSDB_SOURCE_DIR ${PADDLE_SOURCE_DIR}/third_party/rocksdb)
 set(ROCKSDB_TAG 6.19.fb)
 
@@ -32,28 +30,10 @@ set(ROCKSDB_INCLUDE_DIR
 set(ROCKSDB_LIBRARIES
     "${ROCKSDB_INSTALL_DIR}/lib/librocksdb.a"
     CACHE FILEPATH "rocksdb library." FORCE)
-set(ROCKSDB_COMMON_FLAGS
-    "-g -pipe -O2 -W -Wall -Wno-unused-parameter -fPIC -fno-builtin-memcmp -fno-omit-frame-pointer"
-)
-set(ROCKSDB_FLAGS
-    "-DNDEBUG -DROCKSDB_JEMALLOC -DJEMALLOC_NO_DEMANGLE -DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX -DOS_LINUX -DROCKSDB_FALLOCATE_PRESENT -DHAVE_PCLMUL -DZLIB -DROCKSDB_MALLOC_USABLE_SIZE -DROCKSDB_PTHREAD_ADAPTIVE_MUTEX -DROCKSDB_BACKTRACE -DROCKSDB_SUPPORT_THREAD_LOCAL -DROCKSDB_USE_RTTI -DROCKSDB_SCHED_GETCPU_PRESENT -DROCKSDB_RANGESYNC_PRESENT -DROCKSDB_AUXV_GETAUXVAL_PRESENT"
-)
-set(ROCKSDB_CMAKE_CXX_FLAGS
-    "${ROCKSDB_COMMON_FLAGS} -DROCKSDB_LIBAIO_PRESENT ${ROCKSDB_FLAGS} -fPIC -I${JEMALLOC_INCLUDE_DIR}"
-)
-if(NOT WITH_ARM)
-  set(ROCKSDB_FLAGS "${ROCKSDB_FLAGS} -DHAVE_SSE42")
-  set(ROCKSDB_CMAKE_CXX_FLAGS
-      "${ROCKSDB_CMAKE_CXX_FLAGS} -msse -msse4.2 -mpclmul")
-endif()
-set(ROCKSDB_CMAKE_C_FLAGS
-    "${ROCKSDB_COMMON_FLAGS} ${ROCKSDB_FLAGS} -DROCKSDB_LIBAIO_PRESENT -fPIC -I${JEMALLOC_INCLUDE_DIR}"
-)
-include_directories(${ROCKSDB_INCLUDE_DIR})
 
-set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -pthread")
-
-set(ROCKSDB_CMAKE_SHARED_LINKER_FLAGS "-ldl -lrt -lz")
+set(ROCKSDB_CXX_FLAGS
+    "${CMAKE_CXX_FLAGS} -DROCKSDB_LIBAIO_PRESENT -I${JEMALLOC_INCLUDE_DIR}")
+set(ROCKSDB_SHARED_LINKER_FLAGS "-Wl,--no-as-needed -ldl")
 
 if(WITH_ARM)
   file(TO_NATIVE_PATH ${PADDLE_SOURCE_DIR}/patches/rocksdb/libaio.h.patch
@@ -62,6 +42,7 @@ if(WITH_ARM)
       git checkout -- . && git checkout ${ROCKSDB_TAG} && patch -Nd
       ${PADDLE_SOURCE_DIR}/third_party/rocksdb/env/ < ${native_src})
 endif()
+
 ExternalProject_Add(
   extern_rocksdb
   ${EXTERNAL_PROJECT_LOG_ARGS}
@@ -76,25 +57,23 @@ ExternalProject_Add(
              -DWITH_GFLAGS=OFF
              -DWITH_TESTS=OFF
              -DWITH_JEMALLOC=ON
-             -DWITH_BENCHMARK_TOOLS=OFF
-             -DFAIL_ON_WARNINGS=OFF # For Clang compatibility
              -DJeMalloc_LIBRARIES=${JEMALLOC_LIBRARIES}
              -DJeMalloc_INCLUDE_DIRS=${JEMALLOC_INCLUDE_DIR}
-             -DCMAKE_CXX_FLAGS=${ROCKSDB_CMAKE_CXX_FLAGS}
-             -DCMAKE_C_FLAGS=${ROCKSDB_CMAKE_C_FLAGS}
-             -DCMAKE_SHARED_LINKER_FLAGS=${ROCKSDB_CMAKE_SHARED_LINKER_FLAGS}
-  INSTALL_COMMAND
-    mkdir -p ${ROCKSDB_INSTALL_DIR}/lib/ && cp
-    ${ROCKSDB_PREFIX_DIR}/src/extern_rocksdb-build/librocksdb.a
-    ${ROCKSDB_LIBRARIES} && cp -r ${ROCKSDB_SOURCE_DIR}/include
-    ${ROCKSDB_INSTALL_DIR}/
+             -DWITH_BENCHMARK_TOOLS=OFF
+             -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+             -DCMAKE_CXX_FLAGS=${ROCKSDB_CXX_FLAGS}
+             -DCMAKE_SHARED_LINKER_FLAGS=${ROCKSDB_SHARED_LINKER_FLAGS}
+  CMAKE_CACHE_ARGS
+    -DCMAKE_INSTALL_PREFIX:PATH=${ROCKSDB_INSTALL_DIR}
+    -DCMAKE_INSTALL_LIBDIR:PATH=${ROCKSDB_INSTALL_DIR}/lib
+    -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
+    -DCMAKE_BUILD_TYPE:STRING=${THIRD_PARTY_BUILD_TYPE}
   BUILD_BYPRODUCTS ${ROCKSDB_LIBRARIES})
+add_dependencies(extern_rocksdb snappy extern_jemalloc)
 
 add_library(rocksdb STATIC IMPORTED GLOBAL)
-
-add_dependencies(extern_rocksdb snappy)
-add_dependencies(extern_rocksdb extern_jemalloc)
 set_property(TARGET rocksdb PROPERTY IMPORTED_LOCATION ${ROCKSDB_LIBRARIES})
+include_directories(${ROCKSDB_INCLUDE_DIR})
 add_dependencies(rocksdb extern_rocksdb)
 
 list(APPEND external_project_dependencies rocksdb)
diff --git a/paddle/fluid/distributed/ps/service/CMakeLists.txt b/paddle/fluid/distributed/ps/service/CMakeLists.txt
@@ -11,6 +11,10 @@ else()
 
 endif()
 
+if(WITH_PSCORE AND NOT WITH_HETERPS)
+  set(BRPC_DEPS ${BRPC_DEPS} ps_service)
+endif()
+
 brpc_library(
   sendrecv_rpc
   SRCS
diff --git a/paddle/fluid/imperative/CMakeLists.txt b/paddle/fluid/imperative/CMakeLists.txt
@@ -79,7 +79,8 @@ cc_library(
        layout_autotune
        ops_extra_info
        phi
-       common)
+       common
+       global_utils)
 cc_library(
   basic_engine
   SRCS basic_engine.cc
diff --git a/paddle/fluid/pir/dialect/CMakeLists.txt b/paddle/fluid/pir/dialect/CMakeLists.txt
@@ -263,7 +263,7 @@ file(GLOB_RECURSE dist_dialect_srcs
 # if(WITH_DISTRIBUTE) FIXME in next PR
 set(op_dialect_srcs ${op_dialect_srcs} ${dist_dialect_srcs})
 # endif()
-set(op_dialect_deps phi common pir type_info string_helper)
+set(op_dialect_deps phi common pir type_info string_helper global_utils amp)
 if(WITH_ROCM)
   set(op_dialect_deps ${op_dialect_deps} global_utils)
 endif()
@@ -289,7 +289,7 @@ if(WITH_MKLDNN)
       ${CMAKE_CURRENT_SOURCE_DIR}/operator/ir/op_onednn_dialect.cc)
 endif()
 
-set(op_dialect_vjp_deps primitive_vjp_experimental op_dialect)
+set(op_dialect_vjp_deps primitive_vjp_experimental op_dialect prim_utils)
 
 cc_library(
   op_dialect_vjp
diff --git a/paddle/phi/kernels/xpu/xpu_api_wrapper.h b/paddle/phi/kernels/xpu/xpu_api_wrapper.h
@@ -41,7 +41,8 @@ enum XPUFCCalcType {
 
 template <typename T>
 XPUFCCalcType FCCalcType() {
-  if (std::getenv("XPU_PADDLE_FC_FLOAT16") != nullptr &&
+  const char* xpu_paddle_fc_float16 = std::getenv("XPU_PADDLE_FC_FLOAT16");
+  if (xpu_paddle_fc_float16 != nullptr &&
       (std::is_same<phi::dtype::float16, T>::value ||
        std::is_same<XPUTypeFP16, T>::value || std::is_same<float, T>::value)) {
     return XPUFCCalcType::FC_FLOAT16;
diff --git a/test/cpp/auto_parallel/CMakeLists.txt b/test/cpp/auto_parallel/CMakeLists.txt
@@ -8,7 +8,10 @@ cc_test(
   DEPS proto_desc)
 
 if(WITH_DISTRIBUTE)
-  cc_library(spmd_rule_test_util SRCS spmd_rule_test_util.cc)
+  cc_library(
+    spmd_rule_test_util
+    SRCS spmd_rule_test_util.cc
+    DEPS gtest)
   cc_test(
     dist_tensor_test
     SRCS dist_tensor_test.cc
diff --git a/test/cpp/fluid/CMakeLists.txt b/test/cpp/fluid/CMakeLists.txt
@@ -62,7 +62,7 @@ if(WITH_GPU)
   nv_test(
     dropout_op_test
     SRCS dropout_op_test.cc
-    DEPS dropout_op tensor phi common)
+    DEPS dropout_op tensor phi common global_utils)
   nv_test(
     test_leaky_relu_grad_grad_functor
     SRCS test_leaky_relu_grad_grad_functor.cc
diff --git a/test/cpp/pir/core/CMakeLists.txt b/test/cpp/pir/core/CMakeLists.txt
@@ -7,7 +7,6 @@ paddle_test(ir_builder_test SRCS ir_builder_test.cc)
 paddle_test(ir_program_test SRCS ir_program_test.cc)
 paddle_test(ir_infershape_test SRCS ir_infershape_test.cc)
 paddle_test(scalar_attribute_test SRCS scalar_attribute_test.cc)
-paddle_test(ir_printer_test SRCS ir_printer_test.cc DEPS test_dialect)
 paddle_test(paddle_fatal_test SRCS paddle_fatal_test.cc)
 
 file(
diff --git a/test/cpp/pir/core/ir_op_test.cc b/test/cpp/pir/core/ir_op_test.cc
@@ -500,3 +500,62 @@ TEST(op_test, same_operands_and_result_type_trait_test3) {
                    dense_tensor_dtype1),
                pir::IrNotMetException);
 }
+
+TEST(printer_test, custom_hooks) {
+  pir::IrContext *ctx = pir::IrContext::Instance();
+  pir::Dialect *test_dialect = ctx->GetOrRegisterDialect<test::TestDialect>();
+  EXPECT_EQ(test_dialect != nullptr, true);
+
+  pir::OpInfo op1_info = ctx->GetRegisteredOpInfo(test::Operation1::name());
+  pir::OpInfo op2_info = ctx->GetRegisteredOpInfo(test::Operation2::name());
+
+  pir::Operation *op1 = pir::Operation::Create(
+      {},
+      test::CreateAttributeMap({"op1_attr1", "op1_attr2"},
+                               {"op1_attr1", "op1_attr2"}),
+      {pir::Float32Type::get(ctx)},
+      op1_info);
+  pir::Operation *op2 = pir::Operation::Create(
+      {op1->result(0)}, {}, {pir::Float32Type::get(ctx)}, op2_info);
+
+  pir::Program program(ctx);
+  program.block()->push_back(op1);
+  program.block()->push_back(op2);
+
+  pir::PrintHooks hooks;
+  // this one retains old printing and adds new info
+  hooks.value_print_hook = [](pir::Value v, pir::IrPrinter &printer) {
+    printer.IrPrinter::PrintValue(v);
+    printer.os << " [extra info]";
+  };
+  // this one overrides old printing
+  hooks.op_print_hook = [](pir::Operation *op, pir::IrPrinter &printer) {
+    printer.PrintOpResult(op);
+    printer.os << " :=";
+
+    printer.os << " \"" << op->name() << "\"";
+    printer.PrintOpOperands(op);
+    printer.PrintAttributeMap(op);
+    printer.os << " :";
+    printer.PrintOpReturnType(op);
+  };
+
+  hooks.attribute_print_hook = [](pir::Attribute attr,
+                                  pir::IrPrinter &printer) {
+    printer.os << "[PlaceHolder]";
+  };
+  hooks.type_print_hook = [](pir::Type type, pir::IrPrinter &printer) {
+    printer.os << "[" << type << "]";
+  };
+
+  std::stringstream ss;
+
+  ss << pir::CustomPrintHelper{program, hooks};
+  EXPECT_EQ(
+      ss.str(),
+      "{\n"
+      "(%0 [extra info]) := \"test.operation1\" () "
+      "{op1_attr1:[PlaceHolder],op1_attr2:[PlaceHolder]} :[f32]\n"
+      "(%1 [extra info]) := \"test.operation2\" (%0 [extra info]) {} :[f32]\n"
+      "}\n");
+}
diff --git a/test/cpp/pir/core/ir_printer_test.cc b/test/cpp/pir/core/ir_printer_test.cc
