[HLSL] Add support for SV_GroupIndex in SPIR-V #130672

cassiebeckley · 2025-03-10T21:16:23Z

Lower the SV_GroupIndex semantic as the llvm.spv.flattened.thread.id.in.group intrinsic.

Depends on #130670.

Lower the `SV_GroupIndex` semantic as the `llvm.spv.flattened.thread.id.in.group` intrinsic.

github-actions · 2025-03-10T21:16:43Z

Thank you for submitting a Pull Request (PR) to the LLVM Project!

This PR will be automatically labeled and the relevant teams will be notified.

If you wish to, you can add reviewers by using the "Reviewers" section on this page.

If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using @ followed by their GitHub username.

If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers.

If you have further questions, they may be answered by the LLVM GitHub User Guide.

You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums.

cassiebeckley · 2025-03-10T21:16:49Z

@Keenuts @s-perron

llvmbot · 2025-03-10T21:17:11Z

@llvm/pr-subscribers-clang-codegen

@llvm/pr-subscribers-hlsl

Author: Cassandra Beckley (cassiebeckley)

Changes

Lower the SV_GroupIndex semantic as the llvm.spv.flattened.thread.id.in.group intrinsic.

Full diff: https://github.com/llvm/llvm-project/pull/130672.diff

3 Files Affected:

(modified) clang/lib/CodeGen/CGHLSLRuntime.cpp (+3-3)
(modified) clang/lib/CodeGen/CGHLSLRuntime.h (+2)
(modified) clang/test/CodeGenHLSL/semantics/GroupIndex-codegen.hlsl (+12-10)

