Merge branch 'approx_hpvm' of https://gitlab.engr.illinois.edu/llvm/hpvm into approx_hpvm

llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet_dsoc/Makefile

@@ -36,8 +36,8 @@ OPTFLAGS2 = -load  $(HPVM_LIB_DIR)/InlineTensorCalls.so  -inline-tensor-calls
 
 TARGET = $(BUILD_DIR)/$(APP).opt.bc
 SOURCES = $(SRC_DIR)/$(APP).cpp
-#VISC_RT_PATH = $(LLVM_SRC_ROOT)/../build/projects/visc-rt/visc-rt.ll
-VISC_RT_PATH = $(HPVM_BUILD_DIR)/projects/visc-rt/visc-rt.ll
+VISC_RT_PATH = $(LLVM_SRC_ROOT)/projects/visc-cpu-rt/visc-rt.ll
+#VISC_RT_PATH = $(HPVM_BUILD_DIR)/projects/visc-cpu-rt/visc-rt.ll
 
 
 .PRECIOUS: $(BUILD_DIR)/$(APP).ll $(BUILD_DIR)/$(APP).visc.ll
@@ -55,11 +55,12 @@ $(BUILD_DIR)/%.visc.ll: $(BUILD_DIR)/%.ll
 expanded_modules:= $(wildcard *_module.ll)
 
 
+
 $(BUILD_DIR)/%.opt.bc: $(BUILD_DIR)/%.visc.ll
 	$(OPT) $(OPTFLAGS1) $<  -o $@
 	$(CC) -emit-llvm  -c  $(TENSOR_RT_SRC_DIR)/tensor_cpu_runtime.cc  -o  $(BUILD_DIR)/tensor_cpu_runtime.bc
 	$(OPT) -always-inline $(BUILD_DIR)/tensor_cpu_runtime.bc  -o  $(BUILD_DIR)/tensor_cpu_runtime.bc
-	$(LLVM_LINK) $@  $(shell find ./build -name "*module.ll")   $(BUILD_DIR)/tensor_cpu_runtime.bc $(VISC_RT_PATH)  -o  $(BUILD_DIR)/$(APP)_tensor_rt.bc
+	$(LLVM_LINK) $@  $(shell find ./build -name "*module.ll")   $(BUILD_DIR)/tensor_cpu_runtime.bc  $(VISC_RT_PATH)  -o  $(BUILD_DIR)/$(APP)_tensor_rt.bc
 	$(OPT) $(OPTFLAGS2)  $(BUILD_DIR)/$(APP)_tensor_rt.bc -o  $(BUILD_DIR)/$(APP)_inline.bc
 	$(CC) $(BUILD_DIR)/$(APP)_inline.bc -o $(BUILD_DIR)/$(APP)_final $(LINKER_FLAGS)
 	$(foreach module, $(expanded_modules), $(LLVM_LINK) $(module) $(BUILD_DIR)/tensor_cpu_runtime.bc -o $(BUILD_DIR)/$(module)_linked ${\n} $(OPT) $(OPTFLAGS2) $(BUILD_DIR)/$(module)_linked -o  $(BUILD_DIR)/$(module)_inline  ${\n} )

llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/Makefile

@@ -22,9 +22,9 @@ DNN_INCLUDE_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/dnn_sources/include
 TENSOR_RT_INCLUDE_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/tensor_runtime/include
 TENSOR_RT_SRC_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/tensor_runtime/src
 
-# -std=c++11
+# -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=0
 # -I $(TENSOR_INCLUDE_DIR)
-CC_FLAGS = -I $(LLVM_INCLUDE_DIR)  -I $(DNN_INCLUDE_DIR) -I $(COMMON_INCLUDE_DIR)  -I $(TENSOR_RT_INCLUDE_DIR) -I $(CUDA_INCLUDE_PATH)  -fno-exceptions -ffast-math  -D_GLIBCXX_USE_CXX11_ABI=0  -O3
+CC_FLAGS = -I $(LLVM_INCLUDE_DIR)  -I $(DNN_INCLUDE_DIR) -I $(COMMON_INCLUDE_DIR)  -I $(TENSOR_RT_INCLUDE_DIR) -I $(CUDA_INCLUDE_PATH)  -fno-exceptions -ffast-math  -std=c++11   -O3
 LINKER_FLAGS = -lpthread -lOpenCL
 
 HPVM_LIB_DIR = $(HPVM_BUILD_DIR)/lib
