Skip to content

Execution Tests: Long Vectors Remove ternary assignment #7775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alsepkow merged 1 commit into from
Sep 18, 2025
Merged

Execution Tests: Long Vectors Remove ternary assignment #7775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions tools/clang/unittests/HLSLExec/LongVectorOps.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,4 @@ OP_DEFAULT(BinaryComparison, NotEqual, 2, "", "!=")

OP_DEFAULT(Binary, Logical_And, 2, "and", ",")
OP_DEFAULT(Binary, Logical_Or, 2, "or", ",")
OP_DEFAULT_DEFINES(Binary, TernaryAssignment_True, 2, "TestTernaryAssignment",
",", " -DTERNARY_CONDITION=1 -DFUNC_TERNARY_ASSIGNMENT=1")
OP_DEFAULT_DEFINES(Binary, TernaryAssignment_False, 2, "TestTernaryAssignment",
",", " -DTERNARY_CONDITION=0 -DFUNC_TERNARY_ASSIGNMENT=1")
#undef OP
5 changes: 0 additions & 5 deletions tools/clang/unittests/HLSLExec/LongVectors.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,8 +895,6 @@ BINARY_COMPARISON_OP(OpType::NotEqual, (A != B));

DEFAULT_OP_2(OpType::Logical_And, (A && B));
DEFAULT_OP_2(OpType::Logical_Or, (A || B));
DEFAULT_OP_2(OpType::TernaryAssignment_True, (true ? A : B));
DEFAULT_OP_2(OpType::TernaryAssignment_False, (false ? A : B));

//
// dispatchTest
Expand Down Expand Up @@ -1519,9 +1517,6 @@ class DxilConf_SM69_Vectorized {
HLK_TEST(Logical_And, HLSLBool_t, ScalarOp2);
HLK_TEST(Logical_Or, HLSLBool_t, ScalarOp2);

// NOTE: TernaryAssignment_True and TernaryAssignment_False don't have tests.
// Do we want them?

private:
bool Initialized = false;
bool VerboseLogging = false;
Expand Down
8 changes: 0 additions & 8 deletions tools/clang/unittests/HLSLExec/ShaderOpArith.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3776,14 +3776,6 @@ void MSMain(uint GID : SV_GroupIndex,
}
#endif

#ifdef FUNC_TERNARY_ASSIGNMENT
vector<TYPE, NUM> TestTernaryAssignment(vector<TYPE, NUM> Vector,
vector<TYPE, NUM> Vector2))
{
return (TERNARY_CONDITION ? Vector : Vector2);
}
#endif

#ifdef FUNC_UNARY_OPERATOR
vector<OUT_TYPE, NUM> TestUnaryOperator(vector<TYPE, NUM> Vector)
{
Expand Down