[Autobackout][FuncReg]Revert of change: 223ccfd

 ZEBinary: add buffer_address to payload_arguments::arg_type

Add new payload_arg::arg_type::buffer_address to represent the buffer address for stateful access
only argument. The buffer address is needed when a buffer is fully promoted to stateful but the value
of its adderss is used in the kernel. E.g. "if(buffer == nullptr)"

Author: DianaChen

IGC/Compiler/CISACodeGen/OpenCLKernelCodeGen.cpp

@@ -659,8 +659,9 @@ namespace IGC
                 zebin::ZEInfoBuilder::addBindingTableIndex(m_kernelInfo.m_zeBTIArgs,
                     bti_idx, arg_idx);
             }
-
-            // check if all reference are promoted, if it is, we can skip creating stateless payload arg
+            // FIXME: check if all reference are promoted, if it is, we can skip
+            // creating non-bti payload arg
+            /*
             bool is_bti_only =
                 IGC_IS_FLAG_ENABLED(EnableStatelessToStateful) &&
                 IGC_IS_FLAG_ENABLED(EnableStatefulToken) &&
@@ -670,18 +671,11 @@ namespace IGC
                 (kernelArg->getArg()->use_empty() || !GetHasGlobalStatelessAccess())) ||
                     (kernelArg->getArgType() == KernelArg::ArgType::PTR_CONSTANT &&
                     (kernelArg->getArg()->use_empty() || !GetHasConstantStatelessAccess())));
-
-            if (is_bti_only) {
-                // create buffer_address for statefull only arg in case of address check is needed
-                // for example: something like "if(buffer != nullptr)" in the kernel.
-                // this address will be accessed as a value and cannot be de-referenced
-                zebin::zeInfoPayloadArgument& arg = zebin::ZEInfoBuilder::addPayloadArgumentImplicit(m_kernelInfo.m_zePayloadArgs,
-                    zebin::PreDefinedAttrGetter::ArgType::buffer_address,
-                    payloadPosition, kernelArg->getAllocateSize());
-                arg.arg_index = kernelArg->getAssociatedArgNo();
-                arg.offset = payloadPosition;
+            // no need to add normal argument if all use are promoted
+            if (is_bti_only)
                 break;
-            }
+             */
+
             ResourceAllocMD& resAllocMD = GetContext()->getModuleMetaData()->FuncMD[entry].resAllocMD;
             IGC_ASSERT_MESSAGE(resAllocMD.argAllocMDList.size() > 0, "ArgAllocMDList is empty.");
 

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

@@ -176,7 +176,7 @@ struct zeInfoContainer
     HostAccessesTy global_host_access_table;
 };
 struct PreDefinedAttrGetter{
-    static zeinfo_str_t getVersionNumber() { return "1.15"; }
+    static zeinfo_str_t getVersionNumber() { return "1.14"; }
 
     enum class ArgThreadSchedulingMode {
         age_based,
@@ -193,7 +193,6 @@ struct PreDefinedAttrGetter{
         enqueued_local_size,
         global_id_offset,
         private_base_stateless,
-        buffer_address,
         buffer_offset,
         printf_buffer,
         implicit_arg_buffer,
@@ -261,8 +260,6 @@ struct PreDefinedAttrGetter{
             return "global_id_offset";
         case ArgType::private_base_stateless:
             return "private_base_stateless";
-        case ArgType::buffer_address:
-            return "buffer_address";
         case ArgType::buffer_offset:
             return "buffer_offset";
         case ArgType::printf_buffer:

IGC/ZEBinWriter/zebin/spec/zeinfo.md

@@ -7,7 +7,7 @@ SPDX-License-Identifier: MIT
 ============================= end_copyright_notice ==========================-->
 
 # ZE Info
-Version 1.15
+Version 1.14
 
 ## Grammar
 
@@ -166,7 +166,6 @@ Supported <argument_type> of payload_arguments or per_thread_payload_arguments.
 | enqueued_local_size | int32x3 | OpenCL specific feature. The size returned by OCL get_enqueued_local_size API  |
 | global_id_offset | int32x3 | |
 | private_base_stateless | int64 | The base address of private buffer specified at per_thread_memory_buffers |
-| buffer_address | | The address for buffer reference of stateful only memory access. |
 | buffer_offset | | The extra offset for buffer reference to satisfy the alignment requirement of stateful memory access. |
 | printf_buffer | | The address of printf_buffer which holds the printf strings information. |
 | implicit_arg_buffer | int64 | The base address of implicit arg buffer |
@@ -301,7 +300,6 @@ Format: \<_Major number_\>.\<_Minor number_\>
 - Minor number: Increase when backward-compatible features are added. For example, add new attributes.
 
 ## Change Note
-- **Version 1.15**: Add buffer_address to payload argument type.
 - **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.