From d442d498b70d60950309e96c30c5efa5b773fc85 Mon Sep 17 00:00:00 2001 From: Jered Dominguez-Trujillo Date: Thu, 8 Aug 2024 18:15:04 -0600 Subject: [PATCH 1/3] Remove old spatter submodule --- .gitmodules | 3 --- microbenchmarks/spatter | 1 - 2 files changed, 4 deletions(-) delete mode 160000 microbenchmarks/spatter diff --git a/.gitmodules b/.gitmodules index e6b01ba9..947fef1c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -17,9 +17,6 @@ [submodule "utils/pavilion"] path = utils/pavilion url = git@github.com:hpc/pavilion2.git -[submodule "microbenchmarks/spatter"] - path = microbenchmarks/spatter - url = git@github.com:lanl/spatter.git [submodule "miniem_build/spack"] path = miniem_build/spack url = git@github.com:spack/spack diff --git a/microbenchmarks/spatter b/microbenchmarks/spatter deleted file mode 160000 index 4361d097..00000000 --- a/microbenchmarks/spatter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4361d0971b2c2f443980585c2fc14be74c9e7439 From 3a106854db26fe05c0307958defb42b418253f7e Mon Sep 17 00:00:00 2001 From: Jered Dominguez-Trujillo Date: Thu, 8 Aug 2024 18:15:55 -0600 Subject: [PATCH 2/3] Re-added spatter submodule with lfs fix --- .gitmodules | 3 +++ microbenchmarks/spatter | 1 + 2 files changed, 4 insertions(+) create mode 160000 microbenchmarks/spatter diff --git a/.gitmodules b/.gitmodules index 947fef1c..0d3891bd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -23,3 +23,6 @@ [submodule "kokkos-tools"] path = kokkos-tools url = git@github.com:kokkos/kokkos-tools.git +[submodule "microbenchmarks/spatter"] + path = microbenchmarks/spatter + url = git@github.com:lanl/spatter.git diff --git a/microbenchmarks/spatter b/microbenchmarks/spatter new file mode 160000 index 00000000..41ea6dc1 --- /dev/null +++ b/microbenchmarks/spatter @@ -0,0 +1 @@ +Subproject commit 41ea6dc12f3e4373eadbff4e3a2a5b0419548d07 From cf6d4d4e54d4a3674989282e3e861692a055dd29 Mon Sep 17 00:00:00 2001 From: Jered Dominguez-Trujillo Date: Thu, 8 Aug 2024 18:18:12 -0600 Subject: [PATCH 3/3] Documentation updates --- .../09_Microbenchmarks/M2_SPATTER/SPATTER.rst | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/SPATTER.rst b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/SPATTER.rst index 11725978..618a8729 100644 --- a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/SPATTER.rst +++ b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/SPATTER.rst @@ -81,17 +81,17 @@ To setup and build for both the CPU and GPU, run the following: This setup script performs the following: -#. Untars the Pattern JSON files located in the patterns directory +#. Untars the Pattern JSON files located in the datafiles directory - * patterns/flag/static_2d/001.fp.json + * datafiles/flag/static_2d/001.fp.json - * patterns/flag/static_2d/001.nonfp.json + * datafiles/flag/static_2d/001.nonfp.json - * patterns/flag/static_2d/001.json + * datafiles/flag/static_2d/001.json - * patterns/xrage/asteroid/spatter.json + * datafiles/xrage/asteroid/spatter.json -#. Extracts patterns from patterns/xrage/asteroid/spatter.json to separate JSON files located at patterns/xrage/asteroid/spatter{1-9}.json +#. Extracts patterns from datafiles/xrage/asteroid/spatter.json to separate JSON files located at datafiles/xrage/asteroid/spatter{1-9}.json #. Generates default module files located in modules/cpu.mod and modules/gpu.mood @@ -192,7 +192,7 @@ These experiments were ran with core-binding turned on and plotting enabled. xRAGE Asteroid Spatter Pattern 5 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Weak-scaling experiment for the pattern in patterns/xrage/asteroid/spatter5.json. Results will be found in spatter.weakscaling/Crossroads/xrage/asteroid/spatter5/ and Figures will be found in figures/spatter.weakscaling/Crossroads/xrage/asteroid/spatter5 +Weak-scaling experiment for the pattern in datafiles/xrage/asteroid/spatter5.json. Results will be found in spatter.weakscaling/Crossroads/xrage/asteroid/spatter5/ and Figures will be found in figures/spatter.weakscaling/Crossroads/xrage/asteroid/spatter5 This pattern is a Gather with a length of 8,368,968 elements with a target vector length of 1,120,524. @@ -220,7 +220,7 @@ This pattern is a Gather with a length of 8,368,968 elements with a target vecto xRAGE Asteroid Spatter Pattern 9 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Weak-scaling experiment for the pattern in patterns/xrage/asteroid/spatter5.json. Results will be found in spatter.weakscaling/Crossroads/xrage/asteroid/spatter9/ and Figures will be found in figures/spatter.weakscaling/Crossroads/xrage/asteroid/spatter9 +Weak-scaling experiment for the pattern in datafiles/xrage/asteroid/spatter5.json. Results will be found in spatter.weakscaling/Crossroads/xrage/asteroid/spatter9/ and Figures will be found in figures/spatter.weakscaling/Crossroads/xrage/asteroid/spatter9 This pattern is a Scatter with a length of 6,664,304 elements with a target vector length of 2,051,100. @@ -253,7 +253,7 @@ Strong-Scaling throughput experiments with plotting enabled. xRAGE Asteroid Spatter Pattern 5 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Throughput experiment for the pattern in patterns/xrage/asteroid/spatter5.json. Results will be found in spatter.strongscaling/H100/xrage/asteroid/spatter5/ and Figures will be found in figures/spatter.strongscaling/H100/xrage/asteroid/spatter5/ +Throughput experiment for the pattern in datafiles/xrage/asteroid/spatter5.json. Results will be found in spatter.strongscaling/H100/xrage/asteroid/spatter5/ and Figures will be found in figures/spatter.strongscaling/H100/xrage/asteroid/spatter5/ .. code-block:: bash @@ -278,7 +278,7 @@ Throughput experiment for the pattern in patterns/xrage/asteroid/spatter5.json. xRAGE Asteroid Spatter Pattern 9 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Throughput experiment for the pattern in patterns/xrage/asteroid/spatter9.json. Results will be found in spatter.strongscaling/H100/xrage/asteroid/spatter9/ and Figures will be found in figures/spatter.strongscaling/H100/xrage/asteroid/spatter9/ +Throughput experiment for the pattern in datafiles/xrage/asteroid/spatter9.json. Results will be found in spatter.strongscaling/H100/xrage/asteroid/spatter9/ and Figures will be found in figures/spatter.strongscaling/H100/xrage/asteroid/spatter9/ Note that we need to enable atomics with the `-m` flag since this is a scatter pattern which overwrites the same location multiple times. Results with and without atomics are included, but the results with atomics enabled is the benchmarked performance number of importance.