Tune inlining, improve perf for -g

Author: jdoerfert

llvm/lib/Transforms/Instrumentation/GPUSan.cpp

@@ -231,6 +231,8 @@ class GPUSanImpl final {
   }
   FunctionCallee getAllocationInfoFn(PtrOrigin PO) {
     assert(PO >= LOCAL && PO <= GLOBAL && "Origin does not need handling.");
+    if (auto *F = M.getFunction("ompx_get_allocation_info" + getSuffix(PO)))
+      return FunctionCallee(F->getFunctionType(), F);
     return getOrCreateFn(
         AllocationInfoFn[PO], "ompx_get_allocation_info" + getSuffix(PO),
         StructType::create({getPtrTy(PO), Int64Ty, Int32Ty}), {getPtrTy(PO)});
@@ -872,13 +874,14 @@ bool GPUSanImpl::instrument() {
     Value *Idx = createCall(IRB, getThreadIdFn(), {}, "san.gtid");
     Value *Ptr = IRB.CreateGEP(Int64Ty, LocationsArray, {Idx});
     IRB.CreateStore(ConstantInt::get(Int64Ty, 0), Ptr);
-  }
-  IRB.CreateRetVoid();
 
-  for (auto *KernelFn : Kernels) {
-    IRBuilder<> IRB(&*KernelFn->getEntryBlock().getFirstNonPHIOrDbgOrAlloca());
-    createCall(IRB, InitSharedFn, {});
+    for (auto *KernelFn : Kernels) {
+      IRBuilder<> IRB(
+          &*KernelFn->getEntryBlock().getFirstNonPHIOrDbgOrAlloca());
+      createCall(IRB, InitSharedFn, {});
+    }
   }
+  IRB.CreateRetVoid();
 
   for (const auto &It : llvm::enumerate(AmbiguousCallsOrdered)) {
     IRBuilder<> IRB(It.value());
@@ -910,6 +913,13 @@ bool GPUSanImpl::instrument() {
   GV->setVisibility(GlobalValue::ProtectedVisibility);
 
   for (auto *CI : Calls) {
+    if (!CI->getCalledFunction()) {
+      CI->dump();
+      continue;
+    }
+    //  if (!CI->getCalledFunction()->getName().contains("gep") &&
+    //      !CI->getCalledFunction()->getName().contains("info"))
+    //    continue;
     InlineFunctionInfo IFI;
     if (InlineFunction(*CI, IFI).isSuccess())
       Changed = true;

offload/include/Shared/Sanitizer.h

@@ -22,6 +22,7 @@ int64_t __san_get_location_value();
 }
 
 #define INLINE gnu::always_inline
+#define NOINLINE gnu::noinline
 
 enum class AllocationKind { LOCAL, GLOBAL, LAST = GLOBAL };
 
@@ -234,7 +235,8 @@ struct SanitizerTrapInfoTy {
   }
 
   template <enum AllocationKind AK>
-  [[clang::disable_sanitizer_instrumentation, noreturn, INLINE, gnu::cold]] void
+  [[clang::disable_sanitizer_instrumentation, noreturn, NOINLINE,
+    gnu::cold]] void
   exceedsAllocationLength(_AS_PTR(void, AK) Start, uint64_t Length,
                           int64_t AllocationId, uint64_t Slot,
                           int64_t SourceId) {
@@ -244,7 +246,8 @@ struct SanitizerTrapInfoTy {
   }
 
   template <enum AllocationKind AK>
-  [[clang::disable_sanitizer_instrumentation, noreturn, INLINE, gnu::cold]] void
+  [[clang::disable_sanitizer_instrumentation, noreturn, NOINLINE,
+    gnu::cold]] void
   exceedsAllocationSlots(_AS_PTR(void, AK) Start, uint64_t Length,
                          int64_t AllocationId, uint64_t Slot,
                          int64_t SourceId) {
@@ -254,7 +257,8 @@ struct SanitizerTrapInfoTy {
   }
 
   template <enum AllocationKind AK>
-  [[clang::disable_sanitizer_instrumentation, noreturn, INLINE, gnu::cold]] void
+  [[clang::disable_sanitizer_instrumentation, noreturn, NOINLINE,
+    gnu::cold]] void
   pointerOutsideAllocation(_AS_PTR(void, AK) Start, uint64_t Length,
                            int64_t AllocationId, uint64_t Slot, uint64_t PC) {
     allocationError<AK>(PointerOutsideAllocation, Start, Length, AllocationId,
@@ -287,12 +291,14 @@ struct SanitizerTrapInfoTy {
   }
 
   template <enum AllocationKind AK>
-  [[clang::disable_sanitizer_instrumentation, noreturn, INLINE, gnu::cold]] void
+  [[clang::disable_sanitizer_instrumentation, noreturn, NOINLINE,
+    gnu::cold]] void
   accessError(const AllocationPtrTy<AK> AP, int64_t Size, int64_t AccessId,
               int64_t SourceId);
 
   template <enum AllocationKind AK>
-  [[clang::disable_sanitizer_instrumentation, noreturn, INLINE, gnu::cold]] void
+  [[clang::disable_sanitizer_instrumentation, noreturn, NOINLINE,
+    gnu::cold]] void
   garbagePointer(const AllocationPtrTy<AK> AP, void *P, int64_t SourceId) {
     ErrorCode = GarbagePointer;
     AllocationStart = P;
@@ -343,7 +349,7 @@ getAllocation(const AllocationPtrTy<AK> AP, int64_t AccessId = 0) {
 }
 
 template <enum AllocationKind AK>
-[[clang::disable_sanitizer_instrumentation, noreturn, INLINE, gnu::cold]] void
+[[clang::disable_sanitizer_instrumentation, noreturn, NOINLINE, gnu::cold]] void
 SanitizerTrapInfoTy::accessError(const AllocationPtrTy<AK> AP, int64_t Size,
                                  int64_t AccessId, int64_t SourceId) {
   auto &A = getAllocationArray<AK>().Arr[AP.AllocationId];