diff options
Diffstat (limited to 'llvm/test/tools/llvm-cfi-verify/X86')
7 files changed, 11 insertions, 8 deletions
diff --git a/llvm/test/tools/llvm-cfi-verify/X86/blacklist-expected-unprotected.s b/llvm/test/tools/llvm-cfi-verify/X86/blacklist-expected-unprotected.s index c7a3daa0776..dccbd691812 100644 --- a/llvm/test/tools/llvm-cfi-verify/X86/blacklist-expected-unprotected.s +++ b/llvm/test/tools/llvm-cfi-verify/X86/blacklist-expected-unprotected.s @@ -3,7 +3,7 @@ # RUN: echo "src:*tiny*" > %t.blacklist.txt # RUN: llvm-cfi-verify %t.o %t.blacklist.txt | FileCheck %s -# CHECK-LABEL: U +# CHECK-LABEL: {{^Instruction: .* \(FAIL_BAD_CONDITIONAL_BRANCH\)}} # CHECK-NEXT: tiny.cc:11 # CHECK-NEXT: {{^Blacklist Match:.*blacklist\.txt:1$}} # CHECK-NEXT: ====> Expected Unprotected diff --git a/llvm/test/tools/llvm-cfi-verify/X86/blacklist-match-fun.s b/llvm/test/tools/llvm-cfi-verify/X86/blacklist-match-fun.s index f46fb926c5f..21e1ffe7c5c 100644 --- a/llvm/test/tools/llvm-cfi-verify/X86/blacklist-match-fun.s +++ b/llvm/test/tools/llvm-cfi-verify/X86/blacklist-match-fun.s @@ -3,7 +3,7 @@ # RUN: echo "fun:*main*" > %t.blacklist.txt # RUN: llvm-cfi-verify %t.o %t.blacklist.txt | FileCheck %s -# CHECK-LABEL: U +# CHECK-LABEL: {{^Instruction: .* \(FAIL_BAD_CONDITIONAL_BRANCH\)}} # CHECK-NEXT: tiny.cc:11 # CHECK-NEXT: {{^Blacklist Match:.*blacklist\.txt:1$}} # CHECK-NEXT: ====> Expected Unprotected diff --git a/llvm/test/tools/llvm-cfi-verify/X86/blacklist-unexpected-protected.s b/llvm/test/tools/llvm-cfi-verify/X86/blacklist-unexpected-protected.s index 0fd412416a9..2a32e78c8df 100644 --- a/llvm/test/tools/llvm-cfi-verify/X86/blacklist-unexpected-protected.s +++ b/llvm/test/tools/llvm-cfi-verify/X86/blacklist-unexpected-protected.s @@ -3,7 +3,7 @@ # RUN: echo "src:*tiny*" > %t.blacklist.txt # RUN: llvm-cfi-verify %t.o %t.blacklist.txt | FileCheck %s -# CHECK-LABEL: P +# CHECK-LABEL: {{^Instruction: .* \(PROTECTED\)}} # CHECK-NEXT: tiny.cc:11 # CHECK-NEXT: {{^Blacklist Match:.*blacklist\.txt:1$}} # CHECK-NEXT: ====> Unexpected Protected diff --git a/llvm/test/tools/llvm-cfi-verify/X86/dot-printing.s b/llvm/test/tools/llvm-cfi-verify/X86/dot-printing.s index 5e0a2090d82..789f1727e89 100644 --- a/llvm/test/tools/llvm-cfi-verify/X86/dot-printing.s +++ b/llvm/test/tools/llvm-cfi-verify/X86/dot-printing.s @@ -3,14 +3,15 @@ # RUN: llvm-cfi-verify -print-graphs %t.o | FileCheck %s # The expected output is as follows: -# P 0x7b | callq *%rax +# ----------------- Begin Instruction ----------------- +# PROTECTED 0x7b: callq *%rax # digraph graph_0x7b { # "0x77: jbe 2" -> "0x7b: callq *%rax" # "0x77: jbe 2" -> "0x79: ud2" # } # 0x7b = tiny.cc:11:3 (main) -# CHECK: {{^P.*callq +\*%rax.*$}} +# CHECK-LABEL: {{^Instruction: .* \(PROTECTED\):.*callq +\*%rax}} # CHECK-NEXT: digraph # CHECK-NEXT: {{^.*jbe.*->.*callq \*%rax}} # CHECK-NEXT: {{^.*jbe.*->.*ud2}} diff --git a/llvm/test/tools/llvm-cfi-verify/X86/indirect-cf-elimination.s b/llvm/test/tools/llvm-cfi-verify/X86/indirect-cf-elimination.s index e9b873471cb..be5217e02e8 100644 --- a/llvm/test/tools/llvm-cfi-verify/X86/indirect-cf-elimination.s +++ b/llvm/test/tools/llvm-cfi-verify/X86/indirect-cf-elimination.s @@ -1,5 +1,5 @@ # RUN: llvm-mc %s -filetype obj -triple x86_64-linux-elf -o %t.o -# RUN: llvm-cfi-verify %t.o 2>&1 | FileCheck %s +# RUN: llvm-cfi-verify %t.o 2>&1 --summarize | FileCheck %s # This is the same file as protected-lineinfo.s, however contains a hand- # assembled function (fake_function) that has no line table information @@ -10,6 +10,8 @@ # reporting of the cfi-verify program. It should only find a single indirect CF # instruction at `tiny.cc:11` (see protected-lineinfo.s for the source). +# CHECK-NOT: Begin Instruction + # CHECK: Expected Protected: 1 (100.00%) # CHECK: Unexpected Protected: 0 (0.00%) # CHECK: Expected Unprotected: 0 (0.00%) diff --git a/llvm/test/tools/llvm-cfi-verify/X86/protected-lineinfo.s b/llvm/test/tools/llvm-cfi-verify/X86/protected-lineinfo.s index 8eaf2e5e725..f1d0be1ed96 100644 --- a/llvm/test/tools/llvm-cfi-verify/X86/protected-lineinfo.s +++ b/llvm/test/tools/llvm-cfi-verify/X86/protected-lineinfo.s @@ -2,7 +2,7 @@ # RUN: -triple x86_64-linux-elf -o %t.o # RUN: llvm-cfi-verify %t.o | FileCheck %s -# CHECK-LABEL: P +# CHECK-LABEL: {{^Instruction: .* \(PROTECTED\)}} # CHECK-NEXT: tiny.cc:11 # CHECK: Expected Protected: 1 (100.00%) diff --git a/llvm/test/tools/llvm-cfi-verify/X86/unprotected-lineinfo.s b/llvm/test/tools/llvm-cfi-verify/X86/unprotected-lineinfo.s index 65782cb5e42..687ceb558e5 100644 --- a/llvm/test/tools/llvm-cfi-verify/X86/unprotected-lineinfo.s +++ b/llvm/test/tools/llvm-cfi-verify/X86/unprotected-lineinfo.s @@ -2,7 +2,7 @@ # RUN: -triple x86_64-linux-elf -o %t.o # RUN: llvm-cfi-verify %t.o | FileCheck %s -# CHECK-LABEL: U +# CHECK-LABEL: {{^Instruction: .* \(FAIL_BAD_CONDITIONAL_BRANCH\)}} # CHECK-NEXT: tiny.cc:11 # CHECK: Expected Protected: 0 (0.00%) |
