From: Florian Hahn <flo@fhahn.com>
Date: Fri, 4 Sep 2020 08:48:04 +0000 (+0100)
Subject: [DSE] Move legacy tests to DeadStoreElimination/MemDepAnalysis.
X-Git-Tag: llvmorg-13-init~12916
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6cb54cfe0b40216f0cac03f1f70a5b0ba328d5bb;p=platform%2Fupstream%2Fllvm.git

[DSE] Move legacy tests to DeadStoreElimination/MemDepAnalysis.

This patch moves the tests for the old MemDepAnalysis based DSE
implementation to the MemDepAnalysis subdirectory and updates them to
pass -enable-dse-memoryssa=false.

This is in preparation for the switch to MemorySSA-backed DSE.
---

diff --git a/llvm/test/Transforms/DeadStoreElimination/2011-03-25-DSEMiscompile.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/2011-03-25-DSEMiscompile.ll
similarity index 92%
rename from llvm/test/Transforms/DeadStoreElimination/2011-03-25-DSEMiscompile.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/2011-03-25-DSEMiscompile.ll
index 25c2d5f..826732c 100644
--- a/llvm/test/Transforms/DeadStoreElimination/2011-03-25-DSEMiscompile.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/2011-03-25-DSEMiscompile.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basic-aa -dse -S | FileCheck %s
+; RUN: opt < %s -basic-aa -dse -enable-dse-memoryssa=false -S | FileCheck %s
 ; PR9561
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128-n8:16:32"
 target triple = "i386-apple-darwin9.8"
diff --git a/llvm/test/Transforms/DeadStoreElimination/2011-09-06-EndOfFunction.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/2011-09-06-EndOfFunction.ll
similarity index 93%
rename from llvm/test/Transforms/DeadStoreElimination/2011-09-06-EndOfFunction.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/2011-09-06-EndOfFunction.ll
index 7e46d28..3f77349 100644
--- a/llvm/test/Transforms/DeadStoreElimination/2011-09-06-EndOfFunction.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/2011-09-06-EndOfFunction.ll
@@ -1,4 +1,4 @@
-; RUN: opt -dse -S < %s | FileCheck %s
+; RUN: opt -dse -enable-dse-memoryssa=false -S < %s | FileCheck %s
 
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 target triple = "x86_64-apple-darwin"
diff --git a/llvm/test/Transforms/DeadStoreElimination/2011-09-06-MemCpy.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/2011-09-06-MemCpy.ll
similarity index 98%
rename from llvm/test/Transforms/DeadStoreElimination/2011-09-06-MemCpy.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/2011-09-06-MemCpy.ll
index 665d772..6837a3d 100644
--- a/llvm/test/Transforms/DeadStoreElimination/2011-09-06-MemCpy.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/2011-09-06-MemCpy.ll
@@ -1,4 +1,4 @@
-; RUN: opt -dse -S < %s | FileCheck %s
+; RUN: opt -dse -enable-dse-memoryssa=false -S < %s | FileCheck %s
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-f128:128:128-n8:16:32:64"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/llvm/test/Transforms/DeadStoreElimination/2016-07-17-UseAfterFree.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/2016-07-17-UseAfterFree.ll
similarity index 89%
rename from llvm/test/Transforms/DeadStoreElimination/2016-07-17-UseAfterFree.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/2016-07-17-UseAfterFree.ll
index 3501b43..7b74dde 100644
--- a/llvm/test/Transforms/DeadStoreElimination/2016-07-17-UseAfterFree.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/2016-07-17-UseAfterFree.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basic-aa -dse -S -enable-dse-partial-overwrite-tracking | FileCheck %s
+; RUN: opt < %s -basic-aa -dse -enable-dse-memoryssa=false -S -enable-dse-partial-overwrite-tracking | FileCheck %s
 ; PR28588
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
diff --git a/llvm/test/Transforms/DeadStoreElimination/DeleteThrowableInst.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/DeleteThrowableInst.ll
similarity index 93%
rename from llvm/test/Transforms/DeadStoreElimination/DeleteThrowableInst.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/DeleteThrowableInst.ll
index 5bb2952..7e8c9ca 100644
--- a/llvm/test/Transforms/DeadStoreElimination/DeleteThrowableInst.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/DeleteThrowableInst.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -basic-aa -dse -S | FileCheck %s
+; RUN: opt < %s -basic-aa -dse -enable-dse-memoryssa=false -S | FileCheck %s
 
 declare i8* @_Znwj(i32) local_unnamed_addr
 declare void @foo() readnone
