diff --git a/llvm/test/Analysis/MemorySSA/nondeterminism.ll b/llvm/test/Analysis/MemorySSA/nondeterminism.ll --- a/llvm/test/Analysis/MemorySSA/nondeterminism.ll +++ b/llvm/test/Analysis/MemorySSA/nondeterminism.ll @@ -1,4 +1,4 @@ -; RUN: opt -simplifycfg -S --preserve-ll-uselistorder %s | FileCheck %s +; RUN: opt -simplifycfg -S --preserve-uselistorder %s | FileCheck %s ; REQUIRES: x86-registered-target ; CHECK-LABEL: @n ; CHECK: uselistorder i16 0, { 3, 2, 4, 1, 5, 0, 6 } diff --git a/llvm/test/Assembler/uselistorder_global.ll b/llvm/test/Assembler/uselistorder_global.ll --- a/llvm/test/Assembler/uselistorder_global.ll +++ b/llvm/test/Assembler/uselistorder_global.ll @@ -1,4 +1,4 @@ -; RUN: opt -S -preserve-ll-uselistorder < %s | FileCheck %s +; RUN: opt -S -preserve-uselistorder < %s | FileCheck %s ; RUN: verify-uselistorder %s ; CHECK: @g = external global i32 diff --git a/llvm/test/Transforms/ADCE/blocks-with-dead-term-nondeterministic.ll b/llvm/test/Transforms/ADCE/blocks-with-dead-term-nondeterministic.ll --- a/llvm/test/Transforms/ADCE/blocks-with-dead-term-nondeterministic.ll +++ b/llvm/test/Transforms/ADCE/blocks-with-dead-term-nondeterministic.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -passes=adce --preserve-ll-uselistorder -S | FileCheck %s +; RUN: opt < %s -passes=adce --preserve-uselistorder -S | FileCheck %s target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.10.0" diff --git a/llvm/tools/bugpoint/OptimizerDriver.cpp b/llvm/tools/bugpoint/OptimizerDriver.cpp --- a/llvm/tools/bugpoint/OptimizerDriver.cpp +++ b/llvm/tools/bugpoint/OptimizerDriver.cpp @@ -38,10 +38,10 @@ extern cl::opt OutputPrefix; } -static cl::opt PreserveBitcodeUseListOrder( - "preserve-bc-uselistorder", - cl::desc("Preserve use-list order when writing LLVM bitcode."), - cl::init(true), cl::Hidden); +static cl::opt PreserveUseListOrder( + "preserve-uselistorder", + cl::desc("Preserve use-list order when writing LLVM IR."), cl::init(true), + cl::Hidden); static cl::opt OptCmd("opt-command", cl::init(""), @@ -51,7 +51,7 @@ /// This writes the current "Program" to the named bitcode file. If an error /// occurs, true is returned. static bool writeProgramToFileAux(ToolOutputFile &Out, const Module &M) { - WriteBitcodeToFile(M, Out.os(), PreserveBitcodeUseListOrder); + WriteBitcodeToFile(M, Out.os(), PreserveUseListOrder); Out.os().close(); if (!Out.os().has_error()) { Out.keep(); @@ -68,7 +68,7 @@ bool BugDriver::writeProgramToFile(int FD, const Module &M) const { raw_fd_ostream OS(FD, /*shouldClose*/ false); - WriteBitcodeToFile(M, OS, PreserveBitcodeUseListOrder); + WriteBitcodeToFile(M, OS, PreserveUseListOrder); OS.flush(); if (!OS.has_error()) return false; @@ -155,7 +155,7 @@ DiscardTemp Discard{*Temp}; raw_fd_ostream OS(Temp->FD, /*shouldClose*/ false); - WriteBitcodeToFile(Program, OS, PreserveBitcodeUseListOrder); + WriteBitcodeToFile(Program, OS, PreserveUseListOrder); OS.flush(); if (OS.has_error()) { errs() << "Error writing bitcode file: " << Temp->TmpName << "\n"; diff --git a/llvm/tools/llvm-as/llvm-as.cpp b/llvm/tools/llvm-as/llvm-as.cpp --- a/llvm/tools/llvm-as/llvm-as.cpp +++ b/llvm/tools/llvm-as/llvm-as.cpp @@ -57,10 +57,10 @@ cl::desc("Do not run verifier on input LLVM (dangerous!)"), cl::cat(AsCat)); -static cl::opt PreserveBitcodeUseListOrder( - "preserve-bc-uselistorder", - cl::desc("Preserve use-list order when writing LLVM bitcode."), - cl::init(true), cl::Hidden, cl::cat(AsCat)); +static cl::opt PreserveUseListOrder( + "preserve-uselistorder", + cl::desc("Preserve use-list order when writing LLVM IR."), cl::init(true), + cl::Hidden, cl::cat(AsCat)); static cl::opt ClDataLayout("data-layout", cl::desc("data layout string to use"), @@ -100,8 +100,8 @@ // any non-null Index along with it as a per-module Index. // If both are empty, this will give an empty module block, which is // the expected behavior. - WriteBitcodeToFile(*M, Out->os(), PreserveBitcodeUseListOrder, - IndexToWrite, EmitModuleHash); + WriteBitcodeToFile(*M, Out->os(), PreserveUseListOrder, IndexToWrite, + EmitModuleHash); else // Otherwise, with an empty Module but non-empty Index, we write a // combined index. diff --git a/llvm/tools/llvm-dis/llvm-dis.cpp b/llvm/tools/llvm-dis/llvm-dis.cpp --- a/llvm/tools/llvm-dis/llvm-dis.cpp +++ b/llvm/tools/llvm-dis/llvm-dis.cpp @@ -64,10 +64,10 @@ cl::desc("Add informational comments to the .ll file"), cl::cat(DisCategory)); -static cl::opt PreserveAssemblyUseListOrder( - "preserve-ll-uselistorder", - cl::desc("Preserve use-list order when writing LLVM assembly."), - cl::init(false), cl::Hidden, cl::cat(DisCategory)); +static cl::opt PreserveUseListOrder( + "preserve-uselistorder", + cl::desc("Preserve use-list order when writing LLVM IR."), cl::init(false), + cl::Hidden, cl::cat(DisCategory)); static cl::opt MaterializeMetadata("materialize-metadata", @@ -250,7 +250,7 @@ // All that llvm-dis does is write the assembly to a file. if (!DontPrint) { if (M) - M->print(Out->os(), Annotator.get(), PreserveAssemblyUseListOrder); + M->print(Out->os(), Annotator.get(), PreserveUseListOrder); if (Index) Index->print(Out->os()); } diff --git a/llvm/tools/llvm-extract/llvm-extract.cpp b/llvm/tools/llvm-extract/llvm-extract.cpp --- a/llvm/tools/llvm-extract/llvm-extract.cpp +++ b/llvm/tools/llvm-extract/llvm-extract.cpp @@ -120,14 +120,9 @@ cl::desc("Write output as LLVM assembly"), cl::Hidden, cl::cat(ExtractCat)); -static cl::opt PreserveBitcodeUseListOrder( - "preserve-bc-uselistorder", - cl::desc("Preserve use-list order when writing LLVM bitcode."), - cl::init(true), cl::Hidden, cl::cat(ExtractCat)); - -static cl::opt PreserveAssemblyUseListOrder( - "preserve-ll-uselistorder", - cl::desc("Preserve use-list order when writing LLVM assembly."), +static cl::opt PreserveUseListOrder( + "preserve-uselistorder", + cl::desc("Preserve use-list order when writing LLVM IR."), cl::init(false), cl::Hidden, cl::cat(ExtractCat)); int main(int argc, char **argv) { @@ -374,9 +369,9 @@ if (OutputAssembly) Passes.add( - createPrintModulePass(Out.os(), "", PreserveAssemblyUseListOrder)); + createPrintModulePass(Out.os(), "", PreserveUseListOrder)); else if (Force || !CheckBitcodeOutputToConsole(Out.os())) - Passes.add(createBitcodeWriterPass(Out.os(), PreserveBitcodeUseListOrder)); + Passes.add(createBitcodeWriterPass(Out.os(), PreserveUseListOrder)); Passes.run(*M.get()); diff --git a/llvm/tools/llvm-link/llvm-link.cpp b/llvm/tools/llvm-link/llvm-link.cpp --- a/llvm/tools/llvm-link/llvm-link.cpp +++ b/llvm/tools/llvm-link/llvm-link.cpp @@ -110,14 +110,9 @@ cl::desc("Suppress all linking warnings"), cl::init(false), cl::cat(LinkCategory)); -static cl::opt PreserveBitcodeUseListOrder( - "preserve-bc-uselistorder", - cl::desc("Preserve use-list order when writing LLVM bitcode."), - cl::init(true), cl::Hidden, cl::cat(LinkCategory)); - -static cl::opt PreserveAssemblyUseListOrder( - "preserve-ll-uselistorder", - cl::desc("Preserve use-list order when writing LLVM assembly."), +static cl::opt PreserveUseListOrder( + "preserve-uselistorder", + cl::desc("Preserve use-list order when writing LLVM IR."), cl::init(false), cl::Hidden, cl::cat(LinkCategory)); static cl::opt NoVerify("disable-verify", @@ -507,9 +502,9 @@ if (Verbose) errs() << "Writing bitcode...\n"; if (OutputAssembly) { - Composite->print(Out.os(), nullptr, PreserveAssemblyUseListOrder); + Composite->print(Out.os(), nullptr, PreserveUseListOrder); } else if (Force || !CheckBitcodeOutputToConsole(Out.os())) - WriteBitcodeToFile(*Composite, Out.os(), PreserveBitcodeUseListOrder); + WriteBitcodeToFile(*Composite, Out.os(), PreserveUseListOrder); // Declare success. Out.keep(); diff --git a/llvm/tools/opt/opt.cpp b/llvm/tools/opt/opt.cpp --- a/llvm/tools/opt/opt.cpp +++ b/llvm/tools/opt/opt.cpp @@ -211,14 +211,9 @@ cl::value_desc("layout-string"), cl::init("")); -static cl::opt PreserveBitcodeUseListOrder( - "preserve-bc-uselistorder", - cl::desc("Preserve use-list order when writing LLVM bitcode."), - cl::init(true), cl::Hidden); - -static cl::opt PreserveAssemblyUseListOrder( - "preserve-ll-uselistorder", - cl::desc("Preserve use-list order when writing LLVM assembly."), +static cl::opt PreserveUseListOrder( + "preserve-uselistorder", + cl::desc("Preserve use-list order when writing LLVM IR."), cl::init(false), cl::Hidden); static cl::opt RunTwice("run-twice", @@ -710,8 +705,8 @@ // layer. return runPassPipeline(argv[0], *M, TM.get(), &TLII, Out.get(), ThinLinkOut.get(), RemarksFile.get(), Pipeline, - Passes, PluginList, OK, VK, PreserveAssemblyUseListOrder, - PreserveBitcodeUseListOrder, EmitSummaryIndex, + Passes, PluginList, OK, VK, PreserveUseListOrder, + PreserveUseListOrder, EmitSummaryIndex, EmitModuleHash, EnableDebugify, VerifyDebugInfoPreserve) ? 0 @@ -856,9 +851,9 @@ OS = BOS.get(); } if (OutputAssembly) - Passes.add(createPrintModulePass(*OS, "", PreserveAssemblyUseListOrder)); + Passes.add(createPrintModulePass(*OS, "", PreserveUseListOrder)); else - Passes.add(createBitcodeWriterPass(*OS, PreserveBitcodeUseListOrder)); + Passes.add(createBitcodeWriterPass(*OS, PreserveUseListOrder)); } // Before executing passes, print the final values of the LLVM options.