Skip to content

Commit f2d2ffb

Browse files
authored
[DeviceASAN] Fix missing return in MemToShadow function for DG2 (#15845)
*Re-enable device sanitizer tests for dg2 device *Update some invalid-argument tests
1 parent 21a6054 commit f2d2ffb

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

libdevice/sanitizer_utils.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,8 @@ inline uptr MemToShadow_DG2(uptr addr, uint32_t as) {
159159
(uptr)launch_info->GlobalShadowOffset);
160160
return 0;
161161
});
162+
163+
return shadow_ptr;
162164
} else if (as == ADDRESS_SPACE_LOCAL) { // local
163165
// The size of SLM is 64KB on DG2
164166
constexpr unsigned slm_size = 64 * 1024;

sycl/test-e2e/AddressSanitizer/invalid-argument/bad-context.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ int main() {
1717
});
1818
gpu_queue.wait();
1919
// CHECK: DeviceSanitizer: invalid-argument on kernel
20-
// CHECK: The 1th argument {{.*}} is allocated in other context
20+
// CHECK: The {{[0-9]+}}th argument {{.*}} is allocated in other context
2121
// CHECK: {{.*}} is located inside of Device USM region
2222

2323
sycl::free(data, cpu_queue);

sycl/test-e2e/AddressSanitizer/invalid-argument/host-pointer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ int main() {
2121
Q.wait();
2222

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

2727
delete hostPtr;

sycl/test-e2e/AddressSanitizer/invalid-argument/out-of-bounds.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ int main() {
2020
});
2121
Q.wait();
2222
// CHECK: ERROR: DeviceSanitizer: invalid-argument
23-
// CHECK: The 1th argument {{.*}} is located outside of its region
23+
// CHECK: The {{[0-9]+}}th argument {{.*}} is located outside of its region
2424

2525
return 0;
2626
}

sycl/test-e2e/AddressSanitizer/invalid-argument/released-pointer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ int main() {
2020
});
2121
Q.wait();
2222
// CHECK: ERROR: DeviceSanitizer: invalid-argument
23-
// CHECK: The 1th argument {{.*}} is a released USM pointer
23+
// CHECK: The {{[0-9]+}}th argument {{.*}} is a released USM pointer
2424
// CHECK: {{.*}} is located inside of Device USM region
2525
// CHECK: allocated here:
2626
// CHECK: freed here:

sycl/test-e2e/AddressSanitizer/lit.local.cfg

+1-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ config.substitutions.append(
1111
config.unsupported_features += ['cuda', 'hip']
1212

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

1816
# GPU testing requires level_zero
1917
if 'opencl:gpu' in config.sycl_devices:

0 commit comments

Comments
 (0)