From 8ad998a6115a8cd59a18ebdd5ec65329e42050e7 Mon Sep 17 00:00:00 2001 From: Abhina Sreeskantharajan Date: Mon, 11 Jan 2021 15:13:40 -0500 Subject: [PATCH] [tools] Mark output of tools as text if it is really text 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 Reviewed By: rnk Differential Revision: https://reviews.llvm.org/D94313 --- llvm/test/tools/llvm-profdata/csprof-dump.test | 2 +- llvm/test/tools/llvm-profdata/instr-remap.test | 2 +- llvm/tools/llvm-link/llvm-link.cpp | 3 ++- llvm/tools/llvm-profdata/llvm-profdata.cpp | 4 +++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/llvm/test/tools/llvm-profdata/csprof-dump.test b/llvm/test/tools/llvm-profdata/csprof-dump.test index 39643dc..a03b9d8 100644 --- a/llvm/test/tools/llvm-profdata/csprof-dump.test +++ b/llvm/test/tools/llvm-profdata/csprof-dump.test @@ -27,5 +27,5 @@ 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 diff --git a/llvm/test/tools/llvm-profdata/instr-remap.test b/llvm/test/tools/llvm-profdata/instr-remap.test index 159b737..27fddf6 100644 --- a/llvm/test/tools/llvm-profdata/instr-remap.test +++ b/llvm/test/tools/llvm-profdata/instr-remap.test @@ -1,2 +1,2 @@ ; 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 diff --git a/llvm/tools/llvm-link/llvm-link.cpp b/llvm/tools/llvm-link/llvm-link.cpp index 61d0c15..158b168 100644 --- a/llvm/tools/llvm-link/llvm-link.cpp +++ b/llvm/tools/llvm-link/llvm-link.cpp @@ -456,7 +456,8 @@ int main(int argc, char **argv) { 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; diff --git a/llvm/tools/llvm-profdata/llvm-profdata.cpp b/llvm/tools/llvm-profdata/llvm-profdata.cpp index 122ffe7..ad188b6 100644 --- a/llvm/tools/llvm-profdata/llvm-profdata.cpp +++ b/llvm/tools/llvm-profdata/llvm-profdata.cpp @@ -296,7 +296,9 @@ 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); -- 2.7.4