Skip to content

Bump ur and symbolizer #14834

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

Closed
igchor wants to merge 3 commits into from
Closed

Bump ur and symbolizer #14834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0770ca
[UR][DeviceSantizer] Enable Symoblizer for UR santizer layer
zhaomaosu Jul 10, 2024
2190fb6
Update tests
zhaomaosu Jul 11, 2024
9cb3647
Bump UR tag
igchor Jul 29, 2024
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
6 changes: 4 additions & 2 deletions sycl/cmake/modules/FetchUnifiedRuntime.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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 <[email protected]>
# 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
Expand Down
4 changes: 4 additions & 0 deletions sycl/test-e2e/AddressSanitizer/bad-free/bad-free-minus1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]]
4 changes: 4 additions & 0 deletions sycl/test-e2e/AddressSanitizer/bad-free/bad-free-plus1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
4 changes: 4 additions & 0 deletions sycl/test-e2e/AddressSanitizer/double-free/double-free.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]]
2 changes: 2 additions & 0 deletions sycl/test-e2e/AddressSanitizer/use-after-free/quarantine-no-free.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
2 changes: 2 additions & 0 deletions sycl/test-e2e/AddressSanitizer/use-after-free/use-after-free.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}