Patch/system names

.github/workflows/run.yml

@@ -17,7 +17,7 @@ jobs:
 
       - name: Build Saxpy Workspace
         run: |
-          ./bin/benchpark setup saxpy/openmp x86 workspace/
+          ./bin/benchpark setup saxpy/openmp x86_64 workspace/
 
       - name: Setup Ramble & Spack
         run: |
@@ -32,7 +32,7 @@ jobs:
           echo "PATH=$PATH" >> "$GITHUB_ENV"
 
       - name: Setup Saxpy Workspace
-        working-directory: ./workspace/saxpy/openmp/x86/workspace/
+        working-directory: ./workspace/saxpy/openmp/x86_64/workspace/
         run: |
           ramble \
             --workspace-dir . \
@@ -42,7 +42,7 @@ jobs:
             workspace setup
 
       - name: Run Saxpy Experiments
-        working-directory: ./workspace/saxpy/openmp/x86/workspace/
+        working-directory: ./workspace/saxpy/openmp/x86_64/workspace/
         run: |
           ramble \
             -c variables:n_nodes:1 \
@@ -53,7 +53,7 @@ jobs:
             on
 
       - name: Analyze Saxpy Results
-        working-directory: ./workspace/saxpy/openmp/x86/workspace/
+        working-directory: ./workspace/saxpy/openmp/x86_64/workspace/
         run: |
           ramble \
             --workspace-dir . \

configs/AWS-Hpc7a-EPYC4-EFA/system_definition.yaml

