P4 to Git Change 1303140 by lmoriche@lmoriche_opencl_dev on 2016/08/15 17:04:37

SWDEV-94610 - Code provided by Wilkin - Implement the roc Program Manager to call the Lightning Compiler instead of the compiler library.
	- Embed and use the pre-compiled header generated by the built-in library build
	- If LLVM_BIN is not set, try to find Clang from the libamdocl path

	Testing: http://ocltc.amd.com:8111/viewModification.html?modId=75068&personal=true&buildTypeId=&tab=vcsModificationBuilds&show_all_builds=true

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/elf/elf.cpp#35 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/elf/elf.hpp#24 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/blitcl.cpp#9 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#200 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/build/Makefile.oclrocm#7 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/roccompiler.cpp#5 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#7 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.cpp#5 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.hpp#4 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocmetadata.cpp#1 add
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocmetadata.hpp#1 add
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#7 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.hpp#5 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocvirtual.cpp#8 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/program.cpp#81 edit
Este commit está contenido en:
foreman
2016-08-15 18:51:49 -04:00
padre 7aebeaacb2
commit e682abb47e
Se han modificado 14 ficheros con 1924 adiciones y 135 borrados
+75 -72
Ver fichero
@@ -6,24 +6,8 @@ namespace device {
#define BLIT_KERNELS(...) #__VA_ARGS__
const char* BlitSourceCode = BLIT_KERNELS(
extern void __amd_copyBufferToImage(
__global uint*, __write_only image2d_array_t, ulong4,
int4, int4, uint4, ulong4);
extern void __amd_copyImageToBuffer(
__read_only image2d_array_t, __global uint*, __global ushort*,
__global uchar*, int4, ulong4, int4, uint4, ulong4);
extern void __amd_copyImage(
__read_only image2d_array_t, __write_only image2d_array_t,
int4, int4, int4);
extern void __amd_copyImage1DA(
__read_only image2d_array_t, __write_only image2d_array_t,
int4, int4, int4);
const char* BlitSourceCode =
BLIT_KERNELS(
extern void __amd_copyBufferRect(
__global uchar*, __global uchar*,
ulong4, ulong4, ulong4);
@@ -44,58 +28,6 @@ extern void __amd_fillBuffer(
__global uchar*, __global uint*, __constant uchar*,
uint, ulong, ulong);
extern void __amd_fillImage(
__write_only image2d_array_t,
float4, int4, uint4, int4, int4, uint);
__kernel void copyBufferToImage(
__global uint* src,
__write_only image2d_array_t dst,
ulong4 srcOrigin,
int4 dstOrigin,
int4 size,
uint4 format,
ulong4 pitch)
{
__amd_copyBufferToImage(src, dst, srcOrigin, dstOrigin, size, format, pitch);
}
__kernel void copyImageToBuffer(
__read_only image2d_array_t src,
__global uint* dstUInt,
__global ushort* dstUShort,
__global uchar* dstUChar,
int4 srcOrigin,
ulong4 dstOrigin,
int4 size,
uint4 format,
ulong4 pitch)
{
__amd_copyImageToBuffer(src, dstUInt, dstUShort, dstUChar,
srcOrigin, dstOrigin, size, format, pitch);
}
__kernel void copyImage(
__read_only image2d_array_t src,
__write_only image2d_array_t dst,
int4 srcOrigin,
int4 dstOrigin,
int4 size)
{
__amd_copyImage(src, dst, srcOrigin, dstOrigin, size);
}
__kernel void copyImage1DA(
__read_only image2d_array_t src,
__write_only image2d_array_t dst,
int4 srcOrigin,
int4 dstOrigin,
int4 size)
{
__amd_copyImage1DA(src, dst, srcOrigin, dstOrigin, size);
}
__kernel void copyBufferRect(
__global uchar* src,
__global uchar* dst,
@@ -148,6 +80,76 @@ __kernel void fillBuffer(
{
__amd_fillBuffer(bufUChar, bufUInt, pattern, patternSize, offset, size);
}
)
#if !defined(WITH_LIGHTNING_COMPILER)
BLIT_KERNELS(
extern void __amd_copyBufferToImage(
__global uint*, __write_only image2d_array_t, ulong4,
int4, int4, uint4, ulong4);
extern void __amd_copyImageToBuffer(
__read_only image2d_array_t, __global uint*, __global ushort*,
__global uchar*, int4, ulong4, int4, uint4, ulong4);
extern void __amd_copyImage(
__read_only image2d_array_t, __write_only image2d_array_t,
int4, int4, int4);
extern void __amd_copyImage1DA(
__read_only image2d_array_t, __write_only image2d_array_t,
int4, int4, int4);
extern void __amd_fillImage(
__write_only image2d_array_t,
float4, int4, uint4, int4, int4, uint);
__kernel void copyBufferToImage(
__global uint* src,
__write_only image2d_array_t dst,
ulong4 srcOrigin,
int4 dstOrigin,
int4 size,
uint4 format,
ulong4 pitch)
{
__amd_copyBufferToImage(src, dst, srcOrigin, dstOrigin, size, format, pitch);
}
__kernel void copyImageToBuffer(
__read_only image2d_array_t src,
__global uint* dstUInt,
__global ushort* dstUShort,
__global uchar* dstUChar,
int4 srcOrigin,
ulong4 dstOrigin,
int4 size,
uint4 format,
ulong4 pitch)
{
__amd_copyImageToBuffer(src, dstUInt, dstUShort, dstUChar,
srcOrigin, dstOrigin, size, format, pitch);
}
__kernel void copyImage(
__read_only image2d_array_t src,
__write_only image2d_array_t dst,
int4 srcOrigin,
int4 dstOrigin,
int4 size)
{
__amd_copyImage(src, dst, srcOrigin, dstOrigin, size);
}
__kernel void copyImage1DA(
__read_only image2d_array_t src,
__write_only image2d_array_t dst,
int4 srcOrigin,
int4 dstOrigin,
int4 size)
{
__amd_copyImage1DA(src, dst, srcOrigin, dstOrigin, size);
}
__kernel void fillImage(
__write_only image2d_array_t image,
@@ -161,7 +163,8 @@ __kernel void fillImage(
__amd_fillImage(image, patternFLOAT4, patternINT4, patternUINT4,
origin, size, type);
}
);
)
#endif // !defined(WITH_LIGHTNING_COMPILER)
;
} // namespace device