Merge pull request #1124 from wenju-he/adapters-ur_unreachable

[NFC] Add utility function ur_unreachable to simplify code
oneapi-src · Jan 16, 2024 · 178e3fc · 178e3fc
2 parents 45506f3 + 5accf50
commit 178e3fc
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/source/adapters/cuda/usm.cpp b/source/adapters/cuda/usm.cpp
@@ -17,6 +17,7 @@
 #include "event.hpp"
 #include "platform.hpp"
 #include "queue.hpp"
+#include "ur_util.hpp"
 #include "usm.hpp"
 
 #include <cuda.h>
@@ -227,11 +228,7 @@ urUSMGetMemAllocInfo(ur_context_handle_t hContext, const void *pMem,
         return ReturnValue(UR_USM_TYPE_HOST);
       }
       // should never get here
-#ifdef _MSC_VER
-      __assume(0);
-#else
-      __builtin_unreachable();
-#endif
+      ur::unreachable();
     }
     case UR_USM_ALLOC_INFO_BASE_PTR: {
 #if CUDA_VERSION >= 10020

diff --git a/source/adapters/hip/usm.cpp b/source/adapters/hip/usm.cpp
@@ -15,6 +15,7 @@
 #include "context.hpp"
 #include "device.hpp"
 #include "platform.hpp"
+#include "ur_util.hpp"
 #include "usm.hpp"
 
 /// USM: Implements USM Host allocations using HIP Pinned Memory
@@ -190,12 +191,7 @@ urUSMGetMemAllocInfo(ur_context_handle_t hContext, const void *pMem,
         return ReturnValue(UR_USM_TYPE_HOST);
       }
       // should never get here
-#ifdef _MSC_VER
-      __assume(0);
-#else
-      __builtin_unreachable();
-#endif
-      return ReturnValue(UR_USM_TYPE_UNKNOWN);
+      ur::unreachable();
     }
     case UR_USM_ALLOC_INFO_DEVICE: {
       // get device index associated with this pointer

diff --git a/source/adapters/native_cpu/kernel.cpp b/source/adapters/native_cpu/kernel.cpp
@@ -9,6 +9,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "ur_api.h"
+#include "ur_util.hpp"
 
 #include "common.hpp"
 #include "kernel.hpp"
@@ -172,11 +173,7 @@ urKernelGetSubGroupInfo(ur_kernel_handle_t hKernel, ur_device_handle_t hDevice,
     return ReturnValue(0);
   }
   case UR_KERNEL_SUB_GROUP_INFO_FORCE_UINT32: {
-#ifdef _MSC_VER
-    __assume(0);
-#else
-    __builtin_unreachable();
-#endif
+    ur::unreachable();
   }
   }
   DIE_NO_IMPLEMENTATION;

diff --git a/source/common/ur_util.hpp b/source/common/ur_util.hpp
@@ -298,4 +298,14 @@ inline ur_result_t exceptionToResult(std::exception_ptr eptr) {
 
 template <class> inline constexpr bool ur_always_false_t = false;
 
+namespace ur {
+[[noreturn]] inline void unreachable() {
+#ifdef _MSC_VER
+    __assume(0);
+#else
+    __builtin_unreachable();
+#endif
+}
+} // namespace ur
+
 #endif /* UR_UTIL_H */
diff --git a/tools/urtrace/collector.cpp b/tools/urtrace/collector.cpp
@@ -277,7 +277,7 @@ std::unique_ptr<TraceWriter> create_writer() {
     case OUTPUT_JSON:
         return std::make_unique<JsonWriter>();
     default:
-        assert(0); /* unreachable */
+        ur::unreachable();
     }
     return nullptr;
 }