Skip to content

Commit 31c6e03

Browse files
Remove size_t from kernel argument in ULTs
Change-Id: I1fb772fd99ca69bc14f283d6ecc49be95523ce59 Signed-off-by: Adam Cetnerowski <[email protected]>
1 parent e39139d commit 31c6e03

File tree

4 files changed

+12
-27
lines changed

4 files changed

+12
-27
lines changed

unit_tests/aub_tests/gen10/execution_model/enqueue_parent_kernel_tests_gen10.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ GEN10TEST_F(GEN10AUBParentKernelFixture, DISABLED_EnqueueParentKernel) {
7676
CL_FILTER_LINEAR,
7777
retVal);
7878

79-
size_t argScalar = 2;
79+
uint64_t argScalar = 2;
8080
pKernel->setArg(
8181
3,
82-
sizeof(size_t),
82+
sizeof(uint64_t),
8383
&argScalar);
8484

8585
pKernel->setArg(

unit_tests/aub_tests/gen8/execution_model/enqueue_parent_kernel_tests_gen8.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ GEN8TEST_F(GEN8AUBParentKernelFixture, EnqueueParentKernel) {
7575
CL_FILTER_LINEAR,
7676
retVal));
7777

78-
size_t argScalar = 2;
78+
uint64_t argScalar = 2;
7979
pKernel->setArg(
8080
3,
81-
sizeof(size_t),
81+
sizeof(uint64_t),
8282
&argScalar);
8383

8484
pKernel->setArg(

unit_tests/aub_tests/gen9/execution_model/enqueue_parent_kernel_tests_gen9.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ GEN9TEST_F(AUBParentKernelFixture, EnqueueParentKernel) {
7474
CL_FILTER_LINEAR,
7575
retVal);
7676

77-
size_t argScalar = 2;
77+
uint64_t argScalar = 2;
7878
pKernel->setArg(
7979
3,
80-
sizeof(size_t),
80+
sizeof(uint64_t),
8181
&argScalar);
8282

8383
pKernel->setArg(

unit_tests/test_files/simple_block_kernel.cl

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,8 @@
11
/*
2-
* Copyright (c) 2017, Intel Corporation
2+
* Copyright (C) 2017-2018 Intel Corporation
33
*
4-
* Permission is hereby granted, free of charge, to any person obtaining a
5-
* copy of this software and associated documentation files (the "Software"),
6-
* to deal in the Software without restriction, including without limitation
7-
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
8-
* and/or sell copies of the Software, and to permit persons to whom the
9-
* Software is furnished to do so, subject to the following conditions:
4+
* SPDX-License-Identifier: MIT
105
*
11-
* The above copyright notice and this permission notice shall be included
12-
* in all copies or substantial portions of the Software.
13-
*
14-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
15-
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16-
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17-
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
18-
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
19-
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
20-
* OTHER DEALINGS IN THE SOFTWARE.
216
*/
227

238
void block_fn(size_t tid, int mul, __global int* res)
@@ -39,15 +24,15 @@ kernel void simple_block_kernel(__global int* res)
3924
if(enq_res != CLK_SUCCESS) { res[tid] = -1; return; }
4025
}
4126

42-
void block_reflection(size_t scalar, __global uint* buffer, read_only image3d_t img, sampler_t sampler)
27+
void block_reflection(ulong scalar, __global uint* buffer, read_only image3d_t img, sampler_t sampler)
4328
{
4429
float4 color;
4530
int4 coord;
4631
buffer[0] = scalar;
4732
coord.x = scalar;
4833
coord.y = 0;
4934
coord.z = 0;
50-
35+
5136
int width = get_image_width( img );
5237
int heigth = get_image_height( img );
5338
int depth = get_image_depth( img );
@@ -67,7 +52,7 @@ void block_reflection(size_t scalar, __global uint* buffer, read_only image3d_t
6752
color = read_imagef( img, samplerA, coord );
6853

6954
buffer[7] = (uint)color.y;
70-
55+
7156
queue_t def_q = get_default_queue();
7257
ndrange_t ndrange = ndrange_1D(1);
7358
if( scalar > 2 ){
@@ -76,7 +61,7 @@ void block_reflection(size_t scalar, __global uint* buffer, read_only image3d_t
7661
}
7762
}
7863

79-
kernel void kernel_reflection(sampler_t sampler, read_only image3d_t img, __global uint* buffer, size_t scalar )
64+
kernel void kernel_reflection(sampler_t sampler, read_only image3d_t img, __global uint* buffer, ulong scalar)
8065
{
8166
size_t tid = get_global_id(0);
8267

0 commit comments

Comments
 (0)