[llvm] 01b3e6e - [AIX] Support init priority
Xiangling Liao via llvm-commits
llvm-commits at lists.llvm.org
Mon Nov 23 11:51:06 PST 2020
Author: Xiangling Liao
Date: 2020-11-23T14:50:05-05:00
New Revision: 01b3e6e026332d66b18a658f31926436669f3bb9
URL: https://github.com/llvm/llvm-project/commit/01b3e6e026332d66b18a658f31926436669f3bb9
DIFF: https://github.com/llvm/llvm-project/commit/01b3e6e026332d66b18a658f31926436669f3bb9.diff
LOG: [AIX] Support init priority
Support reserved [0-100] and non-reserved[101-65535] Clang/GNU init
priority values on AIX.
This patch maps Clang/GNU values into priority values used in sinit/sterm
functions. User can play with values and be able to get init to occur
before or after XL init and vice versa.
Differential Revision: https://reviews.llvm.org/D91272
Added:
Modified:
llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
llvm/test/CodeGen/PowerPC/aix-static-init-non-default-priority.ll
Removed:
################################################################################
diff --git a/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp b/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
index 22aa9a5e1e45..f7102dccf6ee 100644
--- a/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
+++ b/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
@@ -1996,6 +1996,48 @@ bool PPCAIXAsmPrinter::doFinalization(Module &M) {
return PPCAsmPrinter::doFinalization(M);
}
+static unsigned mapToSinitPriority(int P) {
+ if (P < 0 || P > 65535)
+ report_fatal_error("invalid init priority");
+
+ if (P <= 20)
+ return P;
+
+ if (P < 81)
+ return 20 + (P - 20) * 16;
+
+ if (P <= 1124)
+ return 1004 + (P - 81);
+
+ if (P < 64512)
+ return 2047 + (P - 1124) * 33878;
+
+ return 2147482625 + (P - 64512);
+}
+
+static std::string convertToSinitPriority(int Priority) {
+ // This helper function converts clang init priority to values used in sinit
+ // and sterm functions.
+ //
+ // The conversion strategies are:
+ // We map the reserved clang/gnu priority range [0, 100] into the sinit/sterm
+ // reserved priority range [0, 1023] by
+ // - directly mapping the first 21 and the last 20 elements of the ranges
+ // - linear interpolating the intermediate values with a step size of 16.
+ //
+ // We map the non reserved clang/gnu priority range of [101, 65535] into the
+ // sinit/sterm priority range [1024, 2147483648] by:
+ // - directly mapping the first and the last 1024 elements of the ranges
+ // - linear interpolating the intermediate values with a step size of 33878.
+ unsigned int P = mapToSinitPriority(Priority);
+
+ std::string PrioritySuffix;
+ llvm::raw_string_ostream os(PrioritySuffix);
+ os << llvm::format_hex_no_prefix(P, 8);
+ os.flush();
+ return PrioritySuffix;
+}
+
void PPCAIXAsmPrinter::emitXXStructorList(const DataLayout &DL,
const Constant *List, bool IsCtor) {
SmallVector<Structor, 8> Structors;
@@ -2005,14 +2047,14 @@ void PPCAIXAsmPrinter::emitXXStructorList(const DataLayout &DL,
unsigned Index = 0;
for (Structor &S : Structors) {
- if (S.Priority != 65535)
- report_fatal_error(
- "prioritized sinit and sterm functions are not yet supported on AIX");
+ if (const ConstantExpr *CE = dyn_cast<ConstantExpr>(S.Func))
+ S.Func = CE->getOperand(0);
llvm::GlobalAlias::create(
GlobalValue::ExternalLinkage,
(IsCtor ? llvm::Twine("__sinit") : llvm::Twine("__sterm")) +
- llvm::Twine("80000000_", FormatIndicatorAndUniqueModId) +
+ llvm::Twine(convertToSinitPriority(S.Priority)) +
+ llvm::Twine("_", FormatIndicatorAndUniqueModId) +
llvm::Twine("_", llvm::utostr(Index++)),
cast<Function>(S.Func));
}
diff --git a/llvm/test/CodeGen/PowerPC/aix-static-init-non-default-priority.ll b/llvm/test/CodeGen/PowerPC/aix-static-init-non-default-priority.ll
index 96566a912bb8..81777c2dec14 100644
--- a/llvm/test/CodeGen/PowerPC/aix-static-init-non-default-priority.ll
+++ b/llvm/test/CodeGen/PowerPC/aix-static-init-non-default-priority.ll
@@ -1,10 +1,146 @@
-; RUN: not --crash llc -mtriple powerpc-ibm-aix-xcoff < %s 2>&1 | FileCheck %s
-; RUN: not --crash llc -mtriple powerpc64-ibm-aix-xcoff < %s 2>&1 | FileCheck %s
+; RUN: llc -mtriple powerpc-ibm-aix-xcoff -verify-machineinstrs < %s | FileCheck %s
+; RUN: llc -mtriple powerpc64-ibm-aix-xcoff -verify-machineinstrs < %s | FileCheck %s
- at llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 655, void ()* @foo, i8* null }]
+ at llvm.global_ctors = appending global [5 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* bitcast (i32 (i32)* @cf1 to void ()*), i8* null }, { i32, void ()*, i8* } { i32 21, void ()* @cf2, i8* null }, { i32, void ()*, i8* } { i32 81, void ()* @cf3, i8* null }, { i32, void ()*, i8* } { i32 1125, void ()* @cf4, i8* null }, { i32, void ()*, i8* } { i32 64512, void ()* @cf5, i8* null }]
+ at llvm.global_dtors = appending global [5 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 20, void ()* bitcast (i32 (i32)* @df1 to void ()*), i8* null }, { i32, void ()*, i8* } { i32 80, void ()* @df2, i8* null }, { i32, void ()*, i8* } { i32 1124, void ()* @df3, i8* null }, { i32, void ()*, i8* } { i32 64511, void ()* @df4, i8* null }, { i32, void ()*, i8* } { i32 65535, void ()* @df5, i8* null }]
-define void @foo() {
+define i32 @cf1(i32 %a) {
+ ret i32 %a
+}
+
+define void @cf2() {
+ ret void
+}
+
+define void @cf3() {
+ ret void
+}
+
+define void @cf4() {
+ ret void
+}
+
+define void @cf5() {
ret void
}
-; CHECK: LLVM ERROR: prioritized sinit and sterm functions are not yet supported
+define i32 @df1(i32 %a) {
+ ret i32 %a
+}
+
+define void @df2() {
+ ret void
+}
+
+define void @df3() {
+ ret void
+}
+
+define void @df4() {
+ ret void
+}
+
+define void @df5() {
+ ret void
+}
+
+; CHECK: .globl cf1[DS]
+; CHECK: .globl .cf1
+; CHECK: .align 2
+; CHECK: .csect cf1[DS]
+; CHECK: __sinit00000000_clang_f6a1bc9396775a64c6249effda300afe_0: # @cf1
+; CHECK: .cf1:
+; CHECK: .__sinit00000000_clang_f6a1bc9396775a64c6249effda300afe_0:
+
+; CHECK: .globl cf2[DS]
+; CHECK: .globl .cf2
+; CHECK: .align 2
+; CHECK: .csect cf2[DS]
+; CHECK: __sinit00000024_clang_f6a1bc9396775a64c6249effda300afe_1: # @cf2
+; CHECK: .cf2:
+; CHECK: .__sinit00000024_clang_f6a1bc9396775a64c6249effda300afe_1:
+
+; CHECK: .globl cf3[DS]
+; CHECK: .globl .cf3
+; CHECK: .align 2
+; CHECK: .csect cf3[DS]
+; CHECK: __sinit000003ec_clang_f6a1bc9396775a64c6249effda300afe_2: # @cf3
+; CHECK: .cf3:
+; CHECK: .__sinit000003ec_clang_f6a1bc9396775a64c6249effda300afe_2:
+
+; CHECK: .globl cf4[DS]
+; CHECK: .globl .cf4
+; CHECK: .align 2
+; CHECK: .csect cf4[DS]
+; CHECK: __sinit00008c55_clang_f6a1bc9396775a64c6249effda300afe_3: # @cf4
+; CHECK: .cf4:
+; CHECK: .__sinit00008c55_clang_f6a1bc9396775a64c6249effda300afe_3:
+
+; CHECK: .globl cf5[DS]
+; CHECK: .globl .cf5
+; CHECK: .align 2
+; CHECK: .csect cf5[DS]
+; CHECK: __sinit7ffffc01_clang_f6a1bc9396775a64c6249effda300afe_4: # @cf5
+; CHECK: .cf5:
+; CHECK: .__sinit7ffffc01_clang_f6a1bc9396775a64c6249effda300afe_4:
+
+; CHECK: .globl df1[DS]
+; CHECK: .globl .df1
+; CHECK: .align 2
+; CHECK: .csect df1[DS]
+; CHECK: __sterm00000014_clang_f6a1bc9396775a64c6249effda300afe_0: # @df1
+; CHECK: .df1:
+; CHECK: .__sterm00000014_clang_f6a1bc9396775a64c6249effda300afe_0:
+
+; CHECK: .globl df2[DS]
+; CHECK: .globl .df2
+; CHECK: .align 2
+; CHECK: .csect df2[DS]
+; CHECK: __sterm000003d4_clang_f6a1bc9396775a64c6249effda300afe_1: # @df2
+; CHECK: .df2:
+; CHECK: .__sterm000003d4_clang_f6a1bc9396775a64c6249effda300afe_1:
+
+; CHECK: .globl df3[DS]
+; CHECK: .globl .df3
+; CHECK: .align 2
+; CHECK: .csect df3[DS]
+; CHECK: __sterm000007ff_clang_f6a1bc9396775a64c6249effda300afe_2: # @df3
+; CHECK: .df3:
+; CHECK: .__sterm000007ff_clang_f6a1bc9396775a64c6249effda300afe_2:
+
+; CHECK: .globl df4[DS]
+; CHECK: .globl .df4
+; CHECK: .align 2
+; CHECK: .csect df4[DS]
+; CHECK: __sterm7fff2211_clang_f6a1bc9396775a64c6249effda300afe_3: # @df4
+; CHECK: .df4:
+; CHECK: .__sterm7fff2211_clang_f6a1bc9396775a64c6249effda300afe_3:
+
+; CHECK: .globl df5[DS]
+; CHECK: .globl .df5
+; CHECK: .align 2
+; CHECK: .csect df5[DS]
+; CHECK: __sterm80000000_clang_f6a1bc9396775a64c6249effda300afe_4: # @df5
+; CHECK: .df5:
+; CHECK: .__sterm80000000_clang_f6a1bc9396775a64c6249effda300afe_4:
+
+; CHECK: .globl __sinit00000000_clang_f6a1bc9396775a64c6249effda300afe_0
+; CHECK: .globl .__sinit00000000_clang_f6a1bc9396775a64c6249effda300afe_0
+; CHECK: .globl __sinit00000024_clang_f6a1bc9396775a64c6249effda300afe_1
+; CHECK: .globl .__sinit00000024_clang_f6a1bc9396775a64c6249effda300afe_1
+; CHECK: .globl __sinit000003ec_clang_f6a1bc9396775a64c6249effda300afe_2
+; CHECK: .globl .__sinit000003ec_clang_f6a1bc9396775a64c6249effda300afe_2
+; CHECK: .globl __sinit00008c55_clang_f6a1bc9396775a64c6249effda300afe_3
+; CHECK: .globl .__sinit00008c55_clang_f6a1bc9396775a64c6249effda300afe_3
+; CHECK: .globl __sinit7ffffc01_clang_f6a1bc9396775a64c6249effda300afe_4
+; CHECK: .globl .__sinit7ffffc01_clang_f6a1bc9396775a64c6249effda300afe_4
+; CHECK: .globl __sterm00000014_clang_f6a1bc9396775a64c6249effda300afe_0
+; CHECK: .globl .__sterm00000014_clang_f6a1bc9396775a64c6249effda300afe_0
+; CHECK: .globl __sterm000003d4_clang_f6a1bc9396775a64c6249effda300afe_1
+; CHECK: .globl .__sterm000003d4_clang_f6a1bc9396775a64c6249effda300afe_1
+; CHECK: .globl __sterm000007ff_clang_f6a1bc9396775a64c6249effda300afe_2
+; CHECK: .globl .__sterm000007ff_clang_f6a1bc9396775a64c6249effda300afe_2
+; CHECK: .globl __sterm7fff2211_clang_f6a1bc9396775a64c6249effda300afe_3
+; CHECK: .globl .__sterm7fff2211_clang_f6a1bc9396775a64c6249effda300afe_3
+; CHECK: .globl __sterm80000000_clang_f6a1bc9396775a64c6249effda300afe_4
+; CHECK: .globl .__sterm80000000_clang_f6a1bc9396775a64c6249effda300afe_4
More information about the llvm-commits
mailing list