rename some tests to be more uniform in naming convention.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@60988 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Transforms/GVN/bitcast-of-call.ll b/test/Transforms/GVN/bitcast-of-call.ll
new file mode 100644 (file)
index 0000000..0a045c8
--- /dev/null
+++ b/test/Transforms/GVN/bitcast-of-call.ll
@@ -0,0 +1,12 @@
+; RUN: llvm-as < %s | opt -gvn | llvm-dis | not grep tmp2
+; PR2213
+
+define i32* @f(i8* %x) {
+entry:
+        %tmp = call i8* @m( i32 12 )            ; <i8*> [#uses=2]
+        %tmp1 = bitcast i8* %tmp to i32*                ; <i32*> [#uses=0]
+        %tmp2 = bitcast i8* %tmp to i32*                ; <i32*> [#uses=0]
+        ret i32* %tmp2
+}
+
+declare i8* @m(i32)

diff --git a/test/Transforms/GVN/call.ll b/test/Transforms/GVN/call.ll
deleted file mode 100644 (file)
index 0a045c8..0000000
--- a/test/Transforms/GVN/call.ll
+++ /dev/null
@@ -1,12 +0,0 @@
-; RUN: llvm-as < %s | opt -gvn | llvm-dis | not grep tmp2
-; PR2213
-
-define i32* @f(i8* %x) {
-entry:
-        %tmp = call i8* @m( i32 12 )            ; <i8*> [#uses=2]
-        %tmp1 = bitcast i8* %tmp to i32*                ; <i32*> [#uses=0]
-        %tmp2 = bitcast i8* %tmp to i32*                ; <i32*> [#uses=0]
-        ret i32* %tmp2
-}
-
-declare i8* @m(i32)

diff --git a/test/Transforms/GVN/calls-nonlocal.ll b/test/Transforms/GVN/calls-nonlocal.ll
new file mode 100644 (file)
index 0000000..0d1c8a3
--- /dev/null
+++ b/test/Transforms/GVN/calls-nonlocal.ll
@@ -0,0 +1,49 @@
+; RUN: llvm-as < %s | opt -gvn | llvm-dis | grep strlen | count 2
+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-darwin9"
+
+define i32 @test(i32 %g, i8* %P) nounwind  {
+entry:
+       %tmp2 = call i32 @strlen( i8* %P ) nounwind readonly            ; <i32> [#uses=1]
+       %tmp3 = icmp eq i32 %tmp2, 100          ; <i1> [#uses=1]
+       %tmp34 = zext i1 %tmp3 to i8            ; <i8> [#uses=1]
+       %toBool = icmp ne i8 %tmp34, 0          ; <i1> [#uses=1]
+       br i1 %toBool, label %bb, label %bb6
+
+bb:            ; preds = %entry
+       br label %bb27
+
+bb6:           ; preds = %entry
+       %tmp8 = add i32 %g, 42          ; <i32> [#uses=2]
+       %tmp10 = call i32 @strlen( i8* %P ) nounwind readonly           ; <i32> [#uses=1]
+       %tmp11 = icmp eq i32 %tmp10, 100                ; <i1> [#uses=1]
+       %tmp1112 = zext i1 %tmp11 to i8         ; <i8> [#uses=1]
+       %toBool13 = icmp ne i8 %tmp1112, 0              ; <i1> [#uses=1]
+       br i1 %toBool13, label %bb14, label %bb16
+
+bb14:          ; preds = %bb6
+       br label %bb27
+
+bb16:          ; preds = %bb6
+       %tmp18 = mul i32 %tmp8, 2               ; <i32> [#uses=1]
+       %tmp20 = call i32 @strlen( i8* %P ) nounwind readonly           ; <i32> [#uses=1]
+       %tmp21 = icmp eq i32 %tmp20, 100                ; <i1> [#uses=1]
+       %tmp2122 = zext i1 %tmp21 to i8         ; <i8> [#uses=1]
+       %toBool23 = icmp ne i8 %tmp2122, 0              ; <i1> [#uses=1]
+       br i1 %toBool23, label %bb24, label %bb26
+
+bb24:          ; preds = %bb16
+       br label %bb27
+
+bb26:          ; preds = %bb16
+       br label %bb27
+
+bb27:          ; preds = %bb26, %bb24, %bb14, %bb
+       %tmp.0 = phi i32 [ 11, %bb26 ], [ %tmp18, %bb24 ], [ %tmp8, %bb14 ], [ %g, %bb ]                ; <i32> [#uses=1]
+       br label %return
+
+return:                ; preds = %bb27
+       ret i32 %tmp.0
+}
+
+declare i32 @strlen(i8*) nounwind readonly 

diff --git a/test/Transforms/GVN/calls-readonly.ll b/test/Transforms/GVN/calls-readonly.ll
new file mode 100644 (file)
index 0000000..723ef77
--- /dev/null
+++ b/test/Transforms/GVN/calls-readonly.ll
@@ -0,0 +1,29 @@
+; RUN: llvm-as < %s | opt -basicaa -gvn | llvm-dis | grep {call.*strlen} | count 1
+; Should delete the second call to strlen even though the intervening strchr call exists.
+
+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-darwin7"
+
+define i8* @test(i8* %P, i8* %Q, i32 %x, i32 %y) nounwind readonly {
+entry:
+       %0 = tail call i32 @strlen(i8* %P) nounwind readonly            ; <i32> [#uses=2]
+       %1 = icmp eq i32 %0, 0          ; <i1> [#uses=1]
+       br i1 %1, label %bb, label %bb1
+
+bb:            ; preds = %entry
+       %2 = sdiv i32 %x, %y            ; <i32> [#uses=1]
+       br label %bb1
+
+bb1:           ; preds = %bb, %entry
+       %x_addr.0 = phi i32 [ %2, %bb ], [ %x, %entry ]         ; <i32> [#uses=1]
+       %3 = tail call i8* @strchr(i8* %Q, i32 97) nounwind readonly            ; <i8*> [#uses=1]
+       %4 = tail call i32 @strlen(i8* %P) nounwind readonly            ; <i32> [#uses=1]
+       %5 = add i32 %x_addr.0, %0              ; <i32> [#uses=1]
+       %.sum = sub i32 %5, %4          ; <i32> [#uses=1]
+       %6 = getelementptr i8* %3, i32 %.sum            ; <i8*> [#uses=1]
+       ret i8* %6
+}
+
+declare i32 @strlen(i8*) nounwind readonly
+
+declare i8* @strchr(i8*, i32) nounwind readonly

diff --git a/test/Transforms/GVN/dominated.ll b/test/Transforms/GVN/dominated.ll
deleted file mode 100644 (file)
index d7c9417..0000000
--- a/test/Transforms/GVN/dominated.ll
+++ /dev/null
@@ -1,20 +0,0 @@
-; RUN: llvm-as < %s | opt -gvn | llvm-dis | not grep DEAD
-
-define i32 @main(i32** %p) {
-block1:
-  %z = load i32** %p
-       br i1 true, label %block2, label %block3
-
-block2:
- %a = load i32** %p
- br label %block4
-
-block3:
-  %b = load i32** %p
-  br label %block4
-
-block4:
-  %DEAD = load i32** %p
-  %c = load i32* %DEAD
-  ret i32 %c
-}

diff --git a/test/Transforms/GVN/lpre-basic.ll b/test/Transforms/GVN/lpre-basic.ll
new file mode 100644 (file)
index 0000000..5b52863
--- /dev/null
+++ b/test/Transforms/GVN/lpre-basic.ll
@@ -0,0 +1,18 @@
+; RUN: llvm-as < %s | opt -gvn -enable-load-pre | llvm-dis | grep {%PRE = phi}
+
+define i32 @test(i32* %p, i1 %C) {
+block1:
+       br i1 %C, label %block2, label %block3
+
+block2:
+ br label %block4
+
+block3:
+  %b = bitcast i32 0 to i32
+  store i32 %b, i32* %p
+  br label %block4
+
+block4:
+  %PRE = load i32* %p
+  ret i32 %PRE
+}

diff --git a/test/Transforms/GVN/nonlocal-cse.ll b/test/Transforms/GVN/nonlocal-cse.ll
deleted file mode 100644 (file)
index 0d1c8a3..0000000
--- a/test/Transforms/GVN/nonlocal-cse.ll
+++ /dev/null
@@ -1,49 +0,0 @@
-; RUN: llvm-as < %s | opt -gvn | llvm-dis | grep strlen | count 2
-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-darwin9"
-
-define i32 @test(i32 %g, i8* %P) nounwind  {
-entry:
-       %tmp2 = call i32 @strlen( i8* %P ) nounwind readonly            ; <i32> [#uses=1]
-       %tmp3 = icmp eq i32 %tmp2, 100          ; <i1> [#uses=1]
-       %tmp34 = zext i1 %tmp3 to i8            ; <i8> [#uses=1]
-       %toBool = icmp ne i8 %tmp34, 0          ; <i1> [#uses=1]
-       br i1 %toBool, label %bb, label %bb6
-
-bb:            ; preds = %entry
-       br label %bb27
-
-bb6:           ; preds = %entry
-       %tmp8 = add i32 %g, 42          ; <i32> [#uses=2]
-       %tmp10 = call i32 @strlen( i8* %P ) nounwind readonly           ; <i32> [#uses=1]
-       %tmp11 = icmp eq i32 %tmp10, 100                ; <i1> [#uses=1]
-       %tmp1112 = zext i1 %tmp11 to i8         ; <i8> [#uses=1]
-       %toBool13 = icmp ne i8 %tmp1112, 0              ; <i1> [#uses=1]
-       br i1 %toBool13, label %bb14, label %bb16
-
-bb14:          ; preds = %bb6
-       br label %bb27
-
-bb16:          ; preds = %bb6
-       %tmp18 = mul i32 %tmp8, 2               ; <i32> [#uses=1]
-       %tmp20 = call i32 @strlen( i8* %P ) nounwind readonly           ; <i32> [#uses=1]
-       %tmp21 = icmp eq i32 %tmp20, 100                ; <i1> [#uses=1]
-       %tmp2122 = zext i1 %tmp21 to i8         ; <i8> [#uses=1]
-       %toBool23 = icmp ne i8 %tmp2122, 0              ; <i1> [#uses=1]
-       br i1 %toBool23, label %bb24, label %bb26
-
-bb24:          ; preds = %bb16
-       br label %bb27
-
-bb26:          ; preds = %bb16
-       br label %bb27
-
-bb27:          ; preds = %bb26, %bb24, %bb14, %bb
-       %tmp.0 = phi i32 [ 11, %bb26 ], [ %tmp18, %bb24 ], [ %tmp8, %bb14 ], [ %g, %bb ]                ; <i32> [#uses=1]
-       br label %return
-
-return:                ; preds = %bb27
-       ret i32 %tmp.0
-}
-
-declare i32 @strlen(i8*) nounwind readonly 

diff --git a/test/Transforms/GVN/nonlocal.ll b/test/Transforms/GVN/nonlocal.ll
deleted file mode 100644 (file)
index 1618d05..0000000
--- a/test/Transforms/GVN/nonlocal.ll
+++ /dev/null
@@ -1,19 +0,0 @@
-; RUN: llvm-as < %s | opt -gvn | llvm-dis | not grep {DEAD =}
-
-define i32 @main(i32** %p) {
-block1:
-       br i1 true, label %block2, label %block3
-
-block2:
- %a = load i32** %p
- br label %block4
-
-block3:
-  %b = load i32** %p
-  br label %block4
-
-block4:
-  %DEAD = load i32** %p
-  %c = load i32* %DEAD
-  ret i32 %c
-}

diff --git a/test/Transforms/GVN/pre-basic-add.ll b/test/Transforms/GVN/pre-basic-add.ll
new file mode 100644 (file)
index 0000000..f00bda3
--- /dev/null
+++ b/test/Transforms/GVN/pre-basic-add.ll
@@ -0,0 +1,27 @@
+; RUN: llvm-as < %s | opt -gvn -enable-pre | llvm-dis | grep {.pre}
+
+@H = common global i32 0               ; <i32*> [#uses=2]
+@G = common global i32 0               ; <i32*> [#uses=1]
+
+define i32 @test() nounwind {
+entry:
+       %0 = load i32* @H, align 4              ; <i32> [#uses=2]
+       %1 = call i32 (...)* @foo() nounwind            ; <i32> [#uses=1]
+       %2 = icmp ne i32 %1, 0          ; <i1> [#uses=1]
+       br i1 %2, label %bb, label %bb1
+
+bb:            ; preds = %entry
+       %3 = add i32 %0, 42             ; <i32> [#uses=1]
+       store i32 %3, i32* @G, align 4
+       br label %bb1
+
+bb1:           ; preds = %bb, %entry
+       %4 = add i32 %0, 42             ; <i32> [#uses=1]
+       store i32 %4, i32* @H, align 4
+       br label %return
+
+return:                ; preds = %bb1
+       ret i32 0
+}
+
+declare i32 @foo(...)

diff --git a/test/Transforms/GVN/pre-load.ll b/test/Transforms/GVN/pre-load.ll
deleted file mode 100644 (file)
index 5b52863..0000000
--- a/test/Transforms/GVN/pre-load.ll
+++ /dev/null
@@ -1,18 +0,0 @@
-; RUN: llvm-as < %s | opt -gvn -enable-load-pre | llvm-dis | grep {%PRE = phi}
-
-define i32 @test(i32* %p, i1 %C) {
-block1:
-       br i1 %C, label %block2, label %block3
-
-block2:
- br label %block4
-
-block3:
-  %b = bitcast i32 0 to i32
-  store i32 %b, i32* %p
-  br label %block4
-
-block4:
-  %PRE = load i32* %p
-  ret i32 %PRE
-}

diff --git a/test/Transforms/GVN/pre.ll b/test/Transforms/GVN/pre.ll
deleted file mode 100644 (file)
index f00bda3..0000000
--- a/test/Transforms/GVN/pre.ll
+++ /dev/null
@@ -1,27 +0,0 @@
-; RUN: llvm-as < %s | opt -gvn -enable-pre | llvm-dis | grep {.pre}
-
-@H = common global i32 0               ; <i32*> [#uses=2]
-@G = common global i32 0               ; <i32*> [#uses=1]
-
-define i32 @test() nounwind {
-entry:
-       %0 = load i32* @H, align 4              ; <i32> [#uses=2]
-       %1 = call i32 (...)* @foo() nounwind            ; <i32> [#uses=1]
-       %2 = icmp ne i32 %1, 0          ; <i1> [#uses=1]
-       br i1 %2, label %bb, label %bb1
-
-bb:            ; preds = %entry
-       %3 = add i32 %0, 42             ; <i32> [#uses=1]
-       store i32 %3, i32* @G, align 4
-       br label %bb1
-
-bb1:           ; preds = %bb, %entry
-       %4 = add i32 %0, 42             ; <i32> [#uses=1]
-       store i32 %4, i32* @H, align 4
-       br label %return
-
-return:                ; preds = %bb1
-       ret i32 0
-}
-
-declare i32 @foo(...)

diff --git a/test/Transforms/GVN/readonly-calls.ll b/test/Transforms/GVN/readonly-calls.ll
deleted file mode 100644 (file)
index 723ef77..0000000
--- a/test/Transforms/GVN/readonly-calls.ll
+++ /dev/null
@@ -1,29 +0,0 @@
-; RUN: llvm-as < %s | opt -basicaa -gvn | llvm-dis | grep {call.*strlen} | count 1
-; Should delete the second call to strlen even though the intervening strchr call exists.
-
-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-darwin7"
-
-define i8* @test(i8* %P, i8* %Q, i32 %x, i32 %y) nounwind readonly {
-entry:
-       %0 = tail call i32 @strlen(i8* %P) nounwind readonly            ; <i32> [#uses=2]
-       %1 = icmp eq i32 %0, 0          ; <i1> [#uses=1]
-       br i1 %1, label %bb, label %bb1
-
-bb:            ; preds = %entry
-       %2 = sdiv i32 %x, %y            ; <i32> [#uses=1]
-       br label %bb1
-
-bb1:           ; preds = %bb, %entry
-       %x_addr.0 = phi i32 [ %2, %bb ], [ %x, %entry ]         ; <i32> [#uses=1]
-       %3 = tail call i8* @strchr(i8* %Q, i32 97) nounwind readonly            ; <i8*> [#uses=1]
-       %4 = tail call i32 @strlen(i8* %P) nounwind readonly            ; <i32> [#uses=1]
-       %5 = add i32 %x_addr.0, %0              ; <i32> [#uses=1]
-       %.sum = sub i32 %5, %4          ; <i32> [#uses=1]
-       %6 = getelementptr i8* %3, i32 %.sum            ; <i8*> [#uses=1]
-       ret i8* %6
-}
-
-declare i32 @strlen(i8*) nounwind readonly
-
-declare i8* @strchr(i8*, i32) nounwind readonly

diff --git a/test/Transforms/GVN/rle-dominated.ll b/test/Transforms/GVN/rle-dominated.ll
new file mode 100644 (file)
index 0000000..d7c9417
--- /dev/null
+++ b/test/Transforms/GVN/rle-dominated.ll
@@ -0,0 +1,20 @@
+; RUN: llvm-as < %s | opt -gvn | llvm-dis | not grep DEAD
+
+define i32 @main(i32** %p) {
+block1:
+  %z = load i32** %p
+       br i1 true, label %block2, label %block3
+
+block2:
+ %a = load i32** %p
+ br label %block4
+
+block3:
+  %b = load i32** %p
+  br label %block4
+
+block4:
+  %DEAD = load i32** %p
+  %c = load i32* %DEAD
+  ret i32 %c
+}

diff --git a/test/Transforms/GVN/rle-nonlocal.ll b/test/Transforms/GVN/rle-nonlocal.ll
new file mode 100644 (file)
index 0000000..1618d05
--- /dev/null
+++ b/test/Transforms/GVN/rle-nonlocal.ll
@@ -0,0 +1,19 @@
+; RUN: llvm-as < %s | opt -gvn | llvm-dis | not grep {DEAD =}
+
+define i32 @main(i32** %p) {
+block1:
+       br i1 true, label %block2, label %block3
+
+block2:
+ %a = load i32** %p
+ br label %block4
+
+block3:
+  %b = load i32** %p
+  br label %block4
+
+block4:
+  %DEAD = load i32** %p
+  %c = load i32* %DEAD
+  ret i32 %c
+}

diff --git a/test/Transforms/GVN/rle-semidominated.ll b/test/Transforms/GVN/rle-semidominated.ll
new file mode 100644 (file)
index 0000000..95ee56a
--- /dev/null
+++ b/test/Transforms/GVN/rle-semidominated.ll
@@ -0,0 +1,19 @@
+; RUN: llvm-as < %s | opt -gvn | llvm-dis | not grep {DEAD =}
+
+define i32 @main(i32* %p) {
+block1:
+  %z = load i32* %p
+       br i1 true, label %block2, label %block3
+
+block2:
+ br label %block4
+
+block3:
+  %b = bitcast i32 0 to i32
+  store i32 %b, i32* %p
+  br label %block4
+
+block4:
+  %DEAD = load i32* %p
+  ret i32 %DEAD
+}

diff --git a/test/Transforms/GVN/semidominated.ll b/test/Transforms/GVN/semidominated.ll
deleted file mode 100644 (file)
index 95ee56a..0000000
--- a/test/Transforms/GVN/semidominated.ll
+++ /dev/null
@@ -1,19 +0,0 @@
-; RUN: llvm-as < %s | opt -gvn | llvm-dis | not grep {DEAD =}
-
-define i32 @main(i32* %p) {
-block1:
-  %z = load i32* %p
-       br i1 true, label %block2, label %block3
-
-block2:
- br label %block4
-
-block3:
-  %b = bitcast i32 0 to i32
-  store i32 %b, i32* %p
-  br label %block4
-
-block4:
-  %DEAD = load i32* %p
-  ret i32 %DEAD
-}