Changeset 3936 in CLRX

Timestamp:

Mar 25, 2018, 6:38:12 PM (4 months ago)

Author:

matszpk

Message:

CLRadeonExtender: AsmRegAlloc?: Next preppings to recursion support. Comment internal routines.

File:

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

CLRadeonExtender/trunk/amdasm/AsmRegAlloc.cpp

@@ -678 +678 @@
 }
 
+/* caching concepts:
+ * resfirstPointsCache - cache of the ways that goes to conflict which should be resolved
+ *               from first code block of the code. The entries holds a stackVarMap state
+ *               to first point the conflict (first visited already code block)
+ * resSecondPointsCache - cache of the tree traversing, starting at the first conflict
+ *               point (first visited code block). Entries holds a
+ *               regvars SSAId read before write (that should resolved)
+ */
+
 static void handleSSAEntryWhileResolving(SSAReplacesMap* replacesMap,
             const LastSSAIdMap* stackVarMap,
@@ -736 +745 @@
 typedef std::unordered_map<size_t, std::pair<size_t, size_t> > PrevWaysIndexMap;
 
+// use res second point cache entry to resolve conflict with SSAIds.
+// it emits SSA replaces from these conflicts
 static void useResSecPointCache(SSAReplacesMap* replacesMap,
         const LastSSAIdMap* stackVarMap,
@@ -792 +803 @@
 }
 
+// add new res second cache entry with readBeforeWrite for all encountered regvars
 static void addResSecCacheEntry(const std::unordered_map<size_t, RoutineData>& routineMap,
                 const std::vector<CodeBlock>& codeBlocks,
@@ -907 +919 @@
 }
 
+// apply calls (changes from these calls) from code blocks to stack var map
 static void applyCallToStackVarMap(const CodeBlock& cblock,
         const std::unordered_map<size_t, RoutineData>& routineMap,
@@ -934 +947 @@
 
 
+// main routine to resilve SSA conflicts in code
+// it emits SSA replaces from these conflicts
 static void resolveSSAConflicts(const std::deque<FlowStackEntry2>& prevFlowStack,
         const std::unordered_map<size_t, RoutineData>& routineMap,
@@ -1122 +1137 @@
 }
 
+// join ret SSAId Map - src - last SSAIdMap from called routine
 static void joinRetSSAIdMap(RetSSAIdMap& dest, const LastSSAIdMap& src,
                 size_t routineBlock)
@@ -1148 +1164 @@
 }
 
+// simple join last ssaid map
 static void joinLastSSAIdMap(LastSSAIdMap& dest, const LastSSAIdMap& src)
 {
@@ -1171 +1188 @@
 }
 
+// join last SSAIdMap of the routine including later routine call
+// dest - dest last SSAId map, src - source lastSSAIdMap
+// laterRdatas - data of subroutine/routine exeuted after src lastSSAIdMap state
 static void joinLastSSAIdMapInt(LastSSAIdMap& dest, const LastSSAIdMap& src,
                     const LastSSAIdMap& laterRdataCurSSAIdMap,
@@ -1218 +1238 @@
 
 
+// join routine data from child call with data from parent routine
+// (just join child call from parent)
 static void joinRoutineData(RoutineData& dest, const RoutineData& src)
 {
@@ -1253 +1275 @@
 }
 
+// reduce retSSAIds for calls (for all read before write SSAIds for current code block)
 static void reduceSSAIdsForCalls(FlowStackEntry& entry,
             const std::vector<CodeBlock>& codeBlocks,
@@ -1334 +1357 @@
 }
 
+// reduce retSSAIds (last SSAIds for regvar) while passing by code block
+// and emits SSA replaces for these ssaids
 static bool reduceSSAIds(std::unordered_map<AsmSingleVReg, size_t>& curSSAIdMap,
             RetSSAIdMap& retSSAIdMap, std::unordered_map<size_t, RoutineData>& routineMap,
@@ -1382 +1407 @@
 }
 
+// update single current SSAId for routine and optionally lastSSAIdMap if returns
+// has been encountered but not regvar
 static void updateRoutineData(RoutineData& rdata, const SSAEntry& ssaEntry,
                 size_t prevSSAId)
@@ -1450 +1477 @@
 }
 
+// revert retSSAIdMap while leaving from code block
 static void revertRetSSAIdMap(std::unordered_map<AsmSingleVReg, size_t>& curSSAIdMap,
             RetSSAIdMap& retSSAIdMap, FlowStackEntry& entry, RoutineData* rdata)
@@ -1496 +1524 @@
 }
 
+// update current SSAId in curSSAIdMap for routine while leaving from code block
 static void updateRoutineCurSSAIdMap(RoutineData* rdata, const SSAEntry& ssaEntry,
             const FlowStackEntry& entry, size_t curSSAId, size_t nextSSAId)
