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

Jump to bottom

[DeviceASAN] Fix missing return in MemToShadow function for DG2 #15845

Merged
merged 1 commit into from
Oct 24, 2024
+7 −7
Merged

[DeviceASAN] Fix missing return in MemToShadow function for DG2 #15845

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
2 changes: 2 additions & 0 deletions libdevice/sanitizer_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ inline uptr MemToShadow_DG2(uptr addr, uint32_t as) {
(uptr)launch_info->GlobalShadowOffset);
return 0;
});

return shadow_ptr;
} else if (as == ADDRESS_SPACE_LOCAL) { // local
// The size of SLM is 64KB on DG2
constexpr unsigned slm_size = 64 * 1024;
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/AddressSanitizer/invalid-argument/bad-context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ int main() {
});
gpu_queue.wait();
// CHECK: DeviceSanitizer: invalid-argument on kernel
// CHECK: The 1th argument {{.*}} is allocated in other context
// CHECK: The {{[0-9]+}}th argument {{.*}} is allocated in other context
// CHECK: {{.*}} is located inside of Device USM region

sycl::free(data, cpu_queue);
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/AddressSanitizer/invalid-argument/host-pointer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ int main() {
Q.wait();

// CHECK-GPU: ERROR: DeviceSanitizer: invalid-argument
// CHECK-GPU: The 1th argument {{.*}} is not a USM pointer
// CHECK-GPU: The {{[0-9]+}}th argument {{.*}} is not a USM pointer
// CHECK-CPU-NOT: ERROR: DeviceSanitizer: invalid-argument

delete hostPtr;
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/AddressSanitizer/invalid-argument/out-of-bounds.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ int main() {
});
Q.wait();
// CHECK: ERROR: DeviceSanitizer: invalid-argument
// CHECK: The 1th argument {{.*}} is located outside of its region
// CHECK: The {{[0-9]+}}th argument {{.*}} is located outside of its region

return 0;
}
2 changes: 1 addition & 1 deletion sycl/test-e2e/AddressSanitizer/invalid-argument/released-pointer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ int main() {
});
Q.wait();
// CHECK: ERROR: DeviceSanitizer: invalid-argument
// CHECK: The 1th argument {{.*}} is a released USM pointer
// CHECK: The {{[0-9]+}}th argument {{.*}} is a released USM pointer
// CHECK: {{.*}} is located inside of Device USM region
// CHECK: allocated here:
// CHECK: freed here:
Expand Down
4 changes: 1 addition & 3 deletions sycl/test-e2e/AddressSanitizer/lit.local.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ config.substitutions.append(
config.unsupported_features += ['cuda', 'hip']

# FIXME: Skip some of gpu devices, waiting for gfx driver uplifting
# FIXME: Enable dg2 device when post-commit failure
# https://github.com/intel/llvm/actions/runs/11474026543/job/31930862668 is fixed
config.unsupported_features += ['gpu-intel-gen9', 'gpu-intel-gen11', 'gpu-intel-gen12', 'gpu-intel-pvc', 'gpu-intel-dg2']
config.unsupported_features += ['gpu-intel-gen9', 'gpu-intel-gen11', 'gpu-intel-gen12', 'gpu-intel-pvc']

# GPU testing requires level_zero
if 'opencl:gpu' in config.sycl_devices:
Expand Down
Loading