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] } {
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 -o $assembly 2>/dev/null } msg ]
if { $retval != 0 } {
fail "$test: $pipeline returned $retval\n$msg"
}
set retval [ catch {
- exec -keepnewline $llvm2cpp -f -o $generated < $bytecode 2>/dev/null } msg]
+ exec -keepnewline $llc -march=cpp -o $generated < $bytecode 2>/dev/null } msg]
if { $retval != 0 } {
fail "$test: llvm2cpp returned $retval\n$msg"
}
set retval [ catch {
- exec -keepnewline gcc -g -D__STDC_LIMIT_MACROS -o $executable $generated -I$srcroot/include -I$objroot/include -L$llvmlibsdir -lLLVMCore -lLLVMSupport -lLLVMbzip2 -lLLVMSystem -lstdc++ } msg ]
+ exec -keepnewline gcc -g -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -o $executable $generated -I$srcroot/include -I$objroot/include -L$llvmlibsdir -lLLVMCore -lLLVMSupport -lLLVMSystem -lstdc++ } msg ]
if { $retval != 0 } {
fail "$test: gcc returned $retval\n$msg"
continue