Added PPC to variable name and added isPPC() guard.

Author: stefanp-synopsys

clang/include/clang/Basic/CodeGenOptions.def

@@ -197,7 +197,7 @@ CODEGENOPT(HIPCorrectlyRoundedDivSqrt, 1, 1) ///< -fno-hip-fp32-correctly-rounde
 CODEGENOPT(HIPSaveKernelArgName, 1, 0) ///< Set when -fhip-kernel-arg-name is enabled.
 CODEGENOPT(UniqueInternalLinkageNames, 1, 0) ///< Internal Linkage symbols get unique names.
 CODEGENOPT(SplitMachineFunctions, 1, 0) ///< Split machine functions using profile information.
-CODEGENOPT(UseFullRegisterNames, 1, 0) ///< Print full register names in assembly -mregnames
+CODEGENOPT(PPCUseFullRegisterNames, 1, 0) ///< Print full register names in assembly -mregnames
 
 /// When false, this attempts to generate code as if the result of an
 /// overflowing conversion matches the overflowing behavior of a target's native

clang/include/clang/Driver/Options.td

@@ -4791,7 +4791,7 @@ def mprivileged : Flag<["-"], "mprivileged">,
     Group<m_ppc_Features_Group>;
 
 defm regnames : BoolOption<"m", "regnames",
-  CodeGenOpts<"UseFullRegisterNames">, DefaultFalse,
+  CodeGenOpts<"PPCUseFullRegisterNames">, DefaultFalse,
   PosFlag<SetTrue, [], [ClangOption, CC1Option], "Use full register names when writing assembly output">,
   NegFlag<SetFalse, [], [ClangOption], "Use only register numbers when writing assembly output">>,
   Group<m_Group>;

clang/lib/CodeGen/BackendUtil.cpp

@@ -488,7 +488,8 @@ static bool initTargetOptions(DiagnosticsEngine &Diags,
   Options.MCOptions.Argv0 = CodeGenOpts.Argv0;
   Options.MCOptions.CommandLineArgs = CodeGenOpts.CommandLineArgs;
   Options.MCOptions.AsSecureLogFile = CodeGenOpts.AsSecureLogFile;
-  Options.MCOptions.UseFullRegisterNames = CodeGenOpts.UseFullRegisterNames;
+  Options.MCOptions.PPCUseFullRegisterNames =
+      CodeGenOpts.PPCUseFullRegisterNames;
   Options.MisExpect = CodeGenOpts.MisExpect;
 
   return true;

clang/lib/Driver/ToolChains/Clang.cpp

@@ -5014,11 +5014,11 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     Args.AddLastArg(CmdArgs, options::OPT_fthinlto_index_EQ);
   }
 
-  if (const Arg *A =
-          Args.getLastArg(options::OPT_mregnames, options::OPT_mno_regnames)) {
-    if (A->getOption().matches(options::OPT_mregnames))
-      Args.AddLastArg(CmdArgs, options::OPT_mregnames);
-  }
+  if (Triple.isPPC())
+    if (const Arg *A =
+            Args.getLastArg(options::OPT_mregnames, options::OPT_mno_regnames))
+      if (A->getOption().matches(options::OPT_mregnames))
+        Args.AddLastArg(CmdArgs, options::OPT_mregnames);
 
   if (Args.getLastArg(options::OPT_fthin_link_bitcode_EQ))
     Args.AddLastArg(CmdArgs, options::OPT_fthin_link_bitcode_EQ);

clang/lib/Frontend/CompilerInvocation.cpp

@@ -1781,7 +1781,7 @@ bool CompilerInvocation::ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args,
   }
 
   if (const Arg *A = Args.getLastArg(OPT_mregnames))
-    Opts.UseFullRegisterNames = true;
+    Opts.PPCUseFullRegisterNames = true;
 
   for (const auto &Arg : Args.getAllArgValues(OPT_fdebug_prefix_map_EQ)) {
     auto Split = StringRef(Arg).split('=');

llvm/include/llvm/MC/MCAsmInfo.h

@@ -241,7 +241,7 @@ class MCAsmInfo {
   bool HasLEB128Directives = true;
 
   /// True if full register names are printed.
-  bool UseFullRegisterNames = false;
+  bool PPCUseFullRegisterNames = false;
 
   //===--- Data Emission Directives -------------------------------------===//
 
@@ -713,8 +713,8 @@ class MCAsmInfo {
 
   bool hasLEB128Directives() const { return HasLEB128Directives; }
 
-  bool useFullRegisterNames() const { return UseFullRegisterNames; }
-  void setFullRegisterNames(bool V) { UseFullRegisterNames = V; }
+  bool useFullRegisterNames() const { return PPCUseFullRegisterNames; }
+  void setFullRegisterNames(bool V) { PPCUseFullRegisterNames = V; }
 
   const char *getZeroDirective() const { return ZeroDirective; }
   bool doesZeroDirectiveSupportNonZeroValue() const {

llvm/include/llvm/MC/MCTargetOptions.h

@@ -90,7 +90,7 @@ class MCTargetOptions {
   bool EmitCompactUnwindNonCanonical : 1;
 
   // Whether or not to use full register names on PowerPC.
-  bool UseFullRegisterNames : 1;
+  bool PPCUseFullRegisterNames : 1;
 
   MCTargetOptions();
 

llvm/lib/CodeGen/LLVMTargetMachine.cpp

@@ -81,7 +81,7 @@ void LLVMTargetMachine::initAsmInfo() {
 
   TmpAsmInfo->setRelaxELFRelocations(Options.RelaxELFRelocations);
 
-  TmpAsmInfo->setFullRegisterNames(Options.MCOptions.UseFullRegisterNames);
+  TmpAsmInfo->setFullRegisterNames(Options.MCOptions.PPCUseFullRegisterNames);
 
   if (Options.ExceptionModel != ExceptionHandling::None)
     TmpAsmInfo->setExceptionsType(Options.ExceptionModel);

llvm/lib/MC/MCAsmInfo.cpp

@@ -67,7 +67,7 @@ MCAsmInfo::MCAsmInfo() {
   UseIntegratedAssembler = true;
   ParseInlineAsmUsingAsmParser = false;
   PreserveAsmComments = true;
-  UseFullRegisterNames = false;
+  PPCUseFullRegisterNames = false;
 }
 
 MCAsmInfo::~MCAsmInfo() = default;

llvm/lib/MC/MCTargetOptions.cpp

@@ -19,7 +19,7 @@ MCTargetOptions::MCTargetOptions()
       PreserveAsmComments(true), Dwarf64(false),
       EmitDwarfUnwind(EmitDwarfUnwindType::Default),
       MCUseDwarfDirectory(DefaultDwarfDirectory),
-      EmitCompactUnwindNonCanonical(false), UseFullRegisterNames(false) {}
+      EmitCompactUnwindNonCanonical(false), PPCUseFullRegisterNames(false) {}
 
 StringRef MCTargetOptions::getABIName() const {
   return ABIName;