Skip to content

Commit 7f771fb

Browse files
authored
Execution Tests: Long Vectors Remove ternary assignment (microsoft#7775)
Remove the test cases for ternary assignment. Upon closer inspection I realized that there are no unique DXIL ops or LLVM instructions exercised via ternary assignment (or select for that matter).
1 parent d03a662 commit 7f771fb

3 files changed

Lines changed: 0 additions & 17 deletions

File tree

tools/clang/unittests/HLSLExec/LongVectorOps.def

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,4 @@ OP_DEFAULT(BinaryComparison, NotEqual, 2, "", "!=")
109109

110110
OP_DEFAULT(Binary, Logical_And, 2, "and", ",")
111111
OP_DEFAULT(Binary, Logical_Or, 2, "or", ",")
112-
OP_DEFAULT_DEFINES(Binary, TernaryAssignment_True, 2, "TestTernaryAssignment",
113-
",", " -DTERNARY_CONDITION=1 -DFUNC_TERNARY_ASSIGNMENT=1")
114-
OP_DEFAULT_DEFINES(Binary, TernaryAssignment_False, 2, "TestTernaryAssignment",
115-
",", " -DTERNARY_CONDITION=0 -DFUNC_TERNARY_ASSIGNMENT=1")
116112
#undef OP

tools/clang/unittests/HLSLExec/LongVectors.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -974,8 +974,6 @@ BINARY_COMPARISON_OP(OpType::NotEqual, (A != B));
974974

975975
DEFAULT_OP_2(OpType::Logical_And, (A && B));
976976
DEFAULT_OP_2(OpType::Logical_Or, (A || B));
977-
DEFAULT_OP_2(OpType::TernaryAssignment_True, (true ? A : B));
978-
DEFAULT_OP_2(OpType::TernaryAssignment_False, (false ? A : B));
979977

980978
//
981979
// dispatchTest
@@ -1625,9 +1623,6 @@ class DxilConf_SM69_Vectorized {
16251623
HLK_TEST(Logical_And, HLSLBool_t, ScalarOp2);
16261624
HLK_TEST(Logical_Or, HLSLBool_t, ScalarOp2);
16271625

1628-
// NOTE: TernaryAssignment_True and TernaryAssignment_False don't have tests.
1629-
// Do we want them?
1630-
16311626
private:
16321627
bool Initialized = false;
16331628
bool VerboseLogging = false;

tools/clang/unittests/HLSLExec/ShaderOpArith.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3776,14 +3776,6 @@ void MSMain(uint GID : SV_GroupIndex,
37763776
}
37773777
#endif
37783778
3779-
#ifdef FUNC_TERNARY_ASSIGNMENT
3780-
vector<TYPE, NUM> TestTernaryAssignment(vector<TYPE, NUM> Vector,
3781-
vector<TYPE, NUM> Vector2))
3782-
{
3783-
return (TERNARY_CONDITION ? Vector : Vector2);
3784-
}
3785-
#endif
3786-
37873779
#ifdef FUNC_UNARY_OPERATOR
37883780
vector<OUT_TYPE, NUM> TestUnaryOperator(vector<TYPE, NUM> Vector)
37893781
{

0 commit comments

Comments
 (0)