diff --git a/hpvm/test/dnn_benchmarks/benchmarks/alexnet/Makefile b/hpvm/test/dnn_benchmarks/benchmarks/alexnet/Makefile
deleted file mode 100644
index 0e3294437bdb00854cd3cbdec7d9dacc405e85f2..0000000000000000000000000000000000000000
--- a/hpvm/test/dnn_benchmarks/benchmarks/alexnet/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-DNN_BENCHMARK_ROOT = $(LLVM_SRC_ROOT)/tools/hpvm/test/dnn_benchmarks
-HPVM_BUILD_DIR = $(LLVM_BUILD_ROOT)
-
-CC = $(HPVM_BUILD_DIR)/bin/clang++
-OPT = $(HPVM_BUILD_DIR)/bin/opt
-LLVM_DIS = $(HPVM_BUILD_DIR)/bin/llvm-dis
-LLVM_LINK = $(HPVM_BUILD_DIR)/bin/llvm-link
-LLVM_INCLUDE_DIR = $(LLVM_SRC_ROOT)/include
-
-SRC_DIR = src
-BUILD_DIR = build
-APP = alexnet
-
-TENSOR_INCLUDE_DIR = $(DNN_BENCHMARK_ROOT)/common/include
-TENSOR_RT_INCLUDE_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/tensor_runtime/include
-TENSOR_LIB_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/lib/libtensor_runtime.a
-PROFILER_LIB_DIR = $(LLVM_SRC_ROOT)/projects/gpu_profiler/lib/libgpu_profiler.a
-SOC_SIMULATOR_LIB_DIR = $(LLVM_SRC_ROOT)/projects/soc_simulator/lib/libpromise_profiler.a
-TENSOR_AUTOTUNER_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/lib/libtensor_autotuner.a
-
-CC_FLAGS = -I $(LLVM_INCLUDE_DIR) -I $(TENSOR_INCLUDE_DIR) -I $(TENSOR_RT_INCLUDE_DIR) -I $(CUDA_INCLUDE_PATH)  -fno-exceptions -ffast-math -std=c++11 -O3
-CCFLAGS += -DDEVICE=CUDNN_TARGET
-LINKER_FLAGS = -lpthread -lcudart -lcurand -lcudnn -lcublas -lcufft -lOpenCL -lstdc++fs -lomp
-
-HPVM_LIB_DIR = $(HPVM_BUILD_DIR)/lib
-
-
-HPVM_OPTFLAGS = -load  $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_CUDNN.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load  $(HPVM_LIB_DIR)/LLVMClearDFG.so -inplace -dfg2llvm-cudnn -dfg2llvm-x86 -clearDFG
-
-
-PROMISE_QUANT_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/data/quant_ranges.txt
-
-WRAPPER_API_QUANT_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/data/quant_ranges_rt.txt
-CONF_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/data/tuner_confs.txt
-
-HPVM_OPTFLAGS3 = -load  $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_WrapperAPI.so    -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load  $(HPVM_LIB_DIR)/LLVMFuseHPVMTensorNodes.so  -load  $(HPVM_LIB_DIR)/LLVMClearDFG.so   -inplace -hpvm-fuse -dfg2llvm-wrapperapi -quantization-levels-filename=$(WRAPPER_API_QUANT_FILE_PATH) -configuration-inputs-filename=$(CONF_FILE_PATH) -dfg2llvm-x86 -clearDFG
-
-
-TEMP_CONF_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/predictive/temp.txt
-
-
-HPVM_PRED_OPTFLAGS3 = -load  $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_WrapperAPI.so    -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load  $(HPVM_LIB_DIR)/LLVMFuseHPVMTensorNodes.so  -load  $(HPVM_LIB_DIR)/LLVMClearDFG.so   -inplace -hpvm-fuse -dfg2llvm-wrapperapi -quantization-levels-filename=$(WRAPPER_API_QUANT_FILE_PATH) -configuration-inputs-filename=$(TEMP_CONF_FILE_PATH) -dfg2llvm-x86 -clearDFG
-
-TARGET = $(BUILD_DIR)/$(APP).opt.bc
-SOURCES = $(SRC_DIR)/$(APP).cpp
-HPVM_RT_PATH = $(LLVM_SRC_ROOT)/../build/projects/hpvm-rt/visc-rt.ll
-
-
-.PRECIOUS: $(BUILD_DIR)/$(APP).ll $(BUILD_DIR)/$(APP).hpvm.ll
-default: $(BUILD_DIR) $(TARGET)
-
-
-$(BUILD_DIR)/%.ll: $(SRC_DIR)/%.cpp
-	$(CC) $(CC_FLAGS) -emit-llvm src/$(APP).cpp -S -o  $(BUILD_DIR)/$(APP).ll  
-	$(CC) $(CC_FLAGS) -emit-llvm src/$(APP)_loop.cpp -S -o  $(BUILD_DIR)/$(APP)_loop.ll  
-
-
-$(BUILD_DIR)/%.opt.bc: $(BUILD_DIR)/%.ll
-	$(OPT) -load LLVMGenHPVM.so -genhpvm -globaldce  $(BUILD_DIR)/$(APP).ll -S -o  $(BUILD_DIR)/$(APP).visc.ll
-	$(OPT) -load LLVMGenHPVM.so -genhpvm -globaldce  $(BUILD_DIR)/$(APP)_loop.ll -S -o  $(BUILD_DIR)/$(APP)_loop.visc.ll
-	$(OPT) $(HPVM_OPTFLAGS)  $(BUILD_DIR)/$(APP).hpvm.ll  -o  $(BUILD_DIR)/$(APP)_cudnn.bc
-	$(OPT) $(HPVM_OPTFLAGS3) $(BUILD_DIR)/$(APP)_loop.hpvm.ll  -o  $(BUILD_DIR)/$(APP)_loop_wrapperapi.bc
-	$(OPT) $(HPVM_PRED_OPTFLAGS3) $(BUILD_DIR)/$(APP)_loop.hpvm.ll  -o  $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi.bc
-	$(LLVM_LINK) $(BUILD_DIR)/$(APP)_cudnn.bc $(HPVM_RT_PATH) -o $(BUILD_DIR)/$(APP)_cudnn_linked.bc
-	$(LLVM_LINK) $(BUILD_DIR)/$(APP)_loop_wrapperapi.bc $(HPVM_RT_PATH) -o $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked.bc
-	$(LLVM_LINK) $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi.bc $(HPVM_RT_PATH) -o $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi_linked.bc
-	$(CC) $(BUILD_DIR)/$(APP)_cudnn_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_cudnn_linked $(LINKER_FLAGS)
-	$(CC) $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked $(LINKER_FLAGS)
-	$(CC) $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi_linked $(LINKER_FLAGS)
-
-$(BUILD_DIR):
-	mkdir -p $@
-
-clean:
-	rm -rf $(BUILD_DIR)
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/alexnet2/Makefile b/hpvm/test/dnn_benchmarks/benchmarks/alexnet2/Makefile
deleted file mode 100644
index 002ecfc92ec6cf546f3cf1cb5c0d0bef5fac7419..0000000000000000000000000000000000000000
--- a/hpvm/test/dnn_benchmarks/benchmarks/alexnet2/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-DNN_BENCHMARK_ROOT = $(LLVM_SRC_ROOT)/tools/hpvm/test/dnn_benchmarks
-HPVM_BUILD_DIR = $(LLVM_BUILD_ROOT)
-
-CC = $(HPVM_BUILD_DIR)/bin/clang++
-OPT = $(HPVM_BUILD_DIR)/bin/opt
-LLVM_DIS = $(HPVM_BUILD_DIR)/bin/llvm-dis
-LLVM_LINK = $(HPVM_BUILD_DIR)/bin/llvm-link
-LLVM_INCLUDE_DIR = $(LLVM_SRC_ROOT)/include
-
-SRC_DIR = src
-BUILD_DIR = build
-APP = alexnet2
-
-TENSOR_INCLUDE_DIR = $(DNN_BENCHMARK_ROOT)/common/include
-TENSOR_RT_INCLUDE_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/tensor_runtime/include
-TENSOR_LIB_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/lib/libtensor_runtime.a
-PROFILER_LIB_DIR = $(LLVM_SRC_ROOT)/projects/gpu_profiler/lib/libgpu_profiler.a
-SOC_SIMULATOR_LIB_DIR = $(LLVM_SRC_ROOT)/projects/soc_simulator/lib/libpromise_profiler.a
-TENSOR_AUTOTUNER_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/lib/libtensor_autotuner.a
-
-CC_FLAGS = -I $(LLVM_INCLUDE_DIR) -I $(TENSOR_INCLUDE_DIR) -I $(TENSOR_RT_INCLUDE_DIR) -I $(CUDA_INCLUDE_PATH)  -fno-exceptions -ffast-math -std=c++11 -O3
-CCFLAGS += -DDEVICE=CUDNN_TARGET
-LINKER_FLAGS = -lpthread -lcudart -lcurand -lcudnn -lcublas -lcufft -lOpenCL -lstdc++fs -lomp
-
-HPVM_LIB_DIR = $(HPVM_BUILD_DIR)/lib
-
-
-HPVM_OPTFLAGS = -load  $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_CUDNN.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load  $(HPVM_LIB_DIR)/LLVMClearDFG.so -inplace -dfg2llvm-cudnn -dfg2llvm-x86 -clearDFG
-
-
-PROMISE_QUANT_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/data/quant_ranges.txt
-
-WRAPPER_API_QUANT_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/data/quant_ranges_rt.txt
-CONF_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/data/tuner_confs.txt
-
-HPVM_OPTFLAGS3 = -load  $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_WrapperAPI.so    -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load  $(HPVM_LIB_DIR)/LLVMFuseHPVMTensorNodes.so  -load  $(HPVM_LIB_DIR)/LLVMClearDFG.so   -inplace -hpvm-fuse -dfg2llvm-wrapperapi -quantization-levels-filename=$(WRAPPER_API_QUANT_FILE_PATH) -configuration-inputs-filename=$(CONF_FILE_PATH) -dfg2llvm-x86 -clearDFG
-
-
-TEMP_CONF_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/predictive/temp.txt
-
-
-HPVM_PRED_OPTFLAGS3 = -load  $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_WrapperAPI.so    -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load  $(HPVM_LIB_DIR)/LLVMFuseHPVMTensorNodes.so  -load  $(HPVM_LIB_DIR)/LLVMClearDFG.so   -inplace -hpvm-fuse -dfg2llvm-wrapperapi -quantization-levels-filename=$(WRAPPER_API_QUANT_FILE_PATH) -configuration-inputs-filename=$(TEMP_CONF_FILE_PATH) -dfg2llvm-x86 -clearDFG
-
-TARGET = $(BUILD_DIR)/$(APP).opt.bc
-SOURCES = $(SRC_DIR)/$(APP).cpp
-HPVM_RT_PATH = $(LLVM_SRC_ROOT)/../build/projects/hpvm-rt/visc-rt.ll
-
-
-.PRECIOUS: $(BUILD_DIR)/$(APP).ll $(BUILD_DIR)/$(APP).hpvm.ll
-default: $(BUILD_DIR) $(TARGET)
-
-
-$(BUILD_DIR)/%.ll: $(SRC_DIR)/%.cpp
-	$(CC) $(CC_FLAGS) -emit-llvm src/$(APP).cpp -S -o  $(BUILD_DIR)/$(APP).ll  
-	$(CC) $(CC_FLAGS) -emit-llvm src/$(APP)_loop.cpp -S -o  $(BUILD_DIR)/$(APP)_loop.ll  
-
-
-$(BUILD_DIR)/%.opt.bc: $(BUILD_DIR)/%.ll
-	$(OPT) -load LLVMGenHPVM.so -genhpvm -globaldce  $(BUILD_DIR)/$(APP).ll -S -o  $(BUILD_DIR)/$(APP).visc.ll
-	$(OPT) -load LLVMGenHPVM.so -genhpvm -globaldce  $(BUILD_DIR)/$(APP)_loop.ll -S -o  $(BUILD_DIR)/$(APP)_loop.visc.ll
-	$(OPT) $(HPVM_OPTFLAGS)  $(BUILD_DIR)/$(APP).hpvm.ll  -o  $(BUILD_DIR)/$(APP)_cudnn.bc
-	$(OPT) $(HPVM_OPTFLAGS3) $(BUILD_DIR)/$(APP)_loop.hpvm.ll  -o  $(BUILD_DIR)/$(APP)_loop_wrapperapi.bc
-	$(OPT) $(HPVM_PRED_OPTFLAGS3) $(BUILD_DIR)/$(APP)_loop.hpvm.ll  -o  $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi.bc
-	$(LLVM_LINK) $(BUILD_DIR)/$(APP)_cudnn.bc $(HPVM_RT_PATH) -o $(BUILD_DIR)/$(APP)_cudnn_linked.bc
-	$(LLVM_LINK) $(BUILD_DIR)/$(APP)_loop_wrapperapi.bc $(HPVM_RT_PATH) -o $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked.bc
-	$(LLVM_LINK) $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi.bc $(HPVM_RT_PATH) -o $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi_linked.bc
-	$(CC) $(BUILD_DIR)/$(APP)_cudnn_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_cudnn_linked $(LINKER_FLAGS)
-	$(CC) $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked $(LINKER_FLAGS)
-	$(CC) $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi_linked $(LINKER_FLAGS)
-
-$(BUILD_DIR):
-	mkdir -p $@
-
-clean:
-	rm -rf $(BUILD_DIR)
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/Makefile b/hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/Makefile
deleted file mode 100644
index 787eda03df21939f201d0a668680d5e69df72e84..0000000000000000000000000000000000000000
--- a/hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-DNN_BENCHMARK_ROOT = $(LLVM_SRC_ROOT)/tools/hpvm/test/dnn_benchmarks
-HPVM_BUILD_DIR = $(LLVM_BUILD_ROOT)
-
-CC = $(HPVM_BUILD_DIR)/bin/clang++
-OPT = $(HPVM_BUILD_DIR)/bin/opt
-LLVM_DIS = $(HPVM_BUILD_DIR)/bin/llvm-dis
-LLVM_LINK = $(HPVM_BUILD_DIR)/bin/llvm-link
-LLVM_INCLUDE_DIR = $(LLVM_SRC_ROOT)/include
-
-SRC_DIR = src
-BUILD_DIR = build
-APP = alexnet_imagenet
-
-TENSOR_INCLUDE_DIR = $(DNN_BENCHMARK_ROOT)/common/include
-TENSOR_RT_INCLUDE_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/tensor_runtime/include
-TENSOR_LIB_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/lib/libtensor_runtime.a
-PROFILER_LIB_DIR = $(LLVM_SRC_ROOT)/projects/gpu_profiler/lib/libgpu_profiler.a
-SOC_SIMULATOR_LIB_DIR = $(LLVM_SRC_ROOT)/projects/soc_simulator/lib/libpromise_profiler.a
-TENSOR_AUTOTUNER_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/lib/libtensor_autotuner.a
-
-CC_FLAGS = -I $(LLVM_INCLUDE_DIR) -I $(TENSOR_INCLUDE_DIR) -I $(TENSOR_RT_INCLUDE_DIR) -I $(CUDA_INCLUDE_PATH)  -fno-exceptions -ffast-math -std=c++11 -O3
-CCFLAGS += -DDEVICE=CUDNN_TARGET
-LINKER_FLAGS = -lpthread -lcudart -lcurand -lcudnn -lcublas -lcufft -lOpenCL -lstdc++fs -lomp
-
-HPVM_LIB_DIR = $(HPVM_BUILD_DIR)/lib
-
-
-HPVM_OPTFLAGS = -load  $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_CUDNN.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load  $(HPVM_LIB_DIR)/LLVMClearDFG.so -inplace -dfg2llvm-cudnn -dfg2llvm-x86 -clearDFG
-
-
-PROMISE_QUANT_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/data/quant_ranges.txt
-
-WRAPPER_API_QUANT_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/data/quant_ranges_rt.txt
-CONF_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/data/tuner_confs.txt
-
-HPVM_OPTFLAGS3 = -load  $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_WrapperAPI.so    -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load  $(HPVM_LIB_DIR)/LLVMFuseHPVMTensorNodes.so  -load  $(HPVM_LIB_DIR)/LLVMClearDFG.so   -inplace -hpvm-fuse -dfg2llvm-wrapperapi -quantization-levels-filename=$(WRAPPER_API_QUANT_FILE_PATH) -configuration-inputs-filename=$(CONF_FILE_PATH) -dfg2llvm-x86 -clearDFG
-
-
-TEMP_CONF_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/predictive/temp.txt
-
-
-HPVM_PRED_OPTFLAGS3 = -load  $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_WrapperAPI.so    -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load  $(HPVM_LIB_DIR)/LLVMFuseHPVMTensorNodes.so  -load  $(HPVM_LIB_DIR)/LLVMClearDFG.so   -inplace -hpvm-fuse -dfg2llvm-wrapperapi -quantization-levels-filename=$(WRAPPER_API_QUANT_FILE_PATH) -configuration-inputs-filename=$(TEMP_CONF_FILE_PATH) -dfg2llvm-x86 -clearDFG
-
-TARGET = $(BUILD_DIR)/$(APP).opt.bc
-SOURCES = $(SRC_DIR)/$(APP).cpp
-HPVM_RT_PATH = $(LLVM_SRC_ROOT)/../build/projects/hpvm-rt/visc-rt.ll
-
-
-.PRECIOUS: $(BUILD_DIR)/$(APP).ll $(BUILD_DIR)/$(APP).hpvm.ll
-default: $(BUILD_DIR) $(TARGET)
-
-
-$(BUILD_DIR)/%.ll: $(SRC_DIR)/%.cpp
-	$(CC) $(CC_FLAGS) -emit-llvm src/$(APP).cpp -S -o  $(BUILD_DIR)/$(APP).ll  
-	$(CC) $(CC_FLAGS) -emit-llvm src/$(APP)_loop.cpp -S -o  $(BUILD_DIR)/$(APP)_loop.ll  
-
-
-$(BUILD_DIR)/%.opt.bc: $(BUILD_DIR)/%.ll
-	$(OPT) -load LLVMGenHPVM.so -genhpvm -globaldce  $(BUILD_DIR)/$(APP).ll -S -o  $(BUILD_DIR)/$(APP).visc.ll
-	$(OPT) -load LLVMGenHPVM.so -genhpvm -globaldce  $(BUILD_DIR)/$(APP)_loop.ll -S -o  $(BUILD_DIR)/$(APP)_loop.visc.ll
-	$(OPT) $(HPVM_OPTFLAGS)  $(BUILD_DIR)/$(APP).hpvm.ll  -o  $(BUILD_DIR)/$(APP)_cudnn.bc
-	$(OPT) $(HPVM_OPTFLAGS3) $(BUILD_DIR)/$(APP)_loop.hpvm.ll  -o  $(BUILD_DIR)/$(APP)_loop_wrapperapi.bc
-	$(OPT) $(HPVM_PRED_OPTFLAGS3) $(BUILD_DIR)/$(APP)_loop.hpvm.ll  -o  $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi.bc
-	$(LLVM_LINK) $(BUILD_DIR)/$(APP)_cudnn.bc $(HPVM_RT_PATH) -o $(BUILD_DIR)/$(APP)_cudnn_linked.bc
-	$(LLVM_LINK) $(BUILD_DIR)/$(APP)_loop_wrapperapi.bc $(HPVM_RT_PATH) -o $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked.bc
-	$(LLVM_LINK) $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi.bc $(HPVM_RT_PATH) -o $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi_linked.bc
-	$(CC) $(BUILD_DIR)/$(APP)_cudnn_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_cudnn_linked $(LINKER_FLAGS)
-	$(CC) $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked $(LINKER_FLAGS)
-	$(CC) $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi_linked $(LINKER_FLAGS)
-
-$(BUILD_DIR):
-	mkdir -p $@
-
-clean:
-	rm -rf $(BUILD_DIR)
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/Makefile b/hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/Makefile
deleted file mode 100644
index 42be9998a0e259abe1ce29c7402e8e1f78d798c4..0000000000000000000000000000000000000000
--- a/hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-DNN_BENCHMARK_ROOT = $(LLVM_SRC_ROOT)/tools/hpvm/test/dnn_benchmarks
-HPVM_BUILD_DIR = $(LLVM_BUILD_ROOT)
-
-CC = $(HPVM_BUILD_DIR)/bin/clang++
-OPT = $(HPVM_BUILD_DIR)/bin/opt
-LLVM_DIS = $(HPVM_BUILD_DIR)/bin/llvm-dis
-LLVM_LINK = $(HPVM_BUILD_DIR)/bin/llvm-link
-LLVM_INCLUDE_DIR = $(LLVM_SRC_ROOT)/include
-
-SRC_DIR = src
-BUILD_DIR = build
-APP = lenet_mnist
-
-TENSOR_INCLUDE_DIR = $(DNN_BENCHMARK_ROOT)/common/include
-TENSOR_RT_INCLUDE_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/tensor_runtime/include
-TENSOR_LIB_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/lib/libtensor_runtime.a
-PROFILER_LIB_DIR = $(LLVM_SRC_ROOT)/projects/gpu_profiler/lib/libgpu_profiler.a
-SOC_SIMULATOR_LIB_DIR = $(LLVM_SRC_ROOT)/projects/soc_simulator/lib/libpromise_profiler.a
-TENSOR_AUTOTUNER_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/lib/libtensor_autotuner.a
-
-CC_FLAGS = -I $(LLVM_INCLUDE_DIR) -I $(TENSOR_INCLUDE_DIR) -I $(TENSOR_RT_INCLUDE_DIR) -I $(CUDA_INCLUDE_PATH)  -fno-exceptions -ffast-math -std=c++11 -O3
-CCFLAGS += -DDEVICE=CUDNN_TARGET
-LINKER_FLAGS = -lpthread -lcudart -lcurand -lcudnn -lcublas -lcufft -lOpenCL -lstdc++fs -lomp
-
-HPVM_LIB_DIR = $(HPVM_BUILD_DIR)/lib
-
-
-HPVM_OPTFLAGS = -load  $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_CUDNN.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load  $(HPVM_LIB_DIR)/LLVMClearDFG.so -inplace -dfg2llvm-cudnn -dfg2llvm-x86 -clearDFG
-
-
-PROMISE_QUANT_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/data/quant_ranges.txt
-
-WRAPPER_API_QUANT_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/data/quant_ranges_rt.txt
-CONF_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/data/tuner_confs.txt
-
-HPVM_OPTFLAGS3 = -load  $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_WrapperAPI.so    -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load  $(HPVM_LIB_DIR)/LLVMFuseHPVMTensorNodes.so  -load  $(HPVM_LIB_DIR)/LLVMClearDFG.so   -inplace -hpvm-fuse -dfg2llvm-wrapperapi -quantization-levels-filename=$(WRAPPER_API_QUANT_FILE_PATH) -configuration-inputs-filename=$(CONF_FILE_PATH) -dfg2llvm-x86 -clearDFG
-
-
-TEMP_CONF_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/predictive/temp.txt
-
-
-HPVM_PRED_OPTFLAGS3 = -load  $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_WrapperAPI.so    -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load  $(HPVM_LIB_DIR)/LLVMFuseHPVMTensorNodes.so  -load  $(HPVM_LIB_DIR)/LLVMClearDFG.so   -inplace -hpvm-fuse -dfg2llvm-wrapperapi -quantization-levels-filename=$(WRAPPER_API_QUANT_FILE_PATH) -configuration-inputs-filename=$(TEMP_CONF_FILE_PATH) -dfg2llvm-x86 -clearDFG
-
-TARGET = $(BUILD_DIR)/$(APP).opt.bc
-SOURCES = $(SRC_DIR)/$(APP).cpp
-HPVM_RT_PATH = $(LLVM_SRC_ROOT)/../build/projects/hpvm-rt/visc-rt.ll
-
-
-.PRECIOUS: $(BUILD_DIR)/$(APP).ll $(BUILD_DIR)/$(APP).hpvm.ll
-default: $(BUILD_DIR) $(TARGET)
-
-
-$(BUILD_DIR)/%.ll: $(SRC_DIR)/%.cpp
-	$(CC) $(CC_FLAGS) -emit-llvm src/$(APP).cpp -S -o  $(BUILD_DIR)/$(APP).ll  
-	$(CC) $(CC_FLAGS) -emit-llvm src/$(APP)_loop.cpp -S -o  $(BUILD_DIR)/$(APP)_loop.ll  
-
-
-$(BUILD_DIR)/%.opt.bc: $(BUILD_DIR)/%.ll
-	$(OPT) -load LLVMGenHPVM.so -genhpvm -globaldce  $(BUILD_DIR)/$(APP).ll -S -o  $(BUILD_DIR)/$(APP).visc.ll
-	$(OPT) -load LLVMGenHPVM.so -genhpvm -globaldce  $(BUILD_DIR)/$(APP)_loop.ll -S -o  $(BUILD_DIR)/$(APP)_loop.visc.ll
-	$(OPT) $(HPVM_OPTFLAGS)  $(BUILD_DIR)/$(APP).hpvm.ll  -o  $(BUILD_DIR)/$(APP)_cudnn.bc
-	$(OPT) $(HPVM_OPTFLAGS3) $(BUILD_DIR)/$(APP)_loop.hpvm.ll  -o  $(BUILD_DIR)/$(APP)_loop_wrapperapi.bc
-	$(OPT) $(HPVM_PRED_OPTFLAGS3) $(BUILD_DIR)/$(APP)_loop.hpvm.ll  -o  $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi.bc
-	$(LLVM_LINK) $(BUILD_DIR)/$(APP)_cudnn.bc $(HPVM_RT_PATH) -o $(BUILD_DIR)/$(APP)_cudnn_linked.bc
-	$(LLVM_LINK) $(BUILD_DIR)/$(APP)_loop_wrapperapi.bc $(HPVM_RT_PATH) -o $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked.bc
-	$(LLVM_LINK) $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi.bc $(HPVM_RT_PATH) -o $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi_linked.bc
-	$(CC) $(BUILD_DIR)/$(APP)_cudnn_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_cudnn_linked $(LINKER_FLAGS)
-	$(CC) $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked $(LINKER_FLAGS)
-	$(CC) $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi_linked $(LINKER_FLAGS)
-
-$(BUILD_DIR):
-	mkdir -p $@
-
-clean:
-	rm -rf $(BUILD_DIR)
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/mobilenet/Makefile b/hpvm/test/dnn_benchmarks/benchmarks/mobilenet/Makefile
deleted file mode 100644
index e91c4bd2c2184c9411b93ce6f7d98d6540a15e4e..0000000000000000000000000000000000000000
--- a/hpvm/test/dnn_benchmarks/benchmarks/mobilenet/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-DNN_BENCHMARK_ROOT = $(LLVM_SRC_ROOT)/tools/hpvm/test/dnn_benchmarks
-HPVM_BUILD_DIR = $(LLVM_BUILD_ROOT)
-
-CC = $(HPVM_BUILD_DIR)/bin/clang++
-OPT = $(HPVM_BUILD_DIR)/bin/opt
-LLVM_DIS = $(HPVM_BUILD_DIR)/bin/llvm-dis
-LLVM_LINK = $(HPVM_BUILD_DIR)/bin/llvm-link
-LLVM_INCLUDE_DIR = $(LLVM_SRC_ROOT)/include
-
-SRC_DIR = src
-BUILD_DIR = build
-APP = mobilenet
-
-TENSOR_INCLUDE_DIR = $(DNN_BENCHMARK_ROOT)/common/include
-TENSOR_RT_INCLUDE_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/tensor_runtime/include
-TENSOR_LIB_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/lib/libtensor_runtime.a
-PROFILER_LIB_DIR = $(LLVM_SRC_ROOT)/projects/gpu_profiler/lib/libgpu_profiler.a
-SOC_SIMULATOR_LIB_DIR = $(LLVM_SRC_ROOT)/projects/soc_simulator/lib/libpromise_profiler.a
-TENSOR_AUTOTUNER_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/lib/libtensor_autotuner.a
-
-CC_FLAGS = -I $(LLVM_INCLUDE_DIR) -I $(TENSOR_INCLUDE_DIR) -I $(TENSOR_RT_INCLUDE_DIR) -I $(CUDA_INCLUDE_PATH)  -fno-exceptions -ffast-math -std=c++11 -O3
-CCFLAGS += -DDEVICE=CUDNN_TARGET
-LINKER_FLAGS = -lpthread -lcudart -lcurand -lcudnn -lcublas -lcufft -lOpenCL -lstdc++fs -lomp
-
-HPVM_LIB_DIR = $(HPVM_BUILD_DIR)/lib
-
-
-HPVM_OPTFLAGS = -load  $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_CUDNN.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load  $(HPVM_LIB_DIR)/LLVMClearDFG.so -inplace -dfg2llvm-cudnn -dfg2llvm-x86 -clearDFG
-
-
-PROMISE_QUANT_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/data/quant_ranges.txt
-
-WRAPPER_API_QUANT_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/data/quant_ranges_rt.txt
-CONF_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/data/tuner_confs.txt
-
-HPVM_OPTFLAGS3 = -load  $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_WrapperAPI.so    -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load  $(HPVM_LIB_DIR)/LLVMFuseHPVMTensorNodes.so  -load  $(HPVM_LIB_DIR)/LLVMClearDFG.so   -inplace -hpvm-fuse -dfg2llvm-wrapperapi -quantization-levels-filename=$(WRAPPER_API_QUANT_FILE_PATH) -configuration-inputs-filename=$(CONF_FILE_PATH) -dfg2llvm-x86 -clearDFG
-
-
-TEMP_CONF_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/predictive/temp.txt
-
-
-HPVM_PRED_OPTFLAGS3 = -load  $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_WrapperAPI.so    -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load  $(HPVM_LIB_DIR)/LLVMFuseHPVMTensorNodes.so  -load  $(HPVM_LIB_DIR)/LLVMClearDFG.so   -inplace -hpvm-fuse -dfg2llvm-wrapperapi -quantization-levels-filename=$(WRAPPER_API_QUANT_FILE_PATH) -configuration-inputs-filename=$(TEMP_CONF_FILE_PATH) -dfg2llvm-x86 -clearDFG
-
-TARGET = $(BUILD_DIR)/$(APP).opt.bc
-SOURCES = $(SRC_DIR)/$(APP).cpp
-HPVM_RT_PATH = $(LLVM_SRC_ROOT)/../build/projects/hpvm-rt/visc-rt.ll
-
-
-.PRECIOUS: $(BUILD_DIR)/$(APP).ll $(BUILD_DIR)/$(APP).hpvm.ll
-default: $(BUILD_DIR) $(TARGET)
-
-
-$(BUILD_DIR)/%.ll: $(SRC_DIR)/%.cpp
-	$(CC) $(CC_FLAGS) -emit-llvm src/$(APP).cpp -S -o  $(BUILD_DIR)/$(APP).ll  
-	$(CC) $(CC_FLAGS) -emit-llvm src/$(APP)_loop.cpp -S -o  $(BUILD_DIR)/$(APP)_loop.ll  
-
-
-$(BUILD_DIR)/%.opt.bc: $(BUILD_DIR)/%.ll
-	$(OPT) -load LLVMGenHPVM.so -genhpvm -globaldce  $(BUILD_DIR)/$(APP).ll -S -o  $(BUILD_DIR)/$(APP).visc.ll
-	$(OPT) -load LLVMGenHPVM.so -genhpvm -globaldce  $(BUILD_DIR)/$(APP)_loop.ll -S -o  $(BUILD_DIR)/$(APP)_loop.visc.ll
-	$(OPT) $(HPVM_OPTFLAGS)  $(BUILD_DIR)/$(APP).hpvm.ll  -o  $(BUILD_DIR)/$(APP)_cudnn.bc
-	$(OPT) $(HPVM_OPTFLAGS3) $(BUILD_DIR)/$(APP)_loop.hpvm.ll  -o  $(BUILD_DIR)/$(APP)_loop_wrapperapi.bc
-	$(OPT) $(HPVM_PRED_OPTFLAGS3) $(BUILD_DIR)/$(APP)_loop.hpvm.ll  -o  $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi.bc
-	$(LLVM_LINK) $(BUILD_DIR)/$(APP)_cudnn.bc $(HPVM_RT_PATH) -o $(BUILD_DIR)/$(APP)_cudnn_linked.bc
-	$(LLVM_LINK) $(BUILD_DIR)/$(APP)_loop_wrapperapi.bc $(HPVM_RT_PATH) -o $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked.bc
-	$(LLVM_LINK) $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi.bc $(HPVM_RT_PATH) -o $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi_linked.bc
-	$(CC) $(BUILD_DIR)/$(APP)_cudnn_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_cudnn_linked $(LINKER_FLAGS)
-	$(CC) $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked $(LINKER_FLAGS)
-	$(CC) $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi_linked $(LINKER_FLAGS)
-
-$(BUILD_DIR):
-	mkdir -p $@
-
-clean:
-	rm -rf $(BUILD_DIR)
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/resnet18/Makefile b/hpvm/test/dnn_benchmarks/benchmarks/resnet18/Makefile
deleted file mode 100644
index 3de4101bd66621728c80927a718f93ba1adf96d2..0000000000000000000000000000000000000000
--- a/hpvm/test/dnn_benchmarks/benchmarks/resnet18/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-DNN_BENCHMARK_ROOT = $(LLVM_SRC_ROOT)/tools/hpvm/test/dnn_benchmarks
-HPVM_BUILD_DIR = $(LLVM_BUILD_ROOT)
-
-CC = $(HPVM_BUILD_DIR)/bin/clang++
-OPT = $(HPVM_BUILD_DIR)/bin/opt
-LLVM_DIS = $(HPVM_BUILD_DIR)/bin/llvm-dis
-LLVM_LINK = $(HPVM_BUILD_DIR)/bin/llvm-link
-LLVM_INCLUDE_DIR = $(LLVM_SRC_ROOT)/include
-
-SRC_DIR = src
-BUILD_DIR = build
-APP = resnet18
-
-TENSOR_INCLUDE_DIR = $(DNN_BENCHMARK_ROOT)/common/include
-TENSOR_RT_INCLUDE_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/tensor_runtime/include
-TENSOR_LIB_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/lib/libtensor_runtime.a
-PROFILER_LIB_DIR = $(LLVM_SRC_ROOT)/projects/gpu_profiler/lib/libgpu_profiler.a
-SOC_SIMULATOR_LIB_DIR = $(LLVM_SRC_ROOT)/projects/soc_simulator/lib/libpromise_profiler.a
-TENSOR_AUTOTUNER_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/lib/libtensor_autotuner.a
-
-CC_FLAGS = -I $(LLVM_INCLUDE_DIR) -I $(TENSOR_INCLUDE_DIR) -I $(TENSOR_RT_INCLUDE_DIR) -I $(CUDA_INCLUDE_PATH)  -fno-exceptions -ffast-math -std=c++11 -O3
-CCFLAGS += -DDEVICE=CUDNN_TARGET
-LINKER_FLAGS = -lpthread -lcudart -lcurand -lcudnn -lcublas -lcufft -lOpenCL -lstdc++fs -lomp
-
-HPVM_LIB_DIR = $(HPVM_BUILD_DIR)/lib
-
-
-HPVM_OPTFLAGS = -load  $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_CUDNN.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load  $(HPVM_LIB_DIR)/LLVMClearDFG.so -inplace -dfg2llvm-cudnn -dfg2llvm-x86 -clearDFG
-
-
-PROMISE_QUANT_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/data/quant_ranges.txt
-
-WRAPPER_API_QUANT_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/data/quant_ranges_rt.txt
-CONF_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/data/tuner_confs.txt
-
-HPVM_OPTFLAGS3 = -load  $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_WrapperAPI.so    -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load  $(HPVM_LIB_DIR)/LLVMFuseHPVMTensorNodes.so  -load  $(HPVM_LIB_DIR)/LLVMClearDFG.so   -inplace -hpvm-fuse -dfg2llvm-wrapperapi -quantization-levels-filename=$(WRAPPER_API_QUANT_FILE_PATH) -configuration-inputs-filename=$(CONF_FILE_PATH) -dfg2llvm-x86 -clearDFG
-
-
-TEMP_CONF_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/predictive/temp.txt
-
-
-HPVM_PRED_OPTFLAGS3 = -load  $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_WrapperAPI.so    -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load  $(HPVM_LIB_DIR)/LLVMFuseHPVMTensorNodes.so  -load  $(HPVM_LIB_DIR)/LLVMClearDFG.so   -inplace -hpvm-fuse -dfg2llvm-wrapperapi -quantization-levels-filename=$(WRAPPER_API_QUANT_FILE_PATH) -configuration-inputs-filename=$(TEMP_CONF_FILE_PATH) -dfg2llvm-x86 -clearDFG
-
-TARGET = $(BUILD_DIR)/$(APP).opt.bc
-SOURCES = $(SRC_DIR)/$(APP).cpp
-HPVM_RT_PATH = $(LLVM_SRC_ROOT)/../build/projects/hpvm-rt/visc-rt.ll
-
-
-.PRECIOUS: $(BUILD_DIR)/$(APP).ll $(BUILD_DIR)/$(APP).hpvm.ll
-default: $(BUILD_DIR) $(TARGET)
-
-
-$(BUILD_DIR)/%.ll: $(SRC_DIR)/%.cpp
-	$(CC) $(CC_FLAGS) -emit-llvm src/$(APP).cpp -S -o  $(BUILD_DIR)/$(APP).ll  
-	$(CC) $(CC_FLAGS) -emit-llvm src/$(APP)_loop.cpp -S -o  $(BUILD_DIR)/$(APP)_loop.ll  
-
-
-$(BUILD_DIR)/%.opt.bc: $(BUILD_DIR)/%.ll
-	$(OPT) -load LLVMGenHPVM.so -genhpvm -globaldce  $(BUILD_DIR)/$(APP).ll -S -o  $(BUILD_DIR)/$(APP).visc.ll
-	$(OPT) -load LLVMGenHPVM.so -genhpvm -globaldce  $(BUILD_DIR)/$(APP)_loop.ll -S -o  $(BUILD_DIR)/$(APP)_loop.visc.ll
-	$(OPT) $(HPVM_OPTFLAGS)  $(BUILD_DIR)/$(APP).hpvm.ll  -o  $(BUILD_DIR)/$(APP)_cudnn.bc
-	$(OPT) $(HPVM_OPTFLAGS3) $(BUILD_DIR)/$(APP)_loop.hpvm.ll  -o  $(BUILD_DIR)/$(APP)_loop_wrapperapi.bc
-	$(OPT) $(HPVM_PRED_OPTFLAGS3) $(BUILD_DIR)/$(APP)_loop.hpvm.ll  -o  $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi.bc
-	$(LLVM_LINK) $(BUILD_DIR)/$(APP)_cudnn.bc $(HPVM_RT_PATH) -o $(BUILD_DIR)/$(APP)_cudnn_linked.bc
-	$(LLVM_LINK) $(BUILD_DIR)/$(APP)_loop_wrapperapi.bc $(HPVM_RT_PATH) -o $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked.bc
-	$(LLVM_LINK) $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi.bc $(HPVM_RT_PATH) -o $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi_linked.bc
-	$(CC) $(BUILD_DIR)/$(APP)_cudnn_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_cudnn_linked $(LINKER_FLAGS)
-	$(CC) $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked $(LINKER_FLAGS)
-	$(CC) $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi_linked $(LINKER_FLAGS)
-
-$(BUILD_DIR):
-	mkdir -p $@
-
-clean:
-	rm -rf $(BUILD_DIR)
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/resnet50_imagenet/Makefile b/hpvm/test/dnn_benchmarks/benchmarks/resnet50_imagenet/Makefile
deleted file mode 100644
index 1370ea035425ae3500a8239586ff8d187d027071..0000000000000000000000000000000000000000
--- a/hpvm/test/dnn_benchmarks/benchmarks/resnet50_imagenet/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-DNN_BENCHMARK_ROOT = $(LLVM_SRC_ROOT)/tools/hpvm/test/dnn_benchmarks
-HPVM_BUILD_DIR = $(LLVM_BUILD_ROOT)
-
-CC = $(HPVM_BUILD_DIR)/bin/clang++
-OPT = $(HPVM_BUILD_DIR)/bin/opt
-LLVM_DIS = $(HPVM_BUILD_DIR)/bin/llvm-dis
-LLVM_LINK = $(HPVM_BUILD_DIR)/bin/llvm-link
-LLVM_INCLUDE_DIR = $(LLVM_SRC_ROOT)/include
-
-SRC_DIR = src
-BUILD_DIR = build
-APP = resnet50_imagenet
-
-TENSOR_INCLUDE_DIR = $(DNN_BENCHMARK_ROOT)/common/include
-TENSOR_RT_INCLUDE_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/tensor_runtime/include
-TENSOR_LIB_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/lib/libtensor_runtime.a
-PROFILER_LIB_DIR = $(LLVM_SRC_ROOT)/projects/gpu_profiler/lib/libgpu_profiler.a
-SOC_SIMULATOR_LIB_DIR = $(LLVM_SRC_ROOT)/projects/soc_simulator/lib/libpromise_profiler.a
-TENSOR_AUTOTUNER_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/lib/libtensor_autotuner.a
-
-CC_FLAGS = -I $(LLVM_INCLUDE_DIR) -I $(TENSOR_INCLUDE_DIR) -I $(TENSOR_RT_INCLUDE_DIR) -I $(CUDA_INCLUDE_PATH)  -fno-exceptions -ffast-math -std=c++11 -O3
-CCFLAGS += -DDEVICE=CUDNN_TARGET
-LINKER_FLAGS = -lpthread -lcudart -lcurand -lcudnn -lcublas -lcufft -lOpenCL -lstdc++fs -lomp
-
-HPVM_LIB_DIR = $(HPVM_BUILD_DIR)/lib
-
-
-HPVM_OPTFLAGS = -load  $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_CUDNN.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load  $(HPVM_LIB_DIR)/LLVMClearDFG.so -inplace -dfg2llvm-cudnn -dfg2llvm-x86 -clearDFG
-
-
-PROMISE_QUANT_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/data/quant_ranges.txt
-
-WRAPPER_API_QUANT_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/data/quant_ranges_rt.txt
-CONF_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/data/tuner_confs.txt
-
-HPVM_OPTFLAGS3 = -load  $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_WrapperAPI.so    -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load  $(HPVM_LIB_DIR)/LLVMFuseHPVMTensorNodes.so  -load  $(HPVM_LIB_DIR)/LLVMClearDFG.so   -inplace -hpvm-fuse -dfg2llvm-wrapperapi -quantization-levels-filename=$(WRAPPER_API_QUANT_FILE_PATH) -configuration-inputs-filename=$(CONF_FILE_PATH) -dfg2llvm-x86 -clearDFG
-
-
-TEMP_CONF_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/predictive/temp.txt
-
-
-HPVM_PRED_OPTFLAGS3 = -load  $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_WrapperAPI.so    -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load  $(HPVM_LIB_DIR)/LLVMFuseHPVMTensorNodes.so  -load  $(HPVM_LIB_DIR)/LLVMClearDFG.so   -inplace -hpvm-fuse -dfg2llvm-wrapperapi -quantization-levels-filename=$(WRAPPER_API_QUANT_FILE_PATH) -configuration-inputs-filename=$(TEMP_CONF_FILE_PATH) -dfg2llvm-x86 -clearDFG
-
-TARGET = $(BUILD_DIR)/$(APP).opt.bc
-SOURCES = $(SRC_DIR)/$(APP).cpp
-HPVM_RT_PATH = $(LLVM_SRC_ROOT)/../build/projects/hpvm-rt/visc-rt.ll
-
-
-.PRECIOUS: $(BUILD_DIR)/$(APP).ll $(BUILD_DIR)/$(APP).hpvm.ll
-default: $(BUILD_DIR) $(TARGET)
-
-
-$(BUILD_DIR)/%.ll: $(SRC_DIR)/%.cpp
-	$(CC) $(CC_FLAGS) -emit-llvm src/$(APP).cpp -S -o  $(BUILD_DIR)/$(APP).ll  
-	$(CC) $(CC_FLAGS) -emit-llvm src/$(APP)_loop.cpp -S -o  $(BUILD_DIR)/$(APP)_loop.ll  
-
-
-$(BUILD_DIR)/%.opt.bc: $(BUILD_DIR)/%.ll
-	$(OPT) -load LLVMGenHPVM.so -genhpvm -globaldce  $(BUILD_DIR)/$(APP).ll -S -o  $(BUILD_DIR)/$(APP).visc.ll
-	$(OPT) -load LLVMGenHPVM.so -genhpvm -globaldce  $(BUILD_DIR)/$(APP)_loop.ll -S -o  $(BUILD_DIR)/$(APP)_loop.visc.ll
-	$(OPT) $(HPVM_OPTFLAGS)  $(BUILD_DIR)/$(APP).hpvm.ll  -o  $(BUILD_DIR)/$(APP)_cudnn.bc
-	$(OPT) $(HPVM_OPTFLAGS3) $(BUILD_DIR)/$(APP)_loop.hpvm.ll  -o  $(BUILD_DIR)/$(APP)_loop_wrapperapi.bc
-	$(OPT) $(HPVM_PRED_OPTFLAGS3) $(BUILD_DIR)/$(APP)_loop.hpvm.ll  -o  $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi.bc
-	$(LLVM_LINK) $(BUILD_DIR)/$(APP)_cudnn.bc $(HPVM_RT_PATH) -o $(BUILD_DIR)/$(APP)_cudnn_linked.bc
-	$(LLVM_LINK) $(BUILD_DIR)/$(APP)_loop_wrapperapi.bc $(HPVM_RT_PATH) -o $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked.bc
-	$(LLVM_LINK) $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi.bc $(HPVM_RT_PATH) -o $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi_linked.bc
-	$(CC) $(BUILD_DIR)/$(APP)_cudnn_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_cudnn_linked $(LINKER_FLAGS)
-	$(CC) $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked $(LINKER_FLAGS)
-	$(CC) $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi_linked $(LINKER_FLAGS)
-
-$(BUILD_DIR):
-	mkdir -p $@
-
-clean:
-	rm -rf $(BUILD_DIR)
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/Makefile b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/Makefile
deleted file mode 100644
index 3cc42b7709fa86bb3064256eb3bfe215550628ea..0000000000000000000000000000000000000000
--- a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-DNN_BENCHMARK_ROOT = $(LLVM_SRC_ROOT)/tools/hpvm/test/dnn_benchmarks
-HPVM_BUILD_DIR = $(LLVM_BUILD_ROOT)
-
-CC = $(HPVM_BUILD_DIR)/bin/clang++
-OPT = $(HPVM_BUILD_DIR)/bin/opt
-LLVM_DIS = $(HPVM_BUILD_DIR)/bin/llvm-dis
-LLVM_LINK = $(HPVM_BUILD_DIR)/bin/llvm-link
-LLVM_INCLUDE_DIR = $(LLVM_SRC_ROOT)/include
-
-SRC_DIR = src
-BUILD_DIR = build
-APP = vgg16_cifar10
-
-TENSOR_INCLUDE_DIR = $(DNN_BENCHMARK_ROOT)/common/include
-TENSOR_RT_INCLUDE_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/tensor_runtime/include
-TENSOR_LIB_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/lib/libtensor_runtime.a
-PROFILER_LIB_DIR = $(LLVM_SRC_ROOT)/projects/gpu_profiler/lib/libgpu_profiler.a
-SOC_SIMULATOR_LIB_DIR = $(LLVM_SRC_ROOT)/projects/soc_simulator/lib/libpromise_profiler.a
-TENSOR_AUTOTUNER_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/lib/libtensor_autotuner.a
-
-CC_FLAGS = -I $(LLVM_INCLUDE_DIR) -I $(TENSOR_INCLUDE_DIR) -I $(TENSOR_RT_INCLUDE_DIR) -I $(CUDA_INCLUDE_PATH)  -fno-exceptions -ffast-math -std=c++11 -O3
-CCFLAGS += -DDEVICE=CUDNN_TARGET
-LINKER_FLAGS = -lpthread -lcudart -lcurand -lcudnn -lcublas -lcufft -lOpenCL -lstdc++fs -lomp
-
-HPVM_LIB_DIR = $(HPVM_BUILD_DIR)/lib
-
-
-HPVM_OPTFLAGS = -load  $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_CUDNN.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load  $(HPVM_LIB_DIR)/LLVMClearDFG.so -inplace -dfg2llvm-cudnn -dfg2llvm-x86 -clearDFG
-
-
-PROMISE_QUANT_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/data/quant_ranges.txt
-
-WRAPPER_API_QUANT_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/data/quant_ranges_rt.txt
-CONF_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/data/tuner_confs.txt
-
-HPVM_OPTFLAGS3 = -load  $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_WrapperAPI.so    -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load  $(HPVM_LIB_DIR)/LLVMFuseHPVMTensorNodes.so  -load  $(HPVM_LIB_DIR)/LLVMClearDFG.so   -inplace -hpvm-fuse -dfg2llvm-wrapperapi -quantization-levels-filename=$(WRAPPER_API_QUANT_FILE_PATH) -configuration-inputs-filename=$(CONF_FILE_PATH) -dfg2llvm-x86 -clearDFG
-
-
-TEMP_CONF_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/predictive/temp.txt
-
-
-HPVM_PRED_OPTFLAGS3 = -load  $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_WrapperAPI.so    -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load  $(HPVM_LIB_DIR)/LLVMFuseHPVMTensorNodes.so  -load  $(HPVM_LIB_DIR)/LLVMClearDFG.so   -inplace -hpvm-fuse -dfg2llvm-wrapperapi -quantization-levels-filename=$(WRAPPER_API_QUANT_FILE_PATH) -configuration-inputs-filename=$(TEMP_CONF_FILE_PATH) -dfg2llvm-x86 -clearDFG
-
-TARGET = $(BUILD_DIR)/$(APP).opt.bc
-SOURCES = $(SRC_DIR)/$(APP).cpp
-HPVM_RT_PATH = $(LLVM_SRC_ROOT)/../build/projects/hpvm-rt/visc-rt.ll
-
-
-.PRECIOUS: $(BUILD_DIR)/$(APP).ll $(BUILD_DIR)/$(APP).hpvm.ll
-default: $(BUILD_DIR) $(TARGET)
-
-
-$(BUILD_DIR)/%.ll: $(SRC_DIR)/%.cpp
-	$(CC) $(CC_FLAGS) -emit-llvm src/$(APP).cpp -S -o  $(BUILD_DIR)/$(APP).ll  
-	$(CC) $(CC_FLAGS) -emit-llvm src/$(APP)_loop.cpp -S -o  $(BUILD_DIR)/$(APP)_loop.ll  
-
-
-$(BUILD_DIR)/%.opt.bc: $(BUILD_DIR)/%.ll
-	$(OPT) -load LLVMGenHPVM.so -genhpvm -globaldce  $(BUILD_DIR)/$(APP).ll -S -o  $(BUILD_DIR)/$(APP).visc.ll
-	$(OPT) -load LLVMGenHPVM.so -genhpvm -globaldce  $(BUILD_DIR)/$(APP)_loop.ll -S -o  $(BUILD_DIR)/$(APP)_loop.visc.ll
-	$(OPT) $(HPVM_OPTFLAGS)  $(BUILD_DIR)/$(APP).hpvm.ll  -o  $(BUILD_DIR)/$(APP)_cudnn.bc
-	$(OPT) $(HPVM_OPTFLAGS3) $(BUILD_DIR)/$(APP)_loop.hpvm.ll  -o  $(BUILD_DIR)/$(APP)_loop_wrapperapi.bc
-	$(OPT) $(HPVM_PRED_OPTFLAGS3) $(BUILD_DIR)/$(APP)_loop.hpvm.ll  -o  $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi.bc
-	$(LLVM_LINK) $(BUILD_DIR)/$(APP)_cudnn.bc $(HPVM_RT_PATH) -o $(BUILD_DIR)/$(APP)_cudnn_linked.bc
-	$(LLVM_LINK) $(BUILD_DIR)/$(APP)_loop_wrapperapi.bc $(HPVM_RT_PATH) -o $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked.bc
-	$(LLVM_LINK) $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi.bc $(HPVM_RT_PATH) -o $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi_linked.bc
-	$(CC) $(BUILD_DIR)/$(APP)_cudnn_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_cudnn_linked $(LINKER_FLAGS)
-	$(CC) $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked $(LINKER_FLAGS)
-	$(CC) $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi_linked $(LINKER_FLAGS)
-
-$(BUILD_DIR):
-	mkdir -p $@
-
-clean:
-	rm -rf $(BUILD_DIR)
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/Makefile b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/Makefile
deleted file mode 100644
index e64af1183e3b294e33d773a96c262bce62ed6da9..0000000000000000000000000000000000000000
--- a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-DNN_BENCHMARK_ROOT = $(LLVM_SRC_ROOT)/tools/hpvm/test/dnn_benchmarks
-HPVM_BUILD_DIR = $(LLVM_BUILD_ROOT)
-
-CC = $(HPVM_BUILD_DIR)/bin/clang++
-OPT = $(HPVM_BUILD_DIR)/bin/opt
-LLVM_DIS = $(HPVM_BUILD_DIR)/bin/llvm-dis
-LLVM_LINK = $(HPVM_BUILD_DIR)/bin/llvm-link
-LLVM_INCLUDE_DIR = $(LLVM_SRC_ROOT)/include
-
-SRC_DIR = src
-BUILD_DIR = build
-APP = vgg16_cifar100
-
-TENSOR_INCLUDE_DIR = $(DNN_BENCHMARK_ROOT)/common/include
-TENSOR_RT_INCLUDE_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/tensor_runtime/include
-TENSOR_LIB_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/lib/libtensor_runtime.a
-PROFILER_LIB_DIR = $(LLVM_SRC_ROOT)/projects/gpu_profiler/lib/libgpu_profiler.a
-SOC_SIMULATOR_LIB_DIR = $(LLVM_SRC_ROOT)/projects/soc_simulator/lib/libpromise_profiler.a
-TENSOR_AUTOTUNER_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/lib/libtensor_autotuner.a
-
-CC_FLAGS = -I $(LLVM_INCLUDE_DIR) -I $(TENSOR_INCLUDE_DIR) -I $(TENSOR_RT_INCLUDE_DIR) -I $(CUDA_INCLUDE_PATH)  -fno-exceptions -ffast-math -std=c++11 -O3
-CCFLAGS += -DDEVICE=CUDNN_TARGET
-LINKER_FLAGS = -lpthread -lcudart -lcurand -lcudnn -lcublas -lcufft -lOpenCL -lstdc++fs -lomp
-
-HPVM_LIB_DIR = $(HPVM_BUILD_DIR)/lib
-
-
-HPVM_OPTFLAGS = -load  $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_CUDNN.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load  $(HPVM_LIB_DIR)/LLVMClearDFG.so -inplace -dfg2llvm-cudnn -dfg2llvm-x86 -clearDFG
-
-
-PROMISE_QUANT_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/data/quant_ranges.txt
-
-WRAPPER_API_QUANT_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/data/quant_ranges_rt.txt
-CONF_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/data/tuner_confs.txt
-
-HPVM_OPTFLAGS3 = -load  $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_WrapperAPI.so    -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load  $(HPVM_LIB_DIR)/LLVMFuseHPVMTensorNodes.so  -load  $(HPVM_LIB_DIR)/LLVMClearDFG.so   -inplace -hpvm-fuse -dfg2llvm-wrapperapi -quantization-levels-filename=$(WRAPPER_API_QUANT_FILE_PATH) -configuration-inputs-filename=$(CONF_FILE_PATH) -dfg2llvm-x86 -clearDFG
-
-
-TEMP_CONF_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/predictive/temp.txt
-
-
-HPVM_PRED_OPTFLAGS3 = -load  $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_WrapperAPI.so    -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load  $(HPVM_LIB_DIR)/LLVMFuseHPVMTensorNodes.so  -load  $(HPVM_LIB_DIR)/LLVMClearDFG.so   -inplace -hpvm-fuse -dfg2llvm-wrapperapi -quantization-levels-filename=$(WRAPPER_API_QUANT_FILE_PATH) -configuration-inputs-filename=$(TEMP_CONF_FILE_PATH) -dfg2llvm-x86 -clearDFG
-
-TARGET = $(BUILD_DIR)/$(APP).opt.bc
-SOURCES = $(SRC_DIR)/$(APP).cpp
-HPVM_RT_PATH = $(LLVM_SRC_ROOT)/../build/projects/hpvm-rt/visc-rt.ll
-
-
-.PRECIOUS: $(BUILD_DIR)/$(APP).ll $(BUILD_DIR)/$(APP).hpvm.ll
-default: $(BUILD_DIR) $(TARGET)
-
-
-$(BUILD_DIR)/%.ll: $(SRC_DIR)/%.cpp
-	$(CC) $(CC_FLAGS) -emit-llvm src/$(APP).cpp -S -o  $(BUILD_DIR)/$(APP).ll  
-	$(CC) $(CC_FLAGS) -emit-llvm src/$(APP)_loop.cpp -S -o  $(BUILD_DIR)/$(APP)_loop.ll  
-
-
-$(BUILD_DIR)/%.opt.bc: $(BUILD_DIR)/%.ll
-	$(OPT) -load LLVMGenHPVM.so -genhpvm -globaldce  $(BUILD_DIR)/$(APP).ll -S -o  $(BUILD_DIR)/$(APP).visc.ll
-	$(OPT) -load LLVMGenHPVM.so -genhpvm -globaldce  $(BUILD_DIR)/$(APP)_loop.ll -S -o  $(BUILD_DIR)/$(APP)_loop.visc.ll
-	$(OPT) $(HPVM_OPTFLAGS)  $(BUILD_DIR)/$(APP).hpvm.ll  -o  $(BUILD_DIR)/$(APP)_cudnn.bc
-	$(OPT) $(HPVM_OPTFLAGS3) $(BUILD_DIR)/$(APP)_loop.hpvm.ll  -o  $(BUILD_DIR)/$(APP)_loop_wrapperapi.bc
-	$(OPT) $(HPVM_PRED_OPTFLAGS3) $(BUILD_DIR)/$(APP)_loop.hpvm.ll  -o  $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi.bc
-	$(LLVM_LINK) $(BUILD_DIR)/$(APP)_cudnn.bc $(HPVM_RT_PATH) -o $(BUILD_DIR)/$(APP)_cudnn_linked.bc
-	$(LLVM_LINK) $(BUILD_DIR)/$(APP)_loop_wrapperapi.bc $(HPVM_RT_PATH) -o $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked.bc
-	$(LLVM_LINK) $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi.bc $(HPVM_RT_PATH) -o $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi_linked.bc
-	$(CC) $(BUILD_DIR)/$(APP)_cudnn_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_cudnn_linked $(LINKER_FLAGS)
-	$(CC) $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked $(LINKER_FLAGS)
-	$(CC) $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi_linked $(LINKER_FLAGS)
-
-$(BUILD_DIR):
-	mkdir -p $@
-
-clean:
-	rm -rf $(BUILD_DIR)
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_imagenet/Makefile b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_imagenet/Makefile
deleted file mode 100644
index 3536d71cd608f5ad92d95517dfffbb09eda90f30..0000000000000000000000000000000000000000
--- a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_imagenet/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-DNN_BENCHMARK_ROOT = $(LLVM_SRC_ROOT)/tools/hpvm/test/dnn_benchmarks
-HPVM_BUILD_DIR = $(LLVM_BUILD_ROOT)
-
-CC = $(HPVM_BUILD_DIR)/bin/clang++
-OPT = $(HPVM_BUILD_DIR)/bin/opt
-LLVM_DIS = $(HPVM_BUILD_DIR)/bin/llvm-dis
-LLVM_LINK = $(HPVM_BUILD_DIR)/bin/llvm-link
-LLVM_INCLUDE_DIR = $(LLVM_SRC_ROOT)/include
-
-SRC_DIR = src
-BUILD_DIR = build
-APP = vgg16_imagenet
-
-TENSOR_INCLUDE_DIR = $(DNN_BENCHMARK_ROOT)/common/include
-TENSOR_RT_INCLUDE_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/tensor_runtime/include
-TENSOR_LIB_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/lib/libtensor_runtime.a
-PROFILER_LIB_DIR = $(LLVM_SRC_ROOT)/projects/gpu_profiler/lib/libgpu_profiler.a
-SOC_SIMULATOR_LIB_DIR = $(LLVM_SRC_ROOT)/projects/soc_simulator/lib/libpromise_profiler.a
-TENSOR_AUTOTUNER_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/lib/libtensor_autotuner.a
-
-CC_FLAGS = -I $(LLVM_INCLUDE_DIR) -I $(TENSOR_INCLUDE_DIR) -I $(TENSOR_RT_INCLUDE_DIR) -I $(CUDA_INCLUDE_PATH)  -fno-exceptions -ffast-math -std=c++11 -O3
-CCFLAGS += -DDEVICE=CUDNN_TARGET
-LINKER_FLAGS = -lpthread -lcudart -lcurand -lcudnn -lcublas -lcufft -lOpenCL -lstdc++fs -lomp
-
-HPVM_LIB_DIR = $(HPVM_BUILD_DIR)/lib
-
-
-HPVM_OPTFLAGS = -load  $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_CUDNN.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load  $(HPVM_LIB_DIR)/LLVMClearDFG.so -inplace -dfg2llvm-cudnn -dfg2llvm-x86 -clearDFG
-
-
-PROMISE_QUANT_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/data/quant_ranges.txt
-
-WRAPPER_API_QUANT_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/data/quant_ranges_rt.txt
-CONF_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/data/tuner_confs.txt
-
-HPVM_OPTFLAGS3 = -load  $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_WrapperAPI.so    -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load  $(HPVM_LIB_DIR)/LLVMFuseHPVMTensorNodes.so  -load  $(HPVM_LIB_DIR)/LLVMClearDFG.so   -inplace -hpvm-fuse -dfg2llvm-wrapperapi -quantization-levels-filename=$(WRAPPER_API_QUANT_FILE_PATH) -configuration-inputs-filename=$(CONF_FILE_PATH) -dfg2llvm-x86 -clearDFG
-
-
-TEMP_CONF_FILE_PATH=$(LLVM_SRC_ROOT)/test/dnn_benchmarks/benchmarks/$(APP)/predictive/temp.txt
-
-
-HPVM_PRED_OPTFLAGS3 = -load  $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_WrapperAPI.so    -load  $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load  $(HPVM_LIB_DIR)/LLVMFuseHPVMTensorNodes.so  -load  $(HPVM_LIB_DIR)/LLVMClearDFG.so   -inplace -hpvm-fuse -dfg2llvm-wrapperapi -quantization-levels-filename=$(WRAPPER_API_QUANT_FILE_PATH) -configuration-inputs-filename=$(TEMP_CONF_FILE_PATH) -dfg2llvm-x86 -clearDFG
-
-TARGET = $(BUILD_DIR)/$(APP).opt.bc
-SOURCES = $(SRC_DIR)/$(APP).cpp
-HPVM_RT_PATH = $(LLVM_SRC_ROOT)/../build/projects/hpvm-rt/visc-rt.ll
-
-
-.PRECIOUS: $(BUILD_DIR)/$(APP).ll $(BUILD_DIR)/$(APP).hpvm.ll
-default: $(BUILD_DIR) $(TARGET)
-
-
-$(BUILD_DIR)/%.ll: $(SRC_DIR)/%.cpp
-	$(CC) $(CC_FLAGS) -emit-llvm src/$(APP).cpp -S -o  $(BUILD_DIR)/$(APP).ll  
-	$(CC) $(CC_FLAGS) -emit-llvm src/$(APP)_loop.cpp -S -o  $(BUILD_DIR)/$(APP)_loop.ll  
-
-
-$(BUILD_DIR)/%.opt.bc: $(BUILD_DIR)/%.ll
-	$(OPT) -load LLVMGenHPVM.so -genhpvm -globaldce  $(BUILD_DIR)/$(APP).ll -S -o  $(BUILD_DIR)/$(APP).visc.ll
-	$(OPT) -load LLVMGenHPVM.so -genhpvm -globaldce  $(BUILD_DIR)/$(APP)_loop.ll -S -o  $(BUILD_DIR)/$(APP)_loop.visc.ll
-	$(OPT) $(HPVM_OPTFLAGS)  $(BUILD_DIR)/$(APP).hpvm.ll  -o  $(BUILD_DIR)/$(APP)_cudnn.bc
-	$(OPT) $(HPVM_OPTFLAGS3) $(BUILD_DIR)/$(APP)_loop.hpvm.ll  -o  $(BUILD_DIR)/$(APP)_loop_wrapperapi.bc
-	$(OPT) $(HPVM_PRED_OPTFLAGS3) $(BUILD_DIR)/$(APP)_loop.hpvm.ll  -o  $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi.bc
-	$(LLVM_LINK) $(BUILD_DIR)/$(APP)_cudnn.bc $(HPVM_RT_PATH) -o $(BUILD_DIR)/$(APP)_cudnn_linked.bc
-	$(LLVM_LINK) $(BUILD_DIR)/$(APP)_loop_wrapperapi.bc $(HPVM_RT_PATH) -o $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked.bc
-	$(LLVM_LINK) $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi.bc $(HPVM_RT_PATH) -o $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi_linked.bc
-	$(CC) $(BUILD_DIR)/$(APP)_cudnn_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_cudnn_linked $(LINKER_FLAGS)
-	$(CC) $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked $(LINKER_FLAGS)
-	$(CC) $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_pred_loop_wrapperapi_linked $(LINKER_FLAGS)
-
-$(BUILD_DIR):
-	mkdir -p $@
-
-clean:
-	rm -rf $(BUILD_DIR)