[BOLT] Fix LIT tests on Windows VS2019

[rafauler]

Summary

Fix newline issue in link_fdata.py, as well as how to call the tool.

[Amir]

Cool, thanks for fixing these! Glad that you've found a use for --nmtool option.
We don't have a windows buildbot now to run tests on windows (the -msvc buildbot runs on Linux under wine), but we may request to enable windows pre-merge checks testing.

bolt/test/X86/fallthrough-to-noop.test

 # Check that profile data for the fall-through jump is not ingored when there is
 # a conditional jump followed by a no-op.
 
 RUN: llvm-mc -filetype=obj -triple x86_64-unknown-unknown \
 RUN:   %S/Inputs/ft_to_noop.s -o %t.o
-RUN: link_fdata %S/Inputs/ft_to_noop.s %t.o %t.fdata
+RUN: link_fdata %S/Inputs/ft_to_noop.s %t.o %t.fdata --nmtool llvm-nm
 RUN: llvm-strip --strip-unneeded %t.o
 RUN: %clang %cflags %t.o -o %t.exe -Wl,-q
 RUN: llvm-bolt %t.exe -o %t -data %t.fdata \
 RUN:   -print-cfg -sequential-disassembly 2>&1 | FileCheck %s
 
 CHECK:      Binary Function "foo" after building cfg
 CHECK:        Exec Count  : 20
 CHECK:        Profile Acc : 100.0%

bolt/test/X86/jump-table-footprint-reduction.test

 # Checks that jump table footprint reduction optimization is reducing entry
 # sizes.
 
 RUN: llvm-mc -filetype=obj -triple x86_64-unknown-unknown \
 RUN:   %S/Inputs/jump_table_footprint_reduction.s -o %t.o
-RUN: link_fdata %S/Inputs/jump_table_footprint_reduction.s %t.o %t.fdata
+RUN: link_fdata %S/Inputs/jump_table_footprint_reduction.s %t.o %t.fdata --nmtool llvm-nm
 RUN: llvm-strip --strip-unneeded %t.o
 RUN: %clang %cflags -no-pie %t.o -o %t.exe -Wl,-q
 RUN: llvm-bolt %t.exe -data %t.fdata -o /dev/null \
 RUN:   -jump-tables=move -jt-footprint-reduction -assume-abi -relocs \
 RUN:   | FileCheck %s
 
 CHECK: 100.00% of dynamic JT entries were reduced.
 CHECK: 1 of 1 jump tables affected.
 CHECK: 1 of 1 indirect jumps to JTs affected.
 CHECK: 36 bytes saved.

bolt/test/X86/jump-table-icp.test

 RUN: llvm-mc -filetype=obj -triple x86_64-unknown-unknown \
 RUN:   %p/Inputs/jump_table_icp.s -o %t.o
