Merge pull request #855 from os-fpga/build_vpr_latest_init_git

build_vpr_latest: init submodule if it's missing

Author: serge-dsa

CMakeLists.txt

@@ -314,7 +314,7 @@ set(IPO_LINK_WARN_SUPRESS_FLAGS " ")
 add_custom_target(build_vpr_latest)
 add_custom_command(
   TARGET build_vpr_latest
-  COMMAND bash build_vpr_latest.sh
+  COMMAND bash build_vpr_latest.sh ${PATCH_DIR}/CMAKE_fix/PATCHED_vpr_latest/CMakeLists.txt
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/vpr_latest
 )
 

include/CMAKE_fix/PATCHED_vpr_latest/CMakeLists.txt

@@ -411,9 +411,9 @@ endif()
 
 add_subdirectory(libs) #libs/CMakeLists.txt handles adding warnings flags to non-external libraries
 
-if(${WITH_PARMYS})
-    add_subdirectory(parmys)
-endif()
+#if(${WITH_PARMYS})
+#    add_subdirectory(parmys)
+#endif()
 
 #Add the various tools
 add_compile_options(${WARN_FLAGS}) #Add warn flags for VTR tools

vpr_latest/build_vpr_latest.sh

@@ -10,12 +10,21 @@ export CPU_CORES=${CPU_CORES:="$hw_num_cores"}
 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"
 
+mkdir -p vtr
+pushd vtr
+ls -1 Makefile || git submodule update --init --recursive
+popd
 
-cd vtr && make -j $CPU_CORES
-
+# copy the patched CMakefile
+# include/CMAKE_fix/PATCHED_vpr_latest/CMakeLists.txt
+if (( $# > 0 )); then
+  cp -v $1 vtr
+fi
 
+# do make in vtr
+echo
+cd vtr && make -j $CPU_CORES
 vtr_make_status=$?
 
 printf "\n   vtr_make_status= $vtr_make_status\n"
@@ -27,6 +36,12 @@ file_status=$?
 if (( $file_status == 0 )); then
     printf "\ncopying to vpr_latest..\n"
     cp -v "$vpr_latest_bin_dir/vpr" "$cur_dir/vpr_latest"
+    echo "build_vpr_latest SUCCEEDED"
+else
+  echo
+  echo "build_vpr_latest: vpr binary not found: $vpr_latest_bin_dir/vpr"
+  echo "build_vpr_latest FAILED"
+  echo
 fi
 
 printf "\n   done building vpr_latest in $cur_dir\n\n"