Fixed an infinite looping

Symbolic expression add operation has a bug that causes an infinite looping. This change fixes it. Also, improve debugging functions by adding 'const' qualifier for their arguments.
intel · Sep 12, 2023 · d386d8e · d386d8e
1 parent be078e2
commit d386d8e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/IGC/Compiler/CISACodeGen/SLMConstProp.cpp b/IGC/Compiler/CISACodeGen/SLMConstProp.cpp
@@ -159,7 +159,7 @@ void SymbolicEvaluation::dump_symbols()
     dbgs() << "\n\n";
 }
 
-void SymbolicEvaluation::print(raw_ostream& OS, SymProd* P)
+void SymbolicEvaluation::print(raw_ostream& OS, const SymProd* P)
 {
     bool hasError = false;
     for (int i = 0; i < (int)P->Prod.size(); ++i) {
@@ -178,7 +178,7 @@ void SymbolicEvaluation::print(raw_ostream& OS, SymProd* P)
     }
 }
 
-void SymbolicEvaluation::print_varMapping(raw_ostream& OS, SymProd* P)
+void SymbolicEvaluation::print_varMapping(raw_ostream& OS, const SymProd* P)
 {
     std::map<const Value*, int> varMap;
     const int psz = (int)P->Prod.size();
@@ -202,7 +202,7 @@ void SymbolicEvaluation::print_varMapping(raw_ostream& OS, SymProd* P)
     }
 }
 
-void SymbolicEvaluation::print(raw_ostream& OS, SymTerm* T)
+void SymbolicEvaluation::print(raw_ostream& OS, const SymTerm* T)
 {
     if (T->Term->Prod.size() > 0) {
         if (T->Coeff != 1) {
@@ -216,12 +216,12 @@ void SymbolicEvaluation::print(raw_ostream& OS, SymTerm* T)
     }
 }
 
-void SymbolicEvaluation::print_varMapping(raw_ostream& OS, SymTerm* T)
+void SymbolicEvaluation::print_varMapping(raw_ostream& OS, const SymTerm* T)
 {
     print_varMapping(OS, T->Term);
 }
 
-void SymbolicEvaluation::print(raw_ostream& OS, SymExpr* SE)
+void SymbolicEvaluation::print(raw_ostream& OS, const SymExpr* SE)
 {
     int e = (int)SE->SymTerms.size();
     for (int i = 0; i < e; ++i) {
@@ -239,7 +239,7 @@ void SymbolicEvaluation::print(raw_ostream& OS, SymExpr* SE)
     }
 }
 
-void SymbolicEvaluation::print_varMapping(raw_ostream& OS, SymExpr* SE)
+void SymbolicEvaluation::print_varMapping(raw_ostream& OS, const SymExpr* SE)
 {
     std::map<const Value*, int> varMap;
     const int e = (int)SE->SymTerms.size();
@@ -291,23 +291,23 @@ void SymbolicEvaluation::print_varMapping(raw_ostream& OS, const Value* V)
     }
 }
 
-void SymbolicEvaluation::dump(SymProd* P)
+void SymbolicEvaluation::dump(const SymProd* P)
 {
     dbgs() << "\n";
     print(dbgs(), P);
     print_varMapping(dbgs(), P);
     dbgs() << "\n";
 }
 
-void SymbolicEvaluation::dump(SymTerm* T)
+void SymbolicEvaluation::dump(const SymTerm* T)
 {
     dbgs() << "\n";
     print(dbgs(), T);
     print_varMapping(dbgs(), T);
     dbgs() << "\n";
 }
 
-void SymbolicEvaluation::dump(SymExpr* SE)
+void SymbolicEvaluation::dump(const SymExpr* SE)
 {
     dbgs() << "\n";
     print(dbgs(), SE);
@@ -643,9 +643,9 @@ SymExpr* SymbolicEvaluation::add(
             if (Coeff != 0)
             {
                 T = T0;
-                ++i0;
-                ++i1;
             }
+            ++i0;
+            ++i1;
         }
 
         if (T != nullptr) {

diff --git a/IGC/Compiler/CISACodeGen/SLMConstProp.hpp b/IGC/Compiler/CISACodeGen/SLMConstProp.hpp
@@ -141,19 +141,19 @@ namespace IGC
         }
 
 #if defined(_DEBUG)
-        void print(llvm::raw_ostream& OS, SymProd* P);
-        void print(llvm::raw_ostream& OS, SymTerm* T);
-        void print(llvm::raw_ostream& OS, SymExpr* SE);
+        void print(llvm::raw_ostream& OS, const SymProd* P);
+        void print(llvm::raw_ostream& OS, const SymTerm* T);
+        void print(llvm::raw_ostream& OS, const SymExpr* SE);
         void print(llvm::raw_ostream& OS, const llvm::Value* V);
-        void print_varMapping(llvm::raw_ostream& OS, SymProd* P);
-        void print_varMapping(llvm::raw_ostream& OS, SymTerm* T);
-        void print_varMapping(llvm::raw_ostream& OS, SymExpr* SE);
+        void print_varMapping(llvm::raw_ostream& OS, const SymProd* P);
+        void print_varMapping(llvm::raw_ostream& OS, const SymTerm* T);
+        void print_varMapping(llvm::raw_ostream& OS, const SymExpr* SE);
         void print_varMapping(llvm::raw_ostream& OS, const llvm::Value* V);
 
         void dump_symbols();
-        void dump(SymProd* P);
-        void dump(SymTerm* T);
-        void dump(SymExpr* SE);
+        void dump(const SymProd* P);
+        void dump(const SymTerm* T);
+        void dump(const SymExpr* SE);
         void dump(const llvm::Value* V);
 #endif