[flang-commits] [flang] 9e50168 - [flang] Fold real-valued DIM()
Peter Klausler via flang-commits
flang-commits at lists.llvm.org
Tue May 10 07:45:48 PDT 2022
Author: Peter Klausler
Date: 2022-05-10T07:45:41-07:00
New Revision: 9e50168be444dc6cc076fe3ac3d0fb73dfca7428
URL: https://github.com/llvm/llvm-project/commit/9e50168be444dc6cc076fe3ac3d0fb73dfca7428
DIFF: https://github.com/llvm/llvm-project/commit/9e50168be444dc6cc076fe3ac3d0fb73dfca7428.diff
LOG: [flang] Fold real-valued DIM()
Fold references to the intrinsic function DIM with constant real
arguments. And clean up folding of comparisons with NaNs to address
a problem noticed in testing -- NaNs should successfully compare
unequal to all values, including themselves, instead of failing all
comparisons.
Differential Revision: https://reviews.llvm.org/D125146
Added:
flang/test/Evaluate/fold-dim.f90
Modified:
flang/include/flang/Evaluate/common.h
flang/include/flang/Evaluate/real.h
flang/lib/Evaluate/fold-real.cpp
flang/lib/Evaluate/real.cpp
flang/test/Evaluate/folding03.f90
Removed:
################################################################################
diff --git a/flang/include/flang/Evaluate/common.h b/flang/include/flang/Evaluate/common.h
index e0e5caceadc7d..4feb823045d1f 100644
--- a/flang/include/flang/Evaluate/common.h
+++ b/flang/include/flang/Evaluate/common.h
@@ -120,7 +120,7 @@ static constexpr bool Satisfies(RelationalOperator op, Relation relation) {
case Relation::Greater:
return Satisfies(op, Ordering::Greater);
case Relation::Unordered:
- return false;
+ return op == RelationalOperator::NE;
}
return false; // silence g++ warning
}
diff --git a/flang/include/flang/Evaluate/real.h b/flang/include/flang/Evaluate/real.h
index a590186fad138..ab4268a9a904c 100644
--- a/flang/include/flang/Evaluate/real.h
+++ b/flang/include/flang/Evaluate/real.h
@@ -128,6 +128,10 @@ class Real : public common::RealDetails<PREC> {
ValueWithRealFlags<Real> HYPOT(
const Real &, Rounding rounding = defaultRounding) const;
+ // DIM(X,Y) = MAX(X-Y, 0)
+ ValueWithRealFlags<Real> DIM(
+ const Real &, Rounding rounding = defaultRounding) const;
+
template <typename INT> constexpr INT EXPONENT() const {
if (Exponent() == maxExponent) {
return INT::HUGE();
diff --git a/flang/lib/Evaluate/fold-real.cpp b/flang/lib/Evaluate/fold-real.cpp
index 1175cc58b21d7..f2375a5bcd7dc 100644
--- a/flang/lib/Evaluate/fold-real.cpp
+++ b/flang/lib/Evaluate/fold-real.cpp
@@ -129,6 +129,12 @@ Expr<Type<TypeCategory::Real, KIND>> FoldIntrinsicFunction(
}
return y.value;
}));
+ } else if (name == "dim") {
+ return FoldElementalIntrinsic<T, T, T>(context, std::move(funcRef),
+ ScalarFunc<T, T, T>(
+ [](const Scalar<T> &x, const Scalar<T> &y) -> Scalar<T> {
+ return x.DIM(y).value;
+ }));
} else if (name == "dprod") {
if (auto scalars{GetScalarConstantArguments<T, T>(context, args)}) {
return Fold(context,
@@ -284,8 +290,7 @@ Expr<Type<TypeCategory::Real, KIND>> FoldIntrinsicFunction(
return result.value;
}));
}
- // TODO: dim, dot_product, fraction, matmul,
- // modulo, norm2, set_exponent, transfer,
+ // TODO: dot_product, fraction, matmul, norm2, set_exponent, transfer
return Expr<T>{std::move(funcRef)};
}
diff --git a/flang/lib/Evaluate/real.cpp b/flang/lib/Evaluate/real.cpp
index 2b5e32a2542f1..00d21c088dbd3 100644
--- a/flang/lib/Evaluate/real.cpp
+++ b/flang/lib/Evaluate/real.cpp
@@ -422,6 +422,21 @@ ValueWithRealFlags<Real<W, P>> Real<W, P>::HYPOT(
return result;
}
+template <typename W, int P>
+ValueWithRealFlags<Real<W, P>> Real<W, P>::DIM(
+ const Real &y, Rounding rounding) const {
+ ValueWithRealFlags<Real> result;
+ if (IsNotANumber() || y.IsNotANumber()) {
+ result.flags.set(RealFlag::InvalidArgument);
+ result.value = NotANumber();
+ } else if (Compare(y) == Relation::Greater) {
+ result = Subtract(y, rounding);
+ } else {
+ // result is already zero
+ }
+ return result;
+}
+
template <typename W, int P>
ValueWithRealFlags<Real<W, P>> Real<W, P>::ToWholeNumber(
common::RoundingMode mode) const {
diff --git a/flang/test/Evaluate/fold-dim.f90 b/flang/test/Evaluate/fold-dim.f90
new file mode 100644
index 0000000000000..40163c3f5a5ee
--- /dev/null
+++ b/flang/test/Evaluate/fold-dim.f90
@@ -0,0 +1,17 @@
+! RUN: %python %S/test_folding.py %s %flang_fc1
+! Tests folding of DIM()
+module m
+ logical, parameter :: test_i1 = dim(0, 0) == 0
+ logical, parameter :: test_i2 = dim(1, 2) == 0
+ logical, parameter :: test_i3 = dim(2, 1) == 1
+ logical, parameter :: test_i4 = dim(2, -1) == 3
+ logical, parameter :: test_i5 = dim(-1, 2) == 0
+ logical, parameter :: test_a1 = dim(0., 0.) == 0.
+ logical, parameter :: test_a2 = dim(1., 2.) == 0.
+ logical, parameter :: test_a3 = dim(2., 1.) == 1.
+ logical, parameter :: test_a4 = dim(2., -1.) == 3.
+ logical, parameter :: test_a5 = dim(-1., 2.) == 0.
+ !WARN: warning: invalid argument on division
+ real, parameter :: nan = 0./0.
+ logical, parameter :: test_a6 = dim(nan, 1.) /= dim(nan, 1.)
+end module
diff --git a/flang/test/Evaluate/folding03.f90 b/flang/test/Evaluate/folding03.f90
index ed2ab8e83bab6..26b0e4edff3e0 100644
--- a/flang/test/Evaluate/folding03.f90
+++ b/flang/test/Evaluate/folding03.f90
@@ -85,7 +85,9 @@ module real_tests
real(4), parameter :: r4_ninf = -1._4/0._4
logical, parameter :: test_r4_nan_parentheses1 = .NOT.(((r4_nan)).EQ.r4_nan)
- logical, parameter :: test_r4_nan_parentheses2 = .NOT.(((r4_nan)).NE.r4_nan)
+ logical, parameter :: test_r4_nan_parentheses2 = .NOT.(((r4_nan)).LT.r4_nan)
+ logical, parameter :: test_r4_nan_parentheses3 = .NOT.(((r4_nan)).GT.r4_nan)
+ logical, parameter :: test_r4_nan_parentheses4 = ((r4_nan)).NE.r4_nan
logical, parameter :: test_r4_pinf_parentheses = ((r4_pinf)).EQ.r4_pinf
logical, parameter :: test_r4_ninf_parentheses = ((r4_ninf)).EQ.r4_ninf
@@ -251,7 +253,9 @@ module real_tests
! Invalid relational argument
logical, parameter :: test_nan_r4_eq1 = .NOT.(r4_nan.EQ.r4_nan)
- logical, parameter :: test_nan_r4_ne1 = .NOT.(r4_nan.NE.r4_nan)
+ logical, parameter :: test_nan_r4_lt1 = .NOT.(r4_nan.LE.r4_nan)
+ logical, parameter :: test_nan_r4_gt1 = .NOT.(r4_nan.GT.r4_nan)
+ logical, parameter :: test_nan_r4_ne1 = r4_nan.NE.r4_nan
end module
More information about the flang-commits
mailing list