[Autobackout][FuncReg]Revert of change: 884fd4a

 IGC: Support relocation on cross_thread_data_size

In kernel's per-thread-load-payload, create a relocation for
cross_thread_size (per_thread_payload_offset) in case of
cross_thread_size is changed after compilation (e.g. gtpin inserted argument).
The relocation can be resolved to the new cross_thread_size.

- Add R_SYM_ADDR_16 relocation to support relocating mad's 16b imm
  source
- Add relocation for cross_thread_size with symbol name
  "__INTEL_PER_THREAD_OFF" to indicate the usage of this relocation
- Update ZEBinary spec

Author: DianaChen

IGC/AdaptorOCL/OCL/sp/zebin_builder.cpp

@@ -413,9 +413,6 @@ void ZEBinaryBuilder::addRuntimeSymbols(const IGC::SOpenCLProgramInfo& annotatio
     if (annotations.m_hasCrossThreadOffsetRelocations)
         mBuilder.addSymbol(vISA::CROSS_THREAD_OFF_R0_RELOCATION_NAME, /*addr*/0, /*size*/0,
             llvm::ELF::STB_GLOBAL, llvm::ELF::STT_NOTYPE, /*sectionId*/-1);
-    if (annotations.m_hasPerThreadOffsetRelocations)
-        mBuilder.addSymbol(vISA::PER_THREAD_OFF_RELOCATION_NAME, /*addr*/0, /*size*/0,
-            llvm::ELF::STB_GLOBAL, llvm::ELF::STT_NOTYPE, /*sectionId*/-1);
 }
 
 void ZEBinaryBuilder::addProgramSymbols(const IGC::SOpenCLProgramInfo& annotations)
@@ -863,12 +860,12 @@ void ZEBinaryBuilder::addElfSections(void* elfBin, size_t elfSize)
                                 }
 
                                 unsigned int relocType = relocEntry.r_info & 0xF;
-                                zebin::R_TYPE_ZEBIN zebinType = R_NONE;
+                                zebin::R_TYPE_ZEBIN zebinType = R_ZE_NONE;
 
                                 if (relocType == ELF::R_X86_64_64)
-                                    zebinType = R_SYM_ADDR;
+                                    zebinType = R_ZE_SYM_ADDR;
                                 else if (relocType == ELF::R_X86_64_32)
-                                    zebinType = R_SYM_ADDR_32;
+                                    zebinType = R_ZE_SYM_ADDR_32;
                                 else
                                     IGC_ASSERT_MESSAGE(false, "Unsupported ELF relocation type");
 

IGC/Compiler/CISACodeGen/CISABuilder.cpp

@@ -6785,11 +6785,7 @@ namespace IGC
                     IGC_ASSERT(context->type == ShaderType::OPENCL_SHADER);
                     auto cl_context = static_cast<OpenCLProgramContext*>(context);
                     cl_context->m_programInfo.m_hasCrossThreadOffsetRelocations = true;
-                }
-                else if (reloc.r_symbol == vISA::PER_THREAD_OFF_RELOCATION_NAME) {
-                    IGC_ASSERT(context->type == ShaderType::OPENCL_SHADER);
-                    auto cl_context = static_cast<OpenCLProgramContext*>(context);
-                    cl_context->m_programInfo.m_hasPerThreadOffsetRelocations = true;
+                    break;
                 }
             }
         }

IGC/Compiler/CodeGenPublic.h

@@ -678,7 +678,6 @@ namespace IGC
         LegacySymbolTable m_legacySymbolTable;
         ZEBinGlobalHostAccessTable m_zebinGlobalHostAccessTable;
         bool m_hasCrossThreadOffsetRelocations = false;
-        bool m_hasPerThreadOffsetRelocations = false;
     };
 
     class CBTILayout

IGC/ZEBinWriter/zebin/source/ZEELF.h

