internal minor change

Internal change

Author: jgu222

visa/BuildCISAIR.h

@@ -269,6 +269,7 @@ class CISA_IR_Builder : public VISABuilder
         VISA_EMask_Ctrl emask,
         unsigned exec_size,
         const char *target_label,
+        bool is_fccall,
         int lineNum);
 
 

visa/BuildCISAIRImpl.cpp

@@ -1829,6 +1829,7 @@ bool CISA_IR_Builder::CISA_create_branch_instruction(
     VISA_EMask_Ctrl emask,
     unsigned exec_size,
     const char *target_label,
+    bool is_fccall,
     int lineNum)
 {
     VISA_LabelOpnd * opnd[1];
@@ -1842,10 +1843,12 @@ bool CISA_IR_Builder::CISA_create_branch_instruction(
             //determine correct IDs since function directive might not have been
             //encountered yet
             opnd[i] = m_kernel->getLabelOperandFromFunctionName(std::string(target_label));
+
+            VISA_Label_Kind lblKind = is_fccall ? LABEL_FC : LABEL_SUBROUTINE;
             if (!opnd[i])
             {
-                VISA_CALL_TO_BOOL(CreateVISALabelVar, opnd[i], target_label, LABEL_SUBROUTINE);
-                opnd[i]->tag = ISA_SUBROUTINE;
+                VISA_CALL_TO_BOOL(CreateVISALabelVar, opnd[i], target_label, lblKind);
+                opnd[i]->tag = lblKind;
             }
             VISA_Exec_Size executionSize = Get_VISA_Exec_Size_From_Raw_Size(exec_size);
             VISA_CALL_TO_BOOL(AppendVISACFCallInst,

visa/CISA.l

@@ -521,7 +521,7 @@ vme_fbr {
         return VME_FBR_OP;
     }
 
-jmp|call|goto {
+jmp|goto {
         TRACE("** branch INST");
         CISAlval.opcode = str2opcode(yytext);
         return BRANCH_OP;
@@ -533,6 +533,20 @@ ret|fret {
         return RET_OP;
 }
 
+call {
+        TRACE("** call INST");
+        CISAlval.cisa_call.opcode = ISA_CALL;
+        CISAlval.cisa_call.is_fccall = false;
+        return CALL_OP;
+}
+
+fccall {
+        TRACE("** fccall INST");
+        CISAlval.cisa_call.opcode = ISA_CALL;
+        CISAlval.cisa_call.is_fccall = true;
+        return CALL_OP;
+}
+
 fcall {
    TRACE("** function call INST");
         CISAlval.opcode = ISA_FCALL;

visa/CISA.y

@@ -105,6 +105,12 @@ std::vector<attr_gen_struct*> AttrOptVar;
     VISA_PREDICATE_STATE   pred_sign;
     VISA_PREDICATE_CONTROL pred_ctrl;
 
+    // to tell call is fc_call or subroutine call
+    struct call_sub_or_fc {
+        ISA_Opcode opcode;
+        bool       is_fccall;
+    } cisa_call;
+
     struct {
         VISA_Modifier mod;
     } src_mod;
@@ -384,6 +390,7 @@ std::vector<attr_gen_struct*> AttrOptVar;
 %token <opcode> LIFETIME_START_OP
 %token <opcode> LIFETIME_END_OP
 %token <opcode> AVS_OP
+%token <cisa_call> CALL_OP
 
 %type <string> RTWriteModeOpt
 
@@ -1383,7 +1390,11 @@ SwitchLabels:
                    // 1        2         3          4
 BranchInstruction: Predicate BRANCH_OP ExecSize IdentOrStringLit
     {
-        pBuilder->CISA_create_branch_instruction($1, $2, $3.emask, $3.exec_size, $4, CISAlineno);
+        pBuilder->CISA_create_branch_instruction($1, $2, $3.emask, $3.exec_size, $4, false, CISAlineno);
+    }
+    | Predicate CALL_OP ExecSize IdentOrStringLit
+    {
+        pBuilder->CISA_create_branch_instruction($1, $2.opcode, $3.emask, $3.exec_size, $4, $2.is_fccall, CISAlineno);
     }
     | Predicate RET_OP ExecSize
     {

visa/IsaDisassembly.cpp

@@ -969,7 +969,7 @@ static std::string printInstructionControlFlow(
         label_id = getPrimitiveOperand<uint16_t>(inst, i++);
 
         const label_info_t* lblinfo = header->getLabel(label_id);
-        const char* instName = ((false && lblinfo->kind == LABEL_FC) ? "fccall" : ISA_Inst_Table[opcode].str);
+        const char* instName = (lblinfo->kind == LABEL_FC ? "fccall" : ISA_Inst_Table[opcode].str);
         sstr << printPredicate(opcode, inst->pred)
              << instName
              << " "
@@ -2713,4 +2713,4 @@ std::string printInstruction(
     }
 
     return sstr.str();
-}
+}

visa/IsaVerification.cpp

@@ -3122,7 +3122,11 @@ void vISAVerifier::finalize()
     {
         if (!(iter.second))
         {
-            REPORT_HEADER(options, false, "undefined label: %s", header->getString(header->getLabel(iter.first)->name_index));
+            const label_info_t* lblInfo = header->getLabel(iter.first);
+            if (lblInfo->kind != LABEL_FC)
+            {
+                REPORT_HEADER(options, false, "undefined label: %s", header->getString(lblInfo->name_index));
+            }
         }
     }
 }