From 858c62e51ee983e22915f748447ecef52b432851 Mon Sep 17 00:00:00 2001 From: Lang Hames Date: Mon, 23 Mar 2015 06:02:49 +0000 Subject: [PATCH] [Orc] Add missing -use-orcmcjit flag to a number of Orc regression tests. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@232931 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/ExecutionEngine/OrcJIT/2003-05-06-LivenessClobber.ll | 2 +- test/ExecutionEngine/OrcJIT/load-object-a.ll | 6 +++--- test/ExecutionEngine/OrcJIT/remote/cross-module-a.ll | 2 +- test/ExecutionEngine/OrcJIT/remote/cross-module-sm-pic-a.ll | 2 +- test/ExecutionEngine/OrcJIT/remote/multi-module-a.ll | 2 +- test/ExecutionEngine/OrcJIT/remote/multi-module-sm-pic-a.ll | 2 +- test/ExecutionEngine/OrcJIT/remote/simpletest-remote.ll | 2 +- test/ExecutionEngine/OrcJIT/remote/stubs-remote.ll | 2 +- test/ExecutionEngine/OrcJIT/remote/stubs-sm-pic.ll | 2 +- .../OrcJIT/remote/test-common-symbols-remote.ll | 2 +- .../ExecutionEngine/OrcJIT/remote/test-data-align-remote.ll | 2 +- .../OrcJIT/remote/test-fp-no-external-funcs-remote.ll | 2 +- .../OrcJIT/remote/test-global-init-nonzero-remote.ll | 2 +- .../OrcJIT/remote/test-global-init-nonzero-sm-pic.ll | 2 +- test/ExecutionEngine/OrcJIT/remote/test-ptr-reloc-remote.ll | 2 +- test/ExecutionEngine/OrcJIT/remote/test-ptr-reloc-sm-pic.ll | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/test/ExecutionEngine/OrcJIT/2003-05-06-LivenessClobber.ll b/test/ExecutionEngine/OrcJIT/2003-05-06-LivenessClobber.ll index d714bf7367b..dbb62e0bd26 100644 --- a/test/ExecutionEngine/OrcJIT/2003-05-06-LivenessClobber.ll +++ b/test/ExecutionEngine/OrcJIT/2003-05-06-LivenessClobber.ll @@ -1,6 +1,6 @@ ; This testcase should return with an exit code of 1. ; -; RUN: not %lli %s +; RUN: not %lli -use-orcmcjit %s @test = global i64 0 ; [#uses=1] diff --git a/test/ExecutionEngine/OrcJIT/load-object-a.ll b/test/ExecutionEngine/OrcJIT/load-object-a.ll index 080bf6cf584..0b9509c3c88 100644 --- a/test/ExecutionEngine/OrcJIT/load-object-a.ll +++ b/test/ExecutionEngine/OrcJIT/load-object-a.ll @@ -1,20 +1,20 @@ ; This first line will generate the .o files for the next run line ; RUN: rm -rf %t.cachedir %t.cachedir2 %t.cachedir3 ; RUN: mkdir -p %t.cachedir %t.cachedir2 %t.cachedir3 -; RUN: %lli -extra-module=%p/Inputs/multi-module-b.ll -extra-module=%p/Inputs/multi-module-c.ll -enable-cache-manager -object-cache-dir=%t.cachedir %s +; RUN: %lli -use-orcmcjit -extra-module=%p/Inputs/multi-module-b.ll -extra-module=%p/Inputs/multi-module-c.ll -enable-cache-manager -object-cache-dir=%t.cachedir %s ; Collect generated objects. ; RUN: find %t.cachedir -type f -name 'multi-module-?.o' -exec mv -v '{}' %t.cachedir2 ';' ; This line tests MCJIT object loading -; RUN: %lli -extra-object=%t.cachedir2/multi-module-b.o -extra-object=%t.cachedir2/multi-module-c.o %s +; RUN: %lli -use-orcmcjit -extra-object=%t.cachedir2/multi-module-b.o -extra-object=%t.cachedir2/multi-module-c.o %s ; These lines put the object files into an archive ; RUN: llvm-ar r %t.cachedir3/load-object.a %t.cachedir2/multi-module-b.o ; RUN: llvm-ar r %t.cachedir3/load-object.a %t.cachedir2/multi-module-c.o ; This line test MCJIT archive loading -; RUN: %lli -extra-archive=%t.cachedir3/load-object.a %s +; RUN: %lli -use-orcmcjit -extra-archive=%t.cachedir3/load-object.a %s declare i32 @FB() diff --git a/test/ExecutionEngine/OrcJIT/remote/cross-module-a.ll b/test/ExecutionEngine/OrcJIT/remote/cross-module-a.ll index c31572361d3..cc48fd4426c 100644 --- a/test/ExecutionEngine/OrcJIT/remote/cross-module-a.ll +++ b/test/ExecutionEngine/OrcJIT/remote/cross-module-a.ll @@ -1,4 +1,4 @@ -; RUN: %lli -extra-module=%p/Inputs/cross-module-b.ll -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null +; RUN: %lli -use-orcmcjit -extra-module=%p/Inputs/cross-module-b.ll -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null declare i32 @FB() diff --git a/test/ExecutionEngine/OrcJIT/remote/cross-module-sm-pic-a.ll b/test/ExecutionEngine/OrcJIT/remote/cross-module-sm-pic-a.ll index d47fc6cffbb..d6209d7523a 100644 --- a/test/ExecutionEngine/OrcJIT/remote/cross-module-sm-pic-a.ll +++ b/test/ExecutionEngine/OrcJIT/remote/cross-module-sm-pic-a.ll @@ -1,4 +1,4 @@ -; RUN: %lli -extra-module=%p/Inputs/cross-module-b.ll -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target%exeext -relocation-model=pic -code-model=small %s > /dev/null +; RUN: %lli -use-orcmcjit -extra-module=%p/Inputs/cross-module-b.ll -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target%exeext -relocation-model=pic -code-model=small %s > /dev/null ; XFAIL: mips, i686, i386, arm declare i32 @FB() diff --git a/test/ExecutionEngine/OrcJIT/remote/multi-module-a.ll b/test/ExecutionEngine/OrcJIT/remote/multi-module-a.ll index 0fd363b4447..9ae0e060dd0 100644 --- a/test/ExecutionEngine/OrcJIT/remote/multi-module-a.ll +++ b/test/ExecutionEngine/OrcJIT/remote/multi-module-a.ll @@ -1,4 +1,4 @@ -; RUN: %lli -extra-module=%p/Inputs/multi-module-b.ll -extra-module=%p/Inputs/multi-module-c.ll -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null +; RUN: %lli -use-orcmcjit -extra-module=%p/Inputs/multi-module-b.ll -extra-module=%p/Inputs/multi-module-c.ll -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null declare i32 @FB() diff --git a/test/ExecutionEngine/OrcJIT/remote/multi-module-sm-pic-a.ll b/test/ExecutionEngine/OrcJIT/remote/multi-module-sm-pic-a.ll index d248c4b2a94..a1d4b81eb1a 100644 --- a/test/ExecutionEngine/OrcJIT/remote/multi-module-sm-pic-a.ll +++ b/test/ExecutionEngine/OrcJIT/remote/multi-module-sm-pic-a.ll @@ -1,4 +1,4 @@ -; RUN: %lli -extra-module=%p/Inputs/multi-module-b.ll -extra-module=%p/Inputs/multi-module-c.ll -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target%exeext -relocation-model=pic -code-model=small %s > /dev/null +; RUN: %lli -use-orcmcjit -extra-module=%p/Inputs/multi-module-b.ll -extra-module=%p/Inputs/multi-module-c.ll -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target%exeext -relocation-model=pic -code-model=small %s > /dev/null ; XFAIL: mips, i686, i386, arm declare i32 @FB() diff --git a/test/ExecutionEngine/OrcJIT/remote/simpletest-remote.ll b/test/ExecutionEngine/OrcJIT/remote/simpletest-remote.ll index 30b4dd8e7ab..3ef929bc9e9 100644 --- a/test/ExecutionEngine/OrcJIT/remote/simpletest-remote.ll +++ b/test/ExecutionEngine/OrcJIT/remote/simpletest-remote.ll @@ -1,4 +1,4 @@ -; RUN: %lli -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null +; RUN: %lli -use-orcmcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null define i32 @bar() nounwind { ret i32 0 diff --git a/test/ExecutionEngine/OrcJIT/remote/stubs-remote.ll b/test/ExecutionEngine/OrcJIT/remote/stubs-remote.ll index a834ac5c985..895e0d9de2f 100644 --- a/test/ExecutionEngine/OrcJIT/remote/stubs-remote.ll +++ b/test/ExecutionEngine/OrcJIT/remote/stubs-remote.ll @@ -1,4 +1,4 @@ -; RUN: %lli -remote-mcjit -disable-lazy-compilation=false -mcjit-remote-process=lli-child-target%exeext %s +; RUN: %lli -use-orcmcjit -remote-mcjit -disable-lazy-compilation=false -mcjit-remote-process=lli-child-target%exeext %s ; XFAIL: * ; This test should fail until remote symbol resolution is supported. diff --git a/test/ExecutionEngine/OrcJIT/remote/stubs-sm-pic.ll b/test/ExecutionEngine/OrcJIT/remote/stubs-sm-pic.ll index 62e89cad332..ef1e5ef003f 100644 --- a/test/ExecutionEngine/OrcJIT/remote/stubs-sm-pic.ll +++ b/test/ExecutionEngine/OrcJIT/remote/stubs-sm-pic.ll @@ -1,4 +1,4 @@ -; RUN: %lli -remote-mcjit -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s +; RUN: %lli -use-orcmcjit -remote-mcjit -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s ; XFAIL: * ; This function should fail until remote symbol resolution is supported. diff --git a/test/ExecutionEngine/OrcJIT/remote/test-common-symbols-remote.ll b/test/ExecutionEngine/OrcJIT/remote/test-common-symbols-remote.ll index fb7750adf49..444339550ae 100644 --- a/test/ExecutionEngine/OrcJIT/remote/test-common-symbols-remote.ll +++ b/test/ExecutionEngine/OrcJIT/remote/test-common-symbols-remote.ll @@ -1,4 +1,4 @@ -; RUN: %lli -remote-mcjit -O0 -disable-lazy-compilation=false -mcjit-remote-process=lli-child-target%exeext %s +; RUN: %lli -use-orcmcjit -remote-mcjit -O0 -disable-lazy-compilation=false -mcjit-remote-process=lli-child-target%exeext %s ; The intention of this test is to verify that symbols mapped to COMMON in ELF ; work as expected. diff --git a/test/ExecutionEngine/OrcJIT/remote/test-data-align-remote.ll b/test/ExecutionEngine/OrcJIT/remote/test-data-align-remote.ll index 435c21a4a9f..768729b0999 100644 --- a/test/ExecutionEngine/OrcJIT/remote/test-data-align-remote.ll +++ b/test/ExecutionEngine/OrcJIT/remote/test-data-align-remote.ll @@ -1,4 +1,4 @@ -; RUN: %lli -remote-mcjit -O0 -mcjit-remote-process=lli-child-target%exeext %s +; RUN: %lli -use-orcmcjit -remote-mcjit -O0 -mcjit-remote-process=lli-child-target%exeext %s ; Check that a variable is always aligned as specified. diff --git a/test/ExecutionEngine/OrcJIT/remote/test-fp-no-external-funcs-remote.ll b/test/ExecutionEngine/OrcJIT/remote/test-fp-no-external-funcs-remote.ll index 6134b8b2464..5c1be7669c6 100644 --- a/test/ExecutionEngine/OrcJIT/remote/test-fp-no-external-funcs-remote.ll +++ b/test/ExecutionEngine/OrcJIT/remote/test-fp-no-external-funcs-remote.ll @@ -1,4 +1,4 @@ -; RUN: %lli -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null +; RUN: %lli -use-orcmcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null define double @test(double* %DP, double %Arg) nounwind { %D = load double, double* %DP ; [#uses=1] diff --git a/test/ExecutionEngine/OrcJIT/remote/test-global-init-nonzero-remote.ll b/test/ExecutionEngine/OrcJIT/remote/test-global-init-nonzero-remote.ll index 5b7999c067e..683263dee3b 100644 --- a/test/ExecutionEngine/OrcJIT/remote/test-global-init-nonzero-remote.ll +++ b/test/ExecutionEngine/OrcJIT/remote/test-global-init-nonzero-remote.ll @@ -1,4 +1,4 @@ -; RUN: %lli -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null +; RUN: %lli -use-orcmcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null @count = global i32 1, align 4 diff --git a/test/ExecutionEngine/OrcJIT/remote/test-global-init-nonzero-sm-pic.ll b/test/ExecutionEngine/OrcJIT/remote/test-global-init-nonzero-sm-pic.ll index f9184b4077b..251cef40c52 100644 --- a/test/ExecutionEngine/OrcJIT/remote/test-global-init-nonzero-sm-pic.ll +++ b/test/ExecutionEngine/OrcJIT/remote/test-global-init-nonzero-sm-pic.ll @@ -1,4 +1,4 @@ -; RUN: %lli -remote-mcjit -relocation-model=pic -code-model=small %s > /dev/null +; RUN: %lli -use-orcmcjit -remote-mcjit -relocation-model=pic -code-model=small %s > /dev/null ; XFAIL: mips, aarch64, arm, i686, i386 @count = global i32 1, align 4 diff --git a/test/ExecutionEngine/OrcJIT/remote/test-ptr-reloc-remote.ll b/test/ExecutionEngine/OrcJIT/remote/test-ptr-reloc-remote.ll index ad1af93ffde..d9fb5de225c 100644 --- a/test/ExecutionEngine/OrcJIT/remote/test-ptr-reloc-remote.ll +++ b/test/ExecutionEngine/OrcJIT/remote/test-ptr-reloc-remote.ll @@ -1,4 +1,4 @@ -; RUN: %lli -remote-mcjit -O0 -mcjit-remote-process=lli-child-target%exeext %s +; RUN: %lli -use-orcmcjit -remote-mcjit -O0 -mcjit-remote-process=lli-child-target%exeext %s @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1 @ptr = global i8* getelementptr inbounds ([6 x i8], [6 x i8]* @.str, i32 0, i32 0), align 4 diff --git a/test/ExecutionEngine/OrcJIT/remote/test-ptr-reloc-sm-pic.ll b/test/ExecutionEngine/OrcJIT/remote/test-ptr-reloc-sm-pic.ll index d9a4faa8e6b..34cd3d5ebdd 100644 --- a/test/ExecutionEngine/OrcJIT/remote/test-ptr-reloc-sm-pic.ll +++ b/test/ExecutionEngine/OrcJIT/remote/test-ptr-reloc-sm-pic.ll @@ -1,4 +1,4 @@ -; RUN: %lli -remote-mcjit -O0 -relocation-model=pic -code-model=small %s +; RUN: %lli -use-orcmcjit -remote-mcjit -O0 -relocation-model=pic -code-model=small %s ; XFAIL: mips, aarch64, arm, i686, i386 @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1 -- 2.34.1