address comments

Author: AlexMaclean

llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp

@@ -635,23 +635,23 @@ static bool usedInGlobalVarDef(const Constant *C) {
   return false;
 }
 
-static bool usedInOneFunc(const User *U, Function const *&oneFunc) {
-  if (const GlobalVariable *othergv = dyn_cast<GlobalVariable>(U))
-    if (othergv->getName() == "llvm.used")
+static bool usedInOneFunc(const User *U, Function const *&OneFunc) {
+  if (const GlobalVariable *OtherGV = dyn_cast<GlobalVariable>(U))
+    if (OtherGV->getName() == "llvm.used")
       return true;
 
   if (const Instruction *I = dyn_cast<Instruction>(U)) {
     if (const Function *CurFunc = I->getFunction()) {
-      if (oneFunc && (CurFunc != oneFunc))
+      if (OneFunc && (CurFunc != OneFunc))
         return false;
-      oneFunc = CurFunc;
+      OneFunc = CurFunc;
       return true;
     }
     return false;
   }
 
   for (const User *UU : U->users())
-    if (!usedInOneFunc(UU, oneFunc))
+    if (!usedInOneFunc(UU, OneFunc))
       return false;
 
   return true;
@@ -806,7 +806,7 @@ void NVPTXAsmPrinter::emitGlobals(const Module &M) {
 
   // Print out module-level global variables in proper order
   for (const GlobalVariable *GV : Globals)
-    printModuleLevelGV(GV, OS2, /*processDemoted=*/false, STI);
+    printModuleLevelGV(GV, OS2, /*ProcessDemoted=*/false, STI);
 
   OS2 << '\n';
 
@@ -827,15 +827,14 @@ void NVPTXAsmPrinter::emitGlobalAlias(const Module &M, const GlobalAlias &GA) {
 
 void NVPTXAsmPrinter::emitHeader(Module &M, raw_ostream &O,
                                  const NVPTXSubtarget &STI) {
-  O << "//\n"
-    << "// Generated by LLVM NVPTX Back-End\n"
-    << "//\n"
-    << "\n";
+  const unsigned PTXVersion = STI.getPTXVersion();
 
-  unsigned PTXVersion = STI.getPTXVersion();
-  O << ".version " << (PTXVersion / 10) << "." << (PTXVersion % 10) << "\n";
-
-  O << ".target " << STI.getTargetName();
+  O << "//\n"
+       "// Generated by LLVM NVPTX Back-End\n"
+       "//\n"
+       "\n"
+    << ".version " << (PTXVersion / 10) << "." << (PTXVersion % 10) << "\n"
+    << ".target " << STI.getTargetName();
 
   const NVPTXTargetMachine &NTM = static_cast<const NVPTXTargetMachine &>(TM);
   if (NTM.getDrvInterface() == NVPTX::NVCL)
@@ -860,7 +859,6 @@ void NVPTXAsmPrinter::emitHeader(Module &M, raw_ostream &O,
 
   O << "\n"
     << ".address_size " << (NTM.is64Bit() ? "64" : "32") << "\n"
-
     << "\n";
 }
 
@@ -910,9 +908,7 @@ void NVPTXAsmPrinter::emitLinkageDirective(const GlobalValue *V,
   if (static_cast<NVPTXTargetMachine &>(TM).getDrvInterface() == NVPTX::CUDA) {
     if (V->hasExternalLinkage()) {
       if (const auto *GVar = dyn_cast<GlobalVariable>(V))
-
         O << (GVar->hasInitializer() ? ".visible " : ".extern ");
-
       else if (V->isDeclaration())
         O << ".extern ";
       else
@@ -927,7 +923,7 @@ void NVPTXAsmPrinter::emitLinkageDirective(const GlobalValue *V,
 }
 
 void NVPTXAsmPrinter::printModuleLevelGV(const GlobalVariable *GVar,
-                                         raw_ostream &O, bool processDemoted,
+                                         raw_ostream &O, bool ProcessDemoted,
                                          const NVPTXSubtarget &STI) {
   // Skip meta data
   if (GVar->hasSection())
@@ -1050,7 +1046,7 @@ void NVPTXAsmPrinter::printModuleLevelGV(const GlobalVariable *GVar,
   }
 
   const Function *DemotedFunc = nullptr;
-  if (!processDemoted && canDemoteGlobalVar(GVar, DemotedFunc)) {
+  if (!ProcessDemoted && canDemoteGlobalVar(GVar, DemotedFunc)) {
     O << "// " << GVar->getName() << " has been demoted\n";
     localDecls[DemotedFunc].push_back(GVar);
     return;
@@ -1536,15 +1532,15 @@ void NVPTXAsmPrinter::emitFunctionParamList(const Function *F, raw_ostream &O) {
     }
     // Non-kernel function, just print .param .b<size> for ABI
     // and .reg .b<size> for non-ABI
-    unsigned sz;
+    unsigned Size;
     if (auto *ITy = dyn_cast<IntegerType>(Ty)) {
-      sz = promoteScalarArgumentSize(ITy->getBitWidth());
+      Size = promoteScalarArgumentSize(ITy->getBitWidth());
     } else if (PTy) {
       assert(PTySizeInBits && "Invalid pointer size");
-      sz = PTySizeInBits;
+      Size = PTySizeInBits;
     } else
-      sz = Ty->getPrimitiveSizeInBits();
-    O << "\t.param .b" << sz << " " << ParamSym;
+      Size = Ty->getPrimitiveSizeInBits();
+    O << "\t.param .b" << Size << " " << ParamSym;
   }
 
   if (F->isVarArg()) {