summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore3
-rw-r--r--include/chillAST/chillAST_node.hh58
-rw-r--r--include/chillAST/chillASTs.hh51
-rw-r--r--src/ast/node.cpp73
-rw-r--r--src/chillASTs.cc212
5 files changed, 148 insertions, 249 deletions
diff --git a/.gitignore b/.gitignore
index f0d8fa3..75d39c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,6 @@
# Vim swap file
*.swap
+
+# CHiLL output
+clang_mm.c
diff --git a/include/chillAST/chillAST_node.hh b/include/chillAST/chillAST_node.hh
index a8fb50f..255c07a 100644
--- a/include/chillAST/chillAST_node.hh
+++ b/include/chillAST/chillAST_node.hh
@@ -220,7 +220,7 @@ public:
void setChild(int which, chillAST_Node *n) {
children[which] = n;
- children[which]->parent = this;
+ if (n) children[which]->parent = this;
};
void setMetaComment(const char *c) { metacomment = strdup(c); };
@@ -282,20 +282,10 @@ public:
exit(-1);
};
- virtual void gatherArrayRefs(std::vector<chillAST_ArraySubscriptExpr *> &refs, bool writtento) {
- CHILL_ERROR("(%s) forgot to implement gatherArrayRefs()\n", getTypeString());
- dump();
- print();
- exit(-1);
- };
+ virtual void gatherArrayRefs(std::vector<chillAST_ArraySubscriptExpr *> &refs, bool writtento);
// TODO we MIGHT want the VarDecl // NOTHING IMPLEMENTS THIS? ???
- virtual void gatherScalarRefs(std::vector<chillAST_DeclRefExpr *> &refs, bool writtento) {
- CHILL_ERROR("(%s) forgot to implement gatherScalarRefs()\n", getTypeString());
- dump();
- print();
- exit(-1);
- };
+ virtual void gatherScalarRefs(std::vector<chillAST_DeclRefExpr *> &refs, bool writtento);
//! recursive walk parent links, looking for loops, and grabbing the declRefExpr in the loop init and cond.
virtual void gatherLoopIndeces(std::vector<chillAST_VarDecl *> &indeces);
@@ -307,25 +297,18 @@ public:
chillAST_Node *findContainingNonLoop();
// TODO gather loop init and cond (and if cond) like gatherloopindeces
-
- virtual void gatherDeclRefExprs(std::vector<chillAST_DeclRefExpr *> &refs) { // both scalar and arrays
- fprintf(stderr, "(%s) forgot to implement gatherDeclRefExpr()\n", getTypeString());
- };
+ //! gather both scalar and array references
+ virtual void gatherDeclRefExprs(std::vector<chillAST_DeclRefExpr *> &refs);
- virtual void gatherVarUsage(std::vector<chillAST_VarDecl *> &decls) {
- fprintf(stderr, "(%s) forgot to implement gatherVarUsage()\n", getTypeString());
- };
+ virtual void gatherVarUsage(std::vector<chillAST_VarDecl *> &decls);
virtual void gatherVarLHSUsage(std::vector<chillAST_VarDecl *> &decls) {
fprintf(stderr, "(%s) forgot to implement gatherVarLHSUsage()\n", getTypeString());
};
//! ACTUAL Declaration
- virtual void gatherVarDecls(std::vector<chillAST_VarDecl *> &decls) {
- fprintf(stderr, "(%s) forgot to implement gatherVarDecls()\n", getTypeString());
- };
-
+ virtual void gatherVarDecls(std::vector<chillAST_VarDecl *> &decls);
virtual void
gatherVarDeclsMore(std::vector<chillAST_VarDecl *> &decls) { // even if the decl itself is not in the ast.
@@ -336,9 +319,7 @@ public:
fprintf(stderr, "(%s) forgot to implement gatherScalarVarDecls()\n", getTypeString());
};
- virtual void gatherArrayVarDecls(std::vector<chillAST_VarDecl *> &decls) { // ACTUAL Declaration
- fprintf(stderr, "(%s) forgot to implement gatherArrayVarDecls()\n", getTypeString());
- };
+ virtual void gatherArrayVarDecls(std::vector<chillAST_VarDecl *> &decls);
virtual chillAST_VarDecl *findArrayDecl(const char *name) { // scoping TODO
if (!getSymbolTable()) return parent->findArrayDecl(name); // most things
@@ -347,9 +328,7 @@ public:
}
- virtual void replaceVarDecls(chillAST_VarDecl *olddecl, chillAST_VarDecl *newdecl) {
- fprintf(stderr, "(%s) forgot to implement replaceVarDecls()\n", getTypeString());
- };
+ virtual void replaceVarDecls(chillAST_VarDecl *olddecl, chillAST_VarDecl *newdecl);
//! this just looks for ForStmts with preferred index metacomment attached
virtual bool findLoopIndexesToReplace(chillAST_SymbolTable *symtab, bool forcesync = false) {
@@ -357,11 +336,12 @@ public:
return false;
}
-
- virtual chillAST_Node *constantFold() { // hacky. TODO. make nice
- CHILL_ERROR("(%s) forgot to implement constantFold()\n", getTypeString());
- exit(-1);;
- };
+ //! Folding constant, to some degree.
+ /*!
+ * We shoud need to delegate this to the backend compiler
+ * @return This node
+ */
+ virtual chillAST_Node *constantFold();
virtual chillAST_Node *clone() { // makes a deep COPY (?)
CHILL_ERROR("(%s) forgot to implement clone()\n", getTypeString());
@@ -409,13 +389,7 @@ public:
//! Get a vector of statements
- virtual void gatherStatements(std::vector<chillAST_Node *> &statements) {
- fprintf(stderr, "(%s) forgot to implement gatherStatements()\n", getTypeString());
- dump();
- fflush(stdout);
- print();
- fprintf(stderr, "\n\n");
- }
+ virtual void gatherStatements(std::vector<chillAST_Node *> &statements);
virtual chillAST_SymbolTable *getParameters() { return parameters; }
diff --git a/include/chillAST/chillASTs.hh b/include/chillAST/chillASTs.hh
index a30a420..ea8feaa 100644
--- a/include/chillAST/chillASTs.hh
+++ b/include/chillAST/chillASTs.hh
@@ -532,11 +532,6 @@ public:
};
class chillAST_ForStmt : public chillAST_Node {
-private:
- chillAST_Node *init;
- chillAST_Node *cond;
- chillAST_Node *incr;
- chillAST_Node *body; // always a compoundstmt?
public:
virtual CHILLAST_NODE_TYPE getType() { return CHILLAST_NODE_FORSTMT; }
@@ -555,17 +550,17 @@ public:
void removeSyncComment();
- chillAST_Node *getInit() { return init; };
- void setInit(chillAST_Node *i) { init = i; i->parent = this; }
+ chillAST_Node *getInit() { return children[0]; };
+ void setInit(chillAST_Node *i) { setChild(0,i); }
- chillAST_Node *getCond() { return cond; };
- void setCond(chillAST_Node *c) { cond = c; c->parent = this; }
+ chillAST_Node *getCond() { return children[1]; };
+ void setCond(chillAST_Node *c) { setChild(1,c); }
- chillAST_Node *getInc() { return incr; };
- void setInc(chillAST_Node *i) { incr = i; i->parent = this; }
+ chillAST_Node *getInc() { return children[2]; };
+ void setInc(chillAST_Node *i) { setChild(2,i); }
- chillAST_Node *getBody() { return body; };
- void setBody(chillAST_Node *b) { body = b; b->parent = this; };
+ chillAST_Node *getBody() { return children[3]; };
+ void setBody(chillAST_Node *b) { setChild(3,b); };
bool isNotLeaf() { return true; };
@@ -576,27 +571,10 @@ public:
// required methods that I can't seem to get to inherit
void printControl(int indent = 0, FILE *fp = stderr); // print just for ( ... ) but not body
- chillAST_Node *constantFold();
-
chillAST_Node *clone();
- void gatherVarDecls(std::vector<chillAST_VarDecl *> &decls);
-
void gatherVarDeclsMore(std::vector<chillAST_VarDecl *> &decls) { gatherVarDecls(decls); };
- void gatherScalarVarDecls(std::vector<chillAST_VarDecl *> &decls);
-
- void gatherArrayVarDecls(std::vector<chillAST_VarDecl *> &decls);
-
- void gatherArrayRefs(std::vector<chillAST_ArraySubscriptExpr *> &refs, bool writtento);
-
- void gatherScalarRefs(std::vector<chillAST_DeclRefExpr *> &refs, bool writtento);
-
- void gatherVarUsage(std::vector<chillAST_VarDecl *> &decls);
-
- void gatherDeclRefExprs(std::vector<chillAST_DeclRefExpr *> &refs);
-
- void replaceVarDecls(chillAST_VarDecl *olddecl, chillAST_VarDecl *newdecl); // will get called on inner loops
bool findLoopIndexesToReplace(chillAST_SymbolTable *symtab, bool forcesync = false);
void gatherLoopIndeces(std::vector<chillAST_VarDecl *> &indeces);
@@ -607,11 +585,11 @@ public:
// ADD MYSELF!
loops.push_back(this);
- int n = body->children.size();
+ int n = getBody()->children.size();
//fprintf(stderr, "get_deep_loops of a %s with %d children\n", getTypeString(), n);
for (int i = 0; i < n; i++) {
- //fprintf(stderr, "child %d is a %s\n", i, body->children[i]->getTypeString());
- body->children[i]->get_deep_loops(loops);
+ //fprintf(stderr, "child %d is a %s\n", i, body->children[i]->getTypeString());
+ getBody()->children[i]->get_deep_loops(loops);
}
//fprintf(stderr, "found %d deep loops\n", loops.size());
}
@@ -620,10 +598,10 @@ public:
void find_deepest_loops(std::vector<chillAST_ForStmt *> &loops) {
std::vector<chillAST_ForStmt *> b; // deepest loops below me
- int n = body->children.size();
+ int n = getBody()->children.size();
for (int i = 0; i < n; i++) {
std::vector<chillAST_ForStmt *> l; // deepest loops below one child
- body->children[i]->find_deepest_loops(l);
+ getBody()->children[i]->find_deepest_loops(l);
if (l.size() > b.size()) { // a deeper nesting than we've seen
b = l;
}
@@ -635,9 +613,6 @@ public:
void loseLoopWithLoopVar(char *var); // chillAST_ForStmt
- void replaceChild(chillAST_Node *old, chillAST_Node *newchild);
-
- void gatherStatements(std::vector<chillAST_Node *> &statements);
bool lowerBound(int &l);
diff --git a/src/ast/node.cpp b/src/ast/node.cpp
index 7af48f1..d0a80e9 100644
--- a/src/ast/node.cpp
+++ b/src/ast/node.cpp
@@ -7,6 +7,8 @@
#include "printer/cfamily.h"
#include <stack>
+using namespace std;
+
void chillAST_Node::fixChildInfo() {}
void chillAST_Node::addChild(chillAST_Node *c) {
@@ -257,3 +259,74 @@ void chillAST_Node::print(int indent, FILE *fp) {
fprintf(stdout, "\n");
}
}
+
+chillAST_Node* chillAST_Node::constantFold(){
+ CHILL_DEBUG_PRINT("Using generic\n");
+ for (int i = 0;i<getNumChildren();++i) {
+ if (getChild(i))
+ getChild(i)->constantFold();
+ }
+ return this;
+};
+
+void chillAST_Node::gatherVarDecls(vector<chillAST_VarDecl*> &decls) {
+ CHILL_DEBUG_PRINT("Using generic\n");
+ for (int i = 0;i<getNumChildren();++i) {
+ if (getChild(i))
+ getChild(i)->gatherVarDecls(decls);
+ }
+}
+void chillAST_Node::gatherArrayVarDecls(vector<chillAST_VarDecl*> &decls) {
+ CHILL_DEBUG_PRINT("Using generic\n");
+ for (int i = 0;i<getNumChildren();++i) {
+ if (getChild(i))
+ getChild(i)->gatherArrayVarDecls(decls);
+ }
+}
+void chillAST_Node::gatherArrayRefs(vector<chillAST_ArraySubscriptExpr*> &refs, bool writtento) {
+ CHILL_DEBUG_PRINT("Using generic\n");
+ for (int i = 0;i<getNumChildren();++i) {
+ if (getChild(i))
+ getChild(i)->gatherArrayRefs(refs,writtento);
+ }
+}
+void chillAST_Node::gatherScalarRefs(vector<chillAST_DeclRefExpr*> &refs, bool writtento) {
+ CHILL_DEBUG_PRINT("Using generic\n");
+ for (int i = 0;i<getNumChildren();++i) {
+ if (getChild(i))
+ getChild(i)->gatherScalarRefs(refs,writtento);
+ }
+}
+void chillAST_Node::gatherDeclRefExprs(vector<chillAST_DeclRefExpr*> &refs) {
+ CHILL_DEBUG_PRINT("Using generic\n");
+ for (int i = 0;i<getNumChildren();++i) {
+ if (getChild(i))
+ getChild(i)->gatherDeclRefExprs(refs);
+ }
+}
+void chillAST_Node::gatherVarUsage(vector<chillAST_VarDecl*> &decls) {
+ CHILL_DEBUG_PRINT("Using generic\n");
+ for (int i = 0;i<getNumChildren();++i) {
+ if (getChild(i))
+ getChild(i)->gatherVarUsage(decls);
+ }
+}
+void chillAST_Node::gatherStatements(vector<chillAST_Node*> &statements) {
+ CHILL_DEBUG_PRINT("using generic\n");
+ for (int i = 0;i<getNumChildren();++i) {
+ if (getChild(i))
+ getChild(i)->gatherStatements(statements);
+ }
+}
+void chillAST_Node::replaceVarDecls(chillAST_VarDecl* olddecl, chillAST_VarDecl *newdecl) {
+ CHILL_DEBUG_PRINT("using generic\n");
+ for (int i = 0;i<getNumChildren();++i) {
+ if (getChild(i))
+ getChild(i)->replaceVarDecls(olddecl,newdecl);
+ }
+}
+
+
+
+
+
diff --git a/src/chillASTs.cc b/src/chillASTs.cc
index e026e45..7ac8426 100644
--- a/src/chillASTs.cc
+++ b/src/chillASTs.cc
@@ -635,33 +635,28 @@ void chillAST_MacroDefinition::addChild(chillAST_Node *node) {
}
chillAST_ForStmt::chillAST_ForStmt() {
- init = cond = incr = NULL;
- body = new chillAST_CompoundStmt();
+ children.push_back(NULL); // init
+ children.push_back(NULL); // cond
+ children.push_back(NULL); // incr
+ children.push_back(new chillAST_CompoundStmt()); // Body
conditionoperator = IR_COND_UNKNOWN;
symbolTable = new chillAST_SymbolTable();
}
-chillAST_ForStmt::chillAST_ForStmt(chillAST_Node *ini, chillAST_Node *con, chillAST_Node *inc, chillAST_Node *bod) {
- init = ini;
- cond = con;
- incr = inc;
- body = bod;
- init->setParent(this);
- cond->setParent(this);
- incr->setParent(this);
- symbolTable = new chillAST_SymbolTable();
-
- //fprintf(stderr, "chillAST_ForStmt::chillAST_ForStmt() bod %p\n", bod);
+chillAST_ForStmt::chillAST_ForStmt(chillAST_Node *ini, chillAST_Node *con, chillAST_Node *inc, chillAST_Node *bod)
+ :chillAST_ForStmt() {
+ setInit(ini);
+ setCond(con);
+ setInc(inc);
+ setBody(bod);
- if (body) body->setParent(this); // not sure this should be legal
-
- if (!cond->isBinaryOperator()) {
- CHILL_ERROR("ForStmt conditional is of type %s. Expecting a BinaryOperator\n", cond->getTypeString());
+ if (!con->isBinaryOperator()) {
+ CHILL_ERROR("ForStmt conditional is of type %s. Expecting a BinaryOperator\n", con->getTypeString());
exit(-1);
}
- chillAST_BinaryOperator *bo = (chillAST_BinaryOperator *) cond;
+ chillAST_BinaryOperator *bo = (chillAST_BinaryOperator *) con;
char *condstring = bo->op;
if (!strcmp(condstring, "<")) conditionoperator = IR_COND_LT;
else if (!strcmp(condstring, "<=")) conditionoperator = IR_COND_LE;
@@ -682,13 +677,13 @@ bool chillAST_ForStmt::lowerBound(int &l) { // l is an output (passed as referen
conditionoperator == IR_COND_LE) {
// lower bound is rhs of init
- if (!init->isBinaryOperator()) {
+ if (!getInit()->isBinaryOperator()) {
fprintf(stderr, "chillAST_ForStmt::lowerBound() init is not a chillAST_BinaryOperator\n");
exit(-1);
}
- chillAST_BinaryOperator *bo = (chillAST_BinaryOperator *) init;
- if (!init->isAssignmentOp()) {
+ chillAST_BinaryOperator *bo = (chillAST_BinaryOperator *) getInit();
+ if (!getInit()->isAssignmentOp()) {
fprintf(stderr, "chillAST_ForStmt::lowerBound() init is not an assignment chillAST_BinaryOperator\n");
exit(-1);
}
@@ -700,7 +695,7 @@ bool chillAST_ForStmt::lowerBound(int &l) { // l is an output (passed as referen
} else if (conditionoperator == IR_COND_GT ||
conditionoperator == IR_COND_GE) { // decrementing
// lower bound is rhs of cond (not init)
- chillAST_BinaryOperator *bo = (chillAST_BinaryOperator *) cond;
+ chillAST_BinaryOperator *bo = (chillAST_BinaryOperator *) getCond();
l = bo->rhs->evalAsInt(); // float could be legal I suppose
return true;
}
@@ -720,13 +715,13 @@ bool chillAST_ForStmt::upperBound(int &u) { // u is an output (passed as referen
conditionoperator == IR_COND_GE) { // decrementing
// upper bound is rhs of init
- if (!init->isBinaryOperator()) {
+ if (!getInit()->isBinaryOperator()) {
fprintf(stderr, "chillAST_ForStmt::upperBound() init is not a chillAST_BinaryOperator\n");
exit(-1);
}
- chillAST_BinaryOperator *bo = (chillAST_BinaryOperator *) init;
- if (!init->isAssignmentOp()) {
+ chillAST_BinaryOperator *bo = (chillAST_BinaryOperator *) getInit();
+ if (!getInit()->isAssignmentOp()) {
fprintf(stderr, "chillAST_ForStmt::upperBound() init is not an assignment chillAST_BinaryOperator\n");
exit(-1);
}
@@ -737,7 +732,7 @@ bool chillAST_ForStmt::upperBound(int &u) { // u is an output (passed as referen
conditionoperator == IR_COND_LE) {
//fprintf(stderr, "upper bound is rhs of cond ");
// upper bound is rhs of cond (not init)
- chillAST_BinaryOperator *bo = (chillAST_BinaryOperator *) cond;
+ chillAST_BinaryOperator *bo = (chillAST_BinaryOperator *) getCond();
//bo->rhs->print(0,stderr);
u = bo->rhs->evalAsInt(); // float could be legal I suppose
@@ -758,97 +753,23 @@ bool chillAST_ForStmt::upperBound(int &u) { // u is an output (passed as referen
void chillAST_ForStmt::printControl(int in, FILE *fp) {
chillindent(in, fp);
fprintf(fp, "for (");
- init->print(0, fp);
+ getInit()->print(0, fp);
fprintf(fp, "; ");
- cond->print(0, fp);
+ getCond()->print(0, fp);
fprintf(fp, "; ");
- incr->print(0, fp);
+ getInc()->print(0, fp);
fprintf(fp, ")");
fflush(fp);
}
-chillAST_Node *chillAST_ForStmt::constantFold() {
- init = init->constantFold();
- cond = cond->constantFold();
- incr = incr->constantFold();
- body = body->constantFold();
- return this;
-}
-
chillAST_Node *chillAST_ForStmt::clone() {
- chillAST_ForStmt *fs = new chillAST_ForStmt(init->clone(), cond->clone(), incr->clone(), body->clone());
+ chillAST_ForStmt *fs = new chillAST_ForStmt(getInit()->clone(), getCond()->clone(), getInc()->clone(), getBody()->clone());
fs->isFromSourceFile = isFromSourceFile;
if (filename) fs->filename = strdup(filename);
fs->setParent(getParent());
return fs;
}
-void chillAST_ForStmt::gatherVarDecls(vector<chillAST_VarDecl *> &decls) {
- //fprintf(stderr, "chillAST_ForStmt::gatherVarDecls()\n");
- //fprintf(stderr, "chillAST_ForStmt::gatherVarDecls() before %d\n", decls.size());
- // TODO clear a loop_var_decls variable and then walk it ?
- init->gatherVarDecls(decls);
- cond->gatherVarDecls(decls);
- incr->gatherVarDecls(decls);
- body->gatherVarDecls(decls);
- //fprintf(stderr, "after %d\n", decls.size());
-}
-
-void chillAST_ForStmt::gatherScalarVarDecls(vector<chillAST_VarDecl *> &decls) {
- //fprintf(stderr, "chillAST_ForStmt::gatherScalarVarDecls() before %d\n", decls.size());
- init->gatherScalarVarDecls(decls);
- cond->gatherScalarVarDecls(decls);
- incr->gatherScalarVarDecls(decls);
- body->gatherScalarVarDecls(decls);
-}
-
-void chillAST_ForStmt::gatherArrayVarDecls(vector<chillAST_VarDecl *> &decls) {
- //fprintf(stderr, "chillAST_ForStmt::gatherArrayVarDecls() before %d\n", decls.size());
- init->gatherArrayVarDecls(decls);
- cond->gatherArrayVarDecls(decls);
- incr->gatherArrayVarDecls(decls);
- body->gatherArrayVarDecls(decls);
-}
-
-void chillAST_ForStmt::gatherArrayRefs(std::vector<chillAST_ArraySubscriptExpr *> &refs, bool writtento) {
- init->gatherArrayRefs(refs, 0); // 0 ??
- cond->gatherArrayRefs(refs, 0); // 0 ??
- incr->gatherArrayRefs(refs, 0); // 0 ??
- body->gatherArrayRefs(refs, 0); // 0 ??
-}
-
-void chillAST_ForStmt::gatherScalarRefs(std::vector<chillAST_DeclRefExpr *> &refs, bool writtento) {
- init->gatherScalarRefs(refs, 0); // 0 ??
- cond->gatherScalarRefs(refs, 0); // 0 ??
- incr->gatherScalarRefs(refs, 0); // 0 ??
- body->gatherScalarRefs(refs, 0); // 0 ??
-}
-
-void chillAST_ForStmt::gatherDeclRefExprs(vector<chillAST_DeclRefExpr *> &refs) {
- init->gatherDeclRefExprs(refs);
- cond->gatherDeclRefExprs(refs);
- incr->gatherDeclRefExprs(refs);
- body->gatherDeclRefExprs(refs);
-}
-
-
-void chillAST_ForStmt::gatherVarUsage(vector<chillAST_VarDecl *> &decls) {
- init->gatherVarUsage(decls);
- cond->gatherVarUsage(decls);
- incr->gatherVarUsage(decls);
- body->gatherVarUsage(decls);
-}
-
-void chillAST_ForStmt::gatherStatements(std::vector<chillAST_Node *> &statements) {
-
- // for completeness, should do all 4. Maybe someday
- //init->gatherStatements( statements );
- //cond->gatherStatements( statements );
- //incr->gatherStatements( statements );
- body->gatherStatements(statements);
-}
-
-
void chillAST_ForStmt::addSyncs() {
//fprintf(stderr, "\nchillAST_ForStmt::addSyncs() ");
//fprintf(stderr, "for (");
@@ -860,14 +781,7 @@ void chillAST_ForStmt::addSyncs() {
//fprintf(stderr, ")\n");
if (!parent) {
- fprintf(stderr, "uhoh, chillAST_ForStmt::addSyncs() ForStmt has no parent!\n");
- fprintf(stderr, "for (");
- init->print(0, stderr);
- fprintf(stderr, "; ");
- cond->print(0, stderr);
- fprintf(stderr, "; ");
- incr->print(0, stderr);
- fprintf(stderr, ")\n");
+ CHILL_ERROR("uhoh, chillAST_ForStmt::addSyncs() ForStmt has no parent!\n");
return; // exit?
}
@@ -954,7 +868,7 @@ bool chillAST_ForStmt::findLoopIndexesToReplace(chillAST_SymbolTable *symtab, bo
//fprintf(stderr, "prefer '%s'\n", vname );
vector<chillAST_VarDecl *> decls;
- init->gatherVarLHSUsage(decls);
+ getInit()->gatherVarLHSUsage(decls);
//cond->gatherVarUsage( decls );
//incr->gatherVarUsage( decls );
//fprintf(stderr, "forstmt has %d vardecls in init, cond, inc\n", decls.size());
@@ -1021,29 +935,8 @@ bool chillAST_ForStmt::findLoopIndexesToReplace(chillAST_SymbolTable *symtab, bo
// swap out old for new in init, cond, incr, body
if (newguy) {
fprintf(stderr, "\nwill replace %s with %s in init, cond, incr\n", olddecl->varname, newguy->varname);
- fprintf(stderr, "was: for (");
- init->print(0, stderr);
- fprintf(stderr, "; ");
- cond->print(0, stderr);
- fprintf(stderr, "; ");
- incr->print(0, stderr);
- fprintf(stderr, ")\n");
-
-
- init->replaceVarDecls(olddecl, newguy);
- cond->replaceVarDecls(olddecl, newguy);
- incr->replaceVarDecls(olddecl, newguy);
- fprintf(stderr, " is: for (");
- init->print(0, stderr);
- fprintf(stderr, "; ");
- cond->print(0, stderr);
- fprintf(stderr, "; ");
- incr->print(0, stderr);
- fprintf(stderr, ")\n\n");
-
- fprintf(stderr, "recursing to ForStmt body of type %s\n", body->getTypeString());
- body->replaceVarDecls(olddecl, newguy);
+ replaceVarDecls(olddecl, newguy);
fprintf(stderr, "\nafter recursing to body, this loop is (there should be no %s)\n", olddecl->varname);
print(0, stderr);
@@ -1058,37 +951,18 @@ bool chillAST_ForStmt::findLoopIndexesToReplace(chillAST_SymbolTable *symtab, bo
}
// check for more loops. We may have already swapped variables out in body (right above here)
- body->findLoopIndexesToReplace(symtab, false);
+ getBody()->findLoopIndexesToReplace(symtab, false);
return force;
}
-void chillAST_ForStmt::replaceChild(chillAST_Node *old, chillAST_Node *newchild) {
- //fprintf(stderr, "chillAST_ForStmt::replaceChild() REALLY CALLING BODY->ReplaceCHILD\n");
- body->replaceChild(old, newchild);
-}
-
-
-void chillAST_ForStmt::replaceVarDecls(chillAST_VarDecl *olddecl, chillAST_VarDecl *newdecl) {
- // logic problem if my loop var is olddecl!
-
- //fprintf(stderr, "chillAST_ForStmt::replaceVarDecls( old %s, new %s )\n", olddecl->varname, newdecl->varname);
-
- // this is called for inner loops!
- init->replaceVarDecls(olddecl, newdecl);
- cond->replaceVarDecls(olddecl, newdecl);
- incr->replaceVarDecls(olddecl, newdecl);
- body->replaceVarDecls(olddecl, newdecl);
-}
-
-
void chillAST_ForStmt::gatherLoopIndeces(std::vector<chillAST_VarDecl *> &indeces) {
//fprintf(stderr, "chillAST_ForStmt::gatherLoopIndeces()\nloop is:\n"); print(0,stderr);
vector<chillAST_VarDecl *> decls;
- init->gatherVarLHSUsage(decls);
- cond->gatherVarLHSUsage(decls);
- incr->gatherVarLHSUsage(decls);
+ getInit()->gatherVarLHSUsage(decls);
+ getCond()->gatherVarLHSUsage(decls);
+ getInc()->gatherVarLHSUsage(decls);
// note: NOT GOING INTO BODY OF THE LOOP
int numdecls = decls.size();
@@ -1122,9 +996,9 @@ void chillAST_ForStmt::gatherLoopVars(std::vector<std::string> &loopvars) {
vector<chillAST_VarDecl *> decls;
- init->gatherVarLHSUsage(decls);
- cond->gatherVarLHSUsage(decls);
- incr->gatherVarLHSUsage(decls);
+ getInit()->gatherVarLHSUsage(decls);
+ getCond()->gatherVarLHSUsage(decls);
+ getInc()->gatherVarLHSUsage(decls);
// note: NOT GOING INTO BODY OF THE LOOP
for (int i = 0; i < decls.size(); i++) loopvars.push_back(strdup(decls[i]->varname));
@@ -1140,7 +1014,7 @@ void chillAST_ForStmt::loseLoopWithLoopVar(char *var) {
// if you DON'T do this first, you may have already replaced yourself with this loop body
// the body will no longer have this forstmt as parent, it will have the forstmt's parent as its parent
//fprintf(stderr, "forstmt 0x%x, recursing loseLoop to body 0x%x of type %s with parent 0x%x of type %s\n", this, body, body->getTypeString(), body->parent, body->parent->getTypeString());
- body->loseLoopWithLoopVar(var);
+ getBody()->loseLoopWithLoopVar(var);
@@ -1177,18 +1051,18 @@ void chillAST_ForStmt::loseLoopWithLoopVar(char *var) {
}
vector<chillAST_VarDecl *> decls;
- init->gatherVarLHSUsage(decls); // this can fail if init is outside the loop
- cond->gatherVarLHSUsage(decls);
- incr->gatherVarLHSUsage(decls);
+ getInit()->gatherVarLHSUsage(decls); // this can fail if init is outside the loop
+ getCond()->gatherVarLHSUsage(decls);
+ getInc()->gatherVarLHSUsage(decls);
if (decls.size() > 1) {
fprintf(stderr, "chill_ast.cc multiple loop variables confuses me\n");
exit(-1);
}
- chillAST_Node *newstmt = body;
+ chillAST_Node *newstmt = getBody();
// ACTUALLY, if I am being replaced, and my loop conditional is a min (Ternary), then wrap my loop body in an if statement
- if (cond->isBinaryOperator()) { // what else could it be?
- chillAST_BinaryOperator *BO = (chillAST_BinaryOperator *) cond;
+ if (getCond()->isBinaryOperator()) { // what else could it be?
+ chillAST_BinaryOperator *BO = (chillAST_BinaryOperator *) getCond();
if (BO->rhs->isTernaryOperator()) {
chillAST_TernaryOperator *TO = (chillAST_TernaryOperator *) BO->rhs;
@@ -1217,7 +1091,7 @@ void chillAST_ForStmt::loseLoopWithLoopVar(char *var) {
// wrap the loop body in an if
chillAST_DeclRefExpr *DRE = new chillAST_DeclRefExpr(decls[0]);
chillAST_BinaryOperator *ifcond = new chillAST_BinaryOperator(DRE, "<=", ifcondrhs);
- chillAST_IfStmt *ifstmt = new chillAST_IfStmt(ifcond, body, NULL);
+ chillAST_IfStmt *ifstmt = new chillAST_IfStmt(ifcond, getBody(), NULL);
newstmt = ifstmt;
}
generated by cgit v1.2.3-70-g09d2 (git 2.47.1) at 2025-02-01 22:42:07 +0000