[BOLT] Remove unnecessary script, and rewrite unit test using it

- the checks that match_dwarf.py helped with can also be done using BOLT
  logs.
- rewrote the negate-ra-state.s test to only rely on logs to verify
  correct OpNegateRAState CFI generation.

Author: bgergely0

bolt/test/AArch64/negate-ra-state.s

@@ -1,42 +1,76 @@
+# Checking that .cfi-negate_ra_state directives are emitted in the same location as in the input in the case of no optimizations.
+
 # RUN: llvm-mc -filetype=obj -triple aarch64-unknown-unknown %s -o %t.o
 # RUN: %clang %cflags  %t.o -o %t.exe -Wl,-q
+# RUN: llvm-bolt %t.exe -o %t.exe.bolt --no-threads --print-all | FileCheck %s --check-prefix=CHECK-BOLT
+
+# Check that the negate-ra-state at the start of bar is not discarded.
+# If it was discarded, MarkRAState would report bar as having inconsistent RAStates.
+# CHECK-BOLT-NOT: BOLT-INFO: inconsistent RAStates in function foo
+# CHECK-BOLT-NOT: BOLT-INFO: inconsistent RAStates in function bar
+
+# Check that OpNegateRAState CFIs are generated correctly.
+# CHECK-BOLT: Binary Function "foo" after insert-negate-ra-state-pass {
+# CHECK-BOLT:         paciasp
+# CHECK-BOLT-NEXT:    OpNegateRAState
+
+# CHECK-BOLT:      DWARF CFI Instructions:
+# CHECK-BOLT-NEXT:     0:  OpNegateRAState
+# CHECK-BOLT-NEXT: End of Function "foo"
+
+# CHECK-BOLT: Binary Function "bar" after insert-negate-ra-state-pass {
+# CHECK-BOLT:         OpNegateRAState
+# CHECK-BOLT-NEXT:    mov     x1, #0x0
+# CHECK-BOLT-NEXT:    mov     x1, #0x1
+# CHECK-BOLT-NEXT:    autiasp
+# CHECK-BOLT-NEXT:    OpNegateRAState
+# CHECK-BOLT-NEXT:    ret
 
-# RUN: llvm-objdump %t.exe -d > %t.exe.dump
-# RUN: llvm-objdump --dwarf=frames %t.exe > %t.exe.dump-dwarf
-# RUN: match-dwarf %t.exe.dump %t.exe.dump-dwarf foo > %t.match-dwarf.txt
+# CHECK-BOLT:     DWARF CFI Instructions:
+# CHECK-BOLT-NEXT:     0:  OpNegateRAState
+# CHECK-BOLT-NEXT:     1:  OpNegateRAState
+# CHECK-BOLT-NEXT: End of Function "bar"
 
-# RUN: llvm-bolt %t.exe -o %t.exe.bolt
+# End of negate-ra-state insertion logs for foo and bar.
+# CHECK: Binary Function "_start" after insert-negate-ra-state-pass {
 
-# RUN: llvm-objdump %t.exe.bolt -d > %t.exe.bolt.dump
-# RUN: llvm-objdump --dwarf=frames %t.exe.bolt  > %t.exe.bolt.dump-dwarf
-# RUN: match-dwarf %t.exe.bolt.dump %t.exe.bolt.dump-dwarf foo > %t.bolt.match-dwarf.txt
+# Check that the functions are in the new .text section
+# RUN: llvm-objdump %t.exe.bolt -d -j .text | FileCheck %s --check-prefix=CHECK-OBJDUMP
+# CHECK-OBJDUMP: <foo>:
+# CHECK-OBJDUMP: <bar>:
 
-# RUN: diff %t.match-dwarf.txt %t.bolt.match-dwarf.txt
 
-	.text
-	.globl	foo
-	.p2align	2
-	.type	foo,@function
+  .text
+  .globl  foo
+  .p2align        2
+  .type   foo,@function
 foo:
-	.cfi_startproc
-	hint	#25
-	.cfi_negate_ra_state
-	sub	sp, sp, #16
-	stp	x29, x30, [sp, #16]             // 16-byte Folded Spill
-	.cfi_def_cfa_offset 16
-	str	w0, [sp, #12]
-	ldr	w8, [sp, #12]
-	add	w0, w8, #1
-	ldp	x29, x30, [sp, #16]             // 16-byte Folded Reload
-	add	sp, sp, #16
-	hint	#29
-	.cfi_negate_ra_state
-	ret
-.Lfunc_end1:
-	.size	foo, .Lfunc_end1-foo
-	.cfi_endproc
-
-	.global _start
-	.type _start, %function
+  .cfi_startproc
+  paciasp
+  .cfi_negate_ra_state
+  mov x1, #0
+  b bar
+  .cfi_endproc
+  .size   foo, .-foo
+
+
+
+  .text
+  .globl  bar
+  .p2align        2
+  .type   bar,@function
+bar:
+  .cfi_startproc
+  .cfi_negate_ra_state    // Indicating that RA is signed from the start of bar.
+  mov x1, #0
+  mov x1, #1
+  autiasp
+  .cfi_negate_ra_state
+  ret
+  .cfi_endproc
+  .size   bar, .-bar
+
+  .global _start
+  .type _start, %function
 _start:
-	b foo
+  b foo

bolt/test/lit.cfg.py

@@ -100,7 +100,6 @@
 config.substitutions.append(("%cxxflags", ""))
 
 link_fdata_cmd = os.path.join(config.test_source_root, "link_fdata.py")
-match_dwarf_cmd = os.path.join(config.test_source_root, "match_dwarf.py")
 
 tool_dirs = [config.llvm_tools_dir, config.test_source_root]
 
@@ -144,12 +143,6 @@
     ToolSubst("llvm-readobj", unresolved="fatal"),
     ToolSubst("llvm-dwp", unresolved="fatal"),
     ToolSubst("split-file", unresolved="fatal"),
-    ToolSubst(
-        "match-dwarf",
-        command=sys.executable,
-        unresolved="fatal",
-        extra_args=[match_dwarf_cmd],
-    ),
 ]
 llvm_config.add_tool_substitutions(tools, tool_dirs)