Index: include/llvm/IR/Module.h =================================================================== --- include/llvm/IR/Module.h +++ include/llvm/IR/Module.h @@ -743,6 +743,16 @@ void setPIELevel(PIELevel::Level PL); /// @} +/// @name Utility functions for querying and setting PIE Copy Relocations. +/// @{ + + /// \brief Returns true if PIE can use linker copy relocations. + bool getPIECopyRelocs() const; + + /// \brief Records linker copy relocations support for PIE. + void setPIECopyRelocs(); +/// @} + /// @name Utility functions for querying and setting PGO summary /// @{ Index: lib/IR/Module.cpp =================================================================== --- lib/IR/Module.cpp +++ lib/IR/Module.cpp @@ -511,6 +511,19 @@ addModuleFlag(ModFlagBehavior::Error, "PIE Level", PL); } +bool Module::getPIECopyRelocs() const { + auto *Val = cast_or_null(getModuleFlag("PIE Copy Relocations")); + + if (!Val) + return false; + + return true; +} + +void Module::setPIECopyRelocs() { + addModuleFlag(ModFlagBehavior::Error, "PIE Copy Relocations", 1); +} + void Module::setMaximumFunctionCount(uint64_t Count) { addModuleFlag(ModFlagBehavior::Error, "MaxFunctionCount", Count); } Index: lib/Target/X86/X86Subtarget.cpp =================================================================== --- lib/Target/X86/X86Subtarget.cpp +++ lib/Target/X86/X86Subtarget.cpp @@ -85,10 +85,13 @@ // Extra load is needed for all externally visible globals except with // PIE as the definition of the global in an executable is not - // overridden. + // overridden. When copy relocations support is available for PIE in the + // linker, all global variable references in PIE mode can skip the extra + // load. if (!GV->hasLocalLinkage() && GV->hasDefaultVisibility() && - !isGlobalDefinedInPIE(GV, TM)) + !isGlobalDefinedInPIE(GV, TM) && + (isa(GV) || !GV->getParent()->getPIECopyRelocs())) return X86II::MO_GOTPCREL; } @@ -98,9 +101,13 @@ if (isPICStyleGOT()) { // 32-bit ELF targets. // Extra load is needed for all externally visible globals except with // PIE as the definition of the global in an executable is not overridden. + // When copy relocations support is available for PIE in the + // linker, all global variable references in PIE mode can skip the extra + // load. if (GV->hasLocalLinkage() || GV->hasHiddenVisibility() || - isGlobalDefinedInPIE(GV, TM)) + isGlobalDefinedInPIE(GV, TM) || + (!isa(GV) && GV->getParent()->getPIECopyRelocs())) return X86II::MO_GOTOFF; return X86II::MO_GOT; } Index: test/CodeGen/X86/global-access-pie-copyrelocs.ll =================================================================== --- test/CodeGen/X86/global-access-pie-copyrelocs.ll +++ test/CodeGen/X86/global-access-pie-copyrelocs.ll @@ -0,0 +1,120 @@ +; RUN: llc < %s -march=x86-64 -mcpu=generic -mtriple=x86_64-linux-gnu -relocation-model=pic \ +; RUN: | FileCheck -check-prefix=X64 %s +; RUN: llc < %s -emulated-tls -march=x86 -mcpu=generic -mtriple=i386-linux-gnu -relocation-model=pic \ +; RUN: | FileCheck -check-prefix=X32 %s + +; External Linkage +@a = global i32 0, align 4 + +define i32 @my_access_global_a() #0 { +; X32-LABEL: my_access_global_a: +; X32: addl $_GLOBAL_OFFSET_TABLE_{{.*}}, %eax +; X32-NEXT: movl a@GOTOFF(%eax), %eax +; X64-LABEL: my_access_global_a: +; X64: movl a(%rip), %eax + +entry: + %0 = load i32, i32* @a, align 4 + ret i32 %0 +} + +; WeakAny Linkage +@b = weak global i32 0, align 4 + +define i32 @my_access_global_b() #0 { +; X32-LABEL: my_access_global_b: +; X32: addl $_GLOBAL_OFFSET_TABLE_{{.*}}, %eax +; X32-NEXT: movl b@GOTOFF(%eax), %eax +; X64-LABEL: my_access_global_b: +; X64: movl b(%rip), %eax + +entry: + %0 = load i32, i32* @b, align 4 + ret i32 %0 +} + +; Internal Linkage +@c = internal global i32 0, align 4 + +define i32 @my_access_global_c() #0 { +; X32-LABEL: my_access_global_c: +; X32: addl $_GLOBAL_OFFSET_TABLE_{{.*}}, %eax +; X32-NEXT: movl c@GOTOFF(%eax), %eax +; X64-LABEL: my_access_global_c: +; X64: movl c(%rip), %eax + +entry: + %0 = load i32, i32* @c, align 4 + ret i32 %0 +} + +; External Linkage, only declaration. +@d = external global i32, align 4 + +define i32 @my_access_global_load_d() #0 { +; X32-LABEL: my_access_global_load_d: +; X32: addl $_GLOBAL_OFFSET_TABLE_{{.*}}, %eax +; X32-NEXT: movl d@GOTOFF(%eax), %eax +; X64-LABEL: my_access_global_load_d: +; X64: movl d(%rip), %eax + +entry: + %0 = load i32, i32* @d, align 4 + ret i32 %0 +} + +; External Linkage, only declaration, store a value. + +define i32 @my_access_global_store_d() #0 { +; X32-LABEL: my_access_global_store_d: +; X32: addl $_GLOBAL_OFFSET_TABLE_{{.*}}, %eax +; X32-NEXT: movl $2, d@GOTOFF(%eax) +; X64-LABEL: my_access_global_store_d: +; X64: movl $2, d(%rip) + +entry: + store i32 2, i32* @d, align 4 + ret i32 0 +} + +; External Linkage, function pointer access. +declare i32 @access_fp(i32 ()*) +declare i32 @foo() + +define i32 @my_access_fp_foo() #0 { +; X32-LABEL: my_access_fp_foo: +; X32: addl $_GLOBAL_OFFSET_TABLE_{{.*}}, %ebx +; X32-NEXT: movl foo@GOT(%ebx), %eax +; X64-LABEL: my_access_fp_foo: +; X64: movq foo@GOTPCREL(%rip), %rdi + +entry: + %call = call i32 @access_fp(i32 ()* @foo) + ret i32 %call +} + +; LinkOnceODR Linkage, function pointer access. + +$bar = comdat any + +define linkonce_odr i32 @bar() comdat { +entry: + ret i32 0 +} + +define i32 @my_access_fp_bar() #0 { +; X32-LABEL: my_access_fp_bar: +; X32: addl $_GLOBAL_OFFSET_TABLE_{{.*}}, %ebx +; X32-NEXT: leal bar@GOTOFF(%ebx), %eax +; X64-LABEL: my_access_fp_bar: +; X64: leaq bar(%rip), %rdi + +entry: + %call = call i32 @access_fp(i32 ()* @bar) + ret i32 %call +} + +!llvm.module.flags = !{!0, !1, !2} +!0 = !{i32 1, !"PIC Level", i32 1} +!1 = !{i32 1, !"PIE Level", i32 1} +!2 = !{i32 1, !"PIE Copy Relocations", i32 1}