6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-06-30 23:30:28 +00:00
Code Issues Projects Releases Wiki Activity

Change APInt comparison with uint64_t.

Browse Source 
Summary:
This patch changes the way APInt is compared with a value of type uint64_t.
Before the uint64_t value was truncated to the size of APInt before comparison.
Now the comparison takes into account full 64-bit precision.

Test Plan: Unit tests added. No regressions. Self-hosted check-all done as well.

Reviewers: chandlerc, dexonsmith

Subscribers: llvm-commits

Differential Revision: http://reviews.llvm.org/D10655

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@241204 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Pawel Bylica 2015-07-01 22:56:43 +00:00
parent 3c76e5f588
commit c098b6e6e2
2 changed files with 140 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/llvm/ADT/APInt.h
View File

@ -1038,7 +1038,9 @@ public:
/// the validity of the less-than relationship.
///
/// \returns true if *this < RHS when considered unsigned.
bool ult(uint64_t RHS) const { return ult(APInt(getBitWidth(), RHS)); }
bool ult(uint64_t RHS) const {
return getActiveBits() > 64 ? false : getZExtValue() < RHS;
}
/// \brief Signed less than comparison
///
@ -1054,7 +1056,9 @@ public:
/// the validity of the less-than relationship.
///
/// \returns true if *this < RHS when considered signed.
bool slt(uint64_t RHS) const { return slt(APInt(getBitWidth(), RHS)); }
bool slt(int64_t RHS) const {
return getMinSignedBits() > 64 ? isNegative() : getSExtValue() < RHS;
}
/// \brief Unsigned less or equal comparison
///
@ -1102,7 +1106,9 @@ public:
/// the validity of the greater-than relationship.
///
/// \returns true if *this > RHS when considered unsigned.
bool ugt(uint64_t RHS) const { return ugt(APInt(getBitWidth(), RHS)); }
bool ugt(uint64_t RHS) const {
return getActiveBits() > 64 ? true : getZExtValue() > RHS;
}
/// \brief Signed greather than comparison
///
@ -1118,7 +1124,9 @@ public:
/// the validity of the greater-than relationship.
///
/// \returns true if *this > RHS when considered signed.
bool sgt(uint64_t RHS) const { return sgt(APInt(getBitWidth(), RHS)); }
bool sgt(int64_t RHS) const {
return getMinSignedBits() > 64 ? !isNegative() : getSExtValue() > RHS;
}
/// \brief Unsigned greater or equal comparison
///
@ -1150,7 +1158,7 @@ public:
/// the validity of the greater-or-equal relationship.
///
/// \returns true if *this >= RHS when considered signed.
bool sge(uint64_t RHS) const { return !slt(RHS); }
bool sge(int64_t RHS) const { return !slt(RHS); }
/// This operation tests if there are any pairs of corresponding bits
/// between this APInt and RHS that are both set.

127
unittests/ADT/APIntTest.cpp
View File

