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

[NFC] Drop code related to error_category_for #857

Merged
merged 2 commits into from
Jan 25, 2024
Merged

[NFC] Drop code related to error_category_for #857

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dee7b08
[NFC] Drop code related to `error_category_for`
AlexeySachkov Jan 19, 2024
094d135
Merge branch 'SYCL-2020' into private/asachkov/drop-error-category-for
AlexeySachkov Jan 20, 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
65 changes: 0 additions & 65 deletions util/sycl_exceptions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,25 +29,19 @@

#define SYCL_CTS_SUPPORT_HAS_EXCEPTION_CODE 1
#define SYCL_CTS_SUPPORT_HAS_EXCEPTION_CATEGORY 0
#define SYCL_CTS_SUPPORT_HAS_ERRC_FOR 0
#define SYCL_CTS_SUPPORT_HAS_ERROR_CATEGORY_FOR 0
#define SYCL_CTS_SUPPORT_HAS_MAKE_ERROR_CODE 0

#elif SYCL_CTS_COMPILING_WITH_DPCPP
// Feature flags for DPC++

#define SYCL_CTS_SUPPORT_HAS_EXCEPTION_CODE 1
#define SYCL_CTS_SUPPORT_HAS_EXCEPTION_CATEGORY 1
#define SYCL_CTS_SUPPORT_HAS_ERRC_FOR 1
#define SYCL_CTS_SUPPORT_HAS_ERROR_CATEGORY_FOR 0
#define SYCL_CTS_SUPPORT_HAS_MAKE_ERROR_CODE 0

#else

#define SYCL_CTS_SUPPORT_HAS_EXCEPTION_CODE 1
#define SYCL_CTS_SUPPORT_HAS_EXCEPTION_CATEGORY 1
#define SYCL_CTS_SUPPORT_HAS_ERRC_FOR 1
#define SYCL_CTS_SUPPORT_HAS_ERROR_CATEGORY_FOR 1
#define SYCL_CTS_SUPPORT_HAS_MAKE_ERROR_CODE 1

#endif
Expand Down Expand Up @@ -131,49 +125,6 @@ struct matcher_equals_exception
};
#endif // SYCL_CTS_SUPPORT_HAS_ERRC_ENUM

/**
* Matcher for backend-specific category and error codes
*/
template <sycl::backend Backend, typename CodeT>
class matcher_equals_exception_for
: public Catch::Matchers::MatcherGenericBase {
public:
matcher_equals_exception_for(const CodeT& code_value)
: m_code_value(code_value) {}

bool match(const sycl::exception& other) const {

#if (SYCL_CTS_SUPPORT_HAS_EXCEPTION_CODE == 0) || \
(SYCL_CTS_SUPPORT_HAS_EXCEPTION_CATEGORY == 0) || \
(SYCL_CTS_SUPPORT_HAS_ERROR_CATEGORY_FOR == 0)
// There should be no compilation failures, but every CHECK_THROWS_MATCHES
// should fail with this matcher
return false;
#else
// Error code is validated by value, with no semantic match
const auto& expected_category = sycl::error_category_for<Backend>();
return (other.category() == expected_category) &&
(other.code().value() == m_code_value);
#endif
}

std::string describe() const override {
std::ostringstream result;
result << "has code value " << to_integral(m_code_value);

#if (SYCL_CTS_SUPPORT_HAS_ERROR_CATEGORY_FOR == 0)
result << " for backend-specific category (not supported)";
#else
const auto& expected_category = sycl::error_category_for<Backend>();
result << " for backend-specific category '" << expected_category().name();
result << "'";
#endif
return result.str();
}

private:
const CodeT& m_code_value;
};
} // namespace detail

/**
Expand Down Expand Up @@ -202,22 +153,6 @@ inline auto equals_exception(const sycl::errc& code) {
}
#endif // SYCL_CTS_SUPPORT_HAS_ERRC_ENUM == 1

/**
* Provides matcher for backend-specific category and error codes
*
* Usage example:
* CHECK_THROWS_MATCHES(action(), sycl::exception,
* equals_exception_for<sycl::backend::opencl>(CL_INVALID_PROGRAM));
*/
template <sycl::backend Backend, typename CodeT>
inline auto equals_exception_for(const CodeT& code) {
#if SYCL_CTS_SUPPORT_HAS_ERRC_FOR == 1
static_assert(std::is_same_v<CodeT, sycl::errc_for<Backend>> ||
std::is_same_v<CodeT, int>);
#endif
return detail::matcher_equals_exception_for<Backend, CodeT>(code);
}

} // namespace sycl_cts::util

/**
Expand Down