Changeset 3991


Ignore:
Timestamp:
Aug 11, 2014, 1:58:24 PM (5 years ago)
Author:
daled
Message:

Minor changes.

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

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/CMakeLists.txt

    r3982 r3991  
    5151 
    5252# add the executable
    53 add_executable(icgrep icgrep.cpp llvm_gen.cpp llvm_gen_helper.cpp utf_encoding.cpp cc_codegenobject.cpp  cc_compiler.cpp  cc_compiler_helper.cpp re_simplifier.cpp re_reducer.cpp re_nullable.cpp re_compiler.cpp pbix_compiler.cpp  symbol_generator.cpp utf8_encoder.cpp unicode_categories.h)
     53add_executable(icgrep icgrep.cpp llvm_gen.cpp llvm_gen_helper.cpp utf_encoding.cpp cc_codegenobject.cpp  cc_compiler.cpp  cc_compiler_helper.cpp re_simplifier.cpp re_reducer.cpp re_nullable.cpp re_compiler.cpp pbix_compiler.cpp  symbol_generator.cpp utf8_encoder.cpp unicode_categories.h unicode_categories-flat.h unicode_categories-simple.h)
    5454
    5555target_link_libraries (icgrep PabloADT RegExpADT ${REQ_LLVM_LIBRARIES})
  • icGREP/icgrep-devel/icgrep/icgrep.cpp

    r3969 r3991  
    5050BitBlock EOF_mask = simd<1>::constant<1>();
    5151
    52 Nd* mNd = NULL;
    53 
    5452struct Output {
    5553    BitBlock matches;
    5654    BitBlock LF;
    5755};
    58 
    59 /*
    60 struct Basis_bits {
    61     BitBlock bit_0;
    62     BitBlock bit_1;
    63     BitBlock bit_2;
    64     BitBlock bit_3;
    65     BitBlock bit_4;
    66     BitBlock bit_5;
    67     BitBlock bit_6;
    68     BitBlock bit_7;
    69 };
    70 */
    7156
    7257#include <simd-lib/transpose.hpp>
  • icGREP/icgrep-devel/icgrep/icgrep.h

    r3969 r3991  
    88 */
    99
    10 
    11 
    1210#include <simd-lib/bitblock.hpp>
    1311#include <simd-lib/carryQ.hpp>
    1412#include <simd-lib/pabloSupport.hpp>
    15 
    16 
    1713
    1814struct Basis_bits {
  • icGREP/icgrep-devel/icgrep/llvm_gen.cpp

    r3984 r3991  
    66
    77#include "llvm_gen.h"
    8 #include "printer_pablos.h"
    98
    109Ps* ps = NULL; Nl* nl = NULL; No* no = NULL; Lo* lo = NULL; Ll* ll = NULL; Lm* lm = NULL; Nd* nd = NULL;
     
    441440
    442441    fpm.add(createBasicAliasAnalysisPass());      //Provide basic AliasAnalysis support for GVN. (Global Value Numbering)
     442    fpm.add(createCFGSimplificationPass());       //Simplify the control flow graph.
    443443    fpm.add(createInstructionCombiningPass());    //Simple peephole optimizations and bit-twiddling.
    444     fpm.add(createCFGSimplificationPass());       //Simplify the control flow graph (deleting unreachable blocks, etc).
    445444    fpm.add(createReassociatePass());             //Reassociate expressions.
    446445    fpm.add(createGVNPass());                     //Eliminate common subexpressions.
     
    527526    //This function can be used for testing to print the contents of a register from JIT'd code to the terminal window.
    528527    //mFunc_print_register = mMod->getOrInsertFunction("wrapped_print_register", Type::getVoidTy(getGlobalContext()), m64x2Vect, NULL);
    529 
    530528    //mExecutionEngine->addGlobalMapping(cast<GlobalValue>(mFunc_print_register), (void *)&wrapped_print_register);
    531529    // to call->  b.CreateCall(mFunc_print_register, unicode_category);
  • icGREP/icgrep-devel/icgrep/llvm_gen.h

    r3982 r3991  
    4444#include "llvm_gen_helper.h"
    4545
    46 #include "unicode_categories.h"
     46//#include "unicode_categories.h"
     47//#include "unicode_categories-flat.h"
     48#include "unicode_categories-simple.h"
    4749
    4850#include <iostream>
Note: See TracChangeset for help on using the changeset viewer.