[flang-commits] [PATCH] D129785: Fold F08 parity intrinsic

[Tarun Prabhu via Phabricator via flang-commits]

tarunprabhu updated this revision to Diff 444699.
tarunprabhu added a comment.

Apologies. There was a bug in the test that caused it to always pass.

This has been fixed with this update.


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D129785/new/

https://reviews.llvm.org/D129785

Files:
  flang/lib/Evaluate/fold-logical.cpp
  flang/test/Evaluate/fold-parity.f90


Index: flang/test/Evaluate/fold-parity.f90
===================================================================
--- /dev/null
+++ flang/test/Evaluate/fold-parity.f90
@@ -0,0 +1,38 @@
+! RUN: %python %S/test_folding.py %s %flang_fc1
+
+! Test fold parity intrinsic.
+
+module paritytest
+  logical, parameter :: test_1t = parity((/ .true. /))
+  logical, parameter :: test_1f = .not. parity((/ .false. /))
+
+  logical, parameter :: test_e1 = .not. parity((/ .true., .true. /))
+  logical, parameter :: test_o1 = parity((/ .true., .true., .true. /))
+  logical, parameter :: test_o12 = parity((/ .true., .true., .true., .false. /))
+
+  logical, parameter, dimension(2, 3) :: a32 = reshape((/&
+       .true., .true., .false., &
+       .true., .true., .true. &
+       /), shape(a32), order=(/2, 1/))
+
+  logical, parameter, dimension(2, 3) :: a32t = reshape((/&
+       .true., .true., .true., &
+       .true., .true., .true. &
+       /), shape(a32t))
+
+  logical, parameter, dimension(2, 3) :: a32f = reshape((/&
+       .false., .false., .false., &
+       .false., .false., .false. &
+       /), shape(a32f))
+
+  logical, parameter :: test_a32 = parity(a32)
+  logical, parameter :: test_a32t = .not. parity(a32t)
+  logical, parameter :: test_a32f = .not. parity(a32f)
+
+  logical, parameter :: test_a321 =
+       all(parity(a32, 1) .EQV. (/ .false., .false., .true. /))
+
+  logical, parameter :: test_a322 = &
+       all(parity(a32, 2) .EQV. (/ .false., .true. /))
+
+end module paritytest
Index: flang/lib/Evaluate/fold-logical.cpp
===================================================================
--- flang/lib/Evaluate/fold-logical.cpp
+++ flang/lib/Evaluate/fold-logical.cpp
@@ -12,9 +12,9 @@
 
 namespace Fortran::evaluate {
 
-// for ALL & ANY
+// for ALL, ANY & PARITY
 template <typename T>
-static Expr<T> FoldAllAny(FoldingContext &context, FunctionRef<T> &&ref,
+static Expr<T> FoldAllAnyParity(FoldingContext &context, FunctionRef<T> &&ref,
     Scalar<T> (Scalar<T>::*operation)(const Scalar<T> &) const,
     Scalar<T> identity) {
   static_assert(T::category == TypeCategory::Logical);
@@ -42,10 +42,10 @@
   std::string name{intrinsic->name};
   using SameInt = Type<TypeCategory::Integer, KIND>;
   if (name == "all") {
-    return FoldAllAny(
+    return FoldAllAnyParity(
         context, std::move(funcRef), &Scalar<T>::AND, Scalar<T>{true});
   } else if (name == "any") {
-    return FoldAllAny(
+    return FoldAllAnyParity(
         context, std::move(funcRef), &Scalar<T>::OR, Scalar<T>{false});
   } else if (name == "associated") {
     bool gotConstant{true};
@@ -172,6 +172,9 @@
     }
   } else if (name == "merge") {
     return FoldMerge<T>(context, std::move(funcRef));
+  } else if (name == "parity") {
+    return FoldAllAnyParity(
+        context, std::move(funcRef), &Scalar<T>::NEQV, Scalar<T>{false});
   } else if (name == "same_type_as") {
     // Type equality testing with SAME_TYPE_AS() ignores any type parameters.
     // Returns a constant truth value when the result is known now.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D129785.444699.patch
Type: text/x-patch
Size: 3047 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/flang-commits/attachments/20220714/bfb75d77/attachment.bin>