diff options
| -rw-r--r-- | SD-VBS/common/makefiles/Makefile.common | 2 | ||||
| -rw-r--r-- | baseline/Makefile | 2 | ||||
| -rwxr-xr-x | dis/Makefile | 2 | ||||
| -rw-r--r-- | extra.h | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/SD-VBS/common/makefiles/Makefile.common b/SD-VBS/common/makefiles/Makefile.common index ab3a6b4..15f4f56 100644 --- a/SD-VBS/common/makefiles/Makefile.common +++ b/SD-VBS/common/makefiles/Makefile.common | |||
| @@ -29,7 +29,7 @@ PRELOAD_TIMES_DIR := $(TOP_DIR)/preload-times/$(BMARK) | |||
| 29 | MTIMING_DIR := $(TOP_DIR)/cycles/$(BMARK) | 29 | MTIMING_DIR := $(TOP_DIR)/cycles/$(BMARK) |
| 30 | BMARK_DIR := $(TOP_DIR)/benchmarks/$(BMARK) | 30 | BMARK_DIR := $(TOP_DIR)/benchmarks/$(BMARK) |
| 31 | TOOL_DIR := $(TOP_DIR)/tools | 31 | TOOL_DIR := $(TOP_DIR)/tools |
| 32 | LIBLITMUS ?= /playpen/mc2/liblitmus | 32 | LIBLITMUS ?= /home/ae/liblitmus |
| 33 | ifneq ($(shell grep "define LITMUS 1" ${TOP_DIR}/../extra.h),) | 33 | ifneq ($(shell grep "define LITMUS 1" ${TOP_DIR}/../extra.h),) |
| 34 | override CFLAGS += -I${LIBLITMUS}/include -I${LIBLITMUS}/arch/arm/include | 34 | override CFLAGS += -I${LIBLITMUS}/include -I${LIBLITMUS}/arch/arm/include |
| 35 | override LDFLAGS += -L${LIBLITMUS} -llitmus | 35 | override LDFLAGS += -L${LIBLITMUS} -llitmus |
diff --git a/baseline/Makefile b/baseline/Makefile index dad45a0..37b59ed 100644 --- a/baseline/Makefile +++ b/baseline/Makefile | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | LIBLITMUS ?= /playpen/mc2/liblitmus | 1 | LIBLITMUS ?= /home/ae/liblitmus |
| 2 | CC ?= gcc | 2 | CC ?= gcc |
| 3 | override CFLAGS = -pthread -O2 -I.. | 3 | override CFLAGS = -pthread -O2 -I.. |
| 4 | LDFLAGS = -lrt | 4 | LDFLAGS = -lrt |
diff --git a/dis/Makefile b/dis/Makefile index d18761b..68f19e7 100755 --- a/dis/Makefile +++ b/dis/Makefile | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Build the DIS benchmarks with all-pairs or unpaired instrumentation | 2 | # Build the DIS benchmarks with all-pairs or unpaired instrumentation |
| 3 | # (I know that this Makefile is mildly evil and breaks so many rules | 3 | # (I know that this Makefile is mildly evil and breaks so many rules |
| 4 | # that a good Makefile should follow. Sorry - at least I have one.) | 4 | # that a good Makefile should follow. Sorry - at least I have one.) |
| 5 | LIBLITMUS ?= /playpen/mc2/liblitmus | 5 | LIBLITMUS ?= /home/ae/liblitmus |
| 6 | CC ?= gcc | 6 | CC ?= gcc |
| 7 | override CFLAGS += -pthread -O2 -I.. | 7 | override CFLAGS += -pthread -O2 -I.. |
| 8 | LDFLAGS = -lrt -lm | 8 | LDFLAGS = -lrt -lm |
| @@ -30,7 +30,7 @@ extern int sched_getcpu(); | |||
| 30 | #endif | 30 | #endif |
| 31 | 31 | ||
| 32 | // This is a proxy for "case study mode" now | 32 | // This is a proxy for "case study mode" now |
| 33 | #define LITMUS 1 | 33 | #define LITMUS 0 |
| 34 | #define MMDC_PROF 0 | 34 | #define MMDC_PROF 0 |
| 35 | 35 | ||
| 36 | #if LITMUS | 36 | #if LITMUS |
| @@ -88,7 +88,7 @@ static void _rt_load_params_itrl(int argc, char **argv) { | |||
| 88 | if (argc != (9 + LITMUS*2) && argc != (10 + LITMUS*2)) { | 88 | if (argc != (9 + LITMUS*2) && argc != (10 + LITMUS*2)) { |
| 89 | fprintf(stderr, "Usage: %s <name> <loops> <my core> <other core> <other name> <runID> <save results?> <pairID>\n", argv[0]); | 89 | fprintf(stderr, "Usage: %s <name> <loops> <my core> <other core> <other name> <runID> <save results?> <pairID>\n", argv[0]); |
| 90 | #else | 90 | #else |
| 91 | if (argc != (6 + LITMUS*2)) { | 91 | if (argc != (7 + LITMUS*2)) { |
| 92 | fprintf(stderr, "Usage: %s <name> <loops> <my core> <runID> <save results?>\n", argv[0]); | 92 | fprintf(stderr, "Usage: %s <name> <loops> <my core> <runID> <save results?>\n", argv[0]); |
| 93 | #endif /* PAIRED */ | 93 | #endif /* PAIRED */ |
| 94 | fprintf(stderr, " <name> string for logging. Name of this task.\n"); | 94 | fprintf(stderr, " <name> string for logging. Name of this task.\n"); |
