Use pointer instead of string name to index LabelMap in legacy encoder.

weiyu-chen · sys_zuul · commit bda005b29fcb · 2020-08-05T20:11:36.000-07:00
Change-Id: Ib4aaa9b81dadbbecd384b835b628945d3d5fc079
diff --git a/visa/BinaryEncoding.cpp b/visa/BinaryEncoding.cpp
@@ -3055,17 +3055,16 @@ bool BinaryEncoding::EncodeConditionalBranches(G4_INST *inst,
          op == G4_endif ||
          op == G4_join )
     {
-        G4_Operand *jip = inst->asCFInst()->getJip();
-        if (jip && jip->isLabel())
+        G4_Label* jip = inst->asCFInst()->getJip();
+        if (jip)
         {
-            jipLabel = inst->asCFInst()->getJipLabelStr();
-            int32_t info = GetLabelInfo(this->LabelMap, jipLabel);
+            int32_t info = GetLabelInfo(jip);
             if (info == -1)
             {
                 return false;
             }
             jipOffset = info - insOffset;
-            if ( !isValidIPOffset(jipOffset) )
+            if (!isValidIPOffset(jipOffset))
             {
                 MUST_BE_TRUE(false, "invalid IP offset");
             }
@@ -3092,17 +3091,16 @@ bool BinaryEncoding::EncodeConditionalBranches(G4_INST *inst,
          op == G4_else                  ||
          op == G4_goto )
     {
-        G4_Operand *uip = inst->asCFInst()->getUip();
-        if ( uip && uip->isLabel() )
+        G4_Label* uip = inst->asCFInst()->getUip();
+        if (uip)
         {
-            uipLabel = inst->asCFInst()->getUipLabelStr();
-            int32_t info = GetLabelInfo(this->LabelMap, uipLabel);
+            int32_t info = GetLabelInfo(uip);
             if (info == -1)
             {
                 return false;
             }
             uipOffset = info - insOffset;
-            if ( !isValidIPOffset(uipOffset) )
+            if (!isValidIPOffset(uipOffset))
             {
                 MUST_BE_TRUE(false, "invalid IP offset");
             }
@@ -3125,13 +3123,12 @@ bool BinaryEncoding::EncodeConditionalBranches(G4_INST *inst,
          inst->getSrc(0)->isLabel() )
     {
         // find the label's IP count
-        G4_Operand *opnd = inst->getSrc(0);
-        std::string jmpLabel = opnd->asLabel()->getLabel();
+        G4_Label *opnd = inst->getSrc(0)->asLabel();
         BinInst * mybin = inst->getBinInst();
         // Calculate the address offset
         // Label has the same IP count as the following instruction,
         // "break 1" is to the fall through instruction
-        int32_t info = GetLabelInfo(this->LabelMap, jmpLabel);
+        int32_t info = GetLabelInfo(opnd);
         if (info == -1)
         {
             return false;
@@ -3175,9 +3172,8 @@ bool BinaryEncoding::EncodeConditionalBranches(G4_INST *inst,
 
         if (inst->getSrc(0)->isLabel())
         {
-            G4_Operand *opnd = inst->getSrc(0);
-            std::string jmpLabel = opnd->asLabel()->getLabel();
-            int32_t info = GetLabelInfo(this->LabelMap, jmpLabel);
+            G4_Label *opnd = inst->getSrc(0)->asLabel();
+            int32_t info = GetLabelInfo(opnd);
             if (info == -1)
             {
                 return false;
diff --git a/visa/BinaryEncodingCNL.cpp b/visa/BinaryEncodingCNL.cpp
@@ -1648,11 +1648,10 @@ bool BinaryEncodingCNL::EncodeConditionalBranches(G4_INST *inst,
          op == G4_goto ||
          op == G4_join )
     {
-        G4_Operand *jip = inst->asCFInst()->getJip();
-        if (jip && jip->isLabel())
+        G4_Label *jip = inst->asCFInst()->getJip();
+        if (jip)
         {
-            jipLabel = inst->asCFInst()->getJipLabelStr();
-            int32_t info = GetLabelInfo(this->LabelMap, jipLabel);
+            int32_t info = GetLabelInfo(jip);
             if (info == -1)
             {
                 return false;
@@ -1684,11 +1683,10 @@ bool BinaryEncodingCNL::EncodeConditionalBranches(G4_INST *inst,
         op == G4_else                  ||
         op == G4_goto )
     {
-        G4_Operand *uip = inst->asCFInst()->getUip();
-        if ( uip && uip->isLabel() )
+        G4_Label* uip = inst->asCFInst()->getUip();
+        if (uip)
         {
-            uipLabel = inst->asCFInst()->getUipLabelStr();
-            int32_t info = GetLabelInfo(this->LabelMap, uipLabel);
+            int32_t info = GetLabelInfo(uip);
             if (info == -1)
             {
                 return false;
@@ -1714,12 +1712,11 @@ bool BinaryEncodingCNL::EncodeConditionalBranches(G4_INST *inst,
     {
         // find the label's IP count
         G4_Operand *opnd = inst->getSrc(0);
-        std::string jmpLabel = opnd->asLabel()->getLabel();
         BinInst * mybin = inst->getBinInst();
         // Calculate the address offset
         // Label has the same IP count as the following instruction,
         // "break 1" is to the fall through instruction
-        int32_t info = GetLabelInfo(this->LabelMap, jmpLabel);
+        int32_t info = GetLabelInfo(opnd->asLabel());
         if (info == -1)
         {
             return false;
@@ -1755,8 +1752,7 @@ bool BinaryEncodingCNL::EncodeConditionalBranches(G4_INST *inst,
          inst->getSrc(0)->isLabel() )
     {
         G4_Operand *opnd = inst->getSrc(0);
-        std::string jmpLabel = opnd->asLabel()->getLabel();
-        int32_t info = GetLabelInfo(this->LabelMap, jmpLabel);
+        int32_t info = GetLabelInfo(opnd->asLabel());
         if (info == -1)
         {
             return false;
diff --git a/visa/Common_BinaryEncoding.h b/visa/Common_BinaryEncoding.h
@@ -1489,8 +1489,7 @@ namespace vISA
     protected:
 
         // returns the offset for label in # of half instructions (kernel entry is 0), or -1 if the label is not present
-        inline uint32_t GetLabelInfo(std::map<std::string, uint32_t>& LabelMap,
-            std::string& label)
+        inline uint32_t GetLabelInfo(G4_Label* label)
         {
             auto iter = LabelMap.find(label);
             if (iter == LabelMap.end())
@@ -1504,7 +1503,7 @@ namespace vISA
         std::string          fileName; ///< Name of the binary file
         G4_Kernel&      kernel;
         BinInstList     binInstList; ///< Reference to the binary instructions
-        std::map<std::string, uint32_t> LabelMap;
+        std::map<G4_Label*, uint32_t> LabelMap;
 
         uint32_t        instCounts;
 
@@ -1564,7 +1563,7 @@ namespace vISA
     {
         if (inst->isLabel())
         {
-            this->LabelMap[inst->getLabelStr()] = globalHalfInstNum;
+            this->LabelMap[inst->getLabel()] = globalHalfInstNum;
         }
         else
         {

Original file line number	Diff line number	Diff line change
`@@ -3055,17 +3055,16 @@ bool BinaryEncoding::EncodeConditionalBranches(G4_INST *inst,`
`3055`	`3055`	`op == G4_endif \|\|`
`3056`	`3056`	`op == G4_join )`
`3057`	`3057`	`{`
`3058`		`- G4_Operand *jip = inst->asCFInst()->getJip();`
`3059`		`- if (jip && jip->isLabel())`
	`3058`	`+ G4_Label* jip = inst->asCFInst()->getJip();`
	`3059`	`+ if (jip)`
`3060`	`3060`	`{`
`3061`		`- jipLabel = inst->asCFInst()->getJipLabelStr();`
`3062`		`- int32_t info = GetLabelInfo(this->LabelMap, jipLabel);`
	`3061`	`+ int32_t info = GetLabelInfo(jip);`
`3063`	`3062`	`if (info == -1)`
`3064`	`3063`	`{`
`3065`	`3064`	`return false;`
`3066`	`3065`	`}`
`3067`	`3066`	`jipOffset = info - insOffset;`
`3068`		`- if ( !isValidIPOffset(jipOffset) )`
	`3067`	`+ if (!isValidIPOffset(jipOffset))`
`3069`	`3068`	`{`
`3070`	`3069`	`MUST_BE_TRUE(false, "invalid IP offset");`
`3071`	`3070`	`}`
`@@ -3092,17 +3091,16 @@ bool BinaryEncoding::EncodeConditionalBranches(G4_INST *inst,`
`3092`	`3091`	`op == G4_else \|\|`
`3093`	`3092`	`op == G4_goto )`
`3094`	`3093`	`{`
`3095`		`- G4_Operand *uip = inst->asCFInst()->getUip();`
`3096`		`- if ( uip && uip->isLabel() )`
	`3094`	`+ G4_Label* uip = inst->asCFInst()->getUip();`
	`3095`	`+ if (uip)`
`3097`	`3096`	`{`
`3098`		`- uipLabel = inst->asCFInst()->getUipLabelStr();`
`3099`		`- int32_t info = GetLabelInfo(this->LabelMap, uipLabel);`
	`3097`	`+ int32_t info = GetLabelInfo(uip);`
`3100`	`3098`	`if (info == -1)`
`3101`	`3099`	`{`
`3102`	`3100`	`return false;`
`3103`	`3101`	`}`
`3104`	`3102`	`uipOffset = info - insOffset;`
`3105`		`- if ( !isValidIPOffset(uipOffset) )`
	`3103`	`+ if (!isValidIPOffset(uipOffset))`
`3106`	`3104`	`{`
`3107`	`3105`	`MUST_BE_TRUE(false, "invalid IP offset");`
`3108`	`3106`	`}`
`@@ -3125,13 +3123,12 @@ bool BinaryEncoding::EncodeConditionalBranches(G4_INST *inst,`
`3125`	`3123`	`inst->getSrc(0)->isLabel() )`
`3126`	`3124`	`{`
`3127`	`3125`	`// find the label's IP count`
`3128`		`- G4_Operand *opnd = inst->getSrc(0);`
`3129`		`- std::string jmpLabel = opnd->asLabel()->getLabel();`
	`3126`	`+ G4_Label *opnd = inst->getSrc(0)->asLabel();`
`3130`	`3127`	`BinInst * mybin = inst->getBinInst();`
`3131`	`3128`	`// Calculate the address offset`
`3132`	`3129`	`// Label has the same IP count as the following instruction,`
`3133`	`3130`	`// "break 1" is to the fall through instruction`
`3134`		`- int32_t info = GetLabelInfo(this->LabelMap, jmpLabel);`
	`3131`	`+ int32_t info = GetLabelInfo(opnd);`
`3135`	`3132`	`if (info == -1)`
`3136`	`3133`	`{`
`3137`	`3134`	`return false;`
`@@ -3175,9 +3172,8 @@ bool BinaryEncoding::EncodeConditionalBranches(G4_INST *inst,`
`3175`	`3172`
`3176`	`3173`	`if (inst->getSrc(0)->isLabel())`
`3177`	`3174`	`{`
`3178`		`- G4_Operand *opnd = inst->getSrc(0);`
`3179`		`- std::string jmpLabel = opnd->asLabel()->getLabel();`
`3180`		`- int32_t info = GetLabelInfo(this->LabelMap, jmpLabel);`
	`3175`	`+ G4_Label *opnd = inst->getSrc(0)->asLabel();`
	`3176`	`+ int32_t info = GetLabelInfo(opnd);`
`3181`	`3177`	`if (info == -1)`
`3182`	`3178`	`{`
`3183`	`3179`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -1648,11 +1648,10 @@ bool BinaryEncodingCNL::EncodeConditionalBranches(G4_INST *inst,`
`1648`	`1648`	`op == G4_goto \|\|`
`1649`	`1649`	`op == G4_join )`
`1650`	`1650`	`{`
`1651`		`- G4_Operand *jip = inst->asCFInst()->getJip();`
`1652`		`- if (jip && jip->isLabel())`
	`1651`	`+ G4_Label *jip = inst->asCFInst()->getJip();`
	`1652`	`+ if (jip)`
`1653`	`1653`	`{`
`1654`		`- jipLabel = inst->asCFInst()->getJipLabelStr();`
`1655`		`- int32_t info = GetLabelInfo(this->LabelMap, jipLabel);`
	`1654`	`+ int32_t info = GetLabelInfo(jip);`
`1656`	`1655`	`if (info == -1)`
`1657`	`1656`	`{`
`1658`	`1657`	`return false;`
`@@ -1684,11 +1683,10 @@ bool BinaryEncodingCNL::EncodeConditionalBranches(G4_INST *inst,`
`1684`	`1683`	`op == G4_else \|\|`
`1685`	`1684`	`op == G4_goto )`
`1686`	`1685`	`{`
`1687`		`- G4_Operand *uip = inst->asCFInst()->getUip();`
`1688`		`- if ( uip && uip->isLabel() )`
	`1686`	`+ G4_Label* uip = inst->asCFInst()->getUip();`
	`1687`	`+ if (uip)`
`1689`	`1688`	`{`
`1690`		`- uipLabel = inst->asCFInst()->getUipLabelStr();`
`1691`		`- int32_t info = GetLabelInfo(this->LabelMap, uipLabel);`
	`1689`	`+ int32_t info = GetLabelInfo(uip);`
`1692`	`1690`	`if (info == -1)`
`1693`	`1691`	`{`
`1694`	`1692`	`return false;`
`@@ -1714,12 +1712,11 @@ bool BinaryEncodingCNL::EncodeConditionalBranches(G4_INST *inst,`
`1714`	`1712`	`{`
`1715`	`1713`	`// find the label's IP count`
`1716`	`1714`	`G4_Operand *opnd = inst->getSrc(0);`
`1717`		`- std::string jmpLabel = opnd->asLabel()->getLabel();`
`1718`	`1715`	`BinInst * mybin = inst->getBinInst();`
`1719`	`1716`	`// Calculate the address offset`
`1720`	`1717`	`// Label has the same IP count as the following instruction,`
`1721`	`1718`	`// "break 1" is to the fall through instruction`
`1722`		`- int32_t info = GetLabelInfo(this->LabelMap, jmpLabel);`
	`1719`	`+ int32_t info = GetLabelInfo(opnd->asLabel());`
`1723`	`1720`	`if (info == -1)`
`1724`	`1721`	`{`
`1725`	`1722`	`return false;`
`@@ -1755,8 +1752,7 @@ bool BinaryEncodingCNL::EncodeConditionalBranches(G4_INST *inst,`
`1755`	`1752`	`inst->getSrc(0)->isLabel() )`
`1756`	`1753`	`{`
`1757`	`1754`	`G4_Operand *opnd = inst->getSrc(0);`
`1758`		`- std::string jmpLabel = opnd->asLabel()->getLabel();`
`1759`		`- int32_t info = GetLabelInfo(this->LabelMap, jmpLabel);`
	`1755`	`+ int32_t info = GetLabelInfo(opnd->asLabel());`
`1760`	`1756`	`if (info == -1)`
`1761`	`1757`	`{`
`1762`	`1758`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -1489,8 +1489,7 @@ namespace vISA`
`1489`	`1489`	`protected:`
`1490`	`1490`
`1491`	`1491`	`// returns the offset for label in # of half instructions (kernel entry is 0), or -1 if the label is not present`
`1492`		`- inline uint32_t GetLabelInfo(std::map<std::string, uint32_t>& LabelMap,`
`1493`		`- std::string& label)`
	`1492`	`+ inline uint32_t GetLabelInfo(G4_Label* label)`
`1494`	`1493`	`{`
`1495`	`1494`	`auto iter = LabelMap.find(label);`
`1496`	`1495`	`if (iter == LabelMap.end())`
`@@ -1504,7 +1503,7 @@ namespace vISA`
`1504`	`1503`	`std::string fileName; ///< Name of the binary file`
`1505`	`1504`	`G4_Kernel& kernel;`
`1506`	`1505`	`BinInstList binInstList; ///< Reference to the binary instructions`
`1507`		`- std::map<std::string, uint32_t> LabelMap;`
	`1506`	`+ std::map<G4_Label*, uint32_t> LabelMap;`
`1508`	`1507`
`1509`	`1508`	`uint32_t instCounts;`
`1510`	`1509`
`@@ -1564,7 +1563,7 @@ namespace vISA`
`1564`	`1563`	`{`
`1565`	`1564`	`if (inst->isLabel())`
`1566`	`1565`	`{`
`1567`		`- this->LabelMap[inst->getLabelStr()] = globalHalfInstNum;`
	`1566`	`+ this->LabelMap[inst->getLabel()] = globalHalfInstNum;`
`1568`	`1567`	`}`
`1569`	`1568`	`else`
`1570`	`1569`	`{`