Ignore:
Timestamp:
Apr 21, 2016, 12:18:06 PM (3 years ago)
Author:
cameron
Message:

Some updates for compatibility with LLVM 3.8

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

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/kernels/casefold_pipeline.cpp

    r5010 r5014  
    7272    Function::arg_iterator args = main->arg_begin();
    7373   
    74     Value * const inputStream = args++;
     74    Value * const inputStream = &*(args++);
    7575    inputStream->setName("input");
    76     Value * const bufferSize = args++;
     76    Value * const bufferSize = &*(args++);
    7777    bufferSize->setName("bufferSize");
    7878   
  • icGREP/icgrep-devel/icgrep/kernels/kernel.cpp

    r5008 r5014  
    235235    mDoBlock->setDoesNotThrow();
    236236    Function::arg_iterator args = mDoBlock->arg_begin();
    237     mKernelStateParam = args++;
     237    mKernelStateParam = &*(args++);
    238238    mKernelStateParam->setName("this");
    239239    if (mInputScalarType) {
    240         mInputScalarParam = args++;
     240        mInputScalarParam = &*(args++);
    241241        mInputScalarParam->setName("inputScalars");
    242242    }
    243243    if (mInputStreamType) {
    244244        for (const unsigned offset : mInputStreamOffsets) {
    245             Value * const inputStreamSet = args++;
     245            Value * const inputStreamSet = &*(args++);
    246246            inputStreamSet->setName("inputStreamSet" + std::to_string(offset));
    247247            mInputStreamParam.emplace(offset, inputStreamSet);
     
    249249    }
    250250    if (mOutputScalarType) {
    251         mOutputScalarParam = args++;
     251        mOutputScalarParam = &*(args++);
    252252        mOutputScalarParam->setName("outputScalars");
    253253    }
    254254    if (mOutputStreamType) {
    255         mOutputStreamParam = args;
     255        mOutputStreamParam = &*args;
    256256        mOutputStreamParam->setName("outputStreamSet");
    257257    }
  • icGREP/icgrep-devel/icgrep/kernels/pipeline.cpp

    r5010 r5014  
    6666    Function::arg_iterator args = main->arg_begin();
    6767
    68     Value * const inputStream = args++;
     68    Value * const inputStream = &*(args++);
    6969    inputStream->setName("input");
    70     Value * const bufferSize = args++;
     70    Value * const bufferSize = &*(args++);
    7171    bufferSize->setName("bufferSize");
    72     Value * const fileName = args++;
     72    Value * const fileName = &*(args++);
    7373    fileName->setName("fileName");
    74     Value * const finalLineUnterminated = args++;
     74    Value * const finalLineUnterminated = &*(args++);
    7575    finalLineUnterminated->setName("finalLineUnterminated");
    7676
  • icGREP/icgrep-devel/icgrep/kernels/scanmatchgen.cpp

    r5008 r5014  
    6767
    6868    Function::arg_iterator args = function->arg_begin();
    69     Value * instance = args++;
     69    Value * instance = &*(args++);
    7070    instance->setName("this");
    71     Value * matches_input_parm = args++;
     71    Value * matches_input_parm = &*(args++);
    7272    matches_input_parm->setName("matches");
    73     Value * record_breaks_input_parm = args++;
     73    Value * record_breaks_input_parm = &*(args++);
    7474    record_breaks_input_parm->setName("breaks");
    75     Value * scanwordPos = args++;
     75    Value * scanwordPos = &*(args++);
    7676    scanwordPos->setName("scanwordPos");
    77     Value * recordStart_input_parm = args++;
     77    Value * recordStart_input_parm = &*(args++);
    7878    recordStart_input_parm->setName("pendingLineStart");
    79     Value * recordNum_input_parm = args++;
     79    Value * recordNum_input_parm = &*(args++);
    8080    recordNum_input_parm->setName("lineNum");
    8181
  • icGREP/icgrep-devel/icgrep/kernels/symboltablepipeline.cpp

    r5010 r5014  
    365365    Value * gatherFunctionPtr = iBuilder->CreateLoad(iBuilder->CreateGEP(gatherFunctionPtrArray, groupIV));
    366366    Value * outputBuffer = iBuilder->CreatePointerCast(kBuilder->getOutputStream(groupIV), iBuilder->getInt8PtrTy());
    367     iBuilder->CreateCall5(gatherFunctionPtr, base, startArrayPtr, endArrayPtr, iBuilder->getInt32(32), outputBuffer);
     367    iBuilder->CreateCall(gatherFunctionPtr, {base, startArrayPtr, endArrayPtr, iBuilder->getInt32(32), outputBuffer});
    368368    // Copy the unused start positions to the front of the start position array and adjust the start index
    369369    Value * remainingArrayPtr = iBuilder->CreateGEP(startArrayPtr, iBuilder->getInt32(gatherCount));
     
    418418
    419419        Function::arg_iterator args = function->arg_begin();
    420         Value * const base = args++;
     420        Value * const base = &*(args++);
    421421        base->setName("base");
    422         Value * startArray = args++;
     422        Value * startArray = &*(args++);
    423423        startArray->setName("startArray");
    424         Value * endArray = args++;
     424        Value * endArray = &*(args++);
    425425        endArray->setName("endArray");
    426         Value * const numOfKeys = args++;
     426        Value * const numOfKeys = &*(args++);
    427427        numOfKeys->setName("numOfKeys");
    428         Value * result = args++;
     428        Value * result = &*(args++);
    429429        result->setName("result");
    430430
     
    652652    Function::arg_iterator args = main->arg_begin();
    653653
    654     Value * const inputStream = args++;
     654    Value * const inputStream = &*(args++);
    655655    inputStream->setName("inputStream");
    656656
    657     Value * const bufferSize = args++;
     657    Value * const bufferSize = &*(args++);
    658658    bufferSize->setName("bufferSize");
    659659
     
    767767        Value * endArrayPtr = iBuilder->CreatePointerCast(endArray, PointerType::get(iBuilder->getInt32Ty(), 0));
    768768        Value * outputBuffer = iBuilder->CreatePointerCast(gatheringInstance->getOutputStream(groupIV), iBuilder->getInt8PtrTy());
    769         iBuilder->CreateCall5(mGatherFunction.at(i), base, startArrayPtr, endArrayPtr, startIndex, outputBuffer);
     769        iBuilder->CreateCall(mGatherFunction.at(i), {base, startArrayPtr, endArrayPtr, startIndex, outputBuffer});
    770770        iBuilder->CreateBr(nextNonEmptyGroup);
    771771
  • icGREP/icgrep-devel/icgrep/kernels/u8u16_pipeline.cpp

    r5010 r5014  
    7676    Function::arg_iterator args = main->arg_begin();
    7777   
    78     Value * const inputStream = args++;
     78    Value * const inputStream = &*(args++);
    7979    inputStream->setName("input");
    80     Value * const bufferSize = args++;
     80    Value * const bufferSize = &*(args++);
    8181    bufferSize->setName("bufferSize");
    8282   
Note: See TracChangeset for help on using the changeset viewer.