Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 8 additions & 7 deletions llvm/lib/Target/DirectX/DXILShaderFlags.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,11 @@ void ModuleShaderFlags::updateFunctionFlags(ComputedShaderFlags &CSF,
DXILResourceTypeMap &DRTM,
const ModuleMetadataInfo &MMDI) {
if (!CSF.Doubles)
CSF.Doubles = I.getType()->isDoubleTy();
CSF.Doubles = I.getType()->getScalarType()->isDoubleTy();

if (!CSF.Doubles) {
for (const Value *Op : I.operands()) {
if (Op->getType()->isDoubleTy()) {
if (Op->getType()->getScalarType()->isDoubleTy()) {
CSF.Doubles = true;
break;
}
Expand All @@ -130,12 +130,13 @@ void ModuleShaderFlags::updateFunctionFlags(ComputedShaderFlags &CSF,
}

if (!CSF.LowPrecisionPresent)
CSF.LowPrecisionPresent =
I.getType()->isIntegerTy(16) || I.getType()->isHalfTy();
CSF.LowPrecisionPresent = I.getType()->getScalarType()->isIntegerTy(16) ||
I.getType()->getScalarType()->isHalfTy();

if (!CSF.LowPrecisionPresent) {
for (const Value *Op : I.operands()) {
if (Op->getType()->isIntegerTy(16) || Op->getType()->isHalfTy()) {
if (Op->getType()->getScalarType()->isIntegerTy(16) ||
Op->getType()->getScalarType()->isHalfTy()) {
CSF.LowPrecisionPresent = true;
break;
}
Expand All @@ -150,11 +151,11 @@ void ModuleShaderFlags::updateFunctionFlags(ComputedShaderFlags &CSF,
}

if (!CSF.Int64Ops)
CSF.Int64Ops = I.getType()->isIntegerTy(64);
CSF.Int64Ops = I.getType()->getScalarType()->isIntegerTy(64);

if (!CSF.Int64Ops && !isa<LifetimeIntrinsic>(&I)) {
for (const Value *Op : I.operands()) {
if (Op->getType()->isIntegerTy(64)) {
if (Op->getType()->getScalarType()->isIntegerTy(64)) {
CSF.Int64Ops = true;
break;
}
Expand Down
37 changes: 37 additions & 0 deletions llvm/test/CodeGen/DirectX/ShaderFlags/rawbuffer-doubles.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
; RUN: opt -S --passes="print-dx-shader-flags" 2>&1 %s | FileCheck %s
; RUN: llc %s --filetype=obj -o - | obj2yaml | FileCheck %s --check-prefix=DXC

target triple = "dxil-pc-shadermodel6.7-library"

; CHECK: ; Combined Shader Flags for Module
; CHECK-NEXT: ; Shader Flags Value: 0x00000014
; CHECK-NEXT: ;
; CHECK-NEXT: ; Note: shader requires additional functionality:
; CHECK-NEXT: ; Double-precision floating point
; CHECK-NEXT: ; Note: extra DXIL module flags:
; CHECK-NEXT: ; Raw and structured buffers
; CHECK-NEXT: ;
; CHECK-NEXT: ; Shader Flags for Module Functions

; CHECK: Function rawbuf : 0x00000014
define void @rawbuf() "hlsl.export" {
%rb = tail call target("dx.RawBuffer", <4 x double>, 0, 0)
@llvm.dx.resource.handlefrombinding.tdx.RawBuffer_v4f16_0_0t(i32 0, i32 0, i32 1, i32 0, i1 false, ptr null)
%load = call { <4 x double>, i1 }
@llvm.dx.resource.load.rawbuffer.v4double.tdx.RawBuffer_v4f16_0_0t(target("dx.RawBuffer", <4 x double>, 0, 0) %rb, i32 0, i32 0)
%extract = extractvalue { <4 x double>, i1 } %load, 0
ret void
}

; Metadata to avoid adding flags not currently of interest to this test
!dx.valver = !{!0}
!0 = !{i32 1, i32 8}
!llvm.module.flags = !{!1}
!1 = !{i32 1, !"dx.resmayalias", i32 1}

; DXC: - Name: SFI0
; DXC-NEXT: Size: 8
; DXC-NEXT: Flags:
; DXC-NEXT: Doubles: true
; DXC: ...

36 changes: 36 additions & 0 deletions llvm/test/CodeGen/DirectX/ShaderFlags/rawbuffer-int64.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
; RUN: opt -S --passes="print-dx-shader-flags" 2>&1 %s | FileCheck %s
; RUN: llc %s --filetype=obj -o - | obj2yaml | FileCheck %s --check-prefix=DXC

target triple = "dxil-pc-shadermodel6.7-library"

; CHECK: ; Combined Shader Flags for Module
; CHECK-NEXT: ; Shader Flags Value: 0x00100010
; CHECK-NEXT: ;
; CHECK-NEXT: ; Note: shader requires additional functionality:
; CHECK-NEXT: ; 64-Bit integer
; CHECK-NEXT: ; Note: extra DXIL module flags:
; CHECK-NEXT: ; Raw and structured buffers
; CHECK-NEXT: ;
; CHECK-NEXT: ; Shader Flags for Module Functions

; CHECK: Function rawbuf : 0x00100010
define void @rawbuf() "hlsl.export" {
%rb = tail call target("dx.RawBuffer", <4 x i64>, 0, 0)
@llvm.dx.resource.handlefrombinding.tdx.RawBuffer_v4f16_0_0t(i32 0, i32 0, i32 1, i32 0, i1 false, ptr null)
%load = call { <4 x i64>, i1 }
@llvm.dx.resource.load.rawbuffer.v4i64.tdx.RawBuffer_v4f16_0_0t(target("dx.RawBuffer", <4 x i64>, 0, 0) %rb, i32 0, i32 0)
%extract = extractvalue { <4 x i64>, i1 } %load, 0
ret void
}

; Metadata to avoid adding flags not currently of interest to this test
!dx.valver = !{!0}
!0 = !{i32 1, i32 8}
!llvm.module.flags = !{!1}
!1 = !{i32 1, !"dx.resmayalias", i32 1}

; DXC: - Name: SFI0
; DXC-NEXT: Size: 8
; DXC-NEXT: Flags:
; DXC: Int64Ops: true
; DXC: ...
44 changes: 44 additions & 0 deletions llvm/test/CodeGen/DirectX/ShaderFlags/rawbuffer-low-precision.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
; RUN: opt -S --passes="print-dx-shader-flags" 2>&1 %s | FileCheck %s
; RUN: llc %s --filetype=obj -o - | obj2yaml | FileCheck %s --check-prefix=DXC

target triple = "dxil-pc-shadermodel6.7-library"

; CHECK: ; Combined Shader Flags for Module
; CHECK-NEXT: ; Shader Flags Value: 0x00800030
; CHECK-NEXT: ;
; CHECK-NEXT: ; Note: shader requires additional functionality:
; CHECK-NEXT: ; Native low-precision data types
; CHECK-NEXT: ; Note: extra DXIL module flags:
; CHECK-NEXT: ; Raw and structured buffers
; CHECK-NEXT: ; Low-precision data types present
; CHECK-NEXT: ; Enable native low-precision data types
; CHECK-NEXT: ;
; CHECK-NEXT: ; Shader Flags for Module Functions

; CHECK: Function rawbuf : 0x00800030
define void @rawbuf() "hlsl.export" {
%halfrb = tail call target("dx.RawBuffer", <4 x half>, 0, 0)
@llvm.dx.resource.handlefrombinding.tdx.RawBuffer_v4f16_0_0t(i32 0, i32 0, i32 1, i32 0, i1 false, ptr null)
%i16rb = tail call target("dx.RawBuffer", <4 x i16>, 1, 0)
@llvm.dx.resource.handlefrombinding.tdx.RawBuffer_v4i16_1_0t(i32 0, i32 1, i32 1, i32 0, i1 false, ptr null)
%loadhalfrb = call { <4 x i16>, i1 }
@llvm.dx.resource.load.rawbuffer.v4i16.tdx.RawBuffer_v4f16_0_0t(target("dx.RawBuffer", <4 x half>, 0, 0) %halfrb, i32 0, i32 0)
%extracti16vec = extractvalue { <4 x i16>, i1 } %loadhalfrb, 0
call void @llvm.dx.resource.store.rawbuffer.tdx.RawBuffer_v4i16_1_0t.v4i16(target("dx.RawBuffer", <4 x i16>, 1, 0) %i16rb, i32 0, i32 0, <4 x i16> %extracti16vec)
ret void
}

; Metadata to avoid adding flags not currently of interest to this test, and
; enable native low precision data types
!dx.valver = !{!0}
!0 = !{i32 1, i32 8}
!llvm.module.flags = !{!1, !2}
!1 = !{i32 1, !"dx.nativelowprec", i32 1}
!2 = !{i32 1, !"dx.resmayalias", i32 1}

; DXC: - Name: SFI0
; DXC-NEXT: Size: 8
; DXC-NEXT: Flags:
; DXC: MinimumPrecision: false
; DXC: NativeLowPrecision: true
; DXC: ...