simplify copts, add extra tests

Created using spr 1.3.8-beta.1

Author: melver

llvm/lib/Transforms/Instrumentation/AllocToken.cpp

@@ -67,24 +67,24 @@ cl::opt<std::string> ClFuncPrefix("alloc-token-prefix",
                                   cl::desc("The allocation function prefix"),
                                   cl::Hidden, cl::init("__alloc_token_"));
 
-cl::opt<std::optional<uint64_t>, false, cl::parser<uint64_t>>
+cl::opt<uint64_t>
     ClMaxTokens("alloc-token-max",
                 cl::desc("Maximum number of tokens (0 = target SIZE_MAX)"),
-                cl::Hidden, cl::init(std::nullopt));
+                cl::Hidden, cl::init(0));
 
-cl::opt<std::optional<bool>, false, cl::parser<bool>>
+cl::opt<bool>
     ClFastABI("alloc-token-fast-abi",
               cl::desc("The token ID is encoded in the function name"),
-              cl::Hidden, cl::init(std::nullopt));
+              cl::Hidden, cl::init(false));
 
 // Instrument libcalls only by default - compatible allocators only need to take
 // care of providing standard allocation functions. With extended coverage, also
 // instrument non-libcall allocation function calls with !alloc_token
 // metadata.
-cl::opt<std::optional<bool>, false, cl::parser<bool>>
+cl::opt<bool>
     ClExtended("alloc-token-extended",
                cl::desc("Extend coverage to custom allocation functions"),
-               cl::Hidden, cl::init(std::nullopt));
+               cl::Hidden, cl::init(false));
 
 // C++ defines ::operator new (and variants) as replaceable (vs. standard
 // library versions), which are nobuiltin, and are therefore not covered by
@@ -252,12 +252,12 @@ static AllocTokenOptions resolveOptions(AllocTokenOptions Opts,
     Opts.Extended |= Val->isOne();
 
   // Allow overriding options from command line options.
-  if (ClMaxTokens.has_value())
-    Opts.MaxTokens = *ClMaxTokens;
-  if (ClFastABI.has_value())
-    Opts.FastABI = *ClFastABI;
-  if (ClExtended.has_value())
-    Opts.Extended = *ClExtended;
+  if (ClMaxTokens.getNumOccurrences())
+    Opts.MaxTokens = ClMaxTokens;
+  if (ClFastABI.getNumOccurrences())
+    Opts.FastABI = ClFastABI;
+  if (ClExtended.getNumOccurrences())
+    Opts.Extended = ClExtended;
 
   return Opts;
 }

llvm/test/Instrumentation/AllocToken/hot-cold-new.ll

@@ -0,0 +1,20 @@
+; Manually add instcombine to ensure the hot/cold transformation happens before
+; the LTO pipeline. The default LTO pipeline includes MemProfRemoveInfo which
+; strips the memprof attributes unless the summary index indicates support.
+; RUN: opt < %s -passes='function(instcombine),thinlto<O2>' -optimize-hot-cold-new -S | FileCheck %s
+; RUN: opt < %s -passes='function(instcombine),lto<O2>' -optimize-hot-cold-new -S | FileCheck %s
+; RUN: opt < %s -passes='function(instcombine),alloc-token' -optimize-hot-cold-new -S | FileCheck %s
+
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+
+declare ptr @_Znwm(i64)
+
+define ptr @new_hot() sanitize_alloc_token {
+; CHECK-LABEL: @new_hot(
+; CHECK: call {{.*}} @__alloc_token__Znwm12__hot_cold_t(i64 10, i8 -2, i64 2689373973731826898){{.*}} !alloc_token
+  %ret = call ptr @_Znwm(i64 10) #0, !alloc_token !0
+  ret ptr %ret
+}
+
+attributes #0 = { builtin allocsize(0) "memprof"="hot" }
+!0 = !{!"int", i1 false}

llvm/test/LTO/X86/alloc-token-hot-cold-new.ll

@@ -0,0 +1,25 @@
+; RUN: opt -module-summary -o %t.thin.bc %s
+; RUN: llvm-lto2 run %t.thin.bc -o %t.thin.out \
+; RUN:   -r=%t.thin.bc,main,plx \
+; RUN:   -r=%t.thin.bc,_Znwm, \
+; RUN:   -r=%t.thin.bc,sink,pl \
+; RUN:   -supports-hot-cold-new -optimize-hot-cold-new
+; RUN: llvm-objdump -d -r %t.thin.out.1 | FileCheck %s
+
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+declare ptr @_Znwm(i64)
+
+@sink = global ptr null
+
+; CHECK-LABEL: <main>:
+; CHECK: callq
+; CHECK-NEXT: R_X86_64_PLT32 __alloc_token__Znwm12__hot_cold_t
+define void @main() sanitize_alloc_token {
+  %call = call ptr @_Znwm(i64 8) #0
+  store volatile ptr %call, ptr @sink
+  ret void
+}
+
+attributes #0 = { builtin allocsize(0) "memprof"="hot" }