[Autobackout][FuncReg]Revert of change: 190b1f4

 Minor change to visa disas

Minor refactor to visa disaa. No functional change.

Author: jgu222

visa/IsaDisassembly.cpp

@@ -909,11 +909,11 @@ static std::string printInstructionCommon(
 static std::string printInstructionControlFlow(
     const print_format_provider_t* header,
     const CISA_INST* inst,
-    const Options* opt)
+    const Options *opt)
 {
     ISA_Opcode opcode = (ISA_Opcode)inst->opcode;
     unsigned i = 0;
-    uint16_t label_id = 0;
+    uint16_t label_id  = 0;
 
     std::stringstream sstr;
 
@@ -965,14 +965,11 @@ static std::string printInstructionControlFlow(
     }
     else
     {
-        auto printInstName = [](std::stringstream& SS, const CISA_INST* I, const char* IName) {
-            SS << printPredicate(I->opcode, I->pred)
-                << ISA_Inst_Table[I->opcode].str
-                << " "
-                << printExecutionSize(I->opcode, I->execsize);
-        };
-
-        const char* InstName = ISA_Inst_Table[opcode].str;
+        sstr << printPredicate(inst->opcode, inst->pred)
+             << ISA_Inst_Table[opcode].str
+             << " "
+             << printExecutionSize(inst->opcode, inst->execsize);
+
         switch (opcode)
         {
             case ISA_JMP:
@@ -983,13 +980,6 @@ static std::string printInstructionControlFlow(
                 /// label / function id to jump / call to.
                 label_id = getPrimitiveOperand<uint16_t>(inst, i++);
 
-                // If it is fccall, using "fccall" as text name.
-                bool is_fccall = false; // (opcode == ISA_CALL && header->getLabel(label_id)->kind == LABEL_FC);
-                InstName = is_fccall ? "fccall" : InstName;
-
-                // print instruction name, etc
-                printInstName(sstr, inst, InstName);
-
                 if (opcode == ISA_FCALL)
                 {
                     /// function name in string
@@ -1015,9 +1005,6 @@ static std::string printInstructionControlFlow(
             }
             case ISA_IFCALL:
             {
-                // print instruction name, etc
-                printInstName(sstr, inst, InstName);
-
                 sstr << printOperand(header, inst, i++, opt);
                 /// arg size
                 sstr << " " << getPrimitiveOperand<unsigned>(inst, i++);
@@ -1027,9 +1014,6 @@ static std::string printInstructionControlFlow(
             }
             case ISA_FADDR:
             {
-                // print instruction name, etc
-                printInstName(sstr, inst, InstName);
-
                 /// symbol name in string
                 sstr << header->getString(getPrimitiveOperand<uint16_t>(inst, i++));
                 /// dst
@@ -1038,9 +1022,6 @@ static std::string printInstructionControlFlow(
             }
             case ISA_SWITCHJMP:
             {
-                // print instruction name, etc
-                printInstName(sstr, inst, InstName);
-
                 /// skip num_labels
                 i++;
                 /// index