Babelstream

.github/utils/dryruns.py

@@ -17,6 +17,9 @@
     "gromacs+openmp aws-pcluster instance_type=c6g.xlarge",
     "gromacs+openmp aws-pcluster instance_type=c4.xlarge",
     "gromacs+openmp generic-x86",
+    "babelstream+openmp aws-pcluster instance_type=c6g.xlarge",
+    "babelstream+openmp aws-pcluster instance_type=c4.xlarge",
+    "babelstream+openmp generic-x86",
     "stream aws-pcluster instance_type=c6g.xlarge",
     "stream aws-pcluster instance_type=c4.xlarge",
     "stream cscs-daint",

experiments/babelstream/experiment.py

@@ -34,10 +34,9 @@ class Babelstream(
     maintainers("daboehme")
 
     def compute_applications_section(self):
+        self.add_experiment_variable("n", "50", True)
+        self.add_experiment_variable("s", "10240000", True)
 
-        self.add_experiment_variable("processes_per_node", "1", True)
-        self.add_experiment_variable("n", "35", False)
-        self.add_experiment_variable("o", "0", False)
         n_resources = 1
 
         if self.spec.satisfies("+cuda"):
@@ -47,17 +46,25 @@ def compute_applications_section(self):
             self.add_experiment_variable("execute", "hip-stream", False)
 
         else:
-            self.add_experiment_variable("n_ranks", n_resources, True)
             self.add_experiment_variable("execute", "omp-stream", False)
 
+        if self.spec.satisfies("+openmp"):
+            self.add_experiment_variable("n_threads_per_proc", 16, True)
         if self.spec.satisfies("+cuda") or self.spec.satisfies("+rocm"):
-            self.add_experiment_variable("n_gpus", n_resources, True)
+            self.add_experiment_variable("n_gpus", "{n_resources}", True)
+        else:
+            self.add_experiment_variable("n_ranks", "{n_resources}", True)
 
         self.set_required_variables(
             n_resources=f"{n_resources}",
-            process_problem_size="{n}/" + str(n_resources),
-            total_problem_size="{n}",
+            process_problem_size="{s}",
+            total_problem_size="{s} * {n_resources}",
         )
 
     def compute_package_section(self):
-        self.add_package_spec(self.name, [f"babelstream{self.determine_version()}"])
+        # get package version
+        omp_spec = "+omp" if self.spec.satisfies("+openmp") else ""
+        hip_spec = "+hip" if self.spec.satisfies("+rocm") else ""
+        self.add_package_spec(
+            self.name, [f"babelstream{self.determine_version()} {omp_spec} {hip_spec}"]
+        )