fix simx deadlock bugs caused by LsuMemAdaptor in types.cpp

Author: symmetryyyyy

sim/simx/emulator.cpp

@@ -352,7 +352,7 @@ bool Emulator::barrier_wait(uint32_t bar_id, uint32_t token, uint32_t wid) {
             stalled_warps_.set(wid);
             return false;
         }
-        stalled_warps_.reset(wid);
+        // stalled_warps_.reset(wid);
         return true;
     }
 
@@ -367,7 +367,7 @@ bool Emulator::barrier_wait(uint32_t bar_id, uint32_t token, uint32_t wid) {
 
 
         b.waiting_mask.reset(wid);
-        stalled_warps_.reset(wid);
+        // stalled_warps_.reset(wid);
 
 
         return true;

sim/simx/types.cpp

@@ -150,22 +150,27 @@ void LsuMemAdapter::tick() {
     out_rsp.uuid = rsp_in.uuid;
 
     // merge other responses with the same tag
+    std::vector<uint32_t> pop_list;
+    pop_list.reserve(input_size);
+    pop_list.push_back(i);
     for (uint32_t j = i + 1; j < input_size; ++j) {
       if (RspIn.at(j).empty())
         continue;
       auto& other_rsp = RspIn.at(j).peek();
       if (rsp_in.tag == other_rsp.tag) {
         out_rsp.mask.set(j);
         DT(4, this->name() << "-rsp" << j << ": " << other_rsp);
-        RspIn.at(j).pop();
+        pop_list.push_back(j);
       }
     }
 
     // send memory response
     if (RspOut.try_send(out_rsp, 1)) {
       DT(4, this->name() << "-rsp" << i << ": " << rsp_in);
-      // remove input
-      RspIn.at(i).pop();
+      // Pop all merged inputs only after successful send.
+      for (auto idx : pop_list) {
+        RspIn.at(idx).pop();
+      }
     }
 
     break;
@@ -204,4 +209,4 @@ void LsuMemAdapter::tick() {
       ReqIn.pop();
     }
   }
-}
+}