Skip to content

[DirectX] Infrastructure to collect shader flags for each function #112967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Nov 25, 2024
Merged

[DirectX] Infrastructure to collect shader flags for each function #112967

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3da01ee
[NFC][DirectX] Infrastructure to collect shader flags for each function
bharadwajy Oct 16, 2024
397f70b
clang-format changes
bharadwajy Oct 18, 2024
ae373d4
Use a SmallVector of pairs instead of DenseMap to collect Function
bharadwajy Oct 25, 2024
c02053a
Compare functions by their names instead of constructing a pseudo-sig…
bharadwajy Oct 28, 2024
47ab4c5
Fix incorrect lookup that expects a sorted vector done in a possibly …
bharadwajy Oct 29, 2024
fa8ec60
Use getFunctionList() instead of iterating Module for functions.
bharadwajy Oct 29, 2024
a4f1e51
Change return type of getShaderFlagsMask() to Expected<T>
bharadwajy Oct 29, 2024
a6d84b2
Address PR feedback
bharadwajy Oct 30, 2024
31b0770
Address PR feedback
bharadwajy Nov 4, 2024
3427781
Address PR feedback.
bharadwajy Nov 6, 2024
56af02a
Delete unused function
bharadwajy Nov 13, 2024
f8e501f
Use function shader flag mask for module flags; track combined mask
bharadwajy Nov 15, 2024
c6b3390
Rename operator |= as merge
bharadwajy Nov 18, 2024
70e46e0
Address PR feedback
bharadwajy Nov 22, 2024
07734f7
Rename getShaderFlagsMask() as getFunctionFlags()
bharadwajy Nov 22, 2024
a0d2a31
Cleanup of CHECK directives in tests.
bharadwajy Nov 22, 2024
2cee00a
Delete extraneous space in CHECK line
bharadwajy Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion llvm/lib/Target/DirectX/DXILTranslateMetadata.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#include "llvm/IR/Module.h"
#include "llvm/InitializePasses.h"
#include "llvm/Pass.h"
#include "llvm/Support/Error.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/VersionTuple.h"
#include "llvm/TargetParser/Triple.h"
Expand Down
3 changes: 1 addition & 2 deletions llvm/test/CodeGen/DirectX/ShaderFlags/double-extensions-obj-test.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ attributes #0 = { convergent norecurse nounwind "hlsl.export"}
; CHECK: - Name: SFI0
; CHECK-NEXT: Size: 8
; CHECK-NEXT: Flags:
; CHECK-NEXT: Doubles: true
; CHECK-NOT: {{[A-Za-z]+: +true}}
; CHECK: Doubles: true
; CHECK: DX11_1_DoubleExtensions: true
Copy link
Contributor

@bogner bogner Nov 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It'd be nice to have consistent whitespace across the check lines


18 changes: 7 additions & 11 deletions llvm/test/CodeGen/DirectX/ShaderFlags/double-extensions.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,43 +4,39 @@ target triple = "dxil-pc-shadermodel6.7-library"

; CHECK: ; Combined Shader Flags for Module
; CHECK-NEXT: ; Shader Flags Value: 0x00000044
; CHECK-NEXT: ;
; CHECK-NEXT: ; Note: shader requires additional functionality:

; CHECK: ; Note: shader requires additional functionality:
; CHECK-NEXT: ; Double-precision floating point
; CHECK-NEXT: ; Double-precision extensions for 11.1
; CHECK-NEXT: ; Note: extra DXIL module flags:
; CHECK-NEXT: ;
; CHECK-NEXT: ; Shader Flags for Module Functions
; CHECK-NEXT: ; Function test_fdiv_double : 0x00000044
; CHECK-NEXT: ;
; CHECK-NEXT: ; Function test_uitofp_i64 : 0x00000044
; CHECK-NEXT: ;
; CHECK-NEXT: ; Function test_sitofp_i64 : 0x00000044
; CHECK-NEXT: ;
; CHECK-NEXT: ; Function test_fptoui_i32 : 0x00000044
; CHECK-NEXT: ;
; CHECK-NEXT: ; Function test_fptosi_i64 : 0x00000044

; CHECK: ; Function test_fdiv_double : 0x00000044
define double @test_fdiv_double(double %a, double %b) #0 {
%res = fdiv double %a, %b
ret double %res
}

; CHECK: ; Function test_uitofp_i64 : 0x00000044
define double @test_uitofp_i64(i64 %a) #0 {
%r = uitofp i64 %a to double
ret double %r
}

; CHECK: ; Function test_sitofp_i64 : 0x00000044
define double @test_sitofp_i64(i64 %a) #0 {
%r = sitofp i64 %a to double
ret double %r
}

; CHECK: ; Function test_fptoui_i32 : 0x00000044
define i32 @test_fptoui_i32(double %a) #0 {
%r = fptoui double %a to i32
ret i32 %r
}

; CHECK: ; Function test_fptosi_i64 : 0x00000044
define i64 @test_fptosi_i64(double %a) #0 {
%r = fptosi double %a to i64
ret i64 %r
Expand Down