Merge pull request #854 from os-fpga/custom_target_and_copy_vpr_latest

vpr_latest: custom cmake target, copy vpr_latest exec

Author: serge-dsa

CMakeLists.txt

@@ -307,22 +307,19 @@ add_subdirectory(OpenFPGA)
 set(IPO_LINK_WARN_SUPRESS_FLAGS " ")
 
 
-# Sub-project 'planning' (aka planner)
-add_subdirectory(planning)
-add_dependencies(planning vpr)
-
 # Script to build vpr_latest.
 # We cannot add vpr_latest as cmake dependency because VPR external utilities
 # cmake-targets conflict with OpenFPGA versions of the same targets.
-message(STATUS "\n------------\n")
-message(STATUS "-- begin vpr_latest build script: VPR_LATEST_DEST_DIR= ${VPR_LATEST_DEST_DIR}\n")
-set(SCRIPT_STATUS 111)
-execute_process(
+
+add_custom_target(build_vpr_latest)
+add_custom_command(
+  TARGET build_vpr_latest
   COMMAND bash build_vpr_latest.sh
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/vpr_latest
-  RESULT_VARIABLE SCRIPT_STATUS
-  )
-message(STATUS "")
-message(STATUS "-- end vpr_latest build script: SCRIPT_STATUS= ${SCRIPT_STATUS}\n")
-message(STATUS "--------------\n")
+)
+
+
+# Sub-project 'planning' (aka planner)
+add_subdirectory(planning)
+add_dependencies(planning vpr build_vpr_latest)
 

planning/src/main.cpp

@@ -1,4 +1,4 @@
-static const char* _pln_VERSION_STR = "pln0339";
+static const char* _pln_VERSION_STR = "pln0340";
 
 #include "RS/rsEnv.h"
 #include "util/pln_log.h"

vpr_latest/build_vpr_latest.sh

@@ -1,17 +1,33 @@
 #!/bin/bash
 
-printf "\n   building vpr_latest in $(pwd)\n"
+cur_dir=$(pwd)
+printf "\n   building vpr_latest in $cur_dir\n"
 
 hw_num_cores=`grep -F "model name" /proc/cpuinfo | wc -l`
 
 export CPU_CORES=${CPU_CORES:="$hw_num_cores"}
 
-printf "   CPU_CORES= $CPU_CORES   hw_num_cores= $hw_num_cores\n\n"
+printf "   CPU_CORES= $CPU_CORES   hw_num_cores= $hw_num_cores\n"
+
+vpr_latest_bin_dir="$cur_dir/vtr/build/vpr"
+printf "\n   vpr_latest_bin_dir= $vpr_latest_bin_dir\n\n"
+
 
 cd vtr && make -j $CPU_CORES
 
+
 vtr_make_status=$?
 
 printf "\n   vtr_make_status= $vtr_make_status\n"
-printf "\n   done building vpr_latest in $(pwd)\n\n"
+printf "   vpr_latest_bin_dir= $vpr_latest_bin_dir\n"
+
+printf "\n   "
+ls -1 "$vpr_latest_bin_dir/vpr"
+file_status=$?
+if (( $file_status == 0 )); then
+    printf "\ncopying to vpr_latest..\n"
+    cp -v "$vpr_latest_bin_dir/vpr" "$cur_dir/vpr_latest"
+fi
+
+printf "\n   done building vpr_latest in $cur_dir\n\n"