IGA: Clean up unused encoder options

Change-Id: I53ba1da6e26c35fdac39e9da6f41f0124227eb80

Author: DianaChen

visa/BinaryEncodingIGA.cpp

@@ -471,7 +471,7 @@ void BinaryEncodingIGA::DoAll()
 
     // Make the size of the first BB is multiple of 4 instructions, and do not compact
     // any instructions in it, so that the size of the first BB is multiple of 64 bytes
-    if (kernel.fg.builder->getHasPerThreadProlog()) 
+    if (kernel.fg.builder->getHasPerThreadProlog())
     {
         G4_BB* first_bb = *kernel.fg.begin();
         size_t num_inst = first_bb->getInstList().size();

visa/iga/GEDLibrary/GED_external/Source/common/version.cpp

@@ -24,4 +24,4 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ======================= end_copyright_notice ==================================*/
 
-const char* gedVersion = "0.26.1 (20bb3939)";
+const char* gedVersion = "0.27 (bc3a4c75)";

visa/iga/IGALibrary/Backend/EncoderOpts.hpp

@@ -33,9 +33,6 @@ namespace iga
         bool explicitCompactMissIsWarning;
         bool ignoreNoCompactFormFound;
 
-        // fisrtBB64ByteSize - add padding to the first BB to make sure its size is multiple of 64 byte
-        bool fisrtBB64ByteSize = false;
-
 
         EncoderOpts(
             bool _autoCompact = false,
@@ -44,9 +41,6 @@ namespace iga
         : autoCompact(_autoCompact)
         , explicitCompactMissIsWarning(_explicitCompactMissIsWarning)
         { }
-
-        void setFisrtBB64ByteSize(bool enable = true)
-        { fisrtBB64ByteSize = enable; };
     };
 }
 

visa/iga/IGALibrary/Backend/GED/Decoder.cpp

@@ -724,7 +724,7 @@ void DecoderBase::decodeTernaryDestinationAlign16(Instruction *inst)
 
         GED_DECODE_RAW(uint32_t, subRegNumBytes, DstSubRegNum);
         uint8_t subRegNumber = type == Type::INVALID ?
-            0 : binNumToSubRegNum((uint8_t)subRegNumBytes, regName, type, true);
+            0 : binNumToSubRegNum((uint8_t)subRegNumBytes, regName, type);
         regRef.subRegNum = (uint8_t)(subRegNumber + subregOffAlign16Elems);
         inst->setDirectDestination(
             dstMod,
@@ -780,7 +780,7 @@ void DecoderBase::decodeTernarySourceAlign16(Instruction *inst)
             type);
     } else {
         int subReg = type == Type::INVALID ?
-            0 : binNumToSubRegNum(decodeSrcSubRegNum<S>(), RegName::GRF_R, type, true);
+            0 : binNumToSubRegNum(decodeSrcSubRegNum<S>(), RegName::GRF_R, type);
         RegRef reg = {
             (uint8_t)regNum,
             (uint8_t)subReg
@@ -1494,8 +1494,7 @@ void DecoderBase::decodeDstDirSubRegNum(DirRegOpInfo& dri)
 
         GED_DECODE_RAW(uint32_t, subRegNum, DstSubRegNum);
         dri.regRef.subRegNum =
-            binNumToSubRegNum((uint8_t)subRegNum, dri.regName, scalingType,
-                m_opSpec->isBranching() || m_opSpec->isTernary());
+            binNumToSubRegNum((uint8_t)subRegNum, dri.regName, scalingType);
     }
 }
 
@@ -1820,8 +1819,9 @@ DecoderBase::decodeTernarySrcImmVal(Type t)
 }
 
 uint32_t DecoderBase::binNumToSubRegNum(
-    uint32_t binNum, RegName regName, Type type, bool isTernaryOrBranch)
+    uint32_t binNum, RegName regName, Type type)
 {
+
     return BytesOffsetToSubReg(binNum, regName, type);
 }
 

visa/iga/IGALibrary/Backend/GED/Decoder.hpp

@@ -287,7 +287,8 @@ namespace iga
 
             dri.regRef.subRegNum = binNumToSubRegNum(
                 dri.regRef.subRegNum, dri.regName,
-                scalingType, m_opSpec->isBranching() || m_opSpec->isTernary());
+                scalingType);
+
 
             return dri;
         }
@@ -313,7 +314,7 @@ namespace iga
 
         // Translate Sub register from binary encoding number to asm number
         uint32_t binNumToSubRegNum(
-            uint32_t binNum, RegName regName, Type type, bool isTernaryOrBranch);
+            uint32_t binNum, RegName regName, Type type);
 
     protected:
         GED_MODEL                     m_gedModel;

visa/iga/IGALibrary/Backend/GED/Encoder.cpp

