[llvm] [LoopInterchange] Handle LE and GE correctly (PR #124901)
Ryotaro Kasuga via llvm-commits
llvm-commits at lists.llvm.org
Wed Jan 29 01:01:06 PST 2025
https://github.com/kasuga-fj created https://github.com/llvm/llvm-project/pull/124901
LoopInterchange have converted `DVEntry::LE` and `DVEntry::GE` in direction vectors to '<' and '>' respectively. This handling is incorrect because the information about the '=' it lost. This leads to miscompilation in some cases. To resolve this issue, convert them to '*' instead.
Resolve #123920
>From c8c51b19c9678ca2f32aba76bf35eff719968aed Mon Sep 17 00:00:00 2001
From: Ryotaro Kasuga <kasuga.ryotaro at fujitsu.com>
Date: Tue, 28 Jan 2025 07:28:32 +0000
Subject: [PATCH] [LoopInterchange] Handle LE and GE correctly
LoopInterchange have converted `DVEntry::LE` and `DVEntry::GE` in
direction vectors to '<' and '>' respectively. This handling is
incorrect because the information about the '=' it lost. This leads to
miscompilation in some cases. To resolve this issue, convert them to '*'
instead.
Resolve #123920
---
.../lib/Transforms/Scalar/LoopInterchange.cpp | 11 ++-
.../LoopInterchange/outer-dependency-lte.ll | 75 +++++++++++++++++++
2 files changed, 83 insertions(+), 3 deletions(-)
create mode 100644 llvm/test/Transforms/LoopInterchange/outer-dependency-lte.ll
diff --git a/llvm/lib/Transforms/Scalar/LoopInterchange.cpp b/llvm/lib/Transforms/Scalar/LoopInterchange.cpp
index 38fc682698c53e..ca125d2c0c490c 100644
--- a/llvm/lib/Transforms/Scalar/LoopInterchange.cpp
+++ b/llvm/lib/Transforms/Scalar/LoopInterchange.cpp
@@ -160,11 +160,16 @@ static bool populateDependencyMatrix(CharMatrix &DepMatrix, unsigned Level,
unsigned Levels = D->getLevels();
char Direction;
for (unsigned II = 1; II <= Levels; ++II) {
+ // `DVEntry::LE` is converted to `*`. This is because `LE` means `<`
+ // or `=`, for which we don't have an equivalent representation, so
+ // that the conservative approximation is necessary. The same goes for
+ // `DVEntry::GE`.
+ // TODO: Use of fine-grained expressions allows for more accurate
+ // analysis.
unsigned Dir = D->getDirection(II);
- if (Dir == Dependence::DVEntry::LT || Dir == Dependence::DVEntry::LE)
+ if (Dir == Dependence::DVEntry::LT)
Direction = '<';
- else if (Dir == Dependence::DVEntry::GT ||
- Dir == Dependence::DVEntry::GE)
+ else if (Dir == Dependence::DVEntry::GT)
Direction = '>';
else if (Dir == Dependence::DVEntry::EQ)
Direction = '=';
diff --git a/llvm/test/Transforms/LoopInterchange/outer-dependency-lte.ll b/llvm/test/Transforms/LoopInterchange/outer-dependency-lte.ll
new file mode 100644
index 00000000000000..c17d78f7cfce68
--- /dev/null
+++ b/llvm/test/Transforms/LoopInterchange/outer-dependency-lte.ll
@@ -0,0 +1,75 @@
+; RUN: opt < %s -passes=loop-interchange -pass-remarks-missed='loop-interchange' -pass-remarks-output=%t \
+; RUN: -verify-dom-info -verify-loop-info -verify-loop-lcssa
+; RUN: FileCheck --input-file=%t %s
+
+;; The original code:
+;;
+;; #define N 4
+;; int a[N*N][N*N][N*N];
+;; void f() {
+;; for (int i = 0; i < N; i++)
+;; for (int j = 1; j < 2*N; j++)
+;; for (int k = 1; k < 2*N; k++)
+;; a[2*i][k+1][j-1] -= a[i+N-1][k][j];
+;; }
+;;
+;; The entry of the direction vector for the outermost loop is `DVEntry::LE`.
+;; We need to treat this as `*`, not `<`. See issue #123920 for details.
+
+; CHECK: --- !Missed
+; CHECK-NEXT: Pass: loop-interchange
+; CHECK-NEXT: Name: Dependence
+; CHECK-NEXT: Function: f
+; CHECK: --- !Missed
+; CHECK-NEXT: Pass: loop-interchange
+; CHECK-NEXT: Name: Dependence
+; CHECK-NEXT: Function: f
+
+ at a = dso_local global [16 x [16 x [16 x i32]]] zeroinitializer, align 4
+
+define dso_local void @f() {
+entry:
+ br label %for.cond1.preheader
+
+for.cond1.preheader:
+ %i.039 = phi i32 [ 0, %entry ], [ %inc26, %for.cond.cleanup3 ]
+ %sub = add nuw nsw i32 %i.039, 3
+ %idxprom = zext nneg i32 %sub to i64
+ %mul = shl nuw nsw i32 %i.039, 1
+ %idxprom13 = zext nneg i32 %mul to i64
+ br label %for.cond5.preheader
+
+for.cond.cleanup:
+ ret void
+
+for.cond5.preheader:
+ %j.038 = phi i32 [ 1, %for.cond1.preheader ], [ %inc23, %for.cond.cleanup7 ]
+ %idxprom11 = zext nneg i32 %j.038 to i64
+ %sub18 = add nsw i32 %j.038, -1
+ %idxprom19 = sext i32 %sub18 to i64
+ br label %for.body8
+
+for.cond.cleanup3:
+ %inc26 = add nuw nsw i32 %i.039, 1
+ %cmp = icmp samesign ult i32 %i.039, 3
+ br i1 %cmp, label %for.cond1.preheader, label %for.cond.cleanup
+
+for.cond.cleanup7:
+ %inc23 = add nuw nsw i32 %j.038, 1
+ %cmp2 = icmp samesign ult i32 %j.038, 7
+ br i1 %cmp2, label %for.cond5.preheader, label %for.cond.cleanup3
+
+for.body8:
+ %k.037 = phi i32 [ 1, %for.cond5.preheader ], [ %add15, %for.body8 ]
+ %idxprom9 = zext nneg i32 %k.037 to i64
+ %arrayidx12 = getelementptr inbounds nuw [16 x [16 x [16 x i32]]], ptr @a, i64 0, i64 %idxprom, i64 %idxprom9, i64 %idxprom11
+ %0 = load i32, ptr %arrayidx12, align 4
+ %add15 = add nuw nsw i32 %k.037, 1
+ %idxprom16 = zext nneg i32 %add15 to i64
+ %arrayidx20 = getelementptr inbounds [16 x [16 x [16 x i32]]], ptr @a, i64 0, i64 %idxprom13, i64 %idxprom16, i64 %idxprom19
+ %1 = load i32, ptr %arrayidx20, align 4
+ %sub21 = sub nsw i32 %1, %0
+ store i32 %sub21, ptr %arrayidx20, align 4
+ %cmp6 = icmp samesign ult i32 %k.037, 7
+ br i1 %cmp6, label %for.body8, label %for.cond.cleanup7
+}
More information about the llvm-commits
mailing list