Skip to content

[MLIR][Presburger] Fraction: implement arithmetic operations (/, +, -) and printing #65310

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 6 commits into from
Sep 5, 2023
Merged

[MLIR][Presburger] Fraction: implement arithmetic operations (/, +, -) and printing #65310

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8d3e0da
Shift changes to Fraction
Abhinav271828 Sep 5, 2023
8a05087
Update documentation and remove extraneous include
Abhinav271828 Sep 5, 2023
504ffcd
Add reduction after arithmetic operations
Abhinav271828 Sep 5, 2023
38a86eb
Add increment and decrement
Abhinav271828 Sep 5, 2023
3bf6dd4
Fix const and overload other arithmetic operators
Abhinav271828 Sep 5, 2023
3842f63
Fix return value of reduce
Abhinav271828 Sep 5, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 45 additions & 5 deletions mlir/include/mlir/Analysis/Presburger/Fraction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
//
// This is a simple class to represent fractions. It supports multiplication,
// This is a simple class to represent fractions. It supports arithmetic,
// comparison, floor, and ceiling operations.
//
//===----------------------------------------------------------------------===//
Expand All @@ -30,15 +30,15 @@ struct Fraction {
Fraction() = default;

/// Construct a Fraction from a numerator and denominator.
Fraction(const MPInt &oNum, const MPInt &oDen) : num(oNum), den(oDen) {
Fraction(const MPInt &oNum, const MPInt &oDen = MPInt(1)) : num(oNum), den(oDen) {
if (den < 0) {
num = -num;
den = -den;
}
}
/// Overloads for passing literals.
Fraction(const MPInt &num, int64_t den) : Fraction(num, MPInt(den)) {}
Fraction(int64_t num, const MPInt &den) : Fraction(MPInt(num), den) {}
Fraction(const MPInt &num, int64_t den = 1) : Fraction(num, MPInt(den)) {}
Fraction(int64_t num, const MPInt &den = MPInt(1)) : Fraction(MPInt(num), den) {}
Fraction(int64_t num, int64_t den) : Fraction(MPInt(num), MPInt(den)) {}

// Return the value of the fraction as an integer. This should only be called
Expand All @@ -48,6 +48,10 @@ struct Fraction {
return num / den;
}

llvm::raw_ostream &print(llvm::raw_ostream &os) const {
return os << "(" << num << "/" << den << ")";
}

/// The numerator and denominator, respectively. The denominator is always
/// positive.
MPInt num{0}, den{1};
Expand Down Expand Up @@ -95,8 +99,44 @@ inline bool operator>=(const Fraction &x, const Fraction &y) {
return compare(x, y) >= 0;
}

inline Fraction reduce(const Fraction &f) {
if (f == Fraction(0))
return f;
MPInt g = gcd(f.num, f.den);
return Fraction(f.num / g, f.den / g);
}

inline Fraction operator*(const Fraction &x, const Fraction &y) {
return Fraction(x.num * y.num, x.den * y.den);
return reduce(Fraction(x.num * y.num, x.den * y.den));
}

inline Fraction operator/(const Fraction &x, const Fraction &y) {
return reduce(Fraction(x.num * y.den, x.den * y.num));
}

inline Fraction operator+(const Fraction &x, const Fraction &y) {
return reduce(Fraction(x.num * y.den + x.den * y.num, x.den * y.den));
}

inline Fraction operator-(const Fraction &x, const Fraction &y) {
return reduce(Fraction(x.num * y.den - x.den * y.num, x.den * y.den));
}

inline Fraction& operator+=(const Fraction &g, const Fraction &f) {
Fraction *r = NULL;
*r = g+f;
return *r;
}

inline Fraction& operator-=(const Fraction &g, const Fraction &f) {
Fraction *r = NULL;
*r = g-f;
return *r;
}

inline llvm::raw_ostream &operator<<(llvm::raw_ostream &os, const Fraction &x) {
x.print(os);
return os;
}

} // namespace presburger
Expand Down