luna updated this revision to Diff 394389.
luna added a comment.
Rebase to main
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D115648/new/
https://reviews.llvm.org/D115648
Files:
llvm/lib/Transforms/IPO/WholeProgramDevirt.cpp
llvm/test/ThinLTO/X86/Inputs/devirt_after_filtering_unreachable_lib.ll
llvm/test/ThinLTO/X86/Inputs/devirt_hybrid_after_filtering_unreachable_lib.ll
llvm/test/ThinLTO/X86/devirt_after_filtering_unreachable.ll
llvm/test/ThinLTO/X86/devirt_hybrid_after_filtering_unreachable.ll
Index: llvm/test/ThinLTO/X86/devirt_after_filtering_unreachable.ll
===================================================================
--- llvm/test/ThinLTO/X86/devirt_after_filtering_unreachable.ll
+++ llvm/test/ThinLTO/X86/devirt_after_filtering_unreachable.ll
@@ -1,9 +1,9 @@
-; Test that unreachable functions are ignored by WPD in hybrid LTO.
+; Test that unreachable functions are ignored by WPD in hybrid LTO, and thin LTO.
; In this test case, the unreachable function is the virtual deleting destructor of an abstract class.
; Generate split module with summary for hybrid Regular LTO WPD
; RUN: opt -thinlto-bc -thinlto-split-lto-unit %s -o %t-main.bc
-; RUN: opt -thinlto-bc -thinlto-split-lto-unit %p/Inputs/devirt_hybrid_after_filtering_unreachable_lib.ll -o %t-foo.bc
+; RUN: opt -thinlto-bc -thinlto-split-lto-unit %p/Inputs/devirt_after_filtering_unreachable_lib.ll -o %t-foo.bc
; Tests that devirtualization happens.
; RUN: llvm-lto2 run -save-temps %t-main.bc %t-foo.bc -pass-remarks=. -o %t \
; RUN: -whole-program-visibility \
@@ -56,6 +56,80 @@
; REMARK-COUNT-1: single-impl: devirtualized a call to _ZN7DerivedD0Ev
+; Generate unsplit module with summary for ThinLTO index-based WPD.
+; RUN: opt -thinlto-bc -o %t3.o %s
+; RUN: opt -thinlto-bc -o %t4.o %p/Inputs/devirt_after_filtering_unreachable_lib.ll
+
+; Check that EnableSplitLTOUnit is off, and check the content of summary information.
+; RUN: llvm-dis -o - %t3.o | FileCheck %s --check-prefix=NOENABLESPLITFLAG
+; NOENABLESPLITFLAG-DAG: !{i32 1, !"EnableSplitLTOUnit", i32 0}
+; NOENABLESPLITFLAG-DAG: [[BaseD0:\^[0-9]+]] = gv: (name: "_ZN4BaseD0Ev"
+; NOENABLESPLITFLAG-DAG: [[BaseD2:\^[0-9]+]] = gv: (name: "_ZN4BaseD2Ev"
+; NOENABLESPLITFLAG-DAG: [[BaseTI:\^[0-9]+]] = gv: (name: "_ZTI4Base"
+; NOENABLESPLITFLAG-DAG: [[PureVirtual:\^[0-9]+]] = gv: (name: "__cxa_pure_virtual"
+; NOENABLESPLITFLAG-DAG: [[Base:\^[0-9]+]] = gv: (name: "_ZTV4Base", {{.*}} vTableFuncs: ((virtFunc: [[BaseD2]], offset: 16), (virtFunc: [[BaseD0]], offset: 24)), refs: ([[BaseTI]], [[BaseD2]], [[BaseD0]], [[PureVirtual]])
+; NOENABLESPLITFLAG-DAG: typeidCompatibleVTable: (name: "_ZTS4Base", summary: ((offset: 16, [[Base]])))
+; NOENABLESPLITFLAG-DAG: typeidCompatibleVTable: (name: "_ZTSM4BaseFvvE.virtual", summary: ((offset: 32, [[Base]])))
+
+; Check that EnableSplitLTOUnit is off, and check the content of summary information.
+; RUN: llvm-dis -o - %t4.o | FileCheck %s --check-prefix=LIBNOENABLESPLITFLAG
+; LIBNOENABLESPLITFLAG-DAG: !{i32 1, !"EnableSplitLTOUnit", i32 0}
+; LIBNOENABLESPLITFLAG-DAG: [[DerivedD0:\^[0-9]+]] = gv: (name: "_ZN7DerivedD0Ev"
+; LIBNOENABLESPLITFLAG-DAG: [[BaseD0:\^[0-9]+]] = gv: (name: "_ZN4BaseD0Ev"
+; LIBNOENABLESPLITFLAG-DAG: [[DerivedTI:\^[0-9]+]] = gv: (name: "_ZTI7Derived"
+; LIBNOENABLESPLITFLAG-DAG: [[DerivedD2:\^[0-9]+]] = gv: (name: "_ZN7DerivedD2Ev"
+; LIBNOENABLESPLITFLAG-DAG: [[DerivedX:\^[0-9]+]] = gv: (name: "_ZN7Derived1xEv"
+; LIBNOENABLESPLITFLAG-DAG: [[BaseTI:\^[0-9]+]] = gv: (name: "_ZTI4Base"
+; LIBNOENABLESPLITFLAG-DAG: [[PureVirtual:\^[0-9]+]] = gv: (name: "__cxa_pure_virtual"
+; LIBNOENABLESPLITFLAG-DAG: [[BaseD2:\^[0-9]+]] = gv: (name: "_ZN4BaseD2Ev"
+; LIBNOENABLESPLITFLAG-DAG: [[Base:\^[0-9]+]] = gv: (name: "_ZTV4Base", {{.*}} vTableFuncs: ((virtFunc: [[BaseD2]], offset: 16), (virtFunc: [[BaseD0]], offset: 24)), refs: ([[BaseTI]], [[BaseD2]], [[BaseD0]], [[PureVirtual]])
+; LIBNOENABLESPLITFLAG-DAG: [[Derived:\^[0-9]+]] = gv: (name: "_ZTV7Derived", {{.*}} vTableFuncs: ((virtFunc: [[DerivedD2]], offset: 16), (virtFunc: [[DerivedD0]], offset: 24), (virtFunc: [[DerivedX]], offset: 32)), refs: ([[DerivedTI]], [[DerivedX]], [[DerivedD2]], [[DerivedD0]])
+; LIBNOENABLESPLITFLAG-DAG: typeidCompatibleVTable: (name: "_ZTS4Base", summary: ((offset: 16, [[Derived]]), (offset: 16, [[Base]])))
+; LIBNOENABLESPLITFLAG-DAG: typeidCompatibleVTable: (name: "_ZTS7Derived", summary: ((offset: 16, [[Derived]])))
+; LIBNOENABLESPLITFLAG-DAG: typeidCompatibleVTable: (name: "_ZTSM4BaseFvvE.virtual", summary: ((offset: 32, [[Derived]]), (offset: 32, [[Base]])))
+; LIBNOENABLESPLITFLAG-DAG: typeidCompatibleVTable: (name: "_ZTSM7DerivedFvvE.virtual", summary: ((offset: 32, [[Derived]])))
+
+; Index based WPD
+; RUN: llvm-lto2 run %t4.o %t3.o -save-temps -pass-remarks=. \
+; RUN: -whole-program-visibility \
+; RUN: -wholeprogramdevirt-print-index-based \
+; RUN: -o %t5 \
+; RUN: -r=%t4.o,_ZN7Derived1xEv,pl \
+; RUN: -r=%t4.o,printf, \
+; RUN: -r=%t4.o,_Z3fooP4Base,pl \
+; RUN: -r=%t4.o,_ZN7DerivedD2Ev,pl \
+; RUN: -r=%t4.o,_ZN7DerivedD0Ev,pl \
+; RUN: -r=%t4.o,_ZN4BaseD2Ev,pl \
+; RUN: -r=%t4.o,_ZN4BaseD0Ev,pl \
+; RUN: -r=%t4.o,__cxa_pure_virtual, \
+; RUN: -r=%t4.o,_ZdlPv, \
+; RUN: -r=%t4.o,_ZTV7Derived,pl \
+; RUN: -r=%t4.o,_ZTVN10__cxxabiv120__si_class_type_infoE, \
+; RUN: -r=%t4.o,_ZTS7Derived,pl \
+; RUN: -r=%t4.o,_ZTVN10__cxxabiv117__class_type_infoE, \
+; RUN: -r=%t4.o,_ZTS4Base,pl \
+; RUN: -r=%t4.o,_ZTI4Base,pl \
+; RUN: -r=%t4.o,_ZTI7Derived,pl \
+; RUN: -r=%t4.o,_ZTV4Base,pl \
+; RUN: -r=%t3.o,main,plx \
+; RUN: -r=%t3.o,_Znwm, \
+; RUN: -r=%t3.o,_ZN7DerivedC2Ev,pl \
+; RUN: -r=%t3.o,_Z3fooP4Base, \
+; RUN: -r=%t3.o,_ZN4BaseC2Ev,pl \
+; RUN: -r=%t3.o,_ZN4BaseD2Ev, \
+; RUN: -r=%t3.o,_ZN4BaseD0Ev, \
+; RUN: -r=%t3.o,__cxa_pure_virtual, \
+; RUN: -r=%t3.o,printf, \
+; RUN: -r=%t3.o,_ZTV7Derived, \
+; RUN: -r=%t3.o,_ZTV4Base, \
+; RUN: -r=%t3.o,_ZTVN10__cxxabiv117__class_type_infoE, \
+; RUN: -r=%t3.o,_ZTS4Base, \
+; RUN: -r=%t3.o,_ZTI4Base, 2>&1 | FileCheck %s --check-prefix=PRINT --check-prefix=THINREMARK
+
+; PRINT-DAG: Devirtualized call to {{.*}} (_ZN7DerivedD0Ev)
+; THINREMARK: single-impl: devirtualized a call to _ZN7DerivedD0Ev
+; THINREMARK: single-impl: devirtualized a call to _ZN7DerivedD0Ev
+
; ModuleID = 'tmp.cc'
source_filename = "tmp.cc"
target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
Index: llvm/test/ThinLTO/X86/Inputs/devirt_hybrid_after_filtering_unreachable_lib.ll
===================================================================
--- /dev/null
+++ llvm/test/ThinLTO/X86/Inputs/devirt_hybrid_after_filtering_unreachable_lib.ll
@@ -1,132 +0,0 @@
-; ModuleID = 'lib.cc'
-source_filename = "lib.cc"
-target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-unknown-linux-gnu"
-
-%class.Derived = type { %class.Base }
-%class.Base = type { i32 (...)** }
-
-$_ZN7DerivedD2Ev = comdat any
-
-$_ZN7DerivedD0Ev = comdat any
-
-$_ZN4BaseD2Ev = comdat any
-
-$_ZN4BaseD0Ev = comdat any
-
-$_ZTS4Base = comdat any
-
-$_ZTI4Base = comdat any
-
-$_ZTV4Base = comdat any
-
-@.str = private unnamed_addr constant [12 x i8] c"Derived::x\0A\00", align 1
-@_ZTV7Derived = hidden unnamed_addr constant { [5 x i8*] } { [5 x i8*] [i8* null, i8* bitcast ({ i8*, i8*, i8* }* @_ZTI7Derived to i8*), i8* bitcast (void (%class.Derived*)* @_ZN7DerivedD2Ev to i8*), i8* bitcast (void (%class.Derived*)* @_ZN7DerivedD0Ev to i8*), i8* bitcast (void (%class.Derived*)* @_ZN7Derived1xEv to i8*)] }, align 8, !type !0, !type !1, !type !2, !type !3, !vcall_visibility !4
-@_ZTVN10__cxxabiv120__si_class_type_infoE = external dso_local global i8*
-@_ZTS7Derived = hidden constant [9 x i8] c"7Derived\00", align 1
-@_ZTVN10__cxxabiv117__class_type_infoE = external dso_local global i8*
-@_ZTS4Base = linkonce_odr hidden constant [6 x i8] c"4Base\00", comdat, align 1
-@_ZTI4Base = linkonce_odr hidden constant { i8*, i8* } { i8* bitcast (i8** getelementptr inbounds (i8*, i8** @_ZTVN10__cxxabiv117__class_type_infoE, i64 2) to i8*), i8* getelementptr inbounds ([6 x i8], [6 x i8]* @_ZTS4Base, i32 0, i32 0) }, comdat, align 8
-@_ZTI7Derived = hidden constant { i8*, i8*, i8* } { i8* bitcast (i8** getelementptr inbounds (i8*, i8** @_ZTVN10__cxxabiv120__si_class_type_infoE, i64 2) to i8*), i8* getelementptr inbounds ([9 x i8], [9 x i8]* @_ZTS7Derived, i32 0, i32 0), i8* bitcast ({ i8*, i8* }* @_ZTI4Base to i8*) }, align 8
-@.str.1 = private unnamed_addr constant [24 x i8] c"In Derived::~Derived()\0A\00", align 1
-@_ZTV4Base = linkonce_odr hidden unnamed_addr constant { [5 x i8*] } { [5 x i8*] [i8* null, i8* bitcast ({ i8*, i8* }* @_ZTI4Base to i8*), i8* bitcast (void (%class.Base*)* @_ZN4BaseD2Ev to i8*), i8* bitcast (void (%class.Base*)* @_ZN4BaseD0Ev to i8*), i8* bitcast (void ()* @__cxa_pure_virtual to i8*)] }, comdat, align 8, !type !0, !type !1, !vcall_visibility !4
-@.str.2 = private unnamed_addr constant [18 x i8] c"In Base::~Base()\0A\00", align 1
-
-define hidden void @_ZN7Derived1xEv(%class.Derived* nonnull align 8 dereferenceable(8) %this) unnamed_addr align 2 {
-entry:
- %this.addr = alloca %class.Derived*, align 8
- store %class.Derived* %this, %class.Derived** %this.addr, align 8
- %this1 = load %class.Derived*, %class.Derived** %this.addr, align 8
- %call = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([12 x i8], [12 x i8]* @.str, i64 0, i64 0))
- ret void
-}
-
-declare dso_local i32 @printf(i8*, ...)
-
-define hidden void @_Z3fooP4Base(%class.Base* %b) {
-entry:
- %b.addr = alloca %class.Base*, align 8
- store %class.Base* %b, %class.Base** %b.addr, align 8
- %0 = load %class.Base*, %class.Base** %b.addr, align 8
- %isnull = icmp eq %class.Base* %0, null
- br i1 %isnull, label %delete.end, label %delete.notnull
-
-delete.notnull: ; preds = %entry
- %1 = bitcast %class.Base* %0 to void (%class.Base*)***
- %vtable = load void (%class.Base*)**, void (%class.Base*)*** %1, align 8
- %2 = bitcast void (%class.Base*)** %vtable to i8*
- %3 = call i1 @llvm.type.test(i8* %2, metadata !"_ZTS4Base")
- call void @llvm.assume(i1 %3)
- %vfn = getelementptr inbounds void (%class.Base*)*, void (%class.Base*)** %vtable, i64 1
- %4 = load void (%class.Base*)*, void (%class.Base*)** %vfn, align 8
- call void %4(%class.Base* nonnull align 8 dereferenceable(8) %0)
- br label %delete.end
-
-delete.end: ; preds = %delete.notnull, %entry
- ret void
-}
-
-declare i1 @llvm.type.test(i8*, metadata)
-
-declare void @llvm.assume(i1 noundef)
-
-define linkonce_odr hidden void @_ZN7DerivedD2Ev(%class.Derived* nonnull align 8 dereferenceable(8) %this) unnamed_addr comdat align 2 {
-entry:
- %this.addr = alloca %class.Derived*, align 8
- store %class.Derived* %this, %class.Derived** %this.addr, align 8
- %this1 = load %class.Derived*, %class.Derived** %this.addr, align 8
- %0 = bitcast %class.Derived* %this1 to i32 (...)***
- store i32 (...)** bitcast (i8** getelementptr inbounds ({ [5 x i8*] }, { [5 x i8*] }* @_ZTV7Derived, i32 0, inrange i32 0, i32 2) to i32 (...)**), i32 (...)*** %0, align 8
- %call = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([24 x i8], [24 x i8]* @.str.1, i64 0, i64 0))
- %1 = bitcast %class.Derived* %this1 to %class.Base*
- call void @_ZN4BaseD2Ev(%class.Base* nonnull align 8 dereferenceable(8) %1)
- ret void
-}
-
-define linkonce_odr hidden void @_ZN7DerivedD0Ev(%class.Derived* nonnull align 8 dereferenceable(8) %this) unnamed_addr comdat align 2 {
-entry:
- %this.addr = alloca %class.Derived*, align 8
- store %class.Derived* %this, %class.Derived** %this.addr, align 8
- %this1 = load %class.Derived*, %class.Derived** %this.addr, align 8
- call void @_ZN7DerivedD2Ev(%class.Derived* nonnull align 8 dereferenceable(8) %this1)
- %0 = bitcast %class.Derived* %this1 to i8*
- call void @_ZdlPv(i8* %0)
- ret void
-}
-
-define linkonce_odr hidden void @_ZN4BaseD2Ev(%class.Base* nonnull align 8 dereferenceable(8) %this) unnamed_addr comdat align 2 {
-entry:
- %this.addr = alloca %class.Base*, align 8
- store %class.Base* %this, %class.Base** %this.addr, align 8
- %this1 = load %class.Base*, %class.Base** %this.addr, align 8
- %0 = bitcast %class.Base* %this1 to i32 (...)***
- store i32 (...)** bitcast (i8** getelementptr inbounds ({ [5 x i8*] }, { [5 x i8*] }* @_ZTV4Base, i32 0, inrange i32 0, i32 2) to i32 (...)**), i32 (...)*** %0, align 8
- %call = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([18 x i8], [18 x i8]* @.str.2, i64 0, i64 0))
- ret void
-}
-
-define linkonce_odr hidden void @_ZN4BaseD0Ev(%class.Base* nonnull align 8 dereferenceable(8) %this) unnamed_addr comdat align 2 {
-entry:
- %this.addr = alloca %class.Base*, align 8
- store %class.Base* %this, %class.Base** %this.addr, align 8
- %this1 = load %class.Base*, %class.Base** %this.addr, align 8
- call void @llvm.trap()
- unreachable
-}
-
-declare dso_local void @__cxa_pure_virtual() unnamed_addr
-
-declare void @llvm.trap()
-
-declare dso_local void @_ZdlPv(i8*)
-
-!llvm.module.flags = !{!5, !6, !7, !8}
-!0 = !{i64 16, !"_ZTS4Base"}
-!1 = !{i64 32, !"_ZTSM4BaseFvvE.virtual"}
-!2 = !{i64 16, !"_ZTS7Derived"}
-!3 = !{i64 32, !"_ZTSM7DerivedFvvE.virtual"}
-!4 = !{i64 1}
-!5 = !{i32 1, !"wchar_size", i32 4}
-!6 = !{i32 1, !"Virtual Function Elim", i32 0}
-!7 = !{i32 7, !"uwtable", i32 1}
-!8 = !{i32 7, !"frame-pointer", i32 2}
Index: llvm/lib/Transforms/IPO/WholeProgramDevirt.cpp
===================================================================
--- llvm/lib/Transforms/IPO/WholeProgramDevirt.cpp
+++ llvm/lib/Transforms/IPO/WholeProgramDevirt.cpp
@@ -1099,6 +1099,10 @@
if (VTP.VTableOffset != P.AddressPointOffset + ByteOffset)
continue;
+ assert((VTP.FuncVI) && "FuncVI must not be nullptr");
+ if (mustBeUnreachableFunction(VTP.FuncVI))
+ continue;
+
TargetsForSlot.push_back(VTP.FuncVI);
}
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
