Ignore:
Timestamp:
Jul 3, 2015, 4:48:07 PM (4 years ago)
Author:
nmedfort
Message:

Minor modifications

File:
1 edited

Legend:

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

    r4629 r4638  
    6161                                      cl::cat(cPabloOptimizationsOptions));
    6262#ifdef ENABLE_MULTIPLEXING
    63 static cl::opt<bool> PabloMutualExclusionPass("disable-multiplexing", cl::init(true),
    64                                       cl::desc("Disable combining Advances whose inputs are mutual exclusive."),
     63static cl::opt<bool> EnableMultiplexing("enable-multiplexing", cl::init(false),
     64                                      cl::desc("combine Advances whose inputs are mutual exclusive into the fewest number of advances possible (expensive)."),
    6565                                      cl::cat(cPabloOptimizationsOptions));
    6666#endif
     
    106106    }
    107107
    108     if (IsPregeneratedUnicodeEnabled()) {
     108    if (UsePregeneratedUnicode()) {
    109109        resolveProperties(re_ast);
    110110    }
     
    168168    }
    169169    #ifdef ENABLE_MULTIPLEXING
    170     if (PabloMutualExclusionPass) {
    171         if (AutoMultiplexing::optimize(basisBits, main) && !DisablePabloCSE) {
    172             Simplifier::optimize(main);
    173         }
     170    if (EnableMultiplexing) {
     171        AutoMultiplexing::optimize(basisBits, main);
    174172    }
    175173    #endif
     
    182180
    183181    PabloCompiler pablo_compiler(basisBits);
    184     if (IsPregeneratedUnicodeEnabled()) {
     182    if (UsePregeneratedUnicode()) {
    185183        install_property_gc_fn_ptrs(pablo_compiler);
    186184        install_property_sc_fn_ptrs(pablo_compiler);
Note: See TracChangeset for help on using the changeset viewer.