Merge Pull Request #2410 from jpkenny/sst-elements/hg-packet

Automatically Merged using SST Pull Request AutoTester PR Title: b'Mercury: fix packetization' PR Author: jpkenny
sstsimulator · Oct 25, 2024 · 915e52c · 915e52c
2 parents 68d41cb + a21081e
commit 915e52c
Show file tree

Hide file tree

Showing 15 changed files with 1,645 additions and 81 deletions.
diff --git a/src/sst/elements/iris/sumi/sim_transport.cc b/src/sst/elements/iris/sumi/sim_transport.cc
@@ -405,28 +405,37 @@ SimTransport::send(Message* m)
         if (post_header_delay_.ticks()) {
           //api_parent_app_->compute(post_header_delay_);
         }
-        nic_ioctl_(m);
+        //nic_ioctl_(m);
+        send_packets(m);
       }
       break;
     case SST::Hg::NetworkMessage::posted_send:
       if (post_header_delay_.ticks()) {
         //api_parent_app_->compute(post_header_delay_);
       }
-      nic_ioctl_(m);
+      //nic_ioctl_(m);
+      send_packets(m);
       break;
     case SST::Hg::NetworkMessage::rdma_get_request:
     case SST::Hg::NetworkMessage::rdma_put_payload:
       if (post_rdma_delay_.ticks()) {
         //api_parent_app_->compute(post_rdma_delay_);
       }
-      nic_ioctl_(m);
+      //nic_ioctl_(m);
+      send_packets(m);
       break;
     default:
       sst_hg_abort_printf("attempting to initiate send with invalid type %d",
                         m->type())
   }
 }
 
+void
+SimTransport::send_packets(Message* m)
+{
+  nic_ioctl_(m);
+}
+
 void
 SimTransport::smsgSendResponse(Message* m, uint64_t size, void* buffer, int local_cq, int remote_cq, int qos)
 {
@@ -479,7 +488,9 @@ SimTransport::rdmaPutResponse(Message* m, uint64_t payload_bytes,
 uint64_t
 SimTransport::allocateFlowId()
 {
-  return api_parent_app_->os()->allocateUniqueId();
+  auto id = api_parent_app_->os()->allocateUniqueId().msg_num;
+  return id;
+  //return api_parent_app_->os()->allocateUniqueId();
 }
 
 void

diff --git a/src/sst/elements/iris/sumi/sim_transport.h b/src/sst/elements/iris/sumi/sim_transport.h
@@ -277,6 +277,7 @@ class SimTransport : public Transport, public SST::Hg::API {
 
  private:      
   void send(Message* m) override;
+  void send_packets(Message* m);
 
   uint64_t allocateFlowId() override;
 

diff --git a/src/sst/elements/mask-mpi/Makefile.am b/src/sst/elements/mask-mpi/Makefile.am
@@ -2,7 +2,7 @@
 #
 #
 
-comp_LTLIBRARIES = libmask_mpi.la sendrecv.la reduce.la alltoall.la allgather.la
+comp_LTLIBRARIES = libmask_mpi.la sendrecv.la reduce.la alltoall.la allgather.la halo3d26.la
 
 compdir = $(pkglibdir)
 
@@ -83,6 +83,7 @@ sendrecv_la_SOURCES = tests/sendrecv.cc
 reduce_la_SOURCES = tests/reduce.cc
 alltoall_la_SOURCES = tests/alltoall.cc
 allgather_la_SOURCES = tests/allgather.cc
+halo3d26_la_SOURCES = skeletons/halo3d-26.cc
 
 EXTRA_DIST = \
  tests/testsuite_default_mask_mpi.py \
@@ -91,16 +92,19 @@ EXTRA_DIST = \
  tests/test_sendrecv.py \
  tests/test_alltoall.py \
  tests/test_allgather.py \
+ tests/test_halo3d26.py \
  tests/refFiles/test_reduce.out \
  tests/refFiles/test_sendrecv.out \
  tests/refFiles/test_alltoall.out \
- tests/refFiles/test_allgather.out
+ tests/refFiles/test_allgather.out \
+ tests/refFiles/test_halo3d26.out
 
 libmask_mpi_la_LDFLAGS = -module -avoid-version
 sendrecv_la_LDFLAGS = -module -avoid-version
 reduce_la_LDFLAGS = -module -avoid-version
 alltoall_la_LDFLAGS = -module -avoid-version
 allgather_la_LDFLAGS = -module -avoid-version
+halo3d26_la_LDFLAGS = -module -avoid-version
 
 install-exec-hook: 
 	$(SST_REGISTER_TOOL) SST_ELEMENT_SOURCE     mask-mpi=$(abs_srcdir)