From d52bbf765280368e8e2162bc2eaef734b71a74d8 Mon Sep 17 00:00:00 2001 From: Alan Phipps Date: Fri, 10 Nov 2023 17:16:14 -0600 Subject: [PATCH] [InstrProfiling] Don't attempt to create duplicate data variables. Fixes a bug introduced by commit f95b2f1acf11 ("Reland [InstrProf][compiler-rt] Enable MC/DC Support in LLVM Source-based Code Coverage (1/3)") --- .../Instrumentation/InstrProfiling.cpp | 4 +++ .../InstrProfiling/inline-data-var.ll | 26 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 llvm/test/Instrumentation/InstrProfiling/inline-data-var.ll diff --git a/llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp b/llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp index eadf1cd9baccc..c426a15eeb0ba 100644 --- a/llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp +++ b/llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp @@ -1251,6 +1251,10 @@ void InstrProfiling::createDataVariable(InstrProfCntrInstBase *Inc, GlobalVariable *NamePtr = Inc->getName(); auto &PD = ProfileDataMap[NamePtr]; + // Return if data variable was already created. + if (PD.DataVar) + return; + LLVMContext &Ctx = M->getContext(); Function *Fn = Inc->getParent()->getParent(); diff --git a/llvm/test/Instrumentation/InstrProfiling/inline-data-var.ll b/llvm/test/Instrumentation/InstrProfiling/inline-data-var.ll new file mode 100644 index 0000000000000..dcb97d0a9b976 --- /dev/null +++ b/llvm/test/Instrumentation/InstrProfiling/inline-data-var.ll @@ -0,0 +1,26 @@ +;; Check that only one data variable is created when an instrprof.increment is +;; inlined into more than one function. +; RUN: opt %s -passes='cgscc(inline),instrprof' -S | FileCheck %s + +target triple = "x86_64-unknown-linux-gnu" + +; CHECK: @__profd_foobar = private global +; CHECK-NOT @__profd_foobar + +declare void @llvm.instrprof.increment(ptr %0, i64 %1, i32 %2, i32 %3) +@__profn_foobar = private constant [6 x i8] c"foobar" + +define internal void @foobar() { + call void @llvm.instrprof.increment(ptr @__profn_foobar, i64 123456, i32 32, i32 0) + ret void +} + +define void @foo() { + call void @foobar() + ret void +} + +define void @bar() { + call void @foobar() + ret void +}