From 8000ef44f4a82d845d5139cebfcac047ee291433 Mon Sep 17 00:00:00 2001 From: "Bjoern B. Brandenburg" Date: Tue, 22 Nov 2011 13:49:40 +0100 Subject: Change default path to remove *2010 tag. This is not the 2010 version anymore, so let's use a version-agnostic path. --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index db94ffb..2109a45 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ host-arch := $(shell uname -m | \ ARCH ?= ${host-arch} # LITMUS_KERNEL -- where to find the litmus kernel? -LITMUS_KERNEL ?= ../litmus2010 +LITMUS_KERNEL ?= ../litmus-rt # ############################################################################## @@ -276,4 +276,3 @@ $(error Cannot build without access to the architecture-specific files) endif endif - -- cgit v1.2.2 From b52581ce89bc80938f497bfb61969466e0f2610e Mon Sep 17 00:00:00 2001 From: Christopher Kenna Date: Sun, 8 Apr 2012 18:25:23 -0400 Subject: test color program --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2109a45..582e9a7 100644 --- a/Makefile +++ b/Makefile @@ -71,7 +71,7 @@ AR := ${CROSS_COMPILE}${AR} all = lib ${rt-apps} rt-apps = cycles base_task rt_launch rtspin release_ts measure_syscall \ - base_mt_task runtests + base_mt_task runtests colortest .PHONY: all lib clean dump-config TAGS tags cscope help @@ -216,12 +216,15 @@ obj-release_ts = release_ts.o obj-measure_syscall = null_call.o lib-measure_syscall = -lm +obj-colortest = colortest.o color.o +lib-colortest = -static + # ############################################################################## # Build everything that depends on liblitmus. .SECONDEXPANSION: ${rt-apps}: $${obj-$$@} liblitmus.a - $(CC) -o $@ $(LDFLAGS) ${ldf-$@} $(filter-out liblitmus.a,$+) $(LOADLIBS) $(LDLIBS) ${lib-$@} ${liblitmus-flags} + $(CC) -o $@ $(LDFLAGS) ${ldf-$@} $(filter-out liblitmus.a,$+) $(LOADLIBS) $(LDLIBS) ${liblitmus-flags} ${lib-$@} # ############################################################################## # Dependency resolution. -- cgit v1.2.2 From 041df061efacf3a8e83edb47ac4db37e67e1a258 Mon Sep 17 00:00:00 2001 From: Christopher Kenna Date: Mon, 9 Apr 2012 23:20:14 -0400 Subject: partial benchmark program (squash this) --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 582e9a7..37f7d57 100644 --- a/Makefile +++ b/Makefile @@ -71,7 +71,7 @@ AR := ${CROSS_COMPILE}${AR} all = lib ${rt-apps} rt-apps = cycles base_task rt_launch rtspin release_ts measure_syscall \ - base_mt_task runtests colortest + base_mt_task runtests colortest colorbench .PHONY: all lib clean dump-config TAGS tags cscope help @@ -219,6 +219,9 @@ lib-measure_syscall = -lm obj-colortest = colortest.o color.o lib-colortest = -static +obj-colorbench = colorbench.o color.o +lib-colorbench = -lpthread -static + # ############################################################################## # Build everything that depends on liblitmus. -- cgit v1.2.2 From e0732d7df71cd1db56b1ac7b4ad6132e6d1e00a8 Mon Sep 17 00:00:00 2001 From: Christopher Kenna Date: Wed, 11 Apr 2012 13:32:11 -0400 Subject: benchmark to run on pound --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 37f7d57..7a95b91 100644 --- a/Makefile +++ b/Makefile @@ -220,7 +220,7 @@ obj-colortest = colortest.o color.o lib-colortest = -static obj-colorbench = colorbench.o color.o -lib-colorbench = -lpthread -static +lib-colorbench = -lpthread -lrt # ############################################################################## # Build everything that depends on liblitmus. -- cgit v1.2.2 From 339c2d488296e4d0c38bbd781307f95117e7ef66 Mon Sep 17 00:00:00 2001 From: Christopher Kenna Date: Tue, 24 Apr 2012 15:48:21 -0400 Subject: Color tools checkpoint. --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7a95b91..1a48d8f 100644 --- a/Makefile +++ b/Makefile @@ -71,7 +71,7 @@ AR := ${CROSS_COMPILE}${AR} all = lib ${rt-apps} rt-apps = cycles base_task rt_launch rtspin release_ts measure_syscall \ - base_mt_task runtests colortest colorbench + base_mt_task runtests colortest colorbench testcounters .PHONY: all lib clean dump-config TAGS tags cscope help @@ -222,6 +222,9 @@ lib-colortest = -static obj-colorbench = colorbench.o color.o lib-colorbench = -lpthread -lrt +obj-testcounters = testcounters.o +lib-testcounters = + # ############################################################################## # Build everything that depends on liblitmus. @@ -265,7 +268,7 @@ $(error Cannot build without access to the LITMUS^RT kernel source) endif kernel-unistd-hdrs := $(foreach file,${unistd-headers},${LITMUS_KERNEL}/$(file)) -hdr-ok := $(shell egrep '\#include ["<]litmus/unistd' ${kernel-unistd-hdrs} ) +hdr-ok := $(shell egrep '\#include .*litmus/unistd' ${kernel-unistd-hdrs} ) ifeq ($(strip $(hdr-ok)),) $(info (!!) Could not find LITMUS^RT system calls in ${kernel-unistd-hdrs}.) $(error Your kernel headers do not seem to be LITMUS^RT headers) -- cgit v1.2.2 From 27a8f2048c6c9aebb2230d2903aa71e456c68a84 Mon Sep 17 00:00:00 2001 From: Christopher Kenna Date: Wed, 25 Apr 2012 16:13:26 -0400 Subject: Add performance counter benchmark. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1a48d8f..f6b865c 100644 --- a/Makefile +++ b/Makefile @@ -219,7 +219,7 @@ lib-measure_syscall = -lm obj-colortest = colortest.o color.o lib-colortest = -static -obj-colorbench = colorbench.o color.o +obj-colorbench = colorbench.o color.o perfcounters.o common.o lib-colorbench = -lpthread -lrt obj-testcounters = testcounters.o -- cgit v1.2.2