[flang-commits] [flang] [Flang] Check if two ArrayConstructor's are Equal (PR #121181)
Thirumalai Shaktivel via flang-commits
flang-commits at lists.llvm.org
Thu Dec 26 22:16:00 PST 2024
https://github.com/Thirumalai-Shaktivel updated https://github.com/llvm/llvm-project/pull/121181
>From f62a81ea481b1f283e1caa55ded4c590137b951a Mon Sep 17 00:00:00 2001
From: Thirumalai-Shaktivel <thirumalaishaktivel at gmail.com>
Date: Fri, 27 Dec 2024 05:21:24 +0000
Subject: [PATCH 1/2] [Flang] Check if two ArrayConstructor's are Equal This
also includes comparing the two ImpliedDo
- For ArrayConstructor, check if x and y have the same
elements and type
- For ImpliedDo, check if x and y have the same lower,
upper, stride and values
---
flang/a.out | Bin 0 -> 16688 bytes
flang/include/flang/Lower/Support/Utils.h | 44 +++++++++++++++++++++-
flang/x.f90 | 14 +++++++
3 files changed, 57 insertions(+), 1 deletion(-)
create mode 100755 flang/a.out
create mode 100644 flang/x.f90
diff --git a/flang/a.out b/flang/a.out
new file mode 100755
index 0000000000000000000000000000000000000000..3724c07d8deb63a66c15e93cc23a3f96080a0fcf
GIT binary patch
literal 16688
zcmeHOdu&tJ89xqXgcfjUi<Z%?xK9CV9Op^Wmf=7gZl;81=$N+la%0~lrha7hH4W9;
zg at snNQYI#$ihow6owU(u)o9gqj6YUqP#zQNU at v7;|HvxnoR)QTY!!42 at AsX1KIg{R
zUH8zWNj{SA?|i at S`_ALLuXC=?`C6c>qr&A9oMws736f4%*^FN)4z{Wcz%N?Fd>n5T
zpAnyce4XTMz263C?KDv_6Dt)z3rK#|lqrIrwrRo0EhHqrQfW+8z$jEd$Zs||DY+0^
zRiTWm&)4T6XC#k2=COwikQkkQ6r24uQZ4qcoQZF$xMUTwABp65K=~a|evCe4&&ctl
z=F_i5#j_AS&{6WpqY#CDTa{lSvOOcme)Bmi^zYQSLHV_-0t at ke)jme9ZzKFDE+04X
zY2KvjD|H?QR6H5g=@hk*aBp*CZ6s6^3CB`HHA5}UHO-CQWZYXXn?UWNI_R2OyKal9
z7#11g*q`+zlb#ZVm`^w10{lpC_iGn&Hb;2Id?QL&Dv_V3h;ktmHx}VfgDb{UA3R0u
zmzO9fRid1GN|f{E680S>_`N0g>JsgFr-c2BCHM-Ib31g`Bwg>1#$$TYG7^@q3%#?a
zTMwBDvp<})%tTN3nn*lm_87ep)7BN&bi at -@!icqPNW}XSMszckCUgfIN(HUXm}T~x
ziN<L~IKDn*4W?MrP(Q6wB?V$36lR%GGv+8T9AAwF#sWiVV$6tip{;g7)BfQ&Tsz}M
zoo(AqrV*hU_27`9_k~eT_)$|tjYuRO1dAIXsKOF8!ZFd8Fiincb!t;8W`(1syfb`W
zUw_zgDBI0o7zGt54J#fE2Z^jB+bHFlDHo3pB2PJ~Z5C_0I#;jJ>%9$)`E0$niO!u1
zcakfAq?`-)m(8&LX`E}izA3%(&1Z0%%@WTjF10v3m+r>rAXDP!Gd~v(F0}bE_55Xi
zQ1JtPThBbp6RT{V?rBxDBqkj^KhsE&b?|efrG2>I;ORNR>5_xLfk|Ms-xjD0e#Q{v
z at zYTV;?*Nw%1iwcBro5KwkUiK-hM9GiWUdYeI||H!6Tsgq&fKO^Q;gX9Q-^7ztzFd
zcktzGIRfPflp|1%Ksf^C2>kaWaM6A1huX;bN^NxZ$yy<_Co)z=?zA>?wDO3oEZ6iF
z=-gdrada>7BS-Q8>82)gNO%2?WE$#BotE-1NTwmkR7T1_BbkOCQwOE|Q<7;2G&LsW
z!z9xXWNNRJUnZG`9#g|o{vOFRe3=@Q^7ACq5M*kbl$S&9qiKUo)StRPcBaofq@~}|
zM$TT?&=aW3)ScA!th^14$Ss-$^S|_Y-Ai^$d+=WYqwSf!ouKuSwFsd&=CwmHH#g~C
zGE9a?6vDnu+Be-xu<WXqzMzf2w at MqoG)r?G)6QJAZbkunQ~{N_$v*dz_Gy1=-|))I
zP>a-Ow`e0Pw^LS2pR?v^qbq*{A-fFS%7$<_Hv0@@*Mq1#UqAUzJp!d_&lb39yUq_&
zA;J02!oDt}ja(L*d;PeU4ouXYO#fUPIewky{=uc}s;jx2mLAte0~1=hd-BJ0){x1<
z at Pal990jHWC&1wnxFjC02Xg|N)7t2kNfeZRLmPR|rH#KW=$F3#Wo=~KrHy1=T*|wL
zw9&^Vv&|@(G8f$o1DS00 at 44LQ?Ca6Cbl~V{;OIqnRd?p1dpUkv$1l3?Ig#$ZGTMFR
zg8QZU=kVFXy>I-3aTiQe74M#TjjjZ3Pg4kk!ozeGWIse{TKc$_er*3}(+^>v-A_z#
z{&UFB==|7>&aak!)cG;A_5gSOAUcdjcOQh}5b{q!xi{bWr=Z!3&L8+EotLG^&L7Cq
zmojwz0Cj$M_T4MF96B7>4QhY3h8jVcqoB22M~7ki;E}%R>rtN1k at J3Z@3eM2aEWdd
z;03y&fLS_a#{z%A?`{0f%{>-4>pC8oT>slf7t|Bdd=FgrG}U8xeVB&WbtmgGZRt#Q
zmuv||ePQ4fHR%*?b3fHyP=8$}J)RB1I{Pe|n++pZmwE7r$UiIcPY0A<PUQ%cBT$Y&
zIRfPflp|1%Ksf^C2$Uo6e-i=vAH|t!2jWq))=CZ-4_o0KwfOgGyBV~SwUNk<Xw9H4
z)%Hb<Sby!1x3ASlzOGwl-PZ!7soI-=%H<-!uU^RI_5q&;_K^I3F86(4*Tr1!6z~-A
zJn&}xD7hZpBwRyPu3P5KsoaZ64)OHgzYqR*lR^6&`B%=J$Ts3PfO^J&VnJ2Mg6hw^
zZ+N6~Sgcxn-|~h#Zzr1k>A%NG*g5~NpfWA|PN3Y^X)@Kepz6trHS<3)E8{}dvd(>=
zhyI+)C4qT;MU2!^{|e{{=x=fAACPKd%BdWIas<i|C`X_ifpP at O5hzEX9D#BK$`SaN
zBEaj<c)b}-RVdY}49i^wa=1VqDv-ZkAk!K-O7m>UFPOvMZ8F_M6Dg!m*^pl+C+9xk
zcy6^=>3O{z&9f-6{;yYaagvABA~areR;e;Hcce6?^t@*5Mb$oD>sD=>iA4$-lp7YL
z*$mHWCzOHehFtGP)F%~xg8oxPQXnc-hTENyS|NCC8`uB0oZTO&r78YdmHnGg9l<}e
zQdZ3um~Kk>Ri(eI<b1nTJ^yRqb>)TiHmik`9SR>%*r#xZ!Y36zqwqTlUscHE4*2aH
zotL$1*4*n^x}_H at M^m0UtnT#sYU)x_tb4q^-s@{zrf4C*G<bHHiDWn)^VDO3sn_RO
zT1y`yYJ<ssJ(V;QA;U6sBOVNXtj`vnhSpG1Qz+Q7q9xR~!ZaFiFq at GLw$>ZH&A!GJ
zp+=w4+TdHpO)rXcUau4H=L(f{ozO~DUPtdy1~&nV+20Djf>wg7b*0K&cogp|;2RXr
z&jq&cM8<`?)biU5Uw5?f+=Z_pd|%pHe2+nf>gDGQ^G`|poAUQL^WR0LSo>d+_SIt0
zZ(GtI(3F0JAC<qCI*ug2r2t>UkJ>rpM+S-QOU37P*toEAeZy_ie8!<zdwwY`7K(Py
z3{&woL>Jxl{+aw0$uAOx_rYNV&?BnFwgUT~fWHy_;{7pqtKw!$`<Z2vbTipkxCK8)
z*<!IQhoxz(DZ#HTQGO8oLR#hQvCH6iCQ6huQi6XLyeeY4F~}VPUsWUy^zH2S8J4y%
z3BK4qgUjG=LrGO0+pbRedhkG?cxKdfF2Bh^w-o%sit7AzqRd63;`w>Pe48wXrD^;E
z_$tSJ!J1$R`(b52>}N|GpOAcY{{CX^(<RDzp#(o(g1<xZ3q+NAQStlrEb$e1`xQJ-
z#pYnbs`JLNK;P&M>z2_kKqRdc)^Y^J^u`6<it0hyx{!orD6aQM;=M*h4_Wa<Qa4gV
zB8Wxz5z{h5USDww+7b}fjYPuOsblj&VkdS07*SIXrJ~WDaB)aFEUg))9i5xH<DnF7
zn%LM8h|zIFUrJ(NJDfW<wRH#dz`AzYa-n0Rj2_SwskLts`r5AbtJ}Kt^&K6X13h|A
z+v=_W4BNlBuC2Rs4LoM<*`SuHjSGI>Izamc@*6O&-3;-O+dS4|-$N)Iqqj^*?t3Uz
z>NUGJsMz8=M0EMOlG{wse&?2p;)UZ2{LDQg8#e|cTZ0Y3riPZ574 at yn!JyIDY6e#{
z_4YO!t at Xaf-q!jC1bU;~t)c7Kx{?oYC>hrWj97 at yhhtNUW2=hZn at rlfJ+85sxdp|H
zg at kTWXV4AWvEkSwlJ5!jZRG3WJubZ6gzNu^JuGxN3E at rdj9Nx7&`Q`iz_~DX(j*3j
zHx{={Z+|T1#lT?DOjtV=)wa5`hHee18!(as!W-HdLwPn at 30tGa7c&GMx`Y`q$U)@>
zBbM;WHhGct_QxSw<`9nZ!t>%xQ8>KjfVwFLLMVhK+tt21Y!A+(1_K*nP<`B at lF>L>
z4o-#e;{KF-e)xg&A0j<h at F>Q+*-q7J0LsYYcBPiKoF}{kKN=#le~a>G^g!oKJdS3r
z85yVlR^`v=VMB%dK4ZEanGY~_=K6<}KjWRsFh9RwM}_NvG?!q1o^LS9m8{UyFrDJW
z?dNg-1K_Ai_UHKvBhOc0A`_M2Ob<bzxdHq0e1MV0gOs at aY{&R8bTrpsndcjfKIwgJ
z`xPx7MTTO^{`vWin)hUsA=h8n|J}-ewX);+6C=;J$e-p|h5p|FM=?>;py~ITdcW~|
z4<<5ETb(Hl!RhZ&evD&IW90d@$+)k;Kcf_k++Hq*WyWt6`13fB at k{D at WPh%g<!=}G
z^SF?a=iO{y*#8%lKc7G0QI-nZl*mw6zdc@`KL72?kMVwXR9INQJ$|3|A6EX1zbf$O
zxG{Ya8O(O%JwzPuyW{=2h4w5n{u(}Rhd<A2#<2L865H9*w9NePp`dGzPZN*(dA~L9
ztLE#I{Wy;M;p=kv^M1dHT98OfZO9+lpYa`Noc_YEOno+PQz8TVF<yki>A%fyTW(YS
zYWT?R*Tmy8G*lM%pXZB~^3Q(<QY93g|Eu7ser2w#@SnOO4&)g-L$;Khn7?*yl{|XX
ygkZm_klsV|jfeZq&)>P=xb4zW9S$|wnRf~b=X%+erWwWjpKq}(<`g&-h~gh6Jud$M
literal 0
HcmV?d00001
diff --git a/flang/include/flang/Lower/Support/Utils.h b/flang/include/flang/Lower/Support/Utils.h
index 1cc74521e22d88..5eb39a08898f16 100644
--- a/flang/include/flang/Lower/Support/Utils.h
+++ b/flang/include/flang/Lower/Support/Utils.h
@@ -545,9 +545,51 @@ class IsEqualEvaluateExpr {
return isEqual(x.proc(), y.proc()) && isEqual(x.arguments(), y.arguments());
}
template <typename A>
+ static bool isEqual(const Fortran::evaluate::ImpliedDo<A> &x,
+ const Fortran::evaluate::ImpliedDo<A> &y) {
+ using Expr = Fortran::evaluate::Expr<A>;
+ for (const auto &[xValue, yValue] : llvm::zip(x.values(), y.values())) {
+ bool checkValue = Fortran::common::visit(
+ common::visitors{
+ [&](const Expr &v, const Expr &w) { return isEqual(v, w); },
+ [&](const auto &, const auto &) {
+ llvm::report_fatal_error("isEqual is not handled yet for "
+ "the element type in ImpliedDo");
+ return false;
+ },
+ },
+ xValue.u, yValue.u);
+ if (!checkValue) {
+ return false;
+ }
+ }
+ return isEqual(x.lower(), y.lower()) && isEqual(x.upper(), y.upper()) &&
+ isEqual(x.stride(), y.stride());
+ }
+ template <typename A>
static bool isEqual(const Fortran::evaluate::ArrayConstructor<A> &x,
const Fortran::evaluate::ArrayConstructor<A> &y) {
- llvm::report_fatal_error("not implemented");
+ for (const auto &[xValue, yValue] : llvm::zip(x, y)) {
+ using Expr = Fortran::evaluate::Expr<A>;
+ using ImpliedDo = Fortran::evaluate::ImpliedDo<A>;
+ bool checkElement = Fortran::common::visit(
+ common::visitors{
+ [&](const Expr &v, const Expr &w) { return isEqual(v, w); },
+ [&](const ImpliedDo &v, const ImpliedDo &w) {
+ return isEqual(v, w);
+ },
+ [&](const auto &, const auto &) {
+ llvm::report_fatal_error("isEqual is not handled yet for "
+ "the element type in ImpliedDo");
+ return false;
+ },
+ },
+ xValue.u, yValue.u);
+ if (!checkElement) {
+ return false;
+ }
+ }
+ return x.GetType() == y.GetType();
}
static bool isEqual(const Fortran::evaluate::ImpliedDoIndex &x,
const Fortran::evaluate::ImpliedDoIndex &y) {
diff --git a/flang/x.f90 b/flang/x.f90
new file mode 100644
index 00000000000000..db7bf9a8f901ac
--- /dev/null
+++ b/flang/x.f90
@@ -0,0 +1,14 @@
+program s
+ integer :: j = 0, k
+ integer :: n = 2
+
+ !$omp atomic
+ j = j + fun([ (k,k=1,n) ])
+ print *, j, fun([ (k,k=1,n) ])
+
+ contains
+ function fun(i) result(res)
+ integer :: i(2)
+ res = product(i)
+ end function
+end
>From ac45e595e14ebafca6a4b46844cacff2afb95066 Mon Sep 17 00:00:00 2001
From: Thirumalai-Shaktivel <thirumalaishaktivel at gmail.com>
Date: Fri, 27 Dec 2024 05:58:14 +0000
Subject: [PATCH 2/2] [Test] Add a test
---
flang/test/Lower/OpenMP/atomic-update.f90 | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/flang/test/Lower/OpenMP/atomic-update.f90 b/flang/test/Lower/OpenMP/atomic-update.f90
index 16dae9d5f301c1..7d04745015faab 100644
--- a/flang/test/Lower/OpenMP/atomic-update.f90
+++ b/flang/test/Lower/OpenMP/atomic-update.f90
@@ -185,4 +185,19 @@ program OmpAtomicUpdate
!$omp atomic update
w = max(w,x,y,z)
+!CHECK: %[[IMP_DO:.*]] = hlfir.elemental %{{.*}} unordered : (!fir.shape<1>) -> !hlfir.expr<?xi32> {
+!CHECK: ^bb0(%{{.*}}: index):
+! [...]
+!CHECK: %[[ADD_I1:.*]] = arith.addi {{.*}} : i32
+!CHECK: hlfir.yield_element %[[ADD_I1]] : i32
+!CHECK: }
+! [...]
+!CHECK: %[[SUM:.*]] = hlfir.sum %[[IMP_DO]]
+!CHECK: omp.atomic.update %[[VAL_X_DECLARE]]#1 : !fir.ref<i32> {
+!CHECK: ^bb0(%[[ARG0:.*]]: i32):
+!CHECK: %[[ADD_I2:.*]] = arith.addi %[[ARG0]], %[[SUM]] : i32
+!CHECK: omp.yield(%[[ADD_I2]] : i32)
+!CHECK: }
+ !$omp atomic update
+ x = x + sum([ (y+2, y=1, z) ])
end program OmpAtomicUpdate
More information about the flang-commits
mailing list