Add default JIT LIT variable.

Patch by David Tweed!

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

diff --git a/test/Analysis/Profiling/load-branch-weights-ifs.ll b/test/Analysis/Profiling/load-branch-weights-ifs.ll
index ddbaf96916cfa37c08a47a8064a54d21900b1193..7ed090b7c366a8487dd23c3572b77bdf6a14c551 100644 (file)
--- a/test/Analysis/Profiling/load-branch-weights-ifs.ll
+++ b/test/Analysis/Profiling/load-branch-weights-ifs.ll
@@ -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

diff --git a/test/Analysis/Profiling/load-branch-weights-loops.ll b/test/Analysis/Profiling/load-branch-weights-loops.ll
index 476f377b47a89d23588c253aa4857e5f834de272..9d1925a2d70161bc9addda3a5d18aad3ce5ccaea 100644 (file)
--- a/test/Analysis/Profiling/load-branch-weights-loops.ll
+++ b/test/Analysis/Profiling/load-branch-weights-loops.ll
@@ -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

diff --git a/test/Analysis/Profiling/load-branch-weights-switches.ll b/test/Analysis/Profiling/load-branch-weights-switches.ll
index be11f040a76d137144c27a1b81f43c3f6bf2ba50..5587c7172bb6c3d7579c8069bc5b7cfd81cf5730 100644 (file)
--- a/test/Analysis/Profiling/load-branch-weights-switches.ll
+++ b/test/Analysis/Profiling/load-branch-weights-switches.ll
@@ -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

diff --git a/test/lit.cfg b/test/lit.cfg
index 6f44bb3d8c668f2141debf37b5e4dc6157e3eafb..b7c5f3ef38c6af1ff705f6a1d60254019048b377 100644 (file)
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -143,6 +143,11 @@ if config.test_exec_root is None:
 # 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':