From 9d8f280d5c3a1c0feb229301b25f07ada0fa6ab3 Mon Sep 17 00:00:00 2001 From: "Chodor, Jaroslaw" Date: Fri, 25 Jan 2019 16:11:28 +0100 Subject: [PATCH] Removing address space qualifiers from literals Change-Id: Iffdc5a8d98f37a3df930d67c39f771c89b24f47c --- .../built_ins/kernels/copy_buffer_to_image3d.igdrcl_built_in | 4 ++-- unit_tests/helpers/kernel_binary_helper.cpp | 2 +- unit_tests/main.cpp | 4 ++-- .../{12523835541146349626.cl => 7030307152995455603.cl} | 4 ++-- ...1146349626_options.txt => 7030307152995455603_options.txt} | 0 5 files changed, 7 insertions(+), 7 deletions(-) rename unit_tests/test_files/{12523835541146349626.cl => 7030307152995455603.cl} (99%) rename unit_tests/test_files/{12523835541146349626_options.txt => 7030307152995455603_options.txt} (100%) diff --git a/runtime/built_ins/kernels/copy_buffer_to_image3d.igdrcl_built_in b/runtime/built_ins/kernels/copy_buffer_to_image3d.igdrcl_built_in index 3b4d8feaee..b35fb688c3 100644 --- a/runtime/built_ins/kernels/copy_buffer_to_image3d.igdrcl_built_in +++ b/runtime/built_ins/kernels/copy_buffer_to_image3d.igdrcl_built_in @@ -35,7 +35,7 @@ __kernel void CopyBufferToImage3dBytes(__global uchar *src, int4 dstCoord = (int4)(x, y, z, 0) + dstOffset; uint LOffset = srcOffset + (y * Pitch.x) + (z * Pitch.y); - write_imageui(output, dstCoord, (__global uint4)(*(src + LOffset + x), 0, 0, 1)); + write_imageui(output, dstCoord, (uint4)(*(src + LOffset + x), 0, 0, 1)); } __kernel void CopyBufferToImage3d2Bytes(__global uchar *src, @@ -124,7 +124,7 @@ __kernel void CopyBufferToImage3d8Bytes(__global uchar *src, c = *((__global uint2*)(src + LOffset + x * 8)); } - write_imageui(output, dstCoord, (__global uint4)(c.x, c.y, 0, 1)); + write_imageui(output, dstCoord, (uint4)(c.x, c.y, 0, 1)); } __kernel void CopyBufferToImage3d16Bytes(__global uchar *src, diff --git a/unit_tests/helpers/kernel_binary_helper.cpp b/unit_tests/helpers/kernel_binary_helper.cpp index 088d3574eb..6dc11ebb5b 100644 --- a/unit_tests/helpers/kernel_binary_helper.cpp +++ b/unit_tests/helpers/kernel_binary_helper.cpp @@ -13,7 +13,7 @@ extern PRODUCT_FAMILY productFamily; -const std::string KernelBinaryHelper::BUILT_INS("12523835541146349626"); +const std::string KernelBinaryHelper::BUILT_INS("7030307152995455603"); KernelBinaryHelper::KernelBinaryHelper(const std::string &name, bool appendOptionsToFileName) { // set mock compiler to return expected kernel diff --git a/unit_tests/main.cpp b/unit_tests/main.cpp index e8a3b96ea1..3295b5805b 100644 --- a/unit_tests/main.cpp +++ b/unit_tests/main.cpp @@ -386,8 +386,8 @@ int main(int argc, char **argv) { MockCompilerDebugVars fclDebugVars; MockCompilerDebugVars igcDebugVars; - retrieveBinaryKernelFilename(fclDebugVars.fileName, "12523835541146349626_", ".bc"); - retrieveBinaryKernelFilename(igcDebugVars.fileName, "12523835541146349626_", ".gen"); + retrieveBinaryKernelFilename(fclDebugVars.fileName, "7030307152995455603_", ".bc"); + retrieveBinaryKernelFilename(igcDebugVars.fileName, "7030307152995455603_", ".gen"); gEnvironment->setMockFileNames(fclDebugVars.fileName, igcDebugVars.fileName); gEnvironment->setDefaultDebugVars(fclDebugVars, igcDebugVars, device); diff --git a/unit_tests/test_files/12523835541146349626.cl b/unit_tests/test_files/7030307152995455603.cl similarity index 99% rename from unit_tests/test_files/12523835541146349626.cl rename to unit_tests/test_files/7030307152995455603.cl index e549301d6c..fc31f08916 100644 --- a/unit_tests/test_files/12523835541146349626.cl +++ b/unit_tests/test_files/7030307152995455603.cl @@ -231,7 +231,7 @@ __kernel void CopyBufferToImage3dBytes(__global uchar *src, int4 dstCoord = (int4)(x, y, z, 0) + dstOffset; uint LOffset = srcOffset + (y * Pitch.x) + (z * Pitch.y); - write_imageui(output, dstCoord, (__global uint4)(*(src + LOffset + x), 0, 0, 1)); + write_imageui(output, dstCoord, (uint4)(*(src + LOffset + x), 0, 0, 1)); } __kernel void CopyBufferToImage3d2Bytes(__global uchar *src, @@ -320,7 +320,7 @@ __kernel void CopyBufferToImage3d8Bytes(__global uchar *src, c = *((__global uint2*)(src + LOffset + x * 8)); } - write_imageui(output, dstCoord, (__global uint4)(c.x, c.y, 0, 1)); + write_imageui(output, dstCoord, (uint4)(c.x, c.y, 0, 1)); } __kernel void CopyBufferToImage3d16Bytes(__global uchar *src, diff --git a/unit_tests/test_files/12523835541146349626_options.txt b/unit_tests/test_files/7030307152995455603_options.txt similarity index 100% rename from unit_tests/test_files/12523835541146349626_options.txt rename to unit_tests/test_files/7030307152995455603_options.txt