diff options
author | Erich Keane <erich.keane@intel.com> | 2018-01-16 19:49:52 +0000 |
---|---|---|
committer | Erich Keane <erich.keane@intel.com> | 2018-01-16 19:49:52 +0000 |
commit | 7a94b66d325cbcad56fa4d08b5f88c746bd521d1 (patch) | |
tree | d7910f734879b0a017635dc17da8a5831fdc09d1 | |
parent | 6f37170222ba91eb13f7d8e0d9142ba01003c14f (diff) |
Move target MV resolver to COMDAT
As reported here: https://bugs.llvm.org/show_bug.cgi?id=35921
The resolver functions should be in their own
COMDAT regions. This patch sets that up.
Differential Revision: https://reviews.llvm.org/D42110
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@322592 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/CodeGen/CodeGenModule.cpp | 3 | ||||
-rw-r--r-- | test/CodeGen/attr-target-mv-va-args.c | 2 | ||||
-rw-r--r-- | test/CodeGen/attr-target-mv.c | 6 | ||||
-rw-r--r-- | test/CodeGenCXX/attr-target-mv-diff-ns.cpp | 4 | ||||
-rw-r--r-- | test/CodeGenCXX/attr-target-mv-member-funcs.cpp | 12 | ||||
-rw-r--r-- | test/CodeGenCXX/attr-target-mv-out-of-line-defs.cpp | 2 | ||||
-rw-r--r-- | test/CodeGenCXX/attr-target-mv-overloads.cpp | 4 |
7 files changed, 18 insertions, 15 deletions
diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index acf6e4d63c..fb16c8f260 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/lib/CodeGen/CodeGenModule.cpp @@ -2185,6 +2185,9 @@ void CodeGenModule::emitMultiVersionFunctions() { llvm::Function *ResolverFunc = cast<llvm::Function>( GetGlobalValue((getMangledName(GD) + ".resolver").str())); + if (supportsCOMDAT()) + ResolverFunc->setComdat( + getModule().getOrInsertComdat(ResolverFunc->getName())); std::stable_sort( Options.begin(), Options.end(), std::greater<CodeGenFunction::MultiVersionResolverOption>()); diff --git a/test/CodeGen/attr-target-mv-va-args.c b/test/CodeGen/attr-target-mv-va-args.c index c5d92dbfad..b33f841dba 100644 --- a/test/CodeGen/attr-target-mv-va-args.c +++ b/test/CodeGen/attr-target-mv-va-args.c @@ -18,7 +18,7 @@ int bar() { // CHECK: define i32 @bar() // CHECK: call i32 (i32, ...) @foo.ifunc(i32 1, i32 97, double // CHECK: call i32 (i32, ...) @foo.ifunc(i32 2, double 2.2{{[0-9Ee+]+}}, i8* getelementptr inbounds -// CHECK: define i32 (i32, ...)* @foo.resolver() +// CHECK: define i32 (i32, ...)* @foo.resolver() comdat // CHECK: ret i32 (i32, ...)* @foo.arch_sandybridge // CHECK: ret i32 (i32, ...)* @foo.arch_ivybridge // CHECK: ret i32 (i32, ...)* @foo.sse4.2 diff --git a/test/CodeGen/attr-target-mv.c b/test/CodeGen/attr-target-mv.c index a877fd6e8d..ca3d7d2971 100644 --- a/test/CodeGen/attr-target-mv.c +++ b/test/CodeGen/attr-target-mv.c @@ -38,7 +38,7 @@ inline __attribute__((target("sse4.2"))) void foo_decls(void) {} // CHECK: define i32 @bar() // CHECK: call i32 @foo.ifunc() -// CHECK: define i32 ()* @foo.resolver() +// CHECK: define i32 ()* @foo.resolver() comdat // CHECK: call void @__cpu_indicator_init() // CHECK: ret i32 ()* @foo.arch_sandybridge // CHECK: ret i32 ()* @foo.arch_ivybridge @@ -48,7 +48,7 @@ inline __attribute__((target("sse4.2"))) void foo_decls(void) {} // CHECK: define i32 @bar2() // CHECK: call i32 @foo_inline.ifunc() -// CHECK: define i32 ()* @foo_inline.resolver() +// CHECK: define i32 ()* @foo_inline.resolver() comdat // CHECK: call void @__cpu_indicator_init() // CHECK: ret i32 ()* @foo_inline.arch_sandybridge // CHECK: ret i32 ()* @foo_inline.arch_ivybridge @@ -58,7 +58,7 @@ inline __attribute__((target("sse4.2"))) void foo_decls(void) {} // CHECK: define void @bar3() // CHECK: call void @foo_decls.ifunc() -// CHECK: define void ()* @foo_decls.resolver() +// CHECK: define void ()* @foo_decls.resolver() comdat // CHECK: ret void ()* @foo_decls.sse4.2 // CHECK: ret void ()* @foo_decls diff --git a/test/CodeGenCXX/attr-target-mv-diff-ns.cpp b/test/CodeGenCXX/attr-target-mv-diff-ns.cpp index 1852750e46..4dc2b67b46 100644 --- a/test/CodeGenCXX/attr-target-mv-diff-ns.cpp +++ b/test/CodeGenCXX/attr-target-mv-diff-ns.cpp @@ -38,13 +38,13 @@ int bar() { // CHECK: call i32 @_Z3fooi.ifunc(i32 1) // CHECK: call i32 @_ZN2ns3fooEi.ifunc(i32 2) -// CHECK: define i32 (i32)* @_Z3fooi.resolver() +// CHECK: define i32 (i32)* @_Z3fooi.resolver() comdat // CHECK: ret i32 (i32)* @_Z3fooi.arch_sandybridge // CHECK: ret i32 (i32)* @_Z3fooi.arch_ivybridge // CHECK: ret i32 (i32)* @_Z3fooi.sse4.2 // CHECK: ret i32 (i32)* @_Z3fooi // -// CHECK: define i32 (i32)* @_ZN2ns3fooEi.resolver() +// CHECK: define i32 (i32)* @_ZN2ns3fooEi.resolver() comdat // CHECK: ret i32 (i32)* @_ZN2ns3fooEi.arch_sandybridge // CHECK: ret i32 (i32)* @_ZN2ns3fooEi.arch_ivybridge // CHECK: ret i32 (i32)* @_ZN2ns3fooEi.sse4.2 diff --git a/test/CodeGenCXX/attr-target-mv-member-funcs.cpp b/test/CodeGenCXX/attr-target-mv-member-funcs.cpp index 2c201c5d52..2e5db3b705 100644 --- a/test/CodeGenCXX/attr-target-mv-member-funcs.cpp +++ b/test/CodeGenCXX/attr-target-mv-member-funcs.cpp @@ -81,15 +81,15 @@ int templ_use() { // CHECK: call dereferenceable(1) %struct.S* @_ZN1SaSERKS_.ifunc(%struct.S* %s2 // CHECK: call i32 @_ZN1S3fooEi.ifunc(%struct.S* %s, i32 0) -// CHECK: define %struct.S* (%struct.S*, %struct.S*)* @_ZN1SaSERKS_.resolver() +// CHECK: define %struct.S* (%struct.S*, %struct.S*)* @_ZN1SaSERKS_.resolver() comdat // CHECK: ret %struct.S* (%struct.S*, %struct.S*)* @_ZN1SaSERKS_.arch_ivybridge // CHECK: ret %struct.S* (%struct.S*, %struct.S*)* @_ZN1SaSERKS_ -// CHECK: define void (%struct.ConvertTo*)* @_ZNK9ConvertTocv1SEv.resolver() +// CHECK: define void (%struct.ConvertTo*)* @_ZNK9ConvertTocv1SEv.resolver() comdat // CHECK: ret void (%struct.ConvertTo*)* @_ZNK9ConvertTocv1SEv.arch_ivybridge // CHECK: ret void (%struct.ConvertTo*)* @_ZNK9ConvertTocv1SEv -// CHECK: define i32 (%struct.S*, i32)* @_ZN1S3fooEi.resolver() +// CHECK: define i32 (%struct.S*, i32)* @_ZN1S3fooEi.resolver() comdat // CHECK: ret i32 (%struct.S*, i32)* @_ZN1S3fooEi.arch_sandybridge // CHECK: ret i32 (%struct.S*, i32)* @_ZN1S3fooEi.arch_ivybridge // CHECK: ret i32 (%struct.S*, i32)* @_ZN1S3fooEi.sse4.2 @@ -97,7 +97,7 @@ int templ_use() { // CHECK: define i32 @_Z4bar2v() // CHECK:call i32 @_ZN2S23fooEi.ifunc -// define i32 (%struct.S2*, i32)* @_ZN2S23fooEi.resolver() +// define i32 (%struct.S2*, i32)* @_ZN2S23fooEi.resolver() comdat // CHECK: ret i32 (%struct.S2*, i32)* @_ZN2S23fooEi.arch_sandybridge // CHECK: ret i32 (%struct.S2*, i32)* @_ZN2S23fooEi.arch_ivybridge // CHECK: ret i32 (%struct.S2*, i32)* @_ZN2S23fooEi.sse4.2 @@ -112,13 +112,13 @@ int templ_use() { // CHECK: call i32 @_ZN5templIdE3fooEi.ifunc -// CHECK: define i32 (%struct.templ*, i32)* @_ZN5templIiE3fooEi.resolver() +// CHECK: define i32 (%struct.templ*, i32)* @_ZN5templIiE3fooEi.resolver() comdat // CHECK: ret i32 (%struct.templ*, i32)* @_ZN5templIiE3fooEi.arch_sandybridge // CHECK: ret i32 (%struct.templ*, i32)* @_ZN5templIiE3fooEi.arch_ivybridge // CHECK: ret i32 (%struct.templ*, i32)* @_ZN5templIiE3fooEi.sse4.2 // CHECK: ret i32 (%struct.templ*, i32)* @_ZN5templIiE3fooEi // -// CHECK: define i32 (%struct.templ.0*, i32)* @_ZN5templIdE3fooEi.resolver() +// CHECK: define i32 (%struct.templ.0*, i32)* @_ZN5templIdE3fooEi.resolver() comdat // CHECK: ret i32 (%struct.templ.0*, i32)* @_ZN5templIdE3fooEi.arch_sandybridge // CHECK: ret i32 (%struct.templ.0*, i32)* @_ZN5templIdE3fooEi.arch_ivybridge // CHECK: ret i32 (%struct.templ.0*, i32)* @_ZN5templIdE3fooEi.sse4.2 diff --git a/test/CodeGenCXX/attr-target-mv-out-of-line-defs.cpp b/test/CodeGenCXX/attr-target-mv-out-of-line-defs.cpp index 7072dec503..63353c12d2 100644 --- a/test/CodeGenCXX/attr-target-mv-out-of-line-defs.cpp +++ b/test/CodeGenCXX/attr-target-mv-out-of-line-defs.cpp @@ -30,7 +30,7 @@ int bar() { // CHECK: %s = alloca %struct.S, align 1 // CHECK: %call = call i32 @_ZN1S3fooEi.ifunc(%struct.S* %s, i32 0) -// CHECK: define i32 (%struct.S*, i32)* @_ZN1S3fooEi.resolver() +// CHECK: define i32 (%struct.S*, i32)* @_ZN1S3fooEi.resolver() comdat // CHECK: ret i32 (%struct.S*, i32)* @_ZN1S3fooEi.arch_sandybridge // CHECK: ret i32 (%struct.S*, i32)* @_ZN1S3fooEi.arch_ivybridge // CHECK: ret i32 (%struct.S*, i32)* @_ZN1S3fooEi.sse4.2 diff --git a/test/CodeGenCXX/attr-target-mv-overloads.cpp b/test/CodeGenCXX/attr-target-mv-overloads.cpp index a1b12c304e..c72ea77fa4 100644 --- a/test/CodeGenCXX/attr-target-mv-overloads.cpp +++ b/test/CodeGenCXX/attr-target-mv-overloads.cpp @@ -34,13 +34,13 @@ int bar2() { // CHECK: call i32 @_Z12foo_overloadv.ifunc() // CHECK: call i32 @_Z12foo_overloadi.ifunc(i32 1) -// CHECK: define i32 ()* @_Z12foo_overloadv.resolver() +// CHECK: define i32 ()* @_Z12foo_overloadv.resolver() comdat // CHECK: ret i32 ()* @_Z12foo_overloadv.arch_sandybridge // CHECK: ret i32 ()* @_Z12foo_overloadv.arch_ivybridge // CHECK: ret i32 ()* @_Z12foo_overloadv.sse4.2 // CHECK: ret i32 ()* @_Z12foo_overloadv -// CHECK: define i32 (i32)* @_Z12foo_overloadi.resolver() +// CHECK: define i32 (i32)* @_Z12foo_overloadi.resolver() comdat // CHECK: ret i32 (i32)* @_Z12foo_overloadi.arch_sandybridge // CHECK: ret i32 (i32)* @_Z12foo_overloadi.arch_ivybridge // CHECK: ret i32 (i32)* @_Z12foo_overloadi.sse4.2 |