From 1c3a3e0d45a72e4c53091af643705b883e2f0be4 Mon Sep 17 00:00:00 2001
From: Hashim Sharif <hsharif3@tyler.cs.illinois.edu>
Date: Mon, 25 Nov 2019 22:54:39 -0600
Subject: [PATCH] Fixing Makefile paths for LeNet DSOC
---
.../benchmarks/lenet_dsoc/Makefile | 27 ++++++++++---------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/Makefile b/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/Makefile
index 3e4f668a2c..578cfc713e 100644
--- a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/Makefile
+++ b/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/Makefile
@@ -1,5 +1,5 @@
DNN_BENCHMARK_ROOT = $(LLVM_SRC_ROOT)/test/VISC/DNN_Benchmarks
-# NOTE: can configure build directory
+# NOTE: CHANGE to your BUILD DIRECTORY
HPVM_BUILD_DIR = $(LLVM_SRC_ROOT)/../build_dsoc/
CC = $(HPVM_BUILD_DIR)/bin/clang++
@@ -22,8 +22,6 @@ 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 -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 -std=c++11 -O3
LINKER_FLAGS = -lpthread -lOpenCL
@@ -34,10 +32,10 @@ OPTFLAGS1 = -load $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInP
OPTFLAGS2 = -load $(HPVM_LIB_DIR)/InlineTensorCalls.so -inline-tensor-calls
-TARGET = $(BUILD_DIR)/$(APP).opt.bc
+TARGET = $(BUILD_DIR)/$(APP).final.bc
+
SOURCES = $(SRC_DIR)/$(APP).cpp
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,17 +52,19 @@ $(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 $@
+
+
+$(BUILD_DIR)/%.linked.bc: $(BUILD_DIR)/%.opt.bc
$(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
- #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_inline.bc -o $(BUILD_DIR)/lenet_final $(LINKER_FLAGS)
+ $(LLVM_LINK) $< $(shell find ./build -name "*module.ll") $(BUILD_DIR)/tensor_cpu_runtime.bc $(VISC_RT_PATH) -o $@
+
+
+$(BUILD_DIR)/%.final.bc: $(BUILD_DIR)/%.linked.bc
+ $(OPT) $(OPTFLAGS2) $< -o $@
+ $(CC) $@ -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} )
@@ -74,3 +74,6 @@ $(BUILD_DIR):
clean:
rm -rf $(BUILD_DIR)
+
+
+
--
GitLab