@@ -80,24 +80,6 @@ EncoderBase::EncoderBase(
 
 void EncoderBase::encodeKernelPreProcess(Kernel &k)
 {
-    if (m_opts.fisrtBB64ByteSize && !k.getBlockList().empty()) {
-        int32_t inst_size = 16;
-        Block& blk = **k.getBlockList().begin();
-        // To simplify the size calculation, we do not compact the instructions
-        // Add NOP until the block size is multiple of 64
-        size_t padding_size = blk.getInstList().size() * inst_size % 64;
-        if (padding_size != 0) {
-            padding_size = 64 - padding_size;
-            assert(padding_size % inst_size == 0);
-            size_t num_nop = padding_size / inst_size;
-            // create inst
-            for (size_t i = 0; i < num_nop; ++i)
-                blk.getInstList().push_back(k.createNopInstruction());
-        }
-        for (auto inst : blk.getInstList())
-            inst->addInstOpt(InstOpt::NOCOMPACT);
-    }
-
     doEncodeKernelPreProcess(k);
 }
 

visa/iga/IGALibrary/IR/IRChecker.cpp

@@ -283,7 +283,7 @@ struct SemanticChecker : LOCChecker {
         if (execSize * srcTypeSz > restric_size) {
             warning(
                 "register regioning restriction warning: "
-                "ExecSize * sizeof(Type) exceeds 64 bytes\n"
+                "ExecSize * sizeof(Type) exceeds 2 GRF\n"
                 "see Programmer's Reference Manual (Restriction 1.1)");
         }
         // Restriction 1.2:

visa/iga/IGALibrary/IR/Types.hpp

@@ -47,16 +47,16 @@ enum class Platform
 #define IGA_GEN_VER_ORDINAL(MAJ,MIN) (((MAJ)<<16)|(MIN))
     INVALID     = 0,
 
-    GEN6        = IGA_GEN_VER_ORDINAL( 6, 0),
-    GEN7        = IGA_GEN_VER_ORDINAL( 7, 0),
-    GEN7P5      = IGA_GEN_VER_ORDINAL( 7, 5),
-    GEN8        = IGA_GEN_VER_ORDINAL( 8, 0),
-    GEN8LP      = IGA_GEN_VER_ORDINAL( 8, 1),
-    GEN9        = IGA_GEN_VER_ORDINAL( 9, 0),
-    GEN9LP      = IGA_GEN_VER_ORDINAL( 9, 1),
-    GEN9P5      = IGA_GEN_VER_ORDINAL( 9, 5),
-    GEN10       = IGA_GEN_VER_ORDINAL(10, 0),
-    GEN11       = IGA_GEN_VER_ORDINAL(11, 0),
+    GEN6        = IGA_GEN_VER_ORDINAL( 6, 0 ),
+    GEN7        = IGA_GEN_VER_ORDINAL( 7, 0 ),
+    GEN7P5      = IGA_GEN_VER_ORDINAL( 7, 5 ),
+    GEN8        = IGA_GEN_VER_ORDINAL( 8, 0 ),
+    GEN8LP      = IGA_GEN_VER_ORDINAL( 8, 1 ),
+    GEN9        = IGA_GEN_VER_ORDINAL( 9, 0 ),
+    GEN9LP      = IGA_GEN_VER_ORDINAL( 9, 1 ),
+    GEN9P5      = IGA_GEN_VER_ORDINAL( 9, 5 ),
+    GEN10       = IGA_GEN_VER_ORDINAL(10, 0 ),
+    GEN11       = IGA_GEN_VER_ORDINAL(11, 0 ),
     GENNEXT     = IGA_GEN_VER_ORDINAL(12, 0)
 
 #undef IGA_GEN_VER_ORDINAL

visa/iga/IGALibrary/api/iga.cpp

@@ -82,15 +82,15 @@ struct PlatformEntry {
 };
 
 static const PlatformEntry ALL_PLATFORMS[] {
-    {IGA_GEN7,   iga::Platform::GEN7,   "7"   },
-    {IGA_GEN7p5, iga::Platform::GEN7P5, "7p5" },
-    {IGA_GEN8,   iga::Platform::GEN8,   "8"   },
-    {IGA_GEN8lp, iga::Platform::GEN8LP, "8lp" },
-    {IGA_GEN9,   iga::Platform::GEN9,   "9"   },
-    {IGA_GEN9lp, iga::Platform::GEN9LP, "9lp" },
-    {IGA_GEN9p5, iga::Platform::GEN9P5, "9p5" },
-    {IGA_GEN10,  iga::Platform::GEN10,  "10"  },
-    {IGA_GEN11,  iga::Platform::GEN11,  "11"  },
+    {IGA_GEN7,    iga::Platform::GEN7,    "7"    },
+    {IGA_GEN7p5,  iga::Platform::GEN7P5,  "7p5"  },
+    {IGA_GEN8,    iga::Platform::GEN8,    "8"    },
+    {IGA_GEN8lp,  iga::Platform::GEN8LP,  "8lp"  },
+    {IGA_GEN9,    iga::Platform::GEN9,    "9"    },
+    {IGA_GEN9lp,  iga::Platform::GEN9LP,  "9lp"  },
+    {IGA_GEN9p5,  iga::Platform::GEN9P5,  "9p5"  },
+    {IGA_GEN10,   iga::Platform::GEN10,   "10"   },
+    {IGA_GEN11,   iga::Platform::GEN11,   "11"   },
 };
 
 // conversion to an internal platform

visa/iga/IGALibrary/api/igaEncoderWrapper.cpp

@@ -12,7 +12,6 @@ iga_status_t KernelEncoder::encode()
         m_autoCompact,
         true
     );
-    enc_opt.setFisrtBB64ByteSize(m_fisrtBB64ByteSize);
 
     Encoder enc(m_kernel->getModel(), errHandler, enc_opt);
     enc.encodeKernel(

visa/iga/IGALibrary/api/igaEncoderWrapper.hpp

@@ -8,7 +8,6 @@ class KernelEncoder
     uint32_t m_binarySize = 0;
     iga::Kernel* m_kernel = nullptr;
     bool m_autoCompact = false;
-    bool m_fisrtBB64ByteSize = false;
 
 public:
     // @param compact: auto compact instructions if applicable
@@ -33,6 +32,4 @@ class KernelEncoder
     // FIXME: Move this api to somewhere else that's more apporopriate
     static bool patchImmValue(const iga::Model& model, unsigned char* binary, iga::Type type, const iga::ImmVal &val);
 
-    void setFisrtBB64ByteSize(bool enable = true) { m_fisrtBB64ByteSize = enable; }
-
 };