Skip to content

Commit 3aacbd7

Browse files
committed
allow dx_resource_casthandle through and non intrinsic functions, fix up some testcases so passes happen in right order and intrinsics have the right declarations
1 parent 69f0295 commit 3aacbd7

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

llvm/lib/Target/DirectX/DXILOpLowering.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -770,6 +770,9 @@ class OpLowerer {
770770
continue;
771771
Intrinsic::ID ID = F.getIntrinsicID();
772772
switch (ID) {
773+
case Intrinsic::dx_resource_casthandle:
774+
case Intrinsic::not_intrinsic:
775+
continue;
773776
default: {
774777
DiagnosticInfoUnsupported Diag(F, "Unknown intrinsic?");
775778
M.getContext().diagnose(Diag);

llvm/test/CodeGen/DirectX/clamp.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ declare <3 x half> @llvm.dx.nclamp.v3f16(<3 x half>, <3 x half>, <3 x half>)
286286
declare <4 x float> @llvm.dx.nclamp.v4f32(<4 x float>, <4 x float>, <4 x float>)
287287
declare <2 x double> @llvm.dx.nclamp.v2f64(<2 x double>, <2 x double>, <2 x double>)
288288
declare <4 x i32> @llvm.dx.sclamp.v4i32(<4 x i32>, <4 x i32>, <4 x i32>)
289-
declare <3 x i16> @llvm.dx.uclamp.v3i32(<3 x i16>, <3 x i32>, <3 x i16>)
289+
declare <3 x i16> @llvm.dx.uclamp.v3i16(<3 x i16>, <3 x i16>, <3 x i16>)
290290
declare <4 x i32> @llvm.dx.uclamp.v4i32(<4 x i32>, <4 x i32>, <4 x i32>)
291291
declare <2 x i64> @llvm.dx.uclamp.v2i64(<2 x i64>, <2 x i64>, <2 x i64>)
292292

llvm/test/CodeGen/DirectX/discard.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; RUN: opt -passes='function(scalarizer),module(dxil-op-lower,dxil-intrinsic-expansion)' -S -mtriple=dxil-pc-shadermodel6.3-pixel %s | FileCheck %s
1+
; RUN: opt -passes='function(scalarizer),module(dxil-intrinsic-expansion,dxil-op-lower)' -S -mtriple=dxil-pc-shadermodel6.3-pixel %s | FileCheck %s
22

33
; CHECK-LABEL: define void @test_scalar
44
; CHECK: call void @dx.op.discard(i32 82, i1 %0)

0 commit comments

Comments
 (0)