diff --git a/clang/lib/CodeGen/CGHLSLRuntime.cpp b/clang/lib/CodeGen/CGHLSLRuntime.cpp
index dc34653e8f497..ad06f89b5975f 100644
--- a/clang/lib/CodeGen/CGHLSLRuntime.cpp
+++ b/clang/lib/CodeGen/CGHLSLRuntime.cpp
@@ -437,9 +437,9 @@ llvm::Value *CGHLSLRuntime::emitInputSemantic(IRBuilder<> &B,
                                               llvm::Type *Ty) {
   assert(D.hasAttrs() && "Entry parameter missing annotation attribute!");
   if (D.hasAttr<HLSLSV_GroupIndexAttr>()) {
-    llvm::Function *DxGroupIndex =
-        CGM.getIntrinsic(Intrinsic::dx_flattened_thread_id_in_group);
-    return B.CreateCall(FunctionCallee(DxGroupIndex));
+    llvm::Function *GroupIndex =
+        CGM.getIntrinsic(getFlattenedThreadIdInGroupIntrinsic());
+    return B.CreateCall(FunctionCallee(GroupIndex));
   }
   if (D.hasAttr<HLSLSV_DispatchThreadIDAttr>()) {
     llvm::Function *ThreadIDIntrinsic =
diff --git a/clang/lib/CodeGen/CGHLSLRuntime.h b/clang/lib/CodeGen/CGHLSLRuntime.h
index a9da42324a038..45ab9f8325489 100644
--- a/clang/lib/CodeGen/CGHLSLRuntime.h
+++ b/clang/lib/CodeGen/CGHLSLRuntime.h
@@ -86,6 +86,8 @@ class CGHLSLRuntime {
   GENERATE_HLSL_INTRINSIC_FUNCTION(Cross, cross)
   GENERATE_HLSL_INTRINSIC_FUNCTION(Degrees, degrees)
   GENERATE_HLSL_INTRINSIC_FUNCTION(Frac, frac)
+  GENERATE_HLSL_INTRINSIC_FUNCTION(FlattenedThreadIdInGroup,
+                                   flattened_thread_id_in_group)
   GENERATE_HLSL_INTRINSIC_FUNCTION(Lerp, lerp)
   GENERATE_HLSL_INTRINSIC_FUNCTION(Normalize, normalize)
   GENERATE_HLSL_INTRINSIC_FUNCTION(Rsqrt, rsqrt)
diff --git a/clang/test/CodeGenHLSL/semantics/GroupIndex-codegen.hlsl b/clang/test/CodeGenHLSL/semantics/GroupIndex-codegen.hlsl
index ea358c411997d..e78583b1fb0f0 100644
--- a/clang/test/CodeGenHLSL/semantics/GroupIndex-codegen.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/GroupIndex-codegen.hlsl
@@ -1,7 +1,8 @@
-// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-compute -x hlsl -emit-llvm -disable-llvm-passes -o - -hlsl-entry main %s | FileCheck %s
+// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-compute -x hlsl -emit-llvm -disable-llvm-passes -o - -hlsl-entry main %s | FileCheck %s --check-prefixes=CHECK,CHECK-DXIL -DTARGET=dx
+// RUN: %clang_cc1 -triple spirv-unknown-vulkan-compute -x hlsl -emit-llvm -disable-llvm-passes -o - -hlsl-entry main %s | FileCheck %s --check-prefixes=CHECK,CHECK-SPIRV -DTARGET=spv
 
-[numthreads(1,1,1)]
-void main(unsigned GI : SV_GroupIndex) {
+[numthreads(1, 1, 1)] void main(unsigned GI : SV_GroupIndex)
+{
   main(GI - 1);
 }
 
@@ -10,13 +11,14 @@ void main(unsigned GI : SV_GroupIndex) {
 // semantic parameters and provides the expected void(void) signature that
 // drivers expect for entry points.
 
-//CHECK: define void @main() #[[#ENTRY_ATTR:]] {
-//CHECK-NEXT: entry:
-//CHECK-NEXT:   %0 = call i32 @llvm.dx.flattened.thread.id.in.group()
-//CHECK-NEXT:   call void @_Z4mainj(i32 %0)
-//CHECK-NEXT:   ret void
-//CHECK-NEXT: }
+// CHECK: define void @main() #[[#ENTRY_ATTR:]] {
+// CHECK: entry:
+// CHECK:   %[[#ID_X:]] = call i32 @llvm.[[TARGET]].flattened.thread.id.in.group()
+// CHECK-DXIL:   call void @_Z4mainj(i32 %[[#ID_X]])
+// CHECK-SPIRV:   call spir_func void @_Z4mainj(i32 %[[#ID_X]])
+// CHECK:   ret void
+// CHECK: }
 
 // Verify that the entry had the expected dx.shader attribute
 
-//CHECK: attributes #[[#ENTRY_ATTR]] = { {{.*}}"hlsl.shader"="compute"{{.*}} }
+// CHECK: attributes #[[#ENTRY_ATTR]] = { {{.*}}"hlsl.shader"="compute"{{.*}} }

llvmbot · 2025-03-10T21:17:12Z

@llvm/pr-subscribers-clang

Author: Cassandra Beckley (cassiebeckley)

Changes

Lower the SV_GroupIndex semantic as the llvm.spv.flattened.thread.id.in.group intrinsic.

Full diff: https://github.com/llvm/llvm-project/pull/130672.diff

3 Files Affected:

(modified) clang/lib/CodeGen/CGHLSLRuntime.cpp (+3-3)
(modified) clang/lib/CodeGen/CGHLSLRuntime.h (+2)
(modified) clang/test/CodeGenHLSL/semantics/GroupIndex-codegen.hlsl (+12-10)

diff --git a/clang/lib/CodeGen/CGHLSLRuntime.cpp b/clang/lib/CodeGen/CGHLSLRuntime.cpp
index dc34653e8f497..ad06f89b5975f 100644
--- a/clang/lib/CodeGen/CGHLSLRuntime.cpp
+++ b/clang/lib/CodeGen/CGHLSLRuntime.cpp
@@ -437,9 +437,9 @@ llvm::Value *CGHLSLRuntime::emitInputSemantic(IRBuilder<> &B,
                                               llvm::Type *Ty) {
   assert(D.hasAttrs() && "Entry parameter missing annotation attribute!");
   if (D.hasAttr<HLSLSV_GroupIndexAttr>()) {
-    llvm::Function *DxGroupIndex =
-        CGM.getIntrinsic(Intrinsic::dx_flattened_thread_id_in_group);
-    return B.CreateCall(FunctionCallee(DxGroupIndex));
+    llvm::Function *GroupIndex =
+        CGM.getIntrinsic(getFlattenedThreadIdInGroupIntrinsic());
+    return B.CreateCall(FunctionCallee(GroupIndex));
   }
   if (D.hasAttr<HLSLSV_DispatchThreadIDAttr>()) {
     llvm::Function *ThreadIDIntrinsic =
diff --git a/clang/lib/CodeGen/CGHLSLRuntime.h b/clang/lib/CodeGen/CGHLSLRuntime.h
index a9da42324a038..45ab9f8325489 100644
--- a/clang/lib/CodeGen/CGHLSLRuntime.h
+++ b/clang/lib/CodeGen/CGHLSLRuntime.h
@@ -86,6 +86,8 @@ class CGHLSLRuntime {
   GENERATE_HLSL_INTRINSIC_FUNCTION(Cross, cross)
   GENERATE_HLSL_INTRINSIC_FUNCTION(Degrees, degrees)
   GENERATE_HLSL_INTRINSIC_FUNCTION(Frac, frac)
+  GENERATE_HLSL_INTRINSIC_FUNCTION(FlattenedThreadIdInGroup,
+                                   flattened_thread_id_in_group)
   GENERATE_HLSL_INTRINSIC_FUNCTION(Lerp, lerp)
   GENERATE_HLSL_INTRINSIC_FUNCTION(Normalize, normalize)
   GENERATE_HLSL_INTRINSIC_FUNCTION(Rsqrt, rsqrt)
diff --git a/clang/test/CodeGenHLSL/semantics/GroupIndex-codegen.hlsl b/clang/test/CodeGenHLSL/semantics/GroupIndex-codegen.hlsl
index ea358c411997d..e78583b1fb0f0 100644
--- a/clang/test/CodeGenHLSL/semantics/GroupIndex-codegen.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/GroupIndex-codegen.hlsl
@@ -1,7 +1,8 @@
-// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-compute -x hlsl -emit-llvm -disable-llvm-passes -o - -hlsl-entry main %s | FileCheck %s
+// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-compute -x hlsl -emit-llvm -disable-llvm-passes -o - -hlsl-entry main %s | FileCheck %s --check-prefixes=CHECK,CHECK-DXIL -DTARGET=dx
+// RUN: %clang_cc1 -triple spirv-unknown-vulkan-compute -x hlsl -emit-llvm -disable-llvm-passes -o - -hlsl-entry main %s | FileCheck %s --check-prefixes=CHECK,CHECK-SPIRV -DTARGET=spv
 
-[numthreads(1,1,1)]
-void main(unsigned GI : SV_GroupIndex) {
+[numthreads(1, 1, 1)] void main(unsigned GI : SV_GroupIndex)
+{
   main(GI - 1);
 }
 
@@ -10,13 +11,14 @@ void main(unsigned GI : SV_GroupIndex) {
 // semantic parameters and provides the expected void(void) signature that
 // drivers expect for entry points.
 
-//CHECK: define void @main() #[[#ENTRY_ATTR:]] {
-//CHECK-NEXT: entry:
-//CHECK-NEXT:   %0 = call i32 @llvm.dx.flattened.thread.id.in.group()
-//CHECK-NEXT:   call void @_Z4mainj(i32 %0)
-//CHECK-NEXT:   ret void
-//CHECK-NEXT: }
+// CHECK: define void @main() #[[#ENTRY_ATTR:]] {
+// CHECK: entry:
+// CHECK:   %[[#ID_X:]] = call i32 @llvm.[[TARGET]].flattened.thread.id.in.group()
+// CHECK-DXIL:   call void @_Z4mainj(i32 %[[#ID_X]])
+// CHECK-SPIRV:   call spir_func void @_Z4mainj(i32 %[[#ID_X]])
+// CHECK:   ret void
+// CHECK: }
 
 // Verify that the entry had the expected dx.shader attribute
 
-//CHECK: attributes #[[#ENTRY_ATTR]] = { {{.*}}"hlsl.shader"="compute"{{.*}} }
+// CHECK: attributes #[[#ENTRY_ATTR]] = { {{.*}}"hlsl.shader"="compute"{{.*}} }

clang/test/CodeGenHLSL/semantics/GroupIndex-codegen.hlsl

github-actions · 2025-03-21T18:53:06Z

@cassiebeckley Congratulations on having your first Pull Request (PR) merged into the LLVM Project!

Your changes will be combined with recent changes from other authors, then tested by our build bots. If there is a problem with a build, you may receive a report in an email or a comment on this PR.

Please check whether problems have been caused by your change specifically, as the builds can include changes from many authors. It is not uncommon for your change to be included in a build that fails due to someone else's changes, or infrastructure issues.

How to do this, and the rest of the post-merge process, is covered in detail here.

If your change does cause a problem, it may be reverted, or you can revert it yourself. This is a normal part of LLVM development. You can fix your changes and open a new PR to merge them again.

If you don't get any reports, no action is required from you. Your changes are working as expected, well done!

[HLSL] Add support for SV_GroupIndex in SPIR-V

d4429f7

Lower the `SV_GroupIndex` semantic as the `llvm.spv.flattened.thread.id.in.group` intrinsic.

llvmbot added clang Clang issues not falling into any other category clang:codegen IR generation bugs: mangling, exceptions, etc. HLSL HLSL Language Support labels Mar 10, 2025

github-project-automation bot added this to HLSL Support Mar 10, 2025

s-perron requested review from Keenuts and s-perron March 17, 2025 19:15

s-perron approved these changes Mar 17, 2025

View reviewed changes

clang/test/CodeGenHLSL/semantics/GroupIndex-codegen.hlsl Outdated Show resolved Hide resolved

cassiebeckley and others added 3 commits March 17, 2025 14:52

Formatting

30bab18

Undo unnecessary formatting change

d3321a2

Merge branch 'main' into hlsl-spirv-group-index

ed795e8

Keenuts approved these changes Mar 21, 2025

View reviewed changes

s-perron merged commit 3757ecf into llvm:main Mar 21, 2025
12 checks passed

cassiebeckley mentioned this pull request Mar 21, 2025

Request Commit Access For cassiebeckley #132479

Closed

cassiebeckley deleted the hlsl-spirv-group-index branch March 24, 2025 17:37

damyanp moved this to Closed in HLSL Support Apr 25, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[HLSL] Add support for SV_GroupIndex in SPIR-V #130672

[HLSL] Add support for SV_GroupIndex in SPIR-V #130672

Uh oh!

cassiebeckley commented Mar 10, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Mar 10, 2025

Uh oh!

cassiebeckley commented Mar 10, 2025

Uh oh!

llvmbot commented Mar 10, 2025 •

edited

Loading

Uh oh!

llvmbot commented Mar 10, 2025

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Mar 21, 2025

Uh oh!

Uh oh!

[HLSL] Add support for SV_GroupIndex in SPIR-V #130672

[HLSL] Add support for SV_GroupIndex in SPIR-V #130672

Uh oh!

Conversation

cassiebeckley commented Mar 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Mar 10, 2025

Uh oh!

cassiebeckley commented Mar 10, 2025

Uh oh!

llvmbot commented Mar 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

llvmbot commented Mar 10, 2025

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Mar 21, 2025

Uh oh!

Uh oh!

cassiebeckley commented Mar 10, 2025 •

edited

Loading

llvmbot commented Mar 10, 2025 •

edited

Loading