Skip to content

Commit b7ff3bf

Browse files
sumitsayssumitsays
committed
WIP: Mostly wrote everything.
1 parent 7c81ed6 commit b7ff3bf

File tree

8 files changed

+84
-30
lines changed

8 files changed

+84
-30
lines changed

‎clang/lib/CodeGen/CGHLSLRuntime.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ class CGHLSLRuntime {
101101
GENERATE_HLSL_INTRINSIC_FUNCTION(FDot, fdot)
102102
GENERATE_HLSL_INTRINSIC_FUNCTION(SDot, sdot)
103103
GENERATE_HLSL_INTRINSIC_FUNCTION(UDot, udot)
104-
GENERATE_HLSL_INTRINSIC_FUNCTION(Dot2Add, dot2add)
105104
GENERATE_HLSL_INTRINSIC_FUNCTION(Dot4AddI8Packed, dot4add_i8packed)
106105
GENERATE_HLSL_INTRINSIC_FUNCTION(Dot4AddU8Packed, dot4add_u8packed)
107106
GENERATE_HLSL_INTRINSIC_FUNCTION(WaveActiveAllTrue, wave_all)

‎clang/lib/Headers/hlsl/hlsl_alias_intrinsics.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -972,16 +972,6 @@ uint64_t dot(uint64_t3, uint64_t3);
972972
_HLSL_BUILTIN_ALIAS(__builtin_hlsl_dot)
973973
uint64_t dot(uint64_t4, uint64_t4);
974974

975-
//===----------------------------------------------------------------------===//
976-
// dot2add builtins
977-
//===----------------------------------------------------------------------===//
978-
979-
/// \fn float dot2add(half2 a, half2 b, float c)
980-
981-
_HLSL_AVAILABILITY(shadermodel, 6.4)
982-
_HLSL_BUILTIN_ALIAS(__builtin_hlsl_dot2add)
983-
float dot2add(half2, half2, float);
984-
985975
//===----------------------------------------------------------------------===//
986976
// dot4add builtins
987977
//===----------------------------------------------------------------------===//

‎clang/lib/Headers/hlsl/hlsl_intrinsic_helpers.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,14 @@ distance_vec_impl(vector<T, N> X, vector<T, N> Y) {
4545
return length_vec_impl(X - Y);
4646
}
4747

48+
constexpr float dot2add_impl(half2 a, half2 b, float c) {
49+
#if defined(__DIRECTX__)
50+
return __builtin_hlsl_dot2add(a, b, c);
51+
#else
52+
return dot(a, b) + c;
53+
#endif
54+
}
55+
4856
template <typename T> constexpr T reflect_impl(T I, T N) {
4957
return I - 2 * N * I * N;
5058
}

‎clang/lib/Headers/hlsl/hlsl_intrinsics.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,18 @@ const inline float distance(__detail::HLSL_FIXED_VECTOR<float, N> X,
175175
return __detail::distance_vec_impl(X, Y);
176176
}
177177

178+
//===----------------------------------------------------------------------===//
179+
// dot2add builtins
180+
//===----------------------------------------------------------------------===//
181+
182+
/// \fn float dot2add(half2 a, half2 b, float c)
183+
/// \brief Dot product of 2 vector of type half and add a float scalar value.
184+
185+
_HLSL_AVAILABILITY(shadermodel, 6.4)
186+
const inline float dot2add(half2 a, half2 b, float c) {
187+
return __detail::dot2add_impl(a, b, c);
188+
}
189+
178190
//===----------------------------------------------------------------------===//
179191
// fmod builtins
180192
//===----------------------------------------------------------------------===//

‎clang/lib/Sema/SemaHLSL.cpp

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1989,7 +1989,7 @@ void SemaHLSL::diagnoseAvailabilityViolations(TranslationUnitDecl *TU) {
19891989
}
19901990

19911991
// Helper function for CheckHLSLBuiltinFunctionCall
1992-
static bool CheckVectorElementCallArgs(Sema *S, CallExpr *TheCall) {
1992+
static bool CheckVectorElementCallArgs(Sema *S, CallExpr *TheCall, unsigned NumArgs) {
19931993
assert(TheCall->getNumArgs() > 1);
19941994
ExprResult A = TheCall->getArg(0);
19951995

@@ -1999,7 +1999,7 @@ static bool CheckVectorElementCallArgs(Sema *S, CallExpr *TheCall) {
19991999
SourceLocation BuiltinLoc = TheCall->getBeginLoc();
20002000

20012001
bool AllBArgAreVectors = true;
2002-
for (unsigned i = 1; i < TheCall->getNumArgs(); ++i) {
2002+
for (unsigned i = 1; i < NumArgs; ++i) {
20032003
ExprResult B = TheCall->getArg(i);
20042004
QualType ArgTyB = B.get()->getType();
20052005
auto *VecTyB = ArgTyB->getAs<VectorType>();
@@ -2050,6 +2050,10 @@ static bool CheckVectorElementCallArgs(Sema *S, CallExpr *TheCall) {
20502050
return false;
20512051
}
20522052

2053+
static bool CheckVectorElementCallArgs(Sema *S, CallExpr *TheCall) {
2054+
return CheckVectorElementCallArgs(S, TheCall, TheCall->getNumArgs());
2055+
}
2056+
20532057
static bool CheckAllArgsHaveSameType(Sema *S, CallExpr *TheCall) {
20542058
assert(TheCall->getNumArgs() > 1);
20552059
QualType ArgTy0 = TheCall->getArg(0)->getType();
@@ -2092,10 +2096,10 @@ static bool CheckArgTypeIsCorrect(
20922096
return false;
20932097
}
20942098

2095-
static bool CheckAllArgTypesAreCorrect(
2096-
Sema *S, CallExpr *TheCall, QualType ExpectedType,
2099+
static bool CheckArgTypesAreCorrect(
2100+
Sema *S, CallExpr *TheCall, unsigned NumArgs, QualType ExpectedType,
20972101
llvm::function_ref<bool(clang::QualType PassedType)> Check) {
2098-
for (unsigned i = 0; i < TheCall->getNumArgs(); ++i) {
2102+
for (unsigned i = 0; i < NumArgs; ++i) {
20992103
Expr *Arg = TheCall->getArg(i);
21002104
if (CheckArgTypeIsCorrect(S, Arg, ExpectedType, Check)) {
21012105
return true;
@@ -2104,6 +2108,13 @@ static bool CheckAllArgTypesAreCorrect(
21042108
return false;
21052109
}
21062110

2111+
static bool CheckAllArgTypesAreCorrect(
2112+
Sema *S, CallExpr *TheCall, QualType ExpectedType,
2113+
llvm::function_ref<bool(clang::QualType PassedType)> Check) {
2114+
return CheckArgTypesAreCorrect(S, TheCall, TheCall->getNumArgs(),
2115+
ExpectedType, Check);
2116+
}
2117+
21072118
static bool CheckAllArgsHaveFloatRepresentation(Sema *S, CallExpr *TheCall) {
21082119
auto checkAllFloatTypes = [](clang::QualType PassedType) -> bool {
21092120
return !PassedType->hasFloatingRepresentation();
@@ -2147,15 +2158,17 @@ static bool CheckModifiableLValue(Sema *S, CallExpr *TheCall,
21472158
return true;
21482159
}
21492160

2150-
static bool CheckNoDoubleVectors(Sema *S, CallExpr *TheCall) {
2161+
static bool CheckNoDoubleVectors(Sema *S, CallExpr *TheCall,
2162+
unsigned NumArgs, QualType ExpectedType) {
21512163
auto checkDoubleVector = [](clang::QualType PassedType) -> bool {
21522164
if (const auto *VecTy = PassedType->getAs<VectorType>())
21532165
return VecTy->getElementType()->isDoubleType();
21542166
return false;
21552167
};
2156-
return CheckAllArgTypesAreCorrect(S, TheCall, S->Context.FloatTy,
2157-
checkDoubleVector);
2168+
return CheckArgTypesAreCorrect(S, TheCall, NumArgs,
2169+
ExpectedType, checkDoubleVector);
21582170
}
2171+
21592172
static bool CheckFloatingOrIntRepresentation(Sema *S, CallExpr *TheCall) {
21602173
auto checkAllSignedTypes = [](clang::QualType PassedType) -> bool {
21612174
return !PassedType->hasIntegerRepresentation() &&
@@ -2471,7 +2484,21 @@ bool SemaHLSL::CheckBuiltinFunctionCall(unsigned BuiltinID, CallExpr *TheCall) {
24712484
return true;
24722485
if (SemaRef.BuiltinVectorToScalarMath(TheCall))
24732486
return true;
2474-
if (CheckNoDoubleVectors(&SemaRef, TheCall))
2487+
if (CheckNoDoubleVectors(&SemaRef, TheCall,
2488+
TheCall->getNumArgs(), SemaRef.Context.FloatTy))
2489+
return true;
2490+
break;
2491+
}
2492+
case Builtin::BI__builtin_hlsl_dot2add: {
2493+
if (SemaRef.checkArgCount(TheCall, 3))
2494+
return true;
2495+
if (CheckVectorElementCallArgs(&SemaRef, TheCall, TheCall->getNumArgs() - 1))
2496+
return true;
2497+
if (CheckArgTypeMatches(&SemaRef, TheCall->getArg(2), SemaRef.getASTContext().FloatTy))
2498+
return true;
2499+
if (CheckNoDoubleVectors(&SemaRef, TheCall,
2500+
TheCall->getNumArgs() - 1,
2501+
SemaRef.Context.HalfTy))
24752502
return true;
24762503
break;
24772504
}

‎clang/test/SemaHLSL/BuiltIns/Dot2Add-errors.hlsl

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only -disable-llvm-passes -verify
2+
3+
bool test_too_few_arg() {
4+
return __builtin_hlsl_dot2add();
5+
// expected-error@-1 {{too few arguments to function call, expected 3, have 0}}
6+
}
7+
8+
bool test_too_many_arg(half2 p1, half2 p2, float p3) {
9+
return __builtin_hlsl_dot2add(p1, p2, p3, p1);
10+
// expected-error@-1 {{too many arguments to function call, expected 3, have 4}}
11+
}

‎llvm/include/llvm/IR/IntrinsicsSPIRV.td

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,6 @@ let TargetPrefix = "spv" in {
8989
DefaultAttrsIntrinsic<[LLVMVectorElementType<0>],
9090
[llvm_anyint_ty, LLVMScalarOrSameVectorWidth<0, LLVMVectorElementType<0>>],
9191
[IntrNoMem, Commutative] >;
92-
93-
def int_spv_dot2add : DefaultAttrsIntrinsic<[llvm_float_ty],
94-
[llvm_anyfloat_ty, LLVMMatchType<0>, llvm_float_ty],
95-
[IntrNoMem, Commutative]>;
96-
9792
def int_spv_dot4add_i8packed : DefaultAttrsIntrinsic<[llvm_i32_ty], [llvm_i32_ty, llvm_i32_ty, llvm_i32_ty], [IntrNoMem]>;
9893
def int_spv_dot4add_u8packed : DefaultAttrsIntrinsic<[llvm_i32_ty], [llvm_i32_ty, llvm_i32_ty, llvm_i32_ty], [IntrNoMem]>;
9994
def int_spv_wave_active_countbits : DefaultAttrsIntrinsic<[llvm_i32_ty], [llvm_i1_ty], [IntrConvergent, IntrNoMem]>;

‎llvm/lib/Target/DirectX/DXILOpLowering.cpp

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,8 @@ static SmallVector<Value *> populateOperands(Value *Arg, IRBuilder<> &Builder) {
5555
}
5656

5757
static SmallVector<Value *> argVectorFlatten(CallInst *Orig,
58-
IRBuilder<> &Builder) {
59-
// Note: arg[NumOperands-1] is a pointer and is not needed by our flattening.
60-
unsigned NumOperands = Orig->getNumOperands() - 1;
58+
IRBuilder<> &Builder,
59+
unsigned NumOperands) {
6160
assert(NumOperands > 0);
6261
Value *Arg0 = Orig->getOperand(0);
6362
[[maybe_unused]] auto *VecArg0 = dyn_cast<FixedVectorType>(Arg0->getType());
@@ -75,6 +74,12 @@ static SmallVector<Value *> argVectorFlatten(CallInst *Orig,
7574
return NewOperands;
7675
}
7776

77+
static SmallVector<Value *> argVectorFlatten(CallInst *Orig,
78+
IRBuilder<> &Builder) {
79+
// Note: arg[NumOperands-1] is a pointer and is not needed by our flattening.
80+
return argVectorFlatten(Orig, Builder, Orig->getNumOperands() - 1);
81+
}
82+
/*
7883
static SmallVector<Value *> argVectorFlattenExcludeLastElement(CallInst *Orig,
7984
IRBuilder<> &Builder) {
8085
// Note: arg[NumOperands-1] is a pointer and is not needed by our flattening.
@@ -95,7 +100,7 @@ static SmallVector<Value *> argVectorFlattenExcludeLastElement(CallInst *Orig,
95100
}
96101
return NewOperands;
97102
}
98-
103+
*/
99104
namespace {
100105
class OpLowerer {
101106
Module &M;
@@ -190,7 +195,13 @@ class OpLowerer {
190195
} else if (IsVectorArgExpansion) {
191196
Args = argVectorFlatten(CI, OpBuilder.getIRB());
192197
} else if (F.getIntrinsicID() == Intrinsic::dx_dot2add) {
193-
unsigned NumOperands = CI->getNumOperands() - 1;
198+
// arg[NumOperands-1] is a pointer and is not needed by our flattening.
199+
// arg[NumOperands-2] also does not need to be flattened because it is a scalar.
200+
unsigned NumOperands = CI->getNumOperands() - 2;
201+
Args.push_back(CI->getArgOperand(NumOperands));
202+
Args.append(argVectorFlatten(CI, OpBuilder.getIRB(), NumOperands));
203+
204+
/*unsigned NumOperands = CI->getNumOperands() - 1;
194205
assert(NumOperands > 0);
195206
Value *LastArg = CI->getOperand(NumOperands - 1);
196207
@@ -201,6 +212,7 @@ class OpLowerer {
201212
202213
//Args = populateOperands(LastArg, OpBuilder.getIRB());
203214
Args.append(argVectorFlattenExcludeLastElement(CI, OpBuilder.getIRB()));
215+
*/
204216
} else {
205217
Args.append(CI->arg_begin(), CI->arg_end());
206218
}

0 commit comments

Comments
 (0)