@@ -1542 +1571 @@
 }
 
+static inline const RoutineData* findRoutine(
+        const std::unordered_map<size_t, RoutineData>& routineMap,
+        const std::unordered_map<size_t, RoutineData>* routineMapRecur, size_t block)
+{
+    if (routineMapRecur != nullptr)
+    {
+        auto rit = routineMapRecur->find(block);
+        if (rit != routineMapRecur->end())
+            return &rit->second;
+    }
+    auto rit = routineMap.find(block);
+    return rit!=routineMap.end() ? &rit->second : nullptr;
+}
+
 
 static void createRoutineData(const std::vector<CodeBlock>& codeBlocks,
@@ -1548 +1591 @@
         const ResSecondPointsToCache& subroutToCache,
         SimpleCache<size_t, RoutineData>& subroutinesCache,
-        const std::unordered_map<size_t, RoutineData>& routineMap, RoutineData& rdata,
-        size_t routineBlock, bool noMainLoop = false,
+        const std::unordered_map<size_t, RoutineData>& routineMap,
+        const std::unordered_map<size_t, RoutineData>* routineMapRecur,
+        RoutineData& rdata, size_t routineBlock, bool noMainLoop = false,
         const std::vector<bool>& prevFlowStackBlocks = {})
 {
@@ -1595 +1639 @@
             flowStackBlocks[entry.blockIndex] = !oldFB;
             createRoutineData(codeBlocks, curSSAIdMap, loopBlocks, subroutToCache,
-                subroutinesCache, routineMap, subrData, entry.blockIndex, true,
-                flowStackBlocks);
+                    subroutinesCache, routineMap, routineMapRecur, subrData,
+                    entry.blockIndex, true, flowStackBlocks);
             RoutineData subrDataCopy;
             flowStackBlocks[entry.blockIndex] = oldFB;
@@ -1688 +1732 @@
                 {
                     // try in routine map
-                    auto rit = routineMap.find(entry.blockIndex);
+                    /*rit = routineMap.find(entry.blockIndex);
                     if (rit != routineMap.end())
-                        cachedRdata = &rit->second;
+                        cachedRdata = &rit->second;*/
+                    cachedRdata = findRoutine(routineMap, routineMapRecur,
+                                entry.blockIndex);
                 }
                 if (!isLoop && visited[entry.blockIndex] && cachedRdata == nullptr &&
@@ -1779 +1825 @@
         for (; entry.nextIndex < cblock.nexts.size() &&
                     cblock.nexts[entry.nextIndex].isCall; entry.nextIndex++)
-            joinRoutineData(rdata, routineMap.find(
-                            cblock.nexts[entry.nextIndex].block)->second);
+            //joinRoutineData(rdata, routineMap.find(
+            //                cblock.nexts[entry.nextIndex].block)->second);
+            joinRoutineData(rdata, *findRoutine(routineMap, routineMapRecur,
+                            cblock.nexts[entry.nextIndex].block));
         
         if (entry.nextIndex < cblock.nexts.size())
@@ -1801 +1849 @@
                     {
                         //std::cout << "joincall:"<< next.block << std::endl;
-                        auto it = routineMap.find(next.block); // must find
+                        const RoutineData* callRdata = findRoutine(routineMap,
+                                routineMapRecur, next.block); // must find
                         initializePrevRetSSAIds(cblock, curSSAIdMap, retSSAIdMap,
-                                    it->second, entry);
-                        joinRetSSAIdMap(retSSAIdMap, it->second.lastSSAIdMap, next.block);
+                                    *callRdata, entry);
+                        joinRetSSAIdMap(retSSAIdMap, callRdata->lastSSAIdMap, next.block);
                     }
             }
@@ -2062 +2111 @@
             if (!isRoutineGen[routineBlock])
             {
-                createRoutineData(codeBlocks, curSSAIdMap, loopBlocks,
-                            cblocksToCache, subroutinesCache, routineMap, prevRdata,
-                            routineBlock);
+                createRoutineData(codeBlocks, curSSAIdMap, loopBlocks, cblocksToCache,
+                        subroutinesCache, routineMap, nullptr, prevRdata, routineBlock);
                 //prevRdata.compare(myRoutineData);
                 isRoutineGen[routineBlock] = true;
@@ -2155 +2203 @@
                             ":" << ssaEntry.first.index << ": " <<
                             nextSSAId << ", " << curSSAId << std::endl;
-                
-                /*if (rdata!=nullptr)
-                    updateRoutineCurSSAIdMap(rdata, ssaEntry, entry, curSSAId, nextSSAId);
-                */
             }