[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.

diff --git a/llvm/test/CodeGen/X86/fentry-ibt.ll b/llvm/test/CodeGen/X86/fentry-ibt.ll
index 5ab84ae9743c0611c0f50fbf6855917da99d5dc0..dc661b61ddfcdf424431fbf7bc142e29d6660008 100644 (file)
--- 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 c60d7486db24384a571dc0e6057589e010e43632..48b9855a8ba62493f7949984c4c6adb56245f149 100644 (file)
--- 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 822376c2284d2c75f242275ed71d745c009a1332..8403d4b754d80e494139fe7f3317d7c743ec5296 100644 (file)
--- 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 8fab07e615404e21bafc6ca855f732bc55c2bdf3..64d44d9711cb4cf1ccd08c237253a776eff22974 100644 (file)
--- 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 9ddabaa24cd4d286c766f108ccd9bbb10e5d1da6..c9978d64f1c97c889f9c3649cb960bfe6493b03b 100644 (file)
--- 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 402063bbbe3351febefe58a4c1d765b5b7b69515..d4b0ed3aae69b326be4af5bfd2e2e0c2ea076ccf 100644 (file)
--- 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 41990ddbe479ed11a30a2a28b8e7eb2c34c1ec4b..d6c6edea55e142e0fc07474484da01725d9c68ac 100644 (file)
--- 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 ea5ec9609d2febc73fd03283b0de7716067868d0..fe4a9c7e7e7425cc5c2ef84a58c21ac4be6c9d67 100644 (file)
--- 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 b22b159abdb0e5694b110393b3d64a1cd68831c7..9d1db9cd6b083e753e66049d276259c5464e2f1d 100644 (file)
--- 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 d8a58da3013d3e118baa08fee333e79ad8dedc5e..bf0a00732b88a14db2372dcc706dbfcafacdf59b 100644 (file)
--- 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 9536ba1dbc23c74d1992dfa792b181929ae8a66b..842b1fa949fe2201474313ab62dbe9fcced559d7 100644 (file)
--- 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