Fix paths to HPVM runtime in Makefiles

hpvm/test/parboil/benchmarks/hpvm-cava/Makefile

@@ -95,7 +95,7 @@ CXXFLAGS = $(APP_CXXFLAGS) $(PLATFORM_CXXFLAGS)
 LDFLAGS= $(APP_LDFLAGS) $(PLATFORM_LDFLAGS)
 
 LIBCLC_LIB_PATH = $(LLVM_SRC_ROOT)/../libclc/built_libs
-VISC_RT_PATH = $(LLVM_SRC_ROOT)/tools/hpvm/visc-rt
+VISC_RT_PATH = $(LLVM_SRC_ROOT)/tools/hpvm/projects/visc-rt
 
 VISC_RT_LIB = $(VISC_RT_PATH)/visc-rt.ll
 #LIBCLC_NVPTX_LIB = $(LIBCLC_LIB_PATH)/nvptx--nvidiacl.bc

hpvm/test/parboil/benchmarks/saxpy_test/Makefile

@@ -74,7 +74,7 @@ LDFLAGS= $(APP_LDFLAGS) $(PLATFORM_LDFLAGS)
 
 LIBCLC_LIB_PATH = $(LLVM_SRC_ROOT)/../libclc/built_libs
 #VISC_RT_PATH = $(LLVM_SRC_ROOT)/projects/visc-rt
-VISC_RT_PATH = $(LLVM_SRC_ROOT)/tools/hpvm/visc-rt
+VISC_RT_PATH = $(LLVM_SRC_ROOT)/tools/hpvm/projects/visc-rt
 
 VISC_RT_LIB = $(VISC_RT_PATH)/visc-rt.ll
 LIBCLC_NVPTX_LIB = $(LIBCLC_LIB_PATH)/nvptx64--nvidiacl.bc

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

@@ -12,7 +12,7 @@ LDFLAGS=$(LANG_LDFLAGS) $(PLATFORM_LDFLAGS) $(APP_LDFLAGS)
 # VISC
 LIBCLC_LIB_PATH = $(LLVM_SRC_ROOT)/../libclc/built_libs
 #VISC_RT_PATH = $(LLVM_SRC_ROOT)/../build/projects/visc-rt
-VISC_RT_PATH = $(LLVM_SRC_ROOT)/tools/hpvm/visc-rt
+VISC_RT_PATH = $(LLVM_SRC_ROOT)/tools/hpvm/projects/visc-rt
 
 VISC_RT_LIB = $(VISC_RT_PATH)/visc-rt.ll
 #LIBCLC_NVPTX_LIB = $(LIBCLC_LIB_PATH)/nvptx--nvidiacl.bc