[llvm] ad94b5c - [X86][test] Use Min behavior for "cf-protection-{branch,return}" tests
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Tue Jul 19 21:26:01 PDT 2022
Author: Fangrui Song
Date: 2022-07-19T21:25:55-07:00
New Revision: ad94b5c54f82e7bddc4253ccbf0bdaa9442411cf
URL: https://github.com/llvm/llvm-project/commit/ad94b5c54f82e7bddc4253ccbf0bdaa9442411cf
DIFF: https://github.com/llvm/llvm-project/commit/ad94b5c54f82e7bddc4253ccbf0bdaa9442411cf.diff
LOG: [X86][test] Use Min behavior for "cf-protection-{branch,return}" tests
The behavior does not match that much. Min is the new Clang codegen behavior
since D130065.
Added:
Modified:
llvm/test/CodeGen/X86/fentry-ibt.ll
llvm/test/CodeGen/X86/indirect-branch-tracking-cm-lager.ll
llvm/test/CodeGen/X86/indirect-branch-tracking-eh.ll
llvm/test/CodeGen/X86/indirect-branch-tracking-eh2.ll
llvm/test/CodeGen/X86/indirect-branch-tracking-r2.ll
llvm/test/CodeGen/X86/indirect-branch-tracking.ll
llvm/test/CodeGen/X86/nocf_check.ll
llvm/test/CodeGen/X86/note-cet-property.ll
llvm/test/CodeGen/X86/patchable-function-entry-ibt.ll
llvm/test/CodeGen/X86/shadow-stack.ll
llvm/test/CodeGen/X86/sjlj-shadow-stack-liveness.mir
Removed:
################################################################################
diff --git a/llvm/test/CodeGen/X86/fentry-ibt.ll b/llvm/test/CodeGen/X86/fentry-ibt.ll
index 5ab84ae9743c0..dc661b61ddfcd 100644
--- a/llvm/test/CodeGen/X86/fentry-ibt.ll
+++ b/llvm/test/CodeGen/X86/fentry-ibt.ll
@@ -14,4 +14,4 @@ entry:
!llvm.module.flags = !{!0}
attributes #0 = { "fentry-call"="true" }
-!0 = !{i32 4, !"cf-protection-branch", i32 1}
+!0 = !{i32 8, !"cf-protection-branch", i32 1}
diff --git a/llvm/test/CodeGen/X86/indirect-branch-tracking-cm-lager.ll b/llvm/test/CodeGen/X86/indirect-branch-tracking-cm-lager.ll
index c60d7486db243..48b9855a8ba62 100644
--- a/llvm/test/CodeGen/X86/indirect-branch-tracking-cm-lager.ll
+++ b/llvm/test/CodeGen/X86/indirect-branch-tracking-cm-lager.ll
@@ -31,6 +31,6 @@ entry:
!llvm.module.flags = !{!0, !1, !2, !3}
!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{i32 4, !"cf-protection-return", i32 1}
-!2 = !{i32 4, !"cf-protection-branch", i32 1}
+!1 = !{i32 8, !"cf-protection-return", i32 1}
+!2 = !{i32 8, !"cf-protection-branch", i32 1}
!3 = !{i32 1, !"Code Model", i32 4}
diff --git a/llvm/test/CodeGen/X86/indirect-branch-tracking-eh.ll b/llvm/test/CodeGen/X86/indirect-branch-tracking-eh.ll
index 822376c2284d2..8403d4b754d80 100644
--- a/llvm/test/CodeGen/X86/indirect-branch-tracking-eh.ll
+++ b/llvm/test/CodeGen/X86/indirect-branch-tracking-eh.ll
@@ -91,4 +91,4 @@ try.cont:
!llvm.module.flags = !{!0}
-!0 = !{i32 4, !"cf-protection-branch", i32 1}
+!0 = !{i32 8, !"cf-protection-branch", i32 1}
diff --git a/llvm/test/CodeGen/X86/indirect-branch-tracking-eh2.ll b/llvm/test/CodeGen/X86/indirect-branch-tracking-eh2.ll
index 8fab07e615404..64d44d9711cb4 100644
--- a/llvm/test/CodeGen/X86/indirect-branch-tracking-eh2.ll
+++ b/llvm/test/CodeGen/X86/indirect-branch-tracking-eh2.ll
@@ -143,5 +143,5 @@ declare dso_local void @__cxa_end_catch()
!llvm.module.flags = !{!0, !1, !2}
!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{i32 4, !"cf-protection-return", i32 1}
-!2 = !{i32 4, !"cf-protection-branch", i32 1}
+!1 = !{i32 8, !"cf-protection-return", i32 1}
+!2 = !{i32 8, !"cf-protection-branch", i32 1}
diff --git a/llvm/test/CodeGen/X86/indirect-branch-tracking-r2.ll b/llvm/test/CodeGen/X86/indirect-branch-tracking-r2.ll
index 9ddabaa24cd4d..c9978d64f1c97 100644
--- a/llvm/test/CodeGen/X86/indirect-branch-tracking-r2.ll
+++ b/llvm/test/CodeGen/X86/indirect-branch-tracking-r2.ll
@@ -72,5 +72,5 @@ attributes #1 = { returns_twice }
!llvm.module.flags = !{!0, !1, !2}
!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{i32 4, !"cf-protection-return", i32 1}
-!2 = !{i32 4, !"cf-protection-branch", i32 1}
+!1 = !{i32 8, !"cf-protection-return", i32 1}
+!2 = !{i32 8, !"cf-protection-branch", i32 1}
diff --git a/llvm/test/CodeGen/X86/indirect-branch-tracking.ll b/llvm/test/CodeGen/X86/indirect-branch-tracking.ll
index 402063bbbe335..d4b0ed3aae69b 100644
--- a/llvm/test/CodeGen/X86/indirect-branch-tracking.ll
+++ b/llvm/test/CodeGen/X86/indirect-branch-tracking.ll
@@ -220,4 +220,4 @@ try.cont:
!llvm.module.flags = !{!0}
-!0 = !{i32 4, !"cf-protection-branch", i32 1}
+!0 = !{i32 8, !"cf-protection-branch", i32 1}
diff --git a/llvm/test/CodeGen/X86/nocf_check.ll b/llvm/test/CodeGen/X86/nocf_check.ll
index 41990ddbe479e..d6c6edea55e14 100644
--- a/llvm/test/CodeGen/X86/nocf_check.ll
+++ b/llvm/test/CodeGen/X86/nocf_check.ll
@@ -49,4 +49,4 @@ attributes #2 = { nocf_check }
!llvm.module.flags = !{!0}
-!0 = !{i32 4, !"cf-protection-branch", i32 1}
+!0 = !{i32 8, !"cf-protection-branch", i32 1}
diff --git a/llvm/test/CodeGen/X86/note-cet-property.ll b/llvm/test/CodeGen/X86/note-cet-property.ll
index ea5ec9609d2fe..fe4a9c7e7e742 100644
--- a/llvm/test/CodeGen/X86/note-cet-property.ll
+++ b/llvm/test/CodeGen/X86/note-cet-property.ll
@@ -29,5 +29,5 @@
!llvm.module.flags = !{!0, !1}
-!0 = !{i32 4, !"cf-protection-return", i32 1}
-!1 = !{i32 4, !"cf-protection-branch", i32 1}
+!0 = !{i32 8, !"cf-protection-return", i32 1}
+!1 = !{i32 8, !"cf-protection-branch", i32 1}
diff --git a/llvm/test/CodeGen/X86/patchable-function-entry-ibt.ll b/llvm/test/CodeGen/X86/patchable-function-entry-ibt.ll
index b22b159abdb0e..9d1db9cd6b083 100644
--- a/llvm/test/CodeGen/X86/patchable-function-entry-ibt.ll
+++ b/llvm/test/CodeGen/X86/patchable-function-entry-ibt.ll
@@ -85,4 +85,4 @@ entry:
!llvm.module.flags = !{!0}
-!0 = !{i32 4, !"cf-protection-branch", i32 1}
+!0 = !{i32 8, !"cf-protection-branch", i32 1}
diff --git a/llvm/test/CodeGen/X86/shadow-stack.ll b/llvm/test/CodeGen/X86/shadow-stack.ll
index d8a58da3013d3..bf0a00732b88a 100644
--- a/llvm/test/CodeGen/X86/shadow-stack.ll
+++ b/llvm/test/CodeGen/X86/shadow-stack.ll
@@ -235,4 +235,4 @@ declare i32 @llvm.eh.sjlj.setjmp(ptr)
!llvm.module.flags = !{!0}
-!0 = !{i32 4, !"cf-protection-return", i32 1}
+!0 = !{i32 8, !"cf-protection-return", i32 1}
diff --git a/llvm/test/CodeGen/X86/sjlj-shadow-stack-liveness.mir b/llvm/test/CodeGen/X86/sjlj-shadow-stack-liveness.mir
index 9536ba1dbc23c..842b1fa949fe2 100644
--- a/llvm/test/CodeGen/X86/sjlj-shadow-stack-liveness.mir
+++ b/llvm/test/CodeGen/X86/sjlj-shadow-stack-liveness.mir
@@ -6,7 +6,7 @@
!llvm.module.flags = !{!0}
- !0 = !{i32 4, !"cf-protection-return", i32 1}
+ !0 = !{i32 8, !"cf-protection-return", i32 1}
...
---
name: bar
More information about the llvm-commits
mailing list