Ignore:
Timestamp:
Sep 14, 2016, 2:56:54 PM (3 years ago)
Author:
nmedfort
Message:

Work on multiplexing and distribution passes + a few AST modification bug fixes.

File:
1 edited

Legend:

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

    r5154 r5156  
    7676SET(PABLO_SRC ${PABLO_SRC} pablo/optimizers/pablo_simplifier.cpp pablo/optimizers/codemotionpass.cpp)
    7777IF(ENABLE_MULTIPLEXING)
    78 SET(PABLO_SRC ${PABLO_SRC} pablo/optimizers/distributivepass.cpp pablo/passes/flattenassociativedfg.cpp pablo/passes/factorizedfg.cpp)
    79 SET(PABLO_SRC ${PABLO_SRC} pablo/optimizers/schedulingprepass.cpp pablo/optimizers/pablo_automultiplexing.cpp pablo/optimizers/pablo_bddminimization.cpp)
     78SET(PABLO_SRC ${PABLO_SRC} pablo/optimizers/booleanreassociationpass.cpp pablo/optimizers/distributivepass.cpp pablo/passes/flattenassociativedfg.cpp pablo/passes/factorizedfg.cpp)
     79SET(PABLO_SRC ${PABLO_SRC} pablo/optimizers/schedulingprepass.cpp pablo/optimizers/pablo_automultiplexing.cpp)
    8080ENDIF()
    8181
     
    151151
    152152IF(ENABLE_MULTIPLEXING)
    153 message(STATUS "Enabling Multiplexing")
    154 SET(BUDDY_ROOT "${CMAKE_SOURCE_DIR}/../buddy-2.4/src")
    155 SET(BUDDY_SOURCES ${BUDDY_ROOT}/bddop.cpp ${BUDDY_ROOT}/cache.cpp ${BUDDY_ROOT}/imatrix.cpp ${BUDDY_ROOT}/kernel.cpp)
    156 SET(BUDDY_SOURCES ${BUDDY_SOURCES} ${BUDDY_ROOT}/prime.cpp ${BUDDY_ROOT}/pairs.cpp ${BUDDY_ROOT}/reorder.cpp ${BUDDY_ROOT}/tree.cpp)
    157 add_library(BUDDY ${BUDDY_SOURCES})
    158 include_directories(${BUDDY_ROOT})
    159 target_link_libraries (PabloADT BUDDY)
    160 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_MULTIPLEXING")
    161 ENDIF()
     153    message(STATUS "Enabling Multiplexing")
     154    find_package(Z3 REQUIRED)
     155    include_directories(${Z3_INCLUDE_DIRS})
     156    target_link_libraries(PabloADT ${Z3_LIBRARIES})
     157    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_MULTIPLEXING")
     158ENDIF()
     159
    162160
    163161include_directories("${PROJECT_SOURCE_DIR}")
     
    176174    if(COMPILER_SUPPORTS_GNU11)
    177175      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
    178     else() 
    179       CHECK_CXX_COMPILER_FLAG("-std=gnu++0x" COMPILER_SUPPORTS_GNU0X)   
     176    else()
     177      CHECK_CXX_COMPILER_FLAG("-std=gnu++0x" COMPILER_SUPPORTS_GNU0X)
    180178      if(COMPILER_SUPPORTS_GNU0X)
    181179        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
     
    202200ENDIF()
    203201
    204 IF (PRINT_TIMING_INFORMATION)   
     202IF (PRINT_TIMING_INFORMATION)
    205203    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DPRINT_TIMING_INFORMATION")
    206204ENDIF()
    207205
    208206SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O3 -DNDEBUG")
    209 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} -g -fsanitize=address -fno-omit-frame-pointer")
     207SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} -g") # -fsanitize=address -fno-omit-frame-pointer
    210208
    211209add_test(
Note: See TracChangeset for help on using the changeset viewer.