Ignore:
Timestamp:
Sep 15, 2016, 4:29:27 PM (3 years ago)
Author:
nmedfort
Message:

Bug fix for reassociation pass.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/pablo/optimizers/booleanreassociationpass.h

    r5156 r5157  
    4444    BooleanReassociationPass(Z3_context ctx, Z3_params params, Z3_tactic tactic, PabloFunction & f);
    4545    bool processScopes(PabloFunction & function);
    46     void processScopes(PabloBlock * const block, CharacterizationMap & map);
     46    void processScopes(PabloBlock * const block, CharacterizationMap & C);
    4747    void distributeScope(PabloBlock * const block, CharacterizationMap & C);
    4848
     
    5252    bool contractGraph(Graph & G) const;
    5353
    54     bool reduceVertex(const Vertex u, CharacterizationMap & C, VertexMap & M, Graph & G, const bool use_expensive_simplification) const;
    55     bool reduceGraph(CharacterizationMap & C, VertexMap & M, Graph & G) const;
     54    bool reduceGraph(CharacterizationMap & C, VertexMap & M, Graph & G);
     55
     56    enum class Reduction {
     57        NoChange
     58        , Simplified
     59        , Removed
     60    };
     61
     62    Reduction reduceVertex(const Vertex u, CharacterizationMap & C, VertexMap & M, Graph & G, const bool use_expensive_simplification);
    5663
    5764    bool factorGraph(const PabloAST::ClassTypeId typeId, Graph & G, std::vector<Vertex> & factors) const;
     
    6471    void removeVertex(const Vertex u, Graph & G) const;
    6572
    66     bool redistributeGraph(CharacterizationMap & C, VertexMap & M, Graph & G) const;
     73    bool redistributeGraph(CharacterizationMap & C, VertexMap & M, Graph & G);
    6774
    6875    bool rewriteAST(CharacterizationMap & C, VertexMap &M, Graph & G);
     
    7279    Z3_ast simplify(Z3_ast node, bool use_expensive_minimization = false) const;
    7380
    74     Z3_ast makeVar() const;
     81    Z3_ast makeVar();
    7582
    7683private:
     
    8087    Z3_tactic const             mTactic;
    8188    Z3_ast                      mInFile;
     89    std::vector<Z3_ast>         mRefs;
    8290    PabloFunction &             mFunction;
    8391    bool                        mModified;
Note: See TracChangeset for help on using the changeset viewer.