P4 to Git Change 1204512 by ashi1@ashi1_win50 on 2015/10/27 17:04:33

SWDEV-79695 -  Checkin again after fixed build issue with ocltst changes. Merged all changes in compiler lib to legacy-lib.

	HSAIL Metadata Workgroup Size Hint and Vec Type Hint added to HSAIL
	HSAIL does not handle kernel attributes for work_group_size_hint or vec_type_hint.

	Adding these two kernel attributes to metadata requires multiple changes:
	  HSAIL: Added parsing functions to HSAILParseMetadata.cpp, and similar files
	    Properly translates to .hsail files as 'wsh' and 'vth'
	  MDParser: Flex scanner now reads new hsail metadata, 'wsh' and 'vth'
	  Acl_metadata: added the two new metadata
	    Uint32_t wsh[3]; // Added case: RT_WORK_GROUP_SIZE_HINT
	    Char *vth; // Added case: RT_VEC_TYPE_HINT
	  Since vth is std::string, it was required to serialize, and then de-serialize for aclMetadata

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/common/v0_8/if_acl.cpp#5 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/MDParser/AMDILMDInterface.h#3 integrate
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/MDParser/AMDILMDParser.l#4 integrate
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/MDParser/AMDILMDTypes.cpp#3 integrate
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/MDParser/lex.yy.cpp#4 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/metadata.cpp#4 integrate
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/include/v0_8/aclEnums.h#4 integrate
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/include/v0_8/aclStructs.h#4 integrate
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/v0_8/if_acl.cpp#81 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/MDParser/AMDILMDInterface.h#6 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/MDParser/AMDILMDParser.l#7 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/MDParser/AMDILMDTypes.cpp#6 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/MDParser/lex.yy.cpp#8 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/metadata.cpp#12 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_8/aclEnums.h#26 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_8/aclStructs.h#21 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/HSAIL/HSAILKernel.h#15 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/HSAIL/HSAILKernelManager.cpp#40 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/HSAIL/HSAILModuleInfo.cpp#18 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/HSAIL/HSAILParseMetadata.cpp#16 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/CLAssumptionCheck.cpp#47 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/CLEnumCheck.cpp#51 edit

rocclr/compiler/lib/include/v0_8/aclEnums.h

@@ -218,7 +218,9 @@ typedef enum _rt_query_types_enum_0_8 {
   RT_NUM_KERNEL_HIDDEN_ARGS = 22,
   RT_CONTAINS_SPIRV         = 23,
   RT_WAVES_PER_SIMD_HINT    = 24,
-  RT_LAST_TYPE              = 25
+  RT_WORK_GROUP_SIZE_HINT   = 25,
+  RT_VEC_TYPE_HINT          = 26,
+  RT_LAST_TYPE              = 27
 } aclQueryType_0_8;
 
 //! An enumeration for the various GPU capabilities

rocclr/compiler/lib/include/v0_8/aclStructs.h

@@ -121,6 +121,9 @@ typedef struct _acl_metadata_0_8 {
   uint32_t kernel_index; // RT_KERNEL_INDEX
   uint32_t numHiddenKernelArgs; // RT_NUM_KERNEL_HIDDEN_ARGS
   uint32_t wavesPerSimdHint; // RT_WAVES_PER_SIMD_HINT
+  uint32_t wsh[3]; // RT_WORK_GROUP_SIZE_HINT
+  size_t vecTypeHintSize;
+  const char *vth; // RT_VEC_TYPE_HINT
 } aclMetadata_0_8;
 
 //! An structure that holds information on the capabilities of the bif device.