Merge branch 'neil-kevin-merge' into kevin-updates

codes-org · Jul 12, 2022 · b0b5d15 · b0b5d15
2 parents aa181d1 + 3018dfd
commit b0b5d15
Show file tree

Hide file tree

Showing 28 changed files with 2,306 additions and 129 deletions.
diff --git a/swm/src/Makefile.subdir b/swm/src/Makefile.subdir
@@ -11,7 +11,9 @@ include_HEADERS = \
 						 src/spread/one_to_many_swm_user_code.h \
 						 src/many_to_many/many_to_many_swm_user_code.h \
 						 src/allreduce/allreduce.h \
-						 src/milc/milc_swm_user_code.h
+						 src/milc/milc_swm_user_code.h \
+						 src/periodic_aggressor/periodic_aggressor.h \
+						 src/layered_allbroadcast/layered_allbroadcast.h
 
 src_libswm_la_SOURCES = src/lammps/lammps.cpp	\
 						src/nekbone/cubiclattice.cpp	\
@@ -21,7 +23,9 @@ src_libswm_la_SOURCES = src/lammps/lammps.cpp	\
 						src/spread/one_to_many_swm_user_code.cpp \
 						src/many_to_many/many_to_many_swm_user_code.cpp \
 						src/allreduce/allreduce.cpp \
-						src/milc/milc_swm_user_code.cpp
+						src/milc/milc_swm_user_code.cpp \
+						src/periodic_aggressor/periodic_aggressor.cpp \
+						src/layered_allbroadcast/layered_allbroadcast.cpp
 
 dist_data_DATA = src/lammps/lammps_workload.json \
 			  src/lammps/lammps_workload1.json \
@@ -38,7 +42,9 @@ dist_data_DATA = src/lammps/lammps_workload.json \
 			  src/allreduce/allreduce_workload.json \
 			  src/allreduce/allreduce32_workload.json \
 			  src/allreduce/allreduce256_workload.json \
-			  src/milc/milc_skeleton.json
+			  src/milc/milc_skeleton.json \
+			  src/periodic_aggressor/periodic_aggressor.json \
+			  src/layered_allbroadcast/layered_allbcast.json
 
 
 
