[verbose] Even more verbose comments

Author: omegahm

filter/bccon/contract_collect.cpp

@@ -60,7 +60,7 @@ static void rewrite_chain_add_sub(vector<bh_instruction*>& chain)
     bh_instruction& last = *chain.back();
 
     if (!chain_has_same_type(chain)) {
-        verbose_print("[Collect] Addsub chain doesn't have same type.");
+        verbose_print("[Collect] \tAddsub chain doesn't have same type.");
         return;
     }
 
@@ -69,7 +69,7 @@ static void rewrite_chain_add_sub(vector<bh_instruction*>& chain)
         case BH_COMPLEX64:
         case BH_COMPLEX128:
         case BH_R123:
-            verbose_print("[Collect] Don't know how to do complex types, yet.");
+            verbose_print("[Collect] \tDon't know how to do complex types, yet.");
             return;
     }
 
@@ -116,7 +116,7 @@ static void rewrite_chain_mul_div(vector<bh_instruction*>& chain)
     bh_instruction& last = *chain.back();
 
     if (!chain_has_same_type(chain)) {
-        verbose_print("[Collect] Muldiv chain doesn't have same type.");
+        verbose_print("[Collect] \tMuldiv chain doesn't have same type.");
         return;
     }
 
@@ -125,7 +125,7 @@ static void rewrite_chain_mul_div(vector<bh_instruction*>& chain)
         case BH_COMPLEX64:
         case BH_COMPLEX128:
         case BH_R123:
-            verbose_print("[Collect] Don't know how to do complex types, yet.");
+            verbose_print("[Collect] \tDon't know how to do complex types, yet.");
             return;
     }
 

filter/bccon/contract_muladd.cpp

@@ -54,15 +54,15 @@ static bool rewrite_chain(bh_ir &bhir, const vector<bh_instruction*>& chain, con
                 if (view == instr.operand[0] or
                     view == instr.operand[1] or
                     view == instr.operand[2]) {
-                    verbose_print("[Muladd] Can't rewrite - Found use of view in other place!");
+                    verbose_print("[Muladd] \tCan't rewrite - Found use of view in other place!");
                     return false;
                 }
             }
         }
     }
 
     if (frees.size() != temps.size()) {
-        verbose_print("[Muladd] Can't rewrite - Not same amount of views as frees!");
+        verbose_print("[Muladd] \tCan't rewrite - Not same amount of views as frees!");
         return false;
     }
 

filter/bccon/contract_repeats.cpp

@@ -134,7 +134,7 @@ void Contracter::contract_repeats(bh_ir &bhir)
             bhir.instr_list = new_bh_instr_list;
         }
     } catch(std::runtime_error& e) {
-        verbose_print("[Repeat] Regex failed - Moving on");
+        verbose_print("[Repeat] \tRegex failed - Moving on");
         return;
     }
 

filter/bccon/contract_stupidmath.cpp

@@ -90,6 +90,7 @@ void Contracter::contract_stupidmath(bh_ir &bhir)
         bh_instruction& instr = bhir.instr_list[pc];
 
         if (is_doing_stupid_math(instr)) {
+            verbose_print("[Stupid math] Is doing stupid math with a " + std::string(bh_opcode_text(instr.opcode)));
 
             // We could have the following:
             //   BH_MULTIPLY B A 0
@@ -120,6 +121,7 @@ void Contracter::contract_stupidmath(bh_ir &bhir)
             }
 
             if (!freed) {
+                verbose_print("[Stupid math] \tCan't rectify as it isn't freeing in same flush.");
                 continue;
             }
 
@@ -137,6 +139,7 @@ void Contracter::contract_stupidmath(bh_ir &bhir)
 
             // Only if we FREE B in the same flush, are we allowed to change things.
             if (created_before) {
+                verbose_print("[Stupid math] \tCan't rectify as other view isn't created in same flush.");
                 continue;
             }
 
@@ -157,7 +160,7 @@ void Contracter::contract_stupidmath(bh_ir &bhir)
             }
 
             // Remove self
-            verbose_print("[Stupid math] Removing " + std::string(bh_opcode_text(instr.opcode)));
+            verbose_print("[Stupid math] \tRemoving " + std::string(bh_opcode_text(instr.opcode)));
             instr.opcode = BH_NONE;
         }
     }

filter/bcexp/expand_powk.cpp

@@ -30,6 +30,8 @@ static const int64_t max_exponent_unfolding = 100;
 
 int Expander::expand_powk(bh_ir& bhir, int pc)
 {
+    verbose_print("[Powk] Expanding BH_POWER");
+
     int start_pc = pc;
 
     // Grab the BH_POWER instruction
@@ -50,22 +52,21 @@ int Expander::expand_powk(bh_ir& bhir, int pc)
         exponent = instr.constant.get_int64();
     } catch (overflow_error& e) {
         // Give up, if we cannot get a signed integer
-        verbose_print("[Powk] Can't expand BH_POWER with non-integer");
+        verbose_print("[Powk] \tCan't expand BH_POWER with non-integer");
         return 0;
     }
 
     if (0 > exponent || exponent > max_exponent_unfolding) {
-        verbose_print("[Powk] Can't expand BH_POWER with exponent " + std::to_string(exponent));
+        verbose_print("[Powk] \tCan't expand BH_POWER with exponent " + std::to_string(exponent));
         return 0;
     }
 
     // TODO: Add support for this case by using intermediates.
     if (instr.operand[0].base == instr.operand[1].base) {
-        verbose_print("[Powk] Can't expand BH_POWER without intermediates.");
+        verbose_print("[Powk] \tCan't expand BH_POWER without intermediates.");
         return 0;
     }
 
-    verbose_print("[Powk] Expanding BH_POWER");
     // Lazy choice... no re-use just NOP it.
     instr.opcode = BH_NONE;
 

filter/bcexp/expand_reduce1d.cpp

@@ -45,6 +45,7 @@ int Expander::expand_reduce1d(bh_ir& bhir, int pc, int thread_limit)
     bh_instruction& instr = bhir.instr_list[pc];
     bh_opcode opcode = instr.opcode;
     bh_index elements = bh_nelements(instr.operand[1]);
+    verbose_print("[Reduce1D] Expanding " + string(bh_opcode_text(opcode)));
 
     if (elements * 2 < thread_limit) {
         return 0;
@@ -59,7 +60,7 @@ int Expander::expand_reduce1d(bh_ir& bhir, int pc, int thread_limit)
     }
 
     if (fold < 2) {
-        verbose_print("[Reduce1D] Can't expand " + string(bh_opcode_text(opcode)) + " with a fold less than 2.");
+        verbose_print("[Reduce1D] \tCan't expand " + string(bh_opcode_text(opcode)) + " with a fold less than 2.");
         return 0;
     }
 
@@ -83,7 +84,6 @@ int Expander::expand_reduce1d(bh_ir& bhir, int pc, int thread_limit)
     inject(bhir, ++pc, opcode,  out,  temp, 0, BH_INT64);
     inject(bhir, ++pc, BH_FREE, temp);
 
-    verbose_print("[Reduce1D] Expanding " + string(bh_opcode_text(opcode)));
     return pc - start_pc;
 }