diff --git a/src/benchmarks/meson.build b/src/benchmarks/meson.build index a95dbb5b4fc55907d00f238fb7a9992dc66c772b..a496dd5333a102d4fb15f4e570c59d46a706b30c 100644 --- a/src/benchmarks/meson.build +++ b/src/benchmarks/meson.build @@ -1,2 +1,3 @@ +subdir('nas-ft') subdir('rodinia-srad') subdir('zellularautomat') diff --git a/src/benchmarks/nas-ft/fortran/Makefile b/src/benchmarks/nas-ft/fortran/Makefile deleted file mode 100644 index 0e4b0b420ed0b8bb40ab2eaf3622f90c3516a01c..0000000000000000000000000000000000000000 --- a/src/benchmarks/nas-ft/fortran/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -SHELL=/bin/sh -BENCHMARK=ft -BENCHMARKU=FT -BLKFAC=32 - -include ../config/make.def - -include ../sys/make.common - -OBJS = ft.o ft_data.o ${COMMON}/${RAND}.o ${COMMON}/print_results.o \ - ${COMMON}/timers.o ${COMMON}/wtime.o - -${PROGRAM}: config - @ver=$(VERSION); bfac=`echo $$ver|sed -e 's/^blk//' -e 's/^BLK//'`; \ - if [ x$$ver != x$$bfac ] ; then \ - ${MAKE} BLKFAC=$${bfac:-32} exec; \ - else \ - ${MAKE} exec; \ - fi - -exec: $(OBJS) - ${FLINK} ${FLINKFLAGS} -o ${PROGRAM} ${OBJS} ${F_LIB} - - -.f90.o: - ${FCOMPILE} $< - -blk_par.h: FORCE - sed -e 's/=0/=$(BLKFAC)/' blk_par0.h > blk_par.h_wk - @ if ! `diff blk_par.h_wk blk_par.h > /dev/null 2>&1`; then \ - mv -f blk_par.h_wk blk_par.h; else rm -f blk_par.h_wk; fi -FORCE: - -ft.o: ft.f90 ft_data.o -ft_data.o: ft_data.f90 npbparams.h blk_par.h - -clean: - - rm -f *.o *~ mputil* *.mod - - rm -f ft npbparams.h core blk_par.h - - if [ -d rii_files ]; then rm -r rii_files; fi diff --git a/src/benchmarks/nas-ft/fortran/meson.build b/src/benchmarks/nas-ft/fortran/meson.build new file mode 100644 index 0000000000000000000000000000000000000000..e3e613c4a51b447e83861ee4f451af7e4fb37495 --- /dev/null +++ b/src/benchmarks/nas-ft/fortran/meson.build @@ -0,0 +1,17 @@ +sources = [ + 'ft.f90', + 'ft_data.f90', + 'print_results.f90', + 'timers.f90', + 'randi8.f90', +] + +dependencies = [ + dependency('openmp'), +] + +executable( + 'nas-ft-fortran', + sources, + dependencies: dependencies, +) diff --git a/src/benchmarks/nas-ft/meson.build b/src/benchmarks/nas-ft/meson.build new file mode 100644 index 0000000000000000000000000000000000000000..32c5421e89914ad67d5986e895e735d84326f050 --- /dev/null +++ b/src/benchmarks/nas-ft/meson.build @@ -0,0 +1 @@ +subdir('fortran')