From 57766d01016a4ce532e87b4befdddaa04b1f3d9e Mon Sep 17 00:00:00 2001
From: Dorian Stoll <dorian.stoll@uni-potsdam.de>
Date: Sun, 9 Jun 2024 20:52:18 +0200
Subject: [PATCH] zellularautomat: c: Drop sequential version
---
src/benchmarks/zellularautomat/c/Makefile | 12 +--
src/benchmarks/zellularautomat/c/ca_seq.c | 90 -----------------------
2 files changed, 3 insertions(+), 99 deletions(-)
delete mode 100644 src/benchmarks/zellularautomat/c/ca_seq.c
diff --git a/src/benchmarks/zellularautomat/c/Makefile b/src/benchmarks/zellularautomat/c/Makefile
index e3861240..86371619 100644
--- a/src/benchmarks/zellularautomat/c/Makefile
+++ b/src/benchmarks/zellularautomat/c/Makefile
@@ -9,17 +9,13 @@ OMP_CFLAGS=-fopenmp
C_DEPS=ca_common.c random.c
-TARGETS=ca_seq \
- ca_openmp
+TARGETS=ca_openmp
.PHONY: all
all: $(TARGETS)
.PHONY: cpu
-cpu: ca_seq ca_openmp
-
-ca_seq: ca_seq.c $(C_DEPS)
- $(BASE_CC) $(COMMON_CFLAGS) $(BASE_CFLAGS) $^ $(COMMON_LDFLAGS) -o $@
+cpu: ca_openmp
ca_openmp: ca_openmp.c $(C_DEPS)
$(BASE_CC) $(COMMON_CFLAGS) $(BASE_CFLAGS) $(OMP_CFLAGS) $^ $(COMMON_LDFLAGS) -o $@
@@ -46,12 +42,10 @@ bench: ca_openmp
.PHONY: omp_scaling
-omp_scaling: ca_seq ca_openmp
+omp_scaling: ca_openmp
@for ITS in 128 256 512; do \
for LINES in 1000 10000 50000; do \
echo "$$LINES lines, $$ITS iterations"; \
- printf "sequential \t"; \
- ./ca_seq $$LINES $$ITS; \
for THREADS in `seq \`nproc\``; do \
printf "$$THREADS threads\t"; \
OMP_NUM_THREADS=$$THREADS ./ca_openmp $$LINES $$ITS; \
diff --git a/src/benchmarks/zellularautomat/c/ca_seq.c b/src/benchmarks/zellularautomat/c/ca_seq.c
deleted file mode 100644
index ff187f0a..00000000
--- a/src/benchmarks/zellularautomat/c/ca_seq.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * simulate a cellular automaton with periodic boundaries (torus-like)
- * serial version
- *
- * (c) 2016 Steffen Christgau (C99 port, modularization)
- * (c) 1996,1997 Peter Sanders, Ingo Boesnach (original source)
- *
- * command line arguments:
- * #1: Number of lines
- * #2: Number of iterations to be simulated
- *
- */
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "ca_common.h"
-#include <time.h>
-
-/* --------------------- CA simulation -------------------------------- */
-
-/* annealing rule from ChoDro96 page 34
- * the table is used to map the number of nonzero
- * states in the neighborhood to the new state
- */
-static const cell_state_t anneal[10] = {0, 0, 0, 0, 1, 0, 1, 1, 1, 1};
-
-/* treat torus like boundary conditions */
-static void boundary(line_t *buf, int lines)
-{
- for (int y = 0; y <= lines + 1; y++) {
- /* copy rightmost column to the buffer column 0 */
- buf[y][0] = buf[y][XSIZE];
-
- /* copy leftmost column to the buffer column XSIZE + 1 */
- buf[y][XSIZE + 1] = buf[y][1];
- }
-
- for (int x = 0; x <= XSIZE + 1; x++) {
- /* copy bottommost row to buffer row 0 */
- buf[0][x] = buf[lines][x];
-
- /* copy topmost row to buffer row lines + 1 */
- buf[lines + 1][x] = buf[1][x];
- }
-}
-
-/* make one simulation iteration with lines lines.
- * old configuration is in from, new one is written to to.
- */
-static void simulate(line_t *from, line_t *to, int lines)
-{
- for (int y = 1; y <= lines; y++) {
- for (int x = 1; x <= XSIZE; x++) {
- /* transition is defined in ca_common.h */
- to[y][x] = transition(from, x, y);
- }
- }
-}
-
-/* --------------------- measurement ---------------------------------- */
-
-int main(int argc, char** argv)
-{
- int lines, its;
-
- ca_init(argc, argv, &lines, &its);
-
- line_t *from = calloc((lines + 2), sizeof(line_t));
- line_t *to = calloc((lines + 2), sizeof(line_t));
-
- ca_init_config(from, lines, 0);
-
- TIME_GET(sim_start);
- for (int i = 0; i < its; i++) {
- boundary(from, lines);
- simulate(from, to, lines);
-
- line_t *temp = from;
- from = to;
- to = temp;
- }
- TIME_GET(sim_stop);
-
- ca_hash_and_report(from + 1, lines, TIME_DIFF(sim_start, sim_stop));
-
- free(from);
- free(to);
-
- return EXIT_SUCCESS;
-}
--
GitLab