[ELF][test] Fix several LLD ICF tests

[andrewng]

Summary

A number of the ICF tests were not updated to use --print-icf-sections
instead of --verbose and various '-NOT' checks were not updated to the
latest output format of --print-icf-sections. Because these are all
'negative' tests, these issues have gone unnoticed.

[MaskRay]

lld/test/ELF/icf-non-mergeable.s

11

If the number of sections is small, prefer positive tests.

CHECK:
CHECK-NEXT:
CHECK-NOT: {{.}}

If necessary, add a comment explaining that we don't want to see some sections.

[andrewng]

Added comments to tests.

[andrewng]

lld/test/ELF/icf-non-mergeable.s

11

These tests are checking that no merging has occurred due to ICF, so there are no positive checks as far as the ICF output is concerned. This is the same pattern used in some of the other ICF tests. It's just that these tests were somehow not updated correctly for the ICF related changes and that's what I'm trying to correct.

[andrewng]

Looking at some of the other ICF tests, another approach to checking for no merging is: ... --print-icf-sections | count 0. Would this be preferable to using CHECK-NOT: patterns?

[MaskRay]

Consider moving some similar tests together, possibly using split-file or assembly macros (search .ifdef)

lld/test/ELF/icf-none.s

4

Use ## for non-RUN non-CHECK lines in newer tests

Replace FileCheck --allow-empty with count 0

lld/test/ELF/icf3.s

5

ditto

lld/test/ELF/icf4.s

5

ditto

[andrewng]

Replaced negative checks with checking that there is no output from --print-icf-sections using count.

lld/test/ELF/icf-non-mergeable.s

 // REQUIRES: x86
 
 // This file contains two functions. They are themselves identical,
 // but because they have relocations against different data sections,
 // they are not mergeable.
 
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux \
 // RUN:    %p/Inputs/icf-non-mergeable.s -o %t2
 
-// RUN: ld.lld %t1 %t2 -o /dev/null --icf=all --verbose 2>&1 | FileCheck %s
-
-// CHECK-NOT: selected section '.text.f1'
-// CHECK-NOT:   removing identical section '.text.f2'
+// RUN: ld.lld %t1 %t2 -o /dev/null --icf=all --print-icf-sections | count 0
 
 .globl _start, f1, f2, d1, d2
 _start:
   ret
 
 .section .text.f1, "ax"
 f1:
   movl $5, d1
   ret
 
 .section .text.f2, "ax"
 f2:
   movl $5, d2
   ret

lld/test/ELF/icf-none.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: ld.lld %t -o /dev/null --icf=all --icf=none --verbose 2>&1 | FileCheck %s
-
-# CHECK-NOT: selected section '.text.f1'
+# RUN: ld.lld %t -o /dev/null --icf=all --icf=none --print-icf-sections | count 0
 
 .globl _start, f1, f2
 _start:
   ret
 
 .section .text.f1, "ax"
 f1:
   mov $60, %rax
   mov $42, %rdi
   syscall
 
 .section .text.f2, "ax"
 f2:
   mov $60, %rax
   mov $42, %rdi
   syscall

lld/test/ELF/icf3.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/icf2.s -o %t2
-# RUN: ld.lld %t1 %t2 -o /dev/null --icf=all --print-icf-sections 2>&1 | FileCheck -allow-empty %s
-
-# CHECK-NOT: selected section '.text.f1' from file
-# CHECK-NOT: selected section '.text.f2' from file
+# RUN: ld.lld %t1 %t2 -o /dev/null --icf=all --print-icf-sections | count 0
 
 .globl _start, f1, f2
 _start:
   ret
 
 # This section is not mergeable because the content is different from f2.
 .section .text.f1, "ax"
 f1:
   mov $60, %rdi
   call f2
   mov $0, %rax

lld/test/ELF/icf4.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: ld.lld %t -o /dev/null --icf=all --print-icf-sections 2>&1 | FileCheck -allow-empty %s
-
-# CHECK-NOT: selected section '.text.f1'
-# CHECK-NOT: selected section '.text.f2'
+# RUN: ld.lld %t -o /dev/null --icf=all --print-icf-sections | count 0
 
 .globl _start, f1, f2
 _start:
   ret
 
 .section .text.f1, "ax"
 f1:
   mov $1, %rax
 
 .section .text.f2, "ax"
 f2:
   mov $0, %rax

lld/test/ELF/icf5.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: ld.lld %t -o /dev/null --icf=all --print-icf-sections 2>&1 | FileCheck -allow-empty %s
-
-# CHECK-NOT: selected section '.text.f1'
-# CHECK-NOT: selected section '.text.f2'
+# RUN: ld.lld %t -o /dev/null --icf=all --print-icf-sections | count 0
 
 .globl _start, f1, f2
 _start:
   ret
 
 .section .text.f1, "ax"
 f1:
   mov $0, %rax
 
 .section .text.f2, "awx"
 f2:
   mov $0, %rax

lld/test/ELF/icf6.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: ld.lld %t -o /dev/null --icf=all --print-icf-sections 2>&1 | FileCheck -allow-empty %s
-
-# CHECK-NOT: selected section '.text.f1'
-# CHECK-NOT: selected section '.text.f2'
+# RUN: ld.lld %t -o /dev/null --icf=all --print-icf-sections | count 0
 
 .globl _start, f1, f2
 _start:
   ret
 
 .section .init, "ax"
 f1:
   mov $60, %rax
   mov $42, %rdi
   syscall
 
 .section .fini, "ax"
 f2:
   mov $60, %rax
   mov $42, %rdi
   syscall