From 7606020d11291aa92b73255bdacde4e770f8bf13 Mon Sep 17 00:00:00 2001 From: Daniel Kiss Date: Tue, 27 Feb 2024 10:40:26 +0100 Subject: [PATCH] Don't use module flags as function attr. Pull Request: https://github.com/DanielKristofKiss/llvm-project/pull/1 --- .../SelectionDAG/SelectionDAGBuilder.cpp | 4 --- .../AArch64/AArch64MachineFunctionInfo.cpp | 33 ++++------------- .../lib/Target/ARM/ARMMachineFunctionInfo.cpp | 6 +--- llvm/test/CodeGen/AArch64/kcfi-bti.ll | 7 ++-- .../AArch64/pacbti-llvm-generated-funcs-1.ll | 2 +- .../AArch64/pacbti-llvm-generated-funcs-2.ll | 4 +-- .../CodeGen/AArch64/pacbti-module-attrs.ll | 2 +- .../CodeGen/AArch64/setjmp-bti-outliner.ll | 15 ++++---- llvm/test/CodeGen/AArch64/setjmp-bti.ll | 6 ++-- .../AArch64/sign-return-address-pauth-lr.ll | 36 +++++++++---------- llvm/test/CodeGen/AArch64/wineh-bti.ll | 7 +--- llvm/test/CodeGen/AArch64/wineh-pac.ll | 7 ++-- llvm/test/CodeGen/ARM/setjmp-bti-basic.ll | 5 +-- llvm/test/CodeGen/ARM/setjmp-bti-outliner.ll | 7 ++-- llvm/test/CodeGen/Thumb2/bti-entry-blocks.ll | 7 ++-- .../CodeGen/Thumb2/bti-indirect-branches.ll | 9 ++--- llvm/test/CodeGen/Thumb2/bti-outliner-2.ll | 6 +--- .../CodeGen/Thumb2/bti-outliner-cost-2.ll | 6 +--- .../test/CodeGen/Thumb2/bti-pac-replace-1.mir | 8 +---- llvm/test/CodeGen/Thumb2/bti-pac-replace-2.ll | 7 +--- llvm/test/CodeGen/Thumb2/jump-table-bti.ll | 6 ++-- .../Thumb2/pacbti-m-unsupported-arch.ll | 8 +---- .../AArch64/link-branch-target-enforcement.ll | 2 +- 23 files changed, 61 insertions(+), 139 deletions(-) diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp index ab2f42d2024ccc..40a991e2a62252 100644 --- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp @@ -11584,10 +11584,6 @@ void SelectionDAGBuilder::lowerWorkItem(SwitchWorkListItem W, Value *Cond, HasBranchTargetEnforcement = CurFunc.getFnAttribute("branch-target-enforcement") .getValueAsBool(); - } else { - HasBranchTargetEnforcement = - CurMF->getMMI().getModule()->getModuleFlag( - "branch-target-enforcement"); } if (!HasBranchTargetEnforcement) JTH->FallthroughUnreachable = true; diff --git a/llvm/lib/Target/AArch64/AArch64MachineFunctionInfo.cpp b/llvm/lib/Target/AArch64/AArch64MachineFunctionInfo.cpp index 1a8c71888a852f..a96b0110100fcc 100644 --- a/llvm/lib/Target/AArch64/AArch64MachineFunctionInfo.cpp +++ b/llvm/lib/Target/AArch64/AArch64MachineFunctionInfo.cpp @@ -41,19 +41,8 @@ static std::pair GetSignReturnAddress(const Function &F) { // The function should be signed in the following situations: // - sign-return-address=all // - sign-return-address=non-leaf and the functions spills the LR - if (!F.hasFnAttribute("sign-return-address")) { - const Module &M = *F.getParent(); - if (const auto *Sign = mdconst::extract_or_null( - M.getModuleFlag("sign-return-address"))) { - if (Sign->getZExtValue()) { - if (const auto *All = mdconst::extract_or_null( - M.getModuleFlag("sign-return-address-all"))) - return {true, All->getZExtValue()}; - return {true, false}; - } - } + if (!F.hasFnAttribute("sign-return-address")) return {false, false}; - } StringRef Scope = F.getFnAttribute("sign-return-address").getValueAsString(); if (Scope.equals("none")) @@ -68,9 +57,6 @@ static std::pair GetSignReturnAddress(const Function &F) { static bool ShouldSignWithBKey(const Function &F, const AArch64Subtarget &STI) { if (!F.hasFnAttribute("sign-return-address-key")) { - if (const auto *BKey = mdconst::extract_or_null( - F.getParent()->getModuleFlag("sign-return-address-with-bkey"))) - return BKey->getZExtValue(); if (STI.getTargetTriple().isOSWindows()) return true; return false; @@ -93,24 +79,19 @@ AArch64FunctionInfo::AArch64FunctionInfo(const Function &F, // TODO: skip functions that have no instrumented allocas for optimization IsMTETagged = F.hasFnAttribute(Attribute::SanitizeMemTag); - // BTI/PAuthLR may be set either on the function or the module. Set Bool from - // either the function attribute or module attribute, depending on what is - // set. - // Note: the module attributed is numeric (0 or 1) but the function attribute - // is stringy ("true" or "false"). - auto TryFnThenModule = [&](StringRef AttrName, bool &Bool) { + // BTI/PAuthLR are set on the function attribute. + auto TryFnAttr = [&](StringRef AttrName, bool &Bool) { if (F.hasFnAttribute(AttrName)) { const StringRef V = F.getFnAttribute(AttrName).getValueAsString(); assert(V.equals_insensitive("true") || V.equals_insensitive("false")); Bool = V.equals_insensitive("true"); - } else if (const auto *ModVal = mdconst::extract_or_null( - F.getParent()->getModuleFlag(AttrName))) { - Bool = ModVal->getZExtValue(); + } else { + Bool = false; } }; - TryFnThenModule("branch-target-enforcement", BranchTargetEnforcement); - TryFnThenModule("branch-protection-pauth-lr", BranchProtectionPAuthLR); + TryFnAttr("branch-target-enforcement", BranchTargetEnforcement); + TryFnAttr("branch-protection-pauth-lr", BranchProtectionPAuthLR); // The default stack probe size is 4096 if the function has no // stack-probe-size attribute. This is a safe default because it is the diff --git a/llvm/lib/Target/ARM/ARMMachineFunctionInfo.cpp b/llvm/lib/Target/ARM/ARMMachineFunctionInfo.cpp index a364992fab3ed5..c1bbf82b485819 100644 --- a/llvm/lib/Target/ARM/ARMMachineFunctionInfo.cpp +++ b/llvm/lib/Target/ARM/ARMMachineFunctionInfo.cpp @@ -30,12 +30,8 @@ static bool GetBranchTargetEnforcement(const Function &F, if (!Subtarget->isMClass() || !Subtarget->hasV7Ops()) return false; - if (!F.hasFnAttribute("branch-target-enforcement")) { - if (const auto *BTE = mdconst::extract_or_null( - F.getParent()->getModuleFlag("branch-target-enforcement"))) - return BTE->getZExtValue(); + if (!F.hasFnAttribute("branch-target-enforcement")) return false; - } const StringRef BTIEnable = F.getFnAttribute("branch-target-enforcement").getValueAsString(); diff --git a/llvm/test/CodeGen/AArch64/kcfi-bti.ll b/llvm/test/CodeGen/AArch64/kcfi-bti.ll index d3febb536824e3..d80fdc6164b92b 100644 --- a/llvm/test/CodeGen/AArch64/kcfi-bti.ll +++ b/llvm/test/CodeGen/AArch64/kcfi-bti.ll @@ -3,7 +3,7 @@ ; RUN: llc -mtriple=aarch64-- -verify-machineinstrs -stop-after=kcfi < %s | FileCheck %s --check-prefixes=MIR,KCFI ; ASM: .word 12345678 -define void @f1(ptr noundef %x) !kcfi_type !2 { +define void @f1(ptr noundef %x) #1 !kcfi_type !2 { ; ASM-LABEL: f1: ; ASM: // %bb.0: ; ASM: ldur w16, [x0, #-4] @@ -30,7 +30,7 @@ define void @f1(ptr noundef %x) !kcfi_type !2 { } ; ASM: .word 12345678 -define void @f2(ptr noundef %x) !kcfi_type !2 { +define void @f2(ptr noundef %x) #1 !kcfi_type !2 { ; ASM-LABEL: f2: ; ASM: // %bb.0: ; ASM: ldur w16, [x0, #-4] @@ -58,7 +58,7 @@ define void @f2(ptr noundef %x) !kcfi_type !2 { } ; ASM-NOT: .word: -define void @f3(ptr noundef %x) { +define void @f3(ptr noundef %x) #1 { ; ASM-LABEL: f3: ; ASM: // %bb.0: ; ASM: ldur w9, [x16, #-4] @@ -85,6 +85,7 @@ define void @f3(ptr noundef %x) { } attributes #0 = { returns_twice } +attributes #1 = { "branch-target-enforcement"="true" } !llvm.module.flags = !{!0, !1} !0 = !{i32 8, !"branch-target-enforcement", i32 1} diff --git a/llvm/test/CodeGen/AArch64/pacbti-llvm-generated-funcs-1.ll b/llvm/test/CodeGen/AArch64/pacbti-llvm-generated-funcs-1.ll index 4a2c17d8a6c4e6..0c459a6d36e373 100644 --- a/llvm/test/CodeGen/AArch64/pacbti-llvm-generated-funcs-1.ll +++ b/llvm/test/CodeGen/AArch64/pacbti-llvm-generated-funcs-1.ll @@ -14,7 +14,7 @@ entry: declare void @__asan_init() declare void @__asan_version_mismatch_check_v8() -define internal void @asan.module_ctor() { +define internal void @asan.module_ctor() #0 { call void @__asan_init() call void @__asan_version_mismatch_check_v8() ret void diff --git a/llvm/test/CodeGen/AArch64/pacbti-llvm-generated-funcs-2.ll b/llvm/test/CodeGen/AArch64/pacbti-llvm-generated-funcs-2.ll index 1515db46efc46d..e3394f79c62702 100644 --- a/llvm/test/CodeGen/AArch64/pacbti-llvm-generated-funcs-2.ll +++ b/llvm/test/CodeGen/AArch64/pacbti-llvm-generated-funcs-2.ll @@ -58,8 +58,8 @@ entry: ;; CHECK-NEXT: .cfi_negate_ra_state attributes #0 = { norecurse nounwind readnone "sign-return-address"="all" "sign-return-address-key"="b_key" } -attributes #1 = { noinline } -attributes #2 = { nofree noinline norecurse nounwind writeonly } +attributes #1 = { noinline "sign-return-address"="all" "sign-return-address-key"="b_key" } +attributes #2 = { nofree noinline norecurse nounwind writeonly "sign-return-address"="all" "sign-return-address-key"="b_key" } !llvm.module.flags = !{!0, !1, !2, !3, !4, !5} diff --git a/llvm/test/CodeGen/AArch64/pacbti-module-attrs.ll b/llvm/test/CodeGen/AArch64/pacbti-module-attrs.ll index ba4772178211dd..65c2112caeedc6 100644 --- a/llvm/test/CodeGen/AArch64/pacbti-module-attrs.ll +++ b/llvm/test/CodeGen/AArch64/pacbti-module-attrs.ll @@ -66,7 +66,7 @@ attributes #1 = { nounwind "branch-target-enforcement"="true" "sign-return-addr attributes #2 = { nounwind "branch-target-enforcement"="false" "sign-return-address"="non-leaf" "sign-return-address-key"="a_key" } attributes #3 = { nounwind "branch-target-enforcement"="false" "sign-return-address"="non-leaf" "sign-return-address-key"="b_key" } attributes #4 = { nounwind "branch-target-enforcement"="false" "sign-return-address"="all" "sign-return-address-key"="a_key" } -attributes #5 = { nounwind } +attributes #5 = { nounwind "branch-target-enforcement"="true" "sign-return-address"="all" "sign-return-address-key"="a_key" } !llvm.module.flags = !{!0, !1, !2, !3, !4} diff --git a/llvm/test/CodeGen/AArch64/setjmp-bti-outliner.ll b/llvm/test/CodeGen/AArch64/setjmp-bti-outliner.ll index 36fc2f5b31c149..675dae2af726ca 100644 --- a/llvm/test/CodeGen/AArch64/setjmp-bti-outliner.ll +++ b/llvm/test/CodeGen/AArch64/setjmp-bti-outliner.ll @@ -27,7 +27,7 @@ ; return 2 + a * (a + b) / (c + d); ; } -define i32 @f(i32 noundef %a, i32 noundef %b, i32 noundef %c, i32 noundef %d) { +define i32 @f(i32 noundef %a, i32 noundef %b, i32 noundef %c, i32 noundef %d) #0 { ; BTI-LABEL: f: ; BTI: bl OUTLINED_FUNCTION_1 ; BTI-NEXT: bl setjmp @@ -39,7 +39,7 @@ define i32 @f(i32 noundef %a, i32 noundef %b, i32 noundef %c, i32 noundef %d) { ; NOBTI-NEXT: bl OUTLINED_FUNCTION_1 entry: - %call = call i32 @setjmp(ptr noundef null) #0 + %call = call i32 @setjmp(ptr noundef null) #1 %add = add nsw i32 %b, %a %mul = mul nsw i32 %add, %a %add1 = add nsw i32 %d, %c @@ -50,7 +50,7 @@ entry: declare i32 @setjmp(ptr noundef) #0 -define i32 @g(i32 noundef %a, i32 noundef %b, i32 noundef %c, i32 noundef %d) { +define i32 @g(i32 noundef %a, i32 noundef %b, i32 noundef %c, i32 noundef %d) #0 { ; BTI-LABEL: g: ; BTI: bl OUTLINED_FUNCTION_1 ; BTI-NEXT: bl setjmp @@ -62,7 +62,7 @@ define i32 @g(i32 noundef %a, i32 noundef %b, i32 noundef %c, i32 noundef %d) { ; NOBTI-NEXT: bl OUTLINED_FUNCTION_1 entry: - %call = call i32 @setjmp(ptr noundef null) #0 + %call = call i32 @setjmp(ptr noundef null) #1 %add = add nsw i32 %b, %a %mul = mul nsw i32 %add, %a %add1 = add nsw i32 %d, %c @@ -76,8 +76,5 @@ entry: ; NOBTI: OUTLINED_FUNCTION_1: ; NOBTI-LABEL: ret -attributes #0 = { returns_twice } - -!llvm.module.flags = !{!0} - -!0 = !{i32 8, !"branch-target-enforcement", i32 1} +attributes #0 = { "branch-target-enforcement"="true" } +attributes #1 = { returns_twice } diff --git a/llvm/test/CodeGen/AArch64/setjmp-bti.ll b/llvm/test/CodeGen/AArch64/setjmp-bti.ll index 79a6bafffc8d8d..c963a73aef1236 100644 --- a/llvm/test/CodeGen/AArch64/setjmp-bti.ll +++ b/llvm/test/CodeGen/AArch64/setjmp-bti.ll @@ -24,7 +24,7 @@ ; notsetjmp(); ; } -define void @bbb() { +define void @bbb() #1 { ; BTI-LABEL: bbb: ; BTI: bl setjmp ; BTI-NEXT: hint #36 @@ -72,6 +72,4 @@ declare i32 @setjmp(ptr noundef) #0 declare void @notsetjmp() attributes #0 = { returns_twice } - -!llvm.module.flags = !{!0} -!0 = !{i32 8, !"branch-target-enforcement", i32 1} +attributes #1 = { "branch-target-enforcement"="true" } diff --git a/llvm/test/CodeGen/AArch64/sign-return-address-pauth-lr.ll b/llvm/test/CodeGen/AArch64/sign-return-address-pauth-lr.ll index a78fa853d99dc4..ab2b9ffcd4537a 100644 --- a/llvm/test/CodeGen/AArch64/sign-return-address-pauth-lr.ll +++ b/llvm/test/CodeGen/AArch64/sign-return-address-pauth-lr.ll @@ -15,17 +15,15 @@ ; sign-return-address.ll tests combinations of -mbranch-protection=none/pac-ret ; and whether +pauth-lr is present or not. -; sign-return-address-pauth-lr.ll is identical, with the addition of this module +; sign-return-address-pauth-lr.ll is identical, with the addition of the function ; attribute, which enables -mbranch-protection=pac-ret+pc, and therefore tests ; the remaining parameter combinations in the table: -!llvm.module.flags = !{!1} -!1 = !{i32 1, !"branch-protection-pauth-lr", i32 1} ; RUN: llc -mtriple=aarch64 < %s | FileCheck --check-prefixes=CHECK,COMPAT %s ; RUN: llc -mtriple=aarch64 -mattr=v8.3a < %s | FileCheck --check-prefixes=CHECK,V83A %s ; RUN: llc -mtriple=aarch64 -mattr=v9a -mattr=pauth-lr < %s | FileCheck --check-prefixes=PAUTHLR %s -define i32 @leaf(i32 %x) { +define i32 @leaf(i32 %x) "branch-protection-pauth-lr"="true" { ; CHECK-LABEL: leaf: ; CHECK: // %bb.0: ; CHECK-NEXT: ret @@ -36,7 +34,7 @@ define i32 @leaf(i32 %x) { ret i32 %x } -define i32 @leaf_sign_none(i32 %x) "sign-return-address"="none" { +define i32 @leaf_sign_none(i32 %x) "branch-protection-pauth-lr"="true" "sign-return-address"="none" { ; CHECK-LABEL: leaf_sign_none: ; CHECK: // %bb.0: ; CHECK-NEXT: ret @@ -47,7 +45,7 @@ define i32 @leaf_sign_none(i32 %x) "sign-return-address"="none" { ret i32 %x } -define i32 @leaf_sign_non_leaf(i32 %x) "sign-return-address"="non-leaf" { +define i32 @leaf_sign_non_leaf(i32 %x) "branch-protection-pauth-lr"="true" "sign-return-address"="non-leaf" { ; CHECK-LABEL: leaf_sign_non_leaf: ; CHECK: // %bb.0: ; CHECK-NEXT: ret @@ -58,7 +56,7 @@ define i32 @leaf_sign_non_leaf(i32 %x) "sign-return-address"="non-leaf" { ret i32 %x } -define i32 @leaf_sign_all(i32 %x) "sign-return-address"="all" { +define i32 @leaf_sign_all(i32 %x) "branch-protection-pauth-lr"="true" "sign-return-address"="all" { ; COMPAT-LABEL: leaf_sign_all: ; COMPAT: // %bb.0: ; COMPAT-NEXT: hint #39 @@ -89,7 +87,7 @@ define i32 @leaf_sign_all(i32 %x) "sign-return-address"="all" { ret i32 %x } -define i64 @leaf_clobbers_lr(i64 %x) "sign-return-address"="non-leaf" { +define i64 @leaf_clobbers_lr(i64 %x) "branch-protection-pauth-lr"="true" "sign-return-address"="non-leaf" { ; COMPAT-LABEL: leaf_clobbers_lr: ; COMPAT: // %bb.0: ; COMPAT-NEXT: hint #39 @@ -144,7 +142,7 @@ define i64 @leaf_clobbers_lr(i64 %x) "sign-return-address"="non-leaf" { declare i32 @foo(i32) -define i32 @non_leaf_sign_all(i32 %x) "sign-return-address"="all" { +define i32 @non_leaf_sign_all(i32 %x) "branch-protection-pauth-lr"="true" "sign-return-address"="all" { ; COMPAT-LABEL: non_leaf_sign_all: ; COMPAT: // %bb.0: ; COMPAT-NEXT: hint #39 @@ -191,7 +189,7 @@ define i32 @non_leaf_sign_all(i32 %x) "sign-return-address"="all" { ret i32 %call } -define i32 @non_leaf_sign_non_leaf(i32 %x) "sign-return-address"="non-leaf" { +define i32 @non_leaf_sign_non_leaf(i32 %x) "branch-protection-pauth-lr"="true" "sign-return-address"="non-leaf" { ; COMPAT-LABEL: non_leaf_sign_non_leaf: ; COMPAT: // %bb.0: ; COMPAT-NEXT: hint #39 @@ -239,7 +237,7 @@ define i32 @non_leaf_sign_non_leaf(i32 %x) "sign-return-address"="non-leaf" { } ; Should not use the RETAA instruction. -define i32 @non_leaf_scs(i32 %x) "sign-return-address"="non-leaf" shadowcallstack "target-features"="+v8.3a,+reserve-x18" { +define i32 @non_leaf_scs(i32 %x) "branch-protection-pauth-lr"="true" "sign-return-address"="non-leaf" shadowcallstack "target-features"="+v8.3a,+reserve-x18" { ; CHECK-LABEL: non_leaf_scs: ; CHECK: // %bb.0: ; CHECK-NEXT: str x30, [x18], #8 @@ -278,7 +276,7 @@ define i32 @non_leaf_scs(i32 %x) "sign-return-address"="non-leaf" shadowcallstac ret i32 %call } -define i32 @leaf_sign_all_v83(i32 %x) "sign-return-address"="all" "target-features"="+v8.3a" { +define i32 @leaf_sign_all_v83(i32 %x) "branch-protection-pauth-lr"="true" "sign-return-address"="all" "target-features"="+v8.3a" { ; CHECK-LABEL: leaf_sign_all_v83: ; CHECK: // %bb.0: ; CHECK-NEXT: hint #39 @@ -300,7 +298,7 @@ define i32 @leaf_sign_all_v83(i32 %x) "sign-return-address"="all" "target-featur declare fastcc i64 @bar(i64) -define fastcc void @spill_lr_and_tail_call(i64 %x) "sign-return-address"="all" { +define fastcc void @spill_lr_and_tail_call(i64 %x) "branch-protection-pauth-lr"="true" "sign-return-address"="all" { ; COMPAT-LABEL: spill_lr_and_tail_call: ; COMPAT: // %bb.0: ; COMPAT-NEXT: hint #39 @@ -356,7 +354,7 @@ define fastcc void @spill_lr_and_tail_call(i64 %x) "sign-return-address"="all" { ret void } -define i32 @leaf_sign_all_a_key(i32 %x) "sign-return-address"="all" "sign-return-address-key"="a_key" { +define i32 @leaf_sign_all_a_key(i32 %x) "branch-protection-pauth-lr"="true" "sign-return-address"="all" "sign-return-address-key"="a_key" { ; COMPAT-LABEL: leaf_sign_all_a_key: ; COMPAT: // %bb.0: ; COMPAT-NEXT: hint #39 @@ -387,7 +385,7 @@ define i32 @leaf_sign_all_a_key(i32 %x) "sign-return-address"="all" "sign-return ret i32 %x } -define i32 @leaf_sign_all_b_key(i32 %x) "sign-return-address"="all" "sign-return-address-key"="b_key" { +define i32 @leaf_sign_all_b_key(i32 %x) "branch-protection-pauth-lr"="true" "sign-return-address"="all" "sign-return-address-key"="b_key" { ; COMPAT-LABEL: leaf_sign_all_b_key: ; COMPAT: // %bb.0: ; COMPAT-NEXT: .cfi_b_key_frame @@ -421,7 +419,7 @@ define i32 @leaf_sign_all_b_key(i32 %x) "sign-return-address"="all" "sign-return ret i32 %x } -define i32 @leaf_sign_all_v83_b_key(i32 %x) "sign-return-address"="all" "target-features"="+v8.3a" "sign-return-address-key"="b_key" { +define i32 @leaf_sign_all_v83_b_key(i32 %x) "branch-protection-pauth-lr"="true" "sign-return-address"="all" "target-features"="+v8.3a" "sign-return-address-key"="b_key" { ; CHECK-LABEL: leaf_sign_all_v83_b_key: ; CHECK: // %bb.0: ; CHECK-NEXT: .cfi_b_key_frame @@ -444,7 +442,7 @@ define i32 @leaf_sign_all_v83_b_key(i32 %x) "sign-return-address"="all" "target- } ; Note that BTI instruction is not needed before PACIASP. -define i32 @leaf_sign_all_a_key_bti(i32 %x) "sign-return-address"="all" "sign-return-address-key"="a_key" "branch-target-enforcement"="true"{ +define i32 @leaf_sign_all_a_key_bti(i32 %x) "branch-protection-pauth-lr"="true" "sign-return-address"="all" "sign-return-address-key"="a_key" "branch-target-enforcement"="true" { ; COMPAT-LABEL: leaf_sign_all_a_key_bti: ; COMPAT: // %bb.0: ; COMPAT-NEXT: hint #34 @@ -479,7 +477,7 @@ define i32 @leaf_sign_all_a_key_bti(i32 %x) "sign-return-address"="all" "sign-re } ; Note that BTI instruction is not needed before PACIBSP. -define i32 @leaf_sign_all_b_key_bti(i32 %x) "sign-return-address"="all" "sign-return-address-key"="b_key" "branch-target-enforcement"="true"{ +define i32 @leaf_sign_all_b_key_bti(i32 %x) "branch-protection-pauth-lr"="true" "sign-return-address"="all" "sign-return-address-key"="b_key" "branch-target-enforcement"="true"{ ; COMPAT-LABEL: leaf_sign_all_b_key_bti: ; COMPAT: // %bb.0: ; COMPAT-NEXT: hint #34 @@ -517,7 +515,7 @@ define i32 @leaf_sign_all_b_key_bti(i32 %x) "sign-return-address"="all" "sign-re } ; Note that BTI instruction is not needed before PACIBSP. -define i32 @leaf_sign_all_v83_b_key_bti(i32 %x) "sign-return-address"="all" "target-features"="+v8.3a" "sign-return-address-key"="b_key" "branch-target-enforcement"="true" { +define i32 @leaf_sign_all_v83_b_key_bti(i32 %x) "branch-protection-pauth-lr"="true" "sign-return-address"="all" "target-features"="+v8.3a" "sign-return-address-key"="b_key" "branch-target-enforcement"="true" { ; CHECK-LABEL: leaf_sign_all_v83_b_key_bti: ; CHECK: // %bb.0: ; CHECK-NEXT: hint #34 diff --git a/llvm/test/CodeGen/AArch64/wineh-bti.ll b/llvm/test/CodeGen/AArch64/wineh-bti.ll index a73f4d219bc314..6e2d1e7d9b5d1f 100644 --- a/llvm/test/CodeGen/AArch64/wineh-bti.ll +++ b/llvm/test/CodeGen/AArch64/wineh-bti.ll @@ -1,6 +1,6 @@ ; RUN: llc < %s -mtriple=aarch64-windows -aarch64-min-jump-table-entries=4 | FileCheck %s -define dso_local i32 @func(i32 %in) { +define dso_local i32 @func(i32 %in) "sign-return-address"="non-leaf" "sign-return-address-key"="a_key" "branch-target-enforcement"="true" { entry: call void asm sideeffect "", "~{x19}"() switch i32 %in, label %def [ @@ -27,11 +27,6 @@ lbl4: ret i32 8 } -!llvm.module.flags = !{!0, !1} - -!0 = !{i32 8, !"branch-target-enforcement", i32 1} -!1 = !{i32 8, !"sign-return-address", i32 1} - ; CHECK-LABEL: func: ; CHECK-NEXT: .seh_proc func ; CHECK-NEXT: // %bb.0: diff --git a/llvm/test/CodeGen/AArch64/wineh-pac.ll b/llvm/test/CodeGen/AArch64/wineh-pac.ll index 85ef463c8c127a..797dd10d7e49de 100644 --- a/llvm/test/CodeGen/AArch64/wineh-pac.ll +++ b/llvm/test/CodeGen/AArch64/wineh-pac.ll @@ -1,20 +1,17 @@ ; RUN: llc < %s -mtriple=aarch64-windows | FileCheck %s -define dso_local i32 @func(ptr %g, i32 %a) { +define dso_local i32 @func(ptr %g, i32 %a) "sign-return-address"="non-leaf" "sign-return-address-key"="b_key" { entry: tail call void %g() #2 ret i32 %a } -define dso_local i32 @func2(ptr %g, i32 %a) "target-features"="+v8.3a" { +define dso_local i32 @func2(ptr %g, i32 %a) "sign-return-address"="non-leaf" "sign-return-address-key"="b_key" "target-features"="+v8.3a" { entry: tail call void %g() #2 ret i32 %a } -!llvm.module.flags = !{!0} - -!0 = !{i32 8, !"sign-return-address", i32 1} ; CHECK-LABEL: func: ; CHECK-NEXT: .seh_proc func diff --git a/llvm/test/CodeGen/ARM/setjmp-bti-basic.ll b/llvm/test/CodeGen/ARM/setjmp-bti-basic.ll index 41ba125ae5c150..dfcb73370cff3a 100644 --- a/llvm/test/CodeGen/ARM/setjmp-bti-basic.ll +++ b/llvm/test/CodeGen/ARM/setjmp-bti-basic.ll @@ -18,7 +18,7 @@ @buf = global [20 x i64] zeroinitializer, align 8 -define i32 @foo(i32 %x) { +define i32 @foo(i32 %x) "branch-target-enforcement"="true" { ; BTI-LABEL: foo: ; BTI: bl setjmp ; BTI-NEXT: bti @@ -45,6 +45,3 @@ declare i32 @setjmp(ptr) #0 attributes #0 = { returns_twice } -!llvm.module.flags = !{!0} - -!0 = !{i32 8, !"branch-target-enforcement", i32 1} diff --git a/llvm/test/CodeGen/ARM/setjmp-bti-outliner.ll b/llvm/test/CodeGen/ARM/setjmp-bti-outliner.ll index 2ff1a6df1f1ac2..6f261495583465 100644 --- a/llvm/test/CodeGen/ARM/setjmp-bti-outliner.ll +++ b/llvm/test/CodeGen/ARM/setjmp-bti-outliner.ll @@ -24,7 +24,7 @@ @buf = global [20 x i64] zeroinitializer, align 8 -define i32 @f(i32 %a, i32 %b, i32 %c, i32 %d) { +define i32 @f(i32 %a, i32 %b, i32 %c, i32 %d) "branch-target-enforcement"="true" { ; BTI-LABEL: f: ; BTI: bl OUTLINED_FUNCTION_0 ; BTI-NEXT: bti @@ -53,7 +53,7 @@ return: ; preds = %entry, %if.end ret i32 %retval.0 } -define i32 @g(i32 %a, i32 %b, i32 %c, i32 %d) { +define i32 @g(i32 %a, i32 %b, i32 %c, i32 %d) "branch-target-enforcement"="true" { ; BTI-LABEL: g: ; BTI: bl OUTLINED_FUNCTION_0 ; BTI-NEXT: bti @@ -87,6 +87,3 @@ declare i32 @setjmp(ptr) #0 attributes #0 = { returns_twice } -!llvm.module.flags = !{!0} - -!0 = !{i32 8, !"branch-target-enforcement", i32 1} diff --git a/llvm/test/CodeGen/Thumb2/bti-entry-blocks.ll b/llvm/test/CodeGen/Thumb2/bti-entry-blocks.ll index 1c89e60bc6a549..855940c1d4849e 100644 --- a/llvm/test/CodeGen/Thumb2/bti-entry-blocks.ll +++ b/llvm/test/CodeGen/Thumb2/bti-entry-blocks.ll @@ -1,6 +1,6 @@ ; RUN: llc < %s -mtriple=thumbv7m-arm-none-eabi | FileCheck %s -define hidden i32 @linkage_external() local_unnamed_addr { +define hidden i32 @linkage_external() local_unnamed_addr "branch-target-enforcement"="true" { ; CHECK-LABEL: linkage_external: ; CHECK: bti ; CHECK-NEXT: movs r0, #1 @@ -9,7 +9,7 @@ entry: ret i32 1 } -define internal i32 @linkage_internal() unnamed_addr { +define internal i32 @linkage_internal() unnamed_addr "branch-target-enforcement"="true" { ; CHECK-LABEL: linkage_internal: ; CHECK: bti ; CHECK: movs r0, #2 @@ -17,6 +17,3 @@ define internal i32 @linkage_internal() unnamed_addr { entry: ret i32 2 } - -!llvm.module.flags = !{!1} -!1 = !{i32 8, !"branch-target-enforcement", i32 1} diff --git a/llvm/test/CodeGen/Thumb2/bti-indirect-branches.ll b/llvm/test/CodeGen/Thumb2/bti-indirect-branches.ll index e541a9b944524c..cb698a96fc6bac 100644 --- a/llvm/test/CodeGen/Thumb2/bti-indirect-branches.ll +++ b/llvm/test/CodeGen/Thumb2/bti-indirect-branches.ll @@ -1,7 +1,7 @@ ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py ; RUN: llc < %s -mtriple=thumbv7m-arm-none-eabi | FileCheck %s -define internal i32 @table_switch(i32 %x) { +define internal i32 @table_switch(i32 %x) "branch-target-enforcement"="true" { ; CHECK-LABEL: table_switch: ; CHECK: @ %bb.0: @ %entry ; CHECK-NEXT: bti @@ -57,7 +57,7 @@ return: @computed_goto_cases = private unnamed_addr constant [2 x ptr] [ptr blockaddress(@computed_goto, %return), ptr blockaddress(@computed_goto, %case_1)], align 4 -define internal i32 @computed_goto(i32 %x) { +define internal i32 @computed_goto(i32 %x) "branch-target-enforcement"="true" { ; CHECK-LABEL: computed_goto: ; CHECK: @ %bb.0: @ %entry ; CHECK-NEXT: bti @@ -92,7 +92,7 @@ declare void @may_throw() declare void @consume_exception(ptr) declare i32 @__gxx_personality_v0(...) -define internal i32 @exception_handling(i32 %0) personality ptr @__gxx_personality_v0 { +define internal i32 @exception_handling(i32 %0) "branch-target-enforcement"="true" personality ptr @__gxx_personality_v0 { ; CHECK-LABEL: exception_handling: ; CHECK: @ %bb.0: ; CHECK-NEXT: bti @@ -125,6 +125,3 @@ return: %retval.0 = phi i32 [ 1, %lpad ], [ 0, %entry ] ret i32 %retval.0 } - -!llvm.module.flags = !{!1} -!1 = !{i32 8, !"branch-target-enforcement", i32 1} diff --git a/llvm/test/CodeGen/Thumb2/bti-outliner-2.ll b/llvm/test/CodeGen/Thumb2/bti-outliner-2.ll index 5492b96439a614..936ac28996f319 100644 --- a/llvm/test/CodeGen/Thumb2/bti-outliner-2.ll +++ b/llvm/test/CodeGen/Thumb2/bti-outliner-2.ll @@ -10,7 +10,7 @@ @e = hidden global i32 0, align 4 @f = hidden global i32 0, align 4 -define hidden i32 @x(i32 %p) local_unnamed_addr #0 { +define hidden i32 @x(i32 %p) local_unnamed_addr #2 { entry: %0 = load volatile i32, ptr @a, align 4 %1 = load volatile i32, ptr @b, align 4 @@ -73,10 +73,6 @@ entry: ; CHECK-LABEL: OUTLINED_FUNCTION_0: ; CHECK: bti -attributes #0 = { minsize nofree norecurse nounwind optsize } attributes #1 = { minsize nofree norecurse nounwind optsize "branch-target-enforcement"="false" } attributes #2 = { minsize nofree norecurse nounwind optsize "branch-target-enforcement"="true" } -!llvm.module.flags = !{!0} - -!0 = !{i32 8, !"branch-target-enforcement", i32 1} diff --git a/llvm/test/CodeGen/Thumb2/bti-outliner-cost-2.ll b/llvm/test/CodeGen/Thumb2/bti-outliner-cost-2.ll index cf1d8170e37ebf..87c66a7fc22467 100644 --- a/llvm/test/CodeGen/Thumb2/bti-outliner-cost-2.ll +++ b/llvm/test/CodeGen/Thumb2/bti-outliner-cost-2.ll @@ -44,8 +44,4 @@ entry: ; CHECK-NOT: OUTLINED_FUNCTION -attributes #0 = { minsize nofree norecurse nounwind optsize } - -!llvm.module.flags = !{!0} - -!0 = !{i32 8, !"branch-target-enforcement", i32 1} +attributes #0 = { minsize nofree norecurse nounwind optsize "branch-target-enforcement"="true" } \ No newline at end of file diff --git a/llvm/test/CodeGen/Thumb2/bti-pac-replace-1.mir b/llvm/test/CodeGen/Thumb2/bti-pac-replace-1.mir index 609dc72e258f88..a25793cdb3e2d2 100644 --- a/llvm/test/CodeGen/Thumb2/bti-pac-replace-1.mir +++ b/llvm/test/CodeGen/Thumb2/bti-pac-replace-1.mir @@ -3,7 +3,7 @@ target datalayout = "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64" target triple = "thumbv8.1m.main-arm-unknown-eabi" - define hidden i32 @_Z1fi(i32 %x) { + define hidden i32 @_Z1fi(i32 %x) "sign-return-address"="non-leaf" "sign-return-address-key"="a_key" "branch-target-enforcement"="true" { entry: %add = add nsw i32 %x, 1 %call = tail call i32 @_Z1gi(i32 %add) @@ -13,12 +13,6 @@ declare dso_local i32 @_Z1gi(i32) - !llvm.module.flags = !{!0, !1, !2} - - !0 = !{i32 8, !"branch-target-enforcement", i32 1} - !1 = !{i32 8, !"sign-return-address", i32 1} - !2 = !{i32 8, !"sign-return-address-all", i32 0} - ... --- name: _Z1fi diff --git a/llvm/test/CodeGen/Thumb2/bti-pac-replace-2.ll b/llvm/test/CodeGen/Thumb2/bti-pac-replace-2.ll index ee497433551f9b..523dffb9f09b93 100644 --- a/llvm/test/CodeGen/Thumb2/bti-pac-replace-2.ll +++ b/llvm/test/CodeGen/Thumb2/bti-pac-replace-2.ll @@ -3,7 +3,7 @@ target datalayout = "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64" target triple = "thumbv8.1m.main-arm-unknown-eabi" -define hidden i32 @_Z1fi(i32 %x) { +define hidden i32 @_Z1fi(i32 %x) "sign-return-address"="non-leaf" "sign-return-address-key"="a_key" "branch-target-enforcement"="true" { entry: %add = add nsw i32 %x, 1 %call = tail call i32 @_Z1gi(i32 %add) @@ -13,11 +13,6 @@ entry: declare dso_local i32 @_Z1gi(i32) -!llvm.module.flags = !{!0, !1, !2} -!0 = !{i32 8, !"branch-target-enforcement", i32 1} -!1 = !{i32 8, !"sign-return-address", i32 1} -!2 = !{i32 8, !"sign-return-address-all", i32 0} - ; Check the function starts with `pacbti` and correct unwind info is emitted ; CHECK-LABEL: _Z1fi: ; ... diff --git a/llvm/test/CodeGen/Thumb2/jump-table-bti.ll b/llvm/test/CodeGen/Thumb2/jump-table-bti.ll index b54bffc837e0e5..d4e16341bf719c 100644 --- a/llvm/test/CodeGen/Thumb2/jump-table-bti.ll +++ b/llvm/test/CodeGen/Thumb2/jump-table-bti.ll @@ -6,17 +6,17 @@ ;; Expect to see a range check whenever there is BTI, and not where there ;; isn't. -; RUN: sed s/SPACE/4/ %s | llc -mtriple=thumbv8.1m.main-linux-gnu -mattr=+pacbti -o - | FileCheck %s --check-prefix=BTI-TBB +; RUN: sed s/SPACE/4/ %s | sed '/test_jumptable/s/{/#1 {/' | llc -mtriple=thumbv8.1m.main-linux-gnu -mattr=+pacbti -o - | FileCheck %s --check-prefix=BTI-TBB ; RUN: sed s/SPACE/4/ %s | sed '/test_jumptable/s/{/#0 {/' | llc -mtriple=thumbv8.1m.main-linux-gnu -mattr=+pacbti -o - | FileCheck %s --check-prefix=NOBTI-TBB ; RUN: sed s/SPACE/4/ %s | sed '/^..for-non-bti-build-sed-will-delete-everything-after-this-line/q' | llc -mtriple=thumbv8.1m.main-linux-gnu -mattr=+pacbti -o - | FileCheck %s --check-prefix=NOBTI-TBB ; RUN: sed s/SPACE/4/ %s | sed '/test_jumptable/s/{/#1 {/' | sed '/^..for-non-bti-build-sed-will-delete-everything-after-this-line/q' | llc -mtriple=thumbv8.1m.main-linux-gnu -mattr=+pacbti -o - | FileCheck %s --check-prefix=BTI-TBB -; RUN: sed s/SPACE/400/ %s | llc -mtriple=thumbv8.1m.main-linux-gnu -mattr=+pacbti -o - | FileCheck %s --check-prefix=BTI-TBH +; RUN: sed s/SPACE/400/ %s | sed '/test_jumptable/s/{/#1 {/' | llc -mtriple=thumbv8.1m.main-linux-gnu -mattr=+pacbti -o - | FileCheck %s --check-prefix=BTI-TBH ; RUN: sed s/SPACE/400/ %s | sed '/test_jumptable/s/{/#0 {/' | llc -mtriple=thumbv8.1m.main-linux-gnu -mattr=+pacbti -o - | FileCheck %s --check-prefix=NOBTI-TBH ; RUN: sed s/SPACE/400/ %s | sed '/^..for-non-bti-build-sed-will-delete-everything-after-this-line/q' | llc -mtriple=thumbv8.1m.main-linux-gnu -mattr=+pacbti -o - | FileCheck %s --check-prefix=NOBTI-TBH ; RUN: sed s/SPACE/400/ %s | sed '/test_jumptable/s/{/#1 {/' | sed '/^..for-non-bti-build-sed-will-delete-everything-after-this-line/q' | llc -mtriple=thumbv8.1m.main-linux-gnu -mattr=+pacbti -o - | FileCheck %s --check-prefix=BTI-TBH -; RUN: sed s/SPACE/400000/ %s | llc -mtriple=thumbv8.1m.main-linux-gnu -mattr=+pacbti -o - | FileCheck %s --check-prefix=BTI-MOV +; RUN: sed s/SPACE/400000/ %s | sed '/test_jumptable/s/{/#1 {/' | llc -mtriple=thumbv8.1m.main-linux-gnu -mattr=+pacbti -o - | FileCheck %s --check-prefix=BTI-MOV ; RUN: sed s/SPACE/400000/ %s | sed '/test_jumptable/s/{/#0 {/' | llc -mtriple=thumbv8.1m.main-linux-gnu -mattr=+pacbti -o - | FileCheck %s --check-prefix=NOBTI-MOV ; RUN: sed s/SPACE/400000/ %s | sed '/^..for-non-bti-build-sed-will-delete-everything-after-this-line/q' | llc -mtriple=thumbv8.1m.main-linux-gnu -mattr=+pacbti -o - | FileCheck %s --check-prefix=NOBTI-MOV ; RUN: sed s/SPACE/400000/ %s | sed '/test_jumptable/s/{/#1 {/' | sed '/^..for-non-bti-build-sed-will-delete-everything-after-this-line/q' | llc -mtriple=thumbv8.1m.main-linux-gnu -mattr=+pacbti -o - | FileCheck %s --check-prefix=BTI-MOV diff --git a/llvm/test/CodeGen/Thumb2/pacbti-m-unsupported-arch.ll b/llvm/test/CodeGen/Thumb2/pacbti-m-unsupported-arch.ll index b9daac7d18f7b9..48b4de1a6e1f9b 100644 --- a/llvm/test/CodeGen/Thumb2/pacbti-m-unsupported-arch.ll +++ b/llvm/test/CodeGen/Thumb2/pacbti-m-unsupported-arch.ll @@ -22,10 +22,4 @@ entry: ; CHECK-PACBTI: pacbti declare dso_local i32 @g(i32) -attributes #0 = { noinline nounwind } - -!llvm.module.flags = !{!0, !1, !2} - -!0 = !{i32 8, !"branch-target-enforcement", i32 1} -!1 = !{i32 8, !"sign-return-address", i32 1} -!2 = !{i32 8, !"sign-return-address-all", i32 0} +attributes #0 = { noinline nounwind "sign-return-address"="non-leaf" "branch-target-enforcement"="true" } diff --git a/llvm/test/LTO/AArch64/link-branch-target-enforcement.ll b/llvm/test/LTO/AArch64/link-branch-target-enforcement.ll index ccf8cf67ede6dc..b3c9828cb645ac 100644 --- a/llvm/test/LTO/AArch64/link-branch-target-enforcement.ll +++ b/llvm/test/LTO/AArch64/link-branch-target-enforcement.ll @@ -16,7 +16,7 @@ target triple = "aarch64-unknown-linux-gnu" declare i32 @foo(); -define i32 @main() { +define i32 @main() "sign-return-address"="non-leaf" "sign-return-address-key"="a_key" { entry: %add = call i32 @foo() ret i32 %add