[tools] Mark output of tools as text if it is really text

[abhina.sreeskantharajan]

Summary

This is a continuation of https://reviews.llvm.org/D67696. The following tools also need to set the OF_Text flag correctly.

• llvm-profdata
• llvm-link

[rnk]

Please fix the two test failures observed in the harbormaster output. Your change will cause these tools to produce CRLF output, which tests must account for.

[abhina.sreeskantharajan]

Use diff -B to ignore extra blank lines.

[abhina.sreeskantharajan]

Sorry, I wasn't aware Windows didn't support "diff -B". I will try "diff -b" which appears in other lit tests.

[rnk]

lgtm

llvm/test/tools/llvm-profdata/csprof-dump.test

 RUN: llvm-profdata show --all-functions -counts %p/Inputs/noncs.proftext > %t-text.noncsdump
 RUN: llvm-profdata show --all-functions -counts %t-combined.profdata > %t-index.noncsdump
 RUN: diff %t-text.noncsdump %t-index.noncsdump
 
 Roundtrip test:
 
 RUN: llvm-profdata merge -o %t.0.profdata %S/Inputs/CSIR_profile.proftext
 RUN: llvm-profdata merge -text -o %t.0.proftext %t.0.profdata
-RUN: diff %t.0.proftext %S/Inputs/CSIR_profile.proftext
+RUN: diff -b %t.0.proftext %S/Inputs/CSIR_profile.proftext
 

llvm/test/tools/llvm-profdata/instr-remap.test

 ; RUN: llvm-profdata merge -text %S/Inputs/instr-remap.proftext -r %S/Inputs/instr-remap.remap -o %t.output
-; RUN: diff %S/Inputs/instr-remap.expected %t.output
+; RUN: diff -b %S/Inputs/instr-remap.expected %t.output

llvm/tools/llvm-link/llvm-link.cpp

int main(int argc, char **argv) {
   // Import any functions requested via -import
   if (!importFunctions(argv[0], *Composite))
     return 1;
 
   if (DumpAsm)
     errs() << "Here's the assembly:\n" << *Composite;
 
   std::error_code EC;
-  ToolOutputFile Out(OutputFilename, EC, sys::fs::OF_None);
+  ToolOutputFile Out(OutputFilename, EC,
+                     OutputAssembly ? sys::fs::OF_Text : sys::fs::OF_None);
   if (EC) {
     WithColor::error() << EC.message() << '\n';
     return 1;
   }
 
   if (verifyModule(*Composite, &errs())) {
     errs() << argv[0] << ": ";
     WithColor::error() << "linked module is broken!\n";

llvm/tools/llvm-profdata/llvm-profdata.cpp

if (firstTime)
       warn(toString(make_error<InstrProfError>(IPE)));
   });
 }
 
 static void writeInstrProfile(StringRef OutputFilename,
                               ProfileFormat OutputFormat,
                               InstrProfWriter &Writer) {
   std::error_code EC;
-  raw_fd_ostream Output(OutputFilename.data(), EC, sys::fs::OF_None);
+  raw_fd_ostream Output(OutputFilename.data(), EC,
+                        OutputFormat == PF_Text ? sys::fs::OF_Text
+                                                : sys::fs::OF_None);
   if (EC)
     exitWithErrorCode(EC, OutputFilename);
 
   if (OutputFormat == PF_Text) {
     if (Error E = Writer.writeText(Output))
       exitWithError(std::move(E));
   } else {
     Writer.write(Output);