Changeset 3982 in CLRX

Timestamp:

Apr 10, 2018, 4:18:18 PM (9 days ago)

Author:

matszpk

Message:

CLRadeonExtender: AsmRegAlloc?: Use blockIndex as size_t in finding recursion and collecting changed regvars.

File:

• CLRadeonExtender/trunk/amdasm/AsmRegAlloc.cpp (modified) (11 diffs)

CLRadeonExtender/trunk/amdasm/AsmRegAlloc.cpp

@@ -716 +716 @@
 struct CLRX_INTERNAL FlowStackEntry4
 {
-    BlockIndex blockIndex;
+    size_t blockIndex;
     size_t nextIndex;
     bool isCall;
@@ -2146 +2146 @@
 }
 
-typedef std::unordered_map<BlockIndex, std::unordered_set<AsmSingleVReg> >
+typedef std::unordered_map<size_t, std::unordered_set<AsmSingleVReg> >
                 RecurChangedVarMap;
 
@@ -2259 +2259 @@
     {
         FlowStackEntry4& entry = flowStack.back();
-        CodeBlock& cblock = codeBlocks[entry.blockIndex.index];
+        CodeBlock& cblock = codeBlocks[entry.blockIndex];
         
         if (entry.nextIndex == 0)
@@ -2274 +2274 @@
         
         if (!callStack.empty() &&
-            entry.blockIndex == callStack.back().callBlock &&
+            entry.blockIndex == callStack.back().callBlock.index &&
             entry.nextIndex-1 == callStack.back().callNextIndex)
         {
@@ -2286 +2286 @@
         {
             bool isCall = false;
-            BlockIndex nextBlock = cblock.nexts[entry.nextIndex].block;
+            size_t nextBlock = cblock.nexts[entry.nextIndex].block;
             
             if (cblock.nexts[entry.nextIndex].isCall)
@@ -2295 +2295 @@
                     std::cout << "finding recursions: " << nextBlock << std::endl;
                     // uncomment after tests
-                    recurChangedVarMap.insert({ nextBlock.index, { } });
+                    recurChangedVarMap.insert({ nextBlock, { } });
                     entry.nextIndex++;
                     continue;
                 }
                 // comment after tests
-                //recurChangedVarMap.insert({ nextBlock.index, { } });
+                //recurChangedVarMap.insert({ nextBlock, { } });
                 callStack.push_back({ entry.blockIndex, entry.nextIndex, nextBlock });
                 std::cout << "finding recur: call: " << nextBlock << std::endl;
@@ -2332 +2332 @@
         loopBlocks.clear();
         
-        std::unordered_map<BlockIndex, std::unordered_set<AsmSingleVReg> > chLoopEnds;
+        std::unordered_map<size_t, std::unordered_set<AsmSingleVReg> > chLoopEnds;
         
         while (!flowStack.empty())
         {
             FlowStackEntry4& entry = flowStack.back();
-            CodeBlock& cblock = codeBlocks[entry.blockIndex.index];
+            CodeBlock& cblock = codeBlocks[entry.blockIndex];
             
             if (entry.nextIndex == 0)
@@ -2390 +2390 @@
             {
                 bool isCall = false;
-                BlockIndex nextBlock = cblock.nexts[entry.nextIndex].block;
+                size_t nextBlock = cblock.nexts[entry.nextIndex].block;
                 flowStack.push_back({ nextBlock, 0, isCall });
                 if (flowStackBlocks[nextBlock])
@@ -2623 +2623 @@
             if (cblock.nexts[entry.nextIndex].isCall)
             {
-                bool nextRecursion = false;
+                bool nextRecursion = true;
                 if (!callBlocks.insert(nextBlock).second)
                 {
                     // if already called (then it is recursion)
-                    nextRecursion = recurseBlocks.insert(nextBlock.index).second;
-                    if (nextRecursion)
+                    if (recurseBlocks.insert(nextBlock.index).second)
                     {
                         std::cout << "   -- recursion: " << nextBlock << std::endl;
@@ -2637 +2636 @@
                     else if (entry.blockIndex.pass==1)
                     {
+                        nextRecursion = false;
                         entry.nextIndex++;
                         std::cout << " NO call (rec): " << entry.blockIndex << std::endl;
-                        continue;
+                        //continue;
                     }
                 }
@@ -2645 +2645 @@
                     recurseBlocks.find(nextBlock.index) != recurseBlocks.end())
                 {
+                    nextRecursion = false;
                     entry.nextIndex++;
                     std::cout << " NO call (rec)2: " << entry.blockIndex << std::endl;
+                    //continue;
+                }
+                
+                if (!nextRecursion)
                     continue;
-                }
+                
                 std::cout << " call: " << entry.blockIndex << std::endl;