AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

P4 to Git Change 1079216 by emankov@em-hsa-amd on 2014/09/22 08:18:24

Browse Source 
ECR #333753 - Compiler Lib/RT: Metadata related code refactor, annotation, minor fixes & additional checks

	+ refactor if_aclQueryInfo() in order to simplify code and to avoid direct usage of aclMetadata struct members types
	+ annotation on why we need to use deserializeCLMetadata on "serialized" (to NULL) pointers
	+ erroneously forgotten RT_KERNEL_NAME was added to aclQueryType enum
	+ OCLRTGetInfo, CLEnumCheck tests from ocltst oclcomplib was updated to use RT_KERNEL_NAME
	+ testing of printf is added to OCLRTGetInfo
	+ minor fixes and additional checks

	tests: pre check-in, ocltst -m oclcomplib

	Reviewers: Artem Tamazov, Brian Sumner, German Andryeyev

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/v0_8/if_acl.cpp#49 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_8/aclEnums.h#12 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_8/aclStructs.h#12 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#265 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/CLEnumCheck.cpp#36 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/clSourceShaders.h#5 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclrtGetInfo.cpp#14 edit
This commit is contained in:
foreman
2014-09-22 08:24:39 -04:00
parent 9f99843ca0
commit d50fa706e3
4 changed files with 247 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rocclr/compiler/lib/include/v0_8/aclEnums.h
+2 -1
View File
@@ -200,7 +200,8 @@ typedef enum _rt_query_types_enum_0_8 {
RT_CPU_BARRIER_NAMES= 10,
RT_DEVICE_ENQUEUE = 11,
RT_KERNEL_INDEX = 12,
RT_LAST_TYPE = 13
RT_KERNEL_NAME = 13,
RT_LAST_TYPE = 14
} aclQueryType_0_8;
//! An enumeration for the various GPU capabilities
rocclr/compiler/lib/include/v0_8/aclStructs.h
+13 -11
View File
@@ -101,22 +101,24 @@ typedef struct _acl_md_printf_fmt_0_8 {
typedef struct _acl_metadata_0_8 {
ACL_STRUCT_HEADER; // This holds the size of the structure itself for versioning.
size_t data_size; // This holds the size of all the memory allocated for this structure.
uint32_t major, minor, revision, gpuCaps, funcID;
uint32_t gpuRes[5];
size_t wgs[3];
uint32_t wrs[3];
uint32_t major, minor, revision; // RT_ABI_VERSION
uint32_t gpuCaps; // RT_GPU_FUNC_CAPS
uint32_t funcID; // RT_GPU_FUNC_ID
uint32_t gpuRes[5]; // RT_GPU_DEFAULT_ID
size_t wgs[3]; // RT_WORK_GROUP_SIZE
uint32_t wrs[3]; // RT_WORK_REGION_SIZE
size_t kernelNameSize;
size_t deviceNameSize;
size_t mem[6];
size_t mem[6]; // RT_MEM_SIZES
size_t numArgs;
size_t numPrintf;
aclArgData_0_8 *args;
aclPrintfFmt_0_8 *printf;
const char *kernelName;
const char *deviceName;
bool enqueue_kernel;
uint32_t kernel_index;
aclArgData_0_8 *args; // RT_ARGUMENT_ARRAY
aclPrintfFmt_0_8 *printf; // RT_GPU_PRINTF_ARRAY
const char *kernelName; // RT_KERNEL_NAME
const char *deviceName; // RT_DEVICE_NAME
bool enqueue_kernel; // RT_DEVICE_ENQUEUE
uint32_t kernel_index; // RT_KERNEL_INDEX
} aclMetadata_0_8;
//! An structure that holds information on the capabilities of the bif device.