summaryrefslogtreecommitdiff
path: root/VA/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'VA/Makefile')
-rw-r--r--VA/Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/VA/Makefile b/VA/Makefile
index a79969c..5d2df1c 100644
--- a/VA/Makefile
+++ b/VA/Makefile
@@ -8,7 +8,6 @@ WITH_LOAD_OVERHEAD ?= 0
WITH_FREE_OVERHEAD ?= 0
WITH_DPUINFO ?= 0
-COMMON_INCLUDES := support
HOST_SOURCES := $(wildcard host/*.c)
DPU_SOURCES := $(wildcard dpu/*.c)
@@ -18,12 +17,12 @@ dfatool_timing ?= 1
HOST_CC := ${CC}
-COMMON_FLAGS := -Wall -Wextra -g -I${COMMON_INCLUDES}
+COMMON_FLAGS := -Wall -Wextra -g -Iinclude
HOST_FLAGS := ${COMMON_FLAGS} -O3 `dpu-pkg-config --cflags --libs dpu` -DNR_TASKLETS=${NR_TASKLETS} -DNR_DPUS=${NR_DPUS} -DBL=${BL} -D${TYPE} -DENERGY=${ENERGY} -DWITH_ALLOC_OVERHEAD=${WITH_ALLOC_OVERHEAD} -DWITH_LOAD_OVERHEAD=${WITH_LOAD_OVERHEAD} -DWITH_FREE_OVERHEAD=${WITH_FREE_OVERHEAD} -DWITH_DPUINFO=${WITH_DPUINFO} -DDFATOOL_TIMING=${dfatool_timing} -DASPECTC=${aspectc}
DPU_FLAGS := ${COMMON_FLAGS} -O2 -DNR_TASKLETS=${NR_TASKLETS} -DBL=${BL} -D${TYPE}
ifeq (${aspectc_timing}, 1)
- ASPECTC_HOST_FLAGS += -a support/dfatool_host.ah
+ ASPECTC_HOST_FLAGS += -ainclude/dfatool_host_dpu.ah -ainclude/dfatool_host.ah
endif
ASPECTC_HOST_FLAGS ?= -a0
@@ -45,8 +44,11 @@ all: bin/host_code bin/dpu_code
bin:
${QUIET}mkdir -p bin
+# cp/rm are needed to work around AspectC++ not liking symlinks
bin/host_code: ${HOST_SOURCES} ${COMMON_INCLUDES} bin
+ ${QUIET}cp ../include/dfatool_host_dpu.ah include
${QUIET}${HOST_CC} -o $@ ${HOST_SOURCES} ${HOST_FLAGS}
+ ${QUIET}rm -f include/dfatool_host_dpu.ah
bin/dpu_code: ${DPU_SOURCES} ${COMMON_INCLUDES} bin
${QUIET}dpu-upmem-dpurte-clang ${DPU_FLAGS} -o $@ ${DPU_SOURCES}