diff --git a/llvm/test/Transforms/DeadStoreElimination/OverwriteStoreBegin.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/OverwriteStoreBegin.ll
similarity index 99%
rename from llvm/test/Transforms/DeadStoreElimination/OverwriteStoreBegin.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/OverwriteStoreBegin.ll
index b5d9c40..56334be 100644
--- a/llvm/test/Transforms/DeadStoreElimination/OverwriteStoreBegin.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/OverwriteStoreBegin.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -basic-aa -dse -S | FileCheck %s
+; RUN: opt < %s -basic-aa -dse -enable-dse-memoryssa=false -S | FileCheck %s
 
 define void @write4to7(i32* nocapture %p) {
 ; CHECK-LABEL: @write4to7(
diff --git a/llvm/test/Transforms/DeadStoreElimination/OverwriteStoreEnd.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/OverwriteStoreEnd.ll
similarity index 99%
rename from llvm/test/Transforms/DeadStoreElimination/OverwriteStoreEnd.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/OverwriteStoreEnd.ll
index b6ae657..a8f09e3 100644
--- a/llvm/test/Transforms/DeadStoreElimination/OverwriteStoreEnd.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/OverwriteStoreEnd.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -basic-aa -dse -S | FileCheck %s
+; RUN: opt < %s -basic-aa -dse -enable-dse-memoryssa=false -S | FileCheck %s
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
 
 %struct.vec2 = type { <4 x i32>, <4 x i32> }
diff --git a/llvm/test/Transforms/DeadStoreElimination/PartialStore.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/PartialStore.ll
similarity index 95%
rename from llvm/test/Transforms/DeadStoreElimination/PartialStore.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/PartialStore.ll
index 1dd894e..bb6d024 100644
--- a/llvm/test/Transforms/DeadStoreElimination/PartialStore.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/PartialStore.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basic-aa -dse -enable-dse-partial-store-merging=false -S | FileCheck %s
+; RUN: opt < %s -basic-aa -dse -enable-dse-memoryssa=false -enable-dse-partial-store-merging=false -S | FileCheck %s
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 
 ; Ensure that the dead store is deleted in this case.  It is wholely
diff --git a/llvm/test/Transforms/DeadStoreElimination/PartialStore2.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/PartialStore2.ll
similarity index 83%
rename from llvm/test/Transforms/DeadStoreElimination/PartialStore2.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/PartialStore2.ll
index ebcb0c3..4fb271b 100644
--- a/llvm/test/Transforms/DeadStoreElimination/PartialStore2.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/PartialStore2.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s --data-layout "e" -dse -enable-dse-partial-store-merging=true -S | FileCheck --check-prefix CHECK --check-prefix CHECK-LE %s
-; RUN: opt < %s --data-layout "E" -dse -enable-dse-partial-store-merging=true -S | FileCheck --check-prefix CHECK --check-prefix CHECK-BE %s
+; RUN: opt < %s --data-layout "e" -dse -enable-dse-memoryssa=false -enable-dse-partial-store-merging=true -S | FileCheck --check-prefix CHECK --check-prefix CHECK-LE %s
+; RUN: opt < %s --data-layout "E" -dse -enable-dse-memoryssa=false -enable-dse-partial-store-merging=true -S | FileCheck --check-prefix CHECK --check-prefix CHECK-BE %s
 
 ; This test used to hit an assertion (see PR41949).
 ;
diff --git a/llvm/test/Transforms/DeadStoreElimination/X86/gather-null-pointer.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/X86/gather-null-pointer.ll
similarity index 93%
rename from llvm/test/Transforms/DeadStoreElimination/X86/gather-null-pointer.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/X86/gather-null-pointer.ll
index 6a5f4bb..ee56a6d 100644
--- a/llvm/test/Transforms/DeadStoreElimination/X86/gather-null-pointer.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/X86/gather-null-pointer.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -dse -S | FileCheck %s
+; RUN: opt < %s -dse -enable-dse-memoryssa=false -S | FileCheck %s
 
 ; Both stores should be emitted because we can't tell if the gather aliases.
 
diff --git a/llvm/test/Transforms/DeadStoreElimination/atomic.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/atomic.ll
similarity index 97%
rename from llvm/test/Transforms/DeadStoreElimination/atomic.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/atomic.ll
index 29850b7..ec1917f 100644
--- a/llvm/test/Transforms/DeadStoreElimination/atomic.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/atomic.ll
@@ -1,4 +1,4 @@
-; RUN: opt -basic-aa -dse -S < %s | FileCheck %s
+; RUN: opt -basic-aa -dse -enable-dse-memoryssa=false -S < %s | FileCheck %s
 
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 target triple = "x86_64-apple-macosx10.7.0"
diff --git a/llvm/test/Transforms/DeadStoreElimination/calloc-store.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/calloc-store.ll
similarity index 95%
rename from llvm/test/Transforms/DeadStoreElimination/calloc-store.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/calloc-store.ll
index 5bd384b..cfc73f4 100644
--- a/llvm/test/Transforms/DeadStoreElimination/calloc-store.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/calloc-store.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basic-aa -dse -S | FileCheck %s
+; RUN: opt < %s -basic-aa -dse -enable-dse-memoryssa=false -S | FileCheck %s
 
 declare noalias i8* @calloc(i64, i64)
 
diff --git a/llvm/test/Transforms/DeadStoreElimination/combined-partial-overwrites.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/combined-partial-overwrites.ll
similarity index 98%
rename from llvm/test/Transforms/DeadStoreElimination/combined-partial-overwrites.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/combined-partial-overwrites.ll
index a57693a..0e98e96 100644
--- a/llvm/test/Transforms/DeadStoreElimination/combined-partial-overwrites.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/combined-partial-overwrites.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -dse -enable-dse-partial-store-merging=false < %s | FileCheck %s
+; RUN: opt -S -dse -enable-dse-memoryssa=false -enable-dse-partial-store-merging=false < %s | FileCheck %s
 target datalayout = "E-m:e-i64:64-n32:64"
 target triple = "powerpc64le-unknown-linux"
 
diff --git a/llvm/test/Transforms/DeadStoreElimination/const-pointers.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/const-pointers.ll
similarity index 91%
rename from llvm/test/Transforms/DeadStoreElimination/const-pointers.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/const-pointers.ll
index a2218b7..16be53c 100644
--- a/llvm/test/Transforms/DeadStoreElimination/const-pointers.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/const-pointers.ll
@@ -1,4 +1,4 @@
-; RUN: opt -basic-aa -dse -S < %s | FileCheck %s
+; RUN: opt -basic-aa -dse -enable-dse-memoryssa=false -S < %s | FileCheck %s
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 
 %t = type { i32 }
diff --git a/llvm/test/Transforms/DeadStoreElimination/crash.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/crash.ll
similarity index 98%
rename from llvm/test/Transforms/DeadStoreElimination/crash.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/crash.ll
index ccee7fb..d211ff9 100644
--- a/llvm/test/Transforms/DeadStoreElimination/crash.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/crash.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basic-aa -dse -S
+; RUN: opt < %s -basic-aa -dse -enable-dse-memoryssa=false -S
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
 target triple = "i386-apple-darwin10.0"
diff --git a/llvm/test/Transforms/DeadStoreElimination/cs-cs-aliasing.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/cs-cs-aliasing.ll
similarity index 97%
rename from llvm/test/Transforms/DeadStoreElimination/cs-cs-aliasing.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/cs-cs-aliasing.ll
index b403e33..9df0bad 100644
--- a/llvm/test/Transforms/DeadStoreElimination/cs-cs-aliasing.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/cs-cs-aliasing.ll
@@ -1,4 +1,4 @@
-; RUN: opt -basic-aa -dse -S < %s | FileCheck %s
+; RUN: opt -basic-aa -dse -enable-dse-memoryssa=false -S < %s | FileCheck %s
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/llvm/test/Transforms/DeadStoreElimination/debuginfo.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/debuginfo.ll
similarity index 92%
rename from llvm/test/Transforms/DeadStoreElimination/debuginfo.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/debuginfo.ll
index b927965..fbca29d 100644
--- a/llvm/test/Transforms/DeadStoreElimination/debuginfo.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/debuginfo.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -debugify -basic-aa -dse -S | FileCheck %s
+; RUN: opt < %s -debugify -basic-aa -dse -enable-dse-memoryssa=false -S | FileCheck %s
 
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 
diff --git a/llvm/test/Transforms/DeadStoreElimination/dominate.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/dominate.ll
similarity index 87%
rename from llvm/test/Transforms/DeadStoreElimination/dominate.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/dominate.ll
index 24dd65e..63f1a3f 100644
--- a/llvm/test/Transforms/DeadStoreElimination/dominate.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/dominate.ll
@@ -1,4 +1,4 @@
-; RUN: opt -dse -disable-output < %s
+; RUN: opt -dse -enable-dse-memoryssa=false -disable-output < %s
 ; test that we don't crash
 declare void @bar()
 
diff --git a/llvm/test/Transforms/DeadStoreElimination/fence.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/fence.ll
similarity index 97%
rename from llvm/test/Transforms/DeadStoreElimination/fence.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/fence.ll
index 0ef29b0..ce2dcd3 100644
--- a/llvm/test/Transforms/DeadStoreElimination/fence.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/fence.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -basic-aa -dse < %s | FileCheck %s
+; RUN: opt -S -basic-aa -dse -enable-dse-memoryssa=false < %s | FileCheck %s
 
 ; We conservative choose to prevent dead store elimination
 ; across release or stronger fences.  It's not required 
diff --git a/llvm/test/Transforms/DeadStoreElimination/free.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/free.ll
similarity index 94%
rename from llvm/test/Transforms/DeadStoreElimination/free.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/free.ll
index 66ccc7b..275b7e3 100644
--- a/llvm/test/Transforms/DeadStoreElimination/free.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/free.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basic-aa -dse -S | FileCheck %s
+; RUN: opt < %s -basic-aa -dse -enable-dse-memoryssa=false -S | FileCheck %s
 
 target datalayout = "e-p:64:64:64"
 
diff --git a/llvm/test/Transforms/DeadStoreElimination/inst-limits.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/inst-limits.ll
similarity index 99%
rename from llvm/test/Transforms/DeadStoreElimination/inst-limits.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/inst-limits.ll
index e9e46df..6e5f4c1 100644
--- a/llvm/test/Transforms/DeadStoreElimination/inst-limits.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/inst-limits.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -dse < %s | FileCheck %s
+; RUN: opt -S -dse -enable-dse-memoryssa=false < %s | FileCheck %s
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 
 ; If there are two stores to the same location, DSE should be able to remove
diff --git a/llvm/test/Transforms/DeadStoreElimination/int_sideeffect.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/int_sideeffect.ll
similarity index 80%
rename from llvm/test/Transforms/DeadStoreElimination/int_sideeffect.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/int_sideeffect.ll
index 035e787..806c736 100644
--- a/llvm/test/Transforms/DeadStoreElimination/int_sideeffect.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/int_sideeffect.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S < %s -dse | FileCheck %s
+; RUN: opt -S < %s -dse -enable-dse-memoryssa=false | FileCheck %s
 
 declare void @llvm.sideeffect()
 
diff --git a/llvm/test/Transforms/DeadStoreElimination/invariant.start.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/invariant.start.ll
similarity index 93%
rename from llvm/test/Transforms/DeadStoreElimination/invariant.start.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/invariant.start.ll
index 27400cd..5a0c1f0 100644
--- a/llvm/test/Transforms/DeadStoreElimination/invariant.start.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/invariant.start.ll
@@ -1,5 +1,5 @@
 ; Test to make sure llvm.invariant.start calls are not treated as clobbers.
-; RUN: opt < %s -basic-aa -dse -S | FileCheck %s
+; RUN: opt < %s -basic-aa -dse -enable-dse-memoryssa=false -S | FileCheck %s
 
 declare {}* @llvm.invariant.start.p0i8(i64, i8* nocapture) nounwind readonly
 
diff --git a/llvm/test/Transforms/DeadStoreElimination/launder.invariant.group.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/launder.invariant.group.ll
similarity index 93%
rename from llvm/test/Transforms/DeadStoreElimination/launder.invariant.group.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/launder.invariant.group.ll
index dbbc945..815ad02 100644
--- a/llvm/test/Transforms/DeadStoreElimination/launder.invariant.group.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/launder.invariant.group.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basic-aa -dse -S | FileCheck %s
+; RUN: opt < %s -basic-aa -dse -enable-dse-memoryssa=false -S | FileCheck %s
 
 ; CHECK-LABEL: void @skipBarrier(i8* %ptr)
 define void @skipBarrier(i8* %ptr) {
@@ -62,4 +62,4 @@ define void @skip4Barriers(i8* %ptr) {
 
 
 declare i8* @llvm.launder.invariant.group.p0i8(i8*)
-declare i8* @llvm.strip.invariant.group.p0i8(i8*)
\ No newline at end of file
+declare i8* @llvm.strip.invariant.group.p0i8(i8*)
diff --git a/llvm/test/Transforms/DeadStoreElimination/libcalls.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/libcalls.ll
similarity index 96%
rename from llvm/test/Transforms/DeadStoreElimination/libcalls.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/libcalls.ll
index a18021d..692a9a0 100644
--- a/llvm/test/Transforms/DeadStoreElimination/libcalls.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/libcalls.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -basic-aa -dse < %s | FileCheck %s
+; RUN: opt -S -basic-aa -dse -enable-dse-memoryssa=false < %s | FileCheck %s
 
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/llvm/test/Transforms/DeadStoreElimination/libcalls2.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/libcalls2.ll
similarity index 82%
rename from llvm/test/Transforms/DeadStoreElimination/libcalls2.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/libcalls2.ll
index df30113..23440f1 100644
--- a/llvm/test/Transforms/DeadStoreElimination/libcalls2.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/libcalls2.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -basic-aa -dse < %s | FileCheck %s
+; RUN: opt -S -basic-aa -dse -enable-dse-memoryssa=false < %s | FileCheck %s
 
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/llvm/test/Transforms/DeadStoreElimination/lifetime.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/lifetime.ll
similarity index 92%
rename from llvm/test/Transforms/DeadStoreElimination/lifetime.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/lifetime.ll
index e9999ff..3f20d9e 100644
--- a/llvm/test/Transforms/DeadStoreElimination/lifetime.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/lifetime.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -basic-aa -dse < %s | FileCheck %s
+; RUN: opt -S -basic-aa -dse -enable-dse-memoryssa=false < %s | FileCheck %s
 
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 
diff --git a/llvm/test/Transforms/DeadStoreElimination/mda-with-dbg-values.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/mda-with-dbg-values.ll
similarity index 94%
rename from llvm/test/Transforms/DeadStoreElimination/mda-with-dbg-values.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/mda-with-dbg-values.ll
index 4c6776b..b46e139 100644
--- a/llvm/test/Transforms/DeadStoreElimination/mda-with-dbg-values.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/mda-with-dbg-values.ll
@@ -1,5 +1,5 @@
-; RUN: opt -S -dse -memdep-block-scan-limit=3 < %s | FileCheck %s
-; RUN: opt -S -strip-debug -dse -memdep-block-scan-limit=3 < %s | FileCheck %s
+; RUN: opt -S -dse -enable-dse-memoryssa=false -memdep-block-scan-limit=3 < %s | FileCheck %s
+; RUN: opt -S -strip-debug -dse -enable-dse-memoryssa=false -memdep-block-scan-limit=3 < %s | FileCheck %s
 
 ; Test case to check that the memory dependency analysis gets the same
 ; result even if we have a dbg value between the memcpy and
diff --git a/llvm/test/Transforms/DeadStoreElimination/memintrinsics.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/memintrinsics.ll
similarity index 97%
rename from llvm/test/Transforms/DeadStoreElimination/memintrinsics.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/memintrinsics.ll
index 2902712..4a54d84 100644
--- a/llvm/test/Transforms/DeadStoreElimination/memintrinsics.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/memintrinsics.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -dse < %s | FileCheck %s
+; RUN: opt -S -dse -enable-dse-memoryssa=false < %s | FileCheck %s
 
 declare void @llvm.memcpy.p0i8.p0i8.i8(i8* nocapture, i8* nocapture, i8, i1) nounwind
 declare void @llvm.memmove.p0i8.p0i8.i8(i8* nocapture, i8* nocapture, i8, i1) nounwind
diff --git a/llvm/test/Transforms/DeadStoreElimination/memset-missing-debugloc.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/memset-missing-debugloc.ll
similarity index 98%
rename from llvm/test/Transforms/DeadStoreElimination/memset-missing-debugloc.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/memset-missing-debugloc.ll
index c0f490c..ea07f91 100644
--- a/llvm/test/Transforms/DeadStoreElimination/memset-missing-debugloc.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/memset-missing-debugloc.ll
@@ -1,7 +1,7 @@
 ; Test that the getelementptr generated when the dse pass determines that
 ; a memset can be shortened has the debugloc carried over from the memset.
 
-; RUN: opt -S -march=native -dse < %s| FileCheck %s
+; RUN: opt -S -march=native -dse -enable-dse-memoryssa=false < %s| FileCheck %s
 ; CHECK: bitcast [5 x i64]* %{{[a-zA-Z_][a-zA-Z0-9_]*}} to i8*, !dbg
 ; CHECK-NEXT: %{{[0-9]+}} = getelementptr inbounds i8, i8* %0, i64 32, !dbg ![[DBG:[0-9]+]]
 ; CHECK: ![[DBG]] = !DILocation(line: 2,
diff --git a/llvm/test/Transforms/DeadStoreElimination/merge-stores-big-endian.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/merge-stores-big-endian.ll
similarity index 98%
rename from llvm/test/Transforms/DeadStoreElimination/merge-stores-big-endian.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/merge-stores-big-endian.ll
index 77784ac..1d4f7b3 100644
--- a/llvm/test/Transforms/DeadStoreElimination/merge-stores-big-endian.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/merge-stores-big-endian.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -dse -enable-dse-partial-store-merging -S < %s | FileCheck %s
+; RUN: opt -dse -enable-dse-memoryssa=false -enable-dse-partial-store-merging -S < %s | FileCheck %s
 target datalayout = "E-m:e-i64:64-i128:128-n32:64-S128"
 
 define void @byte_by_byte_replacement(i32 *%ptr) {
diff --git a/llvm/test/Transforms/DeadStoreElimination/merge-stores.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/merge-stores.ll
similarity index 98%
rename from llvm/test/Transforms/DeadStoreElimination/merge-stores.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/merge-stores.ll
index 095ad9d..b3e16f8 100644
--- a/llvm/test/Transforms/DeadStoreElimination/merge-stores.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/merge-stores.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -dse -enable-dse-partial-store-merging -S < %s | FileCheck %s
+; RUN: opt -dse -enable-dse-memoryssa=false -enable-dse-partial-store-merging -S < %s | FileCheck %s
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-f128:128:128-n8:16:32:64"
 
 define void @byte_by_byte_replacement(i32 *%ptr) {
diff --git a/llvm/test/Transforms/DeadStoreElimination/no-targetdata.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/no-targetdata.ll
similarity index 89%
rename from llvm/test/Transforms/DeadStoreElimination/no-targetdata.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/no-targetdata.ll
index aec3076..ae32017 100644
--- a/llvm/test/Transforms/DeadStoreElimination/no-targetdata.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/no-targetdata.ll
@@ -1,4 +1,4 @@
-; RUN: opt -basic-aa -dse -S < %s | FileCheck %s
+; RUN: opt -basic-aa -dse -enable-dse-memoryssa=false -S < %s | FileCheck %s
 
 declare void @llvm.memcpy.p0i8.p0i8.i64(i8* nocapture, i8* nocapture, i64, i1) nounwind
 
diff --git a/llvm/test/Transforms/DeadStoreElimination/operand-bundles.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/operand-bundles.ll
similarity index 94%
rename from llvm/test/Transforms/DeadStoreElimination/operand-bundles.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/operand-bundles.ll
index f3df74b..18117b3 100644
--- a/llvm/test/Transforms/DeadStoreElimination/operand-bundles.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/operand-bundles.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basic-aa -dse -S | FileCheck %s
+; RUN: opt < %s -basic-aa -dse -enable-dse-memoryssa=false -S | FileCheck %s
 
 declare noalias i8* @malloc(i64) "malloc-like"
 
diff --git a/llvm/test/Transforms/DeadStoreElimination/pr11390.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/pr11390.ll
similarity index 95%
rename from llvm/test/Transforms/DeadStoreElimination/pr11390.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/pr11390.ll
index 56ca604..ac806d6 100644
--- a/llvm/test/Transforms/DeadStoreElimination/pr11390.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/pr11390.ll
@@ -1,4 +1,4 @@
-; RUN: opt -basic-aa -dse -S < %s | FileCheck %s
+; RUN: opt -basic-aa -dse -enable-dse-memoryssa=false -S < %s | FileCheck %s
 ; PR11390
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/llvm/test/Transforms/DeadStoreElimination/simple.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/simple.ll
similarity index 99%
rename from llvm/test/Transforms/DeadStoreElimination/simple.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/simple.ll
index 871190c..78f8a7c2 100644
--- a/llvm/test/Transforms/DeadStoreElimination/simple.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/simple.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -basic-aa -dse -S | FileCheck %s
-; RUN: opt < %s -aa-pipeline=basic-aa -passes=dse -S | FileCheck %s
+; RUN: opt < %s -basic-aa -dse -enable-dse-memoryssa=false -S | FileCheck %s
+; RUN: opt < %s -aa-pipeline=basic-aa -passes=dse -enable-dse-memoryssa=false -S | FileCheck %s
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 
 declare void @llvm.memset.p0i8.i64(i8* nocapture, i8, i64, i1) nounwind
diff --git a/llvm/test/Transforms/DeadStoreElimination/tail-byval.ll b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/tail-byval.ll
similarity index 91%
rename from llvm/test/Transforms/DeadStoreElimination/tail-byval.ll
rename to llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/tail-byval.ll
index ed2fbd4..0b4a76f 100644
--- a/llvm/test/Transforms/DeadStoreElimination/tail-byval.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/MemDepAnalysis/tail-byval.ll
@@ -1,4 +1,4 @@
-; RUN: opt -dse -S < %s | FileCheck %s
+; RUN: opt -dse -enable-dse-memoryssa=false -S < %s | FileCheck %s
 
 ; Don't eliminate stores to allocas before tail calls to functions that use
 ; byval. It's correct to mark calls like these as 'tail'. To implement this tail