Changeset 4888 for icGREP/icgrep-devel/icgrep/pablo/optimizers/pablo_automultiplexing.hpp

Timestamp:

Dec 2, 2015, 4:22:23 PM (3 years ago)

Author:

nmedfort

Message:

Work on adding Multiplexing Window Size.

File:

• icGREP/icgrep-devel/icgrep/pablo/optimizers/pablo_automultiplexing.hpp (modified) (3 diffs)

icGREP/icgrep-devel/icgrep/pablo/optimizers/pablo_automultiplexing.hpp

@@ -20 +20 @@
 class PabloFunction;
 
-class AutoMultiplexing {
+class MultiplexingPass {
 
     using CharacterizationMap = llvm::DenseMap<const PabloAST *, BDD>;
@@ -29 +29 @@
     using MultiplexSetGraph = boost::adjacency_list<boost::hash_setS, boost::vecS, boost::bidirectionalS>;
     using SubsetGraph = boost::adjacency_list<boost::hash_setS, boost::vecS, boost::bidirectionalS>;
+    using AdvanceDepth = std::vector<int>;
     using AdvanceAttributes = std::vector<std::pair<Advance *, BDD>>; // the Advance pointer and its respective base BDD variable
     using VertexVector = std::vector<ConstraintVertex>;
@@ -34 +35 @@
 
 public:
-    static bool optimize(PabloFunction & function, const unsigned limit = std::numeric_limits<unsigned>::max(), const unsigned maxSelections = 100, const bool independent = false);
+    static bool optimize(PabloFunction & function, const unsigned limit = std::numeric_limits<unsigned>::max(), const unsigned maxSelections = 100, const unsigned windowSize = 10, const bool independent = false);
 protected:
     unsigned initialize(PabloFunction & function, const bool independent);
+    void initializeBaseConstraintGraph(PabloBlock * const block, const unsigned statements, const unsigned advances);
+    void initializeAdvanceDepth(PabloBlock * const block, const unsigned advances) ;
+
     void characterize(PabloBlock * const block);
     BDD characterize(Statement * const stmt);
     BDD characterize(Advance * const adv, const BDD Ik);
     bool independent(const ConstraintVertex i, const ConstraintVertex j) const;
+    bool exceedsWindowSize(const ConstraintVertex i, const ConstraintVertex j) const;
     bool generateCandidateSets(RNG & rng);
+
     void addCandidateSet(const VertexVector & S, RNG & rng);
-    void selectMultiplexSets(RNG &);
-    void doTransitiveReductionOfSubsetGraph() ;
-    void applySubsetConstraints();
+    void selectMultiplexSets(RNG & rng);
+    void doTransitiveReductionOfSubsetGraph();
+    void eliminateSubsetConstraints();
     void multiplexSelectedIndependentSets(PabloFunction & function);
     static void topologicalSort(PabloFunction & function);
     BDD & get(const PabloAST * const expr);
 
-    inline AutoMultiplexing(const unsigned limit, const unsigned maxSelections)
-    : mLimit(limit)
-    , mMaxSelections(maxSelections)
+    inline MultiplexingPass(const unsigned limit, const unsigned maxSelections, const unsigned windowSize)
+    : mMultiplexingSetSizeLimit(limit)
+    , mMaxMultiplexingSetSelections(maxSelections)
+    , mWindowSize(windowSize)
+    , mTestConstrainedAdvances(true)
     , mVariables(0)
     , mConstraintGraph(0)
+    , mAdvanceDepth(0, 0)
     {
+
     }
 
 private:
-    const unsigned              mLimit;
-    const unsigned              mMaxSelections;
+    const unsigned              mMultiplexingSetSizeLimit;
+    const unsigned              mMaxMultiplexingSetSelections;
+    const unsigned              mWindowSize;
+    const bool                  mTestConstrainedAdvances;
     unsigned                    mVariables;
     CharacterizationMap         mCharacterization;
     ConstraintGraph             mConstraintGraph;
+    AdvanceDepth                mAdvanceDepth;
     SubsetGraph                 mSubsetGraph;
     AdvanceAttributes           mAdvanceAttributes;