Changeset 5848


Ignore:
Timestamp:
Jan 29, 2018, 3:04:25 PM (10 months ago)
Author:
xwa163
Message:
  1. Fix bug of SwizzledDeleteByPEXTKernel
  2. Add character_deletion pipeline and character_deletion_test to make sure SwizzledDeleteByPEXTKernel related logic work correctly
Location:
icGREP/icgrep-devel
Files:
4 added
2 edited

Legend:

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

    r5828 r5848  
    119119add_executable(lz4d lz4d.cpp lz4FrameDecoder.cpp kernels/cc_kernel.cpp kernels/lz4_index_decoder.cpp kernels/lz4_bytestream_decoder.cpp)
    120120add_executable(core combine/core.cpp combine/regexGen.cpp combine/stringGen.cpp combine/propGen.cpp combine/icgrep-test/icgrep-test.cpp grep_interface.cpp grep_engine.cpp kernels/scanmatchgen.cpp kernels/u8u32_kernel.cpp kernels/delmask_kernel.cpp kernels/cc_kernel.cpp kernels/cc_scan_kernel.cpp kernels/charclasses.cpp kernels/linebreak_kernel.cpp kernels/streams_merge.cpp kernels/grep_kernel.cpp kernels/until_n.cpp)
     121add_executable(character_deletion character_deletion.cpp kernels/cc_kernel.cpp)
    121122
    122123#Exclude CoRE from default build.
     
    130131target_link_libraries (lz4d PabloADT CCADT CodeGen ${REQ_LLVM_LIBRARIES} ${Boost_LIBRARIES} ${CUDA_LIB})
    131132target_link_libraries (core RegExpCompiler ${REQ_LLVM_LIBRARIES} ${Boost_LIBRARIES})
     133target_link_libraries (character_deletion PabloADT RegExpCompiler CCADT CodeGen ${REQ_LLVM_LIBRARIES} ${Boost_LIBRARIES} ${CUDA_LIB})
    132134
    133135IF(ENABLE_MULTIPLEXING)
     
    262264  COMMAND python base64test.py ${CMAKE_BINARY_DIR}/base64)
    263265
     266add_test(
     267  NAME character_deletion_test
     268  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../QA/character_deletion
     269  COMMAND python character_deletion_test.py ${CMAKE_BINARY_DIR}/character_deletion
     270)
     271
    264272SET_PROPERTY(TEST greptest PROPERTY TIMEOUT 400)
    265273SET_PROPERTY(TEST proptest PROPERTY TIMEOUT 1500)
    266274SET_PROPERTY(TEST abc_test PROPERTY TIMEOUT 100)
    267 SET_PROPERTY(TEST u8u16_test editd_test base64_test PROPERTY TIMEOUT 40)
     275SET_PROPERTY(TEST u8u16_test editd_test base64_test character_deletion_test PROPERTY TIMEOUT 40)
    268276
    269277
     
    291299  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../QA/base64
    292300  COMMAND python base64test.py "${CMAKE_BINARY_DIR}/base64")
     301
     302add_custom_target(character_deletion_test
     303  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../QA/character_deletion
     304  COMMAND python character_deletion_test.py ${CMAKE_BINARY_DIR}/character_deletion
     305)
    293306
    294307add_custom_target (abc_gen
  • icGREP/icgrep-devel/icgrep/kernels/deletion.cpp

    r5755 r5848  
    102102        Value * pendingData = iBuilder->getScalarField("pendingSwizzleData" + std::to_string(i));
    103103        Value * outputStreamPtr = iBuilder->getOutputStreamBlockPtr("outputSwizzle" + std::to_string(i), iBuilder->getInt32(0));
    104         iBuilder->CreateBlockAlignedStore(pendingData, iBuilder->CreateGEP(outputStreamPtr, outputIndex));
     104                // TODO it seems that we do not need to store pending data here
     105        // iBuilder->CreateBlockAlignedStore(pendingData, iBuilder->CreateGEP(outputStreamPtr, outputIndex));
    105106    }
    106107    iBuilder->setProducedItemCount("outputSwizzle0", iBuilder->CreateAdd(pendingOffset, outputProduced));
Note: See TracChangeset for help on using the changeset viewer.