More refactoring on visa labels

Use createLocalBlockLabel() as much as possible to normalize visa local labels.

Author: jgu222

visa/FlowGraph.cpp

@@ -345,11 +345,12 @@ G4_BB* FlowGraph::createNewBB(bool insertInFG)
     return bb;
 }
 
-G4_BB* FlowGraph::createNewBBWithLabel(const char* LabelPrefix, int Lineno, int CISAoff)
+G4_BB* FlowGraph::createNewBBWithLabel(const char* LabelSuffix, int Lineno, int CISAoff)
 {
     G4_BB* newBB = createNewBB(true);
-    std::string name = LabelPrefix + std::to_string(newBB->getId());
-    G4_Label* lbl = builder->createLabel(name, LABEL_BLOCK);
+    G4_Label* lbl = LabelSuffix != nullptr
+        ? builder->createLocalBlockLabel(LabelSuffix)
+        : builder->createLocalBlockLabel();
     G4_INST* inst = createNewLabelInst(lbl, Lineno, CISAoff);
     newBB->push_back(inst);
     return newBB;
@@ -1313,7 +1314,7 @@ void FlowGraph::handleReturn(Label_BB_Map& labelMap, FuncInfoHashTable& funcInfo
                     // return edge has not been added yet.
                     G4_INST* I0 = retAddr->getFirstInst();
                     if (I0 == nullptr) I0 = last;
-                    G4_BB* newRetBB = createNewBBWithLabel("Label_return_BB", I0->getLineNo(), I0->getCISAOff());
+                    G4_BB* newRetBB = createNewBBWithLabel("Return_BB", I0->getLineNo(), I0->getCISAOff());
                     bb->removeSuccEdge(retAddr);
                     retAddr->removePredEdge(bb);
                     addPredSuccEdges(bb, newRetBB, true);

visa/FlowGraph.h

@@ -436,7 +436,7 @@ class FlowGraph
     G4_INST* createNewLabelInst(G4_Label* label, int lineNo = 0, int CISAOff = -1);
 
     G4_BB* createNewBB(bool insertInFG = true);
-    G4_BB* createNewBBWithLabel(const char* LabelPrefix, int Lineno = 0, int CISAoff = -1);
+    G4_BB* createNewBBWithLabel(const char* LabelSuffix, int Lineno = 0, int CISAoff = -1);
     int64_t insertDummyUUIDMov();
     //
     // Increase by one so that all BBs' traversal are less than traversalNum

visa/Optimizer.cpp

@@ -1183,7 +1183,7 @@ void Optimizer::insertDummyMovForHWRSWA()
                         }
                     }
                     G4_BB* wa_bb = hasJmpIPred ?
-                        kernel.fg.createNewBBWithLabel("WA_", preInst->getLineNo(), preInst->getCISAOff()) :
+                        kernel.fg.createNewBBWithLabel("RSWA", preInst->getLineNo(), preInst->getCISAOff()) :
                         kernel.fg.createNewBB();
                     kernel.fg.insert(bb_it, wa_bb);
                     G4_Label* newLabel = hasJmpIPred ? wa_bb->getLabel() : NULL;
@@ -8630,8 +8630,7 @@ bool Optimizer::foldPseudoAndOr(G4_BB* bb, INST_LIST_ITER& ii)
             }
             else
             {
-                std::string label_name("ffid_prolog_end");
-                jmp_label = builder.createLabel(label_name, LABEL_BLOCK);
+                jmp_label = builder.createLocalBlockLabel("ffid_prolog_end");
                 next_bb->insertBefore(next_bb->begin(), createLabelInst(jmp_label));
             }
             entry_0_bb->push_back(createJmpi(jmp_label));
@@ -9657,7 +9656,7 @@ bool Optimizer::foldPseudoAndOr(G4_BB* bb, INST_LIST_ITER& ii)
         // NOTE: create the call and label instructions directly without forming a BB to skip the
         // BB end with call checking (e.g. in SWSB setting) that this is just a fall-throug call and
         // is a temporarily WA
-        G4_Label *label = builder.createLabel(std::string("_label_ip_wa"), LABEL_BLOCK);
+        G4_Label *label = builder.createLocalBlockLabel("ip_wa");
         insts.push_back(builder.createInternalInst(
             nullptr, G4_call, nullptr, g4::NOSAT, g4::SIMD1,
             builder.createDstRegRegion(dst_decl, 1),
@@ -16700,7 +16699,7 @@ void Optimizer::applyFusedCallWA()
             {
                 // Cannot insert join, otherwise, label for while/endif would be wrong
                 // Here, create a new empty BB so that we can add join into it.
-                G4_BB* endBB = fg.createNewBBWithLabel("_FusedCallWA_EndBB/Tar", callI->getLineNo(), callI->getCISAOff());
+                G4_BB* endBB = fg.createNewBBWithLabel("CallWA_EndBB", callI->getLineNo(), callI->getCISAOff());
                 nextBI = fg.insert(nextBI, endBB);
 
                 // Adjust control-flow
@@ -16763,10 +16762,10 @@ void Optimizer::applyFusedCallWA()
         BB->push_back(I2);
         BB->push_back(I3);
 
-        G4_BB* bigB0 = fg.createNewBBWithLabel("_FusedCallWA_", callI->getLineNo(), callI->getCISAOff());
-        G4_BB* bigB1 = fg.createNewBBWithLabel("_FusedCallWA_", callI->getLineNo(), callI->getCISAOff());
-        G4_BB* smallB0 = fg.createNewBBWithLabel("_FusedCallWA_", callI->getLineNo(), callI->getCISAOff());
-        G4_BB* smallB1 = fg.createNewBBWithLabel("_FusedCallWA_", callI->getLineNo(), callI->getCISAOff());
+        G4_BB* bigB0 = fg.createNewBBWithLabel("CallWA_BigB0", callI->getLineNo(), callI->getCISAOff());
+        G4_BB* bigB1 = fg.createNewBBWithLabel("CallWA_BigB1", callI->getLineNo(), callI->getCISAOff());
+        G4_BB* smallB0 = fg.createNewBBWithLabel("CallWA_SmallB0", callI->getLineNo(), callI->getCISAOff());
+        G4_BB* smallB1 = fg.createNewBBWithLabel("CallWA_SmallB1", callI->getLineNo(), callI->getCISAOff());
         // Note that nextBI points to the nextBB!
         fg.insert(nextBI, bigB0);
         fg.insert(nextBI, bigB1);