diff options
Diffstat (limited to 'modules/benchmark/fft.c')
| -rw-r--r-- | modules/benchmark/fft.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/modules/benchmark/fft.c b/modules/benchmark/fft.c index b7086e06..503a7aaf 100644 --- a/modules/benchmark/fft.c +++ b/modules/benchmark/fft.c @@ -1,5 +1,5 @@ /* - * HardInfo - Displays System Information + * HardInfo - System Information and Benchmark * Copyright (C) 2003-2007 L. A. F. Pereira <l@tia.mat.br> * * This program is free software; you can redistribute it and/or modify @@ -21,18 +21,16 @@ #include "fftbench.h" /* if anything changes in this block, increment revision */ -#define BENCH_REVISION -1 -#define FFT_MAXT 4 +#define BENCH_REVISION 2 +#define CRUNCH_TIME 5 -static gpointer fft_for(unsigned int start, unsigned int end, void *data, gint thread_number) +static gpointer fft_for(void *in_data, gint thread_number) { unsigned int i; - FFTBench **benches = (FFTBench **)data; + FFTBench **benches = (FFTBench **)in_data; FFTBench *fftbench = (FFTBench *)(benches[thread_number]); - for (i = start; i <= end; i++) { - fft_bench_run(fftbench); - } + fft_bench_run(benches[thread_number]); return NULL; } @@ -40,31 +38,33 @@ static gpointer fft_for(unsigned int start, unsigned int end, void *data, gint t void benchmark_fft(void) { + int cpu_procs, cpu_cores, cpu_threads, cpu_nodes; bench_value r = EMPTY_BENCH_VALUE; int n_cores, i; gchar *temp; - FFTBench **benches; + FFTBench **benches=NULL; shell_view_set_enabled(FALSE); shell_status_update("Running FFT benchmark..."); + cpu_procs_cores_threads_nodes(&cpu_procs, &cpu_cores, &cpu_threads, &cpu_nodes); + /* Pre-allocate all benchmarks */ - benches = g_new0(FFTBench *, FFT_MAXT); - for (i = 0; i < FFT_MAXT; i++) { - benches[i] = fft_bench_new(); - } + benches = g_new0(FFTBench *, cpu_threads); + for (i = 0; i < cpu_threads; i++) {benches[i] = fft_bench_new();} /* Run the benchmark */ - r = benchmark_parallel_for(FFT_MAXT, 0, FFT_MAXT, fft_for, benches); + r = benchmark_crunch_for(CRUNCH_TIME, 0, fft_for, benches); /* Free up the memory */ - for (i = 0; i < FFT_MAXT; i++) { + for (i = 0; i < cpu_threads; i++) { fft_bench_free(benches[i]); } g_free(benches); - r.result = r.elapsed_time; + r.result /= 100; + r.revision = BENCH_REVISION; bench_results[BENCHMARK_FFT] = r; } |