P4 to Git Change 1723669 by kzhuravl@kzhuravl-fiji-ocllc-2 on 2018/12/23 13:22:07

SWDEV-173685 - Fix retrieval of required work group size metadata

	Pre-checkin: http://ocltc.amd.com:8111/viewModification.html?modId=113287&personal=true&init=1&tab=vcsModificationBuilds
	Review: http://ocltc.amd.com/reviews/r/16377/

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.hpp#12 edit

rocclr/runtime/device/devkernel.hpp

@@ -52,7 +52,7 @@ enum class ArgField : uint8_t {
 };
 
 enum class AttrField : uint8_t {
-  ReqWorkGroupSize  = 0,
+  ReqdWorkGroupSize  = 0,
   WorkGroupSizeHint = 1,
   VecTypeHint       = 2,
   RuntimeHandle     = 3
@@ -146,7 +146,7 @@ static const std::map<std::string,AddressSpaceQualifier> ArgAddrSpaceQual =
 
 static const std::map<std::string,AttrField> AttrFieldMap =
 {
-  {"ReqWorkGroupSize",    AttrField::ReqWorkGroupSize},
+  {"ReqdWorkGroupSize",   AttrField::ReqdWorkGroupSize},
   {"WorkGroupSizeHint",   AttrField::WorkGroupSizeHint},
   {"VecTypeHint",         AttrField::VecTypeHint},
   {"RuntimeHandle",       AttrField::RuntimeHandle}
@@ -580,7 +580,7 @@ static amd_comgr_status_t populateAttrs(const amd_comgr_metadata_node_t key,
 
   KernelMD* kernelMD = static_cast<KernelMD*>(data);
   switch (itAttrField->second) {
-    case AttrField::ReqWorkGroupSize:
+    case AttrField::ReqdWorkGroupSize:
       {
         status = amd::Comgr::get_metadata_list_size(value, &size);
         if (size == 3 && status == AMD_COMGR_STATUS_SUCCESS) {