Commit de224973 authored by Peter W. Draper's avatar Peter W. Draper
Browse files

Merge branch 'arm_fixes' into 'master'

ARM Fixes

See merge request !734

Few changes for ARM ThunderX2 and ARM-clang:


Do not assume char is signed. Use int8_t for the time-bin .
Improve the detection of the ARMv8.1a cycle counter assembly instruction.
Fix cycle.h for ARMv8.1a. Will push upstream to FFTW.
Add a synchronization point in the memswap() for clang on ARM.
Do not let the autotools choose the flags for clang and GCC on ARM 8.1a. Use the native instructions.
Upgrade to some of the autotools macros.
parents ccb491b7 dfe28004
......@@ -755,7 +755,8 @@ void task_dump_all(struct engine *e, int step) {
/* Add some information to help with the plots and conversion of ticks to
* seconds. */
fprintf(file_thread, " %03d 0 0 0 0 %lld %lld %lld %lld %lld 0 0 %lld\n",
engine_rank, e->tic_step, e->toc_step, e->updates, e->g_updates,
engine_rank, (long long int)e->tic_step,
(long long int)e->toc_step, e->updates, e->g_updates,
e->s_updates, cpufreq);
int count = 0;
for (int l = 0; l < e->sched.nr_tasks; l++) {
......@@ -764,7 +765,8 @@ void task_dump_all(struct engine *e, int step) {
file_thread, " %03i %i %i %i %i %lli %lli %i %i %i %i %lli %i\n",
engine_rank, e->sched.tasks[l].rid, e->sched.tasks[l].type,
e->sched.tasks[l].subtype, (e->sched.tasks[l].cj == NULL),
e->sched.tasks[l].tic, e->sched.tasks[l].toc,
(long long int)e->sched.tasks[l].tic,
(long long int)e->sched.tasks[l].toc,
(e->sched.tasks[l].ci != NULL) ? e->sched.tasks[l].ci->hydro.count
: 0,
(e->sched.tasks[l].cj != NULL) ? e->sched.tasks[l].cj->hydro.count
......@@ -803,7 +805,8 @@ void task_dump_all(struct engine *e, int step) {
file_thread, " %i %i %i %i %lli %lli %i %i %i %i %i\n",
e->sched.tasks[l].rid, e->sched.tasks[l].type,
e->sched.tasks[l].subtype, (e->sched.tasks[l].cj == NULL),
e->sched.tasks[l].tic, e->sched.tasks[l].toc,
(unsigned long long)e->sched.tasks[l].tic,
(unsigned long long)e->sched.tasks[l].toc,
(e->sched.tasks[l].ci == NULL) ? 0
: e->sched.tasks[l].ci->hydro.count,
(e->sched.tasks[l].cj == NULL) ? 0
......
......@@ -27,9 +27,10 @@
#include "intrinsics.h"
#include <math.h>
#include <stdint.h>
typedef long long integertime_t;
typedef char timebin_t;
typedef int8_t timebin_t;
/*! The number of time bins */
#define num_time_bins 56
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment