From 3498e3270194093098f9b8275901517fa2f9fa32 Mon Sep 17 00:00:00 2001 From: Joshua Bakita Date: Fri, 23 Oct 2020 16:42:53 -0400 Subject: Squashed commit sd-vbs from Leo: - Fixes SD-VBS build with LITMUS 1 defined - Fixes memory leak in stitch and tracking benchmarks - Adds initial case-study script and configurations --- SD-VBS/common/makefiles/Makefile.common | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'SD-VBS/common') diff --git a/SD-VBS/common/makefiles/Makefile.common b/SD-VBS/common/makefiles/Makefile.common index 964ece6..ab3a6b4 100644 --- a/SD-VBS/common/makefiles/Makefile.common +++ b/SD-VBS/common/makefiles/Makefile.common @@ -18,7 +18,8 @@ endif endif CC=gcc -override CFLAGS += -DGCC -D$(INPUT) -pthread -I../../../../.. +LIBEXTRA ?= $(TOP_DIR)/../ +override CFLAGS += -DGCC -D$(INPUT) -pthread -I${LIBEXTRA} COMMON_DIR := $(TOP_DIR)/common/c M_COMMON := $(TOP_DIR)/common/matlab M_TOOLBOX=$(TOP_DIR)/common/toolbox @@ -28,8 +29,8 @@ PRELOAD_TIMES_DIR := $(TOP_DIR)/preload-times/$(BMARK) MTIMING_DIR := $(TOP_DIR)/cycles/$(BMARK) BMARK_DIR := $(TOP_DIR)/benchmarks/$(BMARK) TOOL_DIR := $(TOP_DIR)/tools -LIBLITMUS ?= /home/litmus/liblitmus -ifneq ($(shell grep "define LITMUS 1" ../../../../../extra.h),) +LIBLITMUS ?= /playpen/mc2/liblitmus +ifneq ($(shell grep "define LITMUS 1" ${TOP_DIR}/../extra.h),) override CFLAGS += -I${LIBLITMUS}/include -I${LIBLITMUS}/arch/arm/include override LDFLAGS += -L${LIBLITMUS} -llitmus endif @@ -60,7 +61,7 @@ COMMON_SRC := $(wildcard $(COMMON_DIR)/*.c) EXE = INCLUDES = -I$(COMMON_DIR) -I$(C_DIR) -COMPILE_C = $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES) -O2 +COMPILE_C = $(CC) $(CFLAGS) $(INCLUDES) -O2 #COMPILE_C = $(CC) $(CFLAGS) -DGENERATE_OUTPUT -lm -O2 $(INCLUDES) COMPILE_G = $(CC) $(CFLAGS) -g -lm $(INCLUDES) COMPILE_PG = $(COMPILE_G) -pg @@ -111,7 +112,7 @@ compile-preload: compile: $(C_SRC) @echo @echo -e "Benchmark\t\t- $(BMARK)" - @$(COMPILE_C) $(COMMON_SRC) $(C_SRC) -lrt -lm -w -o $(BMARK)$(EXE) + @$(COMPILE_C) $(COMMON_SRC) $(C_SRC) -lrt -lm $(LDFLAGS) -w -o $(BMARK)$(EXE) compile-prof: $(C_SRC) @echo -- cgit v1.2.2