Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Cuda] Save the Cuda native error code on adapter-specific errors #2092

Closed
wants to merge 1 commit into from
Closed

[Cuda] Save the Cuda native error code on adapter-specific errors #2092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/adapters/cuda/adapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urAdapterRelease(ur_adapter_handle_t) {

UR_APIEXPORT ur_result_t UR_APICALL urAdapterGetLastError(
ur_adapter_handle_t, const char **ppMessage, int32_t *pError) {
std::ignore = pError;
*pError = ErrorAdapterNativeCode;
*ppMessage = ErrorMessage;
return ErrorMessageCode;
}
Expand Down
23 changes: 17 additions & 6 deletions source/adapters/cuda/common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@

#include "common.hpp"
#include "logger/ur_logger.hpp"
#include "ur_api.h"

#include <cuda.h>

#include <sstream>
#include <string.h>

ur_result_t mapErrorUR(CUresult Result) {
switch (Result) {
Expand Down Expand Up @@ -105,6 +107,7 @@ void detail::ur::assertion(bool Condition, const char *Message) {
// Global variables for ZER_EXT_RESULT_ADAPTER_SPECIFIC_ERROR
thread_local ur_result_t ErrorMessageCode = UR_RESULT_SUCCESS;
thread_local char ErrorMessage[MaxMessageSize];
thread_local int32_t ErrorAdapterNativeCode = 0;

// Utility function for setting a message and warning
[[maybe_unused]] void setErrorMessage(const char *pMessage,
Expand All @@ -114,16 +117,24 @@ thread_local char ErrorMessage[MaxMessageSize];
ErrorMessageCode = ErrorCode;
}

void setPluginSpecificMessage(CUresult cu_res) {
[[maybe_unused]] void setAdapterSpecificMessage(CUresult cu_res) {
ErrorAdapterNativeCode = static_cast<int32_t>(cu_res);
// according to the documentation of the cuGetErrorName and cuGetErrorString
// CUDA driver APIs, both error_name and error_string are null-terminated.
const char *error_string;
const char *error_name;
cuGetErrorName(cu_res, &error_name);
cuGetErrorString(cu_res, &error_string);
char *message = (char *)malloc(strlen(error_string) + strlen(error_name) + 2);
strcpy(message, error_name);
strcat(message, "\n");
strcat(message, error_string);
static constexpr char new_line[] = "\n";
// non-null-terminated sizes
const size_t error_string_size = std::strlen(error_string);
const size_t error_name_size = std::strlen(error_name);
char *message = reinterpret_cast<char *>(
std::malloc(error_string_size + error_name_size + sizeof(new_line)));
std::strcpy(message, error_name);
std::strcat(message, new_line);
std::strncat(message, error_string, error_string_size);

setErrorMessage(message, UR_RESULT_ERROR_ADAPTER_SPECIFIC);
free(message);
std::free(message);
}
3 changes: 2 additions & 1 deletion source/adapters/cuda/common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,13 @@ std::string getCudaVersionString();
constexpr size_t MaxMessageSize = 256;
extern thread_local ur_result_t ErrorMessageCode;
extern thread_local char ErrorMessage[MaxMessageSize];
extern thread_local int32_t ErrorAdapterNativeCode;

// Utility function for setting a message and warning
[[maybe_unused]] void setErrorMessage(const char *pMessage,
ur_result_t ErrorCode);

void setPluginSpecificMessage(CUresult cu_res);
void setAdapterSpecificMessage(CUresult cu_res);

/// ------ Error handling, matching OpenCL plugin semantics.
namespace detail {
Expand Down
Loading