Skip to content
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

Jump to bottom

Fix a PIX pass's attempt to set the validator version #6707

Merged
merged 4 commits into from
Jul 1, 2024
Merged

Fix a PIX pass's attempt to set the validator version #6707

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
533d564
fix n test
jeffnn Jun 19, 2024
0eef750
clang-format!!!
jeffnn Jun 19, 2024
df55181
Tex feedback: New test for upgrade, use correct comparison
jeffnn Jun 20, 2024
6284b27
Comments for lit tests
jeffnn Jun 26, 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
5 changes: 2 additions & 3 deletions lib/DxilPIXPasses/DxilAnnotateWithVirtualRegister.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ bool DxilAnnotateWithVirtualRegister::runOnModule(llvm::Module &M) {
}
unsigned int Major = 0;
unsigned int Minor = 0;
m_DM->GetDxilVersion(Major, Minor);
if (Major < 6 || (Major == 6 && Minor <= 4)) {
m_DM->GetValidatorVersion(Major, Minor);
jeffnn marked this conversation as resolved.
Show resolved Hide resolved
if (Major < 1 || (Major == 1 && Minor < 4)) {
jeffnn marked this conversation as resolved.
Show resolved Hide resolved
m_DM->SetValidatorVersion(1, 4);
}

Expand Down Expand Up @@ -177,7 +177,6 @@ bool DxilAnnotateWithVirtualRegister::runOnModule(llvm::Module &M) {
<< printableNameSubset << "\n";
}
}

jeffnn marked this conversation as resolved.
Show resolved Hide resolved
if (OSOverride != nullptr) {
// Print a set of strings of the exemplary form "InstructionCount: <n>
// <fnName>"
Expand Down
64 changes: 64 additions & 0 deletions tools/clang/test/DXC/Passes/PIX/validatorUpgrade.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
; RUN: %dxopt %s -dxil-annotate-with-virtual-regs -hlsl-dxilemit -S | FileCheck %s

; CHECK: !dx.valver = !{![[VALVER:.*]]}
; CHECK-NOT: ![[VALVER]] = !{i32 1, i32 4}
jeffnn marked this conversation as resolved.
Show resolved Hide resolved


; GENERATED FROM:
; dxc -Emain -Tcs_6_1


; void main()
; {
; }



;
; Input signature:
;
; Name Index Mask Register SysValue Format Used
; -------------------- ----- ------ -------- -------- ------- ------
; no parameters
;
; Output signature:
;
; Name Index Mask Register SysValue Format Used
; -------------------- ----- ------ -------- -------- ------- ------
; no parameters
; shader hash: bcdf90f13d29df9ebdc77539089a75a6
;
; Pipeline Runtime Information:
;
; Compute Shader
; NumThreads=(1,1,1)
;
;
; Buffer Definitions:
;
;
; Resource Bindings:
;
; Name Type Format Dim ID HLSL Bind Count
; ------------------------------ ---------- ------- ----------- ------- -------------- ------
;
target datalayout = "e-m:e-p:32:32-i1:32-i8:32-i16:32-i32:32-i64:64-f16:32-f32:32-f64:64-n8:16:32:64"
target triple = "dxil-ms-dx"

define void @main() {
ret void
}

!llvm.ident = !{!0}
!dx.version = !{!1}
!dx.valver = !{!2}
!dx.shaderModel = !{!3}
!dx.entryPoints = !{!4}

!0 = !{!"dxc(private) 1.8.0.4583 (PIX_MemberFunctions, 2f4a01af1-dirty)"}
!1 = !{i32 1, i32 1}
!2 = !{i32 1, i32 8}
!3 = !{!"cs", i32 6, i32 1}
!4 = !{void ()* @main, !"main", null, null, !5}
!5 = !{i32 4, !6}
!6 = !{i32 1, i32 1, i32 1}
Loading