All benchmarks point to the new visc.h

hpvm/test/hpvm-cava/Makefile

@@ -25,12 +25,11 @@ BUILD_DIR = build/$(TARGET)_$(VERSION)
 CURRENT_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 
 
-INCLUDES +=  -I$(SRC_DIR) \
-            -I$(CAM_PIPE_SRC_DIR) \
-
+INCLUDES += -I$(SRC_DIR) -I$(CAM_PIPE_SRC_DIR)
+INCLUDES += -I$(LLVM_SRC_ROOT)/include -I../include -I$(VISC_BUILD_DIR)/include
 ifneq ($(CONFUSE_ROOT),)
-INCLUDES += -I$(CONFUSE_ROOT)/include
-LFLAGS += -L$(CONFUSE_ROOT)/lib
+  INCLUDES += -I$(CONFUSE_ROOT)/include
+  LFLAGS += -L$(CONFUSE_ROOT)/lib
 endif
 
 EXE = cava-visc-$(VERSION)-$(TARGET)

hpvm/test/parboil/common/platform/visc.default.mk

@@ -16,10 +16,10 @@ VISC_BUILD_DIR = $(LLVM_SRC_ROOT)/../build
 # gcc (default)
 CC = $(VISC_BUILD_DIR)/bin/clang
 OCLBE = $(VISC_BUILD_DIR)/bin/llvm-cbe
-PLATFORM_CFLAGS = -I$(LLVM_SRC_ROOT)/include -I$(VISC_BUILD_DIR)/include
+PLATFORM_CFLAGS = -I$(LLVM_SRC_ROOT)/include -I$(VISC_BUILD_DIR)/include -I../../../include
 
 CXX = $(VISC_BUILD_DIR)/bin/clang++
-PLATFORM_CXXFLAGS = -I$(LLVM_SRC_ROOT)/include -I$(VISC_BUILD_DIR)/include
+PLATFORM_CXXFLAGS = -I$(LLVM_SRC_ROOT)/include -I$(VISC_BUILD_DIR)/include -I../../../include
 
 LINKER = $(VISC_BUILD_DIR)/bin/clang++
 PLATFORM_LDFLAGS = -lm -lpthread -lOpenCL

hpvm/test/pipeline/Makefile

@@ -22,13 +22,16 @@ CURRENT_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 
 EXE = pipeline-$(TARGET)
 
+INCLUDES += -I$(SRC_DIR) -I$(CAM_PIPE_SRC_DIR)
+INCLUDES += -I$(LLVM_SRC_ROOT)/include -I../include -I$(VISC_BUILD_DIR)/include
+
 ## BEGIN HPVM MAKEFILE
 SRCDIR_OBJS= io.ll
 OBJS_SRC=src/io.cc
 VISC_OBJS=main.visc.ll
 APP = $(EXE)
-APP_CFLAGS+=-ffast-math -O3 -fno-lax-vector-conversions -fno-vectorize -fno-slp-vectorize  -I$(SRC_DIR)
-APP_CXXFLAGS+=-ffast-math -O3 -fno-lax-vector-conversions -fno-vectorize -fno-slp-vectorize -I$(SRC_DIR)
+APP_CFLAGS += $(INCLUDES) -ffast-math -O3 -fno-lax-vector-conversions -fno-vectorize -fno-slp-vectorize
+APP_CXXFLAGS += $(INCLUDES) -ffast-math -O3 -fno-lax-vector-conversions -fno-vectorize -fno-slp-vectorize
 APP_LDFLAGS=`pkg-config opencv --libs`
 
 CFLAGS = $(APP_CFLAGS) $(PLATFORM_CFLAGS)