[Mlir-commits] [mlir] 1e10d35 - Revert "[MLIR][Presburger] introduce MPInt to support fast arbitrary precision in Presburger"
Arjun P
llvmlistbot at llvm.org
Mon Jul 11 06:26:21 PDT 2022
Author: Arjun P
Date: 2022-07-11T14:26:09+01:00
New Revision: 1e10d35ea9c02e9b5694836fd3dcc0b9baf28b48
URL: https://github.com/llvm/llvm-project/commit/1e10d35ea9c02e9b5694836fd3dcc0b9baf28b48
DIFF: https://github.com/llvm/llvm-project/commit/1e10d35ea9c02e9b5694836fd3dcc0b9baf28b48.diff
LOG: Revert "[MLIR][Presburger] introduce MPInt to support fast arbitrary precision in Presburger"
This reverts commit c9035df2fad4da9ea75b9211b3a9b0a230925000.
Reverting due to build failure on Windows: https://lab.llvm.org/buildbot/#/builders/172/builds/14767
Added:
mlir/unittests/Analysis/Presburger/SlowMPIntTest.cpp
Modified:
mlir/lib/Analysis/Presburger/CMakeLists.txt
mlir/unittests/Analysis/Presburger/CMakeLists.txt
Removed:
mlir/include/mlir/Analysis/Presburger/MPInt.h
mlir/lib/Analysis/Presburger/MPInt.cpp
mlir/unittests/Analysis/Presburger/MPIntTest.cpp
################################################################################
diff --git a/mlir/include/mlir/Analysis/Presburger/MPInt.h b/mlir/include/mlir/Analysis/Presburger/MPInt.h
deleted file mode 100644
index 5670d1531909..000000000000
--- a/mlir/include/mlir/Analysis/Presburger/MPInt.h
+++ /dev/null
@@ -1,597 +0,0 @@
-//===- MPInt.h - MLIR MPInt Class -------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This is a simple class to represent arbitrary precision signed integers.
-// Unlike APInt, one does not have to specify a fixed maximum size, and the
-// integer can take on any arbitrary values. This is optimized for small-values
-// by providing fast-paths for the cases when the value stored fits in 64-bits.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef MLIR_ANALYSIS_PRESBURGER_MPINT_H
-#define MLIR_ANALYSIS_PRESBURGER_MPINT_H
-
-#include "mlir/Analysis/Presburger/SlowMPInt.h"
-#include "mlir/Support/MathExtras.h"
-#include "llvm/Support/raw_ostream.h"
-
-namespace mlir {
-namespace presburger {
-
-namespace detail {
-// If builtin intrinsics for overflow-checked arithmetic are available,
-// use them. Otherwise, call through to LLVM's overflow-checked arithmetic
-// functionality. Those functions also have such macro-gated uses of intrinsics,
-// however they are not always_inlined, which is important for us to achieve
-// high-performance; calling the functions directly would result in a slowdown
-// of 1.15x.
-LLVM_ATTRIBUTE_ALWAYS_INLINE bool addOverflow(int64_t x, int64_t y,
- int64_t &result) {
-#if __has_builtin(__builtin_add_overflow)
- return __builtin_add_overflow(x, y, &result);
-#else
- return llvm::AddOverflow(x, y, result);
-#endif
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE bool subOverflow(int64_t x, int64_t y,
- int64_t &result) {
-#if __has_builtin(__builtin_sub_overflow)
- return __builtin_sub_overflow(x, y, &result);
-#else
- return llvm::SubOverflow(x, y, result);
-#endif
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE bool mulOverflow(int64_t x, int64_t y,
- int64_t &result) {
-#if __has_builtin(__builtin_mul_overflow)
- return __builtin_mul_overflow(x, y, &result);
-#else
- return llvm::MulOverflow(x, y, result);
-#endif
-}
-} // namespace detail
-
-/// This class provides support for multi-precision arithmetic.
-///
-/// Unlike APInt, this extends the precision as necessary to prevent overflows
-/// and supports operations between objects with
diff ering internal precisions.
-///
-/// This is optimized for small-values by providing fast-paths for the cases
-/// when the value stored fits in 64-bits. We annotate all fastpaths by using
-/// the LLVM_LIKELY/LLVM_UNLIKELY annotations. Removing these would result in
-/// a 1.2x performance slowdown.
-///
-/// We always_inline all operations; removing these results in a 1.5x
-/// performance slowdown.
-///
-/// When holdsLarge is true, a SlowMPInt is held in the union. If it is false,
-/// the int64_t is held. Using std::variant instead would lead to significantly
-/// worse performance.
-class MPInt {
-private:
- union {
- int64_t valSmall;
- detail::SlowMPInt valLarge;
- };
- unsigned holdsLarge;
-
- LLVM_ATTRIBUTE_ALWAYS_INLINE void initSmall(int64_t o) {
- if (LLVM_UNLIKELY(isLarge()))
- valLarge.detail::SlowMPInt::~SlowMPInt();
- valSmall = o;
- holdsLarge = false;
- }
- LLVM_ATTRIBUTE_ALWAYS_INLINE void initLarge(const detail::SlowMPInt &o) {
- if (LLVM_LIKELY(isSmall())) {
- // The data in memory could be in an arbitrary state, not necessarily
- // corresponding to any valid state of valLarge; we cannot call any member
- // functions, e.g. the assignment operator on it, as they may access the
- // invalid internal state. We instead construct a new object using
- // placement new.
- new (&valLarge) detail::SlowMPInt(o);
- } else {
- // In this case, we need to use the assignment operator, because if we use
- // placement-new as above we would lose track of allocated memory
- // and leak it.
- valLarge = o;
- }
- holdsLarge = true;
- }
-
- LLVM_ATTRIBUTE_ALWAYS_INLINE explicit MPInt(const detail::SlowMPInt &val)
- : valLarge(val), holdsLarge(true) {}
- LLVM_ATTRIBUTE_ALWAYS_INLINE bool isSmall() const { return !holdsLarge; }
- LLVM_ATTRIBUTE_ALWAYS_INLINE bool isLarge() const { return holdsLarge; }
- /// Get the stored value. For getSmall/Large,
- /// the stored value should be small/large.
- LLVM_ATTRIBUTE_ALWAYS_INLINE int64_t getSmall() const {
- assert(isSmall() &&
- "getSmall should only be called when the value stored is small!");
- return valSmall;
- }
- LLVM_ATTRIBUTE_ALWAYS_INLINE int64_t &getSmall() {
- assert(isSmall() &&
- "getSmall should only be called when the value stored is small!");
- return valSmall;
- }
- LLVM_ATTRIBUTE_ALWAYS_INLINE const detail::SlowMPInt &getLarge() const {
- assert(isLarge() &&
- "getLarge should only be called when the value stored is large!");
- return valLarge;
- }
- LLVM_ATTRIBUTE_ALWAYS_INLINE detail::SlowMPInt &getLarge() {
- assert(isLarge() &&
- "getLarge should only be called when the value stored is large!");
- return valLarge;
- }
- explicit operator detail::SlowMPInt() const {
- if (isSmall())
- return detail::SlowMPInt(getSmall());
- return getLarge();
- }
-
-public:
- LLVM_ATTRIBUTE_ALWAYS_INLINE explicit MPInt(int64_t val)
- : valSmall(val), holdsLarge(false) {}
- LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt() : MPInt(0) {}
- LLVM_ATTRIBUTE_ALWAYS_INLINE ~MPInt() {
- if (LLVM_UNLIKELY(isLarge()))
- valLarge.detail::SlowMPInt::~SlowMPInt();
- }
- LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt(const MPInt &o)
- : valSmall(o.valSmall), holdsLarge(false) {
- if (LLVM_UNLIKELY(o.isLarge()))
- initLarge(o.valLarge);
- }
- LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt &operator=(const MPInt &o) {
- if (LLVM_LIKELY(o.isSmall())) {
- initSmall(o.valSmall);
- return *this;
- }
- initLarge(o.valLarge);
- return *this;
- }
- LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt &operator=(int x) {
- initSmall(x);
- return *this;
- }
- LLVM_ATTRIBUTE_ALWAYS_INLINE explicit operator int64_t() const {
- if (isSmall())
- return getSmall();
- return static_cast<int64_t>(getLarge());
- }
-
- bool operator==(const MPInt &o) const;
- bool operator!=(const MPInt &o) const;
- bool operator>(const MPInt &o) const;
- bool operator<(const MPInt &o) const;
- bool operator<=(const MPInt &o) const;
- bool operator>=(const MPInt &o) const;
- MPInt operator+(const MPInt &o) const;
- MPInt operator-(const MPInt &o) const;
- MPInt operator*(const MPInt &o) const;
- MPInt operator/(const MPInt &o) const;
- MPInt operator%(const MPInt &o) const;
- MPInt &operator+=(const MPInt &o);
- MPInt &operator-=(const MPInt &o);
- MPInt &operator*=(const MPInt &o);
- MPInt &operator/=(const MPInt &o);
- MPInt &operator%=(const MPInt &o);
- MPInt operator-() const;
- MPInt &operator++();
- MPInt &operator--();
-
- // Divide by a number that is known to be positive.
- // This is slightly more efficient because it saves an overflow check.
- MPInt divByPositive(const MPInt &o) const;
- MPInt &divByPositiveInPlace(const MPInt &o);
-
- friend MPInt abs(const MPInt &x);
- friend MPInt gcdRange(ArrayRef<MPInt> range);
- friend MPInt ceilDiv(const MPInt &lhs, const MPInt &rhs);
- friend MPInt floorDiv(const MPInt &lhs, const MPInt &rhs);
- friend MPInt gcd(const MPInt &a, const MPInt &b);
- friend MPInt lcm(const MPInt &a, const MPInt &b);
- friend MPInt mod(const MPInt &lhs, const MPInt &rhs);
-
- llvm::raw_ostream &print(llvm::raw_ostream &os) const;
- void dump() const;
-
- /// ---------------------------------------------------------------------------
- /// Convenience operator overloads for int64_t.
- /// ---------------------------------------------------------------------------
- friend MPInt &operator+=(MPInt &a, int64_t b);
- friend MPInt &operator-=(MPInt &a, int64_t b);
- friend MPInt &operator*=(MPInt &a, int64_t b);
- friend MPInt &operator/=(MPInt &a, int64_t b);
- friend MPInt &operator%=(MPInt &a, int64_t b);
-
- friend bool operator==(const MPInt &a, int64_t b);
- friend bool operator!=(const MPInt &a, int64_t b);
- friend bool operator>(const MPInt &a, int64_t b);
- friend bool operator<(const MPInt &a, int64_t b);
- friend bool operator<=(const MPInt &a, int64_t b);
- friend bool operator>=(const MPInt &a, int64_t b);
- friend MPInt operator+(const MPInt &a, int64_t b);
- friend MPInt operator-(const MPInt &a, int64_t b);
- friend MPInt operator*(const MPInt &a, int64_t b);
- friend MPInt operator/(const MPInt &a, int64_t b);
- friend MPInt operator%(const MPInt &a, int64_t b);
-
- friend bool operator==(int64_t a, const MPInt &b);
- friend bool operator!=(int64_t a, const MPInt &b);
- friend bool operator>(int64_t a, const MPInt &b);
- friend bool operator<(int64_t a, const MPInt &b);
- friend bool operator<=(int64_t a, const MPInt &b);
- friend bool operator>=(int64_t a, const MPInt &b);
- friend MPInt operator+(int64_t a, const MPInt &b);
- friend MPInt operator-(int64_t a, const MPInt &b);
- friend MPInt operator*(int64_t a, const MPInt &b);
- friend MPInt operator/(int64_t a, const MPInt &b);
- friend MPInt operator%(int64_t a, const MPInt &b);
-
- friend llvm::hash_code hash_value(const MPInt &x); // NOLINT
-};
-
-/// This just calls through to the operator int64_t, but it's useful when a
-/// function pointer is required. (Although this is marked inline, it is still
-/// possible to obtain and use a function pointer to this.)
-LLVM_ATTRIBUTE_ALWAYS_INLINE int64_t int64FromMPInt(const MPInt &x) {
- return int64_t(x);
-}
-
-llvm::raw_ostream &operator<<(llvm::raw_ostream &os, const MPInt &x);
-
-// The RHS is always expected to be positive, and the result
-/// is always non-negative.
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt mod(const MPInt &lhs, const MPInt &rhs);
-
-namespace detail {
-// Division overflows only when trying to negate the minimal signed value.
-LLVM_ATTRIBUTE_ALWAYS_INLINE bool divWouldOverflow(int64_t x, int64_t y) {
- return x == std::numeric_limits<int64_t>::min() && y == -1;
-}
-} // namespace detail
-
-/// We define the operations here in the header to facilitate inlining.
-
-/// ---------------------------------------------------------------------------
-/// Comparison operators.
-/// ---------------------------------------------------------------------------
-LLVM_ATTRIBUTE_ALWAYS_INLINE bool MPInt::operator==(const MPInt &o) const {
- if (LLVM_LIKELY(isSmall() && o.isSmall()))
- return getSmall() == o.getSmall();
- return detail::SlowMPInt(*this) == detail::SlowMPInt(o);
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE bool MPInt::operator!=(const MPInt &o) const {
- if (LLVM_LIKELY(isSmall() && o.isSmall()))
- return getSmall() != o.getSmall();
- return detail::SlowMPInt(*this) != detail::SlowMPInt(o);
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE bool MPInt::operator>(const MPInt &o) const {
- if (LLVM_LIKELY(isSmall() && o.isSmall()))
- return getSmall() > o.getSmall();
- return detail::SlowMPInt(*this) > detail::SlowMPInt(o);
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE bool MPInt::operator<(const MPInt &o) const {
- if (LLVM_LIKELY(isSmall() && o.isSmall()))
- return getSmall() < o.getSmall();
- return detail::SlowMPInt(*this) < detail::SlowMPInt(o);
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE bool MPInt::operator<=(const MPInt &o) const {
- if (LLVM_LIKELY(isSmall() && o.isSmall()))
- return getSmall() <= o.getSmall();
- return detail::SlowMPInt(*this) <= detail::SlowMPInt(o);
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE bool MPInt::operator>=(const MPInt &o) const {
- if (LLVM_LIKELY(isSmall() && o.isSmall()))
- return getSmall() >= o.getSmall();
- return detail::SlowMPInt(*this) >= detail::SlowMPInt(o);
-}
-
-/// ---------------------------------------------------------------------------
-/// Arithmetic operators.
-/// ---------------------------------------------------------------------------
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt MPInt::operator+(const MPInt &o) const {
- if (LLVM_LIKELY(isSmall() && o.isSmall())) {
- MPInt result;
- bool overflow =
- detail::addOverflow(getSmall(), o.getSmall(), result.getSmall());
- if (LLVM_LIKELY(!overflow))
- return result;
- return MPInt(detail::SlowMPInt(*this) + detail::SlowMPInt(o));
- }
- return MPInt(detail::SlowMPInt(*this) + detail::SlowMPInt(o));
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt MPInt::operator-(const MPInt &o) const {
- if (LLVM_LIKELY(isSmall() && o.isSmall())) {
- MPInt result;
- bool overflow =
- detail::subOverflow(getSmall(), o.getSmall(), result.getSmall());
- if (LLVM_LIKELY(!overflow))
- return result;
- return MPInt(detail::SlowMPInt(*this) - detail::SlowMPInt(o));
- }
- return MPInt(detail::SlowMPInt(*this) - detail::SlowMPInt(o));
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt MPInt::operator*(const MPInt &o) const {
- if (LLVM_LIKELY(isSmall() && o.isSmall())) {
- MPInt result;
- bool overflow =
- detail::mulOverflow(getSmall(), o.getSmall(), result.getSmall());
- if (LLVM_LIKELY(!overflow))
- return result;
- return MPInt(detail::SlowMPInt(*this) * detail::SlowMPInt(o));
- }
- return MPInt(detail::SlowMPInt(*this) * detail::SlowMPInt(o));
-}
-
-// Division overflows only occur when negating the minimal possible value.
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt MPInt::divByPositive(const MPInt &o) const {
- assert(o > 0);
- if (LLVM_LIKELY(isSmall() && o.isSmall()))
- return MPInt(getSmall() / o.getSmall());
- return MPInt(detail::SlowMPInt(*this) / detail::SlowMPInt(o));
-}
-
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt MPInt::operator/(const MPInt &o) const {
- if (LLVM_LIKELY(isSmall() && o.isSmall())) {
- // Division overflows only occur when negating the minimal possible value.
- if (LLVM_UNLIKELY(detail::divWouldOverflow(getSmall(), o.getSmall())))
- return -*this;
- return MPInt(getSmall() / o.getSmall());
- }
- return MPInt(detail::SlowMPInt(*this) / detail::SlowMPInt(o));
-}
-
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt abs(const MPInt &x) {
- return MPInt(x >= 0 ? x : -x);
-}
-// Division overflows only occur when negating the minimal possible value.
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt ceilDiv(const MPInt &lhs, const MPInt &rhs) {
- if (LLVM_LIKELY(lhs.isSmall() && rhs.isSmall())) {
- if (LLVM_UNLIKELY(detail::divWouldOverflow(lhs.getSmall(), rhs.getSmall())))
- return -lhs;
- }
- return MPInt(ceilDiv(detail::SlowMPInt(lhs), detail::SlowMPInt(rhs)));
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt floorDiv(const MPInt &lhs,
- const MPInt &rhs) {
- if (LLVM_LIKELY(lhs.isSmall() && rhs.isSmall())) {
- if (LLVM_UNLIKELY(detail::divWouldOverflow(lhs.getSmall(), rhs.getSmall())))
- return -lhs;
- return MPInt(mlir::floorDiv(lhs.getSmall(), rhs.getSmall()));
- }
- return MPInt(floorDiv(detail::SlowMPInt(lhs), detail::SlowMPInt(rhs)));
-}
-// The RHS is always expected to be positive, and the result
-/// is always non-negative.
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt mod(const MPInt &lhs, const MPInt &rhs) {
- if (LLVM_LIKELY(lhs.isSmall() && rhs.isSmall()))
- return MPInt(mlir::mod(lhs.getSmall(), rhs.getSmall()));
- return MPInt(mod(detail::SlowMPInt(lhs), detail::SlowMPInt(rhs)));
-}
-
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt gcd(const MPInt &a, const MPInt &b) {
- if (LLVM_LIKELY(a.isSmall() && b.isSmall()))
- return MPInt(llvm::greatestCommonDivisor(a.getSmall(), b.getSmall()));
- return MPInt(gcd(detail::SlowMPInt(a), detail::SlowMPInt(b)));
-}
-
-/// Returns the least common multiple of 'a' and 'b'.
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt lcm(const MPInt &a, const MPInt &b) {
- MPInt x = abs(a);
- MPInt y = abs(b);
- return (x * y) / gcd(x, y);
-}
-
-/// This operation cannot overflow.
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt MPInt::operator%(const MPInt &o) const {
- if (LLVM_LIKELY(isSmall() && o.isSmall()))
- return MPInt(getSmall() % o.getSmall());
- return MPInt(detail::SlowMPInt(*this) % detail::SlowMPInt(o));
-}
-
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt MPInt::operator-() const {
- if (LLVM_LIKELY(isSmall())) {
- if (LLVM_LIKELY(getSmall() != std::numeric_limits<int64_t>::min()))
- return MPInt(-getSmall());
- return MPInt(-detail::SlowMPInt(*this));
- }
- return MPInt(-detail::SlowMPInt(*this));
-}
-
-/// ---------------------------------------------------------------------------
-/// Assignment operators, preincrement, predecrement.
-/// ---------------------------------------------------------------------------
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt &MPInt::operator+=(const MPInt &o) {
- if (LLVM_LIKELY(isSmall() && o.isSmall())) {
- int64_t result = getSmall();
- bool overflow = detail::addOverflow(getSmall(), o.getSmall(), result);
- if (LLVM_LIKELY(!overflow)) {
- getSmall() = result;
- return *this;
- }
- // Note: this return is not strictly required but
- // removing it leads to a performance regression.
- return *this = MPInt(detail::SlowMPInt(*this) + detail::SlowMPInt(o));
- }
- return *this = MPInt(detail::SlowMPInt(*this) + detail::SlowMPInt(o));
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt &MPInt::operator-=(const MPInt &o) {
- if (LLVM_LIKELY(isSmall() && o.isSmall())) {
- int64_t result = getSmall();
- bool overflow = detail::subOverflow(getSmall(), o.getSmall(), result);
- if (LLVM_LIKELY(!overflow)) {
- getSmall() = result;
- return *this;
- }
- // Note: this return is not strictly required but
- // removing it leads to a performance regression.
- return *this = MPInt(detail::SlowMPInt(*this) - detail::SlowMPInt(o));
- }
- return *this = MPInt(detail::SlowMPInt(*this) - detail::SlowMPInt(o));
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt &MPInt::operator*=(const MPInt &o) {
- if (LLVM_LIKELY(isSmall() && o.isSmall())) {
- int64_t result = getSmall();
- bool overflow = detail::mulOverflow(getSmall(), o.getSmall(), result);
- if (LLVM_LIKELY(!overflow)) {
- getSmall() = result;
- return *this;
- }
- // Note: this return is not strictly required but
- // removing it leads to a performance regression.
- return *this = MPInt(detail::SlowMPInt(*this) * detail::SlowMPInt(o));
- }
- return *this = MPInt(detail::SlowMPInt(*this) * detail::SlowMPInt(o));
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt &MPInt::operator/=(const MPInt &o) {
- if (LLVM_LIKELY(isSmall() && o.isSmall())) {
- // Division overflows only occur when negating the minimal possible value.
- if (LLVM_UNLIKELY(detail::divWouldOverflow(getSmall(), o.getSmall())))
- return *this = -*this;
- getSmall() /= o.getSmall();
- return *this;
- }
- return *this = MPInt(detail::SlowMPInt(*this) / detail::SlowMPInt(o));
-}
-
-// Division overflows only occur when the divisor is -1.
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt &
-MPInt::divByPositiveInPlace(const MPInt &o) {
- assert(o > 0);
- if (LLVM_LIKELY(isSmall() && o.isSmall())) {
- getSmall() /= o.getSmall();
- return *this;
- }
- return *this = MPInt(detail::SlowMPInt(*this) / detail::SlowMPInt(o));
-}
-
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt &MPInt::operator%=(const MPInt &o) {
- return *this = *this % o;
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt &MPInt::operator++() { return *this += 1; }
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt &MPInt::operator--() { return *this -= 1; }
-
-/// ----------------------------------------------------------------------------
-/// Convenience operator overloads for int64_t.
-/// ----------------------------------------------------------------------------
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt &operator+=(MPInt &a, int64_t b) {
- return a = a + b;
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt &operator-=(MPInt &a, int64_t b) {
- return a = a - b;
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt &operator*=(MPInt &a, int64_t b) {
- return a = a * b;
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt &operator/=(MPInt &a, int64_t b) {
- return a = a / b;
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt &operator%=(MPInt &a, int64_t b) {
- return a = a % b;
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt operator+(const MPInt &a, int64_t b) {
- return a + MPInt(b);
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt operator-(const MPInt &a, int64_t b) {
- return a - MPInt(b);
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt operator*(const MPInt &a, int64_t b) {
- return a * MPInt(b);
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt operator/(const MPInt &a, int64_t b) {
- return a / MPInt(b);
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt operator%(const MPInt &a, int64_t b) {
- return a % MPInt(b);
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt operator+(int64_t a, const MPInt &b) {
- return MPInt(a) + b;
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt operator-(int64_t a, const MPInt &b) {
- return MPInt(a) - b;
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt operator*(int64_t a, const MPInt &b) {
- return MPInt(a) * b;
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt operator/(int64_t a, const MPInt &b) {
- return MPInt(a) / b;
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE MPInt operator%(int64_t a, const MPInt &b) {
- return MPInt(a) % b;
-}
-
-/// We provide special implementations of the comparison operators rather than
-/// calling through as above, as this would result in a 1.2x slowdown.
-LLVM_ATTRIBUTE_ALWAYS_INLINE bool operator==(const MPInt &a, int64_t b) {
- if (LLVM_LIKELY(a.isSmall()))
- return a.getSmall() == b;
- return a.getLarge() == b;
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE bool operator!=(const MPInt &a, int64_t b) {
- if (LLVM_LIKELY(a.isSmall()))
- return a.getSmall() != b;
- return a.getLarge() != b;
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE bool operator>(const MPInt &a, int64_t b) {
- if (LLVM_LIKELY(a.isSmall()))
- return a.getSmall() > b;
- return a.getLarge() > b;
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE bool operator<(const MPInt &a, int64_t b) {
- if (LLVM_LIKELY(a.isSmall()))
- return a.getSmall() < b;
- return a.getLarge() < b;
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE bool operator<=(const MPInt &a, int64_t b) {
- if (LLVM_LIKELY(a.isSmall()))
- return a.getSmall() <= b;
- return a.getLarge() <= b;
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE bool operator>=(const MPInt &a, int64_t b) {
- if (LLVM_LIKELY(a.isSmall()))
- return a.getSmall() >= b;
- return a.getLarge() >= b;
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE bool operator==(int64_t a, const MPInt &b) {
- if (LLVM_LIKELY(b.isSmall()))
- return a == b.getSmall();
- return a == b.getLarge();
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE bool operator!=(int64_t a, const MPInt &b) {
- if (LLVM_LIKELY(b.isSmall()))
- return a != b.getSmall();
- return a != b.getLarge();
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE bool operator>(int64_t a, const MPInt &b) {
- if (LLVM_LIKELY(b.isSmall()))
- return a > b.getSmall();
- return a > b.getLarge();
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE bool operator<(int64_t a, const MPInt &b) {
- if (LLVM_LIKELY(b.isSmall()))
- return a < b.getSmall();
- return a < b.getLarge();
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE bool operator<=(int64_t a, const MPInt &b) {
- if (LLVM_LIKELY(b.isSmall()))
- return a <= b.getSmall();
- return a <= b.getLarge();
-}
-LLVM_ATTRIBUTE_ALWAYS_INLINE bool operator>=(int64_t a, const MPInt &b) {
- if (LLVM_LIKELY(b.isSmall()))
- return a >= b.getSmall();
- return a >= b.getLarge();
-}
-
-} // namespace presburger
-} // namespace mlir
-
-#endif // MLIR_ANALYSIS_PRESBURGER_MPINT_H
diff --git a/mlir/lib/Analysis/Presburger/CMakeLists.txt b/mlir/lib/Analysis/Presburger/CMakeLists.txt
index 22f1a4cac440..27805505c543 100644
--- a/mlir/lib/Analysis/Presburger/CMakeLists.txt
+++ b/mlir/lib/Analysis/Presburger/CMakeLists.txt
@@ -2,7 +2,6 @@ add_mlir_library(MLIRPresburger
IntegerRelation.cpp
LinearTransform.cpp
Matrix.cpp
- MPInt.cpp
PresburgerRelation.cpp
PresburgerSpace.cpp
PWMAFunction.cpp
diff --git a/mlir/lib/Analysis/Presburger/MPInt.cpp b/mlir/lib/Analysis/Presburger/MPInt.cpp
deleted file mode 100644
index 71434eb6866e..000000000000
--- a/mlir/lib/Analysis/Presburger/MPInt.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-//===- MPInt.cpp - MLIR MPInt Class ---------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "mlir/Analysis/Presburger/MPInt.h"
-#include "llvm/Support/MathExtras.h"
-
-using namespace mlir;
-using namespace presburger;
-
-llvm::hash_code mlir::presburger::hash_value(const MPInt &x) {
- if (x.isSmall())
- return llvm::hash_value(x.valSmall);
- return detail::hash_value(x.valLarge);
-}
-
-/// ---------------------------------------------------------------------------
-/// Printing.
-/// ---------------------------------------------------------------------------
-llvm::raw_ostream &MPInt::print(llvm::raw_ostream &os) const {
- if (isSmall())
- return os << valSmall;
- return os << valLarge;
-}
-
-void MPInt::dump() const { print(llvm::errs()); }
-
-llvm::raw_ostream &mlir::presburger::operator<<(llvm::raw_ostream &os,
- const MPInt &x) {
- x.print(os);
- return os;
-}
diff --git a/mlir/unittests/Analysis/Presburger/CMakeLists.txt b/mlir/unittests/Analysis/Presburger/CMakeLists.txt
index c7fc5f0c9b16..a34adb6ba600 100644
--- a/mlir/unittests/Analysis/Presburger/CMakeLists.txt
+++ b/mlir/unittests/Analysis/Presburger/CMakeLists.txt
@@ -3,11 +3,11 @@ add_mlir_unittest(MLIRPresburgerTests
IntegerRelationTest.cpp
LinearTransformTest.cpp
MatrixTest.cpp
- MPIntTest.cpp
PresburgerSetTest.cpp
PresburgerSpaceTest.cpp
PWMAFunctionTest.cpp
SimplexTest.cpp
+ SlowMPIntTest.cpp
../../Dialect/Affine/Analysis/AffineStructuresParser.cpp
)
diff --git a/mlir/unittests/Analysis/Presburger/MPIntTest.cpp b/mlir/unittests/Analysis/Presburger/SlowMPIntTest.cpp
similarity index 61%
rename from mlir/unittests/Analysis/Presburger/MPIntTest.cpp
rename to mlir/unittests/Analysis/Presburger/SlowMPIntTest.cpp
index 60ab731a9749..9d7b84d493bf 100644
--- a/mlir/unittests/Analysis/Presburger/MPIntTest.cpp
+++ b/mlir/unittests/Analysis/Presburger/SlowMPIntTest.cpp
@@ -1,4 +1,4 @@
-//===- MPIntTest.cpp - Tests for MPInt ------------------------------------===//
+//===- SlowMPIntTest.cpp - Tests for SlowMPInt ----------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
@@ -6,33 +6,16 @@
//
//===----------------------------------------------------------------------===//
-#include "mlir/Analysis/Presburger/MPInt.h"
#include "mlir/Analysis/Presburger/SlowMPInt.h"
#include <gmock/gmock.h>
#include <gtest/gtest.h>
using namespace mlir;
using namespace presburger;
+using detail::SlowMPInt;
-// googletest boilerplate to run the same tests with both MPInt and SlowMPInt.
-template <typename>
-class IntTest : public testing::Test {};
-using TypeList = testing::Types<MPInt, detail::SlowMPInt>;
-// This is for pretty-printing the test name with the name of the class in use.
-class TypeNames {
-public:
- template <typename T>
- static std::string GetName(int) { // NOLINT; gtest mandates this name.
- if (std::is_same<T, MPInt>())
- return "MPInt";
- if (std::is_same<T, detail::SlowMPInt>())
- return "SlowMPInt";
- }
-};
-TYPED_TEST_SUITE(IntTest, TypeList, TypeNames);
-
-TYPED_TEST(IntTest, ops) {
- TypeParam two(2), five(5), seven(7), ten(10);
+TEST(SlowMPIntTest, ops) {
+ SlowMPInt two(2), five(5), seven(7), ten(10);
EXPECT_EQ(five + five, ten);
EXPECT_EQ(five * five, 2 * ten + five);
EXPECT_EQ(five * five, 3 * ten - five);
@@ -50,7 +33,7 @@ TYPED_TEST(IntTest, ops) {
EXPECT_EQ(-ten / -seven, -10 / -7);
EXPECT_EQ(ten / seven, 10 / 7);
- TypeParam x = ten;
+ SlowMPInt x = ten;
x += five;
EXPECT_EQ(x, 15);
x *= two;
@@ -74,8 +57,8 @@ TYPED_TEST(IntTest, ops) {
EXPECT_GT(ten, five);
}
-TYPED_TEST(IntTest, ops64Overloads) {
- TypeParam two(2), five(5), seven(7), ten(10);
+TEST(SlowMPIntTest, ops64Overloads) {
+ SlowMPInt two(2), five(5), seven(7), ten(10);
EXPECT_EQ(five + 5, ten);
EXPECT_EQ(five + 5, 5 + five);
EXPECT_EQ(five * 5, 2 * ten + 5);
@@ -87,7 +70,7 @@ TYPED_TEST(IntTest, ops64Overloads) {
EXPECT_EQ(2 - two, 0);
EXPECT_EQ(2 % two, two % 2);
- TypeParam x = ten;
+ SlowMPInt x = ten;
x += 5;
EXPECT_EQ(x, 15);
x *= 2;
@@ -120,34 +103,10 @@ TYPED_TEST(IntTest, ops64Overloads) {
EXPECT_GT(10, five);
}
-TYPED_TEST(IntTest, overflows) {
- TypeParam x(1ll << 60);
+TEST(SlowMPIntTest, overflows) {
+ SlowMPInt x(1ll << 60);
EXPECT_EQ((x * x - x * x * x * x) / (x * x * x), 1 - (1ll << 60));
- TypeParam y(1ll << 62);
+ SlowMPInt y(1ll << 62);
EXPECT_EQ((y + y + y + y + y + y) / y, 6);
EXPECT_EQ(-(2 * (-y)), 2 * y); // -(-2^63) overflow.
- x *= x;
- EXPECT_EQ(x, (y * y) / 16);
- y += y;
- y += y;
- y += y;
- y /= 8;
- EXPECT_EQ(y, 1ll << 62);
- int64_t min = std::numeric_limits<int64_t>::min();
- int64_t max = std::numeric_limits<int64_t>::max();
- TypeParam z(min);
- z /= -1;
- EXPECT_EQ(z, -TypeParam(min));
- TypeParam w(min);
- --w;
- EXPECT_EQ(w, TypeParam(min) - 1);
- TypeParam u(min);
- u -= 1;
- EXPECT_EQ(u, w);
- TypeParam v(max);
- ++v;
- EXPECT_EQ(v, TypeParam(max) + 1);
- TypeParam t(max);
- t += 1;
- EXPECT_EQ(t, v);
}
More information about the Mlir-commits
mailing list