From af9320ed37a4cedc3c56afdcf50f3d37909a2ae1 Mon Sep 17 00:00:00 2001
From: "Daniel J. Magee" <dmagee@lanl.gov>
Date: Wed, 27 Sep 2023 12:53:25 -0600
Subject: [PATCH] Fixed submodule issues, initial table for OSU micro
 benchmarks.

---
 .../10_microbenchmarks/M5_OSUMB/OSUMB.rst     | 30 +++++++++----------
 .../10_microbenchmarks/M5_OSUMB/OSU_req.csv   |  7 +++++
 spatter                                       |  2 +-
 utils/pavilion                                |  2 +-
 4 files changed, 24 insertions(+), 17 deletions(-)
 create mode 100644 doc/sphinx/10_microbenchmarks/M5_OSUMB/OSU_req.csv

diff --git a/doc/sphinx/10_microbenchmarks/M5_OSUMB/OSUMB.rst b/doc/sphinx/10_microbenchmarks/M5_OSUMB/OSUMB.rst
index 00c70ed1..809692bc 100644
--- a/doc/sphinx/10_microbenchmarks/M5_OSUMB/OSUMB.rst
+++ b/doc/sphinx/10_microbenchmarks/M5_OSUMB/OSUMB.rst
@@ -13,8 +13,7 @@ Characteristics
 Problem
 -------
 
-Figure of Merit
----------------
+The OSU benchmarks are a suite of microbenchmarks designed to measure network characteristics on HPC systems.
 
 Run Rules
 ---------
@@ -30,37 +29,38 @@ On GPU enabled systems add these flags to the following configure lines:
     --with-cuda-include=/path/to/cuda/include
     --with-cuda-libpath=/path/to/cuda/lib
 
+Build and install the benchmarks.
+
 .. code-block:: bash
 
     ./configure --prefix=$INSTALL_DIR
     make -j 
     make -j install
 
-RHEL Systems
-------------
+
+Before configuring make sure your CXX and CC environment variables are set to an 
+MPI compiler or wrapper. 
+On most systems this will look like:
 
 .. code-block:: bash
 
     export CC=mpicc CXX=mpicxx
 
-CrayOS Systems
---------------
+On systems with vendor provided wrappers it may look different. 
+For example, on HPE-Cray systems:
 
 .. code-block:: bash
 
-    exportCC=cc CXX=CC
+    export CC=cc CXX=CC
     
 Running
 =======
 
-Input
------
-
-Independent Variables
----------------------
-
-Dependent Variable(s)
----------------------
+.. csv-table:: DGEMM microbenchmark FLOPs measurement
+   :file: OSU_req.csv
+   :align: center
+   :widths: 10, 10, 10, 10, 10
+   :header-rows: 1
 
 Example Results
 ===============
diff --git a/doc/sphinx/10_microbenchmarks/M5_OSUMB/OSU_req.csv b/doc/sphinx/10_microbenchmarks/M5_OSUMB/OSU_req.csv
new file mode 100644
index 00000000..16d842ca
--- /dev/null
+++ b/doc/sphinx/10_microbenchmarks/M5_OSUMB/OSU_req.csv
@@ -0,0 +1,7 @@
+"Test","Description","Message Size","Nodes Used","Ranks Used"
+"osu_latency","Point-to-Point Latency","8 B","2","1 per node"
+"osu_bibw","Point-to-Point Bi-directional bandwidth","1 MB","2","1 per node"
+"osu_mbw_mr","Point-to-Point Multi-Bandwidth & Message Rate","16 KB","2","Host-to-Host (two tests) :   - 1 per NIC  - 1 per core Device-to-Device (two tests):  - 1 per NIC  - 1 per accelerator"
+"osu_get_acc_latency","Point-to-Point One-sided Accumulate Latency","8 B","2","1 per node"
+"osu_allreduce","All-reduce Latency","8B, 25 MB","full-system","1 per NIC"
+"osu_alltoall","All-to-all Latency","1 MB","full-system","1 per NIC odd process count"
\ No newline at end of file
diff --git a/spatter b/spatter
index 7f3ec8c4..bb81eb41 160000
--- a/spatter
+++ b/spatter
@@ -1 +1 @@
-Subproject commit 7f3ec8c4a9ab830e55ed683432778eed02a8c9f0
+Subproject commit bb81eb41052b1be86e09d0e4ecbf40198de66a13
diff --git a/utils/pavilion b/utils/pavilion
index 1574aa69..f502ca86 160000
--- a/utils/pavilion
+++ b/utils/pavilion
@@ -1 +1 @@
-Subproject commit 1574aa697941fa06f827ecf86b72e4fc640dabec
+Subproject commit f502ca86fa27f4bc894aa19232c9f1f42361e269