[PATCH] D137553: [MemorySSA] Relax assert condition in createDefinedAccess

[luxufan via Phabricator via llvm-commits]

StephenFan updated this revision to Diff 476128.
StephenFan retitled this revision from "[MemorySSA] Delete dead MemoryUseOrDef for CallInst when clone loop basicblock" to "[MemorySSA] Relax assert condition in createDefinedAccess".
StephenFan edited the summary of this revision.
StephenFan added a comment.

Address comments.


Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D137553

Files:
  llvm/lib/Analysis/MemorySSA.cpp
  llvm/test/Transforms/SimpleLoopUnswitch/pr58719.ll


Index: llvm/test/Transforms/SimpleLoopUnswitch/pr58719.ll
===================================================================
--- /dev/null
+++ llvm/test/Transforms/SimpleLoopUnswitch/pr58719.ll
@@ -0,0 +1,21 @@
+; RUN: opt -passes="require<globals-aa>,cgscc(instcombine),function(loop-mssa(loop-simplifycfg)),recompute-globalsaa,function(loop-mssa(simple-loop-unswitch<nontrivial>),print<memoryssa>)" -disable-output < %s
+
+; Check that don't crash if the Alias Analysis returns better results than
+; before when cloning loop's memoryssa.
+define void @f(ptr %p) {
+entry:
+  %0 = load i16, ptr %p, align 1
+  ret void
+}
+
+define void @g(i1 %tobool.not) {
+entry:
+  br label %for.cond
+
+for.cond:                                         ; preds = %if.then, %for.cond, %entry
+  br i1 %tobool.not, label %if.then, label %for.cond
+
+if.then:                                          ; preds = %for.cond
+  call void @f()
+  br label %for.cond
+}
Index: llvm/lib/Analysis/MemorySSA.cpp
===================================================================
--- llvm/lib/Analysis/MemorySSA.cpp
+++ llvm/lib/Analysis/MemorySSA.cpp
@@ -1764,7 +1764,14 @@
     bool DefCheck, UseCheck;
     DefCheck = isModSet(ModRef) || isOrdered(I);
     UseCheck = isRefSet(ModRef);
-    assert(Def == DefCheck && (Def || Use == UseCheck) && "Invalid template");
+    // Use set is not checked since AA may return better results as a result of
+    // other transforms.
+    // FIXME: Would Def value always be consistent after transforms?
+    assert(Def == DefCheck && "Invalid template");
+    if (!Def && Use != UseCheck) {
+      // New Access should not have more power than template access
+      assert(!UseCheck && "Invalid template");
+    }
 #endif
   } else {
     // Find out what affect this instruction has on memory.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D137553.476128.patch
Type: text/x-patch
Size: 1818 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20221117/9f2446d8/attachment-0001.bin>