Skip to content

[DeviceSanitizer] Disable ASan when the ESIMD kernel is found #14156

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

Merged
merged 8 commits into from
Jul 2, 2024
Merged

[DeviceSanitizer] Disable ASan when the ESIMD kernel is found #14156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
afa2082
fix metadata in esimd
AllanZyne Jun 13, 2024
277983a
Merge branch 'sycl' into review/yang/fix_esimd
AllanZyne Jun 19, 2024
6799f48
Merge branch 'sycl' into review/yang/fix_esimd
AllanZyne Jun 20, 2024
4295257
disbale asan when found esimd
AllanZyne Jun 25, 2024
03128be
disbale asan when found esimd
AllanZyne Jun 25, 2024
192c0ea
revert FixupMetadata
AllanZyne Jun 26, 2024
8c552f4
fix removeFnAttr logic
AllanZyne Jun 26, 2024
5147988
Merge branch 'sycl' into review/yang/fix_esimd
AllanZyne Jul 2, 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
22 changes: 18 additions & 4 deletions llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1278,7 +1278,8 @@ struct FunctionStackPoisoner : public InstVisitor<FunctionStackPoisoner> {
static void ExtendSpirKernelArgs(Module &M, FunctionAnalysisManager &FAM) {
SmallVector<Function *> SpirFixupFuncs;
for (Function &F : M) {
if (F.getCallingConv() == CallingConv::SPIR_KERNEL) {
if (F.getCallingConv() == CallingConv::SPIR_KERNEL &&
F.hasFnAttribute(Attribute::SanitizeAddress)) {
SpirFixupFuncs.emplace_back(&F);
}
}
Expand All @@ -1294,9 +1295,7 @@ static void ExtendSpirKernelArgs(Module &M, FunctionAnalysisManager &FAM) {
Types.push_back(I->getType());
}

// New argument type: uintptr_t as(1)*, as it's allocated in USM buffer, and
// it can also be treated as a pointer point to the base address of private
// shadow memory
// New argument: uintptr_t as(1)*, which is allocated in shared USM buffer
Types.push_back(IntptrTy->getPointerTo(kSpirOffloadGlobalAS));

FunctionType *NewFTy = FunctionType::get(F->getReturnType(), Types, false);
Expand Down Expand Up @@ -1411,6 +1410,21 @@ PreservedAnalyses AddressSanitizerPass::run(Module &M,
ClUseStackSafety ? &MAM.getResult<StackSafetyGlobalAnalysis>(M) : nullptr;

if (Triple(M.getTargetTriple()).isSPIR()) {
Copy link
Contributor

@sarnex sarnex Jul 2, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just noticed, can you please change this check to

 if (Triple(M.getTargetTriple()).isSPIROrSPIRV()) {

We want to use the SPIR-V backend soon and that uses the SPIRV triple. Follow-up PR is fine. Thanks

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#14413

bool HasESIMDKernel = false;

// ESIMD kernel doesn't support noinline functions, so we can't
// support sanitizer for it
for (Function &F : M)
if (F.hasMetadata("sycl_explicit_simd")) {
F.removeFnAttr(Attribute::SanitizeAddress);
HasESIMDKernel = true;
}

// FIXME: we can't check if the kernel is ESIMD kernel at UR, so we
// have to disable ASan completely in this case
if (HasESIMDKernel)
return PreservedAnalyses::all();

ExtendSpirKernelArgs(M, FAM);
}

Expand Down
17 changes: 17 additions & 0 deletions llvm/test/Instrumentation/AddressSanitizer/SPIRV/sycl_esimd.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
; RUN: opt < %s -passes=asan -asan-instrumentation-with-call-threshold=0 -asan-stack=0 -asan-globals=0 -S | FileCheck %s

target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-n8:16:32:64"
target triple = "spir64-unknown-unknown"

@__spirv_BuiltInGlobalInvocationId = external addrspace(1) constant <3 x i64>

; Function Attrs: sanitize_address
define spir_kernel void @esimd_kernel() #0 !sycl_explicit_simd !1 {
entry:
%0 = load i64, ptr addrspace(1) getelementptr inbounds (i8, ptr addrspace(1) @__spirv_BuiltInGlobalInvocationId, i64 8), align 8
ret void
}
; CHECK-NOT: {{ sanitize_address }}

attributes #0 = { sanitize_address }
!1 = !{}
Loading