Ignore:
Timestamp:
Jan 6, 2016, 2:12:17 PM (3 years ago)
Author:
cameron
Message:

Kernels in icgrep: initial check-in

File:
1 edited

Legend:

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

    r4900 r4907  
    2626#include <llvm/IR/Verifier.h>
    2727
    28 #include <IDISA/s2p_gen.h>
     28#include <kernels/s2p_gen.h>
     29#include <kernels/scanmatchgen.h>
    2930
    3031#include <re/re_re.h>
     
    145146   
    146147    gen_s2p_function(M, idb);
    147 
     148   
     149   
     150    generateScanBitBlockRoutine(M, idb, 64);
    148151   
    149152    if (IRFileName == "") {       
     
    177180    }
    178181    llvm::Function * s2p_IR = M->getFunction("s2p_block");
    179 
     182   
     183    llvm::Function * scanRoutine = M->getFunction("scan_matches_in_bitblock");
     184   
    180185    if (s2p_IR == nullptr) {
    181186        std::cerr << "No s2p_IR!\n";
     
    195200    void * icgrep_MCptr = engine->getPointerToFunction(icgrep_IR);
    196201    void * s2p_MCptr = engine->getPointerToFunction(s2p_IR);
     202    void * scan_MCptr = engine->getPointerToFunction(scanRoutine);
    197203    if (s2p_MCptr == nullptr) {
    198204        std::cerr << "No s2p_MCptr!\n";
     
    202208    if (icgrep_MCptr) {
    203209        GrepExecutor grepEngine(s2p_MCptr, icgrep_init_carry_ptr, icgrep_MCptr);
     210        //GrepExecutor grepEngine(s2p_MCptr, icgrep_init_carry_ptr, icgrep_MCptr, scan_MCptr);
    204211        grepEngine.setCountOnlyOption(CountOnly);
    205212        grepEngine.setNormalizeLineBreaksOption(NormalizeLineBreaks);
Note: See TracChangeset for help on using the changeset viewer.