Adds tests for the new Morton Code class #187
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
XX_Mortons/main.cpp
Outdated
Comment on lines
55
to
198
| // -------------------------------------- SUBTRACTION ------------------------------------------------- | ||
| // ---------------------------------------------------------------------------------------------------- | ||
|
|
||
| // ---------------------------------------- Signed ----------------------------------------------------- | ||
|
|
||
| // No overflow | ||
| assert(static_cast<vector_t>(morton_t(vector_t(1000, 764, -365)) - morton_t(vector_t(834, -243, 100))) == vector_t(166, 1007, -465)); | ||
|
|
||
| // Type 1 overflow: Subtraction of representable coordinates goes out of range | ||
| assert(static_cast<vector_t>(morton_t(vector_t(-900, 70, 500)) - morton_t(vector_t(578, -50, -20))) == vector_t(570, 120, -504)); | ||
|
|
||
| // Type 2 overflow: Subtraction of irrepresentable range gives correct result | ||
| assert(static_cast<vector_t>(morton_t(vector_t(54, 900, -475)) - morton_t(vector_t(-46, 1437, -699))) == vector_t(100, -537, 224)); | ||
|
|
||
| // ---------------------------------------- Unsigned ----------------------------------------------------- | ||
|
|
||
| // No overflow | ||
| assert(static_cast<unsigned_vector_t>(unsigned_morton_t(unsigned_vector_t(382, 910, 543)) - unsigned_morton_t(unsigned_vector_t(322, 564, 299))) == unsigned_vector_t(60, 346, 244)); | ||
|
|
||
| // Type 1 overflow: Subtraction of representable coordinates goes out of range | ||
| assert(static_cast<unsigned_vector_t>(unsigned_morton_t(unsigned_vector_t(382, 910, 543)) - unsigned_morton_t(unsigned_vector_t(2000, 2000, 1000))) == unsigned_vector_t(430, 958, 567)); | ||
|
|
||
| // Type 2 overflow: Subtraction of irrepresentable range gives correct result | ||
| assert(static_cast<unsigned_vector_t>(unsigned_morton_t(unsigned_vector_t(54, 900, 475)) - unsigned_morton_t(unsigned_vector_t(-865, -100, -10))) == unsigned_vector_t(919, 1000, 485)); | ||
|
|
||
|
|
||
| // ---------------------------------------------------------------------------------------------------- | ||
| // -------------------------------------- UNARY NEGATION ---------------------------------------------- | ||
| // ---------------------------------------------------------------------------------------------------- | ||
|
|
||
| // Only makes sense for signed | ||
| assert(static_cast<vector_t>(- morton_t(vector_t(-1024, 543, -475))) == vector_t(-1024, -543, 475)); | ||
|
|
||
| // *********************************************************************************************************************************** | ||
| // ************************************************* Comparison operator tests ******************************************************* | ||
| // *********************************************************************************************************************************** | ||
|
|
||
| // ---------------------------------------------------------------------------------------------------- | ||
| // -------------------------------------- OPERATOR< --------------------------------------------------- | ||
| // ---------------------------------------------------------------------------------------------------- | ||
|
|
||
| // Signed | ||
|
|
||
| // Same sign, negative | ||
| assert(morton_t(vector_t(-954, -455, -333)) < morton_t(vector_t(-433, -455, -433)) == bool_vector_t(true, false, false)); | ||
| // Same sign, positive | ||
| assert(morton_t(vector_t(954, 455, 333)) < morton_t(vector_t(433, 455, 433)) == bool_vector_t(false, false, true)); | ||
| // Differing signs | ||
| assert(morton_t(vector_t(954, -32, 0)) < morton_t(vector_t(-44, 0, -1)) == bool_vector_t(false, true, false)); | ||
|
|
||
| // Unsigned | ||
| assert(unsigned_morton_t(unsigned_vector_t(239, 435, 66)) < unsigned_morton_t(unsigned_vector_t(240, 435, 50)) == bool_vector_t(true, false, false)); | ||
|
|
||
| // ---------------------------------------------------------------------------------------------------- | ||
| // -------------------------------------- OPERATOR<= -------------------------------------------------- | ||
| // ---------------------------------------------------------------------------------------------------- | ||
|
|
||
| // Signed | ||
|
|
||
| // Same sign, negative | ||
| assert(morton_t(vector_t(-954, -455, -333)) <= morton_t(vector_t(-433, -455, -433)) == bool_vector_t(true, true, false)); | ||
| // Same sign, positive | ||
| assert(morton_t(vector_t(954, 455, 333)) <= morton_t(vector_t(433, 455, 433)) == bool_vector_t(false, true, true)); | ||
| // Differing signs | ||
| assert(morton_t(vector_t(954, -32, 0)) <= morton_t(vector_t(-44, 0, -1)) == bool_vector_t(false, true, false)); | ||
|
|
||
| // Unsigned | ||
| assert(unsigned_morton_t(unsigned_vector_t(239, 435, 66)) <= unsigned_morton_t(unsigned_vector_t(240, 435, 50)) == bool_vector_t(true, true, false)); | ||
|
|
||
| // ---------------------------------------------------------------------------------------------------- | ||
| // -------------------------------------- OPERATOR> --------------------------------------------------- | ||
| // ---------------------------------------------------------------------------------------------------- | ||
|
|
||
| // Signed | ||
|
|
||
| // Same sign, negative | ||
| assert(morton_t(vector_t(-954, -455, -333)) > morton_t(vector_t(-433, -455, -433)) == bool_vector_t(false, false, true)); | ||
| // Same sign, positive | ||
| assert(morton_t(vector_t(954, 455, 333)) > morton_t(vector_t(433, 455, 433)) == bool_vector_t(true, false, false)); | ||
| // Differing signs | ||
| assert(morton_t(vector_t(954, -32, 0)) > morton_t(vector_t(-44, 0, -1)) == bool_vector_t(true, false, true)); | ||
|
|
||
| // Unsigned | ||
| assert(unsigned_morton_t(unsigned_vector_t(239, 435, 66)) > unsigned_morton_t(unsigned_vector_t(240, 435, 50)) == bool_vector_t(false, false, true)); | ||
|
|
||
| // ---------------------------------------------------------------------------------------------------- | ||
| // -------------------------------------- OPERATOR>= -------------------------------------------------- | ||
| // ---------------------------------------------------------------------------------------------------- | ||
|
|
||
| // Signed | ||
|
|
||
| // Same sign, negative | ||
| assert(morton_t(vector_t(-954, -455, -333)) >= morton_t(vector_t(-433, -455, -433)) == bool_vector_t(false, true, true)); | ||
| // Same sign, positive | ||
| assert(morton_t(vector_t(954, 455, 333)) >= morton_t(vector_t(433, 455, 433)) == bool_vector_t(true, true, false)); | ||
| // Differing signs | ||
| assert(morton_t(vector_t(954, -32, 0)) >= morton_t(vector_t(-44, 0, -1)) == bool_vector_t(true, false, true)); | ||
|
|
||
| // Unsigned | ||
| assert(unsigned_morton_t(unsigned_vector_t(239, 435, 66)) >= unsigned_morton_t(unsigned_vector_t(240, 435, 50)) == bool_vector_t(false, true, true)); |
There was a problem hiding this comment.
cmon, do single source testing
There was a problem hiding this comment.
see bits of example 22, there's same code you include both in some C++ function and HLSL shader, you run same code in both tests
22_CppCompat/CIntrinsicsTester.h
Outdated
Comment on lines
196
to
202
| auto inverseGlm = glm::inverse(reinterpret_cast<typename float32_t3x3::Base const&>(testInput.inverse)); | ||
| expected.inverse = reinterpret_cast<float32_t3x3&>(inverseGlm); | ||
|
|
||
| expected.addCarry.result = glm::uaddCarry(testInput.addCarryA, testInput.addCarryB, expected.addCarry.carry); | ||
| expected.subBorrow.result = glm::usubBorrow(testInput.subBorrowA, testInput.subBorrowB, expected.subBorrow.borrow); | ||
| expected.addCarryVec.result = glm::uaddCarry(testInput.addCarryAVec, testInput.addCarryBVec, expected.addCarryVec.carry); | ||
| expected.subBorrowVec.result = glm::usubBorrow(testInput.subBorrowAVec, testInput.subBorrowBVec, expected.subBorrowVec.borrow); |
There was a problem hiding this comment.
@Przemog1 why is this example testing glm functions instead of our nbl::hlsl that pass through to them ?
12_Mortons/app_resources/common.hlsl
Outdated
|
|
||
| // Proper coverage would require writing tests for ALL possible sign, dimensions and width configurations | ||
| //using morton_t2 = nbl::hlsl::morton::code<true, 8, 2>; // Fits in an int16_t | ||
| using vector_t2 = nbl::hlsl::vector<int16_t, 3>; |
There was a problem hiding this comment.
t2 but it has dimension of 3 ?
12_Mortons/app_resources/common.hlsl
Outdated
|
|
||
| NBL_CONSTEXPR uint32_t bufferSize = 256; | ||
|
|
||
| // Proper coverage would require writing tests for ALL possible sign, dimensions and width configurations |
There was a problem hiding this comment.
recursion with templates, why not
12_Mortons/app_resources/shader.hlsl
Outdated
| accessor.set(0, foo.value); | ||
| //accessor.set(0, foo.value); | ||
| */ | ||
| uint32_t bar = _static_cast<uint32_t>(0xCAFEDEADDEADBEEF); |
There was a problem hiding this comment.
IIRC its not gonna be a uint64 literal without ull suffix
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checks that the arithmetic and comparisons work as expected + checks it compiles for GPU