Remove all references to MRF as they have been obsolete for years now.

Change-Id: Ia236e7f99102c697f05c199f5bda6e1c28e68f2b

Author: weiyu-chen

visa/BinaryEncoding.cpp

@@ -42,7 +42,6 @@ using namespace vISA;
 // should never invoke the jitter twice with different platform strings.
 unsigned long bitsFlagSubRegNum[] = {128, 128};
 unsigned long bitsNibCtrl[] = {128, 128};
-unsigned long bitsMrfRegNumHWord[] = {128, 128};
 unsigned long bits3SrcFlagSubRegNum[] = {128, 128};
 unsigned long bits3SrcSrcType[] = {128, 128};
 unsigned long bits3SrcDstType[] = {128, 128};
@@ -2567,14 +2566,6 @@ inline BinaryEncoding::Status BinaryEncoding::EncodeOperandSrc2(G4_INST* inst)
     return SUCCESS;
 }
 
-void SetMrfRegNumHWord(BinInst *mybin, uint32_t value)
-{
-    if( mybin->GetIs3Src() )
-        return;
-    else
-        mybin->SetBits(bitsMrfRegNumHWord[0], bitsMrfRegNumHWord[1], value);
-}
-
 void SetExtMsgDescr(G4_INST *inst, BinInst *mybin, uint32_t value)
 {
 

visa/BinaryEncoding.h

@@ -636,7 +636,6 @@ typedef union _EncExtMsgDescriptor_
 // these will be set dynamically once
 extern unsigned long bitsFlagSubRegNum[2];
 extern unsigned long bitsNibCtrl[2];
-extern unsigned long bitsMrfRegNumHWord[2];
 extern unsigned long bits3SrcFlagSubRegNum[2];
 extern unsigned long bits3SrcSrcType[2];
 extern unsigned long bits3SrcDstType[2];
@@ -762,7 +761,6 @@ namespace vISA
             SET_BIT_RANGE(bitsFlagRegNum, 33, 33);
             SET_BIT_RANGE(bitsFlagSubRegNum, 32, 32);
             SET_BIT_RANGE(bitsNibCtrl, 11, 11);
-            SET_BIT_RANGE(bitsMrfRegNumHWord, 76, 69);   // MRF is not used
             SET_BIT_RANGE(bits3SrcFlagSubRegNum, 32, 32);
             SET_BIT_RANGE(bits3SrcFlagRegNum, 33, 33);
             SET_BIT_RANGE(bits3SrcSrcType, 45, 43);

visa/BuildIR.h

@@ -1808,7 +1808,7 @@ class IR_Builder {
         bool is_sendc);
 
     // helper functions
-    G4_Declare *Create_MRF_Dcl( unsigned num_elt, G4_Type type );
+    G4_Declare *createSendPayloadDcl( unsigned num_elt, G4_Type type );
     void Create_MOVR0_Inst(
                         G4_Declare* dcl,
                         short refOff,

visa/BuildIRImpl.cpp

@@ -1177,12 +1177,12 @@ G4_InstSend *IR_Builder::Create_SplitSend_Inst_For_RTWrite(G4_Predicate *pred,
         option, msgDesc, extDescOpnd);
 }
 
-// create a dcl for MRF, size in UD is given
-G4_Declare* IR_Builder::Create_MRF_Dcl( unsigned num_elt, G4_Type type )
+// create a declare for send payload
+G4_Declare* IR_Builder::createSendPayloadDcl( unsigned num_elt, G4_Type type )
 {
     const char* name = getNameString(mem, 16, "M%u", ++num_general_dcl);
-    unsigned short numRow = ( num_elt * G4_Type_Table[type].byteSize - 1 ) / GENX_MRF_REG_SIZ + 1;
-    unsigned short numElt = ( numRow == 1 ) ? num_elt : (GENX_MRF_REG_SIZ/G4_Type_Table[type].byteSize);
+    unsigned short numRow = ( num_elt * G4_Type_Table[type].byteSize - 1 ) / GENX_GRF_REG_SIZ + 1;
+    unsigned short numElt = ( numRow == 1 ) ? num_elt : (GENX_GRF_REG_SIZ/G4_Type_Table[type].byteSize);
     G4_Declare *dcl = createDeclareNoLookup(
         name,
         G4_GRF,
@@ -1191,7 +1191,7 @@ G4_Declare* IR_Builder::Create_MRF_Dcl( unsigned num_elt, G4_Type type )
         type);
     return dcl;
 }
-// create mov(8) mrf, r0
+
 void IR_Builder::Create_MOVR0_Inst( G4_Declare* dcl, short regOff, short subregOff, bool use_nomask )
 {
     G4_DstRegRegion dst1(
@@ -1273,8 +1273,8 @@ void IR_Builder::Create_MOV_Inst(
         0 );
 }
 
-// create multiple MOV inst for send src --> MRF if there are more than 64 byte data in src.
-// dcl: decl for MRF
+// send payload preparation.
+// dcl: decl for send payload
 // num_dword: number of DW to send
 // src_opnd: send src, its size may be several GRFs
 void IR_Builder::Create_MOV_Send_Src_Inst(
@@ -1303,7 +1303,7 @@ void IR_Builder::Create_MOV_Send_Src_Inst(
     if( scalar_src && src_opnd->getType() != Type_UD ){
         // change the type of dst dcl to src type
         remained_dword = num_dword * ( G4_Type_Table[Type_UD].byteSize/G4_Type_Table[src_opnd->getType()].byteSize );
-        dst_dcl = Create_MRF_Dcl(remained_dword, src_opnd->getType());
+        dst_dcl = createSendPayloadDcl(remained_dword, src_opnd->getType());
         dst_dcl->setAliasDeclare( dcl, regoff * G4_GRF_REG_NBYTES + subregoff * G4_Type_Table[Type_UD].byteSize );
         dst_regoff = 0;
         dst_subregoff = 0;
@@ -1343,7 +1343,6 @@ void IR_Builder::Create_MOV_Send_Src_Inst(
         {
             if( remained_dword >= 32 )
             {
-                // mov(16) mrf src
                 execsize = 32;
             }
             else if( remained_dword >= 16 )
@@ -1369,7 +1368,6 @@ void IR_Builder::Create_MOV_Send_Src_Inst(
         {
             if( remained_dword >= 16 )
             {
-                // mov(16) mrf src
                 execsize = 16;
             }
             else if( remained_dword >= 8 )
@@ -1425,30 +1423,31 @@ void IR_Builder::Create_MOV_Send_Src_Inst(
             true );
 
         // update offset in decl
-        if( remained_dword >= execsize ){
+        if (remained_dword >= execsize) {
             remained_dword -= execsize;
-            if( execsize * dst_dcl->getElemSize() == 2 * G4_GRF_REG_NBYTES ){
-                // mov(16) mrf src
+            if (execsize * dst_dcl->getElemSize() == 2 * G4_GRF_REG_NBYTES) {
                 dst_regoff += 2;
-                if( !scalar_src ){
+                if (!scalar_src) {
                     src_regoff += 2;
                 }
-            }else if( execsize * dst_dcl->getElemSize() == G4_GRF_REG_NBYTES ){
+            }
+            else if (execsize * dst_dcl->getElemSize() == G4_GRF_REG_NBYTES) {
                 dst_regoff += 1;
-                if( !scalar_src ){
+                if (!scalar_src) {
                     src_regoff += 1;
                 }
-            }else{
+            }
+            else {
                 dst_subregoff += execsize;
-                if( dst_subregoff > (G4_GRF_REG_NBYTES/dst_dcl->getElemSize()) ){
+                if (dst_subregoff > (G4_GRF_REG_NBYTES / dst_dcl->getElemSize())) {
                     dst_regoff++;
-                    dst_subregoff -= G4_GRF_REG_NBYTES/dst_dcl->getElemSize();
+                    dst_subregoff -= G4_GRF_REG_NBYTES / dst_dcl->getElemSize();
                 }
-                if( !scalar_src ){
+                if (!scalar_src) {
                     src_subregoff += execsize;
-                    if( src_subregoff > (short)(G4_GRF_REG_NBYTES/G4_Type_Table[Type_UD].byteSize) ){
+                    if (src_subregoff > (short)(G4_GRF_REG_NBYTES / G4_Type_Table[Type_UD].byteSize)) {
                         src_regoff++;
-                        src_subregoff -= G4_GRF_REG_NBYTES/G4_Type_Table[Type_UD].byteSize;
+                        src_subregoff -= G4_GRF_REG_NBYTES / G4_Type_Table[Type_UD].byteSize;
                     }
                 }
             }

visa/CISA.l

@@ -890,7 +890,7 @@ V0 {
         return FENCE_OPTIONS;
     }
 
-[ \n\t]+"\\"\n {TRACE("\n** Multiple instructions in a line");}   //gen4 define macro use "\n" to allow multiple instr in a line
+[ \n\t]+"\\"\n {TRACE("\n** Multiple instructions in a line");}
 
 '<EOF>' {
         TRACE("\n** End Of File");

visa/FlowGraph.cpp

@@ -363,22 +363,6 @@ bool FlowGraph::matchBranch(int &sn, INST_LIST& instlist, INST_LIST_ITER &it)
             }
             else if (inst->opcode() == G4_endif)
             {
-                // For GT, if/else/endif are different from Gen4:
-                // (1). if - endif
-                //          if endif_label
-                //          ...
-                //          endif_label:
-                //          endif
-                // (2). if - else - endif
-                //          if else_label
-                //          ...
-                //          else endif_label
-                //          else_label:
-                //          ...
-                //          endif_label:     // this is different from Gen4
-                //          endif
-                //
-
                 if (elseCount == 0)                 // if-endif case
                 {
                     // insert endif label
@@ -784,8 +768,7 @@ void FlowGraph::constructFlowGraph(INST_LIST& instlist)
                 }
                 else
                 {
-                    MUST_BE_TRUE1(false, i->getLineNo(),
-                        ERROR_INVALID_G4INST); // not yet handled
+                    assert(false && "should not reach here");
                 }
             } // need edge
             curr_BB = next_BB;
@@ -3802,7 +3785,7 @@ void G4_BB::addEOTSend(G4_INST* lastInst)
     // mov (8) r1.0<1>:ud r0.0<8;8,1>:ud {NoMask}
     // send (8) null r1 0x27 desc
     IR_Builder* builder = parent->builder;
-    G4_Declare *dcl = builder->Create_MRF_Dcl(NUM_DWORDS_PER_GRF, Type_UD);
+    G4_Declare *dcl = builder->createSendPayloadDcl(NUM_DWORDS_PER_GRF, Type_UD);
     G4_DstRegRegion* movDst = builder->Create_Dst_Opnd_From_Dcl(dcl, 1);
     G4_SrcRegRegion* r0Src = builder->Create_Src_Opnd_From_Dcl(
         builder->getBuiltinR0(), builder->getRegionStride1());

visa/Gen4_IR.hpp

@@ -1529,7 +1529,7 @@ class G4_InstIntrinsic : public G4_INST
     void setTmpFlagStart(int startFlag) { tmpFlagStart = startFlag; }
 };
 }
-// see Gen4 Spec
+
 // RegionWH and RegionV are special for the different modes of source register indirect addressing
 // RegionWH = <width, horzStride>, we set vertStride to UNDEFINED_SHORT
 // RegionV = <horzStride>, we set both vertStride and width to UNDEFINED_SHORT
@@ -3042,11 +3042,7 @@ enum ChannelEnable {
 
 namespace vISA
 {
-//
-// look up Gen4 ISA summary
-// <DstReg><DstRegion><WriteMask><DstType>
-// for both direct and indirect dst regions
-//
+
 class G4_DstRegRegion final : public G4_Operand
 {
     friend class IR_Builder;

visa/GraphColor.cpp

@@ -28,7 +28,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "FlowGraph.h"
 #include "GraphColor.h"
 #include "SpillCode.h"
-#include "SpillManagerGMRF.h"
 #include <list>
 #include <iostream>
 #include <sstream>
@@ -4970,7 +4969,7 @@ void GraphColor::computeSpillCosts(bool useSplitLLRHeuristic)
         // Also ARF live ranges with exclusively sequential references within the code are
         // assigned an infinite spill cost as spilling them will not lower the register
         // pressure in the region they are referenced. This does not necessarily hold for
-        // GRF/MRF live ranges are these are potentially large in size but the portions
+        // GRF live ranges are these are potentially large in size but the portions
         // accessed by each sequential use are limited to 2 registers for general instructions
         // and 8 registers for SEND instructions.
         //
@@ -5901,8 +5900,8 @@ bool GraphColor::regAlloc(bool doBankConflictReduction,
         }
     }
     //
-    // assign registers for GRFs/MRFs, GRFs are first attempted to be assigned using round-robin and if it fails
-    // then we retry using a first-fit heuristic; for MRFs we always use the round-robin heuristic
+    // assign registers for GRFs, GRFs are first attempted to be assigned using round-robin and if it fails
+    // then we retry using a first-fit heuristic.
     //
     if (liveAnalysis.livenessClass(G4_GRF))
     {
@@ -8695,7 +8694,7 @@ int GlobalRA::coloringRegAlloc()
     unsigned maxRAIterations = 10;
     unsigned iterationNo = 0;
 
-    std::vector<SpillManagerGMRF::EDGE> prevIntfEdges;
+    std::vector<SpillManagerGRF::EDGE> prevIntfEdges;
 
     int globalScratchOffset = builder.getOptions()->getuInt32Option(vISA_SpillMemOffset);
     bool useScratchMsgForSpill = globalScratchOffset < (int) (SCRATCH_MSG_LIMIT * 0.6) && !hasStackCall;
@@ -8932,7 +8931,7 @@ int GlobalRA::coloringRegAlloc()
                 }
 
                 startTimer(TIMER_SPILL);
-                SpillManagerGMRF spillGMRF(*this,
+                SpillManagerGRF spillGRF(*this,
                     nextSpillOffset,
                     liveAnalysis.getNumSelectedVar(),
                     &liveAnalysis,
@@ -8946,8 +8945,8 @@ int GlobalRA::coloringRegAlloc()
                     enableSpillSpaceCompression,
                     useScratchMsgForSpill);
 
-                bool success = spillGMRF.insertSpillFillCode(&kernel, pointsToAnalysis);
-                nextSpillOffset = spillGMRF.getNextOffset();
+                bool success = spillGRF.insertSpillFillCode(&kernel, pointsToAnalysis);
+                nextSpillOffset = spillGRF.getNextOffset();
 
                 if (builder.getOption(vISA_RATrace))
                 {
@@ -8966,19 +8965,19 @@ int GlobalRA::coloringRegAlloc()
                     kernel.dumpDotFile("Spill_GRF");
                 }
 
-                scratchOffset = std::max(scratchOffset, spillGMRF.getNextScratchOffset());
+                scratchOffset = std::max(scratchOffset, spillGRF.getNextScratchOffset());
 #ifdef FIX_SCRATCH_SPILL_MESSAGE
                 if (scratchOffset >= SCRATCH_MSG_LIMIT && useScratchMsgForSpill)
                 {
-                    spillGMRF.fixSpillFillCode(&kernel);
+                    spillGRF.fixSpillFillCode(&kernel);
                 }
 #endif
                 bool disableSpillCoalecse = builder.getOption(vISA_DisableSpillCoalescing) ||
                     builder.getOption(vISA_FastSpill) || builder.getOption(vISA_Debug);
                 if (!reserveSpillReg && !disableSpillCoalecse && builder.useSends() &&
                     !kernel.fg.getHasStackCalls() && !kernel.fg.getIsStackCallFunc())
                 {
-                    CoalesceSpillFills c(kernel, liveAnalysis, coloring, spillGMRF, iterationNo, rpe, *this);
+                    CoalesceSpillFills c(kernel, liveAnalysis, coloring, spillGRF, iterationNo, rpe, *this);
                     c.run();
                 }
 

visa/IGfxHwEuIsaCNL.h

@@ -5058,7 +5058,7 @@ typedef union tagEU_INSTRUCTION_OPERAND_SEND_MSG {
         DWORD MessageDescriptor_ResponseLength  : BITFIELD_RANGE( 20, 24); //
 
         /*****************************************************************************\
-        This field specifies the number of 256-bit MRF registers starting from <curr_dest> to be sent out on the request message payload. Valid value ranges from 1 to 15. A value of 0 is considered erroneous.
+        This field specifies the number of 256-bit registers starting from <curr_dest> to be sent out on the request message payload. Valid value ranges from 1 to 15. A value of 0 is considered erroneous.
         \*****************************************************************************/
         DWORD MessageDescriptor_MessageLength   : BITFIELD_RANGE( 25, 28); //
         DWORD __CODEGEN_UNIQUE(Overridden)      : BITFIELD_RANGE( 29, 31); // Override