diff --git a/meson_options.txt b/meson_options.txt new file mode 100644 index 0000000000000000000000000000000000000000..a9aec457abb826ddd7dca57ae332000574720736 --- /dev/null +++ b/meson_options.txt @@ -0,0 +1,5 @@ +option( + 'rodinia_srad_output', + type: 'boolean', + value: false, +) diff --git a/src/benchmarks/meson.build b/src/benchmarks/meson.build index cd38a8b2e1c467ce270bdee29ef41136a8d7f6b5..a95dbb5b4fc55907d00f238fb7a9992dc66c772b 100644 --- a/src/benchmarks/meson.build +++ b/src/benchmarks/meson.build @@ -1 +1,2 @@ +subdir('rodinia-srad') subdir('zellularautomat') diff --git a/src/benchmarks/rodinia-srad/c/Makefile b/src/benchmarks/rodinia-srad/c/Makefile deleted file mode 100644 index 9bd5dd3c4babd4820a575738d078bce3a47fc2ad..0000000000000000000000000000000000000000 --- a/src/benchmarks/rodinia-srad/c/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -SHELL=/bin/sh -ue - -CFLAGS += -O2 -CXXFLAGS += -O2 - -ifdef OUTPUT -CPPFLAGS += -DOUTPUT -endif - -ifdef DEBUG -CFLAGS += -g -CXXFLAGS += -g -endif - -# include Make.user relative to every active Makefile, exactly once -MAKEFILE_DIRS = $(foreach MAKEFILE,$(realpath $(MAKEFILE_LIST)), $(shell dirname $(MAKEFILE))) -$(foreach DIR,$(sort $(MAKEFILE_DIRS)),\ - $(eval -include $(DIR)/Make.user)\ -) - -CFLAGS += -fopenmp -CXXFLAGS += -fopenmp -LDLIBS += -fopenmp - -EXE = srad - -.PHONY: all -all: $(EXE) - -.PHONY: clean -clean: - $(RM) $(EXE) - diff --git a/src/benchmarks/rodinia-srad/c/meson.build b/src/benchmarks/rodinia-srad/c/meson.build new file mode 100644 index 0000000000000000000000000000000000000000..7d5ee0923df5702ce38eef51a11ec291ad7b0322 --- /dev/null +++ b/src/benchmarks/rodinia-srad/c/meson.build @@ -0,0 +1,25 @@ +sources = [ + 'srad.cpp', +] + +dependencies = [ + dependency('openmp'), +] + +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/meson.build b/src/benchmarks/rodinia-srad/meson.build new file mode 100644 index 0000000000000000000000000000000000000000..76d1974ff05dc93d7fe7516692cfeb139c10ce0a --- /dev/null +++ b/src/benchmarks/rodinia-srad/meson.build @@ -0,0 +1 @@ +subdir('c')