[llvm-commits] [llvm] r164996 - in /llvm/trunk/test: Analysis/Profiling/load-branch-weights-ifs.ll Analysis/Profiling/load-branch-weights-loops.ll Analysis/Profiling/load-branch-weights-switches.ll lit.cfg

[James Molloy]

Author: jamesm
Date: Tue Oct  2 05:57:08 2012
New Revision: 164996

URL: http://llvm.org/viewvc/llvm-project?rev=164996&view=rev
Log:
Add default JIT LIT variable.

Patch by David Tweed!


Modified:
    llvm/trunk/test/Analysis/Profiling/load-branch-weights-ifs.ll
    llvm/trunk/test/Analysis/Profiling/load-branch-weights-loops.ll
    llvm/trunk/test/Analysis/Profiling/load-branch-weights-switches.ll
    llvm/trunk/test/lit.cfg

Modified: llvm/trunk/test/Analysis/Profiling/load-branch-weights-ifs.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/Profiling/load-branch-weights-ifs.ll?rev=164996&r1=164995&r2=164996&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/Profiling/load-branch-weights-ifs.ll (original)
+++ llvm/trunk/test/Analysis/Profiling/load-branch-weights-ifs.ll Tue Oct  2 05:57:08 2012
@@ -1,6 +1,6 @@
 ; RUN: opt -insert-edge-profiling -o %t1 < %s
 ; RUN: rm -f %t1.prof_data
-; RUN: lli -load %llvmshlibdir/libprofile_rt%shlibext %t1 \
+; RUN: lli %defaultjit -load %llvmshlibdir/libprofile_rt%shlibext %t1 \
 ; RUN:     -llvmprof-output %t1.prof_data
 ; RUN: opt -profile-file %t1.prof_data -profile-metadata-loader -S -o - < %s \
 ; RUN:     | FileCheck %s

Modified: llvm/trunk/test/Analysis/Profiling/load-branch-weights-loops.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/Profiling/load-branch-weights-loops.ll?rev=164996&r1=164995&r2=164996&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/Profiling/load-branch-weights-loops.ll (original)
+++ llvm/trunk/test/Analysis/Profiling/load-branch-weights-loops.ll Tue Oct  2 05:57:08 2012
@@ -1,6 +1,6 @@
 ; RUN: opt -insert-edge-profiling -o %t1 < %s
 ; RUN: rm -f %t1.prof_data
-; RUN: lli -load %llvmshlibdir/libprofile_rt%shlibext %t1 \
+; RUN: lli %defaultjit -load %llvmshlibdir/libprofile_rt%shlibext %t1 \
 ; RUN:     -llvmprof-output %t1.prof_data
 ; RUN: opt -profile-file %t1.prof_data -profile-metadata-loader -S -o - < %s \
 ; RUN:     | FileCheck %s

Modified: llvm/trunk/test/Analysis/Profiling/load-branch-weights-switches.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/Profiling/load-branch-weights-switches.ll?rev=164996&r1=164995&r2=164996&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/Profiling/load-branch-weights-switches.ll (original)
+++ llvm/trunk/test/Analysis/Profiling/load-branch-weights-switches.ll Tue Oct  2 05:57:08 2012
@@ -1,6 +1,6 @@
 ; RUN: opt -insert-edge-profiling -o %t1 < %s
 ; RUN: rm -f %t1.prof_data
-; RUN: lli -load %llvmshlibdir/libprofile_rt%shlibext %t1 \
+; RUN: lli %defaultjit -load %llvmshlibdir/libprofile_rt%shlibext %t1 \
 ; RUN:     -llvmprof-output %t1.prof_data
 ; RUN: opt -profile-file %t1.prof_data -profile-metadata-loader -S -o - < %s \
 ; RUN:     | FileCheck %s

Modified: llvm/trunk/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/lit.cfg?rev=164996&r1=164995&r2=164996&view=diff
==============================================================================
--- llvm/trunk/test/lit.cfg (original)
+++ llvm/trunk/test/lit.cfg Tue Oct  2 05:57:08 2012
@@ -143,6 +143,11 @@
 # triple so we can check it with XFAIL and XTARGET.
 config.target_triple += lit.valgrindTriple
 
+# Provide a substition for those tests that need to run the jit to obtain data
+# but simply want use the currently considered most reliable jit for platform
+defaultIsMCJIT='true' if 'arm' in config.target_triple else 'false'
+config.substitutions.append( ('%defaultjit', '-use-mcjit='+defaultIsMCJIT) )
+
 # Process jit implementation option
 jit_impl_cfg = lit.params.get('jit_impl', None)
 if jit_impl_cfg == 'mcjit':