From bda128fef125050c0585df0315cfed8adeb1fd46 Mon Sep 17 00:00:00 2001
From: houj04 <houj04@foxmail.com>
Date: Sat, 20 Apr 2024 15:52:24 +0800
Subject: [PATCH 1/2] [XPU] update dtype for numel op

---
 paddle/phi/backends/xpu/xpu3_op_list.cc | 3 +++
 paddle/phi/kernels/xpu/numel_kernel.cc  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/paddle/phi/backends/xpu/xpu3_op_list.cc b/paddle/phi/backends/xpu/xpu3_op_list.cc
index bdc5ffc5921a3d..4a815fd8e5ff5e 100644
--- a/paddle/phi/backends/xpu/xpu3_op_list.cc
+++ b/paddle/phi/backends/xpu/xpu3_op_list.cc
@@ -855,8 +855,11 @@ XPUOpMap& get_kl3_ops() {
        XPUKernelSet({phi::DataType::INT64,
                      phi::DataType::INT32,
                      phi::DataType::INT16,
+                     phi::DataType::UINT8,
                      phi::DataType::BOOL,
                      phi::DataType::FLOAT16,
+                     phi::DataType::FLOAT64,
+                     phi::DataType::BFLOAT16,
                      phi::DataType::FLOAT32})},
       {"sigmoid_cross_entropy_with_logits_grad",
        XPUKernelSet({phi::DataType::FLOAT32})},
diff --git a/paddle/phi/kernels/xpu/numel_kernel.cc b/paddle/phi/kernels/xpu/numel_kernel.cc
index 0268b5cb9ee454..9252838853c483 100644
--- a/paddle/phi/kernels/xpu/numel_kernel.cc
+++ b/paddle/phi/kernels/xpu/numel_kernel.cc
@@ -22,11 +22,14 @@ PD_REGISTER_KERNEL(numel,
                    XPU,
                    ALL_LAYOUT,
                    phi::NumelKernel,
+                   uint8_t,
                    int16_t,
                    int,
                    int64_t,
                    phi::dtype::float16,
+                   phi::dtype::bfloat16,
                    float,
+                   double,
                    bool,
                    phi::dtype::complex<float>,
                    phi::dtype::complex<double>) {

From 511fe723700ae0ddc29e7294bd7f76458d4fc01d Mon Sep 17 00:00:00 2001
From: houj04 <houj04@foxmail.com>
Date: Mon, 22 Apr 2024 11:46:27 +0800
Subject: [PATCH 2/2] dtype for concat and slice.

---
 cmake/external/xpu.cmake                |  2 +-
 paddle/phi/backends/xpu/xpu3_op_list.cc | 10 ++++++++--
 paddle/phi/kernels/xpu/concat_kernel.cc | 10 ++++++----
 paddle/phi/kernels/xpu/slice_kernel.cc  |  6 +++++-
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/cmake/external/xpu.cmake b/cmake/external/xpu.cmake
index b1205fa596b837..728cebe64f6045 100644
--- a/cmake/external/xpu.cmake
+++ b/cmake/external/xpu.cmake
@@ -32,7 +32,7 @@ if(NOT DEFINED XPU_XDNN_BASE_DATE)
   set(XPU_XDNN_BASE_DATE "20240327")
 endif()
 if(NOT DEFINED XPU_XHPC_BASE_DATE)
-  set(XPU_XHPC_BASE_DATE "20240413")
+  set(XPU_XHPC_BASE_DATE "20240422")
 endif()
 set(XPU_XCCL_BASE_VERSION "1.2.0.5")
 if(NOT DEFINED XPU_XFT_BASE_VERSION)
diff --git a/paddle/phi/backends/xpu/xpu3_op_list.cc b/paddle/phi/backends/xpu/xpu3_op_list.cc
index 4a815fd8e5ff5e..40534961a40576 100644
--- a/paddle/phi/backends/xpu/xpu3_op_list.cc
+++ b/paddle/phi/backends/xpu/xpu3_op_list.cc
@@ -202,9 +202,11 @@ XPUOpMap& get_kl3_ops() {
                      phi::DataType::BFLOAT16,
                      phi::DataType::FLOAT64,
                      phi::DataType::BOOL,
+                     phi::DataType::UINT8,
                      phi::DataType::INT8,
-                     phi::DataType::INT64,
-                     phi::DataType::INT32})},
+                     phi::DataType::INT16,
+                     phi::DataType::INT32,
+                     phi::DataType::INT64})},
       {"conv2d_grad",
        XPUKernelSet({phi::DataType::FLOAT32, phi::DataType::FLOAT16})},
       {"conv2d",
@@ -884,6 +886,10 @@ XPUOpMap& get_kl3_ops() {
        XPUKernelSet({phi::DataType::FLOAT32,
                      phi::DataType::FLOAT16,
                      phi::DataType::BFLOAT16,
+                     phi::DataType::FLOAT64,
+                     phi::DataType::UINT8,
+                     phi::DataType::INT8,
+                     phi::DataType::INT16,
                      phi::DataType::INT32,
                      phi::DataType::INT64})},
       {"softmax",
diff --git a/paddle/phi/kernels/xpu/concat_kernel.cc b/paddle/phi/kernels/xpu/concat_kernel.cc
index 0c52791265b8a1..57b0d3731aed17 100644
--- a/paddle/phi/kernels/xpu/concat_kernel.cc
+++ b/paddle/phi/kernels/xpu/concat_kernel.cc
@@ -116,10 +116,12 @@ PD_REGISTER_KERNEL(concat,
                    ALL_LAYOUT,
                    phi::ConcatKernel,
                    float,
-                   double,
                    phi::dtype::float16,
                    phi::dtype::bfloat16,
-                   int64_t,
-                   int,
+                   double,
+                   bool,
+                   uint8_t,
                    int8_t,
-                   bool) {}
+                   int16_t,
+                   int32_t,
+                   int64_t) {}
diff --git a/paddle/phi/kernels/xpu/slice_kernel.cc b/paddle/phi/kernels/xpu/slice_kernel.cc
index d3c114db2411bb..61bc7725b6b63f 100644
--- a/paddle/phi/kernels/xpu/slice_kernel.cc
+++ b/paddle/phi/kernels/xpu/slice_kernel.cc
@@ -118,7 +118,11 @@ PD_REGISTER_KERNEL(slice,
                    ALL_LAYOUT,
                    phi::SliceKernel,
                    float,
-                   int,
                    phi::dtype::float16,
                    phi::dtype::bfloat16,
+                   double,
+                   uint8_t,
+                   int8_t,
+                   int16_t,
+                   int32_t,
                    int64_t) {}