Skip to content

[NFC][SYCL RTC] Minor code cleanup around vectors of strings #20133

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 1 commit into from
Sep 19, 2025
Merged

[NFC][SYCL RTC] Minor code cleanup around vectors of strings #20133

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
25 changes: 9 additions & 16 deletions sycl/include/sycl/kernel_bundle.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1179,14 +1179,11 @@ build_from_source(kernel_bundle<bundle_state::ext_oneapi_source> &SourceKB,
const std::vector<std::string> &BuildOptions,
std::string *LogPtr,
const std::vector<std::string> &RegisteredKernelNames) {
std::vector<sycl::detail::string_view> Options;
Options.reserve(BuildOptions.size());
for (const std::string &opt : BuildOptions)
Options.push_back(sycl::detail::string_view{opt});
std::vector<sycl::detail::string_view> Options{BuildOptions.begin(),
BuildOptions.end()};

std::vector<sycl::detail::string_view> KernelNames;
for (const std::string &name : RegisteredKernelNames)
KernelNames.push_back(sycl::detail::string_view{name});
std::vector<sycl::detail::string_view> KernelNames{
RegisteredKernelNames.begin(), RegisteredKernelNames.end()};

if (LogPtr) {
sycl::detail::string Log;
Expand All @@ -1211,15 +1208,11 @@ compile_from_source(kernel_bundle<bundle_state::ext_oneapi_source> &SourceKB,
const std::vector<std::string> &CompileOptions,
std::string *LogPtr,
const std::vector<std::string> &RegisteredKernelNames) {
std::vector<sycl::detail::string_view> Options;
Options.reserve(CompileOptions.size());
for (const std::string &opt : CompileOptions)
Options.push_back(sycl::detail::string_view{opt});

std::vector<sycl::detail::string_view> KernelNames;
KernelNames.reserve(RegisteredKernelNames.size());
for (const std::string &name : RegisteredKernelNames)
KernelNames.push_back(sycl::detail::string_view{name});
std::vector<sycl::detail::string_view> Options{CompileOptions.begin(),
CompileOptions.end()};

std::vector<sycl::detail::string_view> KernelNames{
RegisteredKernelNames.begin(), RegisteredKernelNames.end()};

sycl::detail::string Log;
auto result = compile_from_source(SourceKB, Devices, Options,
Expand Down
4 changes: 1 addition & 3 deletions sycl/source/detail/kernel_compiler/kernel_compiler_sycl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,7 @@ std::pair<sycl_device_binaries, std::string> SYCL_JIT_Compile(
#if SYCL_EXT_JIT_ENABLE
static std::atomic_uintptr_t CompilationCounter;
std::string CompilationID = "rtc_" + std::to_string(CompilationCounter++);
std::vector<std::string> UserArgStrings;
for (const sycl::detail::string_view UserArg : UserArgs)
UserArgStrings.push_back(UserArg.data());
std::vector<std::string> UserArgStrings{UserArgs.begin(), UserArgs.end()};
return sycl::detail::jit_compiler::get_instance().compileSYCL(
CompilationID, SYCLSource, IncludePairs, UserArgStrings, LogPtr, Format);
#else
Expand Down