[CINN][new hardware] modify according to comment (#65438)

DongBaiYue · web-flow · commit b8464ceb1b1f · 2024-06-26T16:06:29.000+08:00
* [CINN][new hardware] modify according to comment

* fix error message too short
diff --git a/paddle/cinn/common/arch.h b/paddle/cinn/common/arch.h
@@ -24,19 +24,22 @@ namespace common {
 
 struct UnknownArch {};
 
-struct X86Arch {};
+#define CINN_ARCH_CLASS_NAMES(_macro) \
+  _macro(X86Arch) _macro(ARMArch) _macro(NVGPUArch) _macro(HygonDCUArchHIP)
 
-struct ARMArch {};
-
-struct NVGPUArch {};
-
-struct HygonDCUArchHIP {};
+#define DEFINE_CINN_ARCH(class_name) \
+  struct class_name {};
+CINN_ARCH_CLASS_NAMES(DEFINE_CINN_ARCH);
+#undef DEFINE_CINN_ARCH
 
 /**
  * The architecture used by the target. Determines the instruction set to use.
  */
-using ArchBase =
-    std::variant<UnknownArch, X86Arch, ARMArch, NVGPUArch, HygonDCUArchHIP>;
+using ArchBase = std::variant<
+#define LIST_CINN_ARCH_ALTERNATIVE(class_name) class_name,
+    CINN_ARCH_CLASS_NAMES(LIST_CINN_ARCH_ALTERNATIVE)
+#undef LIST_CINN_ARCH_ALTERNATIVE
+        UnknownArch>;
 struct Arch final : public ArchBase {
   using ArchBase::ArchBase;
 
diff --git a/paddle/cinn/hlir/op/broadcast.cc b/paddle/cinn/hlir/op/broadcast.cc
@@ -561,7 +561,7 @@ CINN_REGISTER_HELPER(broadcast_ops) {
                 MakeOpFunction(cinn::hlir::op::InferDtypeForBroadcast))
       .set_attr("generate_equations",
                 MakeOpFunction(cinn::hlir::op::GenerateEquationsForBroadcastTo))
-#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
+#if !defined(CINN_WITH_CUDA) && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForBroadcastTo))
 #endif
diff --git a/paddle/cinn/hlir/op/elementwise.cc b/paddle/cinn/hlir/op/elementwise.cc
@@ -1899,7 +1899,7 @@ CINN_REGISTER_HELPER(elementwise_ops) {
                 MakeOpFunction(cinn::hlir::op::InferDtypeForElementwise))
       .set_attr("generate_equations",
                 MakeOpFunction(cinn::hlir::op::GenerateEquationsForElementwise))
-#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
+#if !defined(CINN_WITH_CUDA) && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForElementwise))
 #endif
@@ -1917,7 +1917,7 @@ CINN_REGISTER_HELPER(elementwise_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForConstScalar))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForConstScalar))
-#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
+#if !defined(CINN_WITH_CUDA) && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForConstScalar))
 #endif
@@ -1951,7 +1951,7 @@ CINN_REGISTER_HELPER(elementwise_ops) {
       .set_attr(
           "generate_equations",
           MakeOpFunction(cinn::hlir::op::GenerateEquationsForFillConstant))
-#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
+#if !defined(CINN_WITH_CUDA) && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForFillConstant))
 #endif
@@ -1969,7 +1969,7 @@ CINN_REGISTER_HELPER(elementwise_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForAssignValue))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForAssignValue))
-#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
+#if !defined(CINN_WITH_CUDA) && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForAssignValue))
 #endif
diff --git a/paddle/cinn/hlir/op/nn.cc b/paddle/cinn/hlir/op/nn.cc
@@ -2559,7 +2559,7 @@ CINN_REGISTER_HELPER(nn_ops) {
       .set_attr("inferdtype", MakeOpFunction(cinn::hlir::op::InferDtypeForRelu))
       .set_attr("generate_equations",
                 MakeOpFunction(cinn::hlir::op::GenerateEquationsForRelu))
-#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
+#if !defined(CINN_WITH_CUDA) && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForUnary))
 #endif
@@ -2579,7 +2579,7 @@ CINN_REGISTER_HELPER(nn_ops) {
           "CINNStrategySymbolic", cinn::hlir::op::StrategyForRelu6Symbolic)
       .set_attr("infershape", MakeOpFunction(cinn::hlir::op::InferShapeForRelu))
       .set_attr("inferdtype", MakeOpFunction(cinn::hlir::op::InferDtypeForRelu))
-#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
+#if !defined(CINN_WITH_CUDA) && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForUnary))
 #endif
@@ -2597,7 +2597,7 @@ CINN_REGISTER_HELPER(nn_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForConv2d))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForConv2d))
-#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
+#if !defined(CINN_WITH_CUDA) && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForConv2d))
 #endif
