diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index 35a9142059418..d8b42363d9412 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -31,6 +31,8 @@ set(UR_BUILD_EXAMPLES OFF CACHE BOOL "Build example applications." FORCE) set(UR_BUILD_TESTS OFF CACHE BOOL "Build unit tests." FORCE) set(UR_BUILD_XPTI_LIBS OFF) set(UR_ENABLE_TRACING ON) +# Override default to enable symbolizer from unified-runtime +set(UR_ENABLE_SYMBOLIZER ON CACHE BOOL "Enable symbolizer for sanitizer layer.") if("level_zero" IN_LIST SYCL_ENABLE_PLUGINS) set(UR_BUILD_ADAPTER_L0 ON) @@ -115,14 +117,14 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT) CACHE PATH "Path to external '${name}' adapter source dir" FORCE) endfunction() - set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") + set(UNIFIED_RUNTIME_REPO "https://github.com/igchor/unified-runtime.git") # commit a985a81dc9ba8adfcc8b54e35ad287e97766fb3e # Merge: b7b0c8b3 f772f907 # Author: Piotr Balcer # Date: Mon Jul 29 09:11:29 2024 +0200 # Merge pull request #1905 from igchor/umf_hwloc_disable # Bump UMF version to allow disabling hwloc - set(UNIFIED_RUNTIME_TAG a985a81dc9ba8adfcc8b54e35ad287e97766fb3e) + set(UNIFIED_RUNTIME_TAG eaa69f44a159f280afa222568666d3952156e4e7) set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES") # Due to the use of dependentloadflag and no installer for UMF and hwloc we need diff --git a/sycl/test-e2e/AddressSanitizer/bad-free/bad-free-minus1.cpp b/sycl/test-e2e/AddressSanitizer/bad-free/bad-free-minus1.cpp index 1c76c29001c32..87bc69308a9d8 100644 --- a/sycl/test-e2e/AddressSanitizer/bad-free/bad-free-minus1.cpp +++ b/sycl/test-e2e/AddressSanitizer/bad-free/bad-free-minus1.cpp @@ -27,3 +27,7 @@ int main() { // CHECK-HOST: [[ADDR]] is located inside of Host USM region {{\[0x.*, 0x.*\)}} // CHECK-SHARED: [[ADDR]] is located inside of Shared USM region {{\[0x.*, 0x.*\)}} // CHECK-DEVICE: [[ADDR]] is located inside of Device USM region {{\[0x.*, 0x.*\)}} +// CHECK: allocated here: +// CHECK-HOST: in main {{.*bad-free-minus1.cpp:}}[[@LINE-15]] +// CHECK-SHARED: in main {{.*bad-free-minus1.cpp:}}[[@LINE-14]] +// CHECK-DEVICE: in main {{.*bad-free-minus1.cpp:}}[[@LINE-13]] diff --git a/sycl/test-e2e/AddressSanitizer/bad-free/bad-free-plus1.cpp b/sycl/test-e2e/AddressSanitizer/bad-free/bad-free-plus1.cpp index a39a375eb7715..cd80e8baa77ad 100644 --- a/sycl/test-e2e/AddressSanitizer/bad-free/bad-free-plus1.cpp +++ b/sycl/test-e2e/AddressSanitizer/bad-free/bad-free-plus1.cpp @@ -25,5 +25,9 @@ int main() { // CHECK-HOST: [[ADDR]] is located inside of Host USM region {{\[0x.*, 0x.*\)}} // CHECK-SHARED: [[ADDR]] is located inside of Shared USM region {{\[0x.*, 0x.*\)}} // CHECK-DEVICE: [[ADDR]] is located inside of Device USM region {{\[0x.*, 0x.*\)}} + // CHECK: allocated here: + // CHECK-HOST: in main {{.*bad-free-plus1.cpp:}}[[@LINE-13]] + // CHECK-SHARED: in main {{.*bad-free-plus1.cpp:}}[[@LINE-12]] + // CHECK-DEVICE: in main {{.*bad-free-plus1.cpp:}}[[@LINE-11]] return 0; } diff --git a/sycl/test-e2e/AddressSanitizer/double-free/double-free.cpp b/sycl/test-e2e/AddressSanitizer/double-free/double-free.cpp index 5356310f1724d..438b5b5f7ff1b 100644 --- a/sycl/test-e2e/AddressSanitizer/double-free/double-free.cpp +++ b/sycl/test-e2e/AddressSanitizer/double-free/double-free.cpp @@ -30,4 +30,8 @@ int main() { // CHECK-SHARED: [[ADDR]] is located inside of Shared USM region {{\[0x.*, 0x.*\)}} // CHECK-DEVICE: [[ADDR]] is located inside of Device USM region {{\[0x.*, 0x.*\)}} // CHECK: freed here +// CHECH: in main {{.*double-free.cpp:}}[@LINE-33] // CHECK: previously allocated here +// CHECK-HOST: in main {{.*double-free.cpp:}}[[@LINE-19]] +// CHECK-SHARED: in main {{.*double-free.cpp:}}[[@LINE-18]] +// CHECK-DEVICE: in main {{.*double-free.cpp:}}[[@LINE-17]] diff --git a/sycl/test-e2e/AddressSanitizer/use-after-free/quarantine-no-free.cpp b/sycl/test-e2e/AddressSanitizer/use-after-free/quarantine-no-free.cpp index c512cfe556957..23b08b37f210b 100644 --- a/sycl/test-e2e/AddressSanitizer/use-after-free/quarantine-no-free.cpp +++ b/sycl/test-e2e/AddressSanitizer/use-after-free/quarantine-no-free.cpp @@ -46,7 +46,9 @@ int main() { // CHECK: #0 {{.*}} {{.*quarantine-no-free.cpp}}:[[@LINE-5]] // CHECK: [[ADDR]] is located inside of Device USM region [{{0x.*}}, {{0x.*}}) // CHECK: allocated here: + // CHECK: in main {{.*quarantine-no-free.cpp}}:[[@LINE-27]] // CHECK: released here: + // CHECK: in main {{.*quarantine-no-free.cpp}}:[[@LINE-25]] return 0; } diff --git a/sycl/test-e2e/AddressSanitizer/use-after-free/use-after-free.cpp b/sycl/test-e2e/AddressSanitizer/use-after-free/use-after-free.cpp index 59cbb37c88fb9..fbf99ada75584 100644 --- a/sycl/test-e2e/AddressSanitizer/use-after-free/use-after-free.cpp +++ b/sycl/test-e2e/AddressSanitizer/use-after-free/use-after-free.cpp @@ -21,7 +21,9 @@ int main() { // CHECK: #0 {{.*}} {{.*use-after-free.cpp:}}[[@LINE-5]] // CHECK: [[ADDR]] is located inside of Device USM region [{{0x.*}}, {{0x.*}}) // CHECK: allocated here: + // CHECK: in main {{.*use-after-free.cpp:}}[[@LINE-14]] // CHECK: released here: + // CHECK: in main {{.*use-after-free.cpp:}}[[@LINE-15]] return 0; }