From 163c440444c74a4e0bbe0a8db3d1ca725413994b Mon Sep 17 00:00:00 2001
From: Joshua Bakita <jbakita@cs.unc.edu>
Date: Thu, 22 Oct 2020 03:17:31 -0400
Subject: Make SD-VBS compatible with run_bench.sh and cleanup

SD-VBS:
- Run silently
- Fix some whitespace errors
- Don't duplicate extra.h
- Auto-detect if building with LITMUS-RT
- Disable result checking
- Add helper symlinks
Misc:
- Remove unused code from libextra
- Set some missing rt_param fields in libextra
- Disable CSV info dump from computeSMTslowdown.sh
- Widen scope of .gitignore on .txt files
- Include list of 2MB DIS pair benchmarks and inputs
---
 SD-VBS/common/makefiles/Makefile.common | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'SD-VBS/common/makefiles')

diff --git a/SD-VBS/common/makefiles/Makefile.common b/SD-VBS/common/makefiles/Makefile.common
index 144adb2..9c28cfc 100644
--- a/SD-VBS/common/makefiles/Makefile.common
+++ b/SD-VBS/common/makefiles/Makefile.common
@@ -18,7 +18,7 @@ endif
 endif
 
 CC=gcc
-override CFLAGS += -DGCC -D$(INPUT) -pthread -DCHECK 
+override CFLAGS += -DGCC -D$(INPUT) -pthread -I../../../../..
 COMMON_DIR := $(TOP_DIR)/common/c
 M_COMMON := $(TOP_DIR)/common/matlab
 M_TOOLBOX=$(TOP_DIR)/common/toolbox
@@ -28,7 +28,11 @@ 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
+LIBLITMUS ?= /home/litmus/liblitmus
+ifneq ($(shell grep "define LITMUS 1" ../../../../../extra.h),)
+	CFLAGS += -I${LIBLITMUS}/include
+	LDFLAGS += -L${LIBLITMUS} -llitmus
+endif
 #The options set below and specific to each benchmark. Disparity takes 2 input images, whereas Tracking can take any >1 input images =.
 
 # Variables exported from the benchmark specific Makefiles:
@@ -55,8 +59,8 @@ COMMON_SRC := $(wildcard $(COMMON_DIR)/*.c)
 # RULES
 
 EXE =
-INCLUDES = -I$(COMMON_DIR) -I$(C_DIR) -I${LIBLITMUS}/include -I${LIBLITMUS}/arch/arm/include
-COMPILE_C = $(CC) $(CFLAGS) $(INCLUDES) -O2
+INCLUDES = -I$(COMMON_DIR) -I$(C_DIR)
+COMPILE_C = $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES) -O2
 #COMPILE_C = $(CC) $(CFLAGS) -DGENERATE_OUTPUT -lm -O2 $(INCLUDES)
 COMPILE_G = $(CC) $(CFLAGS) -g -lm $(INCLUDES)
 COMPILE_PG = $(COMPILE_G) -pg
@@ -107,7 +111,7 @@ compile-preload:
 compile: $(C_SRC)
 	@echo 
 	@echo -e "Benchmark\t\t- $(BMARK)"
-	@$(COMPILE_C) $(COMMON_SRC) $(C_SRC) -lrt -L$(LIBLITMUS) -llitmus -lm  -w -o $(BMARK)$(EXE)
+	@$(COMPILE_C) $(COMMON_SRC) $(C_SRC) -lrt -lm  -w -o $(BMARK)$(EXE)
 
 compile-prof: $(C_SRC)
 	@echo 
-- 
cgit v1.2.2