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

[SYCL][COMPAT] Convert error names to lower case #15373

Merged
merged 2 commits into from
Oct 10, 2024
Merged

[SYCL][COMPAT] Convert error names to lower case #15373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3d5a4a
Convert error codes to lower case
joeatodd Sep 12, 2024
aa3293e
Version bump
joeatodd Sep 12, 2024
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
8 changes: 4 additions & 4 deletions sycl/doc/syclcompat/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1544,10 +1544,10 @@ SYCL spec supported by the current SYCL compiler.

The `SYCLCOMPAT_CHECK_ERROR` macro encapsulates an error-handling mechanism for
expressions that might throw `sycl::exception` and `std::runtime_error`. If no
exceptions are thrown, it returns `syclcompat::error_code::SUCCESS`. If a
`sycl::exception` is caught, it returns `syclcompat::error_code::BACKEND_ERROR`.
exceptions are thrown, it returns `syclcompat::error_code::success`. If a
`sycl::exception` is caught, it returns `syclcompat::error_code::backend_error`.
If a `std::runtime_error` exception is caught,
`syclcompat::error_code::DEFAULT_ERROR` is returned instead. For both cases, it
`syclcompat::error_code::default_error` is returned instead. For both cases, it
prints the error message to the standard error stream.

``` c++
Expand Down Expand Up @@ -1580,7 +1580,7 @@ template <int Arg> class syclcompat_kernel_scalar;


namespace syclcompat {
enum error_code { SUCCESS = 0, BACKEND_ERROR = 1, DEFAULT_ERROR = 999 };
enum error_code { success = 0, backend_error = 1, default_error = 999 };
}

#define SYCLCOMPAT_CHECK_ERROR(expr)
Expand Down
10 changes: 5 additions & 5 deletions sycl/include/syclcompat/defs.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ template <int Arg> class syclcompat_kernel_scalar;
#endif

#define SYCLCOMPAT_MAJOR_VERSION 0
#define SYCLCOMPAT_MINOR_VERSION 1
#define SYCLCOMPAT_MINOR_VERSION 2
#define SYCLCOMPAT_PATCH_VERSION 0

#define SYCLCOMPAT_MAKE_VERSION(_major, _minor, _patch) \
Expand All @@ -67,19 +67,19 @@ template <int Arg> class syclcompat_kernel_scalar;
SYCLCOMPAT_PATCH_VERSION)

namespace syclcompat {
enum error_code { SUCCESS = 0, BACKEND_ERROR = 1, DEFAULT_ERROR = 999 };
enum error_code { success = 0, backend_error = 1, default_error = 999 };
}

#define SYCLCOMPAT_CHECK_ERROR(expr) \
[&]() { \
try { \
expr; \
return syclcompat::error_code::SUCCESS; \
return syclcompat::error_code::success; \
} catch (sycl::exception const &e) { \
std::cerr << e.what() << std::endl; \
return syclcompat::error_code::BACKEND_ERROR; \
return syclcompat::error_code::backend_error; \
} catch (std::runtime_error const &e) { \
std::cerr << e.what() << std::endl; \
return syclcompat::error_code::DEFAULT_ERROR; \
return syclcompat::error_code::default_error; \
} \
}()
6 changes: 3 additions & 3 deletions sycl/test-e2e/syclcompat/defs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ void test_check_error() {
throw std::runtime_error("Expected invalid exception in test_check_error");
};

assert(syclcompat::error_code::SUCCESS == SYCLCOMPAT_CHECK_ERROR());
assert(syclcompat::error_code::BACKEND_ERROR ==
assert(syclcompat::error_code::success == SYCLCOMPAT_CHECK_ERROR());
assert(syclcompat::error_code::backend_error ==
SYCLCOMPAT_CHECK_ERROR(sycl_error_throw()));
assert(syclcompat::error_code::DEFAULT_ERROR ==
assert(syclcompat::error_code::default_error ==
SYCLCOMPAT_CHECK_ERROR(runtime_error_throw()));
}

Expand Down
Loading