Changeset 5859 for icGREP


Ignore:
Timestamp:
Feb 3, 2018, 6:44:46 AM (15 months ago)
Author:
cameron
Message:

Bug fix for DirectCC

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

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/cc/cc_compiler.cpp

    r5847 r5859  
    1515#include <llvm/IR/DerivedTypes.h>
    1616#include <llvm/Support/ErrorHandling.h>
     17#include <llvm/Support/raw_ostream.h>
    1718
    1819using namespace re;
     
    237238    }
    238239    unsigned codeUnitWidth = cast<const CodeUnitAlphabet>(a)->getCodeUnitBitWidth();
    239     unsigned topBit = 1 << codeUnitWidth;
     240    unsigned topBit = 1 << (codeUnitWidth - 1);
    240241    unsigned maxCodeVal = (topBit - 1) | topBit;
    241242    PabloAST * ccStrm = pb.createZeroes();
  • icGREP/icgrep-devel/icgrep/grep_engine.cpp

    r5856 r5859  
    163163                auto numOfCharacterClasses = mpx_basis.size();
    164164                StreamSetBuffer * CharClasses = mGrepDriver->addBuffer<CircularBuffer>(idb, idb->getStreamSetTy(numOfCharacterClasses), baseBufferSize);
    165                 kernel::Kernel * ccK = mGrepDriver->addKernelInstance<kernel::CharClassesKernel>(idb, std::move(mpx_basis));
    166                 mGrepDriver->makeKernelCall(ccK, {BasisBits}, {CharClasses});
     165                kernel::Kernel * ccK = mGrepDriver->addKernelInstance<kernel::CharClassesKernel>(idb, std::move(mpx_basis), true);
     166                mGrepDriver->makeKernelCall(ccK, {ByteStream}, {CharClasses});
    167167//                kernel::Kernel * ccK = mGrepDriver->addKernelInstance<kernel::CharClassesKernel>(idb, std::move(mpx_basis), true);
    168168//                mGrepDriver->makeKernelCall(ccK, {ByteStream}, {CharClasses});
  • icGREP/icgrep-devel/icgrep/kernels/linebreak_kernel.h

    r5841 r5859  
    1111
    1212namespace kernel {
     13//#define USE_DIRECT_LF_BUILDER
    1314
    1415class LineFeedKernelBuilder final : public pablo::PabloKernel {
  • icGREP/icgrep-devel/icgrep/re/re_name_resolve.cpp

    r5835 r5859  
    2323namespace re {
    2424 
    25 static inline CC * extractCC(RE * re) {
    26     if (isa<CC>(re)) {
    27         return cast<CC>(re);
    28     } else if (isa<Name>(re)) {
    29         return extractCC(cast<Name>(re)->getDefinition());
    30     }
    31     return nullptr;
    32 }
    33 
    3425struct NameResolver {
    3526    RE * resolveUnicodeProperties(RE * re) {
Note: See TracChangeset for help on using the changeset viewer.