@@ -2617,7 +2617,7 @@ CINN_REGISTER_HELPER(nn_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForConv2dNCHWc))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForConv2dNCHWc))
-#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
+#if !defined(CINN_WITH_CUDA) && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForConv2dNCHWc))
 #endif
@@ -2635,7 +2635,7 @@ CINN_REGISTER_HELPER(nn_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForConv2d))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForConv2d))
-#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
+#if !defined(CINN_WITH_CUDA) && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForConv2d))
 #endif
@@ -2661,7 +2661,7 @@ CINN_REGISTER_HELPER(nn_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForBatchNorm))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForBatchNorm))
-#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
+#if !defined(CINN_WITH_CUDA) && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForBatchNorm))
 #endif
@@ -2678,7 +2678,7 @@ CINN_REGISTER_HELPER(nn_ops) {
       .set_attr("infershape",
                 MakeOpFunction(cinn::hlir::op::InferShapeForPool1d))
       .set_attr("inferdtype", MakeOpFunction(cinn::hlir::op::InferDtypeForPool))
-#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
+#if !defined(CINN_WITH_CUDA) && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForPool))
 #endif
@@ -2696,7 +2696,7 @@ CINN_REGISTER_HELPER(nn_ops) {
       .set_attr("infershape",
                 MakeOpFunction(cinn::hlir::op::InferShapeForPool2d))
       .set_attr("inferdtype", MakeOpFunction(cinn::hlir::op::InferDtypeForPool))
-#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
+#if !defined(CINN_WITH_CUDA) && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForPool))
 #endif
@@ -2715,7 +2715,7 @@ CINN_REGISTER_HELPER(nn_ops) {
       .set_attr("infershape",
                 MakeOpFunction(cinn::hlir::op::InferShapeForPool3d))
       .set_attr("inferdtype", MakeOpFunction(cinn::hlir::op::InferDtypeForPool))
-#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
+#if !defined(CINN_WITH_CUDA) && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForPool))
 #endif
@@ -2733,7 +2733,7 @@ CINN_REGISTER_HELPER(nn_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForSoftmax))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForSoftmax))
-#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
+#if !defined(CINN_WITH_CUDA) && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForSoftmax))
 #endif
@@ -2751,7 +2751,7 @@ CINN_REGISTER_HELPER(nn_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForDropoutInfer))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForDropoutInfer))
-#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
+#if !defined(CINN_WITH_CUDA) && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForUnary))
 #endif
@@ -2771,7 +2771,7 @@ CINN_REGISTER_HELPER(nn_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForSelect))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForSelect))
-#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
+#if !defined(CINN_WITH_CUDA) && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForUnary))
 #endif
diff --git a/paddle/cinn/hlir/op/transform.cc b/paddle/cinn/hlir/op/transform.cc
@@ -2229,7 +2229,7 @@ CINN_REGISTER_HELPER(transform_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForMatMul))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForMatMul))
-#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
+#if !defined(CINN_WITH_CUDA) && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForMatMul))
 #endif
@@ -2249,7 +2249,7 @@ CINN_REGISTER_HELPER(transform_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForSplit))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForSplit))
-#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
+#if !defined(CINN_WITH_CUDA) && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForSplit))
 #endif
@@ -2271,7 +2271,7 @@ CINN_REGISTER_HELPER(transform_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForConcat))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForConcat))
-#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
+#if !defined(CINN_WITH_CUDA) && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForConcat))
 #endif
@@ -2291,7 +2291,7 @@ CINN_REGISTER_HELPER(transform_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForReverse))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForLayoutTransform))
-#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
+#if !defined(CINN_WITH_CUDA) && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForReverse))
 #endif
