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

[DeviceMSAN] Fix empty kernel #16478

Merged
merged 7 commits into from
Jan 6, 2025
Merged

[DeviceMSAN] Fix empty kernel #16478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fdb7081
check __MsanLaunchInfo wether empty
AllanZyne Dec 26, 2024
80de8a0
update ur
AllanZyne Dec 26, 2024
f32be78
fix build
AllanZyne Dec 27, 2024
52fbc10
Merge branch 'sycl' into review/yang/fix_msan_empty_kernel
AllanZyne Dec 27, 2024
6c65730
Merge remote-tracking branch 'origin/sycl' into review/yang/fix_msan_…
kbenzie Jan 6, 2025
4e27d42
[UR] Bump main tag to 75745a91
kbenzie Jan 6, 2025
6d8c8a1
Merge remote-tracking branch 'origin/sycl' into review/yang/fix_msan_…
kbenzie Jan 6, 2025
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
5 changes: 5 additions & 0 deletions libdevice/sanitizer/msan_rtl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@ inline uptr __msan_get_shadow_pvc(uptr addr, uint32_t as) {
DEVICE_EXTERN_C_NOINLINE void __msan_maybe_warning_##size( \
type s, u32 o, const char __SYCL_CONSTANT__ *file, uint32_t line, \
const char __SYCL_CONSTANT__ *func) { \
if (!__MsanLaunchInfo.get()) \
return; \
if (UNLIKELY(s)) { \
__msan_report_error(size, file, line, func); \
} \
Expand Down Expand Up @@ -191,6 +193,9 @@ DEVICE_EXTERN_C_NOINLINE uptr __msan_get_shadow(uptr addr, uint32_t as) {
(uptr)((__SYCL_GLOBAL__ MsanLaunchInfo *)__MsanLaunchInfo.get())
->CleanShadow;

if (!__MsanLaunchInfo.get())
return shadow_ptr;

if (UNLIKELY(!__MsanLaunchInfo)) {
__spirv_ocl_printf(__msan_print_warning_nolaunchinfo);
return shadow_ptr;
Expand Down
14 changes: 7 additions & 7 deletions sycl/cmake/modules/UnifiedRuntimeTag.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# commit f0b35200c07e6a15766ba75d01a3c176d42a2429
# Merge: 545a01bae624 ceb0465d4090
# Author: Martin Grant <martin.morrisongrant@codeplay.com>
# Date: Mon Jan 6 09:51:26 2025 +0000
# Merge pull request #2519 from oneapi-src/revert-2481-fabio/fix_potential_race_condition
# Revert "Fix potential deadlock in the WaitEvent path of CmdBuffers"
set(UNIFIED_RUNTIME_TAG f0b35200c07e6a15766ba75d01a3c176d42a2429)
# commit 75745a910cb7197de6e214c1f23c544895afbbb7
# Merge: 0eb08b67 5a7d8fa0
# Author: Kenneth Benzie (Benie) <k.benzie@codeplay.com>
# Date: Mon Jan 6 11:21:29 2025 +0000
# Merge pull request #2508 from AllanZyne/review/yang/fix_msan_empty_kernel
# [DeviceMSAN] Fix empty kernel
set(UNIFIED_RUNTIME_TAG 75745a910cb7197de6e214c1f23c544895afbbb7)
Loading