Skip to content

Commit be253dd

Browse files
committed
clean up
1 parent 33a888e commit be253dd

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

tools/clang/unittests/HLSLExec/LongVectorOps.def

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ OP_DEFAULT(UnaryMath, Log10, 1, "log10", "")
134134
OP_DEFAULT(UnaryMath, Log2, 1, "log2", "")
135135
OP_DEFAULT_DEFINES(UnaryMath, Frexp, 1, "TestFrexp", "", " -DFUNC_FREXP=1")
136136

137-
138137
OP_DEFAULT(FloatSpecial, IsFinite, 1, "isfinite", "")
139138
OP_DEFAULT(FloatSpecial, IsInf, 1, "isinf", "")
140139
OP_DEFAULT(FloatSpecial, IsNan, 1, "isnan", "")

tools/clang/unittests/HLSLExec/LongVectors.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,7 @@ struct ExpectedBuilder<OpType::ArrayOperator_SingleAccess, T> {
786786
};
787787

788788
template <typename T>
789-
static std::vector<T> BuildLoop2(const InputSets<T> &Inputs) {
789+
static std::vector<T> buildExpectedArrayAccessOutput(const InputSets<T> &Inputs) {
790790
DXASSERT_NOMSG(Inputs.size() == 2);
791791
const size_t VectorSize = Inputs[0].size();
792792
std::vector<T> Expected;
@@ -807,7 +807,7 @@ struct Op<OpType::ArrayOperator_Loop, T, 2> : DefaultValidation<T> {};
807807
template <typename T> struct ExpectedBuilder<OpType::ArrayOperator_Loop, T> {
808808
static std::vector<T> buildExpected(Op<OpType::ArrayOperator_Loop, T, 2>,
809809
const InputSets<T> &Inputs) {
810-
return BuildLoop2(Inputs);
810+
return buildExpectedArrayAccessOutput(Inputs);
811811
}
812812
};
813813

@@ -817,7 +817,7 @@ struct Op<OpType::ArrayOperator_Unroll, T, 2> : DefaultValidation<T> {};
817817
template <typename T> struct ExpectedBuilder<OpType::ArrayOperator_Unroll, T> {
818818
static std::vector<T> buildExpected(Op<OpType::ArrayOperator_Unroll, T, 2>,
819819
const InputSets<T> &Inputs) {
820-
return BuildLoop2(Inputs);
820+
return buildExpectedArrayAccessOutput(Inputs);
821821
}
822822
};
823823

tools/clang/unittests/HLSLExec/ShaderOpArith.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4102,7 +4102,7 @@ void MSMain(uint GID : SV_GroupIndex,
41024102
#endif
41034103
41044104
[numthreads(1,1,1)]
4105-
void main(uint GI : SV_GroupIndex, uint3 dispatchThreadID : SV_DispatchThreadID) {
4105+
void main(uint GI : SV_GroupIndex) {
41064106
41074107
#ifdef FUNC_SHUFFLE_VECTOR
41084108
// For shuffle vector, the input is a scalar, not a vector.

0 commit comments

Comments
 (0)