More on normalizing label creation

Convert some createLabel() to createLocalBlockLabel()

Author: jgu222

visa/BuildIR.h

@@ -1157,13 +1157,19 @@ class IR_Builder
     //
     G4_Label* createLocalBlockLabel(const std::string& lab = "")
     {
-        std::stringstream ss;
-        std::string kname(kernel.getName() ? kernel.getName() : "L");
-        if (kname.size() > 30)
+        const char* cstr_kname = kernel.getName();
+        std::string kname("L");
+        if (cstr_kname)
         {
-            // kname is just for readability. If it is too long, don't use it.
-            kname = "L";
+            std::string tName = sanitizeLabelString(cstr_kname);
+            // cstr_kname is just for readability. If it is too long, don't use it.
+            if (tName.size() != 0 && tName.size() <= 30)
+            {
+                kname = tName;
+            }
         }
+
+        std::stringstream ss;
         uint32_t lbl_id = getAndUpdateNextLabelId();
         ss  << "_" << kname << "_f" << kernel.getFunctionId() << "_" << lbl_id << "_" << lab;
         size_t len = ss.str().size() + 1;

visa/CFGStructurizer.cpp

@@ -2934,9 +2934,7 @@ G4_BB *CFGStructurizer::createBBWithLabel()
     G4_BB *newBB = CFG->createNewBB();
 
     // Create a label for the new BB
-    std::string str = sanitizeLabelString(CFG->builder->kernel.getName()) +
-        "_cf_" + std::to_string(newBB->getId());
-    G4_Label* lab = CFG->builder->createLabel(str, LABEL_BLOCK);
+    G4_Label* lab = CFG->builder->createLocalBlockLabel("cf");
     G4_INST *labelInst = CFG->builder->createLabelInst(lab, false);
     newBB->push_front(labelInst);
     return newBB;

visa/FlowGraph.cpp

@@ -1209,8 +1209,7 @@ void FlowGraph::handleExit(G4_BB* firstSubroutineBB)
             insert(iter, exitBB);
         }
 
-        std::string exitBBStr("__EXIT_BB");
-        G4_Label *exitLabel = builder->createLabel(exitBBStr, LABEL_BLOCK);
+        G4_Label *exitLabel = builder->createLocalBlockLabel("EXIT_BB");
         G4_INST* label = createNewLabelInst(exitLabel);
         exitBB->push_back(label);
 
@@ -1472,8 +1471,7 @@ G4_BB* FlowGraph::mergeSubRoutineReturn(G4_Label* subroutineLabel)
         //
         // Create a label for the newBB and insert return to new BB
         //
-        std::string str = "LABEL__" + std::to_string(newBB->getId());
-        G4_Label* lab = builder->createLabel(str, LABEL_BLOCK);
+        G4_Label* lab = builder->createLocalBlockLabel();
         G4_INST* labelInst = createNewLabelInst(lab);
 
         // exitBB is really just a dummy one for analysis, and does not need a return
@@ -2338,8 +2336,7 @@ void FlowGraph::mergeFReturns()
         {
             G4_BB* newExit = createNewBB();
             assert(!builder->getIsKernel() && "Not expecting fret in kernel");
-            std::string str = "__MERGED_FRET_EXIT_BLOCK";
-            dumLabel = builder->createLabel(str, LABEL_BLOCK);
+            dumLabel = builder->createLocalBlockLabel("MERGED_FRET_EXIT_BB");
             G4_INST* label = createNewLabelInst(dumLabel);
             newExit->push_back(label);
             G4_INST* fret = builder->createInternalCFInst(