[BOLT][TEST] Adjust tests for BOLT_CLANG_EXE=clang-{6..9}

[Amir]

Summary

Fix tests to pass with clang-6..9 on Ubuntu 20.04.

[yota9]

bolt/test/X86/symtab-secondary-entries.test

5

I don't really mind to use linker directly, but I prefer to use it through compiler, it may send extra flags that linker may expect like -m <arch>, crt files, lib paths & etc, it just seems more universal solution for me, although this way seems to be fine too :) What do you think?

[Amir]

bolt/test/X86/symtab-secondary-entries.test

5

I think it's problematic to rely on implicit compiler behavior wrt linking. Ideally, tests don't need to rely on system libraries at all. I completely agree that compiling assembly is a lot more convenient with the compiler toolchain, but for tests I think it's best to make it more explicit (at least where we can, e.g. for assembly tests).

[yota9]

bolt/test/X86/symtab-secondary-entries.test

5

Well it is more convenient and might be more robust, but I see what you mean. Also we might need to add %ldflags for such tests :)

bolt/test/X86/asm-func-debug.test

 # Verify that we update DW_TAG_compile_unit' ranges and .debug_aranges
 # for assembly function that doesn't have corresponding DIE.
 #
 # The input test case foo() contains nops that we remove.
 
 RUN: %clang -g %cflags %p/../Inputs/asm_foo.s %p/../Inputs/asm_main.c -o %t.exe
 RUN: llvm-bolt %t.exe -o %t -update-debug-sections
 RUN: llvm-dwarfdump -all %t | FileCheck %s
 
 # Check ranges were created/updated for asm compile unit
 CHECK:       0x0000000b: DW_TAG_compile_unit
 CHECK-NEXT:       DW_AT_stmt_list (0x00000000)
 CHECK-NEXT:       DW_AT_low_pc (0x0000000000000000)
 CHECK-NEXT:       DW_AT_ranges
 CHECK-NEXT:          [0x0000000000[[#%x,ADDR:]],
 CHECK-SAME:                              0x0000000000[[#ADDR+1]]))
-CHECK-NEXT:       DW_AT_name ("{{.*}}/asm_foo.s")
+CHECK-NEXT:       DW_AT_name ("{{.*}}asm_foo.s")
 
 # Check .debug_aranges was updated for asm module
 CHECK: .debug_aranges contents:
 CHECK-NEXT:   Address Range Header: length = 0x0000002c, format = DWARF32, version = 0x0002, cu_offset = 0x00000000, addr_size = 0x08, seg_size = 0x00
 CHECK-NEXT:   [0x0000000000[[#ADDR]], 0x0000000000[[#ADDR+1]])
 
 # Check line number info was updated
 CHECK:       0x0000000000[[#ADDR]]   13      0      1   0             0  is_stmt
 CHECK-NEXT:  0x0000000000[[#ADDR+1]] 13      0      1   0             0  is_stmt end_sequence

bolt/test/X86/symtab-secondary-entries.test

 # Check that secondary entry points are updated correctly in the ELF symtab
 
-RUN: %clang %p/Inputs/user-order.S -Wl,-q -o %t.exe -nostdlib
+RUN: llvm-mc -filetype=obj -triple x86_64-unknown-unknown \
+RUN:   %p/Inputs/user-order.S -o %t.o
+RUN: ld.lld %t.o --emit-relocs --nostdlib -o %t.exe
 RUN: llvm-bolt %t.exe -o %t -reorder-functions=user \
 RUN:   -function-order=%p/Inputs/order.txt
 
 RUN: llvm-readelf -Ws %t | cut -d':' -f2- | sort -u | FileCheck %s
 
 CHECK: [[#]] FUNC    GLOBAL DEFAULT   [[#NDX:]] _start
 CHECK: [[#]] FUNC    GLOBAL DEFAULT   [[#NDX]] main
 CHECK: [[#]] FUNC    LOCAL  DEFAULT   [[#NDX]] _a
 CHECK: [[#]] FUNC    GLOBAL DEFAULT   [[#NDX]] _b
 CHECK: [[#]] FUNC    GLOBAL DEFAULT   [[#NDX]] _f
 # The following are all secondary entries of _f
 CHECK:     0 FUNC    GLOBAL DEFAULT   [[#NDX]] _c
 CHECK:     0 FUNC    GLOBAL DEFAULT   [[#NDX]] _d
 CHECK:     0 FUNC    GLOBAL DEFAULT   [[#NDX]] _e