Allow user to change back to std::sort() in SWSB::tokenAllocation().

Add a vISA option to control the behavior.

Author: petechou

visa/LocalScheduler/SWSB_G4IR.cpp

@@ -2359,14 +2359,24 @@ void SWSB::tokenAllocation()
     //Assign tokens to nodes in the order of liveness. Here we only need to
     //iterate SB nodes in that order, and don't actually need to sort
     //SBSendNodes as it might be referenced through allTokenNodesMap.
-    auto sortInLivenessOrder = [](const SBNODE_VECT& vec) {
-        SBNODE_VECT sorted(vec.size());
-        std::partial_sort_copy(vec.begin(), vec.end(), sorted.begin(), sorted.end(), compareInterval);
-        return sorted;
+    auto sortInLivenessOrder = [](const SBNODE_VECT& vec, bool stdSort) {
+        if (stdSort)
+        {
+            SBNODE_VECT sorted(vec);
+            std::sort(sorted.begin(), sorted.end(), compareInterval);
+            return sorted;
+        }
+        else
+        {
+            SBNODE_VECT sorted(vec.size());
+            std::partial_sort_copy(vec.begin(), vec.end(), sorted.begin(), sorted.end(), compareInterval);
+            return sorted;
+        }
     };
     const bool enableSendTokenReduction = fg.builder->getOptions()->getOption(vISA_EnableSendTokenReduction);
     const bool enableDPASTokenReduction = fg.builder->getOptions()->getOption(vISA_EnableDPASTokenReduction);
-    for (SBNode* node : sortInLivenessOrder(SBSendNodes))
+    const bool assignTokenUsingStdsort = fg.builder->getOptions()->getOption(vISA_AssignTokenUsingStdSort);
+    for (SBNode* node : sortInLivenessOrder(SBSendNodes, assignTokenUsingStdsort))
     {
         unsigned startID = node->getLiveStartID();
         G4_INST* inst = node->getLastInstruction();

visa/include/VISAOptionsDefs.h

@@ -240,6 +240,7 @@ DEF_VISA_OPTION(vISA_DistPropTokenAllocation,      ET_BOOL,  "-distPropTokenAllo
 DEF_VISA_OPTION(vISA_SWSBStitch,      ET_BOOL,  "-SWSBStitch",    UNUSED, false)
 DEF_VISA_OPTION(vISA_SBIDDepLoc,      ET_BOOL,  "-SBIDDepLoc",    UNUSED, false)
 DEF_VISA_OPTION(vISA_DumpSBID,      ET_BOOL,  "-dumpSBID",    UNUSED, false)
+DEF_VISA_OPTION(vISA_AssignTokenUsingStdSort, ET_BOOL, "-assignSWSBTokUsingStdSort", UNUSED, false)
 
 DEF_VISA_OPTION(vISA_EnableALUThreePipes,      ET_BOOL,  "-threeALUPipes",    UNUSED, true)
 DEF_VISA_OPTION(vISA_EnableDPASTokenReduction,      ET_BOOL,  "-DPASTokenReduction",    UNUSED, false)