diff --git a/llvm/projects/hpvm-tensor-rt/CMakeLists.txt b/llvm/projects/hpvm-tensor-rt/CMakeLists.txt
index 76730ff31402aa90a589ee17f4b45b2ecc2ca7b0..b3b6cb6e179ee39c82459f13b1734f8c0e626e01 100644
--- a/llvm/projects/hpvm-tensor-rt/CMakeLists.txt
+++ b/llvm/projects/hpvm-tensor-rt/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.5)
project (hpvm-tensor-rt)
find_package(CUDA 6.5 REQUIRED)
set(CUDA_SEPARABLE_COMPILATION ON CACHE BOOL "")
@@ -118,33 +118,34 @@ target_compile_definitions(tensor_runtime_online PRIVATE -DONLINE_PROFILING=true
# Adding rule for the debugging source
add_executable(unit_tests dnn_sources/src/unit_tests.cc)
-target_link_libraries(unit_tests tensor_runtime ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
+target_link_libraries(unit_tests tensor_runtime_online ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
+#**************** FP32 Source Builds ***********
add_executable(lenet_mnist dnn_sources/src/lenet_mnist.cc)
-target_link_libraries(lenet_mnist tensor_runtime ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
+target_link_libraries(lenet_mnist tensor_runtime_online ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
add_executable(alexnet_cifar10 dnn_sources/src/alexnet_cifar10.cc)
-target_link_libraries(alexnet_cifar10 tensor_runtime ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
+target_link_libraries(alexnet_cifar10 tensor_runtime_online ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
add_executable(alexnet2_cifar10 dnn_sources/src/alexnet2_cifar10.cc)
-target_link_libraries(alexnet2_cifar10 tensor_runtime ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
+target_link_libraries(alexnet2_cifar10 tensor_runtime_online ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
add_executable(vgg16_cifar10 dnn_sources/src/vgg16_cifar10.cc)
-target_link_libraries(vgg16_cifar10 tensor_runtime ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
+target_link_libraries(vgg16_cifar10 tensor_runtime_online ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
add_executable(resnet18_cifar10 dnn_sources/src/resnet18_cifar10.cc)
-target_link_libraries(resnet18_cifar10 tensor_runtime ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
+target_link_libraries(resnet18_cifar10 tensor_runtime_online ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
add_executable(vgg16_cifar100 dnn_sources/src/vgg16_cifar100.cc)
-target_link_libraries(vgg16_cifar100 tensor_runtime ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
+target_link_libraries(vgg16_cifar100 tensor_runtime_online ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
add_executable(mobilenet dnn_sources/src/mobilenet.cc)
-target_link_libraries(mobilenet tensor_runtime ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
+target_link_libraries(mobilenet tensor_runtime_online ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
add_executable(mobilenet_shallow dnn_sources/src/mobilenet_shallow.cc)
-target_link_libraries(mobilenet_shallow tensor_runtime ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
+target_link_libraries(mobilenet_shallow tensor_runtime_online ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
add_executable(resnet50_imagenet dnn_sources/src/resnet50_imagenet.cc)
target_link_libraries(resnet50_imagenet tensor_runtime_online ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
@@ -152,7 +153,37 @@ target_link_libraries(resnet50_imagenet tensor_runtime_online ${GPU_PROFILER_L
-#********* Promise API sources
+#********* FP16 Source Builds ******
+
+add_executable(lenet_half dnn_sources/src/half/lenet_mnist_half.cc)
+target_link_libraries(lenet_half tensor_runtime_online ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
+
+add_executable(alexnet_half dnn_sources/src/half/alexnet_cifar10_half.cc)
+target_link_libraries(alexnet_half tensor_runtime_online ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
+
+add_executable(alexnet2_half dnn_sources/src/half/alexnet2_cifar10_half.cc)
+target_link_libraries(alexnet2_half tensor_runtime_online ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
+
+add_executable(resnet18_half dnn_sources/src/half/resnet18_cifar10_half.cc)
+target_link_libraries(resnet18_half tensor_runtime_online ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
+
+add_executable(vgg16_cifar10_half dnn_sources/src/half/vgg16_cifar10_half.cc)
+target_link_libraries(vgg16_cifar10_half tensor_runtime_online ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
+
+add_executable(vgg16_cifar100_half dnn_sources/src/half/vgg16_cifar100_half.cc)
+target_link_libraries(vgg16_cifar100_half tensor_runtime_online ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
+
+add_executable(mobilenet_half dnn_sources/src/half/mobilenet_half.cc)
+target_link_libraries(mobilenet_half tensor_runtime_online ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
+
+add_executable(mobilenet_shallow_half dnn_sources/src/half/mobilenet_shallow_half.cc)
+target_link_libraries(mobilenet_shallow_half tensor_runtime_online ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
+
+
+
+
+#********* Promise API sources - Used with the Autouner
+
add_executable(lenet_promise dnn_sources/src/promise/lenet_promise.cc)
target_link_libraries(lenet_promise tensor_runtime_online ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
@@ -188,71 +219,6 @@ target_link_libraries(resnet50_imagenet_promise tensor_runtime_online ${GPU_PR
-#********* Promise API sources
-add_executable(lenet_promise_install dnn_sources/src/promise/lenet_promise.cc)
-target_link_libraries(lenet_promise_install tensor_runtime_install ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
-
-
-add_executable(alexnet_promise_install dnn_sources/src/promise/alexnet_promise.cc)
-target_link_libraries(alexnet_promise_install tensor_runtime_install ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
-
-add_executable(alexnet2_promise_install dnn_sources/src/promise/alexnet2_promise.cc)
-target_link_libraries(alexnet2_promise_install tensor_runtime_install ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
-
-add_executable(resnet18_promise_install dnn_sources/src/promise/resnet18_promise.cc)
-target_link_libraries(resnet18_promise_install tensor_runtime_install ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
-
-add_executable(vgg16_cifar100_promise_install dnn_sources/src/promise/vgg16_cifar100_promise.cc)
-target_link_libraries(vgg16_cifar100_promise_install tensor_runtime_install ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
-
-add_executable(vgg16_cifar10_promise_install dnn_sources/src/promise/vgg16_cifar10_promise.cc)
-target_link_libraries(vgg16_cifar10_promise_install tensor_runtime_install ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
-
-add_executable(mobilenet_promise_install dnn_sources/src/promise/mobilenet_promise.cc)
-target_link_libraries(mobilenet_promise_install tensor_runtime_install ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
-
-add_executable(mobilenet_shallow_promise_install dnn_sources/src/promise/mobilenet_shallow_promise.cc)
-target_link_libraries(mobilenet_shallow_promise_install tensor_runtime_install ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
-
-add_executable(vgg16_imagenet_promise_install dnn_sources/src/promise/vgg16_imagenet_promise.cc)
-target_link_libraries(vgg16_imagenet_promise_install tensor_runtime_install ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
-
-add_executable(resnet50_imagenet_promise_install dnn_sources/src/promise/resnet50_imagenet_promise.cc)
-target_link_libraries(resnet50_imagenet_promise_install tensor_runtime_install ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
-
-
-
-
-
-
-#********* Half Precision Sources ******
-
-
-add_executable(lenet_half dnn_sources/src/half/lenet_mnist_half.cc)
-target_link_libraries(lenet_half tensor_runtime_online ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
-
-add_executable(alexnet_half dnn_sources/src/half/alexnet_cifar10_half.cc)
-target_link_libraries(alexnet_half tensor_runtime_online ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
-
-add_executable(alexnet2_half dnn_sources/src/half/alexnet2_cifar10_half.cc)
-target_link_libraries(alexnet2_half tensor_runtime_online ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
-
-add_executable(resnet18_half dnn_sources/src/half/resnet18_cifar10_half.cc)
-target_link_libraries(resnet18_half tensor_runtime_online ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
-
-add_executable(vgg16_cifar10_half dnn_sources/src/half/vgg16_cifar10_half.cc)
-target_link_libraries(vgg16_cifar10_half tensor_runtime_online ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
-
-add_executable(vgg16_cifar100_half dnn_sources/src/half/vgg16_cifar100_half.cc)
-target_link_libraries(vgg16_cifar100_half tensor_runtime_online ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
-
-add_executable(mobilenet_half dnn_sources/src/half/mobilenet_half.cc)
-target_link_libraries(mobilenet_half tensor_runtime_online ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
-
-add_executable(mobilenet_shallow_half dnn_sources/src/half/mobilenet_shallow_half.cc)
-target_link_libraries(mobilenet_shallow_half tensor_runtime_online ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
-
-
# OpenTuner Piped Sources
@@ -288,38 +254,6 @@ target_link_libraries(resnet50_imagenet_piped tensor_runtime_online ${GPU_PROF
-# OpenTuner Piped Sources - FP16 supported version --- used for install-time tuning
-add_executable(alexnet_piped_install dnn_sources/src/promise/alexnet_piped.cc)
-target_link_libraries(alexnet_piped_install tensor_runtime_install ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
-
-add_executable(alexnet2_piped_install dnn_sources/src/promise/alexnet2_piped.cc)
-target_link_libraries(alexnet2_piped_install tensor_runtime_install ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
-
-add_executable(lenet_piped_install dnn_sources/src/promise/lenet_piped.cc)
-target_link_libraries(lenet_piped_install tensor_runtime_install ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
-
-add_executable(resnet18_piped_install dnn_sources/src/promise/resnet18_piped.cc)
-target_link_libraries(resnet18_piped_install tensor_runtime_install ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
-
-add_executable(vgg16_cifar10_piped_install dnn_sources/src/promise/vgg16_cifar10_piped.cc)
-target_link_libraries(vgg16_cifar10_piped_install tensor_runtime_install ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
-
-add_executable(vgg16_cifar100_piped_install dnn_sources/src/promise/vgg16_cifar100_piped.cc)
-target_link_libraries(vgg16_cifar100_piped_install tensor_runtime_install ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
-
-add_executable(mobilenet_piped_install dnn_sources/src/promise/mobilenet_piped.cc)
-target_link_libraries(mobilenet_piped_install tensor_runtime_install ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
-
-add_executable(mobilenet_shallow_piped_install dnn_sources/src/promise/mobilenet_shallow_piped.cc)
-target_link_libraries(mobilenet_shallow_piped_install tensor_runtime_install ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
-
-add_executable(vgg16_imagenet_piped_install dnn_sources/src/promise/vgg16_imagenet_piped.cc)
-target_link_libraries(vgg16_imagenet_piped_install tensor_runtime_install ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
-
-add_executable(resnet50_imagenet_piped_install dnn_sources/src/promise/resnet50_imagenet_piped.cc)
-target_link_libraries(resnet50_imagenet_piped_install tensor_runtime_install ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
-
-
#### Image Processing Benchmarks