@@ -0,0 +1,32 @@
+# Copyright 2023 Lawrence Livermore National Security, LLC and other
+# Benchpark Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+system_definition:
+  name: AWS-Hpc7a-EPYC4-EFA
+  manufacturer:
+    vendor: AWS
+    name: ParallelCluster3.7.2-Hpc7a
+  processor:
+    vendor: AMD
+    name: EPYC-Zen4
+    ISA: x86_64
+    uArch: zen4
+  accelerator:
+    vendor: None
+    name: None
+    ISA: None
+    uArch: None
+  interconnect:
+    vendor: AWS
+    name: EFA
+  OS:
+    name: Amazon-Linux-2
+  system-tested:
+    owner: AWS
+    name: ""
+    installation-year: ""
+    description: [aws/hpc7a](https://aws.amazon.com/ec2/instance-types/hpc7a)
+  top500-system-instances:
+    - None

configs/ats4/auxiliary_software_files/packages.yaml → configs/HPECray-EPYC3-MI250X-Slingshot/auxiliary_software_files/packages.yaml

@@ -1,6 +1,7 @@
 packages:
   all:
-    require: target=x86_64
+    require: target=x86_64:
+    variants: amdgpu_target=gfx90a
   tar:
     externals:
     - spec: [email protected]
@@ -187,8 +188,6 @@ packages:
       prefix: /opt/cray/pe/libsci/23.05.1.4/gnu/10.3/x86_64/
   lapack:
     buildable: false
-  hypre:
-    variants: amdgpu_target=gfx90a
   mpi:
     buildable: false
   cray-mpich:

configs/HPECray-EPYC3-MI250X-Slingshot/system_definition.yaml

@@ -0,0 +1,34 @@
+# Copyright 2023 Lawrence Livermore National Security, LLC and other
+# Benchpark Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+system_definition:
+  name: HPECray-EPYC3-MI250X-Slingshot
+  manufacturer:
+    vendor: HPE-Cray
+    name: EX235a
+  processor:
+    vendor: AMD
+    name: EPYC-Zen3
+    ISA: x86_64
+    uArch: zen3
+  accelerator:
+    vendor: AMD
+    name: MI250X
+    ISA: GCN
+    uArch: gfx90a
+  interconnect:
+    vendor: HPE-Cray
+    name: Slingshot-11
+  OS:
+    name: HPE-Cray-OS
+  system-tested:
+    owner: LLNL
+    name: tioga
+    installation-year: 2022
+    description: [top500](https://www.top500.org/system/180052)
+  top500-system-instances:
+    - Frontier (ORNL)
+    - Lumi (EuroHPC/CSC)
+    - Tioga (LLNL)

configs/IBM-POWER9-V100-Infiniband/system_definition.yaml

@@ -0,0 +1,33 @@
+# Copyright 2023 Lawrence Livermore National Security, LLC and other
+# Benchpark Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+system_definition:
+  name: IBM-POWER9-V100-Infiniband
+  manufacturer:
+    vendor: IBM
+    name: AC922
+  processor:
+    vendor: IBM
+    name: POWER9
+    ISA: ppc64le
+    uArch: power9
+  accelerator:
+    vendor: NVIDIA
+    name: V100
+    ISA: PTX
+    uArch: sm_70
+  interconnect:
+    vendor: Mellanox
+    name: EDR-Infiniband
+  OS:
+    name: RHEL
+  system-tested:
+    owner: LLNL
+    name: lassen
+    installation-year: 2018
+    description: [top500](https://www.top500.org/system/179398)
+  top500-system-instances:
+    - Summit (ORNL)
+    - Sierra (LLNL)

configs/Penguin-XeonPlatinum-OmniPath/system_definition.yaml

@@ -0,0 +1,32 @@
+# Copyright 2023 Lawrence Livermore National Security, LLC and other
+# Benchpark Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+system_definition:
+  name: Penguin-XeonPlatinum-OmniPath
+  manufacturer:
+    vendor: PenguinComputing
+    name: RelionCluster
+  processor:
+    vendor: Intel
+    name: XeonPlatinum924248C
+    ISA: x86_64
+    uArch: IceLake-SP
+  accelerator:
+    vendor: None
+    name: None
+    ISA: None
+    uArch: None
+  interconnect:
+    vendor: Intel
+    name: OmniPath
+  OS:
+    name: Linux/TOSS4
+  system-tested:
+    owner: LLNL
+    name: magma
+    installation-year: 2019
+    description: [top500](https://www.top500.org/system/179774)
+  top500-system-instances:
+    - Magma (LLNL)

configs/x86_64/system_definition.yaml

@@ -0,0 +1,32 @@
+# Copyright 2023 Lawrence Livermore National Security, LLC and other
+# Benchpark Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+system_definition:
+  name: x86_64
+  manufacturer:
+    vendor: Any
+    name: Any
+  processor:
+    vendor: Any
+    name: Any
+    ISA: x86_64
+    uArch: Any
+  accelerator:
+    vendor: None
+    name: None
+    ISA: None
+    uArch: None
+  interconnect:
+    vendor: Any
+    name: Any
+  OS:
+    name: Any
+  system-tested:
+    owner: Any
+    name: Any
+    installation-year: Any
+    description: Any
+  top500-system-instances:
+    - Many

docs/4-benchpark-setup.rst

@@ -10,7 +10,7 @@ Also choose a directory for your experiment::
 where:
 
 - ``benchmark/ProgrammingModel``: amg2023/openmp | amg2023/cuda | saxpy/openmp (available choices in ``benchpark/experiments``)
-- ``system``: ats2 | ats4 | cts1 (available choices in ``benchpark/configs``)
+- ``system``: x86_64 | HPECray-EPYC3-MI250X-Slingshot | AWS-Hpc7a-EPYC4-EFA (available choices in ``benchpark/configs``)
 
 This command will assemble a Ramble workspace per experiment
 with a configuration for the specified benchmark and system

docs/add-a-system-config.rst

@@ -3,14 +3,60 @@ Adding a System Configuration
 =============================
 
 ``benchpark/configs`` contains a directory for each system specified in Benchpark.
-If the software stack on your system is unlike the available configurations, 
+If your system is unlike the available configurations,
 you can add a new directory with a name which identifies the system.
 
-The following is required for each given system ``benchpark/configs/${SYSTEM}``:
+The naming convention for the systems is as following::
 
-1. ``spack.yaml`` defines default compiler and package names Spack should
+  Integrator-(opt)ClusterType-CPU-(opt)GPU-Network
+
+Benchpark has definitions for the following systems:
+- AWS-Hpc7a-EPYC4-EFA
+- HPECray-EPYC3-MI250X-Slingshot	(Frontier, Lumi, Tioga)
+- IBM-POWER9-V100-Infiniband	        (Sierra, Summit)
+- Penguin-XeonPlatinum-OmniPath
+- x86_64                                (generic x86 CPU only platform)
+
+The following files are required for each system ``benchpark/configs/${SYSTEM}``:
+
+1. ``system_definition.yaml``
+
+.. code-block:: yaml
+
+  system_definition:
+    name: HPECray-EPYC3-MI250X-Slingshot
+    manufacturer:
+      vendor: HPE-Cray
+      name: EX235a
+    processor:
+      vendor: AMD
+      name: EPYC-Zen3
+      ISA: x86_64
+      uArch: zen3
+    accelerator:
+      vendor: AMD
+      name: MI250X
+      ISA: GCN
+      uArch: gfx90a
+    interconnect:
+      vendor: HPE-Cray
+      name: Slingshot-11
+    OS:
+      name: HPE-Cray-OS
+    system-tested:
+      owner: LLNL
+      name: tioga
+      installation-year: 2022
+      description: [top500](https://www.top500.org/system/180052)
+    top500-system-instances:
+      - Frontier (ORNL)
+      - Lumi (EuroHPC/CSC)
+      - Tioga (LLNL)
+
+
+2. ``spack.yaml`` defines default compiler and package names Spack should
 use to build the benchmarks on this system.  ``spack.yaml`` becomes the
-spack section in the `Ramble configuration file 
+spack section in the `Ramble configuration file
 <https://googlecloudplatform.github.io/ramble/configuration_files.html#spack-config>`_.
 
 .. code-block:: yaml
@@ -22,7 +68,7 @@ spack section in the `Ramble configuration file
         default-mpi:
           spack_spec: 'spack_spec_for_package'
 
-2. ``variables.yaml`` defines system-specific launcher and job scheduler.
+3. ``variables.yaml`` defines system-specific launcher and job scheduler.
 
 .. code-block:: yaml
 
@@ -33,7 +79,7 @@ spack section in the `Ramble configuration file
       batch_ranks: ''
       batch_timeout: ''
 
-3. Optionally, one can add more information about the software installed on the system 
+4. Optionally, one can add more information about the software installed on the system
 by adding Spack config files in ``benchpark/configs/${SYSTEM}/auxiliary_software_files/``.
 
 - `compilers.yaml <https://spack.readthedocs.io/en/latest/getting_started.html#compiler-config>`_ defines the compilers installed on the system.