From 4f634d4cd3254dfc68b65e63be32708105032101 Mon Sep 17 00:00:00 2001 From: Joshua Bakita Date: Thu, 22 Oct 2020 00:24:34 -0400 Subject: Fix Makefiles so that a custom CFLAGS doesn't break the build --- all_pairs/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'all_pairs/Makefile') diff --git a/all_pairs/Makefile b/all_pairs/Makefile index 0042372..f0b284e 100644 --- a/all_pairs/Makefile +++ b/all_pairs/Makefile @@ -1,7 +1,7 @@ LIBLITMUS ?= /media/speedy/litmus/liblitmus CC ?= gcc -CFLAGS = -pthread -O2 -I.. -DPAIRED -LDFLAGS = -lrt +override CFLAGS += -pthread -O2 -I.. -DPAIRED +LDFLAGS += -lrt COMMON = ../extra.h # Handle cases where we're also profiling with the MMDC on the i.MX6Q -- cgit v1.2.2 From a7c3210215bd1181ae93b23c313941dfb44519fb Mon Sep 17 00:00:00 2001 From: Joshua Bakita Date: Thu, 22 Oct 2020 22:46:39 -0400 Subject: Transform LITMUS-RT support in libextra to imply case-study mode Adds and parameters to benchmarks and disables cache flushing when compiled with LITMUS. Also fixes build with LITMUS enabled on yamaha.cs.unc.edu. Also allows output to be disabled, automatically infers _rt_lock_id, and allows for a specific pair ID for paired tasks. (The pair ID is added to all the semaphore and shared memory names, allowing multiple pairs to run in the system at a time.) --- all_pairs/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'all_pairs/Makefile') diff --git a/all_pairs/Makefile b/all_pairs/Makefile index f0b284e..592db70 100644 --- a/all_pairs/Makefile +++ b/all_pairs/Makefile @@ -1,4 +1,4 @@ -LIBLITMUS ?= /media/speedy/litmus/liblitmus +LIBLITMUS ?= /playpen/mc2/liblitmus CC ?= gcc override CFLAGS += -pthread -O2 -I.. -DPAIRED LDFLAGS += -lrt @@ -11,8 +11,8 @@ endif # Include all the LITMUS^RT headers if we're using it ifneq ($(shell grep "define LITMUS 1" ../extra.h),) - CFLAGS += -I${LIBLITMUS}/include -I${LIBLITMUS}/arch/arm/include - LDFLAGS += -L${LIBLITMUS} -llitmus + override CFLAGS += -I${LIBLITMUS}/include -I${LIBLITMUS}/arch/arm/include + override LDFLAGS += -L${LIBLITMUS} -llitmus endif all: bin/cjpeg_wrbmp bin/huff_enc bin/gsm_enc bin/dijkstra bin/h264_dec bin/susan bin/adpcm_enc bin/rijndael_dec bin/huff_dec bin/rijndael_enc bin/gsm_dec bin/anagram bin/epic bin/ammunition bin/g723_enc bin/ndes bin/petrinet bin/statemate bin/cjpeg_transupp bin/mpeg2 bin/fmref bin/audiobeam bin/adpcm_dec -- cgit v1.2.2