[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.
llvm · Jul 20, 2022 · ad94b5c · ad94b5c
1 parent 23ba688
commit ad94b5c
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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