Changeset 3917 in CLRX

Timestamp:

Mar 21, 2018, 8:50:59 PM (5 weeks ago)

Author:

matszpk

Message:

CLRadeonExtender: AsmRegAlloc?: Apply calls from last entry position to stackVarMap (resolveSSAConflicts). Update testcases.

Location:

CLRadeonExtender/trunk

Files:

• amdasm/AsmRegAlloc.cpp (modified) (3 diffs)
• tests/amdasm/AsmRegAllocCase2.cpp (modified) (5 diffs)
• tests/amdasm/AsmRegAllocCase3.cpp (modified) (2 diffs)

CLRadeonExtender/trunk/amdasm/AsmRegAlloc.cpp

@@ -944 +944 @@
                 stackVarMap = *cached;
                 pfStartIndex = it->second.second+1;
+                
+                // apply missing calls at end of the cached
+                const CodeBlock& cblock = codeBlocks[it->second.first];
+                for (const NextBlock& next: cblock.nexts)
+                    if (next.isCall)
+                    {
+                        std::cout << "  applycall (cache): " << it->second.first << ": " <<
+                                next.block << std::endl;
+                        const LastSSAIdMap& regVarMap =
+                                routineMap.find(next.block)->second.lastSSAIdMap;
+                        for (const auto& sentry: regVarMap)
+                            stackVarMap[sentry.first] = sentry.second;
+                    }
             }
         }
@@ -1240 +1253 @@
             std::cout << " " << v;
         std::cout << std::endl;
+    }
+}
+
+static void reduceSSAIdsForCalls(FlowStackEntry& entry,
+            const std::vector<CodeBlock>& codeBlocks,
+            RetSSAIdMap& retSSAIdMap, std::unordered_map<size_t, RoutineData>& routineMap,
+            SSAReplacesMap& ssaReplacesMap)
+{
+    if (retSSAIdMap.empty())
+        return;
+    LastSSAIdMap rbwSSAIdMap;
+    std::unordered_set<AsmSingleVReg> reduced;
+    std::unordered_set<AsmSingleVReg> changed;
+    const CodeBlock& cblock = codeBlocks[entry.blockIndex];
+    // collect rbw SSAIds
+    for (const NextBlock next: cblock.nexts)
+        if (next.isCall)
+        {
+            auto it = routineMap.find(next.block); // must find
+            for (const auto& rentry: it->second.rbwSSAIdMap)
+                rbwSSAIdMap.insertSSAId(rentry.first,rentry.second);
+            
+        }
+    for (const NextBlock next: cblock.nexts)
+        if (next.isCall)
+        {
+            auto it = routineMap.find(next.block); // must find
+            // add changed
+            for (const auto& lentry: it->second.lastSSAIdMap)
+                if (rbwSSAIdMap.find(lentry.first) == rbwSSAIdMap.end())
+                    changed.insert(lentry.first);
+        }
+    
+    // reduce SSAIds
+    for (const auto& rentry: retSSAIdMap)
+    {
+        auto ssaIdsIt = rbwSSAIdMap.find(rentry.first);
+        if (ssaIdsIt != rbwSSAIdMap.end())
+        {
+            const VectorSet<size_t>& ssaIds = ssaIdsIt->second;
+            const VectorSet<size_t>& rssaIds = rentry.second.ssaIds;
+            Array<size_t> outSSAIds(ssaIds.size() + rssaIds.size());
+            std::copy(rssaIds.begin(), rssaIds.end(), outSSAIds.begin());
+            std::copy(ssaIds.begin(), ssaIds.end(), outSSAIds.begin()+rssaIds.size());
+            
+            std::sort(outSSAIds.begin(), outSSAIds.end());
+            outSSAIds.resize(std::unique(outSSAIds.begin(), outSSAIds.end()) -
+                        outSSAIds.begin());
+            size_t minSSAId = outSSAIds.front();
+            if (outSSAIds.size() >= 2)
+            {
+                for (auto sit = outSSAIds.begin()+1; sit != outSSAIds.end(); ++sit)
+                    insertReplace(ssaReplacesMap, rentry.first, *sit, minSSAId);
+                
+                std::cout << "calls retssa ssaid: " << rentry.first.regVar << ":" <<
+                        rentry.first.index << std::endl;
+            }
+            
+            for (size_t rblock: rentry.second.routines)
+                routineMap.find(rblock)->second.lastSSAIdMap[rentry.first] =
+                            VectorSet<size_t>({ minSSAId });
+            reduced.insert(rentry.first);
+        }
+    }
+    for (const AsmSingleVReg& vreg: reduced)
+        retSSAIdMap.erase(vreg);
+    reduced.clear();
+        
+    for (const AsmSingleVReg& vreg: changed)
+    {
+        auto rit = retSSAIdMap.find(vreg);
+        if (rit != retSSAIdMap.end())
+        {
+            // if modified
+            // put before removing to revert for other ways after calls
+            auto res = entry.prevRetSSAIdSets.insert(*rit);
+            if (res.second)
+                res.first->second = rit->second;
+            // just remove, if some change without read before
+            retSSAIdMap.erase(rit);
+        }
     }
 }
