From 43d9e8138e6d6a645009a2891c4e54b03d88e935 Mon Sep 17 00:00:00 2001
From: Dorian Stoll <dorian.stoll@uni-potsdam.de>
Date: Wed, 12 Jun 2024 14:16:23 +0200
Subject: [PATCH] rodinia-srad: c: Output unconditionally
---
meson_options.txt | 5 -----
src/benchmarks/rodinia-srad/c/meson.build | 7 -------
src/benchmarks/rodinia-srad/c/srad.cpp | 16 ----------------
3 files changed, 28 deletions(-)
delete mode 100644 meson_options.txt
diff --git a/meson_options.txt b/meson_options.txt
deleted file mode 100644
index a9aec457..00000000
--- a/meson_options.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-option(
- 'rodinia_srad_output',
- type: 'boolean',
- value: false,
-)
diff --git a/src/benchmarks/rodinia-srad/c/meson.build b/src/benchmarks/rodinia-srad/c/meson.build
index 7d5ee092..5cf4141e 100644
--- a/src/benchmarks/rodinia-srad/c/meson.build
+++ b/src/benchmarks/rodinia-srad/c/meson.build
@@ -10,16 +10,9 @@ options = [
'c_std=c99',
]
-cxxflags = []
-
-if get_option('rodinia_srad_output')
- cxxflags += ['-DOUTPUT']
-endif
-
executable(
'rodinia-srad-c',
sources,
- cpp_args: cxxflags,
dependencies: dependencies,
override_options: options,
)
diff --git a/src/benchmarks/rodinia-srad/c/srad.cpp b/src/benchmarks/rodinia-srad/c/srad.cpp
index 353b7278..d153c339 100644
--- a/src/benchmarks/rodinia-srad/c/srad.cpp
+++ b/src/benchmarks/rodinia-srad/c/srad.cpp
@@ -1,8 +1,6 @@
// srad.cpp : Defines the entry point for the console application.
//
-//#define OUTPUT
-
#define OPEN
#define ITERATION
@@ -184,13 +182,7 @@ int main(int argc, char *argv[]) {
// image update (equ 61)
J[k] = J[k] + 0.25 * lambda * D;
-#ifdef OUTPUT
-// printf("%.5f ", J[k]);
-#endif // output
}
-#ifdef OUTPUT
-// printf("\n");
-#endif // output
}
#ifdef ITERATION
@@ -198,7 +190,6 @@ int main(int argc, char *argv[]) {
#endif
-#ifdef OUTPUT
for (int i = 0; i < rows; i++) {
for (int j = 0; j < cols; j++) {
@@ -206,7 +197,6 @@ int main(int argc, char *argv[]) {
}
printf("\n");
}
-#endif
printf("Computation Done\n");
@@ -233,12 +223,6 @@ void random_matrix(float *I, int rows, int cols) {
for (int i = 0; i < rows; i++) {
for (int j = 0; j < cols; j++) {
I[i * cols + j] = rand() / (float)RAND_MAX;
-#ifdef OUTPUT
-// printf("%g ", I[i * cols + j]);
-#endif
}
-#ifdef OUTPUT
-// printf("\n");
-#endif
}
}
--
GitLab