ZEBIN: Add slm_alignment to .ze_info payload argument.

Provide the alignment of slm local pointer for runtime to set the
alignment requirement accordingly.

Author: petechou

IGC/Compiler/CISACodeGen/OpenCLKernelCodeGen.cpp

@@ -698,7 +698,8 @@ namespace IGC
                 kernelArg->getAssociatedArgNo(),
                 zebin::PreDefinedAttrGetter::ArgAddrMode::slm,
                 zebin::PreDefinedAttrGetter::ArgAddrSpace::local,
-                zebin::PreDefinedAttrGetter::ArgAccessType::readwrite);
+                zebin::PreDefinedAttrGetter::ArgAccessType::readwrite,
+                kernelArg->getAlignment());
             break;
         // by value arguments
         case KernelArg::ArgType::CONSTANT_REG:

IGC/ZEBinWriter/zebin/source/ZEELFObjectBuilder.cpp

@@ -965,7 +965,8 @@ zeInfoPayloadArgument& ZEInfoBuilder::addPayloadArgumentByPointer(
     int32_t arg_index,
     PreDefinedAttrGetter::ArgAddrMode addrmode,
     PreDefinedAttrGetter::ArgAddrSpace addrspace,
-    PreDefinedAttrGetter::ArgAccessType access_type)
+    PreDefinedAttrGetter::ArgAccessType access_type,
+    int32_t alignment)
 {
     arg_list.emplace_back();
     zeInfoPayloadArgument& arg = arg_list.back();
@@ -976,6 +977,13 @@ zeInfoPayloadArgument& ZEInfoBuilder::addPayloadArgumentByPointer(
     arg.addrmode = PreDefinedAttrGetter::get(addrmode);
     arg.addrspace = PreDefinedAttrGetter::get(addrspace);
     arg.access_type = PreDefinedAttrGetter::get(access_type);
+
+    if (addrmode == PreDefinedAttrGetter::ArgAddrMode::slm &&
+        addrspace == PreDefinedAttrGetter::ArgAddrSpace::local) {
+        arg.slm_alignment = alignment;
+    } else {
+        IGC_ASSERT_MESSAGE(alignment == 0, "Only expect a nonzero alignment for slm ptr now");
+    }
     return arg;
 }
 

IGC/ZEBinWriter/zebin/source/ZEELFObjectBuilder.hpp

@@ -411,7 +411,8 @@ class ZEInfoBuilder {
         int32_t arg_index,
         PreDefinedAttrGetter::ArgAddrMode addrmode,
         PreDefinedAttrGetter::ArgAddrSpace addrspace,
-        PreDefinedAttrGetter::ArgAccessType access_type);
+        PreDefinedAttrGetter::ArgAccessType access_type,
+        int32_t alignment = 0);
 
     // addPayloadArgumentByValue - add explicit kernel argument with pass by
     // value type into given arg_list

IGC/ZEBinWriter/zebin/source/autogen/ZEInfo.hpp

@@ -61,7 +61,7 @@ struct zeInfoPayloadArgument
 {
     bool operator==(const zeInfoPayloadArgument& other) const
     {
-        return arg_type == other.arg_type && offset == other.offset && size == other.size && arg_index == other.arg_index && addrmode == other.addrmode && addrspace == other.addrspace && access_type == other.access_type && sampler_index == other.sampler_index && source_offset == other.source_offset;
+        return arg_type == other.arg_type && offset == other.offset && size == other.size && arg_index == other.arg_index && addrmode == other.addrmode && addrspace == other.addrspace && access_type == other.access_type && sampler_index == other.sampler_index && source_offset == other.source_offset && slm_alignment == other.slm_alignment;
     }
     zeinfo_str_t arg_type;
     zeinfo_int32_t offset = 0;
@@ -72,6 +72,7 @@ struct zeInfoPayloadArgument
     zeinfo_str_t access_type;
     zeinfo_int32_t sampler_index = -1;
     zeinfo_int32_t source_offset = -1;
+    zeinfo_int32_t slm_alignment = 0;
 };
 struct zeInfoPerThreadPayloadArgument
 {
@@ -175,7 +176,7 @@ struct zeInfoContainer
     HostAccessesTy global_host_access_table;
 };
 struct PreDefinedAttrGetter{
-    static zeinfo_str_t getVersionNumber() { return "1.13"; }
+    static zeinfo_str_t getVersionNumber() { return "1.14"; }
 
     enum class ArgThreadSchedulingMode {
         age_based,

IGC/ZEBinWriter/zebin/source/autogen/ZEInfoYAML.cpp

@@ -78,6 +78,7 @@ void MappingTraits<zeInfoPayloadArgument>::mapping(IO& io, zeInfoPayloadArgument
     io.mapOptional("access_type", info.access_type, std::string());
     io.mapOptional("sampler_index", info.sampler_index, -1);
     io.mapOptional("source_offset", info.source_offset, -1);
+    io.mapOptional("slm_alignment", info.slm_alignment, 0);
 }
 void MappingTraits<zeInfoPerThreadPayloadArgument>::mapping(IO& io, zeInfoPerThreadPayloadArgument& info)
 {

IGC/ZEBinWriter/zebin/spec/zeinfo.md

@@ -7,7 +7,7 @@ SPDX-License-Identifier: MIT
 ============================= end_copyright_notice ==========================-->
 
 # ZE Info
-Version 1.13
+Version 1.14
 
 ## Grammar
 
@@ -149,6 +149,7 @@ If an attribute is **Required**, it must be present in payload arguments. If it'
 | access_type | <access_type> | Optional | | Present when arg_type is "arg_bypointer" |
 | sampler_index | int32 | Optional | -1 | Present when arg_type is "arg_bypointer" and address_space is "sampler" |
 | source_offset | int32 | Optional | -1 | Present when arg_type is "arg_byvalue" and the arg is a flattened aggregate element |
+| slm_alignment | int32 | Optional | 0 | Present when arg_type is "arg_bypointer", addrmode is "slm" and address_space is "local" |
 <!--- PayloadArgument PayloadArguments -->
 
 ### Supported argument types:
@@ -299,6 +300,7 @@ Format: \<_Major number_\>.\<_Minor number_\>
 - Minor number: Increase when backward-compatible features are added. For example, add new attributes.
 
 ## Change Note
+- **Version 1.14**: Add slm_alignment to payload argument.
 - **Version 1.13**: Add functions with the name and execution env.
 - **Version 1.12**: Add global_host_access_table to container.
 - **Version 1.11**: Add require_disable_eufusion attribute.