style fix

Signed-off-by: Nathan Gauër <[email protected]>

Author: Keenuts

clang/lib/CodeGen/CGBuiltin.cpp

@@ -1146,8 +1146,8 @@ llvm::IntrinsicInst *getConvergenceToken(llvm::BasicBlock *BB) {
 } // namespace
 
 llvm::CallBase *
-CodeGenFunction::AddConvergenceControlAttr(llvm::CallBase *Input,
-                                           llvm::Value *ParentToken) {
+CodeGenFunction::addConvergenceControlToken(llvm::CallBase *Input,
+                                            llvm::Value *ParentToken) {
   llvm::Value *bundleArgs[] = {ParentToken};
   llvm::OperandBundleDef OB("convergencectrl", bundleArgs);
   auto Output = llvm::CallBase::addOperandBundle(
@@ -1158,15 +1158,15 @@ CodeGenFunction::AddConvergenceControlAttr(llvm::CallBase *Input,
 }
 
 llvm::IntrinsicInst *
-CodeGenFunction::EmitConvergenceLoop(llvm::BasicBlock *BB,
-                                     llvm::Value *ParentToken) {
+CodeGenFunction::emitConvergenceLoopToken(llvm::BasicBlock *BB,
+                                          llvm::Value *ParentToken) {
   CGBuilderTy::InsertPoint IP = Builder.saveIP();
   Builder.SetInsertPoint(&BB->front());
   auto CB = Builder.CreateIntrinsic(
       llvm::Intrinsic::experimental_convergence_loop, {}, {});
   Builder.restoreIP(IP);
 
-  auto I = AddConvergenceControlAttr(CB, ParentToken);
+  auto I = addConvergenceControlToken(CB, ParentToken);
   return cast<llvm::IntrinsicInst>(I);
 }
 
@@ -1201,20 +1201,20 @@ CodeGenFunction::getOrEmitConvergenceLoopToken(const LoopInfo *LI) {
 
   llvm::IntrinsicInst *PII =
       LI->getParent()
-          ? EmitConvergenceLoop(LI->getHeader(),
-                                getOrEmitConvergenceLoopToken(LI->getParent()))
+          ? emitConvergenceLoopToken(
+                LI->getHeader(), getOrEmitConvergenceLoopToken(LI->getParent()))
           : getOrEmitConvergenceEntryToken(LI->getHeader()->getParent());
 
-  return EmitConvergenceLoop(LI->getHeader(), PII);
+  return emitConvergenceLoopToken(LI->getHeader(), PII);
 }
 
 llvm::CallBase *
-CodeGenFunction::AddControlledConvergenceAttr(llvm::CallBase *Input) {
+CodeGenFunction::addControlledConvergenceToken(llvm::CallBase *Input) {
   llvm::Value *ParentToken =
       LoopStack.hasInfo()
           ? getOrEmitConvergenceLoopToken(&LoopStack.getInfo())
           : getOrEmitConvergenceEntryToken(Input->getFunction());
-  return AddConvergenceControlAttr(Input, ParentToken);
+  return addConvergenceControlToken(Input, ParentToken);
 }
 
 BitTest BitTest::decodeBitTestBuiltin(unsigned BuiltinID) {
@@ -5892,7 +5892,7 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
         llvm::FunctionType::get(IntTy, {}, false), "__hlsl_wave_get_lane_index",
         {}, false, true));
     if (getTarget().getTriple().isSPIRVLogical())
-      CI = dyn_cast<CallInst>(AddControlledConvergenceAttr(CI));
+      CI = dyn_cast<CallInst>(addControlledConvergenceToken(CI));
     return RValue::get(CI);
   }
 

clang/lib/CodeGen/CGCall.cpp

@@ -5693,7 +5693,7 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
     CI->setName("call");
 
   if (getTarget().getTriple().isSPIRVLogical() && CI->isConvergent())
-    CI = AddControlledConvergenceAttr(CI);
+    CI = addControlledConvergenceToken(CI);
 
   // Update largest vector width from the return type.
   LargestVectorWidth =

clang/lib/CodeGen/CodeGenFunction.h

@@ -4870,19 +4870,19 @@ class CodeGenFunction : public CodeGenTypeCache {
   llvm::Value *emitBoolVecConversion(llvm::Value *SrcVec,
                                      unsigned NumElementsDst,
                                      const llvm::Twine &Name = "");
-  // Adds a convergence_ctrl attribute to |Input| and emits the required parent
+  // Adds a convergence_ctrl token to |Input| and emits the required parent
   // convergence instructions.
-  llvm::CallBase *AddControlledConvergenceAttr(llvm::CallBase *Input);
+  llvm::CallBase *addControlledConvergenceToken(llvm::CallBase *Input);
 
 private:
   // Emits a convergence_loop instruction for the given |BB|, with |ParentToken|
   // as it's parent convergence instr.
-  llvm::IntrinsicInst *EmitConvergenceLoop(llvm::BasicBlock *BB,
-                                           llvm::Value *ParentToken);
-  // Adds a convergence_ctrl attribute with |ParentToken| as parent convergence
+  llvm::IntrinsicInst *emitConvergenceLoopToken(llvm::BasicBlock *BB,
+                                                llvm::Value *ParentToken);
+  // Adds a convergence_ctrl token with |ParentToken| as parent convergence
   // instr to the call |Input|.
-  llvm::CallBase *AddConvergenceControlAttr(llvm::CallBase *Input,
-                                            llvm::Value *ParentToken);
+  llvm::CallBase *addConvergenceControlToken(llvm::CallBase *Input,
+                                             llvm::Value *ParentToken);
   // Find the convergence_entry instruction |F|, or emits ones if none exists.
   // Returns the convergence instruction.
   llvm::IntrinsicInst *getOrEmitConvergenceEntryToken(llvm::Function *F);