ARM support

6 files changed, 15 insertions, 15 deletions

diff --git a/Makefile b/Makefile
index 68c0970..323c2e7 100644
--- a/Makefile
+++ b/Makefile
@@ -24,16 +24,17 @@ LIBPGM = .
 flags-std      = -std=gnu++11
 #flags-optim    = -g -fPIC -march=native
 flags-optim    = -O2 -fPIC -march=native
-flags-debug    = -Wall -Werror -Wno-unused-function -Wno-sign-compare
+flags-debug    = -Wall -Wno-unused-function -Wno-sign-compare
 flags-api      = -D_XOPEN_SOURCE=600 -D_GNU_SOURCE -pthread
 
 # Comment out 'flags-litmus' to disable Litmus support
-#flags-litmus   = -D_USE_LITMUS
+flags-litmus   = -D_USE_LITMUS -DCONFIG_PGMRT_SUPPORT
 
 # architecture-specific flags
 flags-i386     = -m32
 flags-x86_64   = -m64
 flags-sparc64  = -mcpu=v9 -m64
+flags-arm      = -mcpu=cortex-a9 -mtune=native
 # default: none
 
 # name of the directory that has the arch headers in the Linux source
diff --git a/include/atomic.h b/include/atomic.h
index ec5c09c..8f5d9d8 100644
--- a/include/atomic.h
+++ b/include/atomic.h
@@ -5,7 +5,7 @@
 
 static inline void __sync_pause()
 {
-#if (ARCH == x86_64) || (ARCH == i386) || (ARCH == i686)
+#if defined(__i386__) || defined(__x86_64__)
         asm volatile("pause": : :"memory");
 #else
         __sync_synchronize();
diff --git a/src/pgm.cpp b/src/pgm.cpp
index 5e30d32..d332fea 100644
--- a/src/pgm.cpp
+++ b/src/pgm.cpp
@@ -1298,7 +1298,7 @@ void* __pgm_swap_edge_buf(edge_t edge, void* new_uptr, bool swap_producer)
         old_hdr = *old_hdr_ptr;
         if(hdr->usersize != old_hdr->usersize)
         {
-                E("Buffer %p is the wrong size. (is %lu, expected %lu)\n",
+                E("Buffer %p is the wrong size. (is %zu, expected %zu)\n",
                   new_uptr, hdr->usersize, old_hdr->usersize);
                 goto out;
         }
@@ -1356,7 +1356,7 @@ int pgm_swap_edge_bufs(void* a, void* b)
 
         if(hdra->usersize != hdrb->usersize)
         {
-                E("Buffers are not the same size: %p:%lu vs %p:%lu\n",
+                E("Buffers are not the same size: %p:%zu vs %p:%zu\n",
                   a, hdra->usersize, b, hdrb->usersize);
                 goto out;
         }
@@ -3977,15 +3977,15 @@ int pgm_print_graph(graph_t graph, FILE* outs)
 
                 if(!e->is_backedge)
                 {
-                        snprintf(thresh, sizeof(thresh), "(%lu)", e->attr.nr_threshold);
+                        snprintf(thresh, sizeof(thresh), "(%zu)", e->attr.nr_threshold);
                 }
                 else
                 {
-                        snprintf(thresh, sizeof(thresh), "(%lu, %lu)", e->attr.nr_threshold, e->nr_skips);
+                        snprintf(thresh, sizeof(thresh), "(%zu, %zu)", e->attr.nr_threshold, e->nr_skips);
                 }
 
                 fprintf(outs,
-                        "\t%d -> %d [style=%s, color=%s, label=\"%s%s_%s\", headlabel=\"%lu %s\", taillabel=\"%lu\"]\n",
+                        "\t%d -> %d [style=%s, color=%s, label=\"%s%s_%s\", headlabel=\"%zu %s\", taillabel=\"%zu\"]\n",
                         e->producer,
                         e->consumer,
                         (!e->is_backedge) ? "solid" : "dashed",
diff --git a/tools/pgmrt.cpp b/tools/pgmrt.cpp
index 865d0ab..9dd9cf1 100644
--- a/tools/pgmrt.cpp
+++ b/tools/pgmrt.cpp
@@ -190,7 +190,7 @@ void sleep_ns(uint64_t ns)
 {
         int64_t seconds = ns / s2ns(1);
         ns -= s2ns(seconds);
-        struct timespec ts = {.tv_sec = seconds, .tv_nsec = (int64_t)ns};
+        struct timespec ts = {.tv_sec = (time_t)seconds, .tv_nsec = (time_t)ns};
         nanosleep(&ts, NULL);
 }
 
@@ -417,7 +417,6 @@ void work_thread(rt_config cfg)
 //      param.phase = cfg.phase_ns;
         param.period = cfg.period_ns;
         param.exec_cost = cfg.execution_ns;
-        param.split = cfg.split_factor;
         if(cfg.cluster >= 0)
                 param.cpu = domain_to_first_cpu(cfg.cluster);
         param.budget_policy = (cfg.budget) ? PRECISE_ENFORCEMENT : NO_ENFORCEMENT;
@@ -670,8 +669,8 @@ void validate_rate(node_t n, const std::map<std::string, rate>& rates)
                 bool __valid = (a == b);
 
                 if(!__valid) {
-                        printf("%s (%lu = %lu * (%lu / %lu)) "
-                                  "and %s (%lu = %lu * (%lu / %lu)) incompatible\n",
+                        printf("%s (%llu = %llu * (%llu / %llu)) "
+                                  "and %s (%llu = %llu * (%llu / %llu)) incompatible\n",
                                   pgm_get_name(preds_w_rates[i-1].first),
                                   p1, prev.x, scale, prev.y,
                                   pgm_get_name(preds_w_rates[i].first),
diff --git a/tools/pingpong.cpp b/tools/pingpong.cpp
index da45ef6..d6f9cbc 100644
--- a/tools/pingpong.cpp
+++ b/tools/pingpong.cpp
@@ -110,7 +110,7 @@ void fifo_worker(Args args)
 
         string name = (args.is_master) ? "A" : "B";
 
-        printf("(fifo) %s: time: %lu (ns)   average rtt: %lu (ns)   token value: %d\n", name.c_str(), elapsed, avg_round, (int)token);
+        printf("(fifo) %s: time: %llu (ns)   average rtt: %llu (ns)   token value: %d\n", name.c_str(), elapsed, avg_round, (int)token);
 }
 
 void mq_worker(Args args)
@@ -208,7 +208,7 @@ void mq_worker(Args args)
 
         string name = (args.is_master) ? "A" : "B";
 
-        printf("(mq) %s: time: %lu (ns)   average rtt: %lu (ns)   token value: %d\n", name.c_str(), elapsed, avg_round, (int)token);
+        printf("(mq) %s: time: %llu (ns)   average rtt: %llu (ns)   token value: %d\n", name.c_str(), elapsed, avg_round, (int)token);
 }
 
 int main(int argc, char** argv)
diff --git a/tools/ringtest.cpp b/tools/ringtest.cpp
index 3f2bbb5..faf8b73 100644
--- a/tools/ringtest.cpp
+++ b/tools/ringtest.cpp
@@ -95,7 +95,7 @@ void* thread(void* _graph_t)
                         }
                         else
                         {
-                                fprintf(stdout, "%s%d terminates: sum: %lu\n", tabbuf, node.node, sum);
+                                fprintf(stdout, "%s%d terminates: sum: %llu\n", tabbuf, node.node, sum);
 
                                 if(is_src)
                                         CheckError(pgm_terminate(node));