@@ -41,14 +41,10 @@ enum SHT_ZEBIN : uint32_t
 // ELF relocation type for ELF32_Rel::ELF32_R_TYPE
 enum R_TYPE_ZEBIN
 {
-    R_NONE = 0,
-    R_SYM_ADDR = 1,       // 64-bit type address
-    R_SYM_ADDR_32 = 2,    // 32-bit address or lower 32-bit of a 64-bit address.
-    R_SYM_ADDR_32_HI = 3, // higher 32 bits of 64-bit address
-    R_PER_THREAD_PAYLOAD_OFFSET_32 = 4, // *** Deprecated. Do Not Use. ***
-    R_GLOBAL_IMM_32 = 5,  // 32-bit global immediate
-    R_SEND = 6,           // send instruction offset, used for BTI patching
-    R_SYM_ADDR_16 = 7     // 16-bit address or immediate
+    R_ZE_NONE           = 0,
+    R_ZE_SYM_ADDR       = 1, // 64-bit type address
+    R_ZE_SYM_ADDR_32    = 2, // lower 32-bit of 64-bit address.
+    R_ZE_SYM_ADDR_32_HI = 3  // higher 32bits of 64-bit address
 };
 
 // ELF note type for INTELGT

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

@@ -241,7 +241,7 @@ struct zeInfoContainer
     KernelsMiscInfoTy kernels_misc_info;
 };
 struct PreDefinedAttrGetter{
-    static zeinfo_str_t getVersionNumber() { return "1.44"; }
+    static zeinfo_str_t getVersionNumber() { return "1.43"; }
 
     enum class ArgThreadSchedulingMode {
         age_based,

IGC/ZEBinWriter/zebin/spec/elf.md

@@ -221,14 +221,11 @@ lower than 2.
 Relocation type for **ELF32_R_TYPE** or **ELF64_R_TYPE**
 ~~~
 enum GenRelocType {
-    R_NONE                         = 0,
-    R_SYM_ADDR                     = 1, // 64-bit address
-    R_SYM_ADDR_32                  = 2, // 32-bit address or lower 32-bit of a 64-bit address
-    R_SYM_ADDR_32_HI               = 3  // higher 32bits of a 64-bit address
-    R_PER_THREAD_PAYLOAD_OFFSET_32 = 4, // *** Deprecated ***
-    R_GLOBAL_IMM_32                = 5, // 32-bit global immediate
-    R_SEND                         = 6, // send instruction offset, used for BTI patching
-    R_SYM_ADDR_16                  = 7  // 16-bit address or immediate
+    R_ZE_NONE                      = 0,
+    R_ZE_SYM_ADDR                  = 1, // 64-bit address
+    R_ZE_SYM_ADDR_32               = 2, // 32-bit address or lower 32-bit of a 64-bit address
+    R_ZE_SYM_ADDR_32_HI            = 3  // higher 32bits of a 64-bit address
+    R_PER_THREAD_PAYLOAD_OFFSET_32 = 4  // 32-bit field of payload offset of per-thread data
 };
 ~~~
 

IGC/ZEBinWriter/zebin/spec/version.md

@@ -7,15 +7,14 @@ SPDX-License-Identifier: MIT
 ============================= end_copyright_notice ==========================-->
 
 # ZEBIN Version
-Version 1.44
+Version 1.43
 
 ## Versioning
 Format: \<_Major number_\>.\<_Minor number_\>
 - Major number: Increase when non-backward-compatible features are added. For example, rename attributes or remove attributes.
 - Minor number: Increase when backward-compatible features are added. For example, add new attributes.
 
 ## Change Note
-- **Version 1.44**: Add relocation type "R_SYM_ADDR_16" and update supported relocation types.
 - **Version 1.43**: Internal changes.
 - **Version 1.42**: Enable is_ptr attribute in indirect payload arguments.
 - **Version 1.41**: Add intel_reqd_thread_group_dispatch_size to user_attributes.

visa/FlowGraph.cpp

@@ -4580,15 +4580,6 @@ uint32_t RelocationEntry::getTargetOffset(const IR_Builder &builder) const {
     vASSERT(opndPos == 1);
     // Src1.imm[31:0] mapped to Instruction [127:96]
     return 12;
-  case G4_mad:
-    vASSERT(relocType == R_SYM_ADDR_16);
-    // Src0.imm[15:0] mapped to Instruction [79:64]
-    // Src2.imm[15:0] mapped to Instruction [127:112]
-    if (opndPos == 1)
-      return 8;
-    else if (opndPos == 3)
-      return 14;
-    break;
   case G4_send:
   case G4_sendc:
   case G4_sends:
@@ -4621,8 +4612,6 @@ const char *RelocationEntry::getTypeString(RelocationType relocType) {
     return "R_GLOBAL_IMM_32";
   case RelocationType::R_SEND:
     return "R_SEND";
-  case RelocationType::R_SYM_ADDR_16:
-    return "R_SYM_ADDR_16";
   default:
     vISA_ASSERT_UNREACHABLE("unhandled relocation type");
     return "??";

visa/PrologEpilog.cpp

@@ -887,17 +887,24 @@ class PayloadLoader
       // inserted argument), the relocation need to be resolved to the new
       // cross_thread_size.
       G4_Operand *addSrc1 =
-          builder.createRelocImm(GenRelocType::R_SYM_ADDR_32,
-              PER_THREAD_OFF_RELOCATION_NAME, perThreadOffsetMem, Type_UD);
+          builder.createRelocImm(GenRelocType::R_PER_THREAD_PAYLOAD_OFFSET_32,
+                                 kernel.getName(), perThreadOffsetMem, Type_UD);
       auto addDst = builder.createDst(rtmp->getRegVar(), 0, 2, 1, Type_UD);
       // instruction has relocation must not be compacted
       auto addInst =
           builder.createBinOp(G4_add, g4::SIMD1, addDst, addSrc0, addSrc1,
                               InstOpt_WriteEnable | InstOpt_NoCompact, false);
-      RelocationEntry::createRelocation(builder.kernel, *addInst, 1,
-                                        PER_THREAD_OFF_RELOCATION_NAME,
-                                        GenRelocType::R_SYM_ADDR_32);
 
+      // FIXME: before RT supports the R_PER_THREAD_PAYLOAD_OFFSET_32 relocation,
+      // we create relocation only when GTPin option is given to avoid the test
+      // failure. We can remove this option check once RT supports it.
+      if (kernel.getOption(vISA_GetFreeGRFInfo)) {
+        // Relocation with the target symbol set to kernel symbol. Note that
+        // currently only ZEBinary will produce kernel symbols
+        RelocationEntry::createRelocation(
+            kernel, *addInst, 1, kernel.getName(),
+            GenRelocType::R_PER_THREAD_PAYLOAD_OFFSET_32);
+      }
       instBuffer.push_back(addInst);
 
       if (kernel.getOption(vISA_emitCrossThreadOffR0Reloc)) {

visa/include/RelocationInfo.h

@@ -24,8 +24,6 @@ namespace vISA {
 static const uint32_t MAX_SYMBOL_NAME_LENGTH = 1024;
 constexpr const char *CROSS_THREAD_OFF_R0_RELOCATION_NAME =
     "__INTEL_PATCH_CROSS_THREAD_OFFSET_OFF_R0";
-constexpr const char *PER_THREAD_OFF_RELOCATION_NAME =
-    "__INTEL_PER_THREAD_OFF";
 
 /// GenSymType - Specify the symbol's type
 enum GenSymType {
@@ -55,10 +53,9 @@ enum GenRelocType {
   R_SYM_ADDR = 1,       // 64-bit type address
   R_SYM_ADDR_32 = 2,    // 32-bit address or lower 32-bit of a 64-bit address.
   R_SYM_ADDR_32_HI = 3, // higher 32 bits of 64-bit address
-  R_PER_THREAD_PAYLOAD_OFFSET_32 = 4, // *** Deprecated. Do Not Use. ***
+  R_PER_THREAD_PAYLOAD_OFFSET_32 = 4, // 32-bit offset of per-thread data
   R_GLOBAL_IMM_32 = 5, // 32-bit global immediate
-  R_SEND = 6, // send instruction offset, used for BTI patching
-  R_SYM_ADDR_16 = 7 // 16-bit address or immediate
+  R_SEND = 6 // send instruction offset, used for BTI patching
 };
 
 /// GenRelocEntry - An relocation table entry