Changeset 6186


Ignore:
Timestamp:
Nov 2, 2018, 10:48:12 PM (6 months ago)
Author:
cameron
Message:

Various clean-ups

Location:
icGREP/icgrep-devel/icgrep
Files:
2 deleted
15 edited

Legend:

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

    r6184 r6186  
    131131# add_executable(lz4d lz4d.cpp lz4/lz4_frame_decoder.cpp kernels/cc_kernel.cpp kernels/lz4/lz4_index_decoder.cpp kernels/lz4/lz4_bytestream_decoder.cpp)
    132132add_executable(core combine/core.cpp combine/regexGen.cpp combine/stringGen.cpp combine/propGen.cpp combine/icgrep-test/icgrep-test.cpp grep_interface.cpp grep/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)
    133 # add_executable(character_deletion character_deletion.cpp kernels/cc_kernel.cpp)
    134 # add_executable(character_deposit character_deposit.cpp kernels/cc_kernel.cpp kernels/pdep_kernel.cpp kernels/bitstream_pdep_kernel.cpp)
    135133add_executable(lz4_decoder lz4_decoder.cpp)
    136134add_executable(lz4_grep grep_interface.cpp lz4_grep.cpp lz4/grep/lz4_grep_base_generator.cpp lz4/grep/lz4_grep_bytestream_generator.cpp lz4/grep/lz4_grep_bytestream_generator.h lz4/grep/lz4_grep_bitstream_generator.cpp lz4/grep/lz4_grep_bitstream_generator.h lz4/grep/lz4_grep_swizzle_generator.cpp lz4/grep/lz4_grep_swizzle_generator.h)
     
    149147# target_link_libraries (lz4d PabloADT CCADT CodeGen ${REQ_LLVM_LIBRARIES} ${Boost_LIBRARIES} ${CUDA_LIB})
    150148target_link_libraries (core RegExpCompiler ${REQ_LLVM_LIBRARIES} ${Boost_LIBRARIES})
    151 # target_link_libraries (character_deletion PabloADT RegExpCompiler CCADT CodeGen ${REQ_LLVM_LIBRARIES} ${Boost_LIBRARIES} ${CUDA_LIB})
    152 # target_link_libraries (character_deposit PabloADT RegExpCompiler CCADT CodeGen ${REQ_LLVM_LIBRARIES} ${Boost_LIBRARIES} ${CUDA_LIB})
    153149target_link_libraries (lz4_decoder LZ4_Lib PabloADT CCADT CodeGen ${REQ_LLVM_LIBRARIES} ${Boost_LIBRARIES} ${CUDA_LIB})
    154150target_link_libraries (lz4_grep LZ4_Lib UCDlib PabloADT RegExpCompiler CodeGen CCADT CodeGen FileSelect ${REQ_LLVM_LIBRARIES} ${Boost_LIBRARIES} ${CUDA_LIB})
     
    303299
    304300#add_test(
    305 #  NAME character_deletion_test
    306 #  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../QA/character_deletion
    307 #  COMMAND python character_deletion_test.py ${CMAKE_BINARY_DIR}/character_deletion
    308 #)
    309 
    310 #add_test(
    311 #  NAME character_deposit_test
    312 #  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../QA/character_deposit
    313 #  COMMAND python character_deposit_test.py ${CMAKE_BINARY_DIR}/character_deposit
    314 #)
    315 
    316 #add_test(
    317301#  NAME lz4d_ext_dep_test
    318302#  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../QA/lz4_decoder
     
    354338  COMMAND python base64test.py "${CMAKE_BINARY_DIR}/base64")
    355339
    356 #add_custom_target(character_deletion_test
    357 #  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../QA/character_deletion
    358 #  COMMAND python character_deletion_test.py ${CMAKE_BINARY_DIR}/character_deletion
    359 #)
    360 
    361 #add_custom_target(character_deposit_test
    362 #  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../QA/character_deposit
    363 #  COMMAND python character_deposit_test.py ${CMAKE_BINARY_DIR}/character_deposit
    364 #)
    365 
    366340#add_custom_target(lz4d_ext_dep_test
    367341#  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../QA/lz4_decoder
  • icGREP/icgrep-devel/icgrep/UCD/PropertyObjects.h

    r6184 r6186  
    4949    property_t the_property;
    5050    ClassTypeId the_kind;
     51    virtual ~PropertyObject() {}
    5152};
    5253
  • icGREP/icgrep-devel/icgrep/kernels/deletion.cpp

    r6184 r6186  
    447447: MultiBlockKernel("PEXTdel" + std::to_string(PEXTWidth) + "_" + std::to_string(inputStreamSet->getNumElements()),
    448448{Binding{"selectors", selectors}, Binding{"inputStreamSet", inputStreamSet}},
    449 std::move(makeSwizzledDeleteByPEXTOutputBindings(outputStreamSets, PEXTWidth)),
     449makeSwizzledDeleteByPEXTOutputBindings(outputStreamSets, PEXTWidth),
    450450{}, {}, {})
    451451, mStreamCount(inputStreamSet->getNumElements())
  • icGREP/icgrep-devel/icgrep/kernels/grep_kernel.cpp

    r6184 r6186  
    244244, PabloKernel(b, "ic" + getStringHash(mSignature),
    245245// inputs
    246 std::move(makeInputBindings(BasisBits, externals, alphabets)),
     246makeInputBindings(BasisBits, externals, alphabets),
    247247// output
    248248{Binding{"matches", matches, FixedRate(), Add1()}})
  • icGREP/icgrep-devel/icgrep/kernels/kernel.cpp

    r6184 r6186  
    10401040, mIsFinal(nullptr)
    10411041, mNumOfStrides(nullptr)
    1042 , mKernelName(std::move(annotateKernelNameWithDebugFlags(std::move(kernelName)))) {
     1042, mKernelName(annotateKernelNameWithDebugFlags(std::move(kernelName))) {
    10431043
    10441044}
  • icGREP/icgrep-devel/icgrep/kernels/pipeline/pipeline_analysis.hpp

    r6184 r6186  
    111111            Port port; unsigned j;
    112112            std::tie(port, j) = mKernel->getStreamPort(rate.getReference());
    113             add_edge((i + n), (j + (port == Port::Output) ? n : 0), rate.getKind(), G);
     113            add_edge((i + n), j + ((port == Port::Output) ? n : 0), rate.getKind(), G);
    114114        }
    115115    }
  • icGREP/icgrep-devel/icgrep/kernels/pipeline/pipeline_compiler.hpp

    r6184 r6186  
    128128using PopCountDataMap = flat_map<std::pair<const StreamSetBuffer *, bool>, PopCountData>;
    129129
    130 struct PipelineCompiler {
     130class PipelineCompiler {
     131public:
    131132
    132133    using BuilderRef = const std::unique_ptr<kernel::KernelBuilder> &;
  • icGREP/icgrep-devel/icgrep/kernels/streamset.h

    r6184 r6186  
    158158    void setBaseAddress(IDISA::IDISA_Builder * const b, llvm::Value * addr) const override;
    159159
    160     virtual bool hasOverflow() const {
     160    virtual bool hasOverflow() const override {
    161161        return false;
    162162    }
    163163
    164     virtual size_t getOverflowCapacity(const std::unique_ptr<kernel::KernelBuilder> & b) const;
     164    virtual size_t getOverflowCapacity(const std::unique_ptr<kernel::KernelBuilder> & b) const override;
    165165
    166166    llvm::Value * getOverflowAddress(IDISA::IDISA_Builder * const b) const override;
  • icGREP/icgrep-devel/icgrep/kernels/swizzle.cpp

    r6184 r6186  
    7979                                   const unsigned fieldWidth)
    8080: BlockOrientedKernel(makeSwizzleName(inputs, outputs, fieldWidth),
    81 std::move(makeSwizzledInputs(inputs)),
    82 std::move(makeSwizzledOutputs(outputs, fieldWidth)),
     81makeSwizzledInputs(inputs),
     82makeSwizzledOutputs(outputs, fieldWidth),
    8383{}, {}, {})
    8484, mBitStreamCount(getBitStreamCount(inputs))
  • icGREP/icgrep-devel/icgrep/lz4/lz4_decompression_generator.cpp

    r6184 r6186  
    1717LZ4DecompressionGenerator::LZ4DecompressionGenerator()
    1818: LZ4BaseGenerator() {
    19     mPipeline = std::move(makeInternalPipeline());
     19    mPipeline = makeInternalPipeline();
    2020}
    2121
  • icGREP/icgrep-devel/icgrep/re/Unicode/decomposition.cpp

    r6184 r6186  
    107107canonicalMapped(decompTypeObj->GetCodepointSet(DT_ns::Can)),
    108108cc0Set(cccObj->GetCodepointSet(CCC_ns::NR)),
    109 selfNFKD(std::move(decompMappingObj->GetReflexiveSet())),
    110 selfCaseFold(std::move(caseFoldObj->GetReflexiveSet())),
     109selfNFKD(decompMappingObj->GetReflexiveSet()),
     110selfCaseFold(caseFoldObj->GetReflexiveSet()),
    111111HangulPrecomposed(Hangul_SBase, Hangul_SBase + Hangul_SCount - 1) {
    112112
     
    246246}
    247247
    248 RE * transform(RE * re, const DecompositionOptions opt) {
     248RE * toNFD(RE * re, const DecompositionOptions opt) {
    249249    return NFD_Transformer(opt).transformRE(re);
    250250}
  • icGREP/icgrep-devel/icgrep/re/Unicode/decomposition.h

    r6184 r6186  
    1414namespace UCD {
    1515
    16     re::RE * transform(re::RE * re, const DecompositionOptions opt = DecompositionOptions::NFD);
     16/* Transforme an RE so that all string pieces and character classes
     17 are converted to NFD form (or NFKD form if the Compatible option
     18 is used.  The options may also including case folding. Examples:
     19 nfd_re = toNFD(r);
     20 nfkdi_re = toNFD(r, CaseFold | NFKD);
     21 */
     22
     23re::RE * toNFD(re::RE * re, const DecompositionOptions opt = DecompositionOptions::NFD);
    1724
    1825}
  • icGREP/icgrep-devel/icgrep/re/re_toolchain.cpp

    r6185 r6186  
    9292    validateNamesDefined(r);
    9393    if (UnicodeLevel2 && validateAlphabet(&cc::Unicode, r)) {
    94         r = UCD::transform(r);
     94        r = UCD::toNFD(r);
    9595        r = UCD::addClusterMatches(r);
    9696        r = UCD::addEquivalentCodepoints(r);
  • icGREP/icgrep-devel/icgrep/re/re_toolchain.h

    r6185 r6186  
    8484protected:
    8585    RE_Inspector(const InspectionMode ignoreNonUnique = InspectionMode::IgnoreNonUnique) : mIgnoreNonUnique(ignoreNonUnique) {}
     86    virtual ~RE_Inspector() {}
    8687    void inspect(RE * r);
    8788    virtual void inspectName(Name * n);
  • icGREP/icgrep-devel/icgrep/re/validation.h

    r6178 r6186  
    3636    bool validateRE(RE * r);
    3737    RE_Validator(std::string name = "") : mValidatorName(name) {}
     38    virtual ~RE_Validator() {}
    3839protected:
    3940    bool validate(RE * r);
Note: See TracChangeset for help on using the changeset viewer.