diff --git a/swm/src/hacc/hacc_coral.json b/swm/src/hacc/hacc_coral.json
@@ -2,7 +2,6 @@
     "jobs": [
     {
         "name": "StandaloneSWM",
-            "app":  "hacc",
             "size": 786432,
             "time": 0,
             "placement": {
@@ -12,6 +11,7 @@
                 "weight": 1
             },
             "cfg": {
+                "app": "hacc",
                 "request_vc": 0,
                 "response_vc": 1,
                 "iteration_cnt": 1,

diff --git a/swm/src/hacc/hacc_small.json b/swm/src/hacc/hacc_small.json
@@ -2,7 +2,6 @@
     "jobs": [
     {
         "name": "StandaloneSWM",
-            "app":  "hacc",
             "size": 128,
             "time": 0,
             "placement": {
@@ -12,6 +11,7 @@
                 "weight": 1
             },
             "cfg": {
+                "app": "hacc",
                 "request_vc": 0,
                 "response_vc": 1,
                 "iteration_cnt": 1,

diff --git a/swm/src/hacc/workload.json b/swm/src/hacc/workload.json
@@ -2,10 +2,10 @@
     "jobs": [
     {
         "name": "StandaloneSWM",
-            "app":  "hacc",
             "size": 128,
             "time": 0,
             "cfg": {
+                "app":  "hacc",
                 "request_vc": 0,
                 "response_vc": 1,
                 "iteration_cnt": 1,

diff --git a/swm/src/incast/all_to_one_swm_user_code.cpp b/swm/src/incast/all_to_one_swm_user_code.cpp
@@ -108,7 +108,7 @@ AllToOneSWMUserCode::call()
 						-1,
 						NO_BUFFER,
 						msg_req_bytes, 
-						msg_rsp_bytes,
+						0,
 						&(send_handles[send_count]),
 						0,
 						0

diff --git a/swm/src/incast/all_to_one_swm_user_code.h b/swm/src/incast/all_to_one_swm_user_code.h
@@ -56,6 +56,8 @@ class AllToOneSWMUserCode
     uint32_t msg_rsp_bytes;
     uint32_t pkt_rsp_bytes;
     uint32_t dst_rank_id;
+    uint32_t msg_size; // MM addition
+
 
     uint32_t process_id;
     uint32_t process_cnt;

diff --git a/swm/src/incast/incast.json b/swm/src/incast/incast.json
@@ -1,21 +1,21 @@
 {
-"jobs" : {
-        "dll_path": "${FABSIM_APPS_PATH}/dll/incast.so",
-        "size": 4,
-        "cfg": {
-            "app": "incast",
-            "iteration_cnt": 1,
-            "compute_delay": 40000,
-            "msg_req_bytes": 16,
-            "msg_rsp_bytes": 0,
-            "start_delay_max" : 10000,
-            "scattered_start" : false,
-            "dst_rank_id":3,
-            "randomize_communication_order": false,
-            "blocking_comm" : true, 
-            "debug" : false, 
-            "src_rank_id_interval": [0,2],
-            "cpu_freq" : 4e9
-       }
-    }
-}
+    "jobs" : {
+            "dll_path": "${FABSIM_APPS_PATH}/dll/incast.so",
+            "size": 100,
+            "cfg": {
+                "app": "incast",
+                "iteration_cnt": 10,
+                "compute_delay": 0,
+                "msg_req_bytes": 1310720,
+                "msg_rsp_bytes": 0,
+                "start_delay_max" : 0,
+                "scattered_start" : false,
+                "dst_rank_id":99,
+                "randomize_communication_order": false,
+                "blocking_comm" : false, 
+                "debug" : true, 
+                "src_rank_id_interval": [0,98],
+                "cpu_freq" : 4e9
+           }
+        }
+    }
diff --git a/swm/src/incast/incast1.json b/swm/src/incast/incast1.json
@@ -1,21 +1,21 @@
 {
-"jobs" : {
-        "dll_path": "${FABSIM_APPS_PATH}/dll/incast.so",
-        "size": 512,
-        "cfg": {
-            "app": "incast",
-            "iteration_cnt": 500,
-            "compute_delay": 80000,
-            "msg_req_bytes": 160,
-            "msg_rsp_bytes": 0,
-            "start_delay_max" : 10000,
-            "scattered_start" : false,
-            "dst_rank_id":511,
-            "randomize_communication_order": false,
-            "blocking_comm" : true, 
-            "debug" : false, 
-            "src_rank_id_interval": [0,510],
-            "cpu_freq" : 4e9
-       }
-    }
-}
+    "jobs" : {
+            "dll_path": "${FABSIM_APPS_PATH}/dll/incast.so",
+            "size": 512,
+            "cfg": {
+                "app": "incast",
+                "iteration_cnt": 500,
+                "compute_delay": 80000,
+                "msg_req_bytes": 160,
+                "msg_rsp_bytes": 0,
+                "start_delay_max" : 10000,
+                "scattered_start" : false,
+                "dst_rank_id":511,
+                "randomize_communication_order": false,
+                "blocking_comm" : true, 
+                "debug" : false, 
+                "src_rank_id_interval": [0,510],
+                "cpu_freq" : 4e9
+           }
+        }
+    }
diff --git a/swm/src/incast/incast2.json b/swm/src/incast/incast2.json
@@ -1,21 +1,21 @@
 {
-"jobs" : {
-        "dll_path": "${FABSIM_APPS_PATH}/dll/incast.so",
-        "size": 8,
-        "cfg": {
-            "app": "incast",
-            "iteration_cnt": 2,
-            "compute_delay": 0,
-            "msg_req_bytes": 160,
-            "msg_rsp_bytes": 0,
-            "start_delay_max" : 10,
-            "scattered_start" : false,
-            "dst_rank_id":7,
-            "randomize_communication_order": false,
-            "blocking_comm" : false, 
-            "debug" : true, 
-            "src_rank_id_interval": [0,6],
-            "cpu_freq" : 4e9
-       }
-    }
-}
+    "jobs" : {
+            "dll_path": "${FABSIM_APPS_PATH}/dll/incast.so",
+            "size": 8,
+            "cfg": {
+                "app": "incast",
+                "iteration_cnt": 2,
+                "compute_delay": 0,
+                "msg_req_bytes": 160,
+                "msg_rsp_bytes": 0,
+                "start_delay_max" : 10,
+                "scattered_start" : false,
+                "dst_rank_id":7,
+                "randomize_communication_order": false,
+                "blocking_comm" : false, 
+                "debug" : true, 
+                "src_rank_id_interval": [0,6],
+                "cpu_freq" : 4e9
+           }
+        }
+    }
diff --git a/swm/src/incast/incast4.json b/swm/src/incast/incast4.json
@@ -0,0 +1,22 @@
+{
+"jobs" : {
+        "dll_path": "${FABSIM_APPS_PATH}/dll/incast.so",
+        "size": 100,
+        "cfg": {
+            "app": "incast",
+            "iteration_cnt": 150, 
+            "compute_delay": 0,
+            "noop_cnt": 0,
+            "msg_size": 13107200,
+            "start_delay_max" : 0,
+            "scattered_start" : false,
+            "synchronous": true,
+            "dst_rank_id":99,
+            "randomize_communication_order": false,
+            "blocking_comm" : false, 
+            "debug" : true, 
+            "src_rank_id_interval": [0,98],
+            "cpu_freq" : 4e9
+       }
+    }
+}
diff --git a/swm/src/lammps/lammps.cpp b/swm/src/lammps/lammps.cpp
@@ -269,6 +269,8 @@ LAMMPS_SWM::call()
 
     for(ts = 0; ts < num_timesteps; ts++)
     {
+        if(process_id == 0)
+            printf("LAMMPS Starting Timestep %d / %d\n",ts,num_timesteps);
         // initial integration
         SWM_Compute(start_cyc);
         SWM_Allreduce(48, rsp_bytes, SWM_COMM_WORLD, req_vc, resp_vc, NO_BUFFER, NO_BUFFER); // temperature

diff --git a/swm/src/lammps/lammps_workload.json b/swm/src/lammps/lammps_workload.json
@@ -1,12 +1,12 @@
 {
     "jobs": {
             "name": "StandaloneSWM",
-            "app": "dll",
             "dll_path": "apps/dll/lammps.so",      
             "size": 2048,
             "time": 0,
             "cfg":
             { 
+                "app": "lammps",
                 "num_x_replicas": 3,
                 "num_y_replicas": 3,
                 "num_z_replicas": 3,

diff --git a/swm/src/lammps/lammps_workload1.json b/swm/src/lammps/lammps_workload1.json
@@ -1,12 +1,12 @@
 {
     "jobs": {
             "name": "StandaloneSWM",
-            "app": "dll",
             "dll_path": "apps/dll/lammps.so",      
             "size": 2048,
             "time": 0,
             "cfg":
-            { 
+            {
+                "app": "lammps",
                 "num_x_replicas": 3,
                 "num_y_replicas": 3,
                 "num_z_replicas": 3,

diff --git a/swm/src/layered_allbroadcast/layered_allbcast.json b/swm/src/layered_allbroadcast/layered_allbcast.json
@@ -0,0 +1,15 @@
+{
+    "jobs" : {
+            "size": 32,
+            "cfg": {
+                "app": "layered_allbcast",
+                "iteration_cnt": 10,
+                "total_layers": 50,
+                "initial_layer_size": 8192,
+                "layer_growth_rate": 1.12,
+                "grad_compression_rate": 32,
+                "debug" : true,
+                "cpu_freq" : 4e9
+           }
+        }
+    }