X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2Flib%2Fllvm2cpp.exp;h=d8a65ffc4bece2efc48fa2eb05eabec31fd5d536;hb=84701836bfb1889e2e26e361ebd5d29d972ab396;hp=b4141acabd6a854d0c1d941dbb1e99416c5cdbd8;hpb=0aac889d71f1800846ce0b1c828ba6755c6512f3;p=oota-llvm.git

diff --git a/test/lib/llvm2cpp.exp b/test/lib/llvm2cpp.exp
index b4141acabd6..d8a65ffc4be 100644
--- a/test/lib/llvm2cpp.exp
+++ b/test/lib/llvm2cpp.exp
@@ -9,10 +9,9 @@ proc llvm2cpp-test { files } {
   global subdir llvmtoolsdir llvmlibsdir objdir srcdir objroot srcroot 
   set timeout 30
   set path [file join $objdir $subdir]
-  set llvm2cpp [file join $llvmtoolsdir llvm2cpp ]
+  set llc [file join $llvmtoolsdir llc ]
   set llvmas [file join $llvmtoolsdir llvm-as ]
   set llvmdis [file join $llvmtoolsdir llvm-dis ]
-  set llvmupgrade [ file join $llvmtoolsdir llvm-upgrade ]
 
   #Make Output Directory if it does not exist already
   if { [file exists path] } {
@@ -46,22 +45,10 @@ proc llvm2cpp-test { files } {
       continue;
     }
 
-    # Scan the test file to see if there's a line with "lvm-upgrade" in it. 
-    # If so, run llvm-upgrade first or else llvm-as will fail on it.
+    # Run llvm-as/llvm-dis
+    set pipeline llvm-as|llvm-dis
     set retval [ catch { 
-      exec -keepnewline grep llvm-upgrade $test 2>/dev/null } msg ]
-
-    if { $retval == 0 } {
-      # In this case we must run llvm-upgrade before llvm-as
-      set pipeline llvm-upgrade|llvm-as|llvm-dis
-      set retval [ catch { 
-        exec -keepnewline $llvmupgrade < $test -o - | $llvmas | $llvmdis -f -o $assembly 2>/dev/null } msg ]
-    } else {
-      # llvm-upgrade not necessary, just llvm-as/llvm-dis
-      set pipeline llvm-as|llvm-dis
-      set retval [ catch { 
-        exec -keepnewline $llvmas < $test -o - | $llvmdis -f -o $assembly 2>/dev/null } msg ]
-    }
+      exec -keepnewline $llvmas < $test -o - | $llvmdis -f -o $assembly 2>/dev/null } msg ]
 
     if { $retval != 0 } {
       fail "$test: $pipeline returned $retval\n$msg"
@@ -78,7 +65,7 @@ proc llvm2cpp-test { files } {
     }
 
     set retval [ catch { 
-      exec -keepnewline $llvm2cpp -f -o $generated < $bytecode 2>/dev/null } msg]
+      exec -keepnewline $llc -march=cpp -f -o $generated < $bytecode 2>/dev/null } msg]
 
     if { $retval != 0 } {
       fail "$test: llvm2cpp returned $retval\n$msg"