Skip to content

Commit 3915172

Browse files
authored
[DeviceSanitizer] Skip running test when other sanitizers is enabled (#17764)
Also, convert the indentation to use spaces instead of tabs.
1 parent a079757 commit 3915172

File tree

3 files changed

+26
-11
lines changed

3 files changed

+26
-11
lines changed

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ config.substitutions.append(
99
("%force_device_asan_rt", "env UR_ENABLE_LAYERS=UR_LAYER_ASAN")
1010
)
1111

12-
if "-fsanitize=memory" in config.cxx_flags:
13-
config.unsupported=True
14-
1512
# AddressSanitizer is not currently supported for non-spir triples
1613
config.unsupported_features += ['target-nvidia', 'target-amd']
1714

@@ -23,3 +20,11 @@ config.unsupported_features += ['spirv-backend']
2320

2421
# https://github.com/intel/llvm/issues/16920
2522
config.unsupported_features += ['arch-intel_gpu_bmg_g21']
23+
24+
unsupported_san_flags = [
25+
# "-fsanitize=address",
26+
"-fsanitize=memory",
27+
"-fsanitize=thread",
28+
]
29+
if any(flag in config.cxx_flags for flag in unsupported_san_flags):
30+
config.unsupported=True

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
has_arch_gpu_intel_pvc = any('arch-intel_gpu_pvc' in T for T in config.sycl_dev_features.values())
22
if not has_arch_gpu_intel_pvc:
3-
config.unsupported_features += ['gpu']
3+
config.unsupported_features += ['gpu']
44
else:
5-
# TRACKER for PVC + igc-dev: https://github.com/intel/llvm/issues/16401
6-
config.unsupported_features += ['igc-dev']
5+
# TRACKER for PVC + igc-dev: https://github.com/intel/llvm/issues/16401
6+
config.unsupported_features += ['igc-dev']
77

88
# MemorySanitizer is not currently supported for non-spir triples
99
config.unsupported_features += ['target-nvidia', 'target-amd']
@@ -24,5 +24,10 @@ config.substitutions.append(
2424
("%force_device_msan_rt", "env UR_ENABLE_LAYERS=UR_LAYER_MSAN")
2525
)
2626

27-
if "-fsanitize=address" in config.cxx_flags:
27+
unsupported_san_flags = [
28+
"-fsanitize=address",
29+
# "-fsanitize=memory",
30+
"-fsanitize=thread",
31+
]
32+
if any(flag in config.cxx_flags for flag in unsupported_san_flags):
2833
config.unsupported=True

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
has_arch_gpu_intel_pvc = any('arch-intel_gpu_pvc' in T for T in config.sycl_dev_features.values())
22
if not has_arch_gpu_intel_pvc:
3-
config.unsupported_features += ['gpu']
3+
config.unsupported_features += ['gpu']
44
else:
5-
# TRACKER for PVC + igc-dev: https://github.com/intel/llvm/issues/16401
6-
config.unsupported_features += ['igc-dev']
5+
# TRACKER for PVC + igc-dev: https://github.com/intel/llvm/issues/16401
6+
config.unsupported_features += ['igc-dev']
77

88
# ThreadSanitizer is not currently supported for non-spir triples
99
config.unsupported_features += ['target-nvidia', 'target-amd']
@@ -21,5 +21,10 @@ config.substitutions.append(
2121
("%device_tsan_flags", "-Xarch_device -fsanitize=thread")
2222
)
2323

24-
if "-fsanitize=address" in config.cxx_flags or "-fsanitize=memory" in config.cxx_flags:
24+
unsupported_san_flags = [
25+
"-fsanitize=address",
26+
"-fsanitize=memory",
27+
# "-fsanitize=thread",
28+
]
29+
if any(flag in config.cxx_flags for flag in unsupported_san_flags):
2530
config.unsupported=True

0 commit comments

Comments
 (0)