[clang][nvlink-wrapper] Modified tablegen option definitions

Convert alias definitions to proper option definitions for opt-remarks-*
options based on suggestions.

Author: miguelcsx

clang/tools/clang-nvlink-wrapper/ClangNVLinkWrapper.cpp

@@ -341,20 +341,9 @@ Expected<std::unique_ptr<lto::LTO>> createLTO(const ArgList &Args) {
   Conf.CPU = Args.getLastArgValue(OPT_arch);
   Conf.Options = codegen::InitTargetOptionsFromCodeGenFlags(Triple);
 
-  if (auto *Arg = Args.getLastArg(OPT_opt_remarks_filename))
-    Conf.RemarksFilename = Arg->getValue();
-  else
-    Conf.RemarksFilename = RemarksFilename;
-  
-  if (auto *Arg = Args.getLastArg(OPT_opt_remarks_filter))
-    Conf.RemarksPasses = Arg->getValue();
-  else
-    Conf.RemarksPasses = RemarksPasses;
-  
-  if (auto *Arg = Args.getLastArg(OPT_opt_remarks_format))
-    Conf.RemarksFormat = Arg->getValue();
-  else
-    Conf.RemarksFormat = RemarksFormat;
+  Conf.RemarksFilename = Args.getLastArgValue(OPT_opt_remarks_filename, RemarksFilename);
+  Conf.RemarksPasses = Args.getLastArgValue(OPT_opt_remarks_filter, RemarksPasses);
+  Conf.RemarksFormat = Args.getLastArgValue(OPT_opt_remarks_format, RemarksFormat);
 
   Conf.RemarksWithHotness = Args.hasArg(OPT_opt_remarks_with_hotness) || RemarksWithHotness;
   Conf.RemarksHotnessThreshold = RemarksHotnessThreshold;

clang/tools/clang-nvlink-wrapper/NVLinkOpts.td

@@ -73,24 +73,15 @@ def : Joined<["--", "-"], "plugin-opt=emit-llvm">,
 def : Joined<["--", "-"], "plugin-opt=emit-asm">,
   Flags<[WrapperOnlyOption]>, Alias<lto_emit_asm>;
 
-def opt_remarks_filename : Separate<["--"], "opt-remarks-filename">,
+def opt_remarks_filename : Joined<["--", "-"], "plugin-opt=opt-remarks-filename=">,
   Flags<[WrapperOnlyOption]>, HelpText<"YAML output file for optimization remarks">;
-def opt_remarks_format : Separate<["--"], "opt-remarks-format">,
+def opt_remarks_format : Joined<["--", "-"], "plugin-opt=opt-remarks-format=">,
   Flags<[WrapperOnlyOption]>, HelpText<"The format used for serializing remarks (default: YAML)">;
-def opt_remarks_filter : Separate<["--"], "opt-remarks-filter">, 
+def opt_remarks_filter : Joined<["--", "-"], "plugin-opt=opt-remarks-filter=">, 
   Flags<[WrapperOnlyOption]>, HelpText<"Regex for the passes that need to be serialized to the output file">;
-def opt_remarks_with_hotness : Flag<["--"], "opt-remarks-with-hotness">,
+def opt_remarks_with_hotness : Flag<["--", "-"], "plugin-opt=opt-remarks-with-hotness">,
   Flags<[WrapperOnlyOption]>, HelpText<"Include hotness information in the optimization remarks file">;
 
-def : Joined<["--", "-"], "plugin-opt=opt-remarks-filename=">,
-  Flags<[WrapperOnlyOption]>, Alias<opt_remarks_filename>;
-def : Joined<["--", "-"], "plugin-opt=opt-remarks-format=">,
-  Flags<[WrapperOnlyOption]>, Alias<opt_remarks_format>;
-def : Joined<["--", "-"], "plugin-opt=opt-remarks-filter=">,
-  Flags<[WrapperOnlyOption]>, Alias<opt_remarks_filter>;
-def : Flag<["--", "-"], "plugin-opt=opt-remarks-with-hotness">,
-  Flags<[WrapperOnlyOption]>, Alias<opt_remarks_with_hotness>;
-
 def plugin_opt : Joined<["--", "-"], "plugin-opt=">, Flags<[WrapperOnlyOption]>,
   HelpText<"Options passed to LLVM, not including the Clang invocation. Use "
            "'--plugin-opt=--help' for a list of options.">;