Skip to content

[NFCI] Remove/inline [rarely|never] used exception ctor overloads #14406

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

Merged
merged 3 commits into from
Jul 3, 2024
Merged

[NFCI] Remove/inline [rarely|never] used exception ctor overloads #14406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ead10e4
[NFCI] Remove/inline [rarely|never] used `exception` ctor overloads
aelovikov-intel Jul 2, 2024
b3479de
Update sycl/include/sycl/exception.hpp
aelovikov-intel Jul 2, 2024
87cff4f
Update symbols on Windows
aelovikov-intel Jul 3, 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
30 changes: 9 additions & 21 deletions sycl/include/sycl/exception.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,31 +127,19 @@ class __SYCL_EXPORT exception : public virtual std::exception {

protected:
// base constructors used by SYCL 1.2.1 exception subclasses
exception(std::error_code Ec, const char *Msg, const pi_int32 PIErr,
std::shared_ptr<context> Context = nullptr)
: exception(Ec, std::string(Msg), PIErr, Context) {}
exception(std::error_code Ec, const char *Msg, const pi_int32 PIErr)
: exception(Ec, std::string(Msg), PIErr) {}

exception(std::error_code Ec, const std::string &Msg, const pi_int32 PIErr,
std::shared_ptr<context> Context = nullptr)
: exception(Ec, Context, Msg + " " + detail::codeToString(PIErr)) {
exception(std::error_code Ec, const std::string &Msg, const pi_int32 PIErr)
: exception(Ec, nullptr, Msg + " " + detail::codeToString(PIErr)) {
MPIErr = PIErr;
}

exception(const std::string &Msg)
#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
: MMsg(std::make_shared<detail::string>(Msg)), MContext(nullptr){}
#else
: MMsg(std::make_shared<std::string>(Msg)), MContext(nullptr) {
}
#endif

// base constructor for all SYCL 2020 constructors
// exception(context *ctxPtr, std::error_code Ec, const std::string
// &what_arg);
exception(std::error_code Ec, std::shared_ptr<context> SharedPtrCtx,
const std::string &what_arg)
: exception(Ec, SharedPtrCtx, what_arg.c_str()) {
}
// base constructor for all SYCL 2020 constructors
// exception(context *, std::error_code, const std::string);
exception(std::error_code Ec, std::shared_ptr<context> SharedPtrCtx,
const std::string &what_arg)
: exception(Ec, SharedPtrCtx, what_arg.c_str()) {}
exception(std::error_code Ec, std::shared_ptr<context> SharedPtrCtx,
const char *WhatArg);
};
Expand Down
3 changes: 2 additions & 1 deletion sycl/include/sycl/ext/intel/experimental/online_compiler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ class device_arch {
class online_compile_error : public sycl::exception {
public:
online_compile_error() = default;
online_compile_error(const std::string &Msg) : sycl::exception(Msg) {}
online_compile_error(const std::string &Msg)
: sycl::exception(make_error_code(errc::invalid), Msg) {}
Copy link
Contributor Author

@aelovikov-intel aelovikov-intel Jul 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See line 126 in the previous file on why I used this.

};

/// Designates a source language for the online compiler.
Expand Down
5 changes: 2 additions & 3 deletions sycl/test/abi/sycl_symbols_windows.dump
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,9 +529,8 @@
??0event@_V1@sycl@@QEAA@AEBV012@@Z
??0event@_V1@sycl@@QEAA@PEAU_cl_event@@AEBVcontext@12@@Z
??0event@_V1@sycl@@QEAA@XZ
??0exception@_V1@sycl@@IEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z
??0exception@_V1@sycl@@IEAA@Verror_code@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@4@HV?$shared_ptr@Vcontext@_V1@sycl@@@4@@Z
??0exception@_V1@sycl@@IEAA@Verror_code@std@@PEBDHV?$shared_ptr@Vcontext@_V1@sycl@@@4@@Z
??0exception@_V1@sycl@@IEAA@Verror_code@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@4@H@Z
??0exception@_V1@sycl@@IEAA@Verror_code@std@@PEBDH@Z
??0exception@_V1@sycl@@IEAA@Verror_code@std@@V?$shared_ptr@Vcontext@_V1@sycl@@@4@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@4@@Z
??0exception@_V1@sycl@@IEAA@Verror_code@std@@V?$shared_ptr@Vcontext@_V1@sycl@@@4@PEBD@Z
??0exception@_V1@sycl@@QEAA@AEBV012@@Z
Expand Down