-RUN: link_fdata %p/Inputs/jump_table_icp.s %t.o %t.fdata 
+RUN: link_fdata %p/Inputs/jump_table_icp.s %t.o %t.fdata --nmtool llvm-nm
 RUN: llvm-strip --strip-unneeded %t.o
 RUN: %clang %cflags -no-pie %t.o -o %t.exe -Wl,-q
 
 RUN: (llvm-bolt %t.exe -data %t.fdata -o %t -relocs \
 RUN:   -reorder-blocks=cache -split-functions=3 -split-all-cold \
 RUN:   -use-gnu-stack -dyno-stats -indirect-call-promotion=jump-tables \
 RUN:   -print-icp -v=0 \
 RUN:   -icp-jt-remaining-percent-threshold=10 \

bolt/test/X86/loop-nest.test

 # Verifies that llvm-bolt prints correct loop information.
 
 RUN: llvm-mc -filetype=obj -triple x86_64-unknown-unknown \
 RUN:   %p/Inputs/loop_nest.s -o %t.o
-RUN: link_fdata %p/Inputs/loop_nest.s %t.o %t.fdata
+RUN: link_fdata %p/Inputs/loop_nest.s %t.o %t.fdata --nmtool llvm-nm
 RUN: llvm-strip --strip-unneeded %t.o
 RUN: %clang %cflags -no-pie %t.o -o %t.exe -Wl,-q
 
 RUN: llvm-bolt %t.exe -o %t -data=%t.fdata \
 RUN: -print-cfg -print-loops -sequential-disassembly -lite=0 2>&1 | FileCheck %s
 
 CHECK:      Binary Function "main{{.*}}" after building cfg
 CHECK:      Loop Info for Function "main{{.*}}"

bolt/test/X86/merge-fdata-bat-mode.test

 # Check merge-fdata tool correctly processes fdata files with header strings
 # such as the ones produced by BAT mode (boltedcollection)
 RUN: merge-fdata %S/Inputs/bat_profile_1.fdata \
-RUN:             %S/Inputs/bat_profile_2.fdata 2> %t.error \
+RUN:             %S/Inputs/bat_profile_2.fdata \
 RUN:   | FileCheck %s --check-prefix=CHECK-FDATA
-RUN: cat %t.error |& FileCheck %s --check-prefix=CHECK-ERROR
-
-CHECK-ERROR-NOT:  Malformed
 
 CHECK-FDATA: 1 main 451 1 SolveCubic 0 0 302
 
 

bolt/test/X86/no-entry-reordering.test

 # Verifies that llvm-bolt reordering heuristic does not allocate a BB before the
 # entry point even if there is a hot edge from a block to entry point
 
 RUN: llvm-mc -filetype=obj -triple x86_64-unknown-unknown %S/Inputs/entry.s -o %t.o
-RUN: link_fdata %S/Inputs/entry.s %t.o %t.fdata
+RUN: link_fdata %S/Inputs/entry.s %t.o %t.fdata --nmtool llvm-nm
 RUN: llvm-strip --strip-unneeded %t.o
 RUN: %clang %cflags %t.o -o %t.exe -Wl,-q -nostdlib
 RUN: llvm-bolt %t.exe -data %t.fdata -o /dev/null -reorder-blocks=normal \
 RUN:   -funcs=_start -print-reordered -sequential-disassembly | FileCheck %s
 
 CHECK:  BB Layout : .LBB00, {{.*}}

bolt/test/X86/remove-unused.test

 # Verifies that llvm-bolt is able to remove dead basic blocks. Also check that
 # the BB reordering ignores dead BBs.
 
 RUN: llvm-mc -filetype=obj -triple x86_64-unknown-unknown %S/Inputs/entry.s -o %t.o
-RUN: link_fdata %S/Inputs/entry.s %t.o %t.fdata
+RUN: link_fdata %S/Inputs/entry.s %t.o %t.fdata --nmtool llvm-nm
 RUN: llvm-strip --strip-unneeded %t.o
 RUN: %clang %cflags %t.o -o %t.exe -Wl,-q -nostdlib
 RUN: llvm-bolt %t.exe -data %t.fdata -o %t -funcs=_start \
 RUN:   -eliminate-unreachable -reorder-blocks=none \
 RUN:   -print-finalized -sequential-disassembly 2>&1 | FileCheck %s
 
 # Optimized
 CHECK:  BB Layout : .LBB00, .Ltmp0, .Ltmp2, .Ltmp3, .Ltmp4, .Ltmp5, .Ltmp6, .Ltmp7, .Ltmp8, .Ltmp9, .Ltmp10, .Ltmp11

bolt/test/link_fdata.py

 def replace_symbol(matchobj):
     '''
     Expects matchobj to only capture one group which contains the symbol name.
     '''
     symname = matchobj.group('symname')
     assert symname in symbols, f"ERROR: symbol {symname} is not defined in binary"
     return symbols[symname]
 
-with open(args.output, 'w') as f:
+with open(args.output, 'w', newline='\n') as f:
     for etype, expr in exprs:
         if etype == 'FDATA':
             issym1, anchor1, offsym1, issym2, anchor2, offsym2, execnt, mispred = expr
             print(evaluate_symbol(issym1, anchor1, offsym1),
                   evaluate_symbol(issym2, anchor2, offsym2),
                   execnt, mispred, file = f)
         elif etype == 'PREAGG':
             # Replace all symbols enclosed in ##
             print(expr[0], re.sub(replace_pat, replace_symbol, expr[1]),
                   file = f)
         else:
             exit("ERROR: unhandled expression type:\n%s" % etype)

bolt/test/lit.cfg.py

tools = [
     ToolSubst('perf2bolt', unresolved='fatal'),
     ToolSubst('yaml2obj', unresolved='fatal'),
     ToolSubst('llvm-mc', unresolved='fatal'),
     ToolSubst('llvm-nm', unresolved='fatal'),
     ToolSubst('llvm-objdump', unresolved='fatal'),
     ToolSubst('llvm-objcopy', unresolved='fatal'),
     ToolSubst('llvm-strip', unresolved='fatal'),
     ToolSubst('llvm-readelf', unresolved='fatal'),
-    ToolSubst('link_fdata', command=link_fdata_cmd, unresolved='fatal'),
+    ToolSubst('link_fdata', command=sys.executable, unresolved='fatal', extra_args=[link_fdata_cmd]),
     ToolSubst('merge-fdata', unresolved='fatal'),
     ToolSubst('llvm-readobj', unresolved='fatal'),
 ]
 llvm_config.add_tool_substitutions(tools, tool_dirs)
 
 def calculate_arch_features(arch_string):
     features = []
     for arch in arch_string.split():