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 --- dis/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dis/Makefile') diff --git a/dis/Makefile b/dis/Makefile index df93116..88fa7c2 100755 --- a/dis/Makefile +++ b/dis/Makefile @@ -4,7 +4,7 @@ # that a good Makefile should follow. Sorry - at least I have one.) LIBLITMUS ?= /media/speedy/litmus/liblitmus CC ?= gcc -CFLAGS += -pthread -O2 -I.. +override CFLAGS += -pthread -O2 -I.. LDFLAGS = -lrt -lm COMMON = ../extra.h -- 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.) --- dis/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'dis/Makefile') diff --git a/dis/Makefile b/dis/Makefile index 88fa7c2..d18761b 100755 --- a/dis/Makefile +++ b/dis/Makefile @@ -2,7 +2,7 @@ # Build the DIS benchmarks with all-pairs or unpaired instrumentation # (I know that this Makefile is mildly evil and breaks so many rules # that a good Makefile should follow. Sorry - at least I have one.) -LIBLITMUS ?= /media/speedy/litmus/liblitmus +LIBLITMUS ?= /playpen/mc2/liblitmus CC ?= gcc override CFLAGS += -pthread -O2 -I.. LDFLAGS = -lrt -lm @@ -15,8 +15,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: baseline -- cgit v1.2.2 From e0217a963c6c0e0667d41d075038685956bcfacf Mon Sep 17 00:00:00 2001 From: leochanj Date: Fri, 23 Oct 2020 02:11:48 -0400 Subject: wip --- dis/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dis/Makefile') diff --git a/dis/Makefile b/dis/Makefile index d18761b..77e0b8a 100755 --- a/dis/Makefile +++ b/dis/Makefile @@ -2,7 +2,7 @@ # Build the DIS benchmarks with all-pairs or unpaired instrumentation # (I know that this Makefile is mildly evil and breaks so many rules # that a good Makefile should follow. Sorry - at least I have one.) -LIBLITMUS ?= /playpen/mc2/liblitmus +LIBLITMUS ?= /home/litmus/liblitmus CC ?= gcc override CFLAGS += -pthread -O2 -I.. LDFLAGS = -lrt -lm -- cgit v1.2.2