Changeset 5734 for icGREP


Ignore:
Timestamp:
Nov 12, 2017, 12:34:46 PM (17 months ago)
Author:
cameron
Message:

Some changes for LLVM 6.0.0

Location:
icGREP/icgrep-devel/icgrep
Files:
6 edited

Legend:

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

    r5733 r5734  
    6363SET(TOOLCHAIN_SRC toolchain/toolchain.cpp toolchain/pipeline.cpp)
    6464
    65 SET(DRIVER_SRC toolchain/driver.cpp toolchain/cpudriver.cpp toolchain/NVPTXDriver.cpp)
     65SET(DRIVER_SRC toolchain/driver.cpp toolchain/cpudriver.cpp)
     66if(ENABLE_CUDA_COMPILE)
     67SET(DRIVER_SRC ${DRIVER_SRC} toolchain/NVPTXDriver.cpp)
     68endif()
    6669
    6770SET(KERNEL_SRC kernels/interface.cpp kernels/kernel.cpp kernels/streamset.cpp kernels/kernel_builder.cpp)
    6871SET(KERNEL_SRC ${KERNEL_SRC} kernels/source_kernel.cpp kernels/s2p_kernel.cpp kernels/deletion.cpp kernels/swizzle.cpp kernels/p2s_kernel.cpp kernels/stdout_kernel.cpp)
    6972
    70 SET(IDISA_SRC IR_Gen/CBuilder.cpp IR_Gen/idisa_builder.cpp IR_Gen/idisa_avx_builder.cpp IR_Gen/idisa_i64_builder.cpp IR_Gen/idisa_sse_builder.cpp IR_Gen/idisa_nvptx_builder.cpp)
     73SET(IDISA_SRC IR_Gen/CBuilder.cpp IR_Gen/idisa_builder.cpp IR_Gen/idisa_avx_builder.cpp IR_Gen/idisa_i64_builder.cpp IR_Gen/idisa_sse_builder.cpp)
    7174SET(IDISA_SRC ${IDISA_SRC} IR_Gen/idisa_target.cpp)
     75if(ENABLE_CUDA_COMPILE)
     76SET(IDISA_SRC ${IDISA_SRC} IR_Gen/idisa_nvptx_builder.cpp)
     77endif()
    7278
    7379SET(PABLO_SRC pablo/pabloAST.cpp pablo/branch.cpp pablo/codegenstate.cpp pablo/builder.cpp pablo/symbol_generator.cpp pablo/printer_pablos.cpp pablo/pablo_toolchain.cpp)
     
    202208SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLLVM_VERSION_INTEGER=${LLVM_VERSION_INTEGER}")
    203209SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLLVM_VERSION_major=${LLVM_VERSION_MAJOR} -DLLVM_VERSION_MINOR=${LLVM_VERSION_MINOR}")
     210message(STATUS "LLVM Version Integer: ${LLVM_VERSION_INTEGER}")
    204211
    205212SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DPARABIX_VERSION='\"${Parabix_REVISION}\"'")
  • icGREP/icgrep-devel/icgrep/IR_Gen/idisa_target.cpp

    r5560 r5734  
    3636    return new KernelBuilderImpl<IDISA_SSE2_Builder>(C, codegen::BlockSize, codegen::BlockSize);
    3737}
    38 
     38#ifdef CUDA_ENABLED
    3939KernelBuilder * GetIDISA_GPU_Builder(llvm::LLVMContext & C) {
    4040    return new KernelBuilderImpl<IDISA_NVPTX20_Builder>(C, 64, 64 * 64);
    4141}
    42 
     42#endif
    4343}
  • icGREP/icgrep-devel/icgrep/IR_Gen/idisa_target.h

    r5489 r5734  
    1515kernel::KernelBuilder * GetIDISA_Builder(llvm::LLVMContext & C);
    1616
     17#ifdef CUDA_ENABLED
    1718kernel::KernelBuilder * GetIDISA_GPU_Builder(llvm::LLVMContext & C);
    18 
     19#endif
    1920}
    2021
  • icGREP/icgrep-devel/icgrep/editd/editd.cpp

    r5706 r5734  
    3232#include <editd/editd_cpu_kernel.h>
    3333
     34#ifdef CUDA_ENABLED
    3435#include <toolchain/NVPTXDriver.h>
    3536#include <editd/editd_gpu_kernel.h>
    36 #ifdef CUDA_ENABLED
    3737#include <editd/EditdCudaDriver.h>
    3838#endif
     
    6363using namespace parabix;
    6464
     65#ifdef CUDA_ENABLED
    6566const static std::string PTXFilename = "editd.ptx";
     67#endif
    6668
    6769struct matchPosition
     
    526528}
    527529
     530#ifdef CUDA_ENABLED
    528531void editdGPUCodeGen(unsigned patternLen){
    529532    NVPTXDriver pxDriver("editd");
     
    655658
    656659}
     660#endif
    657661
    658662editdFunctionType editdScanCPUCodeGen(ParabixDriver & pxDriver) {
  • icGREP/icgrep-devel/icgrep/toolchain/toolchain.cpp

    r5732 r5734  
    11/*
    2  *  Copyright (c) 2016 International Characters.
     2 *  Copyright (c) 2017 International Characters.
    33 *  This software is licensed to the public under the Open Software License 3.0.
    44 *  icgrep is a trademark of International Characters.
     
    185185
    186186}
    187 
     187#if LLVM_VERSION_INTEGER < LLVM_6_0_0
    188188void printParabixVersion () {
    189189    outs() << "Unicode version " << UCD::UnicodeVersion << "\n";
    190190    outs() << "Parabix (http://parabix.costar.sfu.ca/):\n  " << "Parabix revision " << PARABIX_VERSION << "\n";
    191191}
     192#else
     193void printParabixVersion (raw_ostream & outs) {
     194    outs << "Unicode version " << UCD::UnicodeVersion << "\n";
     195    outs << "Parabix (http://parabix.costar.sfu.ca/):\n  " << "Parabix revision " << PARABIX_VERSION << "\n";
     196}
     197#endif
    192198
    193199void AddParabixVersionPrinter() {
  • icGREP/icgrep-devel/icgrep/toolchain/toolchain.h

    r5732 r5734  
    2020#define LLVM_4_0_0 40000
    2121#define LLVM_5_0_0 50000
     22#define LLVM_6_0_0 60000
    2223
    2324// From LLVM 4.0.0 the clEnumValEnd sentinel is no longer needed.
Note: See TracChangeset for help on using the changeset viewer.