vISA: Remove unused operands in IsaDescriptor

Remove unused code
intel · Nov 21, 2023 · 301dcb0 · 301dcb0
1 parent 2cb1b41
commit 301dcb0
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 34 deletions.
diff --git a/visa/IsaDescription.cpp b/visa/IsaDescription.cpp
@@ -2012,7 +2012,7 @@ VISA_INST_Desc CISA_INST_table[ISA_NUM_OPCODE] = {
         ISA_3D_SAMPLE,
         ISA_Inst_Sampler,
         "3d_sample",
-        10,
+        9,
         0,
         {
             {OPND_OTHER, ISA_TYPE_UW, 0},
@@ -2024,7 +2024,6 @@ VISA_INST_Desc CISA_INST_table[ISA_NUM_OPCODE] = {
             {OPND_SAMPLE, ISA_TYPE_UB, 0},  /// Sampler
             {OPND_SURFACE, ISA_TYPE_UB, 0}, /// Surface
             {OPND_RAW, ISA_TYPE_F, GRF_ALIGNED}, /// Destination
-            {OPND_RAW, ISA_TYPE_UD, 0},   /// Paired Surface
             {OPND_OTHER, ISA_TYPE_UB, 0}, ///  numberMsgSpecific Operands
         },
 
@@ -2036,7 +2035,7 @@ VISA_INST_Desc CISA_INST_table[ISA_NUM_OPCODE] = {
         ISA_3D_LOAD,
         ISA_Inst_Sampler,
         "3d_load",
-        9,
+        8,
         0,
         {
             {OPND_OTHER, ISA_TYPE_UW, 0},
@@ -2048,7 +2047,6 @@ VISA_INST_Desc CISA_INST_table[ISA_NUM_OPCODE] = {
             {OPND_SURFACE, ISA_TYPE_UB, 0}, /// Surface
             {OPND_RAW, ISA_TYPE_F | ISA_TYPE_UD | ISA_TYPE_D,
              0}, /// Destination
-            {OPND_RAW, ISA_TYPE_UD, 0},   /// Paired Surface
             {OPND_OTHER, ISA_TYPE_UB, 0}, ///  numberMsgSpecific Operands
         },
 
@@ -2060,7 +2058,7 @@ VISA_INST_Desc CISA_INST_table[ISA_NUM_OPCODE] = {
         ISA_3D_GATHER4,
         ISA_Inst_Sampler,
         "3d_gather4",
-        10,
+        9,
         0,
         {
             {OPND_OTHER, ISA_TYPE_UW, 0},
@@ -2073,7 +2071,6 @@ VISA_INST_Desc CISA_INST_table[ISA_NUM_OPCODE] = {
             {OPND_SURFACE, ISA_TYPE_UB, 0}, /// Surface
             {OPND_RAW, ISA_TYPE_F | ISA_TYPE_UD | ISA_TYPE_D,
              0}, /// Destination
-            {OPND_RAW, ISA_TYPE_UD, 0},   /// Paired Surface
             {OPND_OTHER, ISA_TYPE_UB, 0}, ///  numberMsgSpecific Operands
         },
 

diff --git a/visa/IsaDisassembly.cpp b/visa/IsaDisassembly.cpp
@@ -1517,10 +1517,6 @@ printInstructionSampler(const print_format_provider_t *header,
 
     // dst
     sstr << printOperand(header, inst, i++, opt);
-
-    // paired resource
-    sstr << printOperand(header, inst, i++, opt);
-
        // skip the param count
     i++;
 
@@ -1563,10 +1559,6 @@ printInstructionSampler(const print_format_provider_t *header,
 
     // dst
     sstr << printOperand(header, inst, i++, opt);
-
-    // paired resource
-    sstr << printOperand(header, inst, i++, opt);
-
        // skip the param count
     i++;
 
@@ -1614,10 +1606,6 @@ printInstructionSampler(const print_format_provider_t *header,
 
     // dst
     sstr << printOperand(header, inst, i++, opt);
-
-    // paired resource
-    sstr << printOperand(header, inst, i++, opt);
-
        // skip the param count
     i++;
 

diff --git a/visa/IsaVerification.cpp b/visa/IsaVerification.cpp
@@ -2238,13 +2238,6 @@ void vISAVerifier::verifyInstructionSampler(const CISA_INST *inst) {
                          "CPS LOD Compensation Enable is only supported for"
                          " sample, sample_b, sample_b_c, sample_c and LOD");
     }
-    bool isPairedSurface = isNotNullRawOperand(inst, 6);
-
-    REPORT_INSTRUCTION(
-        options,
-        (isPairedSurface && irBuilder->getPlatform() >= Xe2) ||
-            !isPairedSurface,
-        "Paired surface can not be defined on this platform");
     break;
   }
   case ISA_3D_LOAD:
@@ -2256,14 +2249,6 @@ void vISAVerifier::verifyInstructionSampler(const CISA_INST *inst) {
       REPORT_INSTRUCTION(options, irBuilder->getPlatform() >= GENX_SKL,
                          "Pixel Null Mask Enable only valid for SKL+");
     }
-    bool isPairedSurface =
-        isNotNullRawOperand(inst, opcode == ISA_3D_LOAD ? 5 : 6);
-
-    REPORT_INSTRUCTION(
-        options,
-        (isPairedSurface && irBuilder->getPlatform() >= Xe2) ||
-            !isPairedSurface,
-        "Paired surface can not be defined on this platform");
     break;
   }
   case ISA_3D_INFO:

diff --git a/visa/VisaToG4/TranslateSendLdStLsc.cpp b/visa/VisaToG4/TranslateSendLdStLsc.cpp
@@ -360,7 +360,6 @@ int IR_Builder::translateLscUntypedInst(
   case LSC_SLM:
     sfid = SFID::SLM;
     break;
-    break;
   default:
     vISA_ASSERT_UNREACHABLE("invalid SFID for untyped LSC message");
   }