[PATCH] Move target dependent test in their own folder for c API test

Justin Bogner mail at justinbogner.com
Mon Jun 22 23:52:33 PDT 2015


deadal nix <deadalnix at gmail.com> writes:
> The patch from git format patch.

LGTM. Committed for you in r240380. Thanks!

> 2015-06-22 23:34 GMT-07:00 Amaury SECHET <deadalnix+llvmreview at gmail.com>:
>
>     Hi bogner, chandlerc,
>    
>     Dissasembly tests depends on target. The problem is that it disable all
>     tests if all targets are not compiled. This dif moves things around in
>     order to get target specific code in a target specific folder.
>    
>     http://reviews.llvm.org/D10636
>    
>     Files:
>       test/Bindings/llvm-c/ARM/disassemble.test
>       test/Bindings/llvm-c/ARM/lit.local.cfg
>       test/Bindings/llvm-c/X86/disassemble.test
>       test/Bindings/llvm-c/X86/lit.local.cfg
>       test/Bindings/llvm-c/disassemble.test
>       test/Bindings/llvm-c/lit.local.cfg
>    
>     Index: test/Bindings/llvm-c/ARM/disassemble.test
>     ===================================================================
>     --- test/Bindings/llvm-c/ARM/disassemble.test
>     +++ test/Bindings/llvm-c/ARM/disassemble.test
>     @@ -19,25 +19,3 @@
>      ;CHECK: sub    r1, r11, #12
>      ;CHECK: 02 20 81 e0
>      ;CHECK: add    r2, r1, r2
>     -
>     -x86_64-linux-unknown  NULL  48 83 c4 38 5b 5d 41 5c 41 5d 41 5e 41 5f c3
>     -;CHECK: triple: x86_64-linux-unknown, features: NULL
>     -;CHECK: addq   $56, %rsp
>     -;CHECK: popq   %rbx
>     -;CHECK: popq   %rbp
>     -;CHECK: popq   %r12
>     -;CHECK: popq   %r13
>     -;CHECK: popq   %r14
>     -;CHECK: popq   %r15
>     -;CHECK: ret
>     -
>     -i686-apple-darwin     NULL  0f b7 4c 24 0a e8 29 ce ff ff
>     -;CHECK: triple: i686-apple-darwin, features: NULL
>     -;CHECK: movzwl 10(%esp), %ecx
>     -;CHECK: calll  -12759
>     -
>     -i686-linux-unknown    NULL  dd 44 24 04 d9 e1 c3
>     -;CHECK: triple: i686-linux-unknown, features: NULL
>     -;CHECK: fldl   4(%esp)
>     -;CHECK: fabs
>     -;CHECK: ret
>     Index: test/Bindings/llvm-c/ARM/lit.local.cfg
>     ===================================================================
>     --- test/Bindings/llvm-c/ARM/lit.local.cfg
>     +++ test/Bindings/llvm-c/ARM/lit.local.cfg
>     @@ -1,4 +1,2 @@
>     -if not "X86" in config.root.targets:
>     -    config.unsupported = True
>      if not "ARM" in config.root.targets:
>          config.unsupported = True
>     Index: test/Bindings/llvm-c/X86/disassemble.test
>     ===================================================================
>     --- /dev/null
>     +++ test/Bindings/llvm-c/X86/disassemble.test
>     @@ -0,0 +1,23 @@
>     +; RUN: llvm-c-test --disassemble < %s | FileCheck %s
>     +
>     +x86_64-linux-unknown  NULL  48 83 c4 38 5b 5d 41 5c 41 5d 41 5e 41 5f c3
>     +;CHECK: triple: x86_64-linux-unknown, features: NULL
>     +;CHECK: addq   $56, %rsp
>     +;CHECK: popq   %rbx
>     +;CHECK: popq   %rbp
>     +;CHECK: popq   %r12
>     +;CHECK: popq   %r13
>     +;CHECK: popq   %r14
>     +;CHECK: popq   %r15
>     +;CHECK: ret
>     +
>     +i686-apple-darwin     NULL  0f b7 4c 24 0a e8 29 ce ff ff
>     +;CHECK: triple: i686-apple-darwin, features: NULL
>     +;CHECK: movzwl 10(%esp), %ecx
>     +;CHECK: calll  -12759
>     +
>     +i686-linux-unknown    NULL  dd 44 24 04 d9 e1 c3
>     +;CHECK: triple: i686-linux-unknown, features: NULL
>     +;CHECK: fldl   4(%esp)
>     +;CHECK: fabs
>     +;CHECK: ret
>     Index: test/Bindings/llvm-c/X86/lit.local.cfg
>     ===================================================================
>     --- test/Bindings/llvm-c/X86/lit.local.cfg
>     +++ test/Bindings/llvm-c/X86/lit.local.cfg
>     @@ -1,4 +1,2 @@
>      if not "X86" in config.root.targets:
>          config.unsupported = True
>     -if not "ARM" in config.root.targets:
>     -    config.unsupported = True
>    
>     EMAIL PREFERENCES
>       http://reviews.llvm.org/settings/panel/emailpreferences/
>
> From 48aa3657f30d8bac3030a79d153fc94d9a90f5b2 Mon Sep 17 00:00:00 2001
> From: amaury <amaury at fb.com>
> Date: Mon, 22 Jun 2015 23:23:19 -0700
> Subject: [PATCH] Move target dependent test in their own folder for c API test
>
> Summary: Dissasembly tests depends on target. The problem is that it disable all tests if all targets are not compiled. This dif moves things around in order to get target specific code in a target specific folder.
>
> Test Plan:
>   bin/llvm-lit ../test/Bindings/llvm-c
>
> Reviewers: bogner, chandlerc
>
> Subscribers: llvm-commits
>
> Differential Revision: http://reviews.llvm.org/D10636
> ---
>  test/Bindings/llvm-c/ARM/disassemble.test | 21 +++++++++++++++
>  test/Bindings/llvm-c/ARM/lit.local.cfg    |  2 ++
>  test/Bindings/llvm-c/X86/disassemble.test | 23 +++++++++++++++++
>  test/Bindings/llvm-c/X86/lit.local.cfg    |  2 ++
>  test/Bindings/llvm-c/disassemble.test     | 43 -------------------------------
>  test/Bindings/llvm-c/lit.local.cfg        |  4 ---
>  6 files changed, 48 insertions(+), 47 deletions(-)
>  create mode 100644 test/Bindings/llvm-c/ARM/disassemble.test
>  create mode 100644 test/Bindings/llvm-c/ARM/lit.local.cfg
>  create mode 100644 test/Bindings/llvm-c/X86/disassemble.test
>  create mode 100644 test/Bindings/llvm-c/X86/lit.local.cfg
>  delete mode 100644 test/Bindings/llvm-c/disassemble.test
>  delete mode 100644 test/Bindings/llvm-c/lit.local.cfg
>
> diff --git a/test/Bindings/llvm-c/ARM/disassemble.test b/test/Bindings/llvm-c/ARM/disassemble.test
> new file mode 100644
> index 0000000..ffa7ebf
> --- /dev/null
> +++ b/test/Bindings/llvm-c/ARM/disassemble.test
> @@ -0,0 +1,21 @@
> +; RUN: llvm-c-test --disassemble < %s | FileCheck %s
> +
> +armv8-linux-gnu     +crypto 02 00 81 e0 02 03 b0 f3
> +;CHECK: triple: armv8-linux-gnu, features: +crypto
> +;CHECK: 02 00 81 e0                  add r0, r1, r2
> +;CHECK: 02 03 b0 f3                  aese.8 q0, q1
> +
> +armv8-linux-gnu     -crypto 02 00 81 e0 02 03 b0 f3
> +;CHECK: triple: armv8-linux-gnu, features: -crypto
> +;CHECK: 02 00 81 e0                  add r0, r1, r2
> +;CHECK: 02                           ???
> +;CHECK: 03                           ???
> +;CHECK: b0                           ???
> +;CHECK: f3                           ???
> +
> +arm-linux-android     NULL  44 26 1f e5 0c 10 4b e2 02 20 81 e0
> +;CHECK: triple: arm-linux-android, features: NULL
> +;CHECK: ldr	r2, [pc, #-1604]
> +;CHECK: sub	r1, r11, #12
> +;CHECK: 02 20 81 e0
> +;CHECK: add	r2, r1, r2
> diff --git a/test/Bindings/llvm-c/ARM/lit.local.cfg b/test/Bindings/llvm-c/ARM/lit.local.cfg
> new file mode 100644
> index 0000000..7c23e4f
> --- /dev/null
> +++ b/test/Bindings/llvm-c/ARM/lit.local.cfg
> @@ -0,0 +1,2 @@
> +if not "ARM" in config.root.targets:
> +    config.unsupported = True
> diff --git a/test/Bindings/llvm-c/X86/disassemble.test b/test/Bindings/llvm-c/X86/disassemble.test
> new file mode 100644
> index 0000000..465b370
> --- /dev/null
> +++ b/test/Bindings/llvm-c/X86/disassemble.test
> @@ -0,0 +1,23 @@
> +; RUN: llvm-c-test --disassemble < %s | FileCheck %s
> +
> +x86_64-linux-unknown  NULL  48 83 c4 38 5b 5d 41 5c 41 5d 41 5e 41 5f c3
> +;CHECK: triple: x86_64-linux-unknown, features: NULL
> +;CHECK: addq	$56, %rsp
> +;CHECK: popq	%rbx
> +;CHECK: popq	%rbp
> +;CHECK: popq	%r12
> +;CHECK: popq	%r13
> +;CHECK: popq	%r14
> +;CHECK: popq	%r15
> +;CHECK: ret
> +
> +i686-apple-darwin     NULL  0f b7 4c 24 0a e8 29 ce ff ff
> +;CHECK: triple: i686-apple-darwin, features: NULL
> +;CHECK: movzwl	10(%esp), %ecx
> +;CHECK: calll	-12759
> +
> +i686-linux-unknown    NULL  dd 44 24 04 d9 e1 c3
> +;CHECK: triple: i686-linux-unknown, features: NULL
> +;CHECK: fldl	4(%esp)
> +;CHECK: fabs
> +;CHECK: ret
> diff --git a/test/Bindings/llvm-c/X86/lit.local.cfg b/test/Bindings/llvm-c/X86/lit.local.cfg
> new file mode 100644
> index 0000000..42bf50d
> --- /dev/null
> +++ b/test/Bindings/llvm-c/X86/lit.local.cfg
> @@ -0,0 +1,2 @@
> +if not "X86" in config.root.targets:
> +    config.unsupported = True
> diff --git a/test/Bindings/llvm-c/disassemble.test b/test/Bindings/llvm-c/disassemble.test
> deleted file mode 100644
> index bb7a9a0..0000000
> --- a/test/Bindings/llvm-c/disassemble.test
> +++ /dev/null
> @@ -1,43 +0,0 @@
> -; RUN: llvm-c-test --disassemble < %s | FileCheck %s
> -
> -armv8-linux-gnu     +crypto 02 00 81 e0 02 03 b0 f3
> -;CHECK: triple: armv8-linux-gnu, features: +crypto
> -;CHECK: 02 00 81 e0                  add r0, r1, r2
> -;CHECK: 02 03 b0 f3                  aese.8 q0, q1
> -
> -armv8-linux-gnu     -crypto 02 00 81 e0 02 03 b0 f3
> -;CHECK: triple: armv8-linux-gnu, features: -crypto
> -;CHECK: 02 00 81 e0                  add r0, r1, r2
> -;CHECK: 02                           ???
> -;CHECK: 03                           ???
> -;CHECK: b0                           ???
> -;CHECK: f3                           ???
> -
> -arm-linux-android     NULL  44 26 1f e5 0c 10 4b e2 02 20 81 e0
> -;CHECK: triple: arm-linux-android, features: NULL
> -;CHECK: ldr	r2, [pc, #-1604]
> -;CHECK: sub	r1, r11, #12
> -;CHECK: 02 20 81 e0
> -;CHECK: add	r2, r1, r2
> -
> -x86_64-linux-unknown  NULL  48 83 c4 38 5b 5d 41 5c 41 5d 41 5e 41 5f c3
> -;CHECK: triple: x86_64-linux-unknown, features: NULL
> -;CHECK: addq	$56, %rsp
> -;CHECK: popq	%rbx
> -;CHECK: popq	%rbp
> -;CHECK: popq	%r12
> -;CHECK: popq	%r13
> -;CHECK: popq	%r14
> -;CHECK: popq	%r15
> -;CHECK: ret
> -
> -i686-apple-darwin     NULL  0f b7 4c 24 0a e8 29 ce ff ff
> -;CHECK: triple: i686-apple-darwin, features: NULL
> -;CHECK: movzwl	10(%esp), %ecx
> -;CHECK: calll	-12759
> -
> -i686-linux-unknown    NULL  dd 44 24 04 d9 e1 c3
> -;CHECK: triple: i686-linux-unknown, features: NULL
> -;CHECK: fldl	4(%esp)
> -;CHECK: fabs
> -;CHECK: ret
> diff --git a/test/Bindings/llvm-c/lit.local.cfg b/test/Bindings/llvm-c/lit.local.cfg
> deleted file mode 100644
> index 75b22c0..0000000
> --- a/test/Bindings/llvm-c/lit.local.cfg
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -if not "X86" in config.root.targets:
> -    config.unsupported = True
> -if not "ARM" in config.root.targets:
> -    config.unsupported = True




More information about the llvm-commits mailing list