Revert "Add NT_INTELGT_PRODUCT_CONFIG to IntelGTNotes"

Revert "Expand .note.intelgt.compat section of zebin files with a new
NT_INTELGT_PRODUCT_CONFIG note so it can be used for program validation
instead of NT_INTELGT_PRODUCT_FAMILY, NT_INTELGT_GFXCORE_FAMILY and
NT_INTELGT_TARGET_METADATA."

Author: karolmikolajczuk

IGC/AdaptorOCL/OCL/sp/spp_g8.cpp

@@ -458,7 +458,6 @@ bool CGen8OpenCLProgram::GetZEBinary(
         (const uint8_t*)buildOptions, buildOptionsSize);
     zebuilder.setProductFamily(m_Platform.eProductFamily);
     zebuilder.setGfxCoreFamily(m_Platform.eRenderCoreFamily);
-    zebuilder.setGmdID(m_Platform.sRenderBlockID);
 
     //
     // Creating ZE binary requires linking individual ELF files,

IGC/AdaptorOCL/OCL/sp/zebin_builder.cpp

@@ -64,11 +64,6 @@ void ZEBinaryBuilder::setGfxCoreFamily(GFXCORE_FAMILY value)
     mBuilder.setGfxCoreFamily(value);
 }
 
-void ZEBinaryBuilder::setGmdID(GFX_GMD_ID value)
-{
-    mBuilder.setGmdID(value);
-}
-
 void ZEBinaryBuilder::createKernel(
     const char*  rawIsaBinary,
     unsigned int rawIsaBinarySize,

IGC/AdaptorOCL/OCL/sp/zebin_builder.hpp

@@ -50,9 +50,6 @@ class ZEBinaryBuilder : DisallowCopy
     // Set the GfxCoreFamily as the specified value.
     void setGfxCoreFamily(GFXCORE_FAMILY value);
 
-    // Set the GmdId as the specified value.
-    void setGmdID(GFX_GMD_ID value);
-
     // Pair of name for the section (1st elem) and VISA asm text (2nd elem).
     using NamedVISAAsm = std::pair<std::string, std::string>;
 

IGC/Compiler/CISACodeGen/EmitVISAPass.cpp

@@ -8239,7 +8239,7 @@ void EmitPass::EmitGenIntrinsicMessage(llvm::GenIntrinsicInst* inst)
     case GenISAIntrinsic::GenISA_software_exception:
     {
         CVariable *Mask = m_currShader->ImmToVariable(
-            1 << 28,
+            1 << 29,
             ISA_TYPE_UD);
 
         m_encoder->SetSrcSubReg(0, 1);

IGC/ZEBinWriter/zebin/source/ZEELF.h

@@ -59,11 +59,6 @@ enum {
     // attribute and section changes. The content is stored in a nul-terminated
     // string and the format is "<Major number>.<Minor number>".
     NT_INTELGT_ZEBIN_VERSION = 4,
-    // The description is stored in a 4-byte ELF word and is used instead
-    // of NT_INTELGT_PRODUCT_FAMILY, NT_INTELGT_GFXCORE_FAMILY and
-    // NT_INTELGT_TARGET_METADATA because it contains all required info to
-    // validate program for a target device
-    NT_INTELGT_PRODUCT_CONFIG = 5,
 };
 
 struct TargetMetadata {

IGC/ZEBinWriter/zebin/source/ZEELFObjectBuilder.cpp

@@ -630,12 +630,6 @@ std::pair<uint64_t, uint64_t> ELFWriter::writeCompatibilityNote() {
     writeOneStrNote("IntelGT",
                     PreDefinedAttrGetter::getVersionNumber(),
                     NT_INTELGT_ZEBIN_VERSION);
-
-    // write NT_INTELGT_PRODUCT_CONFIG
-    writeOneNote("IntelGT",
-                 m_ObjBuilder.m_gmdID.Value,
-                 NT_INTELGT_PRODUCT_CONFIG);
-
     return std::make_pair(start_off, m_W.OS.tell() - start_off);
 }
 

IGC/ZEBinWriter/zebin/source/ZEELFObjectBuilder.hpp

@@ -65,9 +65,6 @@ class ZEELFObjectBuilder {
     void setTargetMetadata(TargetMetadata metadata) { m_metadata = metadata; }
     TargetMetadata getTargetMetadata() const { return m_metadata; }
 
-    void setGmdID(GFX_GMD_ID gmdID) { m_gmdID = gmdID; }
-    GFX_GMD_ID setGmdID() const { return m_gmdID; }
-
     // add a text section contains gen binary
     // - name: section name. This is usually the kernel or function name of
     //         this text section. Do not includes leading .text in given
@@ -378,7 +375,6 @@ class ZEELFObjectBuilder {
     PRODUCT_FAMILY m_productFamily = IGFX_UNKNOWN;
     GFXCORE_FAMILY m_gfxCoreFamily = IGFX_UNKNOWN_CORE;
     TargetMetadata m_metadata;
-    GFX_GMD_ID m_gmdID;
 
     StandardSectionListTy m_textSections;
     StandardSectionListTy m_dataAndbssSections; // data and bss sections

IGC/ZEBinWriter/zebin/spec/elf.md

@@ -98,7 +98,7 @@ information, depending on section type.
 ## ELF note type for INTELGT
 
 **n_type**
-Currently there are 5 note types defined for INTELGT and the notes are placed
+Currently there are 3 note types defined for INTELGT and the notes are placed
 in the .note.intelgt.compat section. The consumer of the ZE binary file should
 recognize both the owner name (INTELGT) and the type of an ELF note entry to
 interpret its description.
@@ -114,11 +114,6 @@ enum {
     // attribute and section changes. The content is stored in a nul-terminated
     // string and the format is "<Major number>.<Minor number>".
     NT_INTELGT_ZEBIN_VERSION = 4,
-    // The description is stored in a 4-byte ELF word and is used instead
-    // of NT_INTELGT_PRODUCT_FAMILY, NT_INTELGT_GFXCORE_FAMILY and
-    // NT_INTELGT_TARGET_METADATA because it contains all required info to
-    // validate program for a target device
-    NT_INTELGT_PRODUCT_CONFIG = 5,
 };
 ~~~
 
@@ -163,24 +158,6 @@ struct TargetMetadata {
 };
 ~~~
 
-**The description of NT_INTELGT_PRODUCT_CONFIG note**
-~~~
-typedef struct GFX_GMD_ID_DEF
-{
-    union
-    {
-        struct
-        {
-            unsigned int    RevisionID : 6;
-            unsigned int    Reserved : 8;
-            unsigned int    GMDRelease : 8;
-            unsigned int    GMDArch : 10;
-        }GmdID;
-        unsigned int    Value;
-    };
-}GFX_GMD_ID;
-~~~
-
 ## Gen Relocation Type
 Relocation type for **ELF32_R_TYPE** or **ELF64_R_TYPE**
 ~~~