Changeset 5862


Ignore:
Timestamp:
Feb 3, 2018, 7:44:18 PM (10 months ago)
Author:
cameron
Message:

Data race; disable segment-pipeline-parallel during recursive greps

Location:
icGREP/icgrep-devel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/QA/greptest.xml

    r5838 r5862  
    853853<grepcase regexp="(?:\p{greek}\p{greek}\p{greek})" datafile="upper_lower_greek" grepcount="3"/>
    854854
    855 <grepcase regexp="\p{name=/AIRPLANE/}" datafile="../All_good" grepcount="8"/>
     855<grepcase regexp="\p{name=/AIRPLANE/}" datafile="../All_good" flags="-enable-object-cache=0 -enable-segment-pipeline-parallel" grepcount="8"/>
    856856<grepcase regexp="\xc4[\x80-\x85]" datafile="../All_good" grepcount="5"/>
    857857<grepcase regexp="[\N{GREEK CAPITAL LETTER ALPHA}-\N{Greek capital letter UPSILON with DIALYTIKA}]" datafile="../All_good" grepcount="27"/>
  • icGREP/icgrep-devel/icgrep/toolchain/grep_pipeline.cpp

    r5861 r5862  
    100100    pxDriver.LinkFunction(*scanMatchK, "accumulate_match_wrapper", &accumulate_match_wrapper);
    101101    pxDriver.LinkFunction(*scanMatchK, "finalize_match_wrapper", &finalize_match_wrapper);
     102   
     103    bool saveSegmentParallel = codegen::SegmentPipelineParallel;
     104    codegen::SegmentPipelineParallel = false;
    102105    pxDriver.generatePipelineIR();
    103106    pxDriver.deallocateBuffers();
     
    108111    auto f = reinterpret_cast<GrepFunctionType>(pxDriver.getMain());
    109112    f(search_buffer, bufferLength);
     113    codegen::SegmentPipelineParallel = saveSegmentParallel;
    110114}
    111115}
Note: See TracChangeset for help on using the changeset viewer.