Ignore:
Timestamp:
Dec 6, 2017, 5:41:27 PM (18 months ago)
Author:
nmedfort
Message:

Bug fixes + more assertions to prevent similar errors.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/u8u16.cpp

    r5755 r5757  
    6060: PabloKernel(b, "u8u16",
    6161{Binding{b->getStreamSetTy(8, 1), "u8bit"}},
    62 {Binding{b->getStreamSetTy(16, 1), "u16bit"}, Binding{b->getStreamSetTy(1, 1), "delMask"}, Binding{b->getStreamSetTy(1, 1), "errMask"}}) {
     62{Binding{b->getStreamSetTy(16, 1), "u16bit"}, Binding{b->getStreamSetTy(1, 1), "delMask"}}) {
    6363
    6464}
     
    253253    Var * output = getOutputStreamVar("u16bit");
    254254    Var * delmask_out = getOutputStreamVar("delMask");
    255     Var * error_mask_out = getOutputStreamVar("errMask");
    256 
    257255    for (unsigned i = 0; i < 8; i++) {
    258256        main.createAssign(main.createExtract(output, i), u16_hi[i]);
     
    262260    }
    263261    main.createAssign(main.createExtract(delmask_out, main.getInteger(0)), delmask);
    264     main.createAssign(main.createExtract(error_mask_out,  main.getInteger(0)), error_mask);
    265262}
    266263
     
    305302    StreamSetBuffer * U8u16Bits = pxDriver.addBuffer<CircularBuffer>(iBuilder, iBuilder->getStreamSetTy(16), segmentSize * bufferSegments);
    306303    StreamSetBuffer * DelMask = pxDriver.addBuffer<CircularBuffer>(iBuilder, iBuilder->getStreamSetTy(), segmentSize * bufferSegments);
    307     StreamSetBuffer * ErrorMask = pxDriver.addBuffer<CircularBuffer>(iBuilder, iBuilder->getStreamSetTy(), segmentSize * bufferSegments);
    308304   
    309305    Kernel * u8u16k = pxDriver.addKernelInstance<U8U16Kernel>(iBuilder);
    310     pxDriver.makeKernelCall(u8u16k, {BasisBits}, {U8u16Bits, DelMask, ErrorMask});
     306    pxDriver.makeKernelCall(u8u16k, {BasisBits}, {U8u16Bits, DelMask});
    311307   
    312308    // Allocate space for fully compressed swizzled UTF-16 bit streams
     
    390386    StreamSetBuffer * U8u16Bits = pxDriver.addBuffer<CircularBuffer>(iBuilder, iBuilder->getStreamSetTy(16), segmentSize * bufferSegments);
    391387    StreamSetBuffer * DelMask = pxDriver.addBuffer<CircularBuffer>(iBuilder, iBuilder->getStreamSetTy(), segmentSize * bufferSegments);
    392     StreamSetBuffer * ErrorMask = pxDriver.addBuffer<CircularBuffer>(iBuilder, iBuilder->getStreamSetTy(), segmentSize * bufferSegments);
    393388   
    394389    Kernel * u8u16k = pxDriver.addKernelInstance<U8U16Kernel>(iBuilder);
    395     pxDriver.makeKernelCall(u8u16k, {BasisBits}, {U8u16Bits, DelMask, ErrorMask});
     390    pxDriver.makeKernelCall(u8u16k, {BasisBits}, {U8u16Bits, DelMask});
    396391   
    397392    StreamSetBuffer * U16Bits = pxDriver.addBuffer<CircularBuffer>(iBuilder, iBuilder->getStreamSetTy(16), segmentSize * bufferSegments);
Note: See TracChangeset for help on using the changeset viewer.