wip

Author: AllanZyne

llvm/include/llvm/SYCLLowerIR/AsanKernelMetadata.h

@@ -0,0 +1,22 @@
+//===-- AsanKernelMetadata.h - instrument device global for sanitizer ---===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+// This pass adds red zone to each image scope device global and record the
+// information like size, red zone size and beginning address. The information
+// will be used by address sanitizer.
+//===----------------------------------------------------------------------===//
+
+#include "llvm/IR/PassManager.h"
+
+namespace llvm {
+
+class AsanKernelMetadataPass : public PassInfoMixin<AsanKernelMetadataPass> {
+public:
+  PreservedAnalyses run(Module &M, ModuleAnalysisManager &MAM);
+};
+
+} // namespace llvm

llvm/lib/SYCLLowerIR/AsanKernelMetadata.cpp

@@ -0,0 +1,63 @@
+//===-- SanitizeDeviceGlobal.cpp - instrument device global for sanitizer -===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+// This pass adds red zone to each image scope device global and record the
+// information like size, red zone size and beginning address. The information
+// will be used by address sanitizer.
+// TODO: Do this in AddressSanitizer pass when urProgramGetGlobalVariablePointer
+// is implemented.
+//===----------------------------------------------------------------------===//
+
+#include "llvm/SYCLLowerIR/AsanKernelMetadata.h"
+
+#include "llvm/IR/IRBuilder.h"
+
+#define DEBUG_TYPE "AsanKernelMetadata"
+
+using namespace llvm;
+
+namespace llvm {
+
+constexpr StringRef SPIRV_DECOR_MD_KIND = "spirv.Decorations";
+constexpr uint32_t SPIRV_HOST_ACCESS_DECOR = 6147;
+
+PreservedAnalyses AsanKernelMetadataPass::run(Module &M,
+                                              ModuleAnalysisManager &MAM) {
+  auto *KernelMetadata = M.getNamedGlobal("__AsanKernelMetadata");
+  if (!KernelMetadata) {
+    return PreservedAnalyses::all();
+  }
+
+  auto &DL = M.getDataLayout();
+  auto &Ctx = M.getContext();
+
+  // Fix attributes
+  KernelMetadata->addAttribute(
+      "sycl-device-global-size",
+      std::to_string(DL.getTypeAllocSize(KernelMetadata->getType())));
+
+  // Fix metadata
+  unsigned MDKindID = Ctx.getMDKindID(SPIRV_DECOR_MD_KIND);
+
+  SmallVector<Metadata *, 1> MDOps;
+
+  SmallVector<Metadata *, 3> MD;
+  auto *Ty = Type::getInt32Ty(Ctx);
+  MD.push_back(ConstantAsMetadata::get(
+      Constant::getIntegerValue(Ty, APInt(32, SPIRV_HOST_ACCESS_DECOR))));
+  MD.push_back(
+      ConstantAsMetadata::get(Constant::getIntegerValue(Ty, APInt(32, 2))));
+  MD.push_back(MDString::get(Ctx, "_Z20__AsanKernelMetadata"));
+
+  MDOps.push_back(MDNode::get(Ctx, MD));
+
+  KernelMetadata->addMetadata(MDKindID, *MDNode::get(Ctx, MDOps));
+
+  return PreservedAnalyses::none();
+}
+
+} // namespace llvm

llvm/lib/SYCLLowerIR/CMakeLists.txt

@@ -70,6 +70,7 @@ add_llvm_component_library(LLVMSYCLLowerIR
   SYCLVirtualFunctionsAnalysis.cpp
   SYCLUtils.cpp
   SanitizeDeviceGlobal.cpp
+  AsanKernelMetadata.cpp
 
   LocalAccessorToSharedMemory.cpp
   GlobalOffset.cpp

llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp

@@ -1328,17 +1328,6 @@ static GlobalVariable *GetOrCreateGlobalString(Module &M, StringRef Name,
   return StringGV;
 }
 
-static std::string SYCLUniqueStableId(const GlobalValue *GV,
-                                      const DataLayout &DL) {
-  std::string Buffer;
-  llvm::raw_string_ostream Out(Buffer);
-
-  Mangler Mgl;
-  Mgl.getNameWithPrefix(Out, GV, true);
-
-  return Out.str();
-}
-
 // Append a new argument "launch_data" to user's spir_kernels
 static void ExtendSpirKernelArgs(Module &M, FunctionAnalysisManager &FAM) {
   SmallVector<Function *> SpirFixupKernels;
@@ -1399,6 +1388,7 @@ static void ExtendSpirKernelArgs(Module &M, FunctionAnalysisManager &FAM) {
   AsanSpirKernelMetadata->addAttribute("sycl-host-access", "2");
   AsanSpirKernelMetadata->addAttribute("sycl-unique-id",
                                        "_Z20__AsanKernelMetadata");
+  AsanSpirKernelMetadata->setDSOLocal(true);
 
   // Handle SpirFixupKernels
   SmallVector<std::pair<Function *, Function *>> SpirFuncs;

llvm/tools/sycl-post-link/sycl-post-link.cpp

@@ -29,6 +29,7 @@
 #include "llvm/IRReader/IRReader.h"
 #include "llvm/Linker/Linker.h"
 #include "llvm/Passes/PassBuilder.h"
+#include "llvm/SYCLLowerIR/AsanKernelMetadata.h"
 #include "llvm/SYCLLowerIR/CompileTimePropertiesPass.h"
 #include "llvm/SYCLLowerIR/ComputeModuleRuntimeInfo.h"
 #include "llvm/SYCLLowerIR/DeviceConfigFile.hpp"
@@ -793,8 +794,10 @@ processInputModule(std::unique_ptr<Module> M) {
 
   // Instrument each image scope device globals if the module has been
   // instrumented by sanitizer pass.
-  if (isModuleUsingAsan(*M))
+  if (isModuleUsingAsan(*M)) {
     Modified |= runModulePass<SanitizeDeviceGlobalPass>(*M);
+    Modified |= runModulePass<AsanKernelMetadataPass>(*M);
+  }
 
   // Transform Joint Matrix builtin calls to align them with SPIR-V friendly
   // LLVM IR specification.

sycl/test-e2e/AddressSanitizer/common/kernel-filter.cpp

@@ -1,6 +1,9 @@
 // REQUIRES: linux
 // RUN: %{build} %device_asan_flags -O2 -fsanitize-ignorelist=%p/ignorelist.txt -o %t
 // RUN: %{run} not %t &> %t.txt ; FileCheck --input-file %t.txt %s
+// RUN: %{build} %device_asan_flags %if cpu %{ -fsycl-targets=spir64_x86_64 %} %if gpu %{ -fsycl-targets=spir64_gen -Xsycl-target-backend=spir64_gen %gpu_aot_target_opts %} -O2 -fsanitize-ignorelist=%p/ignorelist.txt -o %t2
+// RUN: %{run} not %t2 &> %t2.txt ; FileCheck --input-file %t2.txt %s
+
 #include <sycl/detail/core.hpp>
 #include <sycl/usm.hpp>