moebiusband/MD-Bench
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add neighbor lists capacity to index tracer file

Browse Source 
Signed-off-by: Rafael Ravedutti <rafaelravedutti@gmail.com>
This commit is contained in:
Rafael Ravedutti 2021-08-10 17:28:59 +02:00
parent b8d71090aa
commit 2889577a3b
1 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/force.c
View File

@ -33,10 +33,10 @@
#endif #endif
#ifdef MEM_TRACER #ifdef MEM_TRACER
# define MEM_TRACER_INIT FILE *mem_tracer_fp; \ # define MEM_TRACER_INIT FILE *mem_tracer_fp; \
if(first_exec) { mem_tracer_fp = fopen("mem_tracer.out", "w"); } if(first_exec) { mem_tracer_fp = fopen("mem_tracer.out", "w"); }
# define MEM_TRACER_END if(first_exec) { fclose(mem_tracer_fp); } # define MEM_TRACER_END if(first_exec) { fclose(mem_tracer_fp); }
# define MEM_TRACE(addr, op) if(first_exec) { fprintf(mem_tracer_fp, "%c: %p\n", op, (void *)(&(addr))); } # define MEM_TRACE(addr, op) if(first_exec) { fprintf(mem_tracer_fp, "%c: %p\n", op, (void *)(&(addr))); }
#else #else
# define MEM_TRACER_INIT # define MEM_TRACER_INIT
# define MEM_TRACER_END # define MEM_TRACER_END
@ -45,59 +45,59 @@
#ifdef INDEX_TRACER #ifdef INDEX_TRACER
# ifndef VECTOR_WIDTH # ifndef VECTOR_WIDTH
# define VECTOR_WIDTH 8 # define VECTOR_WIDTH 8
# endif # endif
# define INDEX_TRACER_INIT FILE *index_tracer_fp; \ # define INDEX_TRACER_INIT FILE *index_tracer_fp; \
if(first_exec) { index_tracer_fp = fopen("index_tracer.out", "w"); } if(first_exec) { index_tracer_fp = fopen("index_tracer.out", "w"); }
# define INDEX_TRACER_END if(first_exec) { fclose(index_tracer_fp); } # define INDEX_TRACER_END if(first_exec) { fclose(index_tracer_fp); }
# define INDEX_TRACE_NATOMS(nl, ng) if(first_exec) { fprintf(index_tracer_fp, "N: %d, %d\n", nl, ng); } # define INDEX_TRACE_NATOMS(nl, ng, mn) if(first_exec) { fprintf(index_tracer_fp, "N: %d %d %d\n", nl, ng, mn); }
# define INDEX_TRACE_ATOM(a) if(first_exec) { fprintf(index_tracer_fp, "A: %d\n", a); } # define INDEX_TRACE_ATOM(a) if(first_exec) { fprintf(index_tracer_fp, "A: %d\n", a); }
# define INDEX_TRACE(l, e) if(first_exec) { \ # define INDEX_TRACE(l, e) if(first_exec) { \
for(int __i = 0; __i < (e); __i += VECTOR_WIDTH) { \ for(int __i = 0; __i < (e); __i += VECTOR_WIDTH) { \
int __e = (((e) - __i) < VECTOR_WIDTH) ? ((e) - __i) : VECTOR_WIDTH; \ int __e = (((e) - __i) < VECTOR_WIDTH) ? ((e) - __i) : VECTOR_WIDTH; \
fprintf(index_tracer_fp, "I: "); \ fprintf(index_tracer_fp, "I: "); \
for(int __j = 0; __j < __e; ++__j) { \ for(int __j = 0; __j < __e; ++__j) { \
fprintf(index_tracer_fp, "%d ", l[__i + __j]); \ fprintf(index_tracer_fp, "%d ", l[__i + __j]); \
} \
fprintf(index_tracer_fp, "\n"); \
} \ } \
fprintf(index_tracer_fp, "\n"); \ }
} \
}
# define DIST_TRACE_SORT(l, e) if(first_exec) { \ # define DIST_TRACE_SORT(l, e) if(first_exec) { \
for(int __i = 0; __i < (e); __i += VECTOR_WIDTH) { \ for(int __i = 0; __i < (e); __i += VECTOR_WIDTH) { \
int __e = (((e) - __i) < VECTOR_WIDTH) ? ((e) - __i) : VECTOR_WIDTH; \ int __e = (((e) - __i) < VECTOR_WIDTH) ? ((e) - __i) : VECTOR_WIDTH; \
if(__e > 1) { \ if(__e > 1) { \
for(int __j = __i; __j < __i + __e - 1; ++__j) { \ for(int __j = __i; __j < __i + __e - 1; ++__j) { \
for(int __k = __i; __k < __i + __e - (__j - __i) - 1; ++__k) { \ for(int __k = __i; __k < __i + __e - (__j - __i) - 1; ++__k) { \
if(l[__k] > l[__k + 1]) { \ if(l[__k] > l[__k + 1]) { \
int __t = l[__k]; \ int __t = l[__k]; \
l[__k] = l[__k + 1]; \ l[__k] = l[__k + 1]; \
l[__k + 1] = __t; \ l[__k + 1] = __t; \
} \
} \ } \
} \ } \
} \ } \
} \ } \
} \ }
}
# define DIST_TRACE(l, e) if(first_exec) { \ # define DIST_TRACE(l, e) if(first_exec) { \
for(int __i = 0; __i < (e); __i += VECTOR_WIDTH) { \ for(int __i = 0; __i < (e); __i += VECTOR_WIDTH) { \
int __e = (((e) - __i) < VECTOR_WIDTH) ? ((e) - __i) : VECTOR_WIDTH; \ int __e = (((e) - __i) < VECTOR_WIDTH) ? ((e) - __i) : VECTOR_WIDTH; \
if(__e > 1) { \ if(__e > 1) { \
fprintf(index_tracer_fp, "D: "); \ fprintf(index_tracer_fp, "D: "); \
for(int __j = 0; __j < __e - 1; ++__j) { \ for(int __j = 0; __j < __e - 1; ++__j) { \
int __dist = abs(l[__i + __j + 1] - l[__i + __j]); \ int __dist = abs(l[__i + __j + 1] - l[__i + __j]); \
fprintf(index_tracer_fp, "%d ", __dist); \ fprintf(index_tracer_fp, "%d ", __dist); \
} \
fprintf(index_tracer_fp, "\n"); \
} \ } \
fprintf(index_tracer_fp, "\n"); \
} \ } \
} \ }
}
#else #else
# define INDEX_TRACER_INIT # define INDEX_TRACER_INIT
# define INDEX_TRACER_END # define INDEX_TRACER_END
# define INDEX_TRACE_NATOMS(nl, ng) # define INDEX_TRACE_NATOMS(nl, ng, mn)
# define INDEX_TRACE_ATOM(a) # define INDEX_TRACE_ATOM(a)
# define INDEX_TRACE(l, e) # define INDEX_TRACE(l, e)
# define DIST_TRACE_SORT(l, e) # define DIST_TRACE_SORT(l, e)
@ -123,7 +123,7 @@ double computeForce(Parameter *param, Atom *atom, Neighbor *neighbor, int first_
fz[i] = 0.0; fz[i] = 0.0;
} }
INDEX_TRACE_NATOMS(Nlocal, atom->Nghost); INDEX_TRACE_NATOMS(Nlocal, atom->Nghost, neighbor->maxneighs);
LIKWID_MARKER_START("force"); LIKWID_MARKER_START("force");
#pragma omp parallel for #pragma omp parallel for
for(int i = 0; i < Nlocal; i++) { for(int i = 0; i < Nlocal; i++) {