The NS==0 condition used by D103717 missed a corner case: if the current copy
does not have a hash suffix (e.g. weak_odr), a copy with value profiling (with a
different CFG) may exist. This is super rare, but is possible with pre-inlining
PGO instrumentation (which can make a weak_odr function inlines its callees
differently, sometimes with value profiling while sometimes without).
If the current copy with private profd is prevailing, the non-prevailing copy
may get an undefined symbol if a caller inlining the non-prevailing function
references its profd. If the other copy with non-private profd is prevailing,
the current copy may cause a "relocation to discarded section" linker error.
The fix is straightforward: just keep non-private profd in such a `DataReferencedByCode` case.
With this change, a stage 2 (`-DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_INSTRUMENTED=IR`)
clang is 0.08% larger (172431496/172286720-1).
`stat -c %s **/*.o | awk '{s+=$1}END{print s}' is 0.026% larger.
The majority of D103717's benefits remains.
Reviewed By: xur
Differential Revision: https://reviews.llvm.org/D108432
30 lines
1.6 KiB
LLVM
30 lines
1.6 KiB
LLVM
;; Test comdat functions.
|
|
; RUN: opt < %s -mtriple=x86_64-linux -passes=pgo-instr-gen,instrprof -S | FileCheck %s --check-prefixes=ELF
|
|
; RUN: opt < %s -mtriple=x86_64-windows -passes=pgo-instr-gen,instrprof -S | FileCheck %s --check-prefixes=COFF
|
|
|
|
$linkonceodr = comdat any
|
|
$weakodr = comdat any
|
|
|
|
;; profc/profd have hash suffixes. This definition doesn't have value profiling,
|
|
;; so definitions with the same name in other modules must have the same CFG and
|
|
;; cannot have value profiling, either. profd can be made private for ELF.
|
|
; ELF: @__profc_linkonceodr.[[#]] = linkonce_odr hidden global {{.*}} comdat, align 8
|
|
; ELF: @__profd_linkonceodr.[[#]] = private global {{.*}} comdat($__profc_linkonceodr.[[#]]), align 8
|
|
; COFF: @__profc_linkonceodr.[[#]] = linkonce_odr hidden global {{.*}} comdat, align 8
|
|
; COFF: @__profd_linkonceodr.[[#]] = linkonce_odr hidden global {{.*}} comdat, align 8
|
|
define linkonce_odr void @linkonceodr() comdat {
|
|
ret void
|
|
}
|
|
|
|
;; weakodr in a comdat is not renamed. There is no guarantee that definitions in
|
|
;; other modules don't have value profiling. profd should be conservatively
|
|
;; non-private to prevent a caller from referencing a non-prevailing profd,
|
|
;; causing a linker error.
|
|
; ELF: @__profc_weakodr = weak_odr hidden global {{.*}} comdat, align 8
|
|
; ELF: @__profd_weakodr = weak_odr hidden global {{.*}} comdat($__profc_weakodr), align 8
|
|
; COFF: @__profc_weakodr = weak_odr hidden global {{.*}} comdat, align 8
|
|
; COFF: @__profd_weakodr = weak_odr hidden global {{.*}} comdat, align 8
|
|
define weak_odr void @weakodr() comdat {
|
|
ret void
|
|
}
|