Skip to content
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

[ADT] Add APIntOps::abds signed absolute difference and rename absdiff -> abdu #84791

Merged
merged 1 commit into from
Mar 12, 2024
Merged

[ADT] Add APIntOps::abds signed absolute difference and rename absdiff -> abdu #84791

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
7 changes: 6 additions & 1 deletion llvm/include/llvm/ADT/APInt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2188,8 +2188,13 @@ inline const APInt &umax(const APInt &A, const APInt &B) {
return A.ugt(B) ? A : B;
}

/// Determine the absolute difference of two APInts considered to be signed.
inline const APInt abds(const APInt &A, const APInt &B) {
return A.sge(B) ? (A - B) : (B - A);
Copy link
Contributor

Choose a reason for hiding this comment

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

Don't need the parens (but I'm not insisting you remove them if you prefer them).

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Thanks, I always tend towards being overly cautious within ternary

}

/// Determine the absolute difference of two APInts considered to be unsigned.
inline const APInt absdiff(const APInt &A, const APInt &B) {
inline const APInt abdu(const APInt &A, const APInt &B) {
return A.uge(B) ? (A - B) : (B - A);
}

Expand Down
4 changes: 2 additions & 2 deletions llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6068,9 +6068,9 @@ static std::optional<APInt> FoldValue(unsigned Opcode, const APInt &C1,
return (C1Ext + C2Ext + 1).extractBits(C1.getBitWidth(), 1);
}
case ISD::ABDS:
return APIntOps::smax(C1, C2) - APIntOps::smin(C1, C2);
return APIntOps::abds(C1, C2);
case ISD::ABDU:
return APIntOps::umax(C1, C2) - APIntOps::umin(C1, C2);
return APIntOps::abdu(C1, C2);
}
return std::nullopt;
}
Expand Down
66 changes: 50 additions & 16 deletions llvm/unittests/ADT/APIntTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2532,38 +2532,72 @@ TEST(APIntTest, clearLowBits) {
EXPECT_EQ(16u, i32hi16.popcount());
}

TEST(APIntTest, AbsDiff) {
using APIntOps::absdiff;
TEST(APIntTest, abds) {
using APIntOps::abds;

APInt MaxU1(1, 1, false);
APInt MinU1(1, 0, false);
EXPECT_EQ(1u, absdiff(MaxU1, MinU1).getZExtValue());
EXPECT_EQ(1u, absdiff(MinU1, MaxU1).getZExtValue());
EXPECT_EQ(1u, abds(MaxU1, MinU1).getZExtValue());
EXPECT_EQ(1u, abds(MinU1, MaxU1).getZExtValue());

APInt MaxU4(4, 15, false);
APInt MinU4(4, 0, false);
EXPECT_EQ(15u, absdiff(MaxU4, MinU4).getZExtValue());
EXPECT_EQ(15u, absdiff(MinU4, MaxU4).getZExtValue());
EXPECT_EQ(1, abds(MaxU4, MinU4).getSExtValue());
EXPECT_EQ(1, abds(MinU4, MaxU4).getSExtValue());

APInt MaxS8(8, 127, true);
APInt MinS8(8, -128, true);
EXPECT_EQ(1u, absdiff(MaxS8, MinS8).getZExtValue());
EXPECT_EQ(1u, absdiff(MinS8, MaxS8).getZExtValue());
EXPECT_EQ(-1, abds(MaxS8, MinS8).getSExtValue());
EXPECT_EQ(-1, abds(MinS8, MaxS8).getSExtValue());

APInt MaxU16(16, 65535, false);
APInt MinU16(16, 0, false);
EXPECT_EQ(65535u, absdiff(MaxU16, MinU16).getZExtValue());
EXPECT_EQ(65535u, absdiff(MinU16, MaxU16).getZExtValue());
EXPECT_EQ(1, abds(MaxU16, MinU16).getSExtValue());
EXPECT_EQ(1, abds(MinU16, MaxU16).getSExtValue());

APInt MaxS16(16, 32767, true);
APInt MinS16(16, -32768, true);
APInt ZeroS16(16, 0, true);
EXPECT_EQ(1u, absdiff(MaxS16, MinS16).getZExtValue());
EXPECT_EQ(1u, absdiff(MinS16, MaxS16).getZExtValue());
EXPECT_EQ(32768u, absdiff(ZeroS16, MinS16));
EXPECT_EQ(32768u, absdiff(MinS16, ZeroS16));
EXPECT_EQ(32767u, absdiff(ZeroS16, MaxS16));
EXPECT_EQ(32767u, absdiff(MaxS16, ZeroS16));
EXPECT_EQ(-1, abds(MaxS16, MinS16).getSExtValue());
EXPECT_EQ(-1, abds(MinS16, MaxS16).getSExtValue());
EXPECT_EQ(32768u, abds(ZeroS16, MinS16));
EXPECT_EQ(32768u, abds(MinS16, ZeroS16));
EXPECT_EQ(32767u, abds(ZeroS16, MaxS16));
EXPECT_EQ(32767u, abds(MaxS16, ZeroS16));
}

TEST(APIntTest, abdu) {
using APIntOps::abdu;

APInt MaxU1(1, 1, false);
APInt MinU1(1, 0, false);
EXPECT_EQ(1u, abdu(MaxU1, MinU1).getZExtValue());
EXPECT_EQ(1u, abdu(MinU1, MaxU1).getZExtValue());

APInt MaxU4(4, 15, false);
APInt MinU4(4, 0, false);
EXPECT_EQ(15u, abdu(MaxU4, MinU4).getZExtValue());
EXPECT_EQ(15u, abdu(MinU4, MaxU4).getZExtValue());

APInt MaxS8(8, 127, true);
APInt MinS8(8, -128, true);
EXPECT_EQ(1u, abdu(MaxS8, MinS8).getZExtValue());
EXPECT_EQ(1u, abdu(MinS8, MaxS8).getZExtValue());

APInt MaxU16(16, 65535, false);
APInt MinU16(16, 0, false);
EXPECT_EQ(65535u, abdu(MaxU16, MinU16).getZExtValue());
EXPECT_EQ(65535u, abdu(MinU16, MaxU16).getZExtValue());

APInt MaxS16(16, 32767, true);
APInt MinS16(16, -32768, true);
APInt ZeroS16(16, 0, true);
EXPECT_EQ(1u, abdu(MaxS16, MinS16).getZExtValue());
EXPECT_EQ(1u, abdu(MinS16, MaxS16).getZExtValue());
EXPECT_EQ(32768u, abdu(ZeroS16, MinS16));
EXPECT_EQ(32768u, abdu(MinS16, ZeroS16));
EXPECT_EQ(32767u, abdu(ZeroS16, MaxS16));
EXPECT_EQ(32767u, abdu(MaxS16, ZeroS16));
}

TEST(APIntTest, GCD) {
Expand Down
4 changes: 1 addition & 3 deletions llvm/unittests/Support/KnownBitsTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,9 +361,7 @@ TEST(KnownBitsTest, BinaryExhaustive) {
[](const KnownBits &Known1, const KnownBits &Known2) {
return KnownBits::absdiff(Known1, Known2);
},
[](const APInt &N1, const APInt &N2) {
return APIntOps::absdiff(N1, N2);
},
[](const APInt &N1, const APInt &N2) { return APIntOps::abdu(N1, N2); },
checkCorrectnessOnlyBinary);
testBinaryOpExhaustive(
[](const KnownBits &Known1, const KnownBits &Known2) {
Expand Down
Loading