[llvm-commits] CVS: llvm/test/Transforms/Reassociate/mul-factor3.ll mulfactor2.ll shift-factor.ll

[Reid Spencer]

Changes in directory llvm/test/Transforms/Reassociate:

mul-factor3.ll updated: 1.2 -> 1.3
mulfactor2.ll updated: 1.3 -> 1.4
shift-factor.ll updated: 1.2 -> 1.3
---
Log message:

For PR1319: http://llvm.org/PR1319 :
Remove && from the end of the lines to prevent tests from throwing run
lines into the background. Also, clean up places where the same command
is run multiple times by using a temporary file.


---
Diffs of the changes:  (+13 -6)

 mul-factor3.ll  |    6 ++++--
 mulfactor2.ll   |    7 +++++--
 shift-factor.ll |    6 ++++--
 3 files changed, 13 insertions(+), 6 deletions(-)


Index: llvm/test/Transforms/Reassociate/mul-factor3.ll
diff -u llvm/test/Transforms/Reassociate/mul-factor3.ll:1.2 llvm/test/Transforms/Reassociate/mul-factor3.ll:1.3
--- llvm/test/Transforms/Reassociate/mul-factor3.ll:1.2	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/Reassociate/mul-factor3.ll	Mon Apr 16 12:36:08 2007
@@ -1,7 +1,9 @@
 ; This should be one add and two multiplies.
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep mul | wc -l | grep 2 &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep add | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | \
+; RUN:   opt -reassociate -instcombine | llvm-dis > %t 
+; RUN: grep mul %t | wc -l | grep 2
+; RUN: grep add %t | wc -l | grep 1
 
 int %test(int %A, int %B, int %C) {
 	%aa = mul int %A, %A


Index: llvm/test/Transforms/Reassociate/mulfactor2.ll
diff -u llvm/test/Transforms/Reassociate/mulfactor2.ll:1.3 llvm/test/Transforms/Reassociate/mulfactor2.ll:1.4
--- llvm/test/Transforms/Reassociate/mulfactor2.ll:1.3	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/Reassociate/mulfactor2.ll	Mon Apr 16 12:36:08 2007
@@ -1,7 +1,10 @@
 ; This should turn into one multiply and one add.
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -reassociate -instcombine | llvm-dis | grep mul | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -reassociate -instcombine | llvm-dis | grep add | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | \
+; RUN:   opt -instcombine -reassociate -instcombine | llvm-dis -o %t 
+; RUN: grep mul %t | wc -l | grep 1
+; RUN: grep add %t | wc -l | grep 1
+
 int %main(int %t) {
         %tmp.3 = mul int %t, 12         ; <int> [#uses=1]
         %tmp.4 = add int %tmp.3, 5              ; <int> [#uses=1]


Index: llvm/test/Transforms/Reassociate/shift-factor.ll
diff -u llvm/test/Transforms/Reassociate/shift-factor.ll:1.2 llvm/test/Transforms/Reassociate/shift-factor.ll:1.3
--- llvm/test/Transforms/Reassociate/shift-factor.ll:1.2	Fri Dec  1 22:23:10 2006
+++ llvm/test/Transforms/Reassociate/shift-factor.ll	Mon Apr 16 12:36:08 2007
@@ -1,6 +1,8 @@
 ; There should be exactly one shift and one add left.
-; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep shl | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep add | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | \
+; RUN:   opt -reassociate -instcombine | llvm-dis > %t  
+; RUN: grep shl %t | wc -l | grep 1
+; RUN: grep add %t | wc -l | grep 1
 
 int %test(int %X, int %Y) {
         %tmp.2 = shl int %X, ubyte 1            ; <int> [#uses=1]