[HLSL] update StructuredBuffer subscript test for alwaysinline #109023
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The Alwaysinline change made the mangled form of entry points get removed. The StructuredBuffer-subscript.hlsl test was introduced in the meantime depending on that version of the entry point. This revises it in the same way as RWBuffer-subscript Follow up to llvm#89282
llvmbot
added
clang
|
@llvm/pr-subscribers-clang Author: Greg Roth (pow2clk) ChangesThe Alwaysinline change made the mangled form of entry points get removed. The StructuredBuffer-subscript.hlsl test was introduced in the meantime depending on that version of the entry point. This revises it in the same way as RWBuffer-subscript Follow up to #89282 Full diff: https://github.com/llvm/llvm-project/pull/109023.diff 1 Files Affected:
diff --git a/clang/test/CodeGenHLSL/builtins/StructuredBuffer-subscript.hlsl b/clang/test/CodeGenHLSL/builtins/StructuredBuffer-subscript.hlsl
index 9bd885d94d7e75..155749ec4f94a9 100644
--- a/clang/test/CodeGenHLSL/builtins/StructuredBuffer-subscript.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/StructuredBuffer-subscript.hlsl
@@ -11,6 +11,7 @@ void main(unsigned GI : SV_GroupIndex) {
// Even at -O0 the subscript operators get inlined. The -O0 IR is a bit messy
// and confusing to follow so the match here is pretty weak.
-// CHECK: define internal void @"?main@@YAXI@Z"
-// CHECK-NOT: call
+// CHECK: define void @main()
+// Verify inlining leaves only calls to "llvm." intrinsics
+// CHECK-NOT: call {{[^@]*}} @{{[^l][^l][^v][^m][^\.]}}
// CHECK: ret void
|
|
@llvm/pr-subscribers-hlsl Author: Greg Roth (pow2clk) ChangesThe Alwaysinline change made the mangled form of entry points get removed. The StructuredBuffer-subscript.hlsl test was introduced in the meantime depending on that version of the entry point. This revises it in the same way as RWBuffer-subscript Follow up to #89282 Full diff: https://github.com/llvm/llvm-project/pull/109023.diff 1 Files Affected:
diff --git a/clang/test/CodeGenHLSL/builtins/StructuredBuffer-subscript.hlsl b/clang/test/CodeGenHLSL/builtins/StructuredBuffer-subscript.hlsl
index 9bd885d94d7e75..155749ec4f94a9 100644
--- a/clang/test/CodeGenHLSL/builtins/StructuredBuffer-subscript.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/StructuredBuffer-subscript.hlsl
@@ -11,6 +11,7 @@ void main(unsigned GI : SV_GroupIndex) {
// Even at -O0 the subscript operators get inlined. The -O0 IR is a bit messy
// and confusing to follow so the match here is pretty weak.
-// CHECK: define internal void @"?main@@YAXI@Z"
-// CHECK-NOT: call
+// CHECK: define void @main()
+// Verify inlining leaves only calls to "llvm." intrinsics
+// CHECK-NOT: call {{[^@]*}} @{{[^l][^l][^v][^m][^\.]}}
// CHECK: ret void
|
llvm-beanz
approved these changes
Sep 17, 2024
python3kgae
approved these changes
Sep 17, 2024
thurstond
added a commit
that referenced
this pull request
Sep 17, 2024
hamphet
pushed a commit
to hamphet/llvm-project
that referenced
this pull request
Sep 18, 2024
…109023) The Alwaysinline change made the mangled form of entry points get removed. The StructuredBuffer-subscript.hlsl test was introduced in the meantime depending on that version of the entry point. This revises it in the same way as RWBuffer-subscript Follow up to llvm#89282
hamphet
pushed a commit
to hamphet/llvm-project
that referenced
this pull request
Sep 18, 2024
llvm#109023)" This reverts commit f4fe26d. Reason: 4a63f4d reverted "[HLSL] set alwaysinline on HLSL functions (llvm#106588)" due to a buildbot failure; this test (which builds upon the reverted patch) also needs to be reverted.
hamphet
pushed a commit
to hamphet/llvm-project
that referenced
this pull request
Sep 18, 2024
…ne (llvm#109023)" This reverts commit da03d17. I mistakenly reverted this fix-forward.
hamphet
pushed a commit
to hamphet/llvm-project
that referenced
this pull request
Sep 18, 2024
This reverts commit 4a63f4d. It was reverted because of a buildbot breakage, but the fix-forward has landed (llvm#109023).
tmsri
pushed a commit
to tmsri/llvm-project
that referenced
this pull request
Sep 19, 2024
…109023) The Alwaysinline change made the mangled form of entry points get removed. The StructuredBuffer-subscript.hlsl test was introduced in the meantime depending on that version of the entry point. This revises it in the same way as RWBuffer-subscript Follow up to llvm#89282
tmsri
pushed a commit
to tmsri/llvm-project
that referenced
this pull request
Sep 19, 2024
llvm#109023)" This reverts commit f4fe26d. Reason: 4a63f4d reverted "[HLSL] set alwaysinline on HLSL functions (llvm#106588)" due to a buildbot failure; this test (which builds upon the reverted patch) also needs to be reverted.
tmsri
pushed a commit
to tmsri/llvm-project
that referenced
this pull request
Sep 19, 2024
…ne (llvm#109023)" This reverts commit da03d17. I mistakenly reverted this fix-forward.
tmsri
pushed a commit
to tmsri/llvm-project
that referenced
this pull request
Sep 19, 2024
This reverts commit 4a63f4d. It was reverted because of a buildbot breakage, but the fix-forward has landed (llvm#109023).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The Alwaysinline change made the mangled form of entry points get removed. The StructuredBuffer-subscript.hlsl test was introduced in the meantime depending on that version of the entry point. This revises it in the same way as RWBuffer-subscript
Follow up to #89282