Removing address space qualifiers from literals

jchodor · Compute-Runtime-Automation · commit 9d8f280d5c3a · 2019-01-25T17:25:05.000+01:00
Change-Id: Iffdc5a8d98f37a3df930d67c39f771c89b24f47c
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
@@ -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
@@ -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
@@ -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/7030307152995455603.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/7030307152995455603_options.txt b/unit_tests/test_files/7030307152995455603_options.txt

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ __kernel void CopyBufferToImage3dBytes(__global uchar *src,`
`35`	`35`	`int4 dstCoord = (int4)(x, y, z, 0) + dstOffset;`
`36`	`36`	`uint LOffset = srcOffset + (y * Pitch.x) + (z * Pitch.y);`
`37`	`37`
`38`		`- write_imageui(output, dstCoord, (__global uint4)(*(src + LOffset + x), 0, 0, 1));`
	`38`	`+ write_imageui(output, dstCoord, (uint4)(*(src + LOffset + x), 0, 0, 1));`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`__kernel void CopyBufferToImage3d2Bytes(__global uchar *src,`
`@@ -124,7 +124,7 @@ __kernel void CopyBufferToImage3d8Bytes(__global uchar *src,`
`124`	`124`	`c = ((__global uint2)(src + LOffset + x * 8));`
`125`	`125`	`}`
`126`	`126`
`127`		`- write_imageui(output, dstCoord, (__global uint4)(c.x, c.y, 0, 1));`
	`127`	`+ write_imageui(output, dstCoord, (uint4)(c.x, c.y, 0, 1));`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`__kernel void CopyBufferToImage3d16Bytes(__global uchar *src,`
Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ __kernel void CopyBufferToImage3dBytes(__global uchar *src,`
`231`	`231`	`int4 dstCoord = (int4)(x, y, z, 0) + dstOffset;`
`232`	`232`	`uint LOffset = srcOffset + (y * Pitch.x) + (z * Pitch.y);`
`233`	`233`
`234`		`- write_imageui(output, dstCoord, (__global uint4)(*(src + LOffset + x), 0, 0, 1));`
	`234`	`+ write_imageui(output, dstCoord, (uint4)(*(src + LOffset + x), 0, 0, 1));`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`__kernel void CopyBufferToImage3d2Bytes(__global uchar *src,`
`@@ -320,7 +320,7 @@ __kernel void CopyBufferToImage3d8Bytes(__global uchar *src,`
`320`	`320`	`c = ((__global uint2)(src + LOffset + x * 8));`
`321`	`321`	`}`
`322`	`322`
`323`		`- write_imageui(output, dstCoord, (__global uint4)(c.x, c.y, 0, 1));`
	`323`	`+ write_imageui(output, dstCoord, (uint4)(c.x, c.y, 0, 1));`
`324`	`324`	`}`
`325`	`325`
`326`	`326`	`__kernel void CopyBufferToImage3d16Bytes(__global uchar *src,`