merge sanitizer kernel metadata pass

Author: AllanZyne

llvm/include/llvm/SYCLLowerIR/AsanKernelMetadata.h

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

llvm/lib/SYCLLowerIR/AsanKernelMetadata.cpp

@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 // This pass fixes attributes and metadata of global variable
-// "__SanitizerKernelMetadata".
-// We treat "__SanitizerKernelMetadata" as a device global variable, so that it
-// can be read by runtime. "spirv.Decorations" is removed by llvm-link, so we
-// add it here again.
+// "__AsanKernelMetadata" or "__MsanKernelMetadata".
+// We treat "KernelMetadata" as a device global variable, so that it
+// can be read by runtime.
+// "spirv.Decorations" is removed by llvm-link, so we add it here again.
 //===----------------------------------------------------------------------===//
 
 #include "llvm/SYCLLowerIR/SanitizerKernelMetadata.h"
@@ -27,7 +27,11 @@ constexpr uint32_t SPIRV_HOST_ACCESS_DECOR = 6147;
 
 PreservedAnalyses SanitizerKernelMetadataPass::run(Module &M,
                                                    ModuleAnalysisManager &MAM) {
-  auto *KernelMetadata = M.getNamedGlobal("__MsanKernelMetadata");
+  auto *KernelMetadata = M.getNamedGlobal("__AsanKernelMetadata");
+
+  if (!KernelMetadata)
+    KernelMetadata = M.getNamedGlobal("__MsanKernelMetadata");
+
   if (!KernelMetadata)
     return PreservedAnalyses::all();
 

llvm/lib/SYCLLowerIR/CMakeLists.txt

@@ -795,6 +795,7 @@ processInputModule(std::unique_ptr<Module> M) {
   if (isModuleUsingAsan(*M) || isModuleUsingMsan(*M)) {
     // Fix attributes and metadata of KernelMetadata
     Modified |= runModulePass<SanitizerKernelMetadataPass>(*M);
+  }
 
   // Transform Joint Matrix builtin calls to align them with SPIR-V friendly
   // LLVM IR specification.