@@ -377,7 +377,7 @@ class kernel_bundle_impl {
377
377
}
378
378
379
379
// oneapi_ext_kernel_compiler
380
- // program manager integration, only for sycl_jit language
380
+ // program manager integration, only for sycl language
381
381
kernel_bundle_impl (
382
382
context Ctx, std::vector<device> Devs,
383
383
const std::vector<kernel_id> &KernelIDs,
@@ -387,7 +387,7 @@ class kernel_bundle_impl {
387
387
syclex::source_language Lang)
388
388
: kernel_bundle_impl(std::move(Ctx), std::move(Devs), KernelIDs,
389
389
bundle_state::executable) {
390
- assert (Lang == syclex::source_language::sycl_jit );
390
+ assert (Lang == syclex::source_language::sycl );
391
391
// Mark this bundle explicitly as "interop" to ensure that its kernels are
392
392
// enqueued with the info from the kernel object passed by the application,
393
393
// cf. `enqueueImpKernel` in `commands.cpp`. While runtime-compiled kernels
@@ -513,7 +513,7 @@ class kernel_bundle_impl {
513
513
DeviceVec.push_back (Dev);
514
514
}
515
515
516
- if (MLanguage == syclex::source_language::sycl_jit ) {
516
+ if (MLanguage == syclex::source_language::sycl ) {
517
517
// Build device images via the program manager.
518
518
const std::string &SourceStr = std::get<std::string>(MSource);
519
519
std::ostringstream SourceExt;
@@ -536,7 +536,7 @@ class kernel_bundle_impl {
536
536
SourceExt << " )]];\n " ;
537
537
}
538
538
539
- auto [Binaries, Prefix] = syclex::detail::SYCL_JIT_to_SPIRV (
539
+ auto [Binaries, Prefix] = syclex::detail::SYCL_JIT_Compile (
540
540
RegisteredKernelNames.empty () ? SourceStr : SourceExt.str (),
541
541
MIncludePairs, BuildOptions, LogPtr);
542
542
@@ -616,11 +616,6 @@ class kernel_bundle_impl {
616
616
[](std::byte B) { return static_cast <uint8_t >(B); });
617
617
return Result;
618
618
}
619
- if (MLanguage == syclex::source_language::sycl) {
620
- return syclex::detail::SYCL_to_SPIRV (*SourceStrPtr, MIncludePairs,
621
- BuildOptions, LogPtr,
622
- RegisteredKernelNames);
623
- }
624
619
throw sycl::exception (
625
620
make_error_code (errc::invalid),
626
621
" SYCL C++, OpenCL C and SPIR-V are the only supported "
@@ -686,16 +681,11 @@ class kernel_bundle_impl {
686
681
}
687
682
688
683
std::string adjust_kernel_name (const std::string &Name) {
689
- if (MLanguage == syclex::source_language::sycl_jit ) {
684
+ if (MLanguage == syclex::source_language::sycl ) {
690
685
auto It = MMangledKernelNames.find (Name);
691
686
return It == MMangledKernelNames.end () ? Name : It->second ;
692
687
}
693
688
694
- if (MLanguage == syclex::source_language::sycl) {
695
- bool isMangled = Name.find (" __sycl_kernel_" ) != std::string::npos;
696
- return isMangled ? Name : " __sycl_kernel_" + Name;
697
- }
698
-
699
689
return Name;
700
690
}
701
691
@@ -722,7 +712,7 @@ class kernel_bundle_impl {
722
712
throw sycl::exception (make_error_code (errc::invalid),
723
713
" kernel '" + Name + " ' not found in kernel_bundle" );
724
714
725
- if (MLanguage == syclex::source_language::sycl_jit ) {
715
+ if (MLanguage == syclex::source_language::sycl ) {
726
716
auto &PM = ProgramManager::getInstance ();
727
717
auto KID = PM.getSYCLKernelID (MPrefix + AdjustedName);
728
718
@@ -1010,7 +1000,7 @@ class kernel_bundle_impl {
1010
1000
try {
1011
1001
if (MDeviceBinaries) {
1012
1002
ProgramManager::getInstance ().removeImages (MDeviceBinaries);
1013
- syclex::detail::SYCL_JIT_destroy (MDeviceBinaries);
1003
+ syclex::detail::SYCL_JIT_Destroy (MDeviceBinaries);
1014
1004
}
1015
1005
} catch (std::exception &e) {
1016
1006
__SYCL_REPORT_EXCEPTION_TO_STREAM (" exception in ~kernel_bundle_impl" , e);
0 commit comments