@ -254,6 +254,133 @@ TEST(APIntTest, compare) {
}
}
TEST(APIntTest, compareWithRawIntegers) {
EXPECT_TRUE(!APInt(8, 1).uge(256));
EXPECT_TRUE(!APInt(8, 1).ugt(256));
EXPECT_TRUE( APInt(8, 1).ule(256));
EXPECT_TRUE( APInt(8, 1).ult(256));
EXPECT_TRUE(!APInt(8, 1).sge(256));
EXPECT_TRUE(!APInt(8, 1).sgt(256));
EXPECT_TRUE( APInt(8, 1).sle(256));
EXPECT_TRUE( APInt(8, 1).slt(256));
EXPECT_TRUE(!(APInt(8, 0) == 256));
EXPECT_TRUE( APInt(8, 0) != 256);
EXPECT_TRUE(!(APInt(8, 1) == 256));
EXPECT_TRUE( APInt(8, 1) != 256);
auto uint64max = UINT64_MAX;
auto int64max = INT64_MAX;
auto int64min = INT64_MIN;
auto u64 = APInt{128, uint64max};
auto s64 = APInt{128, static_cast<uint64_t>(int64max), true};
auto big = u64 + 1;
EXPECT_TRUE( u64.uge(uint64max));
EXPECT_TRUE(!u64.ugt(uint64max));
EXPECT_TRUE( u64.ule(uint64max));
EXPECT_TRUE(!u64.ult(uint64max));
EXPECT_TRUE( u64.sge(int64max));
EXPECT_TRUE( u64.sgt(int64max));
EXPECT_TRUE(!u64.sle(int64max));
EXPECT_TRUE(!u64.slt(int64max));
EXPECT_TRUE( u64.sge(int64min));
EXPECT_TRUE( u64.sgt(int64min));
EXPECT_TRUE(!u64.sle(int64min));
EXPECT_TRUE(!u64.slt(int64min));
EXPECT_TRUE(u64 == uint64max);
EXPECT_TRUE(u64 != int64max);
EXPECT_TRUE(u64 != int64min);
EXPECT_TRUE(!s64.uge(uint64max));
EXPECT_TRUE(!s64.ugt(uint64max));
EXPECT_TRUE( s64.ule(uint64max));
EXPECT_TRUE( s64.ult(uint64max));
EXPECT_TRUE( s64.sge(int64max));
EXPECT_TRUE(!s64.sgt(int64max));
EXPECT_TRUE( s64.sle(int64max));
EXPECT_TRUE(!s64.slt(int64max));
EXPECT_TRUE( s64.sge(int64min));
EXPECT_TRUE( s64.sgt(int64min));
EXPECT_TRUE(!s64.sle(int64min));
EXPECT_TRUE(!s64.slt(int64min));
EXPECT_TRUE(s64 != uint64max);
EXPECT_TRUE(s64 == int64max);
EXPECT_TRUE(s64 != int64min);
EXPECT_TRUE( big.uge(uint64max));
EXPECT_TRUE( big.ugt(uint64max));
EXPECT_TRUE(!big.ule(uint64max));
EXPECT_TRUE(!big.ult(uint64max));
EXPECT_TRUE( big.sge(int64max));
EXPECT_TRUE( big.sgt(int64max));
EXPECT_TRUE(!big.sle(int64max));
EXPECT_TRUE(!big.slt(int64max));
EXPECT_TRUE( big.sge(int64min));
EXPECT_TRUE( big.sgt(int64min));
EXPECT_TRUE(!big.sle(int64min));
EXPECT_TRUE(!big.slt(int64min));
EXPECT_TRUE(big != uint64max);
EXPECT_TRUE(big != int64max);
EXPECT_TRUE(big != int64min);
}
TEST(APIntTest, compareWithInt64Min) {
int64_t edge = INT64_MIN;
int64_t edgeP1 = edge + 1;
int64_t edgeM1 = INT64_MAX;
auto a = APInt{64, static_cast<uint64_t>(edge), true};
EXPECT_TRUE(!a.slt(edge));
EXPECT_TRUE( a.sle(edge));
EXPECT_TRUE(!a.sgt(edge));
EXPECT_TRUE( a.sge(edge));
EXPECT_TRUE( a.slt(edgeP1));
EXPECT_TRUE( a.sle(edgeP1));
EXPECT_TRUE(!a.sgt(edgeP1));
EXPECT_TRUE(!a.sge(edgeP1));
EXPECT_TRUE( a.slt(edgeM1));
EXPECT_TRUE( a.sle(edgeM1));
EXPECT_TRUE(!a.sgt(edgeM1));
EXPECT_TRUE(!a.sge(edgeM1));
}
TEST(APIntTest, compareWithHalfInt64Max) {
uint64_t edge = 0x4000000000000000;
uint64_t edgeP1 = edge + 1;
uint64_t edgeM1 = edge - 1;
auto a = APInt{64, edge};
EXPECT_TRUE(!a.ult(edge));
EXPECT_TRUE( a.ule(edge));
EXPECT_TRUE(!a.ugt(edge));
EXPECT_TRUE( a.uge(edge));
EXPECT_TRUE( a.ult(edgeP1));
EXPECT_TRUE( a.ule(edgeP1));
EXPECT_TRUE(!a.ugt(edgeP1));
EXPECT_TRUE(!a.uge(edgeP1));
EXPECT_TRUE(!a.ult(edgeM1));
EXPECT_TRUE(!a.ule(edgeM1));
EXPECT_TRUE( a.ugt(edgeM1));
EXPECT_TRUE( a.uge(edgeM1));
EXPECT_TRUE(!a.slt(edge));
EXPECT_TRUE( a.sle(edge));
EXPECT_TRUE(!a.sgt(edge));
EXPECT_TRUE( a.sge(edge));
EXPECT_TRUE( a.slt(edgeP1));
EXPECT_TRUE( a.sle(edgeP1));
EXPECT_TRUE(!a.sgt(edgeP1));
EXPECT_TRUE(!a.sge(edgeP1));
EXPECT_TRUE(!a.slt(edgeM1));
EXPECT_TRUE(!a.sle(edgeM1));
EXPECT_TRUE( a.sgt(edgeM1));
EXPECT_TRUE( a.sge(edgeM1));
}
// Tests different div/rem varaints using scheme (a * b + c) / a
void testDiv(APInt a, APInt b, APInt c) {