[Support] nested-loop/ctrl-flow #34
Conversation
| @@ -7,15 +7,15 @@ | |||
| * Author : Cheng Tan | |||
| * Date : Jan 9, 2023 | |||
| */ | |||
|
|
|||
There was a problem hiding this comment.
Is there an unnecessary space added?
src/CGRA.cpp
Outdated
| #include <fstream> | ||
| #include "CGRA.h" | ||
| #include "json.hpp" | ||
|
|
||
| using json = nlohmann::json; | ||
|
|
||
| CGRA::CGRA(int t_rows, int t_columns, bool t_diagonalVectorization, | ||
| bool t_heterogeneity, bool t_parameterizableCGRA, | ||
| bool t_heterogeneity, bool t_parameterizableCGRA, int t_pathSupportDim, |
There was a problem hiding this comment.
Why is it called pathSupportDim? What does it actually mean? number of tiles that support path merging?
There was a problem hiding this comment.
pathSupportDim is used to determine how many tiles can support path merging. I will reconstruct codes uploading in this PR and finish ASAP.
| @@ -36,7 +36,7 @@ CGRA::CGRA(int t_rows, int t_columns, bool t_diagonalVectorization, | |||
| } | |||
| } | |||
|
|
|||
| ifstream paramCGRA("./paramCGRA.json"); | |||
| ifstream paramCGRA("./param.json"); | |||
There was a problem hiding this comment.
Would this change make our previous ICED or CGRA-Flow compilation fail on "file not found"?
src/CGRA.cpp
Outdated
| @@ -170,8 +170,11 @@ CGRA::CGRA(int t_rows, int t_columns, bool t_diagonalVectorization, | |||
| if (t_heterogeneity) { | |||
| for (int r=0; r<t_rows; ++r) { | |||
| for (int c=0; c<t_columns; ++c) { | |||
| if(r%2==1 and c%2 == 1) | |||
| if (((r*t_columns)+(c+1)) <= t_pathSupportDim){ | |||
| std::cout<< "[MMJ] "<< t_pathSupportDim << "support fuse and merge." <<std::endl; | |||
There was a problem hiding this comment.
[MMJ] -> [DEBUG]? And space between " and <<.
src/CGRA.cpp
Outdated
| @@ -170,8 +170,11 @@ CGRA::CGRA(int t_rows, int t_columns, bool t_diagonalVectorization, | |||
| if (t_heterogeneity) { | |||
| for (int r=0; r<t_rows; ++r) { | |||
| for (int c=0; c<t_columns; ++c) { | |||
| if(r%2==1 and c%2 == 1) | |||
| if (((r*t_columns)+(c+1)) <= t_pathSupportDim){ | |||
There was a problem hiding this comment.
What does this condition indicate? Originally only [1,1], [1,3], [3,1], ..., support heterogeneity. What about now?
src/DFG.cpp
Outdated
| return; | ||
| } | ||
|
|
||
| // dualIssue is used to identify 'br' with multiple output, it combines the ouput together with the same control edge. |
There was a problem hiding this comment.
dualIssue is used to identify -> Identifies.
src/DFG.cpp
Outdated
| } | ||
|
|
||
| // dualIssue is used to identify 'br' with multiple output, it combines the ouput together with the same control edge. | ||
| // Note that the control edge is only one bit width since there is noly one 'br' input. |
src/DFG.cpp
Outdated
|
|
||
|
|
||
| // findIFELPath finds succeed nodes after br with different path | ||
| void DFG::findIFELPath(list<DFGNode*>* t_succList, const int t_mergeSize) { |
There was a problem hiding this comment.
findIFELPath -> findAndMergeIfElsePaths? Am I correct? It looks not only find but also merge?
src/DFG.cpp
Outdated
| } | ||
|
|
||
| // pathMerge is used to merge exclusive pathes | ||
| void DFG::pathMerge(list<DFGNode*>* t_diffPathNode, const int t_mergeSize){ |
src/DFG.cpp
Outdated
| void DFG::ESCORT() { | ||
| dualIssueNew(2,100); | ||
| // If dualIssueNew fails | ||
| dualIssue(3,100); |
There was a problem hiding this comment.
Not quite understand why we need two dualIssue() funcs. And not sure why there are two tuneForDualIssue() funcs. And what the difference between dualissue and tuneFor. Can you plz add comment here?
|
Plz also resolve the conflicts and add tests like this: CGRA-Mapper/.github/workflows/cmake.yml Line 59 in b19c2bb Thanks for the PR! |
There should be a detailed inspect. I will do it.