[llvm] r193544 - Standardizing lli's extra module command line option

Alp Toker alp at nuanti.com
Mon Oct 28 15:22:26 PDT 2013 

On 28/10/2013 21:58, Andrew Kaylor wrote:
> Author: akaylor
> Date: Mon Oct 28 16:58:15 2013
> New Revision: 193544
>
> URL: http://llvm.org/viewvc/llvm-project?rev=193544&view=rev
> Log:
> Standardizing lli's extra module command line option
>
> Modified:
>     llvm/trunk/test/ExecutionEngine/MCJIT/cross-module-a.ll
>     llvm/trunk/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
>     llvm/trunk/test/ExecutionEngine/MCJIT/multi-module-a.ll
>     llvm/trunk/test/ExecutionEngine/MCJIT/multi-module-eh-a.ll
>     llvm/trunk/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
>     llvm/trunk/test/ExecutionEngine/MCJIT/remote/cross-module-a.ll
>     llvm/trunk/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll
>     llvm/trunk/test/ExecutionEngine/MCJIT/remote/multi-module-a.ll
>     llvm/trunk/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll
>     llvm/trunk/tools/lli/lli.cpp
>
> Modified: llvm/trunk/test/ExecutionEngine/MCJIT/cross-module-a.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/MCJIT/cross-module-a.ll?rev=193544&r1=193543&r2=193544&view=diff
> ==============================================================================
> --- llvm/trunk/test/ExecutionEngine/MCJIT/cross-module-a.ll (original)
> +++ llvm/trunk/test/ExecutionEngine/MCJIT/cross-module-a.ll Mon Oct 28 16:58:15 2013
> @@ -1,4 +1,4 @@
> -; RUN: %lli_mcjit -extra-modules=%p/cross-module-b.ir %s > /dev/null
> +; RUN: %lli_mcjit -extra-module=%p/cross-module-b.ir %s > /dev/null
>  
>  declare i32 @FB()
>  
>
> Modified: llvm/trunk/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll?rev=193544&r1=193543&r2=193544&view=diff
> ==============================================================================
> --- llvm/trunk/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll (original)
> +++ llvm/trunk/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll Mon Oct 28 16:58:15 2013
> @@ -1,4 +1,4 @@
> -; RUN: %lli_mcjit -extra-modules=%p/cross-module-b.ir -relocation-model=pic -code-model=small %s > /dev/null
> +; RUN: %lli_mcjit -extra-module=%p/cross-module-b.ir -relocation-model=pic -code-model=small %s > /dev/null
>  ; XFAIL: mips, i686, i386, aarch64, arm
>  
>  declare i32 @FB()
>
> Modified: llvm/trunk/test/ExecutionEngine/MCJIT/multi-module-a.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/MCJIT/multi-module-a.ll?rev=193544&r1=193543&r2=193544&view=diff
> ==============================================================================
> --- llvm/trunk/test/ExecutionEngine/MCJIT/multi-module-a.ll (original)
> +++ llvm/trunk/test/ExecutionEngine/MCJIT/multi-module-a.ll Mon Oct 28 16:58:15 2013
> @@ -1,4 +1,4 @@
> -; RUN: %lli_mcjit -extra-modules=%p/multi-module-b.ir,%p/multi-module-c.ir %s > /dev/null
> +; RUN: %lli_mcjit -extra-module=%p/multi-module-b.ir -extra-module=%p/multi-module-c.ir %s > /dev/null
>  
>  declare i32 @FB()
>  
>
> Modified: llvm/trunk/test/ExecutionEngine/MCJIT/multi-module-eh-a.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/MCJIT/multi-module-eh-a.ll?rev=193544&r1=193543&r2=193544&view=diff
> ==============================================================================
> --- llvm/trunk/test/ExecutionEngine/MCJIT/multi-module-eh-a.ll (original)
> +++ llvm/trunk/test/ExecutionEngine/MCJIT/multi-module-eh-a.ll Mon Oct 28 16:58:15 2013
> @@ -1,4 +1,4 @@
> -; RUN: %lli_mcjit -extra-modules=%p/multi-module-eh-b.ir %s
> +; RUN: %lli_mcjit -extra-module=%p/multi-module-eh-b.ir %s
>  ; XFAIL: arm, cygwin, win32, mingw
>  declare i8* @__cxa_allocate_exception(i64)
>  declare void @__cxa_throw(i8*, i8*, i8*)
>
> Modified: llvm/trunk/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll?rev=193544&r1=193543&r2=193544&view=diff
> ==============================================================================
> --- llvm/trunk/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll (original)
> +++ llvm/trunk/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll Mon Oct 28 16:58:15 2013
> @@ -1,4 +1,4 @@
> -; RUN: %lli_mcjit -extra-modules=%p/multi-module-b.ir,%p/multi-module-c.ir -relocation-model=pic -code-model=small %s > /dev/null
> +; RUN: %lli_mcjit -extra-module=%p/multi-module-b.ir -extra-module=%p/multi-module-c.ir -relocation-model=pic -code-model=small %s > /dev/null
>  ; XFAIL: mips, i686, i386, aarch64, arm
>  
>  declare i32 @FB()
>
> Modified: llvm/trunk/test/ExecutionEngine/MCJIT/remote/cross-module-a.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/MCJIT/remote/cross-module-a.ll?rev=193544&r1=193543&r2=193544&view=diff
> ==============================================================================
> --- llvm/trunk/test/ExecutionEngine/MCJIT/remote/cross-module-a.ll (original)
> +++ llvm/trunk/test/ExecutionEngine/MCJIT/remote/cross-module-a.ll Mon Oct 28 16:58:15 2013
> @@ -1,4 +1,4 @@
> -; RUN: %lli_mcjit -extra-modules=%p/cross-module-b.ir  -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target %s > /dev/null
> +; RUN: %lli_mcjit -extra-module=%p/cross-module-b.ir -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target %s > /dev/null
>  
>  ; This fails because __main is not resolved in remote mcjit.
>  ; XFAIL: cygwin,mingw32
>
> Modified: llvm/trunk/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll?rev=193544&r1=193543&r2=193544&view=diff
> ==============================================================================
> --- llvm/trunk/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll (original)
> +++ llvm/trunk/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll Mon Oct 28 16:58:15 2013
> @@ -1,4 +1,4 @@
> -; RUN: %lli_mcjit -extra-modules=%p/cross-module-b.ir  -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target -relocation-model=pic -code-model=small %s > /dev/null
> +; RUN: %lli_mcjit -extra-module=%p/cross-module-b.ir -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target -relocation-model=pic -code-model=small %s > /dev/null
>  ; XFAIL: mips, i686, i386, aarch64, arm
>  
>  declare i32 @FB()
>
> Modified: llvm/trunk/test/ExecutionEngine/MCJIT/remote/multi-module-a.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/MCJIT/remote/multi-module-a.ll?rev=193544&r1=193543&r2=193544&view=diff
> ==============================================================================
> --- llvm/trunk/test/ExecutionEngine/MCJIT/remote/multi-module-a.ll (original)
> +++ llvm/trunk/test/ExecutionEngine/MCJIT/remote/multi-module-a.ll Mon Oct 28 16:58:15 2013
> @@ -1,4 +1,4 @@
> -; RUN: %lli_mcjit -extra-modules=%p/multi-module-b.ir,%p/multi-module-c.ir  -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target %s > /dev/null
> +; RUN: %lli_mcjit -extra-module=%p/multi-module-b.ir -extra-module=%p/multi-module-c.ir -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target %s > /dev/null
>  
>  ; This fails because __main is not resolved in remote mcjit.
>  ; XFAIL: cygwin,mingw32
>
> Modified: llvm/trunk/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll?rev=193544&r1=193543&r2=193544&view=diff
> ==============================================================================
> --- llvm/trunk/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll (original)
> +++ llvm/trunk/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll Mon Oct 28 16:58:15 2013
> @@ -1,4 +1,4 @@
> -; RUN: %lli_mcjit -extra-modules=%p/multi-module-b.ir,%p/multi-module-c.ir  -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target -relocation-model=pic -code-model=small %s > /dev/null
> +; RUN: %lli_mcjit -extra-module=%p/multi-module-b.ir -extra-module=%p/multi-module-c.ir -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target -relocation-model=pic -code-model=small %s > /dev/null
>  ; XFAIL: mips, i686, i386, aarch64, arm
>  
>  declare i32 @FB()
>
> Modified: llvm/trunk/tools/lli/lli.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lli/lli.cpp?rev=193544&r1=193543&r2=193544&view=diff
> ==============================================================================
> --- llvm/trunk/tools/lli/lli.cpp (original)
> +++ llvm/trunk/tools/lli/lli.cpp Mon Oct 28 16:58:15 2013
> @@ -132,8 +132,7 @@ namespace {
>              cl::init("main"));
>  
>    cl::list<std::string>
> -  ExtraModules("extra-modules",
> -         cl::CommaSeparated,
> +  ExtraModules("extra-module",
>           cl::desc("Extra modules to be loaded"),
>           cl::value_desc("<input bitcode 2>,<input bitcode 3>,..."));

I think this needs to be cl::ZeroOrMore. Also don't forget to update the
cl::value_desc.

Alp.

>  
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

-- 
http://www.nuanti.com
the browser experts

More information about the llvm-commits mailing list