Minor refactor around rt write operations

Minor refactor around RT write operations (NFC)

Author: anikaushik

visa/BuildCISAIRImpl.cpp

@@ -3270,10 +3270,12 @@ bool CISA_IR_Builder::CISA_create_rtwrite_3d_instruction(
     A = operands[counter++];
   }
 
-  VISA_StateOpndHandle *surface =
-      CISA_get_surface_variable(surfaceName, lineNum);
-  if (!surface)
-    return false; // error recorded
+  VISA_StateOpndHandle* surface = nullptr;
+  if (surfaceName != nullptr) {
+    surface = CISA_get_surface_variable(surfaceName, lineNum);
+    if (!surface)
+      return false; // error recorded
+  }
 
   uint8_t numMsgSpecificOpnd = 0;
   VISA_RawOpnd *rawOpnds[20];

visa/CISA.y

@@ -1419,11 +1419,10 @@ RTWriteOperands:
         RTRWOperandsVec.push_back($2);
     }
 
-RTWriteInstruction: RTWInstruction
-
-            //      1            2                3                 4           5     6
-RTWInstruction: Predicate    RTWRITE_OP_3D    RTWriteModeOpt    ExecSize    Var
-              RTWriteOperands
+                //      1            2                3             4           5
+RTWriteInstruction: Predicate    RTWRITE_OP_3D    RTWriteModeOpt    ExecSize    Var
+                // 6
+                RTWriteOperands
    {
        bool result = pBuilder->CISA_create_rtwrite_3d_instruction(
            $1, $3, $4.emask, (unsigned int)$4.exec_size, $5,

visa/IsaDescription.cpp

@@ -134,7 +134,7 @@ struct ISA_Inst_Info ISA_Inst_Table[ISA_OPCODE_ENUM_SIZE] = {
     {ISA_3D_LOAD, ISA_Inst_Sampler, "load_3d", 5, 1},
     {ISA_3D_GATHER4, ISA_Inst_Sampler, "gather4_3d", 5, 1},
     {ISA_3D_INFO, ISA_Inst_Sampler, "info_3d", 2, 1},
-    {ISA_3D_RT_WRITE, ISA_Inst_Data_Port, "rt_write_3d", 3, 0},
+    {ISA_3D_RT_WRITE, ISA_Inst_Data_Port, "rt_write_3d", 3, 1},
     {ISA_3D_URB_WRITE, ISA_Inst_Misc, "urb_write_3d", 6, 0},
     {ISA_3D_TYPED_ATOMIC, ISA_Inst_Data_Port, "typed_atomic", 9, 1},
     {ISA_GATHER4_SCALED, ISA_Inst_Data_Port, "gather4_scaled", 4, 1},
@@ -2110,7 +2110,7 @@ VISA_INST_Desc CISA_INST_table[ISA_NUM_OPCODE] = {
             {OPND_EXECSIZE, ISA_TYPE_UB, SIZE_1},
             {OPND_PRED, ISA_TYPE_UW, 0},    /// predicate
             {OPND_OTHER, ISA_TYPE_UW, 0},   /// mode
-            {OPND_SURFACE, ISA_TYPE_UB, 0}, /// Surface
+            {OPND_SURFACE | OPND_SRC_GEN | OPND_IMM | OPND_SRC_ADDR, ISA_TYPE_UB | ISA_TYPE_Q | ISA_TYPE_UQ, 0}, /// Surface
         },
 
     },

visa/IsaDisassembly.cpp

@@ -2362,10 +2362,11 @@ printInstructionDataport(const print_format_provider_t *header,
     }
 
     sstr << " " << printExecutionSize(inst->opcode, inst->execsize);
-
-    // surface
-    surface = getPrimitiveOperand<uint8_t>(inst, i++);
-    sstr << " " << printSurfaceName(surface);
+    {
+      // surface
+      surface = getPrimitiveOperand<uint8_t>(inst, i++);
+      sstr << " " << printSurfaceName(surface);
+    }
 
     while (i < inst->opnd_num) {
       sstr << printOperand(header, inst, i++, opt);