Changeset 5373


Ignore:
Timestamp:
Mar 26, 2017, 9:41:12 AM (2 years ago)
Author:
cameron
Message:

Parabix version info, unique names for IDISA builders

Location:
icGREP/icgrep-devel/icgrep
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/CMakeLists.txt

    r5371 r5373  
    88set (icgrep_VERSION_MINOR 6)
    99
     10
     11
    1012option(ENABLE_MULTIPLEXING "Compiling the Multiplexing Module")
    1113option(PRINT_TIMING_INFORMATION "Write compilation and execution timing information to standard error stream")
     
    1416
    1517message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION} in: ${LLVM_DIR}")
     18
    1619set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/cmake") # ensure custom FindXYZ.cmake files are found
     20
     21set (Parabix_REVISION "svn")
     22include(VersionFromVCS)
     23add_version_info_from_vcs(Parabix_REVISION)
     24message(STATUS "Parabix_REVISION: ${Parabix_REVISION}")
     25
    1726
    1827# Now set the header and library paths:
     
    180189ENDIF()
    181190
     191SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DPARABIX_VERSION='\"${Parabix_REVISION}\"'")
     192
    182193IF (PRINT_TIMING_INFORMATION)
    183194    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DPRINT_TIMING_INFORMATION")
  • icGREP/icgrep-devel/icgrep/base64.cpp

    r5364 r5373  
    176176
    177177int main(int argc, char *argv[]) {
     178    AddParabixVersionPrinter();
    178179    cl::HideUnrelatedOptions(ArrayRef<const cl::OptionCategory *>{&base64Options, codegen::codegen_flags()});
    179180    cl::ParseCommandLineOptions(argc, argv);
  • icGREP/icgrep-devel/icgrep/icgrep.cpp

    r5355 r5373  
    367367int main(int argc, char *argv[]) {
    368368    llvm::install_fatal_error_handler(&icgrep_error_handler);
     369    AddParabixVersionPrinter();
    369370#ifndef USE_LLVM_3_6
    370371    cl::HideUnrelatedOptions(ArrayRef<const cl::OptionCategory *>{&LegacyGrepOptions, &EnhancedGrepOptions, re::re_toolchain_flags(), pablo::pablo_toolchain_flags(), codegen::codegen_flags()});
  • icGREP/icgrep-devel/icgrep/toolchain.cpp

    r5371 r5373  
    126126#endif
    127127
     128void printParabixVersion () {
     129    raw_ostream &OS = outs();
     130    OS << "Parabix (http://parabix.costar.sfu.ca/):\n  " << "Parabix revision " << PARABIX_VERSION << "\n";
     131}
     132
     133void AddParabixVersionPrinter() {
     134    cl::AddExtraVersionPrinter(&printParabixVersion);
     135}
     136
     137
    128138
    129139void setAllFeatures(EngineBuilder &builder) {
     
    171181
    172182ExecutionEngine * JIT_to_ExecutionEngine (Module * m) {
     183
    173184    // Use the pass manager to optimize the function.
    174185    legacy::PassManager PM;
  • icGREP/icgrep-devel/icgrep/toolchain.h

    r5364 r5373  
    4848#endif
    4949
     50void AddParabixVersionPrinter();
     51
    5052bool AVX2_available();
    5153
  • icGREP/icgrep-devel/icgrep/u8u16.cpp

    r5364 r5373  
    552552
    553553int main(int argc, char *argv[]) {
     554    AddParabixVersionPrinter();
    554555    cl::HideUnrelatedOptions(ArrayRef<const cl::OptionCategory *>{&u8u16Options, pablo::pablo_toolchain_flags(), codegen::codegen_flags()});
    555556    cl::ParseCommandLineOptions(argc, argv);
  • icGREP/icgrep-devel/icgrep/wc.cpp

    r5364 r5373  
    248248
    249249int main(int argc, char *argv[]) {
     250    AddParabixVersionPrinter();
    250251    cl::HideUnrelatedOptions(ArrayRef<const cl::OptionCategory *>{&wcFlags, pablo_toolchain_flags(), codegen::codegen_flags()});
    251252    cl::ParseCommandLineOptions(argc, argv);
Note: See TracChangeset for help on using the changeset viewer.