Ignore:
Timestamp:
May 22, 2017, 12:14:19 PM (2 years ago)
Author:
nmedfort
Message:

Restructuring work for the Driver classes. Start of work to eliminate the memory leaks with the ExecutionEngine?. Replaced custom AlignedMalloc? with backend call to std::aligned_malloc. Salvaged some work on DistributionPass? for reevaluation.

File:
1 edited

Legend:

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

    r5459 r5464  
    5959SET(OBJECT_CACHE_SRC toolchain/object_cache.cpp)
    6060
    61 SET(TOOLCHAIN_SRC toolchain/toolchain.cpp  toolchain/pipeline.cpp ${OBJECT_CACHE_SRC})
     61SET(TOOLCHAIN_SRC toolchain/toolchain.cpp toolchain/pipeline.cpp toolchain/driver.cpp)
     62
     63SET(DRIVER_SRC toolchain/cpudriver.cpp toolchain/NVPTXDriver.cpp)
    6264
    6365SET(KERNEL_SRC kernels/kernel.cpp kernels/streamset.cpp kernels/interface.cpp kernels/kernel_builder.cpp)
     
    7072SET(PABLO_SRC ${PABLO_SRC} pablo/analysis/pabloverifier.cpp)
    7173SET(PABLO_SRC ${PABLO_SRC} pablo/passes/ssapass.cpp)
    72 SET(PABLO_SRC ${PABLO_SRC} pablo/optimizers/pablo_simplifier.cpp pablo/optimizers/codemotionpass.cpp pablo/passes/flattenif.cpp)
     74SET(PABLO_SRC ${PABLO_SRC} pablo/optimizers/pablo_simplifier.cpp pablo/optimizers/codemotionpass.cpp pablo/optimizers/distributivepass.cpp pablo/passes/flattenif.cpp)
    7375IF(ENABLE_MULTIPLEXING)
    7476SET(PABLO_SRC ${PABLO_SRC} pablo/optimizers/booleanreassociationpass.cpp)
     
    7678ENDIF()
    7779
    78 add_library(CodeGen ${TOOLCHAIN_SRC} ${KERNEL_SRC} ${IDISA_SRC})
     80add_library(CodeGen ${TOOLCHAIN_SRC} ${DRIVER_SRC} ${OBJECT_CACHE_SRC} ${KERNEL_SRC} ${IDISA_SRC})
    7981add_library(PabloADT ${PABLO_SRC})
    8082add_library(RegExpADT re/re_re.cpp re/re_cc.cpp re/re_rep.cpp re/re_diff.cpp re/re_intersect.cpp re/printer_re.cpp)
     
    8890
    8991# add the executable
    90 target_link_libraries (PabloADT CodeGen ${REQ_LLVM_LIBRARIES})
     92target_link_libraries (CodeGen ${REQ_LLVM_LIBRARIES})
     93target_link_libraries (PabloADT CodeGen)
    9194target_link_libraries (CCADT PabloADT)
    9295target_link_libraries (UCDlib RegExpADT PabloADT CCADT)
     
    206209
    207210SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O3 -DNDEBUG")
    208 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} -g -fno-omit-frame-pointer")
     211SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} -g -fno-omit-frame-pointer -fsanitize=address")
    209212
    210213add_test(
Note: See TracChangeset for help on using the changeset viewer.