@@ -36,8 +36,8 @@ OPTFLAGS2 = -load  $(HPVM_LIB_DIR)/InlineTensorCalls.so  -inline-tensor-calls
 
 TARGET = $(BUILD_DIR)/$(APP).opt.bc
 SOURCES = $(SRC_DIR)/$(APP).cpp
-#VISC_RT_PATH = $(LLVM_SRC_ROOT)/../build/projects/visc-rt/visc-rt.ll
-VISC_RT_PATH = $(HPVM_BUILD_DIR)/projects/visc-rt/visc-rt.ll
+VISC_RT_PATH = $(LLVM_SRC_ROOT)/projects/visc-cpu-rt/visc-rt.ll
+#VISC_RT_PATH = $(HPVM_BUILD_DIR)/projects/visc-rt/visc-rt.ll
 
 
 .PRECIOUS: $(BUILD_DIR)/$(APP).ll $(BUILD_DIR)/$(APP).visc.ll
@@ -54,14 +54,18 @@ $(BUILD_DIR)/%.visc.ll: $(BUILD_DIR)/%.ll
 
 expanded_modules:= $(wildcard *_module.ll)
 
+
+#$(wildcard build/_*.ll)
+
 $(BUILD_DIR)/%.opt.bc: $(BUILD_DIR)/%.visc.ll
 	$(OPT) $(OPTFLAGS1) $<  -o $@
 	$(CC) -emit-llvm  -c  $(TENSOR_RT_SRC_DIR)/tensor_cpu_runtime.cc  -o  $(BUILD_DIR)/tensor_cpu_runtime.bc
 	$(OPT) -always-inline $(BUILD_DIR)/tensor_cpu_runtime.bc  -o  $(BUILD_DIR)/tensor_cpu_runtime.bc
-	$(LLVM_LINK) $@   $(BUILD_DIR)/$(wildcard  *module.ll)  $(BUILD_DIR)/tensor_cpu_runtime.bc $(VISC_RT_PATH)  -o  $(BUILD_DIR)/lenet_tensor_rt.bc
+        #LL_FILES = $(shell cd build; find ./ -name "*module.ll")
+	$(LLVM_LINK) $@  $(shell find ./build -name "*module.ll")   $(BUILD_DIR)/tensor_cpu_runtime.bc $(VISC_RT_PATH)  -o  $(BUILD_DIR)/lenet_tensor_rt.bc
 	$(OPT) $(OPTFLAGS2)  $(BUILD_DIR)/lenet_tensor_rt.bc -o  $(BUILD_DIR)/lenet_inline.bc
-	$(CC) $(BUILD_DIR)/lenet_tensor_rt.bc -o $(BUILD_DIR)/lenet_final $(LINKER_FLAGS)
-	$(foreach module, $(expanded_modules), $(LLVM_LINK) $(module) $(BUILD_DIR)/tensor_cpu_runtime.bc -o $(module)_linked ${\n} $(OPT) $(OPTFLAGS2) $(module)_linked -o $(module)_inline  ${\n} )
+	$(CC) $(BUILD_DIR)/lenet_inline.bc -o $(BUILD_DIR)/lenet_final $(LINKER_FLAGS)
+	$(foreach module, $(expanded_modules), $(LLVM_LINK) $(module) $(BUILD_DIR)/tensor_cpu_runtime.bc -o $(BUILD_DIR)/$(module)_linked ${\n} $(OPT) $(OPTFLAGS2) $(BUILD_DIR)/$(module)_linked -o  $(BUILD_DIR)/$(module)_inline  ${\n} )