rename to -memprof-runtime-default-options

Author: ellishg

compiler-rt/include/sanitizer/memprof_interface.h

@@ -47,8 +47,8 @@ void SANITIZER_CDECL __memprof_print_accumulated_stats(void);
 
 /// User-provided default option settings.
 ///
-/// You can set these options via the -memprof-default-options LLVM flag or
-/// you can provide your own implementation of this function. See
+/// You can set these options via the -memprof-runtime-default-options LLVM flag
+/// or you can provide your own implementation of this function. See
 /// memprof_flags.h for more info.
 ///
 /// \returns Default options string.

compiler-rt/lib/memprof/memprof_flags.h

@@ -22,8 +22,8 @@
 // prior one:
 //  1) by setting MEMPROF_DEFAULT_OPTIONS during the compilation of the MemProf
 //     runtime
-//  2) by setting the LLVM flag -memprof-default-options during the compilation
-//     of your binary
+//  2) by setting the LLVM flag -memprof-runtime-default-options during the
+//     compilation of your binary
 //  3) by overriding the user-specified function __memprof_default_options()
 //  4) by setting the environment variable MEMPROF_OPTIONS during runtime
 

compiler-rt/test/memprof/TestCases/set_options.cpp

@@ -1,7 +1,7 @@
 // RUN: %clangxx_memprof %s -o %t-default
 // RUN: %run %t-default | FileCheck %s --check-prefix=DEFAULT
 
-// RUN: %clangxx_memprof %s -mllvm -memprof-default-options="print_text=true,log_path=stdout,atexit=false" -o %t
+// RUN: %clangxx_memprof %s -mllvm -memprof-runtime-default-options="print_text=true,log_path=stdout,atexit=false" -o %t
 // RUN: %run %t | FileCheck %s
 
 #include <sanitizer/memprof_interface.h>

llvm/lib/Transforms/Instrumentation/MemProfiler.cpp

@@ -167,9 +167,9 @@ static cl::opt<bool>
                             cl::Hidden, cl::init(false));
 
 static cl::opt<std::string>
-    MemprofDefaultOptions("memprof-default-options",
-                          cl::desc("The default memprof options"), cl::Hidden,
-                          cl::init(""));
+    MemprofRuntimeDefaultOptions("memprof-runtime-default-options",
+                                 cl::desc("The default memprof options"),
+                                 cl::Hidden, cl::init(""));
 
 extern cl::opt<bool> MemProfReportHintedSizes;
 
@@ -554,7 +554,7 @@ void createMemprofHistogramFlagVar(Module &M) {
 
 void createMemprofDefaultOptionsVar(Module &M) {
   Constant *OptionsConst = ConstantDataArray::getString(
-      M.getContext(), MemprofDefaultOptions, /*AddNull=*/true);
+      M.getContext(), MemprofRuntimeDefaultOptions, /*AddNull=*/true);
   GlobalVariable *OptionsVar =
       new GlobalVariable(M, OptionsConst->getType(), /*isConstant=*/true,
                          GlobalValue::WeakAnyLinkage, OptionsConst,

llvm/test/Instrumentation/HeapProfiler/memprof-options.ll

@@ -1,5 +1,5 @@
 ; RUN: opt < %s -mtriple=x86_64-unknown-linux -passes='function(memprof),memprof-module' -S | FileCheck %s --check-prefixes=CHECK,EMPTY
-; RUN: opt < %s -mtriple=x86_64-unknown-linux -passes='function(memprof),memprof-module' -S -memprof-default-options="verbose=1" | FileCheck %s --check-prefixes=CHECK,VERBOSE
+; RUN: opt < %s -mtriple=x86_64-unknown-linux -passes='function(memprof),memprof-module' -S -memprof-runtime-default-options="verbose=1" | FileCheck %s --check-prefixes=CHECK,VERBOSE
 
 define i32 @main() {
 entry: