[llvm] 3984a3d - [MergedLoadStoreMotion] Regenerate test checks (NFC)

Nikita Popov via llvm-commits llvm-commits at lists.llvm.org
Fri Jul 28 05:45:38 PDT 2023


Author: Nikita Popov
Date: 2023-07-28T14:45:30+02:00
New Revision: 3984a3ddbb280f08cd73fb57f1bd0d1fd78c4a6b

URL: https://github.com/llvm/llvm-project/commit/3984a3ddbb280f08cd73fb57f1bd0d1fd78c4a6b
DIFF: https://github.com/llvm/llvm-project/commit/3984a3ddbb280f08cd73fb57f1bd0d1fd78c4a6b.diff

LOG: [MergedLoadStoreMotion] Regenerate test checks (NFC)

Added: 
    

Modified: 
    llvm/test/Transforms/MergedLoadStoreMotion/st_sink_barrier_call.ll
    llvm/test/Transforms/MergedLoadStoreMotion/st_sink_no_barrier_store.ll
    llvm/test/Transforms/MergedLoadStoreMotion/st_sink_with_barrier.ll

Removed: 
    


################################################################################
diff  --git a/llvm/test/Transforms/MergedLoadStoreMotion/st_sink_barrier_call.ll b/llvm/test/Transforms/MergedLoadStoreMotion/st_sink_barrier_call.ll
index 3f78ee1b3e9eca..c0723c4e82a3b2 100644
--- a/llvm/test/Transforms/MergedLoadStoreMotion/st_sink_barrier_call.ll
+++ b/llvm/test/Transforms/MergedLoadStoreMotion/st_sink_barrier_call.ll
@@ -1,14 +1,40 @@
-; Test to make sure that a function call that needs to be a barrier to sinking stores is indeed a barrier.
-; Stores sunks into the footer.
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 2
 ; RUN: opt -passes=mldst-motion -S < %s | FileCheck %s
 target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
 
+; Test to make sure that a function call that needs to be a barrier to sinking stores is indeed a barrier.
+; Stores sunks into the footer.
+
 %struct.node = type { i32, ptr, ptr, ptr, i32, i32, i32, i32 }
 
 declare i32 @foo(i32 %x)
 
-; Function Attrs: nounwind uwtable
 define void @sink_store(ptr nocapture %r, i32 %index) {
+; CHECK-LABEL: define void @sink_store
+; CHECK-SAME: (ptr nocapture [[R:%.*]], i32 [[INDEX:%.*]]) {
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[NODE_0_IN16:%.*]] = getelementptr inbounds [[STRUCT_NODE:%.*]], ptr [[R]], i64 0, i32 2
+; CHECK-NEXT:    [[NODE_017:%.*]] = load ptr, ptr [[NODE_0_IN16]], align 8
+; CHECK-NEXT:    [[INDEX_ADDR:%.*]] = alloca i32, align 4
+; CHECK-NEXT:    store i32 [[INDEX]], ptr [[INDEX_ADDR]], align 4
+; CHECK-NEXT:    [[TMP0:%.*]] = load i32, ptr [[INDEX_ADDR]], align 4
+; CHECK-NEXT:    [[CMP:%.*]] = icmp slt i32 [[TMP0]], 0
+; CHECK-NEXT:    br i1 [[CMP]], label [[IF_THEN:%.*]], label [[IF_ELSE:%.*]]
+; CHECK:       if.then:
+; CHECK-NEXT:    [[TMP1:%.*]] = load i32, ptr [[INDEX_ADDR]], align 4
+; CHECK-NEXT:    [[P1:%.*]] = getelementptr inbounds [[STRUCT_NODE]], ptr [[NODE_017]], i32 0, i32 6
+; CHECK-NEXT:    store i32 [[TMP1]], ptr [[P1]], align 4
+; CHECK-NEXT:    br label [[IF_END:%.*]]
+; CHECK:       if.else:
+; CHECK-NEXT:    [[TMP2:%.*]] = load i32, ptr [[INDEX_ADDR]], align 4
+; CHECK-NEXT:    [[ADD:%.*]] = add nsw i32 [[TMP2]], 1
+; CHECK-NEXT:    [[P3:%.*]] = getelementptr inbounds [[STRUCT_NODE]], ptr [[NODE_017]], i32 0, i32 6
+; CHECK-NEXT:    store i32 [[ADD]], ptr [[P3]], align 4
+; CHECK-NEXT:    [[TMP3:%.*]] = call i32 @foo(i32 5)
+; CHECK-NEXT:    br label [[IF_END]]
+; CHECK:       if.end:
+; CHECK-NEXT:    ret void
+;
 entry:
   %node.0.in16 = getelementptr inbounds %struct.node, ptr %r, i64 0, i32 2
   %node.017 = load ptr, ptr %node.0.in16, align 8
@@ -18,26 +44,20 @@ entry:
   %cmp = icmp slt i32 %0, 0
   br i1 %cmp, label %if.then, label %if.else
 
-; CHECK: if.then
 if.then:                                          ; preds = %entry
   %1 = load i32, ptr %index.addr, align 4
   %p1 = getelementptr inbounds %struct.node, ptr %node.017, i32 0, i32 6
-  ; CHECK: store i32
   store i32 %1, ptr %p1, align 4
   br label %if.end
 
-; CHECK: if.else
 if.else:                                          ; preds = %entry
   %2 = load i32, ptr %index.addr, align 4
   %add = add nsw i32 %2, 1
   %p3 = getelementptr inbounds %struct.node, ptr %node.017, i32 0, i32 6
-  ; CHECK: store i32
   store i32 %add, ptr %p3, align 4
   call i32 @foo(i32 5)				  ;barrier
   br label %if.end
 
-; CHECK: if.end
 if.end:                                           ; preds = %if.else, %if.then
-; CHECK-NOT: store
   ret void
 }

diff  --git a/llvm/test/Transforms/MergedLoadStoreMotion/st_sink_no_barrier_store.ll b/llvm/test/Transforms/MergedLoadStoreMotion/st_sink_no_barrier_store.ll
index 96d6e595f3dd17..9a20011af0dcb4 100644
--- a/llvm/test/Transforms/MergedLoadStoreMotion/st_sink_no_barrier_store.ll
+++ b/llvm/test/Transforms/MergedLoadStoreMotion/st_sink_no_barrier_store.ll
@@ -1,12 +1,38 @@
-; Test to make sure that stores in a diamond get merged with a non barrier store after the store instruction to be sunk
-; Stores sunks into the footer.
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 2
 ; RUN: opt -passes=mldst-motion -S < %s | FileCheck %s
 target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
 
+; Test to make sure that stores in a diamond get merged with a non barrier store after the store instruction to be sunk
+; Stores sunks into the footer.
+
 %struct.node = type { i32, ptr, ptr, ptr, i32, i32, i32, i32 }
 
-; Function Attrs: nounwind uwtable
 define void @sink_store(ptr nocapture %r, i32 %index) {
+; CHECK-LABEL: define void @sink_store
+; CHECK-SAME: (ptr nocapture [[R:%.*]], i32 [[INDEX:%.*]]) {
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[NODE_0_IN16:%.*]] = getelementptr inbounds [[STRUCT_NODE:%.*]], ptr [[R]], i64 0, i32 2
+; CHECK-NEXT:    [[NODE_017:%.*]] = load ptr, ptr [[NODE_0_IN16]], align 8
+; CHECK-NEXT:    [[INDEX_ADDR:%.*]] = alloca i32, align 4
+; CHECK-NEXT:    store i32 [[INDEX]], ptr [[INDEX_ADDR]], align 4
+; CHECK-NEXT:    [[TMP0:%.*]] = load i32, ptr [[INDEX_ADDR]], align 4
+; CHECK-NEXT:    [[CMP:%.*]] = icmp slt i32 [[TMP0]], 0
+; CHECK-NEXT:    br i1 [[CMP]], label [[IF_THEN:%.*]], label [[IF_ELSE:%.*]]
+; CHECK:       if.then:
+; CHECK-NEXT:    [[TMP1:%.*]] = load i32, ptr [[INDEX_ADDR]], align 4
+; CHECK-NEXT:    br label [[IF_END:%.*]]
+; CHECK:       if.else:
+; CHECK-NEXT:    [[TMP2:%.*]] = load i32, ptr [[INDEX_ADDR]], align 4
+; CHECK-NEXT:    [[ADD:%.*]] = add nsw i32 [[TMP2]], 1
+; CHECK-NEXT:    [[P3:%.*]] = getelementptr inbounds [[STRUCT_NODE]], ptr [[NODE_017]], i32 5, i32 6
+; CHECK-NEXT:    store i32 [[ADD]], ptr [[P3]], align 4
+; CHECK-NEXT:    br label [[IF_END]]
+; CHECK:       if.end:
+; CHECK-NEXT:    [[ADD_SINK:%.*]] = phi i32 [ [[TMP1]], [[IF_THEN]] ], [ [[ADD]], [[IF_ELSE]] ]
+; CHECK-NEXT:    [[TMP3:%.*]] = getelementptr inbounds [[STRUCT_NODE]], ptr [[NODE_017]], i32 0, i32 6
+; CHECK-NEXT:    store i32 [[ADD_SINK]], ptr [[TMP3]], align 4
+; CHECK-NEXT:    ret void
+;
 entry:
   %node.0.in16 = getelementptr inbounds %struct.node, ptr %r, i64 0, i32 2
   %node.017 = load ptr, ptr %node.0.in16, align 8
@@ -16,27 +42,21 @@ entry:
   %cmp = icmp slt i32 %0, 0
   br i1 %cmp, label %if.then, label %if.else
 
-; CHECK: if.then
 if.then:                                          ; preds = %entry
   %1 = load i32, ptr %index.addr, align 4
   %p1 = getelementptr inbounds %struct.node, ptr %node.017, i32 0, i32 6
-  ; CHECK-NOT: store i32
   store i32 %1, ptr %p1, align 4
   br label %if.end
 
-; CHECK: if.else
 if.else:                                          ; preds = %entry
   %2 = load i32, ptr %index.addr, align 4
   %add = add nsw i32 %2, 1
   %p2 = getelementptr inbounds %struct.node, ptr %node.017, i32 0, i32 6
   store i32 %add, ptr %p2, align 4
   %p3 = getelementptr inbounds %struct.node, ptr %node.017, i32 5, i32 6
-  ; CHECK: store i32
   store i32 %add, ptr %p3, align 4  			  ; This is not a barrier
   br label %if.end
 
-; CHECK: if.end
 if.end:                                           ; preds = %if.else, %if.then
-; CHECK: store
   ret void
 }

diff  --git a/llvm/test/Transforms/MergedLoadStoreMotion/st_sink_with_barrier.ll b/llvm/test/Transforms/MergedLoadStoreMotion/st_sink_with_barrier.ll
index 3c96603d89736f..a741e5cd5aa93e 100644
--- a/llvm/test/Transforms/MergedLoadStoreMotion/st_sink_with_barrier.ll
+++ b/llvm/test/Transforms/MergedLoadStoreMotion/st_sink_with_barrier.ll
@@ -1,11 +1,38 @@
-; Test to make sure that load from the same address as a store and appears after the store prevents the store from being sunk
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 2
 ; RUN: opt -passes=mldst-motion -S < %s | FileCheck %s
 target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
 
+; Test to make sure that load from the same address as a store and appears after the store prevents the store from being sunk
+
 %struct.node = type { i32, ptr, ptr, ptr, i32, i32, i32, i32 }
 
