Skip to content
Snippets Groups Projects
Commit a23e55b7 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Also update the testPair unit test to use the new calling convention of DOPAIR1

parent 0099b465
No related branches found
No related tags found
1 merge request!348Fix pair vec
...@@ -16,14 +16,36 @@ ...@@ -16,14 +16,36 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
******************************************************************************/ ******************************************************************************/
#include "../config.h"
/* Some standard headers. */
#include <fenv.h> #include <fenv.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
/* Local headers. */
#include "swift.h" #include "swift.h"
#if defined(WITH_VECTORIZATION)
#define DOSELF1 runner_doself1_density_vec
#define DOPAIR1 runner_dopair1_branch_density
#define DOSELF1_NAME "runner_doself1_density_vec"
#define DOPAIR1_NAME "runner_dopair1_density_vec"
#endif
#ifndef DOSELF1
#define DOSELF1 runner_doself1_density
#define DOSELF1_NAME "runner_doself1_density"
#endif
#ifndef DOPAIR1
#define DOPAIR1 runner_dopair1_branch_density
#define DOPAIR1_NAME "runner_dopair1_density"
#endif
/* n is both particles per axis and box size: /* n is both particles per axis and box size:
* particles are generated on a mesh with unit spacing * particles are generated on a mesh with unit spacing
*/ */
...@@ -187,6 +209,9 @@ void dump_particle_fields(char *fileName, struct cell *ci, struct cell *cj) { ...@@ -187,6 +209,9 @@ void dump_particle_fields(char *fileName, struct cell *ci, struct cell *cj) {
/* Just a forward declaration... */ /* Just a forward declaration... */
void runner_dopair1_density(struct runner *r, struct cell *ci, struct cell *cj); void runner_dopair1_density(struct runner *r, struct cell *ci, struct cell *cj);
void runner_doself1_density_vec(struct runner *r, struct cell *ci);
void runner_dopair1_branch_density(struct runner *r, struct cell *ci,
struct cell *cj);
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
size_t particles = 0, runs = 0, volume, type = 0; size_t particles = 0, runs = 0, volume, type = 0;
...@@ -206,6 +231,9 @@ int main(int argc, char *argv[]) { ...@@ -206,6 +231,9 @@ int main(int argc, char *argv[]) {
unsigned long long cpufreq = 0; unsigned long long cpufreq = 0;
clocks_set_cpufreq(cpufreq); clocks_set_cpufreq(cpufreq);
/* Choke on FP-exceptions */
feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
srand(0); srand(0);
while ((c = getopt(argc, argv, "h:p:r:t:d:f:")) != -1) { while ((c = getopt(argc, argv, "h:p:r:t:d:f:")) != -1) {
...@@ -276,7 +304,7 @@ int main(int argc, char *argv[]) { ...@@ -276,7 +304,7 @@ int main(int argc, char *argv[]) {
#if defined(DEFAULT_SPH) || !defined(WITH_VECTORIZATION) #if defined(DEFAULT_SPH) || !defined(WITH_VECTORIZATION)
/* Run the test */ /* Run the test */
runner_dopair1_density(&runner, ci, cj); DOPAIR1(&runner, ci, cj);
#endif #endif
toc = getticks(); toc = getticks();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment