encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tint: add CheckedAdd AFloat overload 

Bug: tint:1581
Change-Id: I3d346a5ced345dbd720cce3404b4a0a402e71838
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/98106
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Dan Sinclair <dsinclair@chromium.org>
Commit-Queue: Antonio Maiorano <amaiorano@google.com>
This commit is contained in:
Antonio Maiorano 2022-08-03 21:20:26 +00:00 committed by Dawn LUCI CQ
parent 7692f3a5e2
commit 50940aeef1
2 changed files with 57 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tint/number.h
View File

@ -363,6 +363,15 @@ inline std::optional<AInt> CheckedAdd(AInt a, AInt b) {
return AInt(result); return AInt(result);
} }
/// @returns a + b, or an empty optional if the resulting value overflowed the AFloat
inline std::optional<AFloat> CheckedAdd(AFloat a, AFloat b) {
auto result = a.value + b.value;
if (!std::isfinite(result)) {
return {};
}
return AFloat{result};
}
/// @returns a * b, or an empty optional if the resulting value overflowed the AInt /// @returns a * b, or an empty optional if the resulting value overflowed the AInt
inline std::optional<AInt> CheckedMul(AInt a, AInt b) { inline std::optional<AInt> CheckedMul(AInt a, AInt b) {
int64_t result; int64_t result;

66
src/tint/number_test.cc
View File

@ -356,24 +356,25 @@ INSTANTIATE_TEST_SUITE_P(
///////////////////////////////////// /////////////////////////////////////
})); }));
using BinaryCheckedCase = std::tuple<std::optional<AInt>, AInt, AInt>;
#undef OVERFLOW // corecrt_math.h :( #undef OVERFLOW // corecrt_math.h :(
#define OVERFLOW \ #define OVERFLOW \
{} {}
using CheckedAddTest = testing::TestWithParam<BinaryCheckedCase>; using BinaryCheckedCase_AInt = std::tuple<std::optional<AInt>, AInt, AInt>;
TEST_P(CheckedAddTest, Test) { using BinaryCheckedCase_AFloat = std::tuple<std::optional<AFloat>, AFloat, AFloat>;
using CheckedAddTest_AInt = testing::TestWithParam<BinaryCheckedCase_AInt>;
TEST_P(CheckedAddTest_AInt, Test) {
auto expect = std::get<0>(GetParam()); auto expect = std::get<0>(GetParam());
auto a = std::get<1>(GetParam()); auto a = std::get<1>(GetParam());
auto b = std::get<2>(GetParam()); auto b = std::get<2>(GetParam());
EXPECT_EQ(CheckedAdd(a, b), expect) << std::hex << "0x" << a << " * 0x" << b; EXPECT_EQ(CheckedAdd(a, b), expect) << std::hex << "0x" << a << " + 0x" << b;
EXPECT_EQ(CheckedAdd(b, a), expect) << std::hex << "0x" << a << " * 0x" << b; EXPECT_EQ(CheckedAdd(b, a), expect) << std::hex << "0x" << a << " + 0x" << b;
} }
INSTANTIATE_TEST_SUITE_P( INSTANTIATE_TEST_SUITE_P(
CheckedAddTest, CheckedAddTest_AInt,
CheckedAddTest, CheckedAddTest_AInt,
testing::ValuesIn(std::vector<BinaryCheckedCase>{ testing::ValuesIn(std::vector<BinaryCheckedCase_AInt>{
{AInt(0), AInt(0), AInt(0)}, {AInt(0), AInt(0), AInt(0)},
{AInt(1), AInt(1), AInt(0)}, {AInt(1), AInt(1), AInt(0)},
{AInt(2), AInt(1), AInt(1)}, {AInt(2), AInt(1), AInt(1)},
@ -398,8 +399,37 @@ INSTANTIATE_TEST_SUITE_P(
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
})); }));
using CheckedMulTest = testing::TestWithParam<BinaryCheckedCase>; using CheckedAddTest_AFloat = testing::TestWithParam<BinaryCheckedCase_AFloat>;
TEST_P(CheckedMulTest, Test) { TEST_P(CheckedAddTest_AFloat, Test) {
auto expect = std::get<0>(GetParam());
auto a = std::get<1>(GetParam());
auto b = std::get<2>(GetParam());
EXPECT_EQ(CheckedAdd(a, b), expect) << std::hex << "0x" << a << " + 0x" << b;
EXPECT_EQ(CheckedAdd(b, a), expect) << std::hex << "0x" << a << " + 0x" << b;
}
INSTANTIATE_TEST_SUITE_P(
CheckedAddTest_AFloat,
CheckedAddTest_AFloat,
testing::ValuesIn(std::vector<BinaryCheckedCase_AFloat>{
{AFloat(0), AFloat(0), AFloat(0)},
{AFloat(1), AFloat(1), AFloat(0)},
{AFloat(2), AFloat(1), AFloat(1)},
{AFloat(0), AFloat(-1), AFloat(1)},
{AFloat(3), AFloat(2), AFloat(1)},
{AFloat(-1), AFloat(-2), AFloat(1)},
{AFloat(0x300), AFloat(0x100), AFloat(0x200)},
{AFloat(0x100), AFloat(-0x100), AFloat(0x200)},
{AFloat::Highest(), AFloat(1), AFloat(AFloat::kHighestValue - 1)},
{AFloat::Lowest(), AFloat(-1), AFloat(AFloat::kLowestValue + 1)},
{AFloat::Highest(), AFloat::Highest(), AFloat(0)},
{AFloat::Lowest(), AFloat::Lowest(), AFloat(0)},
{OVERFLOW, AFloat::Highest(), AFloat::Highest()},
{OVERFLOW, AFloat::Lowest(), AFloat::Lowest()},
////////////////////////////////////////////////////////////////////////
}));
using CheckedMulTest_AInt = testing::TestWithParam<BinaryCheckedCase_AInt>;
TEST_P(CheckedMulTest_AInt, Test) {
auto expect = std::get<0>(GetParam()); auto expect = std::get<0>(GetParam());
auto a = std::get<1>(GetParam()); auto a = std::get<1>(GetParam());
auto b = std::get<2>(GetParam()); auto b = std::get<2>(GetParam());
@ -407,9 +437,9 @@ TEST_P(CheckedMulTest, Test) {
EXPECT_EQ(CheckedMul(b, a), expect) << std::hex << "0x" << a << " * 0x" << b; EXPECT_EQ(CheckedMul(b, a), expect) << std::hex << "0x" << a << " * 0x" << b;
} }
INSTANTIATE_TEST_SUITE_P( INSTANTIATE_TEST_SUITE_P(
CheckedMulTest, CheckedMulTest_AInt,
CheckedMulTest, CheckedMulTest_AInt,
testing::ValuesIn(std::vector<BinaryCheckedCase>{ testing::ValuesIn(std::vector<BinaryCheckedCase_AInt>{
{AInt(0), AInt(0), AInt(0)}, {AInt(0), AInt(0), AInt(0)},
{AInt(0), AInt(1), AInt(0)}, {AInt(0), AInt(1), AInt(0)},
{AInt(1), AInt(1), AInt(1)}, {AInt(1), AInt(1), AInt(1)},
@ -446,8 +476,8 @@ INSTANTIATE_TEST_SUITE_P(
using TernaryCheckedCase = std::tuple<std::optional<AInt>, AInt, AInt, AInt>; using TernaryCheckedCase = std::tuple<std::optional<AInt>, AInt, AInt, AInt>;
using CheckedMaddTest = testing::TestWithParam<TernaryCheckedCase>; using CheckedMaddTest_AInt = testing::TestWithParam<TernaryCheckedCase>;
TEST_P(CheckedMaddTest, Test) { TEST_P(CheckedMaddTest_AInt, Test) {
auto expect = std::get<0>(GetParam()); auto expect = std::get<0>(GetParam());
auto a = std::get<1>(GetParam()); auto a = std::get<1>(GetParam());
auto b = std::get<2>(GetParam()); auto b = std::get<2>(GetParam());
@ -458,8 +488,8 @@ TEST_P(CheckedMaddTest, Test) {
<< std::hex << "0x" << a << " * 0x" << b << " + 0x" << c; << std::hex << "0x" << a << " * 0x" << b << " + 0x" << c;
} }
INSTANTIATE_TEST_SUITE_P( INSTANTIATE_TEST_SUITE_P(
CheckedMaddTest, CheckedMaddTest_AInt,
CheckedMaddTest, CheckedMaddTest_AInt,
testing::ValuesIn(std::vector<TernaryCheckedCase>{ testing::ValuesIn(std::vector<TernaryCheckedCase>{
{AInt(0), AInt(0), AInt(0), AInt(0)}, {AInt(0), AInt(0), AInt(0), AInt(0)},
{AInt(0), AInt(1), AInt(0), AInt(0)}, {AInt(0), AInt(1), AInt(0), AInt(0)},