change implemented builtin

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

Author: Keenuts

clang/include/clang/Basic/Builtins.td

@@ -4518,6 +4518,13 @@ def HLSLWaveActiveCountBits : LangBuiltin<"HLSL_LANG"> {
   let Prototype = "unsigned int(bool)";
 }
 
+// HLSL
+def HLSLWaveGetLaneIndex : LangBuiltin<"HLSL_LANG"> {
+  let Spellings = ["__builtin_hlsl_wave_get_lane_index"];
+  let Attributes = [NoThrow, Const];
+  let Prototype = "unsigned int()";
+}
+
 def HLSLCreateHandle : LangBuiltin<"HLSL_LANG"> {
   let Spellings = ["__builtin_hlsl_create_handle"];
   let Attributes = [NoThrow, Const];

clang/lib/CodeGen/CGBuiltin.cpp

@@ -1169,8 +1169,7 @@ CodeGenFunction::EmitConvergenceLoop(llvm::BasicBlock *BB,
   // Removing any old attributes.
   I->setNotConvergent();
 
-  assert(isa<llvm::IntrinsicInst>(I));
-  return dyn_cast<llvm::IntrinsicInst>(I);
+  return cast<llvm::IntrinsicInst>(I);
 }
 
 llvm::IntrinsicInst *
@@ -1191,7 +1190,7 @@ CodeGenFunction::getOrEmitConvergenceEntryToken(llvm::Function *F) {
   assert(isa<llvm::IntrinsicInst>(I));
   Builder.restoreIP(IP);
 
-  return dyn_cast<llvm::IntrinsicInst>(I);
+  return cast<llvm::IntrinsicInst>(I);
 }
 
 llvm::IntrinsicInst *
@@ -5785,14 +5784,10 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
         {NDRange, Kernel, Block}));
   }
 
-  case Builtin::BI__builtin_hlsl_wave_active_count_bits: {
-    llvm::Type *BoolTy = llvm::IntegerType::get(getLLVMContext(), 1);
-    llvm::Value *Src0 = EmitScalarExpr(E->getArg(0));
-    auto *CI =
-        EmitRuntimeCall(CGM.CreateRuntimeFunction(
-                            llvm::FunctionType::get(IntTy, {BoolTy}, false),
-                            "__hlsl_wave_active_count_bits", {}),
-                        {Src0});
+  case Builtin::BI__builtin_hlsl_wave_get_lane_index: {
+    auto *CI = EmitRuntimeCall(CGM.CreateRuntimeFunction(
+        llvm::FunctionType::get(IntTy, {}, false), "__hlsl_wave_get_lane_index",
+        {}, false, true));
     if (getTarget().getTriple().isSPIRVLogical())
       CI = dyn_cast<CallInst>(AddControlledConvergenceAttr(CI));
     return RValue::get(CI);

clang/lib/Headers/hlsl/hlsl_intrinsics.h

@@ -775,5 +775,10 @@ _HLSL_AVAILABILITY(shadermodel, 6.0)
 _HLSL_BUILTIN_ALIAS(__builtin_hlsl_wave_active_count_bits)
 uint WaveActiveCountBits(bool Val);
 
+/// \brief Returns the index of the current lane within the current wave.
+_HLSL_AVAILABILITY(shadermodel, 6.0)
+_HLSL_BUILTIN_ALIAS(__builtin_hlsl_wave_get_lane_index)
+uint WaveGetLaneIndex();
+
 } // namespace hlsl
 #endif //_HLSL_HLSL_INTRINSICS_H_