The tests try to use target mem type aligned access. Generated tests pass (except vstore-half which skips) on intel(cpu), beignet, nvidia CUDA vstore-half passes on patched beignet
Signed-off-by: Jan Vesely <jan.ves...@rutgers.edu> --- This patch replaces patches 1,3,4. sorry for the noise. generated_tests/CMakeLists.txt | 4 + generated_tests/gen_cl_vstore_tests.py | 133 +++++++++++++++++++++++++++++++++ tests/cl.py | 2 + tests/cl/program/execute/vstore-int.cl | 126 ------------------------------- 4 files changed, 139 insertions(+), 126 deletions(-) create mode 100644 generated_tests/gen_cl_vstore_tests.py delete mode 100644 tests/cl/program/execute/vstore-int.cl diff --git a/generated_tests/CMakeLists.txt b/generated_tests/CMakeLists.txt index 7240572..ff43af5 100644 --- a/generated_tests/CMakeLists.txt +++ b/generated_tests/CMakeLists.txt @@ -202,6 +202,9 @@ piglit_make_generated_tests( cl_store_tests.list gen_cl_store_tests.py) piglit_make_generated_tests( + cl_vstore_tests.list + gen_cl_vstore_tests.py) +piglit_make_generated_tests( builtin_cl_math_tests.list gen_cl_math_builtins.py) piglit_make_generated_tests( @@ -255,6 +258,7 @@ add_custom_target(gen-cl-tests builtin_cl_relational_tests.list builtin_cl_common_tests.list cl_store_tests.list + cl_vstore_tests.list ) # Add a "gen-tests" target that can be used to generate all the diff --git a/generated_tests/gen_cl_vstore_tests.py b/generated_tests/gen_cl_vstore_tests.py new file mode 100644 index 0000000..b947705 --- /dev/null +++ b/generated_tests/gen_cl_vstore_tests.py @@ -0,0 +1,133 @@ +# Copyright 2013 Advanced Micro Devices, Inc. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# +# Authors: Tom Stellard <thomas.stell...@amd.com> +# +# + +from __future__ import print_function, division, absolute_import +import os +import textwrap +import random + +from six.moves import range + +from modules import utils + +TYPES = ['char', 'uchar', 'short', 'ushort', 'int', 'uint', 'long', 'ulong', 'half', 'float', 'double'] +VEC_SIZES = ['2', '4', '8', '16'] + +dirName = os.path.join("cl", "vstore") +utils.safe_makedirs(dirName) + + +def gen_array(size): + random.seed(size) + return ' '.join([str(random.randint(0, 255)) for i in range(size)]) + + +def ext_req(type_name): + if type_name[:6] == "double": + return "require_device_extensions: cl_khr_fp64" + if type_name[:6] == "half": + return "require_device_extensions: cl_khr_fp16" + return "" + +def begin_test(suffix, type_name, addr_space): + fileName = os.path.join(dirName, 'vstore'+ suffix + '-' + type_name + '-' + addr_space + '.cl') + print(fileName) + f = open(fileName, 'w') + f.write(textwrap.dedent((""" + /*! + [config] + name: Vector store{suffix} {type_name}2,4,8,16 + clc_version_min: 10 + + dimensions: 1 + global_size: 1 0 0 + """ + ext_req(type_name)) + .format(type_name=type_name, addr_space=addr_space, suffix=suffix))) + return f + +def gen_test(suffix, t, mem_type, vec_sizes): + f = begin_test(suffix, t, 'global') + for s in vec_sizes: + size = int(s) if s != '' else 1 + type_name = t + s + f.write(textwrap.dedent(""" + [test] + name: vector store{suffix} global {type_name} + kernel_name: vstore{suffix}{n}_global + arg_out: 0 buffer {mem_type}[{size}] 0 {gen_array} + arg_in: 1 buffer {type_name}[1] {gen_array} + + [test] + name: vector store{suffix} global offset {type_name} + kernel_name: vstore{suffix}{n}_global_offset + arg_out: 0 buffer {mem_type}[{offset_size}] {zeros} {gen_array} + arg_in: 1 buffer {type_name}[1] {gen_array} + """.format(type_name=type_name, mem_type=mem_type, size=size + 1, + zeros=("0 " * (size + 1)), offset_size=size*2 + 1, n=s, + gen_array=gen_array(size), suffix=suffix))) + + f.write(textwrap.dedent(""" + !*/ + """)) + if t == "double": + f.write(textwrap.dedent(""" + #pragma OPENCL EXTENSION cl_khr_fp64: enable + """)) + if t == "half": + f.write(textwrap.dedent(""" + #pragma OPENCL EXTENSION cl_khr_fp16: enable + """)) + for s in vec_sizes: + type_name = t + s + f.write(textwrap.dedent(""" + kernel void vstore{suffix}{n}_global(global {mem_type} *out, + global {type_name} *in) {{ + {type_name} tmp = in[0]; + vstore{suffix}{n}(({type_name})0, 0, out); + vstore{suffix}{n}(tmp, 0, out + 1); + }} + + kernel void vstore{suffix}{n}_global_offset(global {mem_type} *out, + global {type_name} *in) {{ + {type_name} tmp = ({type_name})0; + vstore{suffix}{n}(tmp, 0, out); + vstore{suffix}{n}(tmp, 0, out + 1); + tmp = in[0]; + vstore{suffix}{n}(tmp, 1, out + 1); + }} + """.format(type_name=type_name, mem_type=mem_type, n=s, suffix=suffix))) + + f.close() + + +def main(): + for t in TYPES: + gen_test('', t, t, VEC_SIZES); + +gen_test('_half', 'float', 'half', [''] + VEC_SIZES); +gen_test('_half', 'double', 'half', [''] + VEC_SIZES); + +if __name__ == '__main__': + main() diff --git a/tests/cl.py b/tests/cl.py index 6679930..353ab05 100644 --- a/tests/cl.py +++ b/tests/cl.py @@ -138,3 +138,5 @@ add_program_test_dir(grouptools.join('program', 'execute', 'builtin'), 'common')) add_program_test_dir(grouptools.join('program', 'execute', 'store'), os.path.join(GENERATED_TESTS_DIR, 'cl', 'store')) +add_program_test_dir(grouptools.join('program', 'execute', 'vstore'), + os.path.join(GENERATED_TESTS_DIR, 'cl', 'vstore')) diff --git a/tests/cl/program/execute/vstore-int.cl b/tests/cl/program/execute/vstore-int.cl deleted file mode 100644 index 103a0a8..0000000 --- a/tests/cl/program/execute/vstore-int.cl +++ /dev/null @@ -1,126 +0,0 @@ -/*! -[config] -name: Vector store int2,3,4,8,16 -clc_version_min: 10 - -dimensions: 1 -global_size: 1 0 0 - -[test] -name: vector store int2 -kernel_name: vstore2_test -arg_out: 0 buffer int[2] 56 65 -arg_in: 1 buffer int[2] 56 65 - -[test] -name: vector store int2 with offset -kernel_name: vstore2_offset -arg_out: 0 buffer int[4] 0 0 56 65 -arg_in: 1 buffer int[2] 56 65 - -[test] -name: vector store int3 -kernel_name: vstore3_test -arg_out: 0 buffer int[3] 56 65 12 -arg_in: 1 buffer int[3] 56 65 12 - -[test] -name: vector store int3 with offset -kernel_name: vstore3_offset -arg_out: 0 buffer int[6] 0 0 0 56 65 12 -arg_in: 1 buffer int[3] 56 65 12 - -[test] -name: vector store int4 -kernel_name: vstore4_test -arg_out: 0 buffer int[4] 56 65 18 81 -arg_in: 1 buffer int[4] 56 65 18 81 - -[test] -name: vector store int4 with offset -kernel_name: vstore4_offset -arg_out: 0 buffer int[8] 0 0 0 0 56 65 18 81 -arg_in: 1 buffer int[4] 56 65 18 81 - -[test] -name: vector store int8 -kernel_name: vstore8_test -arg_out: 0 buffer int[8] 56 65 18 81 12 21 34 43 -arg_in: 1 buffer int[8] 56 65 18 81 12 21 34 43 - -[test] -name: vector store int8 with offset -kernel_name: vstore8_offset -arg_out: 0 buffer int[16] 0 0 0 0 0 0 0 0 56 65 18 81 12 21 34 43 -arg_in: 1 buffer int[8] 56 65 18 81 12 21 34 43 - -[test] -name: vector store int16 -kernel_name: vstore16_test -arg_out: 0 buffer int[16] 56 65 18 81 12 21 34 43 23 32 67 76 78 87 89 98 -arg_in: 1 buffer int[16] 56 65 18 81 12 21 34 43 23 32 67 76 78 87 89 98 - -[test] -name: vector store int16 with offset -kernel_name: vstore16_offset -arg_out: 0 buffer int[32] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 \ - 56 65 18 81 12 21 34 43 23 32 67 76 78 87 89 98 -arg_in: 1 buffer int[16] 56 65 18 81 12 21 34 43 23 32 67 76 78 87 89 98 -!*/ - -kernel void vstore2_test(global int* out, global int* in) { - int2 val = {in[0], in[1]}; - vstore2(val, 0, out); -} - -kernel void vstore2_offset(global int* out, global int* in) { - int2 val = {in[0], in[1]}; - vstore2((int2)0, 0, out); - vstore2(val, 1, out); -} - -kernel void vstore3_test(global int* out, global int* in) { - int3 val = {in[0], in[1], in[2]}; - vstore3(val, 0, out); -} - -kernel void vstore3_offset(global int* out, global int* in) { - int3 val = {in[0], in[1], in[2]}; - vstore3((int3)0, 0, out); - vstore3(val, 1, out); -} - -kernel void vstore4_test(global int* out, global int* in) { - int4 val = {in[0], in[1], in[2], in[3]}; - vstore4(val, 0, out); -} - -kernel void vstore4_offset(global int* out, global int* in) { - int4 val = {in[0], in[1], in[2], in[3]}; - vstore4((int4)0, 0, out); - vstore4(val, 1, out); -} - -kernel void vstore8_test(global int* out, global int* in) { - int8 val = {in[0], in[1], in[2], in[3], in[4], in[5], in[6], in[7]}; - vstore8(val, 0, out); -} - -kernel void vstore8_offset(global int* out, global int* in) { - int8 val = {in[0], in[1], in[2], in[3], in[4], in[5], in[6], in[7]}; - vstore8((int8)0, 0, out); - vstore8(val, 1, out); -} - -kernel void vstore16_test(global int* out, global int* in) { - int16 val = {in[0], in[1], in[2], in[3], in[4], in[5], in[6], in[7], - in[8], in[9], in[10], in[11], in[12], in[13], in[14], in[15]}; - vstore16(val, 0, out); -} - -kernel void vstore16_offset(global int* out, global int* in) { - int16 val = {in[0], in[1], in[2], in[3], in[4], in[5], in[6], in[7], - in[8], in[9], in[10], in[11], in[12], in[13], in[14], in[15]}; - vstore16((int16)0, 0, out); - vstore16(val, 1, out); -} -- 2.7.4 _______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit