diff options
| author | Christopher Kenna <cjk@cs.unc.edu> | 2012-12-05 17:00:38 -0500 |
|---|---|---|
| committer | Christopher Kenna <cjk@cs.unc.edu> | 2012-12-05 17:00:38 -0500 |
| commit | fc8bf9b972edbb049af7f3980f8026b83d27b4fd (patch) | |
| tree | caa90447129344f14591fbced50f26d2afc66767 | |
| parent | e8bd4862ad1bbe5b0f6c645ce31d2a6ba41292a7 (diff) | |
Update cycles type and add arm programs.
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | arch/arm/include/asm/cycles.h | 2 |
2 files changed, 7 insertions, 2 deletions
| @@ -74,7 +74,7 @@ all = lib ${rt-apps} | |||
| 74 | 74 | ||
| 75 | rt-apps = cycles base_task rt_launch rtspin release_ts measure_syscall \ | 75 | rt-apps = cycles base_task rt_launch rtspin release_ts measure_syscall \ |
| 76 | base_mt_task runtests colortest testcounters \ | 76 | base_mt_task runtests colortest testcounters \ |
| 77 | colorspin singlepage perfmoncpu bespin | 77 | colorspin singlepage perfmoncpu bespin armsinglepage wss |
| 78 | 78 | ||
| 79 | .PHONY: all lib clean dump-config TAGS tags cscope help | 79 | .PHONY: all lib clean dump-config TAGS tags cscope help |
| 80 | 80 | ||
| @@ -253,6 +253,11 @@ lib-testcounters = | |||
| 253 | 253 | ||
| 254 | obj-perfmoncpu = perfmoncpu.o perfcounters.o | 254 | obj-perfmoncpu = perfmoncpu.o perfcounters.o |
| 255 | 255 | ||
| 256 | obj-armsinglepage = armsinglepage.o color.o common.o | ||
| 257 | |||
| 258 | obj-wss = wss.o color.o common.o | ||
| 259 | lib-wss = -lrt | ||
| 260 | |||
| 256 | # ############################################################################## | 261 | # ############################################################################## |
| 257 | # Build everything that depends on liblitmus. | 262 | # Build everything that depends on liblitmus. |
| 258 | 263 | ||
diff --git a/arch/arm/include/asm/cycles.h b/arch/arm/include/asm/cycles.h index 73632f8..f1a776d 100644 --- a/arch/arm/include/asm/cycles.h +++ b/arch/arm/include/asm/cycles.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #ifndef ASM_CYCLES_H | 1 | #ifndef ASM_CYCLES_H |
| 2 | #define ASM_CYCLES_H | 2 | #define ASM_CYCLES_H |
| 3 | 3 | ||
| 4 | typedef unsigned long cycles_t; | 4 | typedef unsigned long long cycles_t; |
| 5 | 5 | ||
| 6 | #define CYCLES_FMT "lu" | 6 | #define CYCLES_FMT "lu" |
| 7 | 7 | ||