@@ -1949 +2043 @@
             if (entry.nextIndex!=0) // if back from calls (just return from calls)
             {
+                reduceSSAIdsForCalls(entry, codeBlocks, retSSAIdMap, routineMap,
+                                     ssaReplacesMap);
                 //
                 for (const NextBlock& next: cblock.nexts)

CLRadeonExtender/trunk/tests/amdasm/AsmRegAllocCase2.cpp

@@ -659 +659 @@
         {   // SSA replaces
             { { "sa", 2 }, { { 3, 2 }, { 4, 1 } } },
-            { { "sa", 5 }, { { 3, 1 }, { 5, 2 }, { 6, 1 } } }
+            { { "sa", 3 }, { { 3, 1 } } },
+            { { "sa", 5 }, { { 3, 1 }, { 5, 2 }, { 6, 1 } } },
         },
         true, ""
@@ -783 +784 @@
         {   // SSA replaces
             { { "sa", 2 }, { { 3, 2 }, { 4, 1 } } },
+            { { "sa", 3 }, { { 3, 1 } } },
             { { "sa", 5 }, { { 4, 2 }, { 5, 1 } } }
         },
@@ -929 +931 @@
             { { "sa", 2 }, { { 4, 2 } } },
             { { "sa", 3 }, { { 4, 2 } } },
-            { { "sa", 4 }, { { 4, 2 } } },
+            { { "sa", 4 }, { { 4, 3 }, { 4, 2 } } },
             { { "sa", 5 }, { { 5, 2 } } }
         },
@@ -1178 +1180 @@
                 { },
                 {
-                    { { "sa", 7 }, SSAInfo(2, 6, 6, 6, 1, true) }
+                    { { "sa", 7 }, SSAInfo(1, 6, 6, 6, 1, true) }
                 }, false, false, true },
             {   // block 8 - routine
@@ -1239 +1241 @@
             { { "sa", 5 }, { { 5, 1 }, { 6, 1 } } },
             { { "sa", 6 }, { { 2, 1 }, { 3, 1 }, { 4, 1 }, { 7, 1 } } },
-            { { "sa", 7 }, { { 3, 2 }, { 4, 2 }, { 2, 1 } } }
+            //{ { "sa", 7 }, { { 3, 2 }, { 4, 2 }, { 2, 1 } } }
+            { { "sa", 7 }, { { 2, 1 }, { 3, 1 }, { 4, 1 } } }
         },
         true, ""

CLRadeonExtender/trunk/tests/amdasm/AsmRegAllocCase3.cpp

@@ -163 +163 @@
                 {
                     { { "sa", 0 }, SSAInfo(0, SIZE_MAX, 1, SIZE_MAX, 0, true) },
-                    { { "sa", 2 }, SSAInfo(2, 6, 6, 6, 1, true) },
+                    { { "sa", 2 }, SSAInfo(1, 6, 6, 6, 1, true) },
                     { { "sa", 3 }, SSAInfo(1, 7, 7, 7, 1, true) },
                     { { "sa", 4 }, SSAInfo(1, 9, 9, 9, 1, true) },
@@ -382 +382 @@
         },
         {   // SSA replaces
-            /*{ { "sa", 2 }, { { 3, 2 }, { 4, 2 }, { 5, 2 }, { 5, 1 }, { 4, 1 } } },
+            { { "sa", 2 }, { { 2, 1 }, { 3, 1 }, { 4, 1 }, { 5, 1 } } },
             { { "sa", 3 }, { { 2, 1 }, { 4, 1 }, { 5, 1 }, { 6, 1 } } },
             { { "sa", 4 }, { { 2, 1 }, { 4, 3 }, { 3, 1 }, { 4, 1 },
-                        { 5, 1 }, { 6, 1 } } },
-            { { "sa", 5 }, { { 2, 1 }, { 3, 1 }, { 4, 1 }, { 5, 1 } } }*/
+                        { 5, 1 }, { 6, 1 }, { 8, 3 }, { 7, 3 } } },
+            { { "sa", 5 }, { { 2, 1 }, { 3, 1 }, { 4, 1 }, { 5, 1 } } }
         },
         true, ""