opt: Add option to strip or add llvm value names

[MatzeB]

Summary

This adds two commandline options to the opt tool:

• -name-values: Give anonymous llvm values a name.
• -strip-value-names: Removes names from llvm values.

This is useful for developers that want to manually edit .ll files. This is because with anonymous values you can't insert/remove instructions without renumbering all following values. The stripping part may be useful if you want to hide names from the original source or in combination with name-values you can force all values into a simple naming scheme.

[arsenm]

You can already do this with opt -strip, opt -instnamer / opt-metarenamer

[MatzeB]

Oops, I somehow missed those. Abandoning.

tools/opt/opt.cpp

 static cl::opt<bool>
 VerifyEach("verify-each", cl::desc("Verify after each transform"));
 
 static cl::opt<bool>
 StripDebug("strip-debug",
            cl::desc("Strip debugger symbol info from translation unit"));
 
 static cl::opt<bool>
+StripValueNames("strip-value-names", cl::desc("Remove llvm value names"));
+
+static cl::opt<bool>
+NameValues("name-values", cl::desc("Give anonymous llvm values a name"));
+
+static cl::opt<bool>
 DisableInline("disable-inlining", cl::desc("Do not run the inliner pass"));
 
 static cl::opt<bool>
 DisableOptimizations("disable-opt",
                      cl::desc("Do not run any optimization passes"));
 
 static cl::opt<bool>
 StandardLinkOpts("std-link-opts",
static TargetMachine* GetTargetMachine(Triple TheTriple, StringRef CPUStr,
   }
 
   return TheTarget->createTargetMachine(TheTriple.getTriple(),
                                         CPUStr, FeaturesStr, Options,
                                         RelocModel, CMModel,
                                         GetCodeGenOptLevel());
 }
 
+static void removeValueNames(Module &Mod) {
+  for (Function &F : Mod) {
+    for (BasicBlock &BB : F) {
+      BB.setName("");
+      for (Instruction &I : BB)
+        I.setName("");
+    }
+  }
+}
+
+static void nameValuesInFunction(Function &F) {
+  bool FirstBB = true;
+  for (BasicBlock &BB : F) {
+    if (!BB.hasName())
+      BB.setName(FirstBB ? "entry" : "BB");
+    FirstBB = false;
+
+    for (Instruction &I : BB) {
+      if (I.getType()->isVoidTy())
+        continue;
+      if (!I.hasName())
+        I.setName("v");
+    }
+  }
+}
+
+static void nameValues(Module &Mod) {
+  for (Function &F : Mod)
+    nameValuesInFunction(F);
+}
+
 #ifdef LINK_POLLY_INTO_TOOLS
 namespace polly {
 void initializePollyPasses(llvm::PassRegistry &Registry);
 }
 #endif
 
 //===----------------------------------------------------------------------===//
 // main for opt
if (!M) {
     Err.print(argv[0], errs());
     return 1;
   }
 
   // Strip debug info before running the verifier.
   if (StripDebug)
     StripDebugInfo(*M);
 
+  if (StripValueNames)
+    removeValueNames(*M);
+
+  if (NameValues)
+    nameValues(*M);
+
   // Immediately run the verifier to catch any problems before starting up the
   // pass pipelines.  Otherwise we can crash on broken code during
   // doInitialization().
   if (!NoVerify && verifyModule(*M, &errs())) {
     errs() << argv[0] << ": " << InputFilename
            << ": error: input module is broken!\n";
     return 1;
   }