vtrutil/vpr: Include more build configuration options in vpr --version

Author: kmurray

libs/libvtrutil/CMakeLists.txt

@@ -22,12 +22,32 @@ if(NOT DEFINED VTR_VERSION_PATCH)
     set(VTR_VERSION_PATCH 0)
 endif()
 
-set(VTR_BUILD_TYPE "${CMAKE_BUILD_TYPE}")
+set(VTR_BUILD_INFO "${CMAKE_BUILD_TYPE}")
 if (CMAKE_INTERPROCEDURAL_OPTIMIZATION)
-    set(VTR_BUILD_TYPE "${VTR_BUILD_TYPE} IPO")
+    set(VTR_BUILD_INFO "${VTR_BUILD_INFO} IPO")
 endif()
+
 if (VPR_PGO_CONFIG STREQUAL "prof_use")
-    set(VTR_BUILD_TYPE "${VTR_BUILD_TYPE} PGO")
+    set(VTR_BUILD_INFO "${VTR_BUILD_INFO} PGO")
+elseif (VPR_PGO_CONFIG STREQUAL "prof_gen")
+    set(VTR_BUILD_INFO "${VTR_BUILD_INFO} PGOgen")
+endif()
+
+set(VTR_BUILD_INFO "${VTR_BUILD_INFO} VTR_ASSERT_LEVEL=${VTR_ASSERT_LEVEL}")
+
+if (VTR_ENABLE_SANITIZE)
+    set(VTR_BUILD_INFO "${VTR_BUILD_INFO} sanitizers")
+endif()
+if (VTR_ENABLE_PROFILING)
+    set(VTR_BUILD_INFO "${VTR_BUILD_INFO} gprof")
+endif()
+
+if (VTR_ENABLE_COVERAGE)
+    set(VTR_BUILD_INFO "${VTR_BUILD_INFO} gcov")
+endif()
+
+if (VTR_ENABLE_DEBUG_LOGGING)
+    set(VTR_BUILD_INFO "${VTR_BUILD_INFO} debug_logging")
 endif()
 
 # We always update the vtr_version.cpp file every time the project is built, 
@@ -53,7 +73,7 @@ add_custom_command(OUTPUT ${VTR_VERSION_FILE_OUT}
                     -D VTR_VERSION_PATCH=${VTR_VERSION_PATCH}
                     -D VTR_VERSION_PRERELEASE=${VTR_VERSION_PRERELEASE}
                     -D VTR_COMPILER_INFO=${VTR_COMPILER_INFO}
-                    -D VTR_BUILD_TYPE=${VTR_BUILD_TYPE}
+                    -D VTR_BUILD_INFO=${VTR_BUILD_INFO}
                     -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/configure_version.cmake
     MAIN_DEPENDENCY ${VTR_VERSION_FILE_IN}
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

libs/libvtrutil/cmake/modules/configure_version.cmake

@@ -47,7 +47,8 @@ endif()
 
 #Other build meta-data
 string(TIMESTAMP VTR_BUILD_TIMESTAMP)
-set(VTR_BUILD_TIMESTAMP "${VTR_BUILD_TIMESTAMP} (${VTR_BUILD_TYPE} build)")
+set(VTR_BUILD_TIMESTAMP "${VTR_BUILD_TIMESTAMP}")
+set(VTR_BUILD_INFO "${VTR_BUILD_INFO}")
 
 message(STATUS "VTR Version: ${VTR_VERSION}")
 

libs/libvtrutil/src/vtr_version.cpp.in

@@ -16,4 +16,5 @@ namespace vtr {
     const char* VCS_REVISION_SHORT = "@VTR_VCS_REVISION_SHORT@";
     const char* COMPILER = "@VTR_COMPILER_INFO@";
     const char* BUILD_TIMESTAMP = "@VTR_BUILD_TIMESTAMP@";
+    const char* BUILD_INFO = "@VTR_BUILD_INFO@";
 }

libs/libvtrutil/src/vtr_version.h

@@ -9,11 +9,12 @@ extern const char* VERSION_SHORT;
 extern const size_t VERSION_MAJOR;
 extern const size_t VERSION_MINOR;
 extern const size_t VERSION_PATCH;
+extern const char* VERSION_PRERELEASE;
 
 extern const char* VCS_REVISION;
 extern const char* COMPILER;
 extern const char* BUILD_TIMESTAMP;
-extern const char* PRERELEASE_TAG;
+extern const char* BUILD_INFO;
 } // namespace vtr
 
 #endif

vpr/src/base/vpr_api.cpp

@@ -103,12 +103,13 @@ static void get_intercluster_switch_fanin_estimates(const t_vpr_setup& vpr_setup
 
 /* Display general VPR information */
 void vpr_print_title() {
-    VTR_LOG("\n");
     VTR_LOG("VPR FPGA Placement and Routing.\n");
     VTR_LOG("Version: %s\n", vtr::VERSION);
     VTR_LOG("Revision: %s\n", vtr::VCS_REVISION);
     VTR_LOG("Compiled: %s\n", vtr::BUILD_TIMESTAMP);
     VTR_LOG("Compiler: %s\n", vtr::COMPILER);
+    VTR_LOG("Build Info: %s\n", vtr::BUILD_INFO);
+    VTR_LOG("\n");
     VTR_LOG("University of Toronto\n");
     VTR_LOG("verilogtorouting.org\n");
     VTR_LOG("vtr-users@googlegroups.com\n");