Skip to content

[SYCL][ABI-Break] Drop pi::die #14626

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 19, 2024
Merged

[SYCL][ABI-Break] Drop pi::die #14626

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
8706a67
[SYCL][ABI-Break] Hide pi::die symbol
AlexeySachkov Jul 18, 2024
222458f
Merge branch 'sycl' into private/asachkov/hide-pi-die-symbol
steffenlarsen Jul 19, 2024
6faf4d1
Completely drop `pi::die`
AlexeySachkov Jul 19, 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
3 changes: 0 additions & 3 deletions sycl/include/sycl/detail/pi.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,6 @@ bool trace(TraceLevel level);
#error "Unsupported OS"
#endif

// Report error and no return (keeps compiler happy about no return statements).
[[noreturn]] __SYCL_EXPORT void die(const char *Message);

using PiPlugin = ::pi_plugin;
using PiResult = ::pi_result;
using PiPlatform = ::pi_platform;
Expand Down
12 changes: 1 addition & 11 deletions sycl/source/detail/pi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,7 @@ std::string platformInfoToString(pi_platform_info info) {
case PI_EXT_PLATFORM_INFO_BACKEND:
return "PI_EXT_PLATFORM_INFO_BACKEND";
}
die("Unknown pi_platform_info value passed to "
"sycl::detail::pi::platformInfoToString");
return "unknown PI_PLATFORM_INFO enum value";
}

std::string memFlagToString(pi_mem_flags Flag) {
Expand Down Expand Up @@ -513,15 +512,6 @@ template const PluginPtr &getPlugin<backend::ext_oneapi_level_zero>();
template const PluginPtr &getPlugin<backend::ext_oneapi_cuda>();
template const PluginPtr &getPlugin<backend::ext_oneapi_hip>();

// Report error and no return (keeps compiler from printing warnings).
// TODO: Probably change that to throw a catchable exception,
// but for now it is useful to see every failure.
//
[[noreturn]] void die(const char *Message) {
std::cerr << "pi_die: " << Message << std::endl;
std::terminate();
}

// Reads an integer value from ELF data.
template <typename ResT>
static ResT readELFValue(const unsigned char *Data, size_t NumBytes,
Expand Down
1 change: 0 additions & 1 deletion sycl/test/abi/sycl_symbols_linux.dump
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3287,7 +3287,6 @@ _ZN4sycl3_V16detail28SampledImageAccessorBaseHostC2ENS0_5rangeILi3EEEPviiNS0_2id
_ZN4sycl3_V16detail28getPixelCoordNearestFiltModeENS0_3vecIfLi4EEENS0_15addressing_modeENS0_5rangeILi3EEE
_ZN4sycl3_V16detail28getValueFromDynamicParameterERNS0_3ext6oneapi12experimental6detail22dynamic_parameter_baseE
_ZN4sycl3_V16detail2pi25contextSetExtendedDeleterERKNS0_7contextEPFvPvES6_
_ZN4sycl3_V16detail2pi3dieEPKc
_ZN4sycl3_V16detail30UnsampledImageAccessorBaseHost10getAccDataEv
_ZN4sycl3_V16detail30UnsampledImageAccessorBaseHost6getPtrEv
_ZN4sycl3_V16detail30UnsampledImageAccessorBaseHostC1ENS0_5rangeILi3EEENS0_6access4modeEPviiNS0_2idILi3EEENS0_18image_channel_typeENS0_19image_channel_orderERKNS0_13property_listE
Expand Down
1 change: 0 additions & 1 deletion sycl/test/abi/sycl_symbols_windows.dump
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3749,7 +3749,6 @@
?destroy_image_handle@experimental@oneapi@ext@_V1@sycl@@YAXAEAUunsampled_image_handle@12345@AEBVdevice@45@AEBVcontext@45@@Z
?destroy_image_handle@experimental@oneapi@ext@_V1@sycl@@YAXAEAUunsampled_image_handle@12345@AEBVqueue@45@@Z
?device_has@queue@_V1@sycl@@AEBA_NW4aspect@23@@Z
?die@pi@detail@_V1@sycl@@YAXPEBD@Z
?empty@kernel_bundle_plain@detail@_V1@sycl@@QEBA_NXZ
?enable_ext_oneapi_default_context@detail@_V1@sycl@@YAX_N@Z
?end@HostProfilingInfo@detail@_V1@sycl@@QEAAXXZ
Expand Down
Loading