Merge branch 'develop' into experiment/kripke

configs/LLNL-Magma-Penguin-icelake-OmniPath/auxiliary_software_files/packages.yaml

@@ -4,6 +4,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 packages:
+  papi:
+    externals:
+    - spec: [email protected]
+      prefix: /usr/tce/packages/papi/papi-6.0.0.1
+      buildable: false
   tar:
     externals:
     - spec: [email protected]

configs/LLNL-Pascal-Penguin-broadwell-P100-OmniPath/auxiliary_software_files/packages.yaml

@@ -4,6 +4,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 packages:
+  papi:
+    externals:
+    - spec: [email protected]
+      prefix: /usr/tce/packages/papi/papi-6.0.0.1
+      buildable: false
   tar:
     externals:
     - spec: [email protected]
@@ -27,6 +32,11 @@ packages:
     externals:
     - spec: [email protected]
       prefix: /usr
+  python:
+    externals:
+    - spec: [email protected]
+      prefix: /usr/tce/packages/python/python-3.9.12/
+      buildable: false
   mpi:
     buildable: false
   mvapich2:

modifiers/caliper-cuda/configs/modifier.yaml

@@ -0,0 +1,18 @@
+# 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
+
+variables:
+  modifier_package_name: 'caliper-cuda'
+  modifier_spack_variant: '+caliper'
+
+modifiers:
+  - name: caliper-cuda
+    mode: cuda
+
+spack:
+  packages:
+    caliper-cuda:
+      spack_spec: caliper+adiak+mpi~libunwind~libdw~papi+cuda cuda_arch=={cuda_arch}
+

modifiers/caliper-cuda/modifier.py

@@ -0,0 +1,27 @@
+# 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
+
+from ramble.modkit import *
+from ramble.mod.benchpark.caliper import Caliper as CaliperBase
+
+
+class CaliperCuda(CaliperBase):
+    """Define a modifier for Caliper"""
+
+    name = "caliper-cuda"
+
+    mode(
+        "cuda",
+        description="Profile CUDA API functions",
+    )
+
+    _cali_datafile = CaliperBase._cali_datafile
+
+    env_var_modification(
+        "CALI_CONFIG",
+        "spot(output={}, profile.cuda)".format(_cali_datafile),
+        method="set",
+        modes=["cuda"],
+    )

modifiers/caliper-topdown/configs/modifier.yaml

@@ -0,0 +1,18 @@
+# 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
+
+variables:
+  modifier_package_name: 'caliper-topdown'
+  modifier_spack_variant: '+caliper'
+
+modifiers:
+  - name: caliper-topdown
+    mode: topdown-all
+
+spack:
+  packages:
+    caliper-topdown:
+      spack_spec: caliper+adiak+mpi~libunwind~libdw+papi
+

modifiers/caliper-topdown/modifier.py

@@ -0,0 +1,57 @@
+# 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
+
+from ramble.modkit import *
+from ramble.mod.benchpark.caliper import Caliper as CaliperBase
+
+
+class CaliperTopdown(CaliperBase):
+    """Define a modifier for Caliper"""
+
+    name = "caliper-topdown"
+
+    mode(
+        "topdown-counters-all",
+        description="Raw counter values for Intel top-down analysis (all levels)",
+    )
+    mode(
+        "topdown-counters-toplevel",
+        description="Raw counter values for Intel top-down analysis (top level)",
+    )
+    mode(
+        "topdown-all",
+        description="Top-down analysis for Intel CPUs (all levels)",
+    )
+    mode(
+        "topdown-toplevel",
+        description="Top-down analysis for Intel CPUs (top level)",
+    )
+
+    _cali_datafile = CaliperBase._cali_datafile
+
+    env_var_modification(
+        "CALI_CONFIG",
+        "spot(output={}, topdown-counters.all)".format(_cali_datafile),
+        method="set",
+        modes=["topdown-counters-all"],
+    )
+    env_var_modification(
+        "CALI_CONFIG",
+        "spot(output={}, topdown-counters.toplevel)".format(_cali_datafile),
+        method="set",
+        modes=["topdown-counters-toplevel"],
+    )
+    env_var_modification(
+        "CALI_CONFIG",
+        "spot(output={}, topdown.all)".format(_cali_datafile),
+        method="set",
+        modes=["topdown-all"],
+    )
+    env_var_modification(
+        "CALI_CONFIG",
+        "spot(output={}, topdown.toplevel)".format(_cali_datafile),
+        method="set",
+        modes=["topdown-toplevel"],
+    )