@@ -2311,7 +2311,7 @@ CINN_REGISTER_HELPER(transform_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForTranspose))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForLayoutTransform))
-#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
+#if !defined(CINN_WITH_CUDA) && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForTranspose))
 #endif
@@ -2329,7 +2329,7 @@ CINN_REGISTER_HELPER(transform_ops) {
           "CINNStrategy", cinn::hlir::op::StrategyForMul)
       .set_attr("infershape", MakeOpFunction(cinn::hlir::op::InferShapeForMul))
       .set_attr("inferdtype", MakeOpFunction(cinn::hlir::op::InferDtypeForMul))
-#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
+#if !defined(CINN_WITH_CUDA) && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForMul))
 #endif
@@ -2377,7 +2377,7 @@ CINN_REGISTER_HELPER(transform_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForLayoutTransform))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForLayoutTransform))
-#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
+#if !defined(CINN_WITH_CUDA) && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForLayoutTransform))
 #endif
@@ -2397,7 +2397,7 @@ CINN_REGISTER_HELPER(transform_ops) {
                 MakeOpFunction(cinn::hlir::op::InferShapeForSlice))
       .set_attr("inferdtype",
                 MakeOpFunction(cinn::hlir::op::InferDtypeForSlice))
-#ifndef CINN_WITH_CUDA && !defined(CINN_WITH_HIP)
+#if !defined(CINN_WITH_CUDA) && !defined(CINN_WITH_HIP)
       .set_attr("inferlayout",
                 MakeOpFunction(cinn::hlir::op::InferLayoutForSlice))
 #endif
diff --git a/paddle/cinn/runtime/hip/hip_util.h b/paddle/cinn/runtime/hip/hip_util.h
@@ -25,34 +25,35 @@ namespace cinn {
 namespace runtime {
 namespace hip {
 
-#define HIP_CALL(func)                                                       \
-  {                                                                          \
-    auto status = func;                                                      \
-    if (status != hipSuccess) {                                              \
-      PADDLE_THROW(phi::errors::InvalidArgument("HIP Error : %s",            \
-                                                hipGetErrorString(status))); \
-    }                                                                        \
+#define HIP_CHECK(expr)                                               \
+  {                                                                   \
+    auto status = expr;                                               \
+    if (status != hipSuccess) {                                       \
+      PADDLE_THROW(phi::errors::Fatal("HIP Error in Paddle CINN: %s", \
+                                      hipGetErrorString(status)));    \
+    }                                                                 \
   }
 
-#define HIP_DRIVER_CALL(func)                         \
-  {                                                   \
-    auto status = func;                               \
-    if (status != hipSuccess) {                       \
-      const char* msg;                                \
-      hipDrvGetErrorString(status, &msg);             \
-      PADDLE_THROW(phi::errors::InvalidArgument(      \
-          "HIP Driver Error: %s failed with error: ", \
-          hipGetErrorString(status)));                \
-    }                                                 \
+#define HIP_DRIVER_CHECK(expr)                                         \
+  {                                                                    \
+    auto status = expr;                                                \
+    if (status != hipSuccess) {                                        \
+      const char* msg;                                                 \
+      hipDrvGetErrorString(status, &msg);                              \
+      PADDLE_THROW(phi::errors::Fatal(                                 \
+          "HIP Driver Error in Paddle CINN: %s failed with error: %s", \
+          #expr,                                                       \
+          msg));                                                       \
+    }                                                                  \
   }
 
-#define HIPRTC_CALL(func)                                     \
-  {                                                           \
-    auto status = func;                                       \
-    if (status != HIPRTC_SUCCESS) {                           \
-      PADDLE_THROW(phi::errors::InvalidArgument(              \
-          "NVRTC Error : %s", hiprtcGetErrorString(status))); \
-    }                                                         \
+#define HIPRTC_CHECK(expr)                                               \
+  {                                                                      \
+    auto status = expr;                                                  \
+    if (status != HIPRTC_SUCCESS) {                                      \
+      PADDLE_THROW(phi::errors::Fatal("HIPRTC Error in Paddle CINN: %s", \
+                                      hiprtcGetErrorString(status)));    \
+    }                                                                    \
   }
 }  // namespace hip
 }  // namespace runtime