-; Function Attrs: nounwind uwtable
 define void @sink_store(ptr nocapture %r, i32 %index) {
+; CHECK-LABEL: define void @sink_store
+; CHECK-SAME: (ptr nocapture [[R:%.*]], i32 [[INDEX:%.*]]) {
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[NODE_0_IN16:%.*]] = getelementptr inbounds [[STRUCT_NODE:%.*]], ptr [[R]], i64 0, i32 2
+; CHECK-NEXT:    [[NODE_017:%.*]] = load ptr, ptr [[NODE_0_IN16]], align 8
+; CHECK-NEXT:    [[INDEX_ADDR:%.*]] = alloca i32, align 4
+; CHECK-NEXT:    store i32 [[INDEX]], ptr [[INDEX_ADDR]], align 4
+; CHECK-NEXT:    [[TMP0:%.*]] = load i32, ptr [[INDEX_ADDR]], align 4
+; CHECK-NEXT:    [[CMP:%.*]] = icmp slt i32 [[TMP0]], 0
+; CHECK-NEXT:    br i1 [[CMP]], label [[IF_THEN:%.*]], label [[IF_ELSE:%.*]]
+; CHECK:       if.then:
+; CHECK-NEXT:    [[TMP1:%.*]] = load i32, ptr [[INDEX_ADDR]], align 4
+; CHECK-NEXT:    [[P1:%.*]] = getelementptr inbounds [[STRUCT_NODE]], ptr [[NODE_017]], i32 0, i32 6
+; CHECK-NEXT:    store i32 [[TMP1]], ptr [[P1]], align 4
+; CHECK-NEXT:    [[P2:%.*]] = getelementptr inbounds [[STRUCT_NODE]], ptr [[NODE_017]], i32 0, i32 6
+; CHECK-NEXT:    [[BARRIER:%.*]] = load i32, ptr [[P2]], align 4
+; CHECK-NEXT:    br label [[IF_END:%.*]]
+; CHECK:       if.else:
+; CHECK-NEXT:    [[TMP2:%.*]] = load i32, ptr [[INDEX_ADDR]], align 4
+; CHECK-NEXT:    [[ADD:%.*]] = add nsw i32 [[TMP2]], 1
+; CHECK-NEXT:    [[P3:%.*]] = getelementptr inbounds [[STRUCT_NODE]], ptr [[NODE_017]], i32 0, i32 6
+; CHECK-NEXT:    store i32 [[ADD]], ptr [[P3]], align 4
+; CHECK-NEXT:    br label [[IF_END]]
+; CHECK:       if.end:
+; CHECK-NEXT:    ret void
+;
 entry:
   %node.0.in16 = getelementptr inbounds %struct.node, ptr %r, i64 0, i32 2
   %node.017 = load ptr, ptr %node.0.in16, align 8
@@ -15,28 +42,21 @@ entry:
   %cmp = icmp slt i32 %0, 0
   br i1 %cmp, label %if.then, label %if.else
 
-; CHECK: if.then
 if.then:                                          ; preds = %entry
   %1 = load i32, ptr %index.addr, align 4
   %p1 = getelementptr inbounds %struct.node, ptr %node.017, i32 0, i32 6
-  ; CHECK: store i32
   store i32 %1, ptr %p1, align 4
   %p2 = getelementptr inbounds %struct.node, ptr %node.017, i32 0, i32 6
-  ; CHECK: load i32, ptr
   %barrier = load i32 , ptr %p2, align 4
   br label %if.end
 
-; CHECK: if.else
 if.else:                                          ; preds = %entry
   %2 = load i32, ptr %index.addr, align 4
   %add = add nsw i32 %2, 1
   %p3 = getelementptr inbounds %struct.node, ptr %node.017, i32 0, i32 6
-  ; CHECK: store i32
   store i32 %add, ptr %p3, align 4
   br label %if.end
 
-; CHECK: if.end
 if.end:                                           ; preds = %if.else, %if.then
-; CHECK-NOT: store
   ret void
 }


        


More information about the llvm-commits mailing list