Skip to content

Adding array operator long vector tests to HLK #7887

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
merged 22 commits into from
Nov 20, 2025
Merged

Adding array operator long vector tests to HLK #7887

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
8d371f1
first test
joaosaffran Nov 4, 2025
5cc409e
adding single element access test
joaosaffran Nov 6, 2025
8256850
format
joaosaffran Nov 6, 2025
33a888e
adding more test
joaosaffran Nov 7, 2025
be253dd
clean up
joaosaffran Nov 7, 2025
ce5ebdf
foramt
joaosaffran Nov 7, 2025
c657ded
clean up
joaosaffran Nov 7, 2025
ab7707f
ongoing tests
joaosaffran Nov 13, 2025
a5918e7
finishing dynamic access test
joaosaffran Nov 14, 2025
ad76246
clean up
joaosaffran Nov 14, 2025
d4072c1
clean up
joaosaffran Nov 14, 2025
c21f0be
clean up
joaosaffran Nov 14, 2025
4deea4a
Merge branch 'main' into test/array-operator
joaosaffran Nov 14, 2025
4e0fda9
clean up
joaosaffran Nov 14, 2025
22f0c80
addressing comments from Tex
joaosaffran Nov 17, 2025
de0cbc4
adding comments
joaosaffran Nov 17, 2025
1a8fb8a
foramt
joaosaffran Nov 17, 2025
34bb415
fix oopsy
joaosaffran Nov 17, 2025
da88c6a
fix typo
joaosaffran Nov 17, 2025
3c32ba5
addressing comments from Alex
joaosaffran Nov 18, 2025
3cc3f31
Merge branch 'main' into test/array-operator
joaosaffran Nov 18, 2025
234a466
fix merge
joaosaffran Nov 18, 2025
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
6 changes: 6 additions & 0 deletions tools/clang/unittests/HLSLExec/LongVectorOps.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,12 @@ OP(Bitwise, FirstBitLow, 1, "firstbitlow", "", "", "LongVectorOp", Bitwise, Defa
OP_DEFAULT_DEFINES(Unary, Initialize, 1, "TestInitialize", "",
" -DFUNC_INITIALIZE=1")

OP_DEFAULT_DEFINES(ArrayOperator, ArrayOperator_StaticAccess, 1, "TestArrayOperatorStaticAccess", "",
" -DTEST_ARRAY_OPERATOR")

OP(ArrayOperator, ArrayOperator_DynamicAccess, 2, "TestArrayOperatorDynamicAccess", "",
" -DTEST_ARRAY_OPERATOR=1 -DDYNAMIC_ACCESS=1", "LongVectorOP", Default1, Zero, Default3)

#define OP_CAST_DEFAULT(GROUP, SYMBOL) \
OP_DEFAULT_DEFINES(GROUP, SYMBOL, 1, "TestCast", "", "-DFUNC_TEST_CAST=1")
#define OP_CAST(GROUP, SYMBOL, INPUT_SET_1) \
Expand Down
6 changes: 6 additions & 0 deletions tools/clang/unittests/HLSLExec/LongVectorTestData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,7 @@ BEGIN_INPUT_SETS(uint16_t)
INPUT_SET(InputSet::Default1, 1, 699, 3, 1023, 5, 6, 0, 8, 9, 10);
INPUT_SET(InputSet::Default2, 2, 111, 3, 4, 5, 9, 21, 8, 9, 10);
INPUT_SET(InputSet::Default3, 4, 112, 4, 5, 3, 7, 21, 1, 11, 9);
INPUT_SET(InputSet::Zero, 0);
INPUT_SET(InputSet::BitShiftRhs, 1, 6, 3, 0, 9, 3, 12, 13, 14, 15);
INPUT_SET(InputSet::Bitwise, 0, 1, 3, 6, 9, 0x5555, 0xAAAA, 0x8000, 127,
std::numeric_limits<uint16_t>::max());
Expand All @@ -335,6 +336,7 @@ BEGIN_INPUT_SETS(uint32_t)
INPUT_SET(InputSet::Default1, 1, 2, 3, 4, 5, 0, 7, 8, 9, 10);
INPUT_SET(InputSet::Default2, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
INPUT_SET(InputSet::Default3, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1);
INPUT_SET(InputSet::Zero, 0);
INPUT_SET(InputSet::BitShiftRhs, 1, 6, 3, 0, 9, 3, 30, 31, 32);
INPUT_SET(InputSet::Bitwise, 0, 1, 3, 6, 9, 0x55555555, 0xAAAAAAAA, 0x80000000,
127, std::numeric_limits<uint32_t>::max());
Expand All @@ -346,6 +348,7 @@ BEGIN_INPUT_SETS(uint64_t)
INPUT_SET(InputSet::Default1, 1, 2, 3, 4, 5, 0, 7, 1000, 9, 10);
INPUT_SET(InputSet::Default2, 1, 2, 1337, 4, 5, 6, 7, 8, 9, 10);
INPUT_SET(InputSet::Default3, 10, 20, 1338, 40, 50, 60, 70, 80, 90, 11);
INPUT_SET(InputSet::Zero, 0);
INPUT_SET(InputSet::BitShiftRhs, 1, 6, 3, 0, 9, 3, 62, 63, 64);
INPUT_SET(InputSet::Bitwise, 0, 1, 3, 6, 9, 0x5555555555555555,
0xAAAAAAAAAAAAAAAA, 0x8000000000000000, 127,
Expand All @@ -361,6 +364,7 @@ INPUT_SET(InputSet::Default2, 1.0, -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, -1.0, 1.0,
-1.0);
INPUT_SET(InputSet::Default3, -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, -1.0,
1.0);
INPUT_SET(InputSet::Zero, 0.0);
INPUT_SET(InputSet::RangeHalfPi, -1.073, 0.044, -1.047, 0.313, 1.447, -0.865,
1.364, -0.715, -0.800, 0.541);
INPUT_SET(InputSet::RangeOne, 0.331, 0.727, -0.957, 0.677, -0.025, 0.495, 0.855,
Expand Down Expand Up @@ -392,6 +396,7 @@ INPUT_SET(InputSet::Default2, 1.0, -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, -1.0, 1.0,
-1.0);
INPUT_SET(InputSet::Default3, -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, -1.0,
1.0);
INPUT_SET(InputSet::Zero, 0.0);
INPUT_SET(InputSet::RangeHalfPi, 0.315f, -0.316f, 1.409f, -0.09f, -1.569f,
1.302f, -0.326f, 0.781f, -1.235f, 0.623f);
INPUT_SET(InputSet::RangeOne, 0.727f, 0.331f, -0.957f, 0.677f, -0.025f, 0.495f,
Expand Down Expand Up @@ -420,6 +425,7 @@ INPUT_SET(InputSet::Default2, 1.0, -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, -1.0, 1.0,
-1.0);
INPUT_SET(InputSet::Default3, -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, -1.0,
1.0);
INPUT_SET(InputSet::Zero, 0.0);
INPUT_SET(InputSet::RangeHalfPi, 0.807, 0.605, 1.317, 0.188, 1.566, -1.507,
0.67, -1.553, 0.194, -0.883);
INPUT_SET(InputSet::RangeOne, 0.331, 0.277, -0.957, 0.677, -0.025, 0.495, 0.855,
Expand Down
62 changes: 62 additions & 0 deletions tools/clang/unittests/HLSLExec/LongVectors.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,6 +776,48 @@ BITWISE_OP(OpType::FirstBitLow, (FirstBitLow(A)));

DEFAULT_OP_1(OpType::Initialize, (A));

template <typename T>
struct Op<OpType::ArrayOperator_StaticAccess, T, 1> : DefaultValidation<T> {};

template <typename T>
static std::vector<T> buildExpectedArrayAccess(const InputSets<T> &Inputs) {
const size_t VectorSize = Inputs[0].size();
std::vector<T> Expected;
Expected.resize(VectorSize);
Copy link
Contributor

@alsepkow alsepkow Nov 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason you opted to zero an expected vector for the elements we aren't testing vs just setting the expected output size to 6?

You could avoid verifying a bunch of zeros by doing that. And if I recall correctly, all you will need to do is set the size of Expected to 6 here. The framework we built dispatches calls to other functions based on the number of elements in the Expected vector. And you can set OutNum in the shader to 6 with logic similar to how it's changed for the reduction op.

Copy link
Collaborator Author

@joaosaffran joaosaffran Nov 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The test read and write at different indexes on which vector size. This is done to provide GEP instruction with index to access at the beginning, middle and end of vector. Forcing that to be 6 means we will need to store the that at I always, making the storing of elements to always be static.

I could make the IndexVector to be 0 to 5, but that reduces the scope where we test GEP calc for larger vectors

Copy link
Contributor

@alsepkow alsepkow Nov 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great point! I wasn't considering the storing portion when I asked that. I wonder if a comment saying that is helpful for a little documentation on that being the intent.


const size_t IndexCount = 6;
size_t IndexList[IndexCount] = {
0, VectorSize - 1, 1, VectorSize - 2, VectorSize / 2, VectorSize / 2 + 1};
size_t End = std::min(VectorSize, IndexCount);
for (size_t i = 0; i < End; ++i)
Copy link
Contributor

@alsepkow alsepkow Nov 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

casing, i should be I

Expected[IndexList[i]] = Inputs[0][IndexList[i]];

return Expected;
}

template <typename T>
struct ExpectedBuilder<OpType::ArrayOperator_StaticAccess, T> {
static std::vector<T>
buildExpected(Op<OpType::ArrayOperator_StaticAccess, T, 1>,
const InputSets<T> &Inputs) {
DXASSERT_NOMSG(Inputs.size() == 1);
return buildExpectedArrayAccess(Inputs);
}
};

template <typename T>
struct Op<OpType::ArrayOperator_DynamicAccess, T, 2> : DefaultValidation<T> {};

template <typename T>
struct ExpectedBuilder<OpType::ArrayOperator_DynamicAccess, T> {
static std::vector<T>
buildExpected(Op<OpType::ArrayOperator_DynamicAccess, T, 2>,
const InputSets<T> &Inputs) {
DXASSERT_NOMSG(Inputs.size() == 2);
return buildExpectedArrayAccess(Inputs);
}
};

//
// Cast
//
Expand Down Expand Up @@ -1775,15 +1817,35 @@ class DxilConf_SM69_Vectorized {
// Unary

HLK_TEST(Initialize, HLSLBool_t);
HLK_TEST(ArrayOperator_StaticAccess, HLSLBool_t);
HLK_TEST(ArrayOperator_DynamicAccess, HLSLBool_t);
HLK_TEST(Initialize, int16_t);
HLK_TEST(ArrayOperator_StaticAccess, int16_t);
HLK_TEST(ArrayOperator_DynamicAccess, int16_t);
HLK_TEST(Initialize, int32_t);
HLK_TEST(ArrayOperator_StaticAccess, int32_t);
HLK_TEST(ArrayOperator_DynamicAccess, int32_t);
HLK_TEST(Initialize, int64_t);
HLK_TEST(ArrayOperator_StaticAccess, int64_t);
HLK_TEST(ArrayOperator_DynamicAccess, int64_t);
HLK_TEST(Initialize, uint16_t);
HLK_TEST(ArrayOperator_StaticAccess, uint16_t);
HLK_TEST(ArrayOperator_DynamicAccess, uint16_t);
HLK_TEST(Initialize, uint32_t);
HLK_TEST(ArrayOperator_StaticAccess, uint32_t);
HLK_TEST(ArrayOperator_DynamicAccess, uint32_t);
HLK_TEST(Initialize, uint64_t);
HLK_TEST(ArrayOperator_StaticAccess, uint64_t);
HLK_TEST(ArrayOperator_DynamicAccess, uint64_t);
HLK_TEST(Initialize, HLSLHalf_t);
HLK_TEST(ArrayOperator_StaticAccess, HLSLHalf_t);
HLK_TEST(ArrayOperator_DynamicAccess, HLSLHalf_t);
HLK_TEST(Initialize, float);
HLK_TEST(ArrayOperator_StaticAccess, float);
HLK_TEST(ArrayOperator_DynamicAccess, float);
HLK_TEST(Initialize, double);
HLK_TEST(ArrayOperator_StaticAccess, double);
HLK_TEST(ArrayOperator_DynamicAccess, double);

HLK_TEST(ShuffleVector, HLSLBool_t);
HLK_TEST(ShuffleVector, int16_t);
Expand Down
32 changes: 31 additions & 1 deletion tools/clang/unittests/HLSLExec/ShaderOpArith.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4184,7 +4184,37 @@ void MSMain(uint GID : SV_GroupIndex,
const uint32_t OutNum = NUM;
#endif

#if IS_UNARY_OP
#if TEST_ARRAY_OPERATOR
// This test case is for testing array operator [].
// It tests static array access with a compile time constant index array.
// And dynamic access, by introducing a runtime dependency that prevents the
Copy link
Contributor

@alsepkow alsepkow Nov 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

very minor nit: Change 'And' to 'Or' to further clarify its one or the other at a time.

Suggested change
// And dynamic access, by introducing a runtime dependency that prevents the
// Or dynamic access, by introducing a runtime dependency that prevents the

// index array from being a compile time constant.
const uint IndexCount = 6;
const uint IndexList[IndexCount] = {
0,
OutNum - 1,
1,
OutNum - 2,
OutNum / 2,
OutNum / 2 + 1
};

vector<OUT_TYPE, OutNum> OutputVector = 0;
uint End = min(OutNum, IndexCount);

#if DYNAMIC_ACCESS
uint Zero = (uint) Input2[0];
Copy link
Contributor

@alsepkow alsepkow Nov 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: const

#endif

[unroll]for(uint i = 0; i < End; ++i) {
#if DYNAMIC_ACCESS
uint index = (uint)(IndexList[i] + Zero);
#else
uint index = (uint)(IndexList[i]);
#endif
OutputVector[index] = Input1[index];
}
#elif IS_UNARY_OP
vector<OUT_TYPE, OutNum> OutputVector = FUNC(Input1);
#elif IS_BINARY_OP
vector<OUT_TYPE, OutNum> OutputVector = FUNC(Input1 OPERATOR
Expand Down