[Piglit] [PATCH] cl/atomic: Fix duplicate names for threaded int/uint tests

Jan Vesely jan.vesely at rutgers.edu
Thu Sep 25 13:54:35 PDT 2014


Reviewed-by: Jan Vesely <jan.vesely at rutgers.edu>

thanks

On Thu, 2014-09-25 at 15:38 -0500, Aaron Watry wrote:
> Signed-off-by: Aaron Watry <awatry at gmail.com>
> CC: Jan Vesely <jan.vesely at rutgers.edu>
> ---
>  tests/cl/program/execute/builtin/atomic/atomic_add-local.cl     | 4 ++--
>  tests/cl/program/execute/builtin/atomic/atomic_and-local.cl     | 4 ++--
>  tests/cl/program/execute/builtin/atomic/atomic_cmpxchg-local.cl | 4 ++--
>  tests/cl/program/execute/builtin/atomic/atomic_dec-local.cl     | 4 ++--
>  tests/cl/program/execute/builtin/atomic/atomic_inc-local.cl     | 4 ++--
>  tests/cl/program/execute/builtin/atomic/atomic_max-local.cl     | 4 ++--
>  tests/cl/program/execute/builtin/atomic/atomic_min-local.cl     | 4 ++--
>  tests/cl/program/execute/builtin/atomic/atomic_or-local.cl      | 4 ++--
>  tests/cl/program/execute/builtin/atomic/atomic_sub-local.cl     | 4 ++--
>  tests/cl/program/execute/builtin/atomic/atomic_xchg-local.cl    | 4 ++--
>  tests/cl/program/execute/builtin/atomic/atomic_xor-local.cl     | 4 ++--
>  11 files changed, 22 insertions(+), 22 deletions(-)
> 
> diff --git a/tests/cl/program/execute/builtin/atomic/atomic_add-local.cl b/tests/cl/program/execute/builtin/atomic/atomic_add-local.cl
> index c155fbb..197b9e9 100644
> --- a/tests/cl/program/execute/builtin/atomic/atomic_add-local.cl
> +++ b/tests/cl/program/execute/builtin/atomic/atomic_add-local.cl
> @@ -26,7 +26,7 @@ arg_in:  2 uint           4
>  arg_in:  3 uint           5
>  
>  [test]
> -name: threads
> +name: threads int
>  kernel_name: threads_int
>  dimensions: 1
>  global_size: 8 0 0
> @@ -35,7 +35,7 @@ arg_out: 0 buffer int[1] 28
>  arg_in:  1 buffer int[1] NULL
>  
>  [test]
> -name: threads
> +name: threads uint
>  kernel_name: threads_uint
>  dimensions: 1
>  global_size: 8 0 0
> diff --git a/tests/cl/program/execute/builtin/atomic/atomic_and-local.cl b/tests/cl/program/execute/builtin/atomic/atomic_and-local.cl
> index dc5f835..ebde50e 100644
> --- a/tests/cl/program/execute/builtin/atomic/atomic_and-local.cl
> +++ b/tests/cl/program/execute/builtin/atomic/atomic_and-local.cl
> @@ -26,7 +26,7 @@ arg_in:  2 uint           4
>  arg_in:  3 uint           5
>  
>  [test]
> -name: threads
> +name: threads int
>  kernel_name: threads_int
>  dimensions: 1
>  global_size: 8 0 0
> @@ -35,7 +35,7 @@ arg_out: 0 buffer int[1] 0
>  arg_in:  1 buffer int[1] NULL
>  
>  [test]
> -name: threads
> +name: threads uint
>  kernel_name: threads_uint
>  dimensions: 1
>  global_size: 8 0 0
> diff --git a/tests/cl/program/execute/builtin/atomic/atomic_cmpxchg-local.cl b/tests/cl/program/execute/builtin/atomic/atomic_cmpxchg-local.cl
> index 4519b9f..2a98176 100644
> --- a/tests/cl/program/execute/builtin/atomic/atomic_cmpxchg-local.cl
> +++ b/tests/cl/program/execute/builtin/atomic/atomic_cmpxchg-local.cl
> @@ -28,7 +28,7 @@ arg_in:  3 buffer uint[2] 4 3
>  arg_in:  4 buffer uint[2] 5 5
>  
>  [test]
> -name: threads
> +name: threads int
>  kernel_name: threads_int
>  dimensions: 1
>  global_size: 8 0 0
> @@ -37,7 +37,7 @@ arg_out: 0 buffer int[1] 8
>  arg_in:  1 buffer int[1] NULL
>  
>  [test]
> -name: threads
> +name: threads uint
>  kernel_name: threads_uint
>  dimensions: 1
>  global_size: 8 0 0
> diff --git a/tests/cl/program/execute/builtin/atomic/atomic_dec-local.cl b/tests/cl/program/execute/builtin/atomic/atomic_dec-local.cl
> index aaa9885..900cec4 100644
> --- a/tests/cl/program/execute/builtin/atomic/atomic_dec-local.cl
> +++ b/tests/cl/program/execute/builtin/atomic/atomic_dec-local.cl
> @@ -24,7 +24,7 @@ arg_in:  1 buffer uint[1] NULL
>  arg_in:  2 uint           2
>  
>  [test]
> -name: threads
> +name: threads int
>  kernel_name: threads_int
>  dimensions: 1
>  global_size: 8 0 0
> @@ -33,7 +33,7 @@ arg_out: 0 buffer int[1] 8
>  arg_in:  1 buffer int[1] NULL
>  
>  [test]
> -name: threads
> +name: threads uint
>  kernel_name: threads_uint
>  dimensions: 1
>  global_size: 8 0 0
> diff --git a/tests/cl/program/execute/builtin/atomic/atomic_inc-local.cl b/tests/cl/program/execute/builtin/atomic/atomic_inc-local.cl
> index d51b4b7..4e4d0ca 100644
> --- a/tests/cl/program/execute/builtin/atomic/atomic_inc-local.cl
> +++ b/tests/cl/program/execute/builtin/atomic/atomic_inc-local.cl
> @@ -24,7 +24,7 @@ arg_in:  1 buffer uint[1] NULL
>  arg_in:  2 uint           2
>  
>  [test]
> -name: threads
> +name: threads int
>  kernel_name: threads_int
>  dimensions: 1
>  global_size: 8 0 0
> @@ -33,7 +33,7 @@ arg_out: 0 buffer int[1] 8
>  arg_in:  1 buffer int[1] NULL
>  
>  [test]
> -name: threads
> +name: threads uint
>  kernel_name: threads_uint
>  dimensions: 1
>  global_size: 8 0 0
> diff --git a/tests/cl/program/execute/builtin/atomic/atomic_max-local.cl b/tests/cl/program/execute/builtin/atomic/atomic_max-local.cl
> index 68b513f..89ee6c1 100644
> --- a/tests/cl/program/execute/builtin/atomic/atomic_max-local.cl
> +++ b/tests/cl/program/execute/builtin/atomic/atomic_max-local.cl
> @@ -38,7 +38,7 @@ arg_in:  3 uint           0xffffffff
>  
> 
>  [test]
> -name: threads
> +name: threads int
>  kernel_name: threads_int
>  dimensions: 1
>  global_size: 8 0 0
> @@ -47,7 +47,7 @@ arg_out: 0 buffer int[1] 7
>  arg_in:  1 buffer int[1] NULL
>  
>  [test]
> -name: threads
> +name: threads uint
>  kernel_name: threads_uint
>  dimensions: 1
>  global_size: 8 0 0
> diff --git a/tests/cl/program/execute/builtin/atomic/atomic_min-local.cl b/tests/cl/program/execute/builtin/atomic/atomic_min-local.cl
> index 2d0a536..7c7bee0 100644
> --- a/tests/cl/program/execute/builtin/atomic/atomic_min-local.cl
> +++ b/tests/cl/program/execute/builtin/atomic/atomic_min-local.cl
> @@ -38,7 +38,7 @@ arg_in:  3 uint           3
>  
> 
>  [test]
> -name: threads
> +name: threads int
>  kernel_name: threads_int
>  dimensions: 1
>  global_size: 8 0 0
> @@ -47,7 +47,7 @@ arg_out: 0 buffer int[1] 0
>  arg_in:  1 buffer int[1] NULL
>  
>  [test]
> -name: threads
> +name: threads uint
>  kernel_name: threads_uint
>  dimensions: 1
>  global_size: 8 0 0
> diff --git a/tests/cl/program/execute/builtin/atomic/atomic_or-local.cl b/tests/cl/program/execute/builtin/atomic/atomic_or-local.cl
> index c46a289..e67165a 100644
> --- a/tests/cl/program/execute/builtin/atomic/atomic_or-local.cl
> +++ b/tests/cl/program/execute/builtin/atomic/atomic_or-local.cl
> @@ -26,7 +26,7 @@ arg_in:  2 uint           4
>  arg_in:  3 uint           5
>  
>  [test]
> -name: threads
> +name: threads int
>  kernel_name: threads_int
>  dimensions: 1
>  global_size: 8 0 0
> @@ -35,7 +35,7 @@ arg_out: 0 buffer int[1] 7
>  arg_in:  1 buffer int[1] NULL
>  
>  [test]
> -name: threads
> +name: threads uint
>  kernel_name: threads_uint
>  dimensions: 1
>  global_size: 8 0 0
> diff --git a/tests/cl/program/execute/builtin/atomic/atomic_sub-local.cl b/tests/cl/program/execute/builtin/atomic/atomic_sub-local.cl
> index 30fab8f..276a27e 100644
> --- a/tests/cl/program/execute/builtin/atomic/atomic_sub-local.cl
> +++ b/tests/cl/program/execute/builtin/atomic/atomic_sub-local.cl
> @@ -26,7 +26,7 @@ arg_in:  2 uint           5
>  arg_in:  3 uint           4
>  
>  [test]
> -name: threads
> +name: threads int
>  kernel_name: threads_int
>  dimensions: 1
>  global_size: 8 0 0
> @@ -35,7 +35,7 @@ arg_out: 0 buffer int[1] 28
>  arg_in:  1 buffer int[1] NULL
>  
>  [test]
> -name: threads
> +name: threads uint
>  kernel_name: threads_uint
>  dimensions: 1
>  global_size: 8 0 0
> diff --git a/tests/cl/program/execute/builtin/atomic/atomic_xchg-local.cl b/tests/cl/program/execute/builtin/atomic/atomic_xchg-local.cl
> index d751f4a..d23c065 100644
> --- a/tests/cl/program/execute/builtin/atomic/atomic_xchg-local.cl
> +++ b/tests/cl/program/execute/builtin/atomic/atomic_xchg-local.cl
> @@ -37,7 +37,7 @@ arg_in:  2 float           4.0
>  arg_in:  3 float           5.0
>  
>  [test]
> -name: threads
> +name: threads int
>  kernel_name: threads_int
>  dimensions: 1
>  global_size: 8 0 0
> @@ -46,7 +46,7 @@ arg_out: 0 buffer int[1] 7
>  arg_in:  1 buffer int[1] NULL
>  
>  [test]
> -name: threads
> +name: threads uint
>  kernel_name: threads_uint
>  dimensions: 1
>  global_size: 8 0 0
> diff --git a/tests/cl/program/execute/builtin/atomic/atomic_xor-local.cl b/tests/cl/program/execute/builtin/atomic/atomic_xor-local.cl
> index dcf0377..5673d19 100644
> --- a/tests/cl/program/execute/builtin/atomic/atomic_xor-local.cl
> +++ b/tests/cl/program/execute/builtin/atomic/atomic_xor-local.cl
> @@ -27,7 +27,7 @@ arg_in:  2 uint           4
>  arg_in:  3 uint           5
>  
>  [test]
> -name: threads
> +name: threads int
>  kernel_name: threads_int
>  dimensions: 1
>  global_size: 8 0 0
> @@ -36,7 +36,7 @@ arg_out: 0 buffer int[1] 0
>  arg_in:  1 buffer int[1] NULL
>  
>  [test]
> -name: threads
> +name: threads uint
>  kernel_name: threads_uint
>  dimensions: 1
>  global_size: 8 0 0


-- 
Jan Vesely <jan.vesely at rutgers.edu>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part
URL: <http://lists.freedesktop.org/archives/piglit/attachments/20140925/0259cf9e/attachment-0001.sig>


More information about the Piglit mailing list