MC: check dependency between 2 given requests only once

[simgrid.git] / src / mc / api.cpp

diff --git a/src/mc/api.cpp b/src/mc/api.cpp
index dbd3c59024c9c1dc9483213d969fbd2f4e4b1ea8..c62d73c8dfb197b8b593ae20c347f7ac983869f2 100644 (file)
--- a/src/mc/api.cpp
+++ b/src/mc/api.cpp
@@ -221,12 +221,9 @@ simgrid::mc::ActorInformation* Api::actor_info_cast(smx_actor_t actor) const
   return process_info;
 }
 
-// Does half the job
+// Does half the job. precondition: r1->call_ < r2->call_
 bool Api::request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) const
 {
-  if (r1->call_ == Simcall::COMM_ISEND && r2->call_ == Simcall::COMM_IRECV)
-    return false;
-
   if (r1->call_ == Simcall::COMM_IRECV && r2->call_ == Simcall::COMM_ISEND)
     return false;
 
@@ -234,7 +231,7 @@ bool Api::request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) const
   auto comm1 = get_comm_or_nullptr(r1);
   auto comm2 = get_comm_or_nullptr(r2);
 
-  if ((r1->call_ == Simcall::COMM_ISEND || r1->call_ == Simcall::COMM_IRECV) && r2->call_ == Simcall::COMM_WAIT) {
+  if ((r1->call_ == Simcall::COMM_IRECV || r1->call_ == Simcall::COMM_ISEND) && r2->call_ == Simcall::COMM_WAIT) {
     auto mbox1 = get_mbox_remote_addr(r1);
     auto mbox2 = remote(comm2->mbox_cpy);
 
@@ -262,19 +259,22 @@ bool Api::request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) const
     return false;
 #endif
 
-  if (r1->call_ == Simcall::COMM_WAIT && (r2->call_ == Simcall::COMM_WAIT || r2->call_ == Simcall::COMM_TEST) &&
+  if (r1->call_ == Simcall::COMM_TEST && r2->call_ == Simcall::COMM_WAIT &&
       (comm1->src_actor_.get() == nullptr || comm1->dst_actor_.get() == nullptr))
     return false;
 
   if (r1->call_ == Simcall::COMM_TEST &&
       (simcall_comm_test__get__comm(r1) == nullptr || comm1->src_buff_ == nullptr || comm1->dst_buff_ == nullptr))
     return false;
+  if (r2->call_ == Simcall::COMM_TEST &&
+      (simcall_comm_test__get__comm(r2) == nullptr || comm2->src_buff_ == nullptr || comm2->dst_buff_ == nullptr))
+    return false;
 
   if (r1->call_ == Simcall::COMM_TEST && r2->call_ == Simcall::COMM_WAIT && comm1->src_buff_ == comm2->src_buff_ &&
       comm1->dst_buff_ == comm2->dst_buff_)
     return false;
 
-  if (r1->call_ == Simcall::COMM_WAIT && r2->call_ == Simcall::COMM_TEST && comm1->src_buff_ != nullptr &&
+  if (r1->call_ == Simcall::COMM_TEST && r2->call_ == Simcall::COMM_WAIT && comm1->src_buff_ != nullptr &&
       comm1->dst_buff_ != nullptr && comm2->src_buff_ != nullptr && comm2->dst_buff_ != nullptr &&
       comm1->dst_buff_ != comm2->src_buff_ && comm1->dst_buff_ != comm2->dst_buff_ &&
       comm2->dst_buff_ != comm1->src_buff_)
@@ -283,19 +283,35 @@ bool Api::request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) const
   return true;
 }
 
-bool Api::simcall_check_dependency(smx_simcall_t const req1, smx_simcall_t const req2) const
+bool Api::simcall_check_dependency(smx_simcall_t req1, smx_simcall_t req2) const
 {
+  const auto IRECV = Simcall::COMM_IRECV;
+  const auto ISEND = Simcall::COMM_ISEND;
+  const auto TEST  = Simcall::COMM_TEST;
+  const auto WAIT  = Simcall::COMM_WAIT;
+
   if (req1->issuer_ == req2->issuer_)
     return false;
 
-  /* Wait with timeout transitions are not considered by the independence theorem, thus we consider them as dependent
-   * with all other transitions */
-  if ((req1->call_ == Simcall::COMM_WAIT && simcall_comm_wait__get__timeout(req1) > 0) ||
-      (req2->call_ == Simcall::COMM_WAIT && simcall_comm_wait__get__timeout(req2) > 0))
+  /* The independence theorem only consider 4 simcalls. All others are dependent with anything. */
+  if (req1->call_ != ISEND && req1->call_ != IRECV && req1->call_ != TEST && req1->call_ != WAIT)
+    return true;
+  if (req2->call_ != ISEND && req2->call_ != IRECV && req2->call_ != TEST && req2->call_ != WAIT)
     return true;
 
+  /* Timeouts in wait transitions are not considered by the independence theorem, thus assumed dependent */
+  if ((req1->call_ == WAIT && simcall_comm_wait__get__timeout(req1) > 0) ||
+      (req2->call_ == WAIT && simcall_comm_wait__get__timeout(req2) > 0))
+    return true;
+
+  /* Make sure that req1 and req2 are in alphabetic order */
+  if (req1->call_ > req2->call_) {
+    auto temp = req1;
+    req1 = req2;
+    req2 = temp;
+  }
   if (req1->call_ != req2->call_)
-    return request_depend_asymmetric(req1, req2) && request_depend_asymmetric(req2, req1);
+    return request_depend_asymmetric(req1, req2);
 
   // Those are internal requests, we do not need indirection because those objects are copies:
   const auto comm1 = get_comm_or_nullptr(req1);
@@ -421,11 +437,6 @@ RemotePtr<kernel::activity::CommImpl> Api::get_comm_isend_raw_addr(smx_simcall_t
   return remote(static_cast<kernel::activity::CommImpl*>(simcall_comm_isend__getraw__result(request)));
 }
 
-RemotePtr<kernel::activity::CommImpl> Api::get_comm_wait_raw_addr(smx_simcall_t request) const
-{
-  return remote(simcall_comm_wait__getraw__comm(request));
-}
-
 RemotePtr<kernel::activity::CommImpl> Api::get_comm_waitany_raw_addr(smx_simcall_t request, int value) const
 {
   auto addr      = simcall_comm_waitany